summaryrefslogtreecommitdiff
path: root/dev-ml
diff options
context:
space:
mode:
Diffstat (limited to 'dev-ml')
-rw-r--r--dev-ml/ANSITerminal-0.6.513
-rw-r--r--dev-ml/ANSITerminal-0.713
-rw-r--r--dev-ml/ANSITerminal/ANSITerminal-0.6.5.ebuild20
-rw-r--r--dev-ml/ANSITerminal/ANSITerminal-0.7.ebuild25
-rw-r--r--dev-ml/ANSITerminal/Manifest6
-rw-r--r--dev-ml/ANSITerminal/files/oasis.patch13
-rw-r--r--dev-ml/ANSITerminal/metadata.xml11
-rw-r--r--dev-ml/Manifest.gzbin60062 -> 40998 bytes
-rw-r--r--dev-ml/OCaml-ImageMagick-0.34-r113
-rw-r--r--dev-ml/OCaml-ImageMagick/Manifest4
-rw-r--r--dev-ml/OCaml-ImageMagick/OCaml-ImageMagick-0.34-r1.ebuild38
-rw-r--r--dev-ml/OCaml-ImageMagick/metadata.xml8
-rw-r--r--dev-ml/alcotest-0.8.113
-rw-r--r--dev-ml/alcotest-0.8.213
-rw-r--r--dev-ml/alcotest/Manifest5
-rw-r--r--dev-ml/alcotest/alcotest-0.8.1.ebuild33
-rw-r--r--dev-ml/alcotest/alcotest-0.8.2.ebuild33
-rw-r--r--dev-ml/alcotest/metadata.xml11
-rw-r--r--dev-ml/angstrom-0.7.013
-rw-r--r--dev-ml/angstrom-async-0.7.012
-rw-r--r--dev-ml/angstrom-async/Manifest3
-rw-r--r--dev-ml/angstrom-async/angstrom-async-0.7.0.ebuild33
-rw-r--r--dev-ml/angstrom-async/metadata.xml11
-rw-r--r--dev-ml/angstrom-lwt-unix-0.7.012
-rw-r--r--dev-ml/angstrom-lwt-unix/Manifest3
-rw-r--r--dev-ml/angstrom-lwt-unix/angstrom-lwt-unix-0.7.0.ebuild33
-rw-r--r--dev-ml/angstrom-lwt-unix/metadata.xml11
-rw-r--r--dev-ml/angstrom-unix-0.7.012
-rw-r--r--dev-ml/angstrom-unix/Manifest3
-rw-r--r--dev-ml/angstrom-unix/angstrom-unix-0.7.0.ebuild29
-rw-r--r--dev-ml/angstrom-unix/metadata.xml11
-rw-r--r--dev-ml/angstrom/Manifest3
-rw-r--r--dev-ml/angstrom/angstrom-0.7.0.ebuild28
-rw-r--r--dev-ml/angstrom/metadata.xml11
-rw-r--r--dev-ml/astring-0.8.312
-rw-r--r--dev-ml/astring/Manifest3
-rw-r--r--dev-ml/astring/astring-0.8.3.ebuild25
-rw-r--r--dev-ml/astring/metadata.xml11
-rw-r--r--dev-ml/async-0.9.012
-rw-r--r--dev-ml/async/Manifest3
-rw-r--r--dev-ml/async/async-0.9.0.ebuild26
-rw-r--r--dev-ml/async/metadata.xml11
-rw-r--r--dev-ml/async_extra-0.9.011
-rw-r--r--dev-ml/async_extra/Manifest3
-rw-r--r--dev-ml/async_extra/async_extra-0.9.0.ebuild32
-rw-r--r--dev-ml/async_extra/metadata.xml11
-rw-r--r--dev-ml/async_js-0.9.011
-rw-r--r--dev-ml/async_js/Manifest3
-rw-r--r--dev-ml/async_js/async_js-0.9.0.ebuild35
-rw-r--r--dev-ml/async_js/metadata.xml11
-rw-r--r--dev-ml/async_kernel-0.9.011
-rw-r--r--dev-ml/async_kernel/Manifest3
-rw-r--r--dev-ml/async_kernel/async_kernel-0.9.0.ebuild29
-rw-r--r--dev-ml/async_kernel/metadata.xml11
-rw-r--r--dev-ml/async_rpc_kernel-0.9.011
-rw-r--r--dev-ml/async_rpc_kernel/Manifest3
-rw-r--r--dev-ml/async_rpc_kernel/async_rpc_kernel-0.9.0.ebuild31
-rw-r--r--dev-ml/async_rpc_kernel/metadata.xml12
-rw-r--r--dev-ml/async_ssl-0.9.011
-rw-r--r--dev-ml/async_ssl/Manifest3
-rw-r--r--dev-ml/async_ssl/async_ssl-0.9.0.ebuild39
-rw-r--r--dev-ml/async_ssl/metadata.xml11
-rw-r--r--dev-ml/async_unix-0.9.011
-rw-r--r--dev-ml/async_unix/Manifest3
-rw-r--r--dev-ml/async_unix/async_unix-0.9.0.ebuild33
-rw-r--r--dev-ml/async_unix/metadata.xml11
-rw-r--r--dev-ml/atd-1.12.013
-rw-r--r--dev-ml/atd-1.2.013
-rw-r--r--dev-ml/atd-1.2.113
-rw-r--r--dev-ml/atd/Manifest7
-rw-r--r--dev-ml/atd/atd-1.12.0.ebuild46
-rw-r--r--dev-ml/atd/atd-1.2.0.ebuild33
-rw-r--r--dev-ml/atd/atd-1.2.1.ebuild34
-rw-r--r--dev-ml/atd/metadata.xml11
-rw-r--r--dev-ml/atdgen-1.10.013
-rw-r--r--dev-ml/atdgen-1.10.213
-rw-r--r--dev-ml/atdgen-1.12.013
-rw-r--r--dev-ml/atdgen/Manifest7
-rw-r--r--dev-ml/atdgen/atdgen-1.10.0.ebuild34
-rw-r--r--dev-ml/atdgen/atdgen-1.10.2.ebuild35
-rw-r--r--dev-ml/atdgen/atdgen-1.12.0.ebuild45
-rw-r--r--dev-ml/atdgen/metadata.xml11
-rw-r--r--dev-ml/base-0.9.111
-rw-r--r--dev-ml/base-0.9.211
-rw-r--r--dev-ml/base-0.9.311
-rw-r--r--dev-ml/base-0.9.411
-rw-r--r--dev-ml/base/Manifest9
-rw-r--r--dev-ml/base/base-0.9.1.ebuild33
-rw-r--r--dev-ml/base/base-0.9.2.ebuild33
-rw-r--r--dev-ml/base/base-0.9.3.ebuild33
-rw-r--r--dev-ml/base/base-0.9.4.ebuild33
-rw-r--r--dev-ml/base/metadata.xml11
-rw-r--r--dev-ml/batteries-2.7.013
-rw-r--r--dev-ml/batteries/Manifest3
-rw-r--r--dev-ml/batteries/batteries-2.7.0.ebuild23
-rw-r--r--dev-ml/batteries/metadata.xml11
-rw-r--r--dev-ml/bignum-0.9.011
-rw-r--r--dev-ml/bignum/Manifest3
-rw-r--r--dev-ml/bignum/bignum-0.9.0.ebuild34
-rw-r--r--dev-ml/bignum/metadata.xml11
-rw-r--r--dev-ml/bin-prot-0.9.011
-rw-r--r--dev-ml/bin-prot-0.9.111
-rw-r--r--dev-ml/bin-prot-0.9.211
-rw-r--r--dev-ml/bin-prot/Manifest7
-rw-r--r--dev-ml/bin-prot/bin-prot-0.9.0.ebuild44
-rw-r--r--dev-ml/bin-prot/bin-prot-0.9.1.ebuild44
-rw-r--r--dev-ml/bin-prot/bin-prot-0.9.2.ebuild44
-rw-r--r--dev-ml/bin-prot/metadata.xml11
-rw-r--r--dev-ml/biniou-1.0.1213
-rw-r--r--dev-ml/biniou-1.0.1313
-rw-r--r--dev-ml/biniou-1.1.013
-rw-r--r--dev-ml/biniou-1.2.013
-rw-r--r--dev-ml/biniou/Manifest9
-rw-r--r--dev-ml/biniou/biniou-1.0.12.ebuild31
-rw-r--r--dev-ml/biniou/biniou-1.0.13.ebuild31
-rw-r--r--dev-ml/biniou/biniou-1.1.0.ebuild32
-rw-r--r--dev-ml/biniou/biniou-1.2.0.ebuild32
-rw-r--r--dev-ml/biniou/metadata.xml11
-rw-r--r--dev-ml/bolt-1.413
-rw-r--r--dev-ml/bolt/Manifest3
-rw-r--r--dev-ml/bolt/bolt-1.4.ebuild40
-rw-r--r--dev-ml/bolt/metadata.xml8
-rw-r--r--dev-ml/bos-0.1.612
-rw-r--r--dev-ml/bos/Manifest3
-rw-r--r--dev-ml/bos/bos-0.1.6.ebuild44
-rw-r--r--dev-ml/bos/metadata.xml11
-rw-r--r--dev-ml/bson-0.89.313
-rw-r--r--dev-ml/bson/Manifest3
-rw-r--r--dev-ml/bson/bson-0.89.3.ebuild18
-rw-r--r--dev-ml/bson/metadata.xml11
-rw-r--r--dev-ml/cairo-ocaml-1.2.013
-rw-r--r--dev-ml/cairo-ocaml/Manifest7
-rw-r--r--dev-ml/cairo-ocaml/cairo-ocaml-1.2.0.ebuild91
-rw-r--r--dev-ml/cairo-ocaml/files/0001-Add-missing-libraries-used-by-the-stubs-to-CAIRO_LIB.patch26
-rw-r--r--dev-ml/cairo-ocaml/files/0002-Fix-Makefile-to-avoid-recompiling-files-in-usr.patch27
-rw-r--r--dev-ml/cairo-ocaml/files/0003-Fix-FTBFS-on-bytecode-architectures.patch39
-rw-r--r--dev-ml/cairo-ocaml/files/0004-no-automagic.patch25
-rw-r--r--dev-ml/cairo-ocaml/metadata.xml16
-rw-r--r--dev-ml/calendar-2.0413
-rw-r--r--dev-ml/calendar/Manifest3
-rw-r--r--dev-ml/calendar/calendar-2.04.ebuild33
-rw-r--r--dev-ml/calendar/metadata.xml8
-rw-r--r--dev-ml/camlbz2-0.6.013
-rw-r--r--dev-ml/camlbz2/Manifest3
-rw-r--r--dev-ml/camlbz2/camlbz2-0.6.0.ebuild30
-rw-r--r--dev-ml/camlbz2/metadata.xml8
-rw-r--r--dev-ml/camldbm-1.012
-rw-r--r--dev-ml/camldbm/Manifest5
-rw-r--r--dev-ml/camldbm/camldbm-1.0.ebuild28
-rw-r--r--dev-ml/camldbm/files/hasgotfix.patch15
-rw-r--r--dev-ml/camldbm/files/include_fix.patch15
-rw-r--r--dev-ml/camldbm/metadata.xml8
-rw-r--r--dev-ml/camlidl-1.05-r112
-rw-r--r--dev-ml/camlidl/Manifest7
-rw-r--r--dev-ml/camlidl/camlidl-1.05-r1.ebuild53
-rw-r--r--dev-ml/camlidl/files/META.camlidl5
-rw-r--r--dev-ml/camlidl/files/includes.patch12
-rw-r--r--dev-ml/camlidl/files/nowarn.patch13
-rw-r--r--dev-ml/camlidl/files/tests.patch36
-rw-r--r--dev-ml/camlidl/metadata.xml8
-rw-r--r--dev-ml/camlimages-4.2.213
-rw-r--r--dev-ml/camlimages-4.2.313
-rw-r--r--dev-ml/camlimages-4.2.413
-rw-r--r--dev-ml/camlimages/Manifest7
-rw-r--r--dev-ml/camlimages/camlimages-4.2.2.ebuild59
-rw-r--r--dev-ml/camlimages/camlimages-4.2.3.ebuild59
-rw-r--r--dev-ml/camlimages/camlimages-4.2.4.ebuild59
-rw-r--r--dev-ml/camlimages/metadata.xml11
-rw-r--r--dev-ml/camlp4-4.04_p112
-rw-r--r--dev-ml/camlp4-4.05_p112
-rw-r--r--dev-ml/camlp4/Manifest5
-rw-r--r--dev-ml/camlp4/camlp4-4.04_p1.ebuild43
-rw-r--r--dev-ml/camlp4/camlp4-4.05_p1.ebuild43
-rw-r--r--dev-ml/camlp4/metadata.xml11
-rw-r--r--dev-ml/camlp5-6.1713
-rw-r--r--dev-ml/camlp5-7.0013
-rw-r--r--dev-ml/camlp5-7.0113
-rw-r--r--dev-ml/camlp5-7.0313
-rw-r--r--dev-ml/camlp5/Manifest9
-rw-r--r--dev-ml/camlp5/camlp5-6.17.ebuild69
-rw-r--r--dev-ml/camlp5/camlp5-7.00.ebuild65
-rw-r--r--dev-ml/camlp5/camlp5-7.01.ebuild65
-rw-r--r--dev-ml/camlp5/camlp5-7.03.ebuild65
-rw-r--r--dev-ml/camlp5/metadata.xml11
-rw-r--r--dev-ml/camlpdf-2.1.113
-rw-r--r--dev-ml/camlpdf/Manifest4
-rw-r--r--dev-ml/camlpdf/camlpdf-2.1.1.ebuild40
-rw-r--r--dev-ml/camlpdf/files/ocaml43.patch13
-rw-r--r--dev-ml/camlpdf/metadata.xml11
-rw-r--r--dev-ml/camlzip-1.0613
-rw-r--r--dev-ml/camlzip-1.0713
-rw-r--r--dev-ml/camlzip/Manifest5
-rw-r--r--dev-ml/camlzip/camlzip-1.06.ebuild34
-rw-r--r--dev-ml/camlzip/camlzip-1.07.ebuild36
-rw-r--r--dev-ml/camlzip/metadata.xml11
-rw-r--r--dev-ml/camomile-0.8.5-r113
-rw-r--r--dev-ml/camomile/Manifest4
-rw-r--r--dev-ml/camomile/camomile-0.8.5-r1.ebuild41
-rw-r--r--dev-ml/camomile/files/ocaml405.patch40
-rw-r--r--dev-ml/camomile/metadata.xml11
-rw-r--r--dev-ml/capnp-ocaml-3.0.013
-rw-r--r--dev-ml/capnp-ocaml-3.1.013
-rw-r--r--dev-ml/capnp-ocaml/Manifest5
-rw-r--r--dev-ml/capnp-ocaml/capnp-ocaml-3.0.0.ebuild36
-rw-r--r--dev-ml/capnp-ocaml/capnp-ocaml-3.1.0.ebuild36
-rw-r--r--dev-ml/capnp-ocaml/metadata.xml11
-rw-r--r--dev-ml/cmdliner-1.0.013
-rw-r--r--dev-ml/cmdliner-1.0.113
-rw-r--r--dev-ml/cmdliner-1.0.213
-rw-r--r--dev-ml/cmdliner/Manifest7
-rw-r--r--dev-ml/cmdliner/cmdliner-1.0.0.ebuild43
-rw-r--r--dev-ml/cmdliner/cmdliner-1.0.1.ebuild43
-rw-r--r--dev-ml/cmdliner/cmdliner-1.0.2.ebuild43
-rw-r--r--dev-ml/cmdliner/metadata.xml8
-rw-r--r--dev-ml/configurator-0.9.111
-rw-r--r--dev-ml/configurator/Manifest3
-rw-r--r--dev-ml/configurator/configurator-0.9.1.ebuild32
-rw-r--r--dev-ml/configurator/metadata.xml11
-rw-r--r--dev-ml/core-0.9.1-r112
-rw-r--r--dev-ml/core-0.9.212
-rw-r--r--dev-ml/core/Manifest6
-rw-r--r--dev-ml/core/core-0.9.1-r1.ebuild30
-rw-r--r--dev-ml/core/core-0.9.2.ebuild29
-rw-r--r--dev-ml/core/files/glibc225.patch12
-rw-r--r--dev-ml/core/metadata.xml20
-rw-r--r--dev-ml/core_bench-0.9.011
-rw-r--r--dev-ml/core_bench/Manifest3
-rw-r--r--dev-ml/core_bench/core_bench-0.9.0.ebuild33
-rw-r--r--dev-ml/core_bench/metadata.xml11
-rw-r--r--dev-ml/core_extended-0.9.011
-rw-r--r--dev-ml/core_extended/Manifest3
-rw-r--r--dev-ml/core_extended/core_extended-0.9.0.ebuild38
-rw-r--r--dev-ml/core_extended/metadata.xml11
-rw-r--r--dev-ml/core_kernel-0.9.011
-rw-r--r--dev-ml/core_kernel-0.9.111
-rw-r--r--dev-ml/core_kernel/Manifest5
-rw-r--r--dev-ml/core_kernel/core_kernel-0.9.0.ebuild47
-rw-r--r--dev-ml/core_kernel/core_kernel-0.9.1.ebuild47
-rw-r--r--dev-ml/core_kernel/metadata.xml19
-rw-r--r--dev-ml/core_profiler-0.9.011
-rw-r--r--dev-ml/core_profiler/Manifest3
-rw-r--r--dev-ml/core_profiler/core_profiler-0.9.0.ebuild33
-rw-r--r--dev-ml/core_profiler/metadata.xml11
-rw-r--r--dev-ml/cppo-1.4.113
-rw-r--r--dev-ml/cppo-1.5.013
-rw-r--r--dev-ml/cppo/Manifest5
-rw-r--r--dev-ml/cppo/cppo-1.4.1.ebuild31
-rw-r--r--dev-ml/cppo/cppo-1.5.0.ebuild37
-rw-r--r--dev-ml/cppo/metadata.xml11
-rw-r--r--dev-ml/cryptokit-1.1013
-rw-r--r--dev-ml/cryptokit-1.1114
-rw-r--r--dev-ml/cryptokit-1.1214
-rw-r--r--dev-ml/cryptokit/Manifest7
-rw-r--r--dev-ml/cryptokit/cryptokit-1.10.ebuild48
-rw-r--r--dev-ml/cryptokit/cryptokit-1.11.ebuild50
-rw-r--r--dev-ml/cryptokit/cryptokit-1.12.ebuild52
-rw-r--r--dev-ml/cryptokit/metadata.xml11
-rw-r--r--dev-ml/csv-1.513
-rw-r--r--dev-ml/csv-1.613
-rw-r--r--dev-ml/csv-1.713
-rw-r--r--dev-ml/csv/Manifest7
-rw-r--r--dev-ml/csv/csv-1.5.ebuild23
-rw-r--r--dev-ml/csv/csv-1.6.ebuild28
-rw-r--r--dev-ml/csv/csv-1.7.ebuild37
-rw-r--r--dev-ml/csv/metadata.xml14
-rw-r--r--dev-ml/cudf-0.8-r113
-rw-r--r--dev-ml/cudf/Manifest3
-rw-r--r--dev-ml/cudf/cudf-0.8-r1.ebuild66
-rw-r--r--dev-ml/cudf/metadata.xml8
-rw-r--r--dev-ml/deriving-0.7.113
-rw-r--r--dev-ml/deriving/Manifest3
-rw-r--r--dev-ml/deriving/deriving-0.7.1.ebuild35
-rw-r--r--dev-ml/deriving/metadata.xml11
-rw-r--r--dev-ml/dns-1.0.013
-rw-r--r--dev-ml/dns-async-1.0.014
-rw-r--r--dev-ml/dns-async/Manifest3
-rw-r--r--dev-ml/dns-async/dns-async-1.0.0.ebuild42
-rw-r--r--dev-ml/dns-async/metadata.xml11
-rw-r--r--dev-ml/dns-lwt-1.0.014
-rw-r--r--dev-ml/dns-lwt-unix-1.0.014
-rw-r--r--dev-ml/dns-lwt-unix/Manifest3
-rw-r--r--dev-ml/dns-lwt-unix/dns-lwt-unix-1.0.0.ebuild45
-rw-r--r--dev-ml/dns-lwt-unix/metadata.xml11
-rw-r--r--dev-ml/dns-lwt/Manifest3
-rw-r--r--dev-ml/dns-lwt/dns-lwt-1.0.0.ebuild43
-rw-r--r--dev-ml/dns-lwt/metadata.xml11
-rw-r--r--dev-ml/dns/Manifest3
-rw-r--r--dev-ml/dns/dns-1.0.0.ebuild43
-rw-r--r--dev-ml/dns/metadata.xml11
-rw-r--r--dev-ml/dose3-5.0.114
-rw-r--r--dev-ml/dose3/Manifest3
-rw-r--r--dev-ml/dose3/dose3-5.0.1.ebuild64
-rw-r--r--dev-ml/dose3/metadata.xml13
-rw-r--r--dev-ml/easy-format-1.0.213
-rw-r--r--dev-ml/easy-format-1.2.013
-rw-r--r--dev-ml/easy-format/Manifest5
-rw-r--r--dev-ml/easy-format/easy-format-1.0.2.ebuild33
-rw-r--r--dev-ml/easy-format/easy-format-1.2.0.ebuild33
-rw-r--r--dev-ml/easy-format/metadata.xml11
-rw-r--r--dev-ml/eliom-6.2.013
-rw-r--r--dev-ml/eliom-999911
-rw-r--r--dev-ml/eliom/Manifest5
-rw-r--r--dev-ml/eliom/eliom-6.2.0.ebuild70
-rw-r--r--dev-ml/eliom/eliom-9999.ebuild66
-rw-r--r--dev-ml/eliom/files/lwt3.patch44
-rw-r--r--dev-ml/eliom/metadata.xml14
-rw-r--r--dev-ml/enumerate-111.08.00-r113
-rw-r--r--dev-ml/enumerate/Manifest3
-rw-r--r--dev-ml/enumerate/enumerate-111.08.00-r1.ebuild26
-rw-r--r--dev-ml/enumerate/metadata.xml8
-rw-r--r--dev-ml/extlib-1.7.113
-rw-r--r--dev-ml/extlib-1.7.213
-rw-r--r--dev-ml/extlib/Manifest6
-rw-r--r--dev-ml/extlib/extlib-1.7.1.ebuild51
-rw-r--r--dev-ml/extlib/extlib-1.7.2.ebuild47
-rw-r--r--dev-ml/extlib/files/ocaml405.patch35
-rw-r--r--dev-ml/extlib/metadata.xml12
-rw-r--r--dev-ml/facile-1.1.312
-rw-r--r--dev-ml/facile/Manifest4
-rw-r--r--dev-ml/facile/facile-1.1.3.ebuild53
-rw-r--r--dev-ml/facile/files/facile-1.1-make.patch48
-rw-r--r--dev-ml/facile/metadata.xml12
-rw-r--r--dev-ml/fieldslib-0.9.011
-rw-r--r--dev-ml/fieldslib/Manifest3
-rw-r--r--dev-ml/fieldslib/fieldslib-0.9.0.ebuild29
-rw-r--r--dev-ml/fieldslib/metadata.xml17
-rw-r--r--dev-ml/findlib-1.7.113
-rw-r--r--dev-ml/findlib-1.7.213
-rw-r--r--dev-ml/findlib-1.7.313
-rw-r--r--dev-ml/findlib/Manifest10
-rw-r--r--dev-ml/findlib/files/externalmeta4.patch16
-rw-r--r--dev-ml/findlib/files/externalmeta5.patch13
-rw-r--r--dev-ml/findlib/files/externalmeta6.patch13
-rw-r--r--dev-ml/findlib/findlib-1.7.1.ebuild73
-rw-r--r--dev-ml/findlib/findlib-1.7.2.ebuild73
-rw-r--r--dev-ml/findlib/findlib-1.7.3.ebuild73
-rw-r--r--dev-ml/findlib/metadata.xml8
-rw-r--r--dev-ml/flow_parser-0.50.012
-rw-r--r--dev-ml/flow_parser-0.51.012
-rw-r--r--dev-ml/flow_parser-0.52.012
-rw-r--r--dev-ml/flow_parser/Manifest7
-rw-r--r--dev-ml/flow_parser/flow_parser-0.50.0.ebuild39
-rw-r--r--dev-ml/flow_parser/flow_parser-0.51.0.ebuild39
-rw-r--r--dev-ml/flow_parser/flow_parser-0.52.0.ebuild39
-rw-r--r--dev-ml/flow_parser/metadata.xml11
-rw-r--r--dev-ml/fmt-0.8.413
-rw-r--r--dev-ml/fmt/Manifest3
-rw-r--r--dev-ml/fmt/fmt-0.8.4.ebuild32
-rw-r--r--dev-ml/fmt/metadata.xml11
-rw-r--r--dev-ml/fort-0.4.212
-rw-r--r--dev-ml/fort/Manifest4
-rw-r--r--dev-ml/fort/files/fort-0.4.2-ocaml4.patch22
-rw-r--r--dev-ml/fort/fort-0.4.2.ebuild29
-rw-r--r--dev-ml/fort/metadata.xml15
-rw-r--r--dev-ml/fpath-0.7.212
-rw-r--r--dev-ml/fpath/Manifest3
-rw-r--r--dev-ml/fpath/fpath-0.7.2.ebuild29
-rw-r--r--dev-ml/fpath/metadata.xml11
-rw-r--r--dev-ml/gd4o-1.0_alpha513
-rw-r--r--dev-ml/gd4o/Manifest3
-rw-r--r--dev-ml/gd4o/gd4o-1.0_alpha5.ebuild54
-rw-r--r--dev-ml/gd4o/metadata.xml11
-rw-r--r--dev-ml/gen-0.4.0.113
-rw-r--r--dev-ml/gen/Manifest3
-rw-r--r--dev-ml/gen/gen-0.4.0.1.ebuild24
-rw-r--r--dev-ml/gen/metadata.xml11
-rw-r--r--dev-ml/gen_js_api-1.0.312
-rw-r--r--dev-ml/gen_js_api-1.0.412
-rw-r--r--dev-ml/gen_js_api/Manifest5
-rw-r--r--dev-ml/gen_js_api/gen_js_api-1.0.3.ebuild23
-rw-r--r--dev-ml/gen_js_api/gen_js_api-1.0.4.ebuild23
-rw-r--r--dev-ml/gen_js_api/metadata.xml11
-rw-r--r--dev-ml/gsl-ocaml-1.19.113
-rw-r--r--dev-ml/gsl-ocaml/Manifest3
-rw-r--r--dev-ml/gsl-ocaml/gsl-ocaml-1.19.1.ebuild28
-rw-r--r--dev-ml/gsl-ocaml/metadata.xml15
-rw-r--r--dev-ml/herelib-112.35.0013
-rw-r--r--dev-ml/herelib/Manifest3
-rw-r--r--dev-ml/herelib/herelib-112.35.00.ebuild24
-rw-r--r--dev-ml/herelib/metadata.xml8
-rw-r--r--dev-ml/iTeML-2.512
-rw-r--r--dev-ml/iTeML-2.612
-rw-r--r--dev-ml/iTeML-2.712
-rw-r--r--dev-ml/iTeML/Manifest7
-rw-r--r--dev-ml/iTeML/iTeML-2.5.ebuild30
-rw-r--r--dev-ml/iTeML/iTeML-2.6.ebuild30
-rw-r--r--dev-ml/iTeML/iTeML-2.7.ebuild30
-rw-r--r--dev-ml/iTeML/metadata.xml11
-rw-r--r--dev-ml/incremental-0.9.011
-rw-r--r--dev-ml/incremental/Manifest3
-rw-r--r--dev-ml/incremental/incremental-0.9.0.ebuild32
-rw-r--r--dev-ml/incremental/metadata.xml11
-rw-r--r--dev-ml/incremental_kernel-0.9.011
-rw-r--r--dev-ml/incremental_kernel/Manifest3
-rw-r--r--dev-ml/incremental_kernel/incremental_kernel-0.9.0.ebuild33
-rw-r--r--dev-ml/incremental_kernel/metadata.xml11
-rw-r--r--dev-ml/integers-0.2.211
-rw-r--r--dev-ml/integers/Manifest3
-rw-r--r--dev-ml/integers/integers-0.2.2.ebuild32
-rw-r--r--dev-ml/integers/metadata.xml11
-rw-r--r--dev-ml/io-page-1.6.013
-rw-r--r--dev-ml/io-page/Manifest3
-rw-r--r--dev-ml/io-page/io-page-1.6.0.ebuild27
-rw-r--r--dev-ml/io-page/metadata.xml11
-rw-r--r--dev-ml/jane-street-headers-0.9.011
-rw-r--r--dev-ml/jane-street-headers/Manifest3
-rw-r--r--dev-ml/jane-street-headers/jane-street-headers-0.9.0.ebuild27
-rw-r--r--dev-ml/jane-street-headers/metadata.xml11
-rw-r--r--dev-ml/jbuilder-1.0_beta1413
-rw-r--r--dev-ml/jbuilder/Manifest3
-rw-r--r--dev-ml/jbuilder/jbuilder-1.0_beta14.ebuild33
-rw-r--r--dev-ml/jbuilder/metadata.xml11
-rw-r--r--dev-ml/js-build-tools-113.33.0413
-rw-r--r--dev-ml/js-build-tools-113.33.0613
-rw-r--r--dev-ml/js-build-tools/Manifest5
-rw-r--r--dev-ml/js-build-tools/js-build-tools-113.33.04.ebuild39
-rw-r--r--dev-ml/js-build-tools/js-build-tools-113.33.06.ebuild39
-rw-r--r--dev-ml/js-build-tools/metadata.xml12
-rw-r--r--dev-ml/js_of_ocaml-2.8.4-r213
-rw-r--r--dev-ml/js_of_ocaml-3.0.013
-rw-r--r--dev-ml/js_of_ocaml-999912
-rw-r--r--dev-ml/js_of_ocaml/Manifest8
-rw-r--r--dev-ml/js_of_ocaml/files/ocaml405.patch41
-rw-r--r--dev-ml/js_of_ocaml/files/ppx.patch11
-rw-r--r--dev-ml/js_of_ocaml/js_of_ocaml-2.8.4-r2.ebuild71
-rw-r--r--dev-ml/js_of_ocaml/js_of_ocaml-3.0.0.ebuild77
-rw-r--r--dev-ml/js_of_ocaml/js_of_ocaml-9999.ebuild75
-rw-r--r--dev-ml/js_of_ocaml/metadata.xml18
-rw-r--r--dev-ml/jsonm-1.0.112
-rw-r--r--dev-ml/jsonm/Manifest3
-rw-r--r--dev-ml/jsonm/jsonm-1.0.1.ebuild38
-rw-r--r--dev-ml/jsonm/metadata.xml8
-rw-r--r--dev-ml/kaputt-1.212
-rw-r--r--dev-ml/kaputt/Manifest3
-rw-r--r--dev-ml/kaputt/kaputt-1.2.ebuild37
-rw-r--r--dev-ml/kaputt/metadata.xml8
-rw-r--r--dev-ml/lablgl-1.05-r113
-rw-r--r--dev-ml/lablgl/Manifest3
-rw-r--r--dev-ml/lablgl/lablgl-1.05-r1.ebuild94
-rw-r--r--dev-ml/lablgl/metadata.xml8
-rw-r--r--dev-ml/lablgtk-2.18.513
-rw-r--r--dev-ml/lablgtk/Manifest3
-rw-r--r--dev-ml/lablgtk/lablgtk-2.18.5.ebuild82
-rw-r--r--dev-ml/lablgtk/metadata.xml13
-rw-r--r--dev-ml/labltk-8.06.213
-rw-r--r--dev-ml/labltk-8.06.313
-rw-r--r--dev-ml/labltk/Manifest7
-rw-r--r--dev-ml/labltk/files/findlib.patch20
-rw-r--r--dev-ml/labltk/files/ocaml405.patch382
-rw-r--r--dev-ml/labltk/labltk-8.06.2.ebuild44
-rw-r--r--dev-ml/labltk/labltk-8.06.3.ebuild43
-rw-r--r--dev-ml/labltk/metadata.xml8
-rw-r--r--dev-ml/lambda-term-1.1112
-rw-r--r--dev-ml/lambda-term/Manifest4
-rw-r--r--dev-ml/lambda-term/files/lwtreact.patch13
-rw-r--r--dev-ml/lambda-term/lambda-term-1.11.ebuild28
-rw-r--r--dev-ml/lambda-term/metadata.xml11
-rw-r--r--dev-ml/llvm-ocaml-4.0.114
-rw-r--r--dev-ml/llvm-ocaml-5.0.114
-rw-r--r--dev-ml/llvm-ocaml-5.0.214
-rw-r--r--dev-ml/llvm-ocaml-6.0.015
-rw-r--r--dev-ml/llvm-ocaml-6.0.115
-rw-r--r--dev-ml/llvm-ocaml-6.0.999913
-rw-r--r--dev-ml/llvm-ocaml-999913
-rw-r--r--dev-ml/llvm-ocaml/Manifest13
-rw-r--r--dev-ml/llvm-ocaml/llvm-ocaml-4.0.1.ebuild119
-rw-r--r--dev-ml/llvm-ocaml/llvm-ocaml-5.0.1.ebuild122
-rw-r--r--dev-ml/llvm-ocaml/llvm-ocaml-5.0.2.ebuild122
-rw-r--r--dev-ml/llvm-ocaml/llvm-ocaml-6.0.0.ebuild127
-rw-r--r--dev-ml/llvm-ocaml/llvm-ocaml-6.0.1.ebuild127
-rw-r--r--dev-ml/llvm-ocaml/llvm-ocaml-6.0.9999.ebuild127
-rw-r--r--dev-ml/llvm-ocaml/llvm-ocaml-9999.ebuild131
-rw-r--r--dev-ml/llvm-ocaml/metadata.xml7
-rw-r--r--dev-ml/logs-0.6.213
-rw-r--r--dev-ml/logs/Manifest3
-rw-r--r--dev-ml/logs/logs-0.6.2.ebuild54
-rw-r--r--dev-ml/logs/metadata.xml16
-rw-r--r--dev-ml/lwt-3.0.013
-rw-r--r--dev-ml/lwt-3.1.012
-rw-r--r--dev-ml/lwt/Manifest5
-rw-r--r--dev-ml/lwt/lwt-3.0.0.ebuild43
-rw-r--r--dev-ml/lwt/lwt-3.1.0.ebuild55
-rw-r--r--dev-ml/lwt/metadata.xml16
-rw-r--r--dev-ml/lwt_glib-1.0.113
-rw-r--r--dev-ml/lwt_glib/Manifest3
-rw-r--r--dev-ml/lwt_glib/lwt_glib-1.0.1.ebuild27
-rw-r--r--dev-ml/lwt_glib/metadata.xml11
-rw-r--r--dev-ml/lwt_react-1.0.113
-rw-r--r--dev-ml/lwt_react/Manifest3
-rw-r--r--dev-ml/lwt_react/lwt_react-1.0.1.ebuild27
-rw-r--r--dev-ml/lwt_react/metadata.xml11
-rw-r--r--dev-ml/lwt_ssl-1.0.113
-rw-r--r--dev-ml/lwt_ssl-1.1.112
-rw-r--r--dev-ml/lwt_ssl/Manifest5
-rw-r--r--dev-ml/lwt_ssl/lwt_ssl-1.0.1.ebuild27
-rw-r--r--dev-ml/lwt_ssl/lwt_ssl-1.1.1.ebuild32
-rw-r--r--dev-ml/lwt_ssl/metadata.xml11
-rw-r--r--dev-ml/macaque-0.7.413
-rw-r--r--dev-ml/macaque/Manifest3
-rw-r--r--dev-ml/macaque/macaque-0.7.4.ebuild27
-rw-r--r--dev-ml/macaque/metadata.xml11
-rw-r--r--dev-ml/markup-0.7.513
-rw-r--r--dev-ml/markup/Manifest3
-rw-r--r--dev-ml/markup/markup-0.7.5.ebuild38
-rw-r--r--dev-ml/markup/metadata.xml11
-rw-r--r--dev-ml/mccs-1.1.2c12
-rw-r--r--dev-ml/mccs/Manifest3
-rw-r--r--dev-ml/mccs/mccs-1.1.2c.ebuild30
-rw-r--r--dev-ml/mccs/metadata.xml11
-rw-r--r--dev-ml/menhir-2017071213
-rw-r--r--dev-ml/menhir-2017101313
-rw-r--r--dev-ml/menhir/Manifest5
-rw-r--r--dev-ml/menhir/menhir-20170712.ebuild36
-rw-r--r--dev-ml/menhir/menhir-20171013.ebuild36
-rw-r--r--dev-ml/menhir/metadata.xml8
-rw-r--r--dev-ml/merlin-2.5.312
-rw-r--r--dev-ml/merlin-2.5.412
-rw-r--r--dev-ml/merlin-2.5.512
-rw-r--r--dev-ml/merlin-3.0.012
-rw-r--r--dev-ml/merlin-3.0.112
-rw-r--r--dev-ml/merlin-3.0.212
-rw-r--r--dev-ml/merlin-3.0.312
-rw-r--r--dev-ml/merlin-extend-0.312
-rw-r--r--dev-ml/merlin-extend/Manifest3
-rw-r--r--dev-ml/merlin-extend/merlin-extend-0.3.ebuild25
-rw-r--r--dev-ml/merlin-extend/metadata.xml11
-rw-r--r--dev-ml/merlin/Manifest15
-rw-r--r--dev-ml/merlin/merlin-2.5.3.ebuild33
-rw-r--r--dev-ml/merlin/merlin-2.5.4.ebuild33
-rw-r--r--dev-ml/merlin/merlin-2.5.5.ebuild33
-rw-r--r--dev-ml/merlin/merlin-3.0.0.ebuild33
-rw-r--r--dev-ml/merlin/merlin-3.0.1.ebuild33
-rw-r--r--dev-ml/merlin/merlin-3.0.2.ebuild33
-rw-r--r--dev-ml/merlin/merlin-3.0.3.ebuild33
-rw-r--r--dev-ml/merlin/metadata.xml11
-rw-r--r--dev-ml/metadata.xml40
-rw-r--r--dev-ml/mirage-profile-0.7.0-r114
-rw-r--r--dev-ml/mirage-profile/Manifest3
-rw-r--r--dev-ml/mirage-profile/metadata.xml11
-rw-r--r--dev-ml/mirage-profile/mirage-profile-0.7.0-r1.ebuild32
-rw-r--r--dev-ml/mongo-0.67.213
-rw-r--r--dev-ml/mongo/Manifest4
-rw-r--r--dev-ml/mongo/files/noinstalltest.patch9
-rw-r--r--dev-ml/mongo/metadata.xml11
-rw-r--r--dev-ml/mongo/mongo-0.67.2.ebuild26
-rw-r--r--dev-ml/mtime-1.1.013
-rw-r--r--dev-ml/mtime/Manifest3
-rw-r--r--dev-ml/mtime/metadata.xml11
-rw-r--r--dev-ml/mtime/mtime-1.1.0.ebuild34
-rw-r--r--dev-ml/oasis-0.4.1013
-rw-r--r--dev-ml/oasis-0.4.813
-rw-r--r--dev-ml/oasis/Manifest5
-rw-r--r--dev-ml/oasis/metadata.xml8
-rw-r--r--dev-ml/oasis/oasis-0.4.10.ebuild40
-rw-r--r--dev-ml/oasis/oasis-0.4.8.ebuild38
-rw-r--r--dev-ml/ocaml-augeas-0.512
-rw-r--r--dev-ml/ocaml-augeas/Manifest3
-rw-r--r--dev-ml/ocaml-augeas/metadata.xml10
-rw-r--r--dev-ml/ocaml-augeas/ocaml-augeas-0.5.ebuild26
-rw-r--r--dev-ml/ocaml-autoconf-1.19
-rw-r--r--dev-ml/ocaml-autoconf/Manifest3
-rw-r--r--dev-ml/ocaml-autoconf/metadata.xml8
-rw-r--r--dev-ml/ocaml-autoconf/ocaml-autoconf-1.1.ebuild21
-rw-r--r--dev-ml/ocaml-base64-2.2.013
-rw-r--r--dev-ml/ocaml-base64/Manifest3
-rw-r--r--dev-ml/ocaml-base64/metadata.xml11
-rw-r--r--dev-ml/ocaml-base64/ocaml-base64-2.2.0.ebuild25
-rw-r--r--dev-ml/ocaml-bigstring-0.1.114
-rw-r--r--dev-ml/ocaml-bigstring/Manifest3
-rw-r--r--dev-ml/ocaml-bigstring/metadata.xml11
-rw-r--r--dev-ml/ocaml-bigstring/ocaml-bigstring-0.1.1.ebuild31
-rw-r--r--dev-ml/ocaml-cairo-0.513
-rw-r--r--dev-ml/ocaml-cairo/Manifest3
-rw-r--r--dev-ml/ocaml-cairo/metadata.xml11
-rw-r--r--dev-ml/ocaml-cairo/ocaml-cairo-0.5.ebuild28
-rw-r--r--dev-ml/ocaml-cohttp-0.22.013
-rw-r--r--dev-ml/ocaml-cohttp/Manifest3
-rw-r--r--dev-ml/ocaml-cohttp/metadata.xml15
-rw-r--r--dev-ml/ocaml-cohttp/ocaml-cohttp-0.22.0.ebuild62
-rw-r--r--dev-ml/ocaml-compiler-libs-0.9.012
-rw-r--r--dev-ml/ocaml-compiler-libs/Manifest3
-rw-r--r--dev-ml/ocaml-compiler-libs/metadata.xml11
-rw-r--r--dev-ml/ocaml-compiler-libs/ocaml-compiler-libs-0.9.0.ebuild19
-rw-r--r--dev-ml/ocaml-conduit-0.15.412
-rw-r--r--dev-ml/ocaml-conduit/Manifest3
-rw-r--r--dev-ml/ocaml-conduit/metadata.xml11
-rw-r--r--dev-ml/ocaml-conduit/ocaml-conduit-0.15.4.ebuild46
-rw-r--r--dev-ml/ocaml-containers-1.313
-rw-r--r--dev-ml/ocaml-containers-1.413
-rw-r--r--dev-ml/ocaml-containers/Manifest5
-rw-r--r--dev-ml/ocaml-containers/metadata.xml11
-rw-r--r--dev-ml/ocaml-containers/ocaml-containers-1.3.ebuild32
-rw-r--r--dev-ml/ocaml-containers/ocaml-containers-1.4.ebuild32
-rw-r--r--dev-ml/ocaml-cstruct-3.1.113
-rw-r--r--dev-ml/ocaml-cstruct/Manifest3
-rw-r--r--dev-ml/ocaml-cstruct/metadata.xml16
-rw-r--r--dev-ml/ocaml-cstruct/ocaml-cstruct-3.1.1.ebuild64
-rw-r--r--dev-ml/ocaml-ctypes-0.11.213
-rw-r--r--dev-ml/ocaml-ctypes-0.11.313
-rw-r--r--dev-ml/ocaml-ctypes-0.12.113
-rw-r--r--dev-ml/ocaml-ctypes-0.13.013
-rw-r--r--dev-ml/ocaml-ctypes/Manifest9
-rw-r--r--dev-ml/ocaml-ctypes/metadata.xml11
-rw-r--r--dev-ml/ocaml-ctypes/ocaml-ctypes-0.11.2.ebuild35
-rw-r--r--dev-ml/ocaml-ctypes/ocaml-ctypes-0.11.3.ebuild35
-rw-r--r--dev-ml/ocaml-ctypes/ocaml-ctypes-0.12.1.ebuild36
-rw-r--r--dev-ml/ocaml-ctypes/ocaml-ctypes-0.13.0.ebuild36
-rw-r--r--dev-ml/ocaml-data-notation-0.0.11-r113
-rw-r--r--dev-ml/ocaml-data-notation/Manifest3
-rw-r--r--dev-ml/ocaml-data-notation/metadata.xml8
-rw-r--r--dev-ml/ocaml-data-notation/ocaml-data-notation-0.0.11-r1.ebuild25
-rw-r--r--dev-ml/ocaml-dispatch-0.3.013
-rw-r--r--dev-ml/ocaml-dispatch-0.4.013
-rw-r--r--dev-ml/ocaml-dispatch/Manifest5
-rw-r--r--dev-ml/ocaml-dispatch/metadata.xml11
-rw-r--r--dev-ml/ocaml-dispatch/ocaml-dispatch-0.3.0.ebuild34
-rw-r--r--dev-ml/ocaml-dispatch/ocaml-dispatch-0.4.0.ebuild43
-rw-r--r--dev-ml/ocaml-doc-4.049
-rw-r--r--dev-ml/ocaml-doc-4.059
-rw-r--r--dev-ml/ocaml-doc/Manifest5
-rw-r--r--dev-ml/ocaml-doc/metadata.xml8
-rw-r--r--dev-ml/ocaml-doc/ocaml-doc-4.04.ebuild24
-rw-r--r--dev-ml/ocaml-doc/ocaml-doc-4.05.ebuild24
-rw-r--r--dev-ml/ocaml-expat-1.0.013
-rw-r--r--dev-ml/ocaml-expat-1.1.013
-rw-r--r--dev-ml/ocaml-expat/Manifest5
-rw-r--r--dev-ml/ocaml-expat/metadata.xml11
-rw-r--r--dev-ml/ocaml-expat/ocaml-expat-1.0.0.ebuild46
-rw-r--r--dev-ml/ocaml-expat/ocaml-expat-1.1.0.ebuild46
-rw-r--r--dev-ml/ocaml-expect-0.0.513
-rw-r--r--dev-ml/ocaml-expect/Manifest3
-rw-r--r--dev-ml/ocaml-expect/metadata.xml8
-rw-r--r--dev-ml/ocaml-expect/ocaml-expect-0.0.5.ebuild26
-rw-r--r--dev-ml/ocaml-extunix-0.1.413
-rw-r--r--dev-ml/ocaml-extunix-0.1.513
-rw-r--r--dev-ml/ocaml-extunix/Manifest5
-rw-r--r--dev-ml/ocaml-extunix/metadata.xml11
-rw-r--r--dev-ml/ocaml-extunix/ocaml-extunix-0.1.4.ebuild23
-rw-r--r--dev-ml/ocaml-extunix/ocaml-extunix-0.1.5.ebuild23
-rw-r--r--dev-ml/ocaml-fileutils-0.5.113
-rw-r--r--dev-ml/ocaml-fileutils-0.5.213
-rw-r--r--dev-ml/ocaml-fileutils/Manifest5
-rw-r--r--dev-ml/ocaml-fileutils/metadata.xml8
-rw-r--r--dev-ml/ocaml-fileutils/ocaml-fileutils-0.5.1.ebuild24
-rw-r--r--dev-ml/ocaml-fileutils/ocaml-fileutils-0.5.2.ebuild24
-rw-r--r--dev-ml/ocaml-gettext-0.3.5-r113
-rw-r--r--dev-ml/ocaml-gettext-0.3.713
-rw-r--r--dev-ml/ocaml-gettext/Manifest6
-rw-r--r--dev-ml/ocaml-gettext/files/oc43.patch12
-rw-r--r--dev-ml/ocaml-gettext/metadata.xml11
-rw-r--r--dev-ml/ocaml-gettext/ocaml-gettext-0.3.5-r1.ebuild51
-rw-r--r--dev-ml/ocaml-gettext/ocaml-gettext-0.3.7.ebuild51
-rw-r--r--dev-ml/ocaml-hashcons-1.213
-rw-r--r--dev-ml/ocaml-hashcons-1.313
-rw-r--r--dev-ml/ocaml-hashcons/Manifest5
-rw-r--r--dev-ml/ocaml-hashcons/metadata.xml11
-rw-r--r--dev-ml/ocaml-hashcons/ocaml-hashcons-1.2.ebuild37
-rw-r--r--dev-ml/ocaml-hashcons/ocaml-hashcons-1.3.ebuild37
-rw-r--r--dev-ml/ocaml-ipaddr-2.8.013
-rw-r--r--dev-ml/ocaml-ipaddr/Manifest3
-rw-r--r--dev-ml/ocaml-ipaddr/metadata.xml11
-rw-r--r--dev-ml/ocaml-ipaddr/ocaml-ipaddr-2.8.0.ebuild31
-rw-r--r--dev-ml/ocaml-magic-mime-1.0.013
-rw-r--r--dev-ml/ocaml-magic-mime-1.1.011
-rw-r--r--dev-ml/ocaml-magic-mime/Manifest5
-rw-r--r--dev-ml/ocaml-magic-mime/metadata.xml11
-rw-r--r--dev-ml/ocaml-magic-mime/ocaml-magic-mime-1.0.0.ebuild17
-rw-r--r--dev-ml/ocaml-magic-mime/ocaml-magic-mime-1.1.0.ebuild26
-rw-r--r--dev-ml/ocaml-make-6.37.011
-rw-r--r--dev-ml/ocaml-make-6.39.011
-rw-r--r--dev-ml/ocaml-make/Manifest5
-rw-r--r--dev-ml/ocaml-make/metadata.xml11
-rw-r--r--dev-ml/ocaml-make/ocaml-make-6.37.0.ebuild31
-rw-r--r--dev-ml/ocaml-make/ocaml-make-6.39.0.ebuild31
-rw-r--r--dev-ml/ocaml-migrate-parsetree-1.0.512
-rw-r--r--dev-ml/ocaml-migrate-parsetree-1.0.612
-rw-r--r--dev-ml/ocaml-migrate-parsetree-1.0.712
-rw-r--r--dev-ml/ocaml-migrate-parsetree/Manifest7
-rw-r--r--dev-ml/ocaml-migrate-parsetree/metadata.xml11
-rw-r--r--dev-ml/ocaml-migrate-parsetree/ocaml-migrate-parsetree-1.0.5.ebuild20
-rw-r--r--dev-ml/ocaml-migrate-parsetree/ocaml-migrate-parsetree-1.0.6.ebuild20
-rw-r--r--dev-ml/ocaml-migrate-parsetree/ocaml-migrate-parsetree-1.0.7.ebuild20
-rw-r--r--dev-ml/ocaml-mysql-1.2.113
-rw-r--r--dev-ml/ocaml-mysql-1.2.213
-rw-r--r--dev-ml/ocaml-mysql/Manifest5
-rw-r--r--dev-ml/ocaml-mysql/metadata.xml8
-rw-r--r--dev-ml/ocaml-mysql/ocaml-mysql-1.2.1.ebuild38
-rw-r--r--dev-ml/ocaml-mysql/ocaml-mysql-1.2.2.ebuild38
-rw-r--r--dev-ml/ocaml-pcap-0.4.013
-rw-r--r--dev-ml/ocaml-pcap/Manifest3
-rw-r--r--dev-ml/ocaml-pcap/metadata.xml11
-rw-r--r--dev-ml/ocaml-pcap/ocaml-pcap-0.4.0.ebuild33
-rw-r--r--dev-ml/ocaml-re-1.7.113
-rw-r--r--dev-ml/ocaml-re/Manifest3
-rw-r--r--dev-ml/ocaml-re/metadata.xml11
-rw-r--r--dev-ml/ocaml-re/ocaml-re-1.7.1.ebuild23
-rw-r--r--dev-ml/ocaml-redis-0.3.513
-rw-r--r--dev-ml/ocaml-redis-lwt-0.3.513
-rw-r--r--dev-ml/ocaml-redis-lwt/Manifest3
-rw-r--r--dev-ml/ocaml-redis-lwt/metadata.xml11
-rw-r--r--dev-ml/ocaml-redis-lwt/ocaml-redis-lwt-0.3.5.ebuild43
-rw-r--r--dev-ml/ocaml-redis-sync-0.3.513
-rw-r--r--dev-ml/ocaml-redis-sync/Manifest3
-rw-r--r--dev-ml/ocaml-redis-sync/metadata.xml11
-rw-r--r--dev-ml/ocaml-redis-sync/ocaml-redis-sync-0.3.5.ebuild42
-rw-r--r--dev-ml/ocaml-redis/Manifest3
-rw-r--r--dev-ml/ocaml-redis/metadata.xml11
-rw-r--r--dev-ml/ocaml-redis/ocaml-redis-0.3.5.ebuild43
-rw-r--r--dev-ml/ocaml-safepass-2.013
-rw-r--r--dev-ml/ocaml-safepass/Manifest3
-rw-r--r--dev-ml/ocaml-safepass/metadata.xml11
-rw-r--r--dev-ml/ocaml-safepass/ocaml-safepass-2.0.ebuild22
-rw-r--r--dev-ml/ocaml-sha-1.912
-rw-r--r--dev-ml/ocaml-sha/Manifest3
-rw-r--r--dev-ml/ocaml-sha/metadata.xml11
-rw-r--r--dev-ml/ocaml-sha/ocaml-sha-1.9.ebuild28
-rw-r--r--dev-ml/ocaml-snappy-0.1.013
-rw-r--r--dev-ml/ocaml-snappy/Manifest3
-rw-r--r--dev-ml/ocaml-snappy/metadata.xml11
-rw-r--r--dev-ml/ocaml-snappy/ocaml-snappy-0.1.0.ebuild20
-rw-r--r--dev-ml/ocaml-sqlite3-4.1.213
-rw-r--r--dev-ml/ocaml-sqlite3-4.1.313
-rw-r--r--dev-ml/ocaml-sqlite3-4.2.012
-rw-r--r--dev-ml/ocaml-sqlite3-4.3.012
-rw-r--r--dev-ml/ocaml-sqlite3/Manifest9
-rw-r--r--dev-ml/ocaml-sqlite3/metadata.xml12
-rw-r--r--dev-ml/ocaml-sqlite3/ocaml-sqlite3-4.1.2.ebuild28
-rw-r--r--dev-ml/ocaml-sqlite3/ocaml-sqlite3-4.1.3.ebuild28
-rw-r--r--dev-ml/ocaml-sqlite3/ocaml-sqlite3-4.2.0.ebuild36
-rw-r--r--dev-ml/ocaml-sqlite3/ocaml-sqlite3-4.3.0.ebuild36
-rw-r--r--dev-ml/ocaml-ssl-0.5.313
-rw-r--r--dev-ml/ocaml-ssl-0.5.413
-rw-r--r--dev-ml/ocaml-ssl-0.5.513
-rw-r--r--dev-ml/ocaml-ssl/Manifest7
-rw-r--r--dev-ml/ocaml-ssl/metadata.xml12
-rw-r--r--dev-ml/ocaml-ssl/ocaml-ssl-0.5.3.ebuild34
-rw-r--r--dev-ml/ocaml-ssl/ocaml-ssl-0.5.4.ebuild34
-rw-r--r--dev-ml/ocaml-ssl/ocaml-ssl-0.5.5.ebuild34
-rw-r--r--dev-ml/ocaml-stdint-0.4.213
-rw-r--r--dev-ml/ocaml-stdint-0.5.013
-rw-r--r--dev-ml/ocaml-stdint/Manifest5
-rw-r--r--dev-ml/ocaml-stdint/metadata.xml11
-rw-r--r--dev-ml/ocaml-stdint/ocaml-stdint-0.4.2.ebuild20
-rw-r--r--dev-ml/ocaml-stdint/ocaml-stdint-0.5.0.ebuild20
-rw-r--r--dev-ml/ocaml-text-0.813
-rw-r--r--dev-ml/ocaml-text/Manifest3
-rw-r--r--dev-ml/ocaml-text/metadata.xml11
-rw-r--r--dev-ml/ocaml-text/ocaml-text-0.8.ebuild36
-rw-r--r--dev-ml/ocaml-uint-1.2.013
-rw-r--r--dev-ml/ocaml-uint/Manifest3
-rw-r--r--dev-ml/ocaml-uint/metadata.xml8
-rw-r--r--dev-ml/ocaml-uint/ocaml-uint-1.2.0.ebuild20
-rw-r--r--dev-ml/ocaml-uri-1.9.413
-rw-r--r--dev-ml/ocaml-uri/Manifest3
-rw-r--r--dev-ml/ocaml-uri/metadata.xml11
-rw-r--r--dev-ml/ocaml-uri/ocaml-uri-1.9.4.ebuild33
-rw-r--r--dev-ml/ocaml-webmachine-0.4.013
-rw-r--r--dev-ml/ocaml-webmachine/Manifest3
-rw-r--r--dev-ml/ocaml-webmachine/metadata.xml11
-rw-r--r--dev-ml/ocaml-webmachine/ocaml-webmachine-0.4.0.ebuild32
-rw-r--r--dev-ml/ocaml-websocket-2.913
-rw-r--r--dev-ml/ocaml-websocket/Manifest3
-rw-r--r--dev-ml/ocaml-websocket/metadata.xml15
-rw-r--r--dev-ml/ocaml-websocket/ocaml-websocket-2.9.ebuild51
-rw-r--r--dev-ml/ocamlbuild-0.10.112
-rw-r--r--dev-ml/ocamlbuild-0.11.012
-rw-r--r--dev-ml/ocamlbuild/Manifest5
-rw-r--r--dev-ml/ocamlbuild/metadata.xml11
-rw-r--r--dev-ml/ocamlbuild/ocamlbuild-0.10.1.ebuild33
-rw-r--r--dev-ml/ocamlbuild/ocamlbuild-0.11.0.ebuild35
-rw-r--r--dev-ml/ocamldap-2.213
-rw-r--r--dev-ml/ocamldap/Manifest4
-rw-r--r--dev-ml/ocamldap/files/ocaml-4.02.patch13
-rw-r--r--dev-ml/ocamldap/metadata.xml27
-rw-r--r--dev-ml/ocamldap/ocamldap-2.2.ebuild28
-rw-r--r--dev-ml/ocamldsort-0.16.0-r111
-rw-r--r--dev-ml/ocamldsort/Manifest3
-rw-r--r--dev-ml/ocamldsort/metadata.xml8
-rw-r--r--dev-ml/ocamldsort/ocamldsort-0.16.0-r1.ebuild26
-rw-r--r--dev-ml/ocamlgraph-1.8.713
-rw-r--r--dev-ml/ocamlgraph-1.8.813
-rw-r--r--dev-ml/ocamlgraph/Manifest7
-rw-r--r--dev-ml/ocamlgraph/files/ocamlgraph-1.8.6-installfindlib.patch38
-rw-r--r--dev-ml/ocamlgraph/files/ocamlgraph-1.8.7-test.patch19
-rw-r--r--dev-ml/ocamlgraph/metadata.xml11
-rw-r--r--dev-ml/ocamlgraph/ocamlgraph-1.8.7.ebuild62
-rw-r--r--dev-ml/ocamlgraph/ocamlgraph-1.8.8.ebuild57
-rw-r--r--dev-ml/ocamlify-0.0.213
-rw-r--r--dev-ml/ocamlify/Manifest3
-rw-r--r--dev-ml/ocamlify/metadata.xml8
-rw-r--r--dev-ml/ocamlify/ocamlify-0.0.2.ebuild20
-rw-r--r--dev-ml/ocamlmod-0.0.813
-rw-r--r--dev-ml/ocamlmod-0.0.913
-rw-r--r--dev-ml/ocamlmod/Manifest5
-rw-r--r--dev-ml/ocamlmod/metadata.xml8
-rw-r--r--dev-ml/ocamlmod/ocamlmod-0.0.8.ebuild23
-rw-r--r--dev-ml/ocamlmod/ocamlmod-0.0.9.ebuild23
-rw-r--r--dev-ml/ocamlnet-4.1.214
-rw-r--r--dev-ml/ocamlnet-4.1.314
-rw-r--r--dev-ml/ocamlnet-4.1.414
-rw-r--r--dev-ml/ocamlnet/Manifest8
-rw-r--r--dev-ml/ocamlnet/files/ocaml405.patch145
-rw-r--r--dev-ml/ocamlnet/metadata.xml12
-rw-r--r--dev-ml/ocamlnet/ocamlnet-4.1.2.ebuild81
-rw-r--r--dev-ml/ocamlnet/ocamlnet-4.1.3.ebuild77
-rw-r--r--dev-ml/ocamlnet/ocamlnet-4.1.4.ebuild77
-rw-r--r--dev-ml/ocamlpam-1.113
-rw-r--r--dev-ml/ocamlpam/Manifest5
-rw-r--r--dev-ml/ocamlpam/files/ocaml404.patch12
-rw-r--r--dev-ml/ocamlpam/files/ocamlpam-1.1-makefile.patch17
-rw-r--r--dev-ml/ocamlpam/metadata.xml8
-rw-r--r--dev-ml/ocamlpam/ocamlpam-1.1.ebuild37
-rw-r--r--dev-ml/ocamlsdl-0.9.113
-rw-r--r--dev-ml/ocamlsdl/Manifest4
-rw-r--r--dev-ml/ocamlsdl/files/ocamlopt.patch22
-rw-r--r--dev-ml/ocamlsdl/metadata.xml11
-rw-r--r--dev-ml/ocamlsdl/ocamlsdl-0.9.1.ebuild63
-rw-r--r--dev-ml/ocamlweb-1.3912
-rw-r--r--dev-ml/ocamlweb/Manifest4
-rw-r--r--dev-ml/ocamlweb/files/ocamlweb-1.37-strip.patch19
-rw-r--r--dev-ml/ocamlweb/metadata.xml8
-rw-r--r--dev-ml/ocamlweb/ocamlweb-1.39.ebuild34
-rw-r--r--dev-ml/ocplib-endian-1.013
-rw-r--r--dev-ml/ocplib-endian/Manifest3
-rw-r--r--dev-ml/ocplib-endian/metadata.xml11
-rw-r--r--dev-ml/ocplib-endian/ocplib-endian-1.0.ebuild24
-rw-r--r--dev-ml/ocplib-simplex-0.311
-rw-r--r--dev-ml/ocplib-simplex/Manifest3
-rw-r--r--dev-ml/ocplib-simplex/metadata.xml12
-rw-r--r--dev-ml/ocplib-simplex/ocplib-simplex-0.3.ebuild33
-rw-r--r--dev-ml/ocsigen-i18n-3.1.011
-rw-r--r--dev-ml/ocsigen-i18n/Manifest3
-rw-r--r--dev-ml/ocsigen-i18n/metadata.xml11
-rw-r--r--dev-ml/ocsigen-i18n/ocsigen-i18n-3.1.0.ebuild23
-rw-r--r--dev-ml/ocsigen-start-1.0.012
-rw-r--r--dev-ml/ocsigen-start-999910
-rw-r--r--dev-ml/ocsigen-start/Manifest4
-rw-r--r--dev-ml/ocsigen-start/metadata.xml11
-rw-r--r--dev-ml/ocsigen-start/ocsigen-start-1.0.0.ebuild41
-rw-r--r--dev-ml/ocsigen-start/ocsigen-start-9999.ebuild41
-rw-r--r--dev-ml/ocsigen-toolkit-1.0.013
-rw-r--r--dev-ml/ocsigen-toolkit-999911
-rw-r--r--dev-ml/ocsigen-toolkit/Manifest4
-rw-r--r--dev-ml/ocsigen-toolkit/metadata.xml11
-rw-r--r--dev-ml/ocsigen-toolkit/ocsigen-toolkit-1.0.0.ebuild46
-rw-r--r--dev-ml/ocsigen-toolkit/ocsigen-toolkit-9999.ebuild46
-rw-r--r--dev-ml/octavius-1.1.012
-rw-r--r--dev-ml/octavius/Manifest3
-rw-r--r--dev-ml/octavius/metadata.xml11
-rw-r--r--dev-ml/octavius/octavius-1.1.0.ebuild20
-rw-r--r--dev-ml/ocurl-0.6.113
-rw-r--r--dev-ml/ocurl-0.7.1013
-rw-r--r--dev-ml/ocurl-0.7.913
-rw-r--r--dev-ml/ocurl/Manifest7
-rw-r--r--dev-ml/ocurl/metadata.xml11
-rw-r--r--dev-ml/ocurl/ocurl-0.6.1.ebuild35
-rw-r--r--dev-ml/ocurl/ocurl-0.7.10.ebuild37
-rw-r--r--dev-ml/ocurl/ocurl-0.7.9.ebuild37
-rw-r--r--dev-ml/odns-0.3-r112
-rw-r--r--dev-ml/odns/Manifest4
-rw-r--r--dev-ml/odns/files/odns-0.3-parmake.patch16
-rw-r--r--dev-ml/odns/metadata.xml8
-rw-r--r--dev-ml/odns/odns-0.3-r1.ebuild40
-rw-r--r--dev-ml/ojquery-0.113
-rw-r--r--dev-ml/ojquery-999911
-rw-r--r--dev-ml/ojquery/Manifest4
-rw-r--r--dev-ml/ojquery/metadata.xml11
-rw-r--r--dev-ml/ojquery/ojquery-0.1.ebuild32
-rw-r--r--dev-ml/ojquery/ojquery-9999.ebuild32
-rw-r--r--dev-ml/onanomsg-1.0-r213
-rw-r--r--dev-ml/onanomsg/Manifest6
-rw-r--r--dev-ml/onanomsg/files/bigstring.patch218
-rw-r--r--dev-ml/onanomsg/files/testrun.patch15
-rw-r--r--dev-ml/onanomsg/files/tests.patch12
-rw-r--r--dev-ml/onanomsg/metadata.xml14
-rw-r--r--dev-ml/onanomsg/onanomsg-1.0-r2.ebuild51
-rw-r--r--dev-ml/opam-1.3.1-r113
-rw-r--r--dev-ml/opam-file-format-2.0.0_beta313
-rw-r--r--dev-ml/opam-file-format/Manifest3
-rw-r--r--dev-ml/opam-file-format/metadata.xml11
-rw-r--r--dev-ml/opam-file-format/opam-file-format-2.0.0_beta3.ebuild29
-rw-r--r--dev-ml/opam/Manifest4
-rw-r--r--dev-ml/opam/files/stublibs.patch13
-rw-r--r--dev-ml/opam/metadata.xml11
-rw-r--r--dev-ml/opam/opam-1.3.1-r1.ebuild55
-rw-r--r--dev-ml/optcomp-1.6-r113
-rw-r--r--dev-ml/optcomp/Manifest3
-rw-r--r--dev-ml/optcomp/metadata.xml11
-rw-r--r--dev-ml/optcomp/optcomp-1.6-r1.ebuild22
-rw-r--r--dev-ml/ounit-2.0.013
-rw-r--r--dev-ml/ounit-2.0.513
-rw-r--r--dev-ml/ounit-2.0.613
-rw-r--r--dev-ml/ounit/Manifest7
-rw-r--r--dev-ml/ounit/metadata.xml8
-rw-r--r--dev-ml/ounit/ounit-2.0.0.ebuild20
-rw-r--r--dev-ml/ounit/ounit-2.0.5.ebuild20
-rw-r--r--dev-ml/ounit/ounit-2.0.6.ebuild20
-rw-r--r--dev-ml/pa_bench-112.06.0013
-rw-r--r--dev-ml/pa_bench/Manifest3
-rw-r--r--dev-ml/pa_bench/metadata.xml8
-rw-r--r--dev-ml/pa_bench/pa_bench-112.06.00.ebuild24
-rw-r--r--dev-ml/pa_ounit-113.00.0013
-rw-r--r--dev-ml/pa_ounit/Manifest3
-rw-r--r--dev-ml/pa_ounit/metadata.xml17
-rw-r--r--dev-ml/pa_ounit/pa_ounit-113.00.00.ebuild21
-rw-r--r--dev-ml/pa_sexp_conv-113.00.0113
-rw-r--r--dev-ml/pa_sexp_conv/Manifest3
-rw-r--r--dev-ml/pa_sexp_conv/metadata.xml11
-rw-r--r--dev-ml/pa_sexp_conv/pa_sexp_conv-113.00.01.ebuild23
-rw-r--r--dev-ml/pa_structural_sexp-113.00.0013
-rw-r--r--dev-ml/pa_structural_sexp/Manifest3
-rw-r--r--dev-ml/pa_structural_sexp/metadata.xml11
-rw-r--r--dev-ml/pa_structural_sexp/pa_structural_sexp-113.00.00.ebuild22
-rw-r--r--dev-ml/parmap-1.0_rc7-r113
-rw-r--r--dev-ml/parmap-1.0_rc813
-rw-r--r--dev-ml/parmap/Manifest5
-rw-r--r--dev-ml/parmap/metadata.xml11
-rw-r--r--dev-ml/parmap/parmap-1.0_rc7-r1.ebuild46
-rw-r--r--dev-ml/parmap/parmap-1.0_rc8.ebuild46
-rw-r--r--dev-ml/patience_diff-0.9.012
-rw-r--r--dev-ml/patience_diff/Manifest3
-rw-r--r--dev-ml/patience_diff/metadata.xml11
-rw-r--r--dev-ml/patience_diff/patience_diff-0.9.0.ebuild23
-rw-r--r--dev-ml/pcre-ocaml-7.2.313
-rw-r--r--dev-ml/pcre-ocaml-7.3.013
-rw-r--r--dev-ml/pcre-ocaml-7.3.213
-rw-r--r--dev-ml/pcre-ocaml-7.3.313
-rw-r--r--dev-ml/pcre-ocaml/Manifest9
-rw-r--r--dev-ml/pcre-ocaml/metadata.xml12
-rw-r--r--dev-ml/pcre-ocaml/pcre-ocaml-7.2.3.ebuild30
-rw-r--r--dev-ml/pcre-ocaml/pcre-ocaml-7.3.0.ebuild41
-rw-r--r--dev-ml/pcre-ocaml/pcre-ocaml-7.3.2.ebuild41
-rw-r--r--dev-ml/pcre-ocaml/pcre-ocaml-7.3.3.ebuild41
-rw-r--r--dev-ml/pgocaml-2.313
-rw-r--r--dev-ml/pgocaml/Manifest3
-rw-r--r--dev-ml/pgocaml/metadata.xml11
-rw-r--r--dev-ml/pgocaml/pgocaml-2.3.ebuild32
-rw-r--r--dev-ml/pipebang-113.00.0013
-rw-r--r--dev-ml/pipebang/Manifest3
-rw-r--r--dev-ml/pipebang/metadata.xml11
-rw-r--r--dev-ml/pipebang/pipebang-113.00.00.ebuild19
-rw-r--r--dev-ml/pomap-3.0.613
-rw-r--r--dev-ml/pomap-3.0.713
-rw-r--r--dev-ml/pomap-4.0.012
-rw-r--r--dev-ml/pomap/Manifest7
-rw-r--r--dev-ml/pomap/metadata.xml12
-rw-r--r--dev-ml/pomap/pomap-3.0.6.ebuild30
-rw-r--r--dev-ml/pomap/pomap-3.0.7.ebuild30
-rw-r--r--dev-ml/pomap/pomap-4.0.0.ebuild21
-rw-r--r--dev-ml/postgresql-ocaml-4.0.113
-rw-r--r--dev-ml/postgresql-ocaml-4.1.012
-rw-r--r--dev-ml/postgresql-ocaml-4.2.012
-rw-r--r--dev-ml/postgresql-ocaml/Manifest7
-rw-r--r--dev-ml/postgresql-ocaml/metadata.xml12
-rw-r--r--dev-ml/postgresql-ocaml/postgresql-ocaml-4.0.1.ebuild33
-rw-r--r--dev-ml/postgresql-ocaml/postgresql-ocaml-4.1.0.ebuild34
-rw-r--r--dev-ml/postgresql-ocaml/postgresql-ocaml-4.2.0.ebuild34
-rw-r--r--dev-ml/ppx_assert-0.9.012
-rw-r--r--dev-ml/ppx_assert/Manifest3
-rw-r--r--dev-ml/ppx_assert/metadata.xml11
-rw-r--r--dev-ml/ppx_assert/ppx_assert-0.9.0.ebuild31
-rw-r--r--dev-ml/ppx_ast-0.9.112
-rw-r--r--dev-ml/ppx_ast/Manifest3
-rw-r--r--dev-ml/ppx_ast/metadata.xml11
-rw-r--r--dev-ml/ppx_ast/ppx_ast-0.9.1.ebuild23
-rw-r--r--dev-ml/ppx_base-0.9.012
-rw-r--r--dev-ml/ppx_base/Manifest3
-rw-r--r--dev-ml/ppx_base/metadata.xml11
-rw-r--r--dev-ml/ppx_base/ppx_base-0.9.0.ebuild28
-rw-r--r--dev-ml/ppx_bench-0.9.112
-rw-r--r--dev-ml/ppx_bench/Manifest3
-rw-r--r--dev-ml/ppx_bench/metadata.xml11
-rw-r--r--dev-ml/ppx_bench/ppx_bench-0.9.1.ebuild26
-rw-r--r--dev-ml/ppx_bin_prot-0.9.012
-rw-r--r--dev-ml/ppx_bin_prot/Manifest3
-rw-r--r--dev-ml/ppx_bin_prot/metadata.xml11
-rw-r--r--dev-ml/ppx_bin_prot/ppx_bin_prot-0.9.0.ebuild28
-rw-r--r--dev-ml/ppx_compare-0.9.0-r112
-rw-r--r--dev-ml/ppx_compare/Manifest3
-rw-r--r--dev-ml/ppx_compare/metadata.xml11
-rw-r--r--dev-ml/ppx_compare/ppx_compare-0.9.0-r1.ebuild27
-rw-r--r--dev-ml/ppx_core-0.9.0-r112
-rw-r--r--dev-ml/ppx_core/Manifest3
-rw-r--r--dev-ml/ppx_core/metadata.xml11
-rw-r--r--dev-ml/ppx_core/ppx_core-0.9.0-r1.ebuild26
-rw-r--r--dev-ml/ppx_custom_printf-0.9.0-r112
-rw-r--r--dev-ml/ppx_custom_printf/Manifest3
-rw-r--r--dev-ml/ppx_custom_printf/metadata.xml11
-rw-r--r--dev-ml/ppx_custom_printf/ppx_custom_printf-0.9.0-r1.ebuild27
-rw-r--r--dev-ml/ppx_derivers-1.012
-rw-r--r--dev-ml/ppx_derivers/Manifest3
-rw-r--r--dev-ml/ppx_derivers/metadata.xml11
-rw-r--r--dev-ml/ppx_derivers/ppx_derivers-1.0.ebuild19
-rw-r--r--dev-ml/ppx_deriving-4.2-r113
-rw-r--r--dev-ml/ppx_deriving/Manifest3
-rw-r--r--dev-ml/ppx_deriving/metadata.xml11
-rw-r--r--dev-ml/ppx_deriving/ppx_deriving-4.2-r1.ebuild51
-rw-r--r--dev-ml/ppx_deriving_yojson-3.013
-rw-r--r--dev-ml/ppx_deriving_yojson/Manifest4
-rw-r--r--dev-ml/ppx_deriving_yojson/files/ocaml405.patch76
-rw-r--r--dev-ml/ppx_deriving_yojson/metadata.xml11
-rw-r--r--dev-ml/ppx_deriving_yojson/ppx_deriving_yojson-3.0.ebuild44
-rw-r--r--dev-ml/ppx_driver-0.9.1-r112
-rw-r--r--dev-ml/ppx_driver/Manifest3
-rw-r--r--dev-ml/ppx_driver/metadata.xml11
-rw-r--r--dev-ml/ppx_driver/ppx_driver-0.9.1-r1.ebuild24
-rw-r--r--dev-ml/ppx_enumerate-0.9.012
-rw-r--r--dev-ml/ppx_enumerate/Manifest3
-rw-r--r--dev-ml/ppx_enumerate/metadata.xml11
-rw-r--r--dev-ml/ppx_enumerate/ppx_enumerate-0.9.0.ebuild25
-rw-r--r--dev-ml/ppx_expect-0.9.012
-rw-r--r--dev-ml/ppx_expect/Manifest3
-rw-r--r--dev-ml/ppx_expect/metadata.xml11
-rw-r--r--dev-ml/ppx_expect/ppx_expect-0.9.0.ebuild36
-rw-r--r--dev-ml/ppx_fail-0.9.012
-rw-r--r--dev-ml/ppx_fail/Manifest3
-rw-r--r--dev-ml/ppx_fail/metadata.xml11
-rw-r--r--dev-ml/ppx_fail/ppx_fail-0.9.0.ebuild25
-rw-r--r--dev-ml/ppx_fields_conv-0.9.0-r112
-rw-r--r--dev-ml/ppx_fields_conv/Manifest3
-rw-r--r--dev-ml/ppx_fields_conv/metadata.xml11
-rw-r--r--dev-ml/ppx_fields_conv/ppx_fields_conv-0.9.0-r1.ebuild27
-rw-r--r--dev-ml/ppx_hash-0.9.012
-rw-r--r--dev-ml/ppx_hash/Manifest3
-rw-r--r--dev-ml/ppx_hash/metadata.xml11
-rw-r--r--dev-ml/ppx_hash/ppx_hash-0.9.0.ebuild28
-rw-r--r--dev-ml/ppx_here-0.9.112
-rw-r--r--dev-ml/ppx_here/Manifest3
-rw-r--r--dev-ml/ppx_here/metadata.xml11
-rw-r--r--dev-ml/ppx_here/ppx_here-0.9.1.ebuild24
-rw-r--r--dev-ml/ppx_import-1.213
-rw-r--r--dev-ml/ppx_import/Manifest3
-rw-r--r--dev-ml/ppx_import/metadata.xml11
-rw-r--r--dev-ml/ppx_import/ppx_import-1.2.ebuild39
-rw-r--r--dev-ml/ppx_inline_test-0.9.212
-rw-r--r--dev-ml/ppx_inline_test/Manifest3
-rw-r--r--dev-ml/ppx_inline_test/metadata.xml11
-rw-r--r--dev-ml/ppx_inline_test/ppx_inline_test-0.9.2.ebuild27
-rw-r--r--dev-ml/ppx_jane-0.9.012
-rw-r--r--dev-ml/ppx_jane/Manifest3
-rw-r--r--dev-ml/ppx_jane/metadata.xml11
-rw-r--r--dev-ml/ppx_jane/ppx_jane-0.9.0.ebuild40
-rw-r--r--dev-ml/ppx_js_style-0.9.012
-rw-r--r--dev-ml/ppx_js_style/Manifest3
-rw-r--r--dev-ml/ppx_js_style/metadata.xml11
-rw-r--r--dev-ml/ppx_js_style/ppx_js_style-0.9.0.ebuild25
-rw-r--r--dev-ml/ppx_let-0.9.012
-rw-r--r--dev-ml/ppx_let/Manifest3
-rw-r--r--dev-ml/ppx_let/metadata.xml11
-rw-r--r--dev-ml/ppx_let/ppx_let-0.9.0.ebuild23
-rw-r--r--dev-ml/ppx_metaquot-0.9.012
-rw-r--r--dev-ml/ppx_metaquot/Manifest3
-rw-r--r--dev-ml/ppx_metaquot/metadata.xml11
-rw-r--r--dev-ml/ppx_metaquot/ppx_metaquot-0.9.0.ebuild25
-rw-r--r--dev-ml/ppx_optcomp-0.9.0-r312
-rw-r--r--dev-ml/ppx_optcomp/Manifest3
-rw-r--r--dev-ml/ppx_optcomp/metadata.xml11
-rw-r--r--dev-ml/ppx_optcomp/ppx_optcomp-0.9.0-r3.ebuild23
-rw-r--r--dev-ml/ppx_optional-0.9.012
-rw-r--r--dev-ml/ppx_optional/Manifest3
-rw-r--r--dev-ml/ppx_optional/metadata.xml11
-rw-r--r--dev-ml/ppx_optional/ppx_optional-0.9.0.ebuild24
-rw-r--r--dev-ml/ppx_pipebang-0.9.012
-rw-r--r--dev-ml/ppx_pipebang/Manifest3
-rw-r--r--dev-ml/ppx_pipebang/metadata.xml11
-rw-r--r--dev-ml/ppx_pipebang/ppx_pipebang-0.9.0.ebuild24
-rw-r--r--dev-ml/ppx_sexp_conv-0.9.0-r112
-rw-r--r--dev-ml/ppx_sexp_conv/Manifest3
-rw-r--r--dev-ml/ppx_sexp_conv/metadata.xml11
-rw-r--r--dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.9.0-r1.ebuild28
-rw-r--r--dev-ml/ppx_sexp_message-0.9.012
-rw-r--r--dev-ml/ppx_sexp_message/Manifest3
-rw-r--r--dev-ml/ppx_sexp_message/metadata.xml11
-rw-r--r--dev-ml/ppx_sexp_message/ppx_sexp_message-0.9.0.ebuild27
-rw-r--r--dev-ml/ppx_sexp_value-0.9.012
-rw-r--r--dev-ml/ppx_sexp_value/Manifest3
-rw-r--r--dev-ml/ppx_sexp_value/metadata.xml11
-rw-r--r--dev-ml/ppx_sexp_value/ppx_sexp_value-0.9.0.ebuild27
-rw-r--r--dev-ml/ppx_tools-5.0.4.03.013
-rw-r--r--dev-ml/ppx_tools-5.0.4.05.013
-rw-r--r--dev-ml/ppx_tools/Manifest6
-rw-r--r--dev-ml/ppx_tools/files/ocaml404.patch47
-rw-r--r--dev-ml/ppx_tools/metadata.xml11
-rw-r--r--dev-ml/ppx_tools/ppx_tools-5.0.4.03.0.ebuild33
-rw-r--r--dev-ml/ppx_tools/ppx_tools-5.0.4.05.0.ebuild29
-rw-r--r--dev-ml/ppx_tools_versioned-5.0.112
-rw-r--r--dev-ml/ppx_tools_versioned/Manifest3
-rw-r--r--dev-ml/ppx_tools_versioned/metadata.xml11
-rw-r--r--dev-ml/ppx_tools_versioned/ppx_tools_versioned-5.0.1.ebuild30
-rw-r--r--dev-ml/ppx_traverse-0.9.012
-rw-r--r--dev-ml/ppx_traverse/Manifest3
-rw-r--r--dev-ml/ppx_traverse/metadata.xml11
-rw-r--r--dev-ml/ppx_traverse/ppx_traverse-0.9.0.ebuild25
-rw-r--r--dev-ml/ppx_traverse_builtins-0.9.012
-rw-r--r--dev-ml/ppx_traverse_builtins/Manifest3
-rw-r--r--dev-ml/ppx_traverse_builtins/metadata.xml11
-rw-r--r--dev-ml/ppx_traverse_builtins/ppx_traverse_builtins-0.9.0.ebuild20
-rw-r--r--dev-ml/ppx_type_conv-0.9.012
-rw-r--r--dev-ml/ppx_type_conv/Manifest3
-rw-r--r--dev-ml/ppx_type_conv/metadata.xml11
-rw-r--r--dev-ml/ppx_type_conv/ppx_type_conv-0.9.0.ebuild26
-rw-r--r--dev-ml/ppx_typerep_conv-0.9.012
-rw-r--r--dev-ml/ppx_typerep_conv/Manifest3
-rw-r--r--dev-ml/ppx_typerep_conv/metadata.xml11
-rw-r--r--dev-ml/ppx_typerep_conv/ppx_typerep_conv-0.9.0.ebuild26
-rw-r--r--dev-ml/ppx_variants_conv-0.9.012
-rw-r--r--dev-ml/ppx_variants_conv/Manifest3
-rw-r--r--dev-ml/ppx_variants_conv/metadata.xml11
-rw-r--r--dev-ml/ppx_variants_conv/ppx_variants_conv-0.9.0.ebuild26
-rw-r--r--dev-ml/pxp-1.2.8-r113
-rw-r--r--dev-ml/pxp-1.2.913
-rw-r--r--dev-ml/pxp/Manifest6
-rw-r--r--dev-ml/pxp/files/oc43.patch13
-rw-r--r--dev-ml/pxp/metadata.xml8
-rw-r--r--dev-ml/pxp/pxp-1.2.8-r1.ebuild54
-rw-r--r--dev-ml/pxp/pxp-1.2.9.ebuild50
-rw-r--r--dev-ml/qcheck-0.613
-rw-r--r--dev-ml/qcheck-0.713
-rw-r--r--dev-ml/qcheck/Manifest5
-rw-r--r--dev-ml/qcheck/metadata.xml11
-rw-r--r--dev-ml/qcheck/qcheck-0.6.ebuild23
-rw-r--r--dev-ml/qcheck/qcheck-0.7.ebuild23
-rw-r--r--dev-ml/re2-0.9.012
-rw-r--r--dev-ml/re2-0.9.112
-rw-r--r--dev-ml/re2/Manifest5
-rw-r--r--dev-ml/re2/metadata.xml11
-rw-r--r--dev-ml/re2/re2-0.9.0.ebuild24
-rw-r--r--dev-ml/re2/re2-0.9.1.ebuild24
-rw-r--r--dev-ml/react-1.2.113
-rw-r--r--dev-ml/react/Manifest3
-rw-r--r--dev-ml/react/metadata.xml23
-rw-r--r--dev-ml/react/react-1.2.1.ebuild31
-rw-r--r--dev-ml/reactiveData-0.2.113
-rw-r--r--dev-ml/reactiveData-999911
-rw-r--r--dev-ml/reactiveData/Manifest4
-rw-r--r--dev-ml/reactiveData/metadata.xml11
-rw-r--r--dev-ml/reactiveData/reactiveData-0.2.1.ebuild36
-rw-r--r--dev-ml/reactiveData/reactiveData-9999.ebuild36
-rw-r--r--dev-ml/reason-2.0.013
-rw-r--r--dev-ml/reason-parser-2.0.013
-rw-r--r--dev-ml/reason-parser/Manifest3
-rw-r--r--dev-ml/reason-parser/metadata.xml11
-rw-r--r--dev-ml/reason-parser/reason-parser-2.0.0.ebuild39
-rw-r--r--dev-ml/reason/Manifest3
-rw-r--r--dev-ml/reason/metadata.xml11
-rw-r--r--dev-ml/reason/reason-2.0.0.ebuild34
-rw-r--r--dev-ml/res-4.0.713
-rw-r--r--dev-ml/res-5.0.012
-rw-r--r--dev-ml/res/Manifest5
-rw-r--r--dev-ml/res/metadata.xml12
-rw-r--r--dev-ml/res/res-4.0.7.ebuild30
-rw-r--r--dev-ml/res/res-5.0.0.ebuild23
-rw-r--r--dev-ml/result-1.213
-rw-r--r--dev-ml/result/Manifest3
-rw-r--r--dev-ml/result/metadata.xml11
-rw-r--r--dev-ml/result/result-1.2.ebuild28
-rw-r--r--dev-ml/rresult-0.5.012
-rw-r--r--dev-ml/rresult/Manifest3
-rw-r--r--dev-ml/rresult/metadata.xml11
-rw-r--r--dev-ml/rresult/rresult-0.5.0.ebuild24
-rw-r--r--dev-ml/sedlex-1.99.313
-rw-r--r--dev-ml/sedlex-1.99.413
-rw-r--r--dev-ml/sedlex/Manifest5
-rw-r--r--dev-ml/sedlex/metadata.xml11
-rw-r--r--dev-ml/sedlex/sedlex-1.99.3.ebuild37
-rw-r--r--dev-ml/sedlex/sedlex-1.99.4.ebuild42
-rw-r--r--dev-ml/sequence-0.1013
-rw-r--r--dev-ml/sequence/Manifest3
-rw-r--r--dev-ml/sequence/metadata.xml11
-rw-r--r--dev-ml/sequence/sequence-0.10.ebuild23
-rw-r--r--dev-ml/sexplib-0.9.212
-rw-r--r--dev-ml/sexplib-0.9.312
-rw-r--r--dev-ml/sexplib/Manifest5
-rw-r--r--dev-ml/sexplib/metadata.xml12
-rw-r--r--dev-ml/sexplib/sexplib-0.9.2.ebuild22
-rw-r--r--dev-ml/sexplib/sexplib-0.9.3.ebuild22
-rw-r--r--dev-ml/spawn-0.9.012
-rw-r--r--dev-ml/spawn/Manifest3
-rw-r--r--dev-ml/spawn/metadata.xml11
-rw-r--r--dev-ml/spawn/spawn-0.9.0.ebuild19
-rw-r--r--dev-ml/stdio-0.9.0-r112
-rw-r--r--dev-ml/stdio-0.9.112
-rw-r--r--dev-ml/stdio/Manifest5
-rw-r--r--dev-ml/stdio/metadata.xml11
-rw-r--r--dev-ml/stdio/stdio-0.9.0-r1.ebuild22
-rw-r--r--dev-ml/stdio/stdio-0.9.1.ebuild22
-rw-r--r--dev-ml/stringext-1.4.313
-rw-r--r--dev-ml/stringext-1.5.013
-rw-r--r--dev-ml/stringext/Manifest5
-rw-r--r--dev-ml/stringext/metadata.xml11
-rw-r--r--dev-ml/stringext/stringext-1.4.3.ebuild26
-rw-r--r--dev-ml/stringext/stringext-1.5.0.ebuild22
-rw-r--r--dev-ml/textutils-0.9.012
-rw-r--r--dev-ml/textutils/Manifest3
-rw-r--r--dev-ml/textutils/metadata.xml11
-rw-r--r--dev-ml/textutils/textutils-0.9.0.ebuild23
-rw-r--r--dev-ml/topkg-0.9.012
-rw-r--r--dev-ml/topkg-0.9.112
-rw-r--r--dev-ml/topkg/Manifest5
-rw-r--r--dev-ml/topkg/metadata.xml11
-rw-r--r--dev-ml/topkg/topkg-0.9.0.ebuild33
-rw-r--r--dev-ml/topkg/topkg-0.9.1.ebuild33
-rw-r--r--dev-ml/type-conv-113.00.0213
-rw-r--r--dev-ml/type-conv/Manifest3
-rw-r--r--dev-ml/type-conv/metadata.xml8
-rw-r--r--dev-ml/type-conv/type-conv-113.00.02.ebuild27
-rw-r--r--dev-ml/typerep-0.9.012
-rw-r--r--dev-ml/typerep/Manifest3
-rw-r--r--dev-ml/typerep/metadata.xml11
-rw-r--r--dev-ml/typerep/typerep-0.9.0.ebuild19
-rw-r--r--dev-ml/typerep_extended-0.9.012
-rw-r--r--dev-ml/typerep_extended/Manifest3
-rw-r--r--dev-ml/typerep_extended/metadata.xml11
-rw-r--r--dev-ml/typerep_extended/typerep_extended-0.9.0.ebuild31
-rw-r--r--dev-ml/tyxml-4.1.013
-rw-r--r--dev-ml/tyxml/Manifest3
-rw-r--r--dev-ml/tyxml/metadata.xml15
-rw-r--r--dev-ml/tyxml/tyxml-4.1.0.ebuild36
-rw-r--r--dev-ml/uchar-0.0.214
-rw-r--r--dev-ml/uchar/Manifest3
-rw-r--r--dev-ml/uchar/metadata.xml11
-rw-r--r--dev-ml/uchar/uchar-0.0.2.ebuild41
-rw-r--r--dev-ml/ulex-1.113
-rw-r--r--dev-ml/ulex/Manifest3
-rw-r--r--dev-ml/ulex/metadata.xml8
-rw-r--r--dev-ml/ulex/ulex-1.1.ebuild32
-rw-r--r--dev-ml/utop-2.0.112
-rw-r--r--dev-ml/utop/Manifest3
-rw-r--r--dev-ml/utop/metadata.xml11
-rw-r--r--dev-ml/utop/utop-2.0.1.ebuild27
-rw-r--r--dev-ml/uuidm-0.9.612
-rw-r--r--dev-ml/uuidm/Manifest3
-rw-r--r--dev-ml/uuidm/metadata.xml8
-rw-r--r--dev-ml/uuidm/uuidm-0.9.6.ebuild22
-rw-r--r--dev-ml/uutf-1.0.113
-rw-r--r--dev-ml/uutf/Manifest3
-rw-r--r--dev-ml/uutf/metadata.xml11
-rw-r--r--dev-ml/uutf/uutf-1.0.1.ebuild55
-rw-r--r--dev-ml/variantslib-0.9.012
-rw-r--r--dev-ml/variantslib/Manifest3
-rw-r--r--dev-ml/variantslib/metadata.xml12
-rw-r--r--dev-ml/variantslib/variantslib-0.9.0.ebuild22
-rw-r--r--dev-ml/xml-light-2.2-r313
-rw-r--r--dev-ml/xml-light/Manifest7
-rw-r--r--dev-ml/xml-light/files/01_installopt.dpatch24
-rw-r--r--dev-ml/xml-light/files/02_cmi_depends.dpatch18
-rw-r--r--dev-ml/xml-light/files/03_cflags.dpatch51
-rw-r--r--dev-ml/xml-light/files/04_dtd_trace.dpatch26
-rw-r--r--dev-ml/xml-light/metadata.xml8
-rw-r--r--dev-ml/xml-light/xml-light-2.2-r3.ebuild62
-rw-r--r--dev-ml/xmlm-1.3.013
-rw-r--r--dev-ml/xmlm/Manifest3
-rw-r--r--dev-ml/xmlm/metadata.xml11
-rw-r--r--dev-ml/xmlm/xmlm-1.3.0.ebuild31
-rw-r--r--dev-ml/xstr-0.2.112
-rw-r--r--dev-ml/xstr/Manifest3
-rw-r--r--dev-ml/xstr/metadata.xml8
-rw-r--r--dev-ml/xstr/xstr-0.2.1.ebuild32
-rw-r--r--dev-ml/yojson-1.4.013
-rw-r--r--dev-ml/yojson/Manifest3
-rw-r--r--dev-ml/yojson/metadata.xml11
-rw-r--r--dev-ml/yojson/yojson-1.4.0.ebuild33
-rw-r--r--dev-ml/zarith-1.4.113
-rw-r--r--dev-ml/zarith-1.513
-rw-r--r--dev-ml/zarith-1.613
-rw-r--r--dev-ml/zarith-1.713
-rw-r--r--dev-ml/zarith/Manifest9
-rw-r--r--dev-ml/zarith/metadata.xml14
-rw-r--r--dev-ml/zarith/zarith-1.4.1.ebuild46
-rw-r--r--dev-ml/zarith/zarith-1.5.ebuild52
-rw-r--r--dev-ml/zarith/zarith-1.6.ebuild52
-rw-r--r--dev-ml/zarith/zarith-1.7.ebuild52
-rw-r--r--dev-ml/zed-1.512
-rw-r--r--dev-ml/zed/Manifest3
-rw-r--r--dev-ml/zed/metadata.xml11
-rw-r--r--dev-ml/zed/zed-1.5.ebuild27
1276 files changed, 19210 insertions, 4570 deletions
diff --git a/dev-ml/ANSITerminal-0.6.5 b/dev-ml/ANSITerminal-0.6.5
deleted file mode 100644
index 7840c2ae2971..000000000000
--- a/dev-ml/ANSITerminal-0.6.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=Module which offers basic control of ANSI compliant terminals
-EAPI=5
-HOMEPAGE=http://forge.ocamlcore.org/projects/ansiterminal/
-IUSE=+ocamlopt debug doc
-KEYWORDS=~amd64 ~x86
-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 983774947da124fb7d542ce25a218bb1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e oasis 9256ed89af74c3365ec888c00bfdfe43 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=46ce2151f6f0cf4d4d2c6ede7cc9f925
diff --git a/dev-ml/ANSITerminal-0.7 b/dev-ml/ANSITerminal-0.7
deleted file mode 100644
index 4f9908bf6058..000000000000
--- a/dev-ml/ANSITerminal-0.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ml/oasis >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=Module which offers basic control of ANSI compliant terminals
-EAPI=5
-HOMEPAGE=https://github.com/Chris00/ANSITerminal
-IUSE=+ocamlopt debug doc
-KEYWORDS=~amd64 ~x86
-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 983774947da124fb7d542ce25a218bb1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e oasis 9256ed89af74c3365ec888c00bfdfe43 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8f35873f8817de25af38fab1b3f49e6b
diff --git a/dev-ml/ANSITerminal/ANSITerminal-0.6.5.ebuild b/dev-ml/ANSITerminal/ANSITerminal-0.6.5.ebuild
new file mode 100644
index 000000000000..4403189644da
--- /dev/null
+++ b/dev-ml/ANSITerminal/ANSITerminal-0.6.5.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+OASIS_BUILD_DOCS=1
+
+inherit oasis eutils
+
+DESCRIPTION="Module which offers basic control of ANSI compliant terminals"
+HOMEPAGE="http://forge.ocamlcore.org/projects/ansiterminal/"
+SRC_URI="http://forge.ocamlcore.org/frs/download.php/1206/${P}.tar.gz"
+LICENSE="LGPL-3-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+DEPEND=""
+RDEPEND="${DEPEND}"
+IUSE=""
+
+DOCS=( "README.txt" "AUTHORS.txt" )
diff --git a/dev-ml/ANSITerminal/ANSITerminal-0.7.ebuild b/dev-ml/ANSITerminal/ANSITerminal-0.7.ebuild
new file mode 100644
index 000000000000..64ca0743656f
--- /dev/null
+++ b/dev-ml/ANSITerminal/ANSITerminal-0.7.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+OASIS_BUILD_DOCS=1
+
+inherit oasis eutils
+
+DESCRIPTION="Module which offers basic control of ANSI compliant terminals"
+HOMEPAGE="https://github.com/Chris00/ANSITerminal"
+SRC_URI="https://github.com/Chris00/ANSITerminal/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="LGPL-3-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+RDEPEND=""
+DEPEND="${DEPEND} dev-ml/oasis"
+IUSE=""
+
+DOCS=( "README.txt" "AUTHORS.txt" )
+
+src_prepare() {
+ epatch "${FILESDIR}/oasis.patch"
+ oasis setup || die
+}
diff --git a/dev-ml/ANSITerminal/Manifest b/dev-ml/ANSITerminal/Manifest
new file mode 100644
index 000000000000..bd84b2a5dee1
--- /dev/null
+++ b/dev-ml/ANSITerminal/Manifest
@@ -0,0 +1,6 @@
+AUX oasis.patch 416 BLAKE2B 36d9fe43bb37e4e89cb755add41ec0957615664d4e3f0d1ae0b8efeafcfc189002f72387f3dd9b7cd11310508964ee43043a827d159fe572fab79ddae58cd5f5 SHA512 390f45f6503e5ca4a12049be17fbc4ff7a53cfb770a2afc6d4514f353febbd3f61f922b6b3a9f5d5f06325f89405fd68cadc5af60f681314b0bd14a6cec5831e
+DIST ANSITerminal-0.6.5.tar.gz 52473 BLAKE2B 1f7f5b8dc1e7f9c2434a7e4eea1cec848f019a82a4137f744008532fac85016d3908890f2dd4cf5e8fb5c9f4aaad69cba4d56e75ab7ab57354ff7a4988a5cfe8 SHA512 43a059cc2a947a70409e19b8c6d01e1b5aa495290967f984a6d707e5ff329dd88e82ba68e08b6262da4a19bb24be2e61154fcf8781ee5cbad98240276d7b060d
+DIST ANSITerminal-0.7.tar.gz 16763 BLAKE2B 5d25cdfe02f3b6f155995208897a11a21535105caa8db682f60a1215113e507ccac294037177d0fcd52431e3853aa655ead14e2054ada1369754d39c8db9448b SHA512 986f9d7fd862741ac7039cbd92c19b847d7b2d03edfb2d0851fe46ecc9678bf4617d1e687a61af3d3b28e2cfe347a80312f9bf5c84f957de0d6c169ca4209566
+EBUILD ANSITerminal-0.6.5.ebuild 519 BLAKE2B e88ec25b4235ba7117c3540881600f6255a22ec4f04baffda4685657cc67424b53768ca4476fd89c3ae35795d67ac63c90d503b7dc753fb40a29703c098bfe7e SHA512 0d20f0f965a68cea5c684e32212f2e725d5bb4658b5138e8edb7ee28381f841cb9e9fc2c0dbde5de3ed7c6bfe363f76eaf6ca278d7766db9fd6eaee7c5695650
+EBUILD ANSITerminal-0.7.ebuild 610 BLAKE2B 8504345457d1b4a3f4ad6091b9c3a57c67bc1072618491c7c60539c746332b3d25acd16c668c28a7e3bd7cee255f9d279d6cc36557da9e8ba365b23444944439 SHA512 223e5e614f081ef02ca96c77203d510f7add25cc8291baf078b5b4635e705f7bdf86708593a32b898742555fa6ea139e4348de6a76c4f770f301ad265d9a24e6
+MISC metadata.xml 332 BLAKE2B 654ce606957b2e3a4f3f301e02b320c5fcc616fd6c7414628a1dd85cf60ccf7aa7f23a3b43b5f6f919e8c482ace32380ce1d998ab9c85503ee840fc0af65293c SHA512 227751b6ba18690c3ebeea95baf04fe73de3b4f672351a1b9aef31da8c037ec917984ecba1ec4452431326b3df10674c07bf53d69cdbfcb406b535684e24ac51
diff --git a/dev-ml/ANSITerminal/files/oasis.patch b/dev-ml/ANSITerminal/files/oasis.patch
new file mode 100644
index 000000000000..d95b446a0407
--- /dev/null
+++ b/dev-ml/ANSITerminal/files/oasis.patch
@@ -0,0 +1,13 @@
+Index: ANSITerminal-0.7/_oasis
+===================================================================
+--- ANSITerminal-0.7.orig/_oasis
++++ ANSITerminal-0.7/_oasis
+@@ -19,7 +19,7 @@ Library "ANSITerminal"
+ InternalModules: ANSITerminal_common
+ CSources: ANSITerminal_stubs.c
+ BuildDepends: unix, bytes
+-
++
+ Document API
+ Title: API reference for ANSITerminal
+ Type: OCamlbuild (0.3)
diff --git a/dev-ml/ANSITerminal/metadata.xml b/dev-ml/ANSITerminal/metadata.xml
new file mode 100644
index 000000000000..73a1d1721344
--- /dev/null
+++ b/dev-ml/ANSITerminal/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">Chris00/ANSITerminal</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 51ef8b3071f7..57203c5b38cc 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
Binary files differ
diff --git a/dev-ml/OCaml-ImageMagick-0.34-r1 b/dev-ml/OCaml-ImageMagick-0.34-r1
deleted file mode 100644
index 676017abb486..000000000000
--- a/dev-ml/OCaml-ImageMagick-0.34-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=media-gfx/imagemagick-7:= dev-lang/ocaml:=[ocamlopt] >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Provide the ImageMagick methods to OCaml
-EAPI=6
-HOMEPAGE=http://www.linux-nantes.org/~fmonnier/OCaml/ImageMagick/
-KEYWORDS=~amd64
-LICENSE=MIT
-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 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c38900991455510a4cb1f1ab37f76eac
diff --git a/dev-ml/OCaml-ImageMagick/Manifest b/dev-ml/OCaml-ImageMagick/Manifest
new file mode 100644
index 000000000000..22903909c175
--- /dev/null
+++ b/dev-ml/OCaml-ImageMagick/Manifest
@@ -0,0 +1,4 @@
+DIST OCaml-ImageMagick-0.34-imagemagick7.patch.bz2 15950 BLAKE2B 009ea1a988acb117768e60a30e7443165018aa58715eab83e6155d8c9e6772454f4d432afad9be6c07333701e1a78490c1b16c3f687c381f4ddc134ce42cecc8 SHA512 a5d1eb7baa001144cc618532b6446cae30974ee7f95455fb18de287731f1867ba767812a876510c0fc7944aa5259f4e60e9f68fa1364fac3a2dfb8f8c1f6a219
+DIST OCaml-ImageMagick-0.34.tgz 64219 BLAKE2B 2260f1fa3521d1c930fdc8380bc007aa9fb555e484887faf3a63f00cd0b82b71a6c0e061299c31c686dd651def9089b3f7e2d97642f2a7c60421eb0f25cad5b1 SHA512 cf1f979aed0aad1fb27dd6817adbc22c2f7c0d6d8c96a48d9532ce89c128b046ea7ac38ad96a5267a5920fccd0cd3631844e428e933143a405522ed5ebcbee39
+EBUILD OCaml-ImageMagick-0.34-r1.ebuild 811 BLAKE2B 222553f653f7f629faf664bd5df301e9cd11ae3e29e33461c66f06aab2f3f6a0f416689e30fbc740f4487aaf3aa70bb3cee7fcb3d2064c51fb059b4083864dce SHA512 eb0eb9aabdc8e646232cf9762a05619702147bb3af807402062c70059d97ce39651e96cc96a60e1e5461b9502456026200bee8bfbd2a85bb998a9cfc3ee805ef
+MISC metadata.xml 243 BLAKE2B 010ca240ae06e9a9f6d7ba213eb06df36d9ba862ff2d2458d98a9fea1a1e7f3026d13832a73bce1b3ad9345029425e6abfae9e03bf126f2329b3f030ed3753fd SHA512 1c5b4b2163017e496999d1f87e5c9c5ac6c11b2e9187450ccfb3df258f34e54d278972f04ee0e8429476c6f87e091a869ac2a28c6e8c8e6d20678c3e74061449
diff --git a/dev-ml/OCaml-ImageMagick/OCaml-ImageMagick-0.34-r1.ebuild b/dev-ml/OCaml-ImageMagick/OCaml-ImageMagick-0.34-r1.ebuild
new file mode 100644
index 000000000000..e779844d33b2
--- /dev/null
+++ b/dev-ml/OCaml-ImageMagick/OCaml-ImageMagick-0.34-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit findlib toolchain-funcs eutils
+
+DESCRIPTION="Provide the ImageMagick methods to OCaml"
+HOMEPAGE="http://www.linux-nantes.org/~fmonnier/OCaml/ImageMagick/"
+SRC_URI="http://www.linux-nantes.org/~fmonnier/OCaml/ImageMagick/ImageMagick/${P}.tgz
+ mirror://gentoo/${P}-imagemagick7.patch.bz2
+"
+
+LICENSE="MIT"
+SLOT="0/7${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+# interactive tests
+RESTRICT="test"
+
+DEPEND=">=media-gfx/imagemagick-7:=
+ dev-lang/ocaml:=[ocamlopt]"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ epatch "${WORKDIR}/${P}-imagemagick7.patch"
+ default
+}
+
+src_configure() {
+ sed -e "s/gcc/$(tc-getCC)/" -i Makefile || die
+}
+
+src_install() {
+ findlib_src_preinst
+ emake find_install
+ dodoc README.txt
+}
diff --git a/dev-ml/OCaml-ImageMagick/metadata.xml b/dev-ml/OCaml-ImageMagick/metadata.xml
new file mode 100644
index 000000000000..ffac4d7ebc01
--- /dev/null
+++ b/dev-ml/OCaml-ImageMagick/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-ml/alcotest-0.8.1 b/dev-ml/alcotest-0.8.1
deleted file mode 100644
index cc7ab8318f85..000000000000
--- a/dev-ml/alcotest-0.8.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=dev-ml/fmt:= dev-ml/astring:= dev-ml/cmdliner:= dev-ml/result:= dev-ml/jbuilder dev-ml/findlib >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=A lightweight and colourful test framework
-EAPI=5
-HOMEPAGE=https://github.com/mirage/alcotest/
-IUSE=test
-KEYWORDS=~amd64
-LICENSE=ISC
-RDEPEND=dev-ml/fmt:= dev-ml/astring:= dev-ml/cmdliner:= dev-ml/result:= >=dev-lang/ocaml-4:=
-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 24b4a2529c1fd12f1304856d6c5a690d
-_md5_=e4b101035b078938c5c75de8559caebf
diff --git a/dev-ml/alcotest-0.8.2 b/dev-ml/alcotest-0.8.2
deleted file mode 100644
index 76ca696ebab8..000000000000
--- a/dev-ml/alcotest-0.8.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=dev-ml/fmt:= dev-ml/astring:= dev-ml/cmdliner:= dev-ml/result:= dev-ml/jbuilder dev-ml/findlib >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=A lightweight and colourful test framework
-EAPI=5
-HOMEPAGE=https://github.com/mirage/alcotest/
-IUSE=test
-KEYWORDS=~amd64
-LICENSE=ISC
-RDEPEND=dev-ml/fmt:= dev-ml/astring:= dev-ml/cmdliner:= dev-ml/result:= >=dev-lang/ocaml-4:=
-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 24b4a2529c1fd12f1304856d6c5a690d
-_md5_=e4b101035b078938c5c75de8559caebf
diff --git a/dev-ml/alcotest/Manifest b/dev-ml/alcotest/Manifest
new file mode 100644
index 000000000000..28791629ef13
--- /dev/null
+++ b/dev-ml/alcotest/Manifest
@@ -0,0 +1,5 @@
+DIST alcotest-0.8.1.tar.gz 24358 BLAKE2B 4f905cb478183015355b7bed85b2b20de6880b64d6425a4804cf050dd95fe024e83d9c2f6b57f908bdf7eac650cd2133811219fd30de0c45fa0e66caa3178980 SHA512 76224df2d4923e666fd844a0735f2a23035454bb3c3aeb6a6f8d19376342f0f94f39a401d6225af3f90cddd2f65aa779ce87e42ee8d82e6b3ca33730d4277253
+DIST alcotest-0.8.2.tar.gz 25456 BLAKE2B 6f3362dd83d127600710a9efcf5428ce1d960a2a8798a533c3216d7c8934dadd38f672f383e45c0a0ab441e723b4c6477a3c92905e2351e81bbfda324e373e69 SHA512 df1cf5ab42e91a66cae2913504d6825f842169332b8673047faea769966f62d61cb1c288325a840211df0b22c31208566cf754b0816bfdf5d8ef34e8c5127668
+EBUILD alcotest-0.8.1.ebuild 618 BLAKE2B 12b3211fc4eceaed53dfcb7bef272d26e04a93eac89ec3dde2f0812b206db0dea61ffc9750ff0fb5e4579a88b21e578ef1bc61089ee39b93de2943cbfd18bffe SHA512 9e77c4d60b8b15365884905df7b55a8b87e30c731bc941aa097e4365bc0dd9934dee42260d526ee11783314890d309ee028bc773162fd0505d36f9502ecdae38
+EBUILD alcotest-0.8.2.ebuild 618 BLAKE2B 12b3211fc4eceaed53dfcb7bef272d26e04a93eac89ec3dde2f0812b206db0dea61ffc9750ff0fb5e4579a88b21e578ef1bc61089ee39b93de2943cbfd18bffe SHA512 9e77c4d60b8b15365884905df7b55a8b87e30c731bc941aa097e4365bc0dd9934dee42260d526ee11783314890d309ee028bc773162fd0505d36f9502ecdae38
+MISC metadata.xml 327 BLAKE2B c4e771cffb6f19821658bf42662709fc848f340910ee36a03da41af3c6c3607970901ef1377041a90b171be6ec56bbbdf9717dfde9cd3ec8f4c57c6fca206ee0 SHA512 190d8967c1d83d6b8a5b9f50af37fdafc2660d28408ef2331e7e75afdcc679a72c1fea8a23388417ee7aca7da494a492f800411e9b03ec13d6dbaa7e2db34f59
diff --git a/dev-ml/alcotest/alcotest-0.8.1.ebuild b/dev-ml/alcotest/alcotest-0.8.1.ebuild
new file mode 100644
index 000000000000..40aa58ad9a07
--- /dev/null
+++ b/dev-ml/alcotest/alcotest-0.8.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit opam
+
+DESCRIPTION="A lightweight and colourful test framework"
+HOMEPAGE="https://github.com/mirage/alcotest/"
+SRC_URI="https://github.com/mirage/alcotest/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND="
+ dev-ml/fmt:=
+ dev-ml/astring:=
+ dev-ml/cmdliner:=
+ dev-ml/result:=
+"
+DEPEND="${RDEPEND}
+ dev-ml/jbuilder
+ dev-ml/findlib"
+
+src_compile() {
+ jbuilder build -p alcotest || die
+}
+
+src_test() {
+ jbuilder runtest -p alcotest || die
+}
diff --git a/dev-ml/alcotest/alcotest-0.8.2.ebuild b/dev-ml/alcotest/alcotest-0.8.2.ebuild
new file mode 100644
index 000000000000..40aa58ad9a07
--- /dev/null
+++ b/dev-ml/alcotest/alcotest-0.8.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit opam
+
+DESCRIPTION="A lightweight and colourful test framework"
+HOMEPAGE="https://github.com/mirage/alcotest/"
+SRC_URI="https://github.com/mirage/alcotest/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND="
+ dev-ml/fmt:=
+ dev-ml/astring:=
+ dev-ml/cmdliner:=
+ dev-ml/result:=
+"
+DEPEND="${RDEPEND}
+ dev-ml/jbuilder
+ dev-ml/findlib"
+
+src_compile() {
+ jbuilder build -p alcotest || die
+}
+
+src_test() {
+ jbuilder runtest -p alcotest || die
+}
diff --git a/dev-ml/alcotest/metadata.xml b/dev-ml/alcotest/metadata.xml
new file mode 100644
index 000000000000..ffac9af607a7
--- /dev/null
+++ b/dev-ml/alcotest/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">mirage/alcotest</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/angstrom-0.7.0 b/dev-ml/angstrom-0.7.0
deleted file mode 100644
index 1d6b6df4babb..000000000000
--- a/dev-ml/angstrom-0.7.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=dev-ml/result:= dev-ml/jbuilder test? ( dev-ml/alcotest ) >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=Parser combinators built for speed and memory efficiency
-EAPI=6
-HOMEPAGE=https://github.com/inhabitedtype/angstrom
-IUSE=test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ml/result:= >=dev-lang/ocaml-4:=
-SLOT=0/0.7.0
-SRC_URI=https://github.com/inhabitedtype/angstrom/archive/0.7.0.tar.gz -> angstrom-0.7.0.tar.gz
-_eclasses_=opam 24b4a2529c1fd12f1304856d6c5a690d
-_md5_=cc2f65c3654d5c5d63ce38283906b580
diff --git a/dev-ml/angstrom-async-0.7.0 b/dev-ml/angstrom-async-0.7.0
deleted file mode 100644
index 7b6b8fa63429..000000000000
--- a/dev-ml/angstrom-async-0.7.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=dev-lang/ocaml:= dev-ml/angstrom:= dev-ml/async:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=Parser combinators built for speed and memory efficiency
-EAPI=6
-HOMEPAGE=https://github.com/inhabitedtype/angstrom
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-lang/ocaml:= dev-ml/angstrom:= dev-ml/async:= >=dev-lang/ocaml-4:=
-SLOT=0/0.7.0
-SRC_URI=https://github.com/inhabitedtype/angstrom/archive/0.7.0.tar.gz -> angstrom-0.7.0.tar.gz
-_eclasses_=opam 24b4a2529c1fd12f1304856d6c5a690d
-_md5_=c31cc3a45efe5ae7c15de2a9c45b4ef3
diff --git a/dev-ml/angstrom-async/Manifest b/dev-ml/angstrom-async/Manifest
new file mode 100644
index 000000000000..636916754cc0
--- /dev/null
+++ b/dev-ml/angstrom-async/Manifest
@@ -0,0 +1,3 @@
+DIST angstrom-0.7.0.tar.gz 106216 BLAKE2B 4f11a3b7b2f36bf1e5eaea68cb6b4fc0ca6e8ae608fa5dbb80e51a011157acf43ba649bf336158c43cab16b9935aac4e9bdd6f7baa5568ef930149c45de4460b SHA512 c4980e38b45dae9d9584ca7a248870b5966e8d2286ea137acf4e61b981ff2584a3952be8be66a06885e72ae3d326fabe837cdb391a3001f04f66d7823b93d528
+EBUILD angstrom-async-0.7.0.ebuild 636 BLAKE2B 8a7c0e020ec2a9b27692250204cbf3f3a9a2b23e2726255a46de04813edcf1f844b62f23f322ed2ccbda3aecedf6b085fa75cccd4b2eb66f9a4d5f35cd67021d SHA512 d9867a7836cf443f9ebd3d1aed8756749043a8b853d955d0bd38b3077f66c48bcf8c66c98813d83ca156cb157867366e928c3c93277893f7fa5f629026046f7b
+MISC metadata.xml 334 BLAKE2B f257e9a885971fc056322d502d679f7955519dc406f16117b8d74df5e625be507a72393ed0c1a08d9bb2702e8b41e2d6614c75f398134ed6b428f3c77d078ee7 SHA512 e3be38d2e05c7b71ebdca5924babe2f779505c0e4cfd320031f56c4f3d5602ef60b4f8f45e1b3bc308655f266f5289b11e857fba8455aa5067f15e9ccdd76307
diff --git a/dev-ml/angstrom-async/angstrom-async-0.7.0.ebuild b/dev-ml/angstrom-async/angstrom-async-0.7.0.ebuild
new file mode 100644
index 000000000000..d67309411be2
--- /dev/null
+++ b/dev-ml/angstrom-async/angstrom-async-0.7.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit opam
+
+DESCRIPTION="Parser combinators built for speed and memory efficiency"
+HOMEPAGE="https://github.com/inhabitedtype/angstrom"
+SRC_URI="https://github.com/inhabitedtype/angstrom/archive/${PV}.tar.gz -> angstrom-${PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+ dev-lang/ocaml:=
+ dev-ml/angstrom:=
+ dev-ml/async:=
+"
+DEPEND="${RDEPEND}
+ dev-ml/jbuilder"
+
+S="${WORKDIR}/angstrom-${PV}"
+
+src_compile() {
+ jbuilder build -p ${PN} || die
+}
+
+src_test() {
+ jbuilder runtest -p ${PN}
+}
diff --git a/dev-ml/angstrom-async/metadata.xml b/dev-ml/angstrom-async/metadata.xml
new file mode 100644
index 000000000000..cd1f003b6403
--- /dev/null
+++ b/dev-ml/angstrom-async/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">inhabitedtype/angstrom</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/angstrom-lwt-unix-0.7.0 b/dev-ml/angstrom-lwt-unix-0.7.0
deleted file mode 100644
index 50b107731a13..000000000000
--- a/dev-ml/angstrom-lwt-unix-0.7.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=dev-lang/ocaml:= dev-ml/angstrom:= dev-ml/lwt:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=Parser combinators built for speed and memory efficiency
-EAPI=6
-HOMEPAGE=https://github.com/inhabitedtype/angstrom
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-lang/ocaml:= dev-ml/angstrom:= dev-ml/lwt:= >=dev-lang/ocaml-4:=
-SLOT=0/0.7.0
-SRC_URI=https://github.com/inhabitedtype/angstrom/archive/0.7.0.tar.gz -> angstrom-0.7.0.tar.gz
-_eclasses_=opam 24b4a2529c1fd12f1304856d6c5a690d
-_md5_=9d325b187990d05de59b857244d165c5
diff --git a/dev-ml/angstrom-lwt-unix/Manifest b/dev-ml/angstrom-lwt-unix/Manifest
new file mode 100644
index 000000000000..71ee4d597340
--- /dev/null
+++ b/dev-ml/angstrom-lwt-unix/Manifest
@@ -0,0 +1,3 @@
+DIST angstrom-0.7.0.tar.gz 106216 BLAKE2B 4f11a3b7b2f36bf1e5eaea68cb6b4fc0ca6e8ae608fa5dbb80e51a011157acf43ba649bf336158c43cab16b9935aac4e9bdd6f7baa5568ef930149c45de4460b SHA512 c4980e38b45dae9d9584ca7a248870b5966e8d2286ea137acf4e61b981ff2584a3952be8be66a06885e72ae3d326fabe837cdb391a3001f04f66d7823b93d528
+EBUILD angstrom-lwt-unix-0.7.0.ebuild 634 BLAKE2B 4fb7be45841c4a5efb2f74af1b3979155d6c813b81c9baa7ebe21fba9c9b508f99faa52f9cbc718bb3a6e2a769d3d41c0c7eb22f293c00b815970834ff82af8d SHA512 b53d7d909dad23644927ea446f1857ec9ec3d01663ede9ea18570578a01fa0923e0ba2caf025c4c9462b4f4dcb4708a4094589fd2f4eafcb30660c9ff7bbd5b7
+MISC metadata.xml 334 BLAKE2B f257e9a885971fc056322d502d679f7955519dc406f16117b8d74df5e625be507a72393ed0c1a08d9bb2702e8b41e2d6614c75f398134ed6b428f3c77d078ee7 SHA512 e3be38d2e05c7b71ebdca5924babe2f779505c0e4cfd320031f56c4f3d5602ef60b4f8f45e1b3bc308655f266f5289b11e857fba8455aa5067f15e9ccdd76307
diff --git a/dev-ml/angstrom-lwt-unix/angstrom-lwt-unix-0.7.0.ebuild b/dev-ml/angstrom-lwt-unix/angstrom-lwt-unix-0.7.0.ebuild
new file mode 100644
index 000000000000..d746325abfcc
--- /dev/null
+++ b/dev-ml/angstrom-lwt-unix/angstrom-lwt-unix-0.7.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit opam
+
+DESCRIPTION="Parser combinators built for speed and memory efficiency"
+HOMEPAGE="https://github.com/inhabitedtype/angstrom"
+SRC_URI="https://github.com/inhabitedtype/angstrom/archive/${PV}.tar.gz -> angstrom-${PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+ dev-lang/ocaml:=
+ dev-ml/angstrom:=
+ dev-ml/lwt:=
+"
+DEPEND="${RDEPEND}
+ dev-ml/jbuilder"
+
+S="${WORKDIR}/angstrom-${PV}"
+
+src_compile() {
+ jbuilder build -p ${PN} || die
+}
+
+src_test() {
+ jbuilder runtest -p ${PN}
+}
diff --git a/dev-ml/angstrom-lwt-unix/metadata.xml b/dev-ml/angstrom-lwt-unix/metadata.xml
new file mode 100644
index 000000000000..cd1f003b6403
--- /dev/null
+++ b/dev-ml/angstrom-lwt-unix/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">inhabitedtype/angstrom</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/angstrom-unix-0.7.0 b/dev-ml/angstrom-unix-0.7.0
deleted file mode 100644
index 11ab4a7e1aae..000000000000
--- a/dev-ml/angstrom-unix-0.7.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=dev-ml/angstrom:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=Parser combinators built for speed and memory efficiency
-EAPI=6
-HOMEPAGE=https://github.com/inhabitedtype/angstrom
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ml/angstrom:= >=dev-lang/ocaml-4:=
-SLOT=0/0.7.0
-SRC_URI=https://github.com/inhabitedtype/angstrom/archive/0.7.0.tar.gz -> angstrom-0.7.0.tar.gz
-_eclasses_=opam 24b4a2529c1fd12f1304856d6c5a690d
-_md5_=3836476be7b69ee263ba3237e62e0f9e
diff --git a/dev-ml/angstrom-unix/Manifest b/dev-ml/angstrom-unix/Manifest
new file mode 100644
index 000000000000..5fe0a9cb93c8
--- /dev/null
+++ b/dev-ml/angstrom-unix/Manifest
@@ -0,0 +1,3 @@
+DIST angstrom-0.7.0.tar.gz 106216 BLAKE2B 4f11a3b7b2f36bf1e5eaea68cb6b4fc0ca6e8ae608fa5dbb80e51a011157acf43ba649bf336158c43cab16b9935aac4e9bdd6f7baa5568ef930149c45de4460b SHA512 c4980e38b45dae9d9584ca7a248870b5966e8d2286ea137acf4e61b981ff2584a3952be8be66a06885e72ae3d326fabe837cdb391a3001f04f66d7823b93d528
+EBUILD angstrom-unix-0.7.0.ebuild 599 BLAKE2B 5e669695f5c1ccc4e1206ee8e9731694387c6141e9a2fe692b8fed1ca462f08441250367ec92d941282fb3f673c03c77e685d5c07cd7800b129dfa13d5057157 SHA512 269935809319c9adc4201f6567448fba755990a4933649f9fdaf94a8d7f241940985baf3d294e500c04cd0e58d97ef23d6e41c41fef3552ffc342f239699d93b
+MISC metadata.xml 334 BLAKE2B f257e9a885971fc056322d502d679f7955519dc406f16117b8d74df5e625be507a72393ed0c1a08d9bb2702e8b41e2d6614c75f398134ed6b428f3c77d078ee7 SHA512 e3be38d2e05c7b71ebdca5924babe2f779505c0e4cfd320031f56c4f3d5602ef60b4f8f45e1b3bc308655f266f5289b11e857fba8455aa5067f15e9ccdd76307
diff --git a/dev-ml/angstrom-unix/angstrom-unix-0.7.0.ebuild b/dev-ml/angstrom-unix/angstrom-unix-0.7.0.ebuild
new file mode 100644
index 000000000000..40d81a856586
--- /dev/null
+++ b/dev-ml/angstrom-unix/angstrom-unix-0.7.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit opam
+
+DESCRIPTION="Parser combinators built for speed and memory efficiency"
+HOMEPAGE="https://github.com/inhabitedtype/angstrom"
+SRC_URI="https://github.com/inhabitedtype/angstrom/archive/${PV}.tar.gz -> angstrom-${PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="dev-ml/angstrom:="
+DEPEND="${RDEPEND}
+ dev-ml/jbuilder"
+
+S="${WORKDIR}/angstrom-${PV}"
+
+src_compile() {
+ jbuilder build -p ${PN} || die
+}
+
+src_test() {
+ jbuilder runtest -p ${PN}
+}
diff --git a/dev-ml/angstrom-unix/metadata.xml b/dev-ml/angstrom-unix/metadata.xml
new file mode 100644
index 000000000000..cd1f003b6403
--- /dev/null
+++ b/dev-ml/angstrom-unix/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">inhabitedtype/angstrom</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/angstrom/Manifest b/dev-ml/angstrom/Manifest
new file mode 100644
index 000000000000..a5c75e6c1c06
--- /dev/null
+++ b/dev-ml/angstrom/Manifest
@@ -0,0 +1,3 @@
+DIST angstrom-0.7.0.tar.gz 106216 BLAKE2B 4f11a3b7b2f36bf1e5eaea68cb6b4fc0ca6e8ae608fa5dbb80e51a011157acf43ba649bf336158c43cab16b9935aac4e9bdd6f7baa5568ef930149c45de4460b SHA512 c4980e38b45dae9d9584ca7a248870b5966e8d2286ea137acf4e61b981ff2584a3952be8be66a06885e72ae3d326fabe837cdb391a3001f04f66d7823b93d528
+EBUILD angstrom-0.7.0.ebuild 587 BLAKE2B f6ece66436ae475254fbaeffce7413b59bb71910c4b015a3bc1bd315a79342612df9ba245d7e606cfd1c6a8c5104043889faaf760cd875446d3766509fa5b239 SHA512 1e3c5f2672685f4449c90973a25bd009a8e66f30eafedf82486d0c929f5d9f470ad56f690479696fb4ddfe0ff3c86fab5ad3ddf2505604a2803ffbc25e88d3a8
+MISC metadata.xml 334 BLAKE2B f257e9a885971fc056322d502d679f7955519dc406f16117b8d74df5e625be507a72393ed0c1a08d9bb2702e8b41e2d6614c75f398134ed6b428f3c77d078ee7 SHA512 e3be38d2e05c7b71ebdca5924babe2f779505c0e4cfd320031f56c4f3d5602ef60b4f8f45e1b3bc308655f266f5289b11e857fba8455aa5067f15e9ccdd76307
diff --git a/dev-ml/angstrom/angstrom-0.7.0.ebuild b/dev-ml/angstrom/angstrom-0.7.0.ebuild
new file mode 100644
index 000000000000..29b53a837077
--- /dev/null
+++ b/dev-ml/angstrom/angstrom-0.7.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit opam
+
+DESCRIPTION="Parser combinators built for speed and memory efficiency"
+HOMEPAGE="https://github.com/inhabitedtype/angstrom"
+SRC_URI="https://github.com/inhabitedtype/angstrom/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND="dev-ml/result:="
+DEPEND="${RDEPEND}
+ dev-ml/jbuilder
+ test? ( dev-ml/alcotest )"
+
+src_compile() {
+ jbuilder build -p ${PN} || die
+}
+
+src_test() {
+ jbuilder runtest -p ${PN}
+}
diff --git a/dev-ml/angstrom/metadata.xml b/dev-ml/angstrom/metadata.xml
new file mode 100644
index 000000000000..cd1f003b6403
--- /dev/null
+++ b/dev-ml/angstrom/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">inhabitedtype/angstrom</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/astring-0.8.3 b/dev-ml/astring-0.8.3
deleted file mode 100644
index 66a57471ce96..000000000000
--- a/dev-ml/astring-0.8.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=dev-lang/ocaml:=[ocamlopt] dev-ml/topkg dev-ml/ocamlbuild dev-ml/findlib >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=Alternative String module for OCaml
-EAPI=5
-HOMEPAGE=http://erratique.ch/software/astring https://github.com/dbuenzli/astring
-KEYWORDS=~amd64
-LICENSE=ISC
-RDEPEND=dev-lang/ocaml:=[ocamlopt] >=dev-lang/ocaml-4:=
-SLOT=0/0.8.3
-SRC_URI=http://erratique.ch/software/astring/releases/astring-0.8.3.tbz
-_eclasses_=opam 24b4a2529c1fd12f1304856d6c5a690d
-_md5_=bf19617785588138c4b41ef0b8bb0499
diff --git a/dev-ml/astring/Manifest b/dev-ml/astring/Manifest
new file mode 100644
index 000000000000..6f82c70bb4e4
--- /dev/null
+++ b/dev-ml/astring/Manifest
@@ -0,0 +1,3 @@
+DIST astring-0.8.3.tbz 38710 BLAKE2B 253fe07b51996eb7b5f84e18d171b0f65cbb5abba9b241a02aa679765f3190edc636c1ba989910fde374a20c7615db1887eb73d8607f3bb8311e20ab6e67f670 SHA512 c7230e47b7ef14e6040fb18284a3d5aa8da1428b721cf91a7f17104cfb853be24b9c2aaa0b118bf3e050158aa8748311435417c6cf9014d260fb4379e4ead3e1
+EBUILD astring-0.8.3.ebuild 544 BLAKE2B 92711e64cdd1c9357949d5269ef6f5abafdcbf586a8ad12a6080a304eb75c6cd02aa26796956021165a5c576708213da6914fed03befcab301f2d6a277d0380d SHA512 f82e7914443e9f80fdea42b4d3a2603b2fcb66343648798c79d52965e6107b8a15135248b02feb1fcef967193ce922d86ae2b6b81c20338fffca896b87de52bf
+MISC metadata.xml 328 BLAKE2B ac4cbca0d613fa5e3f06dbba3f77400b40b1469dbf4c4980b212bb3bfc6d782a4beb42918aafcc99a713acb07049e40dfd73a3c045592c2a861afd95976fe18d SHA512 d160a180c4cdfb31180232edd9ad5ba724e667c15a384c09010351e2053d726a1709cf5fe045f72fbdc2046214909a10e70ab202ee617da9a57f74964b2c8de8
diff --git a/dev-ml/astring/astring-0.8.3.ebuild b/dev-ml/astring/astring-0.8.3.ebuild
new file mode 100644
index 000000000000..cd17e8514586
--- /dev/null
+++ b/dev-ml/astring/astring-0.8.3.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit opam
+
+DESCRIPTION="Alternative String module for OCaml"
+HOMEPAGE="http://erratique.ch/software/astring https://github.com/dbuenzli/astring"
+SRC_URI="http://erratique.ch/software/astring/releases/${P}.tbz"
+
+LICENSE="ISC"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="dev-lang/ocaml:=[ocamlopt]"
+DEPEND="${RDEPEND}
+ dev-ml/topkg
+ dev-ml/ocamlbuild
+ dev-ml/findlib"
+
+src_compile() {
+ ocaml pkg/pkg.ml build || die
+}
diff --git a/dev-ml/astring/metadata.xml b/dev-ml/astring/metadata.xml
new file mode 100644
index 000000000000..7f44ca0a6b88
--- /dev/null
+++ b/dev-ml/astring/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">dbuenzli/astring</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/async-0.9.0 b/dev-ml/async-0.9.0
deleted file mode 100644
index e649d4894541..000000000000
--- a/dev-ml/async-0.9.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=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-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=Jane Street Capital's asynchronous execution library
-EAPI=6
-HOMEPAGE=https://github.com/janestreet/async
-KEYWORDS=~amd64
-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 24b4a2529c1fd12f1304856d6c5a690d
-_md5_=a986994d3355154bf98c7ebfba8f16ed
diff --git a/dev-ml/async/Manifest b/dev-ml/async/Manifest
new file mode 100644
index 000000000000..737f01fa056f
--- /dev/null
+++ b/dev-ml/async/Manifest
@@ -0,0 +1,3 @@
+DIST async-0.9.0.tar.gz 17856 BLAKE2B b7206641936aa430ddc35091b89c465fe0abd98883c9206f3a978372dc016a35f41a228adf906def56f894eafabdb223463a77fc690e373bbd5284c590871924 SHA512 93c0fa4d6e7d1c4dff1f460db8ec95b3eea1d7c19fda117bb9efc8711f4908d2922467c33f66659395169ead9b37931da16a85a031d6073fc9296c218f2c55bb
+EBUILD async-0.9.0.ebuild 594 BLAKE2B a01140a79815f8b0df4503144d34df5e575f3339a984498dc7c68f72925d7c695af573bb6ed2a260985c520408c0d72f085e3c426e2630b132c4434494313273 SHA512 dc3565459af17982efc881302b328897f98af5933f1e5521cf41fbc45b230bff82cac8c114a8e56686c9cc9dd4178e2e7bbc48c6381cb2d89439360ebc4e0ad7
+MISC metadata.xml 328 BLAKE2B 4f0e3b1cc705a9dd5bc97f563b0785f96c0fbedd285963254fa57c35cd37da50ba0e87bbbb5c4c629cec7810e8b1ef9173cc70d680b8aac7f502fa893720351b SHA512 266276bd7d6489d1100b9f2268247b497532817bdef973ebd48e07cc139c113986fda2c204a86a66a465cfe27094eb3faf33a2b49a16fa294ec4f23abde067a1
diff --git a/dev-ml/async/async-0.9.0.ebuild b/dev-ml/async/async-0.9.0.ebuild
new file mode 100644
index 000000000000..e1ba15eb9c98
--- /dev/null
+++ b/dev-ml/async/async-0.9.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit opam
+
+DESCRIPTION="Jane Street Capital's asynchronous execution library"
+HOMEPAGE="https://github.com/janestreet/async"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+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:=
+"
+DEPEND="${RDEPEND} dev-ml/jbuilder"
diff --git a/dev-ml/async/metadata.xml b/dev-ml/async/metadata.xml
new file mode 100644
index 000000000000..c444611196e7
--- /dev/null
+++ b/dev-ml/async/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">janestreet/async</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/async_extra-0.9.0 b/dev-ml/async_extra-0.9.0
deleted file mode 100644
index 8d3d0f6a2391..000000000000
--- a/dev-ml/async_extra-0.9.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=>=dev-lang/ocaml-4.02.0:= dev-ml/async_kernel:= dev-ml/async_rpc_kernel:= dev-ml/async_unix:= dev-ml/core:= dev-ml/ppx_driver:= dev-ml/ppx_jane:= dev-ml/ocaml-migrate-parsetree:= dev-ml/opam dev-ml/jbuilder
-DESCRIPTION=Jane Street Capital's asynchronous execution library (extra)
-EAPI=6
-HOMEPAGE=https://github.com/janestreet/async_extra
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=>=dev-lang/ocaml-4.02.0:= dev-ml/async_kernel:= dev-ml/async_rpc_kernel:= dev-ml/async_unix:= dev-ml/core:= dev-ml/ppx_driver:= dev-ml/ppx_jane:= dev-ml/ocaml-migrate-parsetree:=
-SLOT=0/0.9.0
-SRC_URI=https://github.com/janestreet/async_extra/archive/v0.9.0.tar.gz -> async_extra-0.9.0.tar.gz
-_md5_=3fb34e6737250e4450d97482b1a45303
diff --git a/dev-ml/async_extra/Manifest b/dev-ml/async_extra/Manifest
new file mode 100644
index 000000000000..198da4e537a8
--- /dev/null
+++ b/dev-ml/async_extra/Manifest
@@ -0,0 +1,3 @@
+DIST async_extra-0.9.0.tar.gz 105722 BLAKE2B 5c371478b1507ddd63bbafb26858752f483a970cbdad174d62032a102fc8ded517ed87581a81b265cce82c9c27a85e09ca6df3209dbe86a35e71cbf35e027d39 SHA512 6f0d69a389e66e47cd0a3cf288c2b0242299e5c3befa77f7a656bc30dfb63f78e5287c4de5e80473c1ce2ee5fed038bf0b4d2b94eb73f045b20f40b14868fa1a
+EBUILD async_extra-0.9.0.ebuild 802 BLAKE2B 5c2f86ee837874fb71acb782b30edf55567bb56ef8168a2a76e2d87d1015c5e873260db071b60a4bee5262b04a3a761bb83e09a9a94ad206db3ebb78884ad171 SHA512 b2df0ced7bd04f55835703ed1e3b57c8b6163677eb2b5670213f5e321434d5d78c463798be41b99be9eb3fc80500bdc149398c2a4f518177a4f1194af3a9d571
+MISC metadata.xml 334 BLAKE2B aca26b6ae7ecd18ec6df2f742cac17fbc13fbc694cda79e834b1e4057b91c399bf150dad36f5404a8a67aa9b9351966c006e0fca0a415c0a49c7bdbabdba8467 SHA512 3944e0b6c73f2e3c23ca9c1d70b3b3fb5e8616614a1eb0b15528f5aee747a9689a4a1413eeda52f88070ca7ae77a16d87188801004e398df899d75f2f71b6df9
diff --git a/dev-ml/async_extra/async_extra-0.9.0.ebuild b/dev-ml/async_extra/async_extra-0.9.0.ebuild
new file mode 100644
index 000000000000..06c9100af230
--- /dev/null
+++ b/dev-ml/async_extra/async_extra-0.9.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Jane Street Capital's asynchronous execution library (extra)"
+HOMEPAGE="https://github.com/janestreet/async_extra"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND=">=dev-lang/ocaml-4.02.0:=
+ dev-ml/async_kernel:=
+ dev-ml/async_rpc_kernel:=
+ dev-ml/async_unix:=
+ dev-ml/core:=
+ dev-ml/ppx_driver:=
+ dev-ml/ppx_jane:=
+ dev-ml/ocaml-migrate-parsetree:=
+"
+DEPEND="${RDEPEND} dev-ml/opam dev-ml/jbuilder"
+
+src_install() {
+ opam-installer -i \
+ --prefix="${ED}/usr" \
+ --libdir="${D}/$(ocamlc -where)" \
+ --docdir="${ED}/usr/share/doc/${PF}" \
+ ${PN}.install || die
+}
diff --git a/dev-ml/async_extra/metadata.xml b/dev-ml/async_extra/metadata.xml
new file mode 100644
index 000000000000..e8e993916222
--- /dev/null
+++ b/dev-ml/async_extra/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">janestreet/async_extra</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/async_js-0.9.0 b/dev-ml/async_js-0.9.0
deleted file mode 100644
index 4c1cf9ef38f5..000000000000
--- a/dev-ml/async_js-0.9.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-lang/ocaml:= dev-ml/async_kernel:= dev-ml/async_rpc_kernel:= dev-ml/ppx_driver:= dev-ml/ppx_jane:= dev-ml/js_of_ocaml:= dev-ml/ocaml-migrate-parsetree:= dev-ml/opam dev-ml/jbuilder
-DESCRIPTION=Async support for JavaScript platforms
-EAPI=6
-HOMEPAGE=https://github.com/janestreet/async_js
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-lang/ocaml:= dev-ml/async_kernel:= dev-ml/async_rpc_kernel:= dev-ml/ppx_driver:= dev-ml/ppx_jane:= dev-ml/js_of_ocaml:= dev-ml/ocaml-migrate-parsetree:=
-SLOT=0/0.9.0
-SRC_URI=https://github.com/janestreet/async_js/archive/v0.9.0.tar.gz -> async_js-0.9.0.tar.gz
-_md5_=065512f9a70522e8f42d66259af5fe11
diff --git a/dev-ml/async_js/Manifest b/dev-ml/async_js/Manifest
new file mode 100644
index 000000000000..96f0b5af28d1
--- /dev/null
+++ b/dev-ml/async_js/Manifest
@@ -0,0 +1,3 @@
+DIST async_js-0.9.0.tar.gz 13597 BLAKE2B 6c2ee0820c0291d3b292f7fac629d3bd19fa4a07385b1805842c41cf96510e67c104e98064419c64cf74a70d79cecc9dff575f16b12162fee36dfc94ce3f080e SHA512 f188a023e105d409c10ff1517eba5f7c543ed1bdb9e81863569c34d911379cc00b704b8b9081e0041dac2e63dc48efc01763f199de5e5b8693533d2815fe2b4b
+EBUILD async_js-0.9.0.ebuild 759 BLAKE2B 6653314d9612b20bbc17b350affce0a2fa5b564535644c63e874651f633f87320a96cb8bb2ca67e2bf2718ba4c69c6124be9e6b829d300c15858e0c73442dd76 SHA512 09854a78d6cfac5d9f1ffc620ed4058b756f2fc014ac42d9e65d737311cec0263f5f982ebe833e1cf0cb0e72e10ce05c76998a0d977c20e9a67c440c798f8389
+MISC metadata.xml 331 BLAKE2B e5afcc95c551c22960251188ab2a9d706b4b6741e5a0fdcdd5d75fb795ae123199c81c04595974635dd33d04c8dd6dee58f628874273c493b9c7851d7571d2f2 SHA512 673a975b2cac01a4437867c1430ad78858a5bccc03ec766a2b81a780dd62ee3dc3bad782b633056114b0970e56d9791b862f3c9b4a16938c85287331cdc6c6e8
diff --git a/dev-ml/async_js/async_js-0.9.0.ebuild b/dev-ml/async_js/async_js-0.9.0.ebuild
new file mode 100644
index 000000000000..fecdc074310d
--- /dev/null
+++ b/dev-ml/async_js/async_js-0.9.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Async support for JavaScript platforms"
+HOMEPAGE="https://github.com/janestreet/async_js"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+ dev-lang/ocaml:=
+ dev-ml/async_kernel:=
+ dev-ml/async_rpc_kernel:=
+ dev-ml/ppx_driver:=
+ dev-ml/ppx_jane:=
+ dev-ml/js_of_ocaml:=
+ dev-ml/ocaml-migrate-parsetree:=
+"
+DEPEND="${RDEPEND}
+ dev-ml/opam
+ dev-ml/jbuilder
+"
+
+src_install() {
+ opam-installer -i \
+ --prefix="${ED}/usr" \
+ --libdir="${D}/$(ocamlc -where)" \
+ --docdir="${ED}/usr/share/doc/${PF}" \
+ ${PN}.install || die
+}
diff --git a/dev-ml/async_js/metadata.xml b/dev-ml/async_js/metadata.xml
new file mode 100644
index 000000000000..bdd4090e1b9c
--- /dev/null
+++ b/dev-ml/async_js/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">janestreet/async_js</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/async_kernel-0.9.0 b/dev-ml/async_kernel-0.9.0
deleted file mode 100644
index 87ba1b37c6de..000000000000
--- a/dev-ml/async_kernel-0.9.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=>=dev-lang/ocaml-4.02.0:= dev-ml/core_kernel:= dev-ml/ppx_driver:= dev-ml/ppx_jane:= dev-ml/ocaml-migrate-parsetree:= dev-ml/opam dev-ml/jbuilder
-DESCRIPTION=Jane Street Capital's asynchronous execution library (core)
-EAPI=6
-HOMEPAGE=https://github.com/janestreet/async_kernel
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=>=dev-lang/ocaml-4.02.0:= dev-ml/core_kernel:= dev-ml/ppx_driver:= dev-ml/ppx_jane:= dev-ml/ocaml-migrate-parsetree:=
-SLOT=0/0.9.0
-SRC_URI=https://github.com/janestreet/async_kernel/archive/v0.9.0.tar.gz -> async_kernel-0.9.0.tar.gz
-_md5_=32cf18ced4fee6969d9ba175b703e78f
diff --git a/dev-ml/async_kernel/Manifest b/dev-ml/async_kernel/Manifest
new file mode 100644
index 000000000000..2f8373c82d25
--- /dev/null
+++ b/dev-ml/async_kernel/Manifest
@@ -0,0 +1,3 @@
+DIST async_kernel-0.9.0.tar.gz 132837 BLAKE2B cbd1748459bca8691a6051b54beb177858707e166350c9f431d48cab1379adc557a4240f66efa0557cfef9c9ffa00fb458cb8d83a5466651ac40d01228524ed7 SHA512 a2aaa28cce736509bd77041694cbce482f698274144acebabd5db9f3186e0c0bab32196634f5fb19e3921141e0a2b849df8bc0d67e843292cbe3fd301848e519
+EBUILD async_kernel-0.9.0.ebuild 738 BLAKE2B 977aa63b6d9126e6cedd2089749a3f45d5289207ba326e706f39ac5644afc9e43e9a7886b5ee54d78648fe1775b7c86b88095b0714065c635ba2080197f4ceb7 SHA512 2fd2cc015d0814feefb2303bc3a6683f686a7ad76a9a5697bd6cd60f236520e06b544a86435d2c1aacd5e98bfdcd3b212eebd2bbb2227948a965c383eff5229d
+MISC metadata.xml 335 BLAKE2B 26a6f8f448155e7611f351a8f1a1d138741677ee2290d6dce8c9fd65151be359bcd7b451dc1c0bf6eabf5af11507ed94fb570ecf3e8893c0f9c3c64ddfcf7c55 SHA512 035f11d981edecd9d29f27a206cdb4060e32b757a7d1bb5ef15b6414477801ac7df9993dcf7b7c3cd0512b05920383bb3f980c65590243392e3b7ecac322d4aa
diff --git a/dev-ml/async_kernel/async_kernel-0.9.0.ebuild b/dev-ml/async_kernel/async_kernel-0.9.0.ebuild
new file mode 100644
index 000000000000..e563147731ce
--- /dev/null
+++ b/dev-ml/async_kernel/async_kernel-0.9.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Jane Street Capital's asynchronous execution library (core)"
+HOMEPAGE="https://github.com/janestreet/async_kernel"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND=">=dev-lang/ocaml-4.02.0:=
+ dev-ml/core_kernel:=
+ dev-ml/ppx_driver:=
+ dev-ml/ppx_jane:=
+ dev-ml/ocaml-migrate-parsetree:=
+"
+DEPEND="${RDEPEND} dev-ml/opam dev-ml/jbuilder"
+
+src_install() {
+ opam-installer -i \
+ --prefix="${ED}/usr" \
+ --libdir="${D}/$(ocamlc -where)" \
+ --docdir="${ED}/usr/share/doc/${PF}" \
+ ${PN}.install || die
+}
diff --git a/dev-ml/async_kernel/metadata.xml b/dev-ml/async_kernel/metadata.xml
new file mode 100644
index 000000000000..c67db9f27c24
--- /dev/null
+++ b/dev-ml/async_kernel/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">janestreet/async_kernel</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/async_rpc_kernel-0.9.0 b/dev-ml/async_rpc_kernel-0.9.0
deleted file mode 100644
index afcf8882a1da..000000000000
--- a/dev-ml/async_rpc_kernel-0.9.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-lang/ocaml:= dev-ml/async_kernel:= dev-ml/core_kernel:= dev-ml/ppx_driver:= dev-ml/ppx_jane:= dev-ml/ocaml-migrate-parsetree:= dev-ml/opam dev-ml/jbuilder
-DESCRIPTION=Platform-independent core of Async RPC library
-EAPI=6
-HOMEPAGE=https://github.com/janestreet/async_rpc_kernel
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-lang/ocaml:= dev-ml/async_kernel:= dev-ml/core_kernel:= dev-ml/ppx_driver:= dev-ml/ppx_jane:= dev-ml/ocaml-migrate-parsetree:=
-SLOT=0/0.9.0
-SRC_URI=https://github.com/janestreet/async_rpc_kernel/archive/v0.9.0.tar.gz -> async_rpc_kernel-0.9.0.tar.gz
-_md5_=ea739718576ba2e125e1a3fb7dbed3f9
diff --git a/dev-ml/async_rpc_kernel/Manifest b/dev-ml/async_rpc_kernel/Manifest
new file mode 100644
index 000000000000..df466c0d0c19
--- /dev/null
+++ b/dev-ml/async_rpc_kernel/Manifest
@@ -0,0 +1,3 @@
+DIST async_rpc_kernel-0.9.0.tar.gz 57411 BLAKE2B 43d07ed0d8e529daf63bf7ee9ff109d765bba0aa2c849e72eb2b60e27d1d1f465fe41ee39b8bc883c6eb63c83c43dde8abc7d7734737bc9819a870d91de18e9e SHA512 4c93165f78a92ae4904503b18072a775ea3ab0f49e460404741bd4daf3f6c483da3dfa987f7013a41dce348a8e95664b4784d175256ccd52a2d8df8e89d3c136
+EBUILD async_rpc_kernel-0.9.0.ebuild 745 BLAKE2B 9a4d46febcd649a65b52423f83ce8263992b39156e2e6f67c70ee1ae02ddc39d245d6f9f322cbb36c35b18bbd8854270f68b0097025e14a60681d2fb5514850d SHA512 57d180c957953c8228d02d983f26f07e04fa39a0265195f794c1e81bcd664db3260f3ddfd453b532853372f758ef6ba9d749e69c7df59196145f642f58bda18e
+MISC metadata.xml 412 BLAKE2B 8115e42aa1dab01d3eccfd65af5842c91e8e81c3ff57ed689fe29db6c625ab9784e156d91fba0272d94779c3dbaa5b4a666e063455cfaa3fd6ef009a902376fb SHA512 200d6b732f9b43b3af6139d8c050c069d0b7da9c5aae72a9fe3b66526d78cf15cf3147c5c5750697a701ec5bd001df4e0c2805121851ad79608192454caa0fc6
diff --git a/dev-ml/async_rpc_kernel/async_rpc_kernel-0.9.0.ebuild b/dev-ml/async_rpc_kernel/async_rpc_kernel-0.9.0.ebuild
new file mode 100644
index 000000000000..efbafe69d388
--- /dev/null
+++ b/dev-ml/async_rpc_kernel/async_rpc_kernel-0.9.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Platform-independent core of Async RPC library"
+HOMEPAGE="https://github.com/janestreet/async_rpc_kernel"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+ dev-lang/ocaml:=
+ dev-ml/async_kernel:=
+ dev-ml/core_kernel:=
+ dev-ml/ppx_driver:=
+ dev-ml/ppx_jane:=
+ dev-ml/ocaml-migrate-parsetree:=
+"
+DEPEND="${RDEPEND} dev-ml/opam dev-ml/jbuilder"
+
+src_install() {
+ opam-installer -i \
+ --prefix="${ED}/usr" \
+ --libdir="${D}/$(ocamlc -where)" \
+ --docdir="${ED}/usr/share/doc/${PF}" \
+ ${PN}.install || die
+}
diff --git a/dev-ml/async_rpc_kernel/metadata.xml b/dev-ml/async_rpc_kernel/metadata.xml
new file mode 100644
index 000000000000..e2129d2f8804
--- /dev/null
+++ b/dev-ml/async_rpc_kernel/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="bitbucket">yminsky/ocaml-core</remote-id>
+ <remote-id type="github">janestreet/async_rpc_kernel</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/async_ssl-0.9.0 b/dev-ml/async_ssl-0.9.0
deleted file mode 100644
index ebd426054ebe..000000000000
--- a/dev-ml/async_ssl-0.9.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-lang/ocaml:= dev-ml/async:= dev-ml/base:= dev-ml/configurator:= dev-ml/core:= dev-ml/ppx_driver:= dev-ml/ppx_jane:= dev-ml/stdio:= dev-ml/ocaml-ctypes:= dev-libs/openssl:0= dev-ml/ocaml-migrate-parsetree:= dev-ml/opam dev-ml/jbuilder
-DESCRIPTION=An Async-pipe-based interface with OpenSSL.
-EAPI=6
-HOMEPAGE=https://github.com/janestreet/async_ssl
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-lang/ocaml:= dev-ml/async:= dev-ml/base:= dev-ml/configurator:= dev-ml/core:= dev-ml/ppx_driver:= dev-ml/ppx_jane:= dev-ml/stdio:= dev-ml/ocaml-ctypes:= dev-libs/openssl:0= dev-ml/ocaml-migrate-parsetree:=
-SLOT=0/0.9.0
-SRC_URI=https://github.com/janestreet/async_ssl/archive/v0.9.0.tar.gz -> async_ssl-0.9.0.tar.gz
-_md5_=6f4af3aaa0308eb114f3ea43e305604f
diff --git a/dev-ml/async_ssl/Manifest b/dev-ml/async_ssl/Manifest
new file mode 100644
index 000000000000..1214602da143
--- /dev/null
+++ b/dev-ml/async_ssl/Manifest
@@ -0,0 +1,3 @@
+DIST async_ssl-0.9.0.tar.gz 28227 BLAKE2B e916e196964d085312836d773e290ac52c950c5ceb084347557d72776c7b6b9548ad2bd01c5fc6fa701d18c55fff62e48af5459bf5897478252f8d27dd6687fc SHA512 bb023e0c60f9f04368f2e2a4aea80700a60853a03fe1550fe48a9defe42ec66736a6cc0cf40c6a472cd3f8b5b30d79711e4fd714b53ebd4ba7f3f3c22eb7a15e
+EBUILD async_ssl-0.9.0.ebuild 822 BLAKE2B 692e29784084f17383eb728ea5d3eab3bacaf353397bfaacdddf5115d70b1ef68ef2678d905f0b6ea18fd5d4881b36033a6f2230f654d4dbf044d24259743981 SHA512 1b3f7d070cc0d6b09c139e4c467f6dc5c748c5ccc1b756c9590fc7ffe3237e4a35623f462e2767178dabf504471d1511e71e44478927a58e9c663a6e69b45459
+MISC metadata.xml 332 BLAKE2B 82d2502af15abffa019c5d0665eceb4270ed2a30080763a301e3609a9e5cebcb15cb36f9019c427f86955927ea008f8e754bf931a1179dd7974ef321a74747e5 SHA512 1d5dbdca3ca70a23e287169f7e4d8bcfc8912ce7713a349c90a04375874e9fdc948232ad314c4a3cc7b4109d6b42100804758126b202d8a952a3a0761a083dd0
diff --git a/dev-ml/async_ssl/async_ssl-0.9.0.ebuild b/dev-ml/async_ssl/async_ssl-0.9.0.ebuild
new file mode 100644
index 000000000000..92946fd066df
--- /dev/null
+++ b/dev-ml/async_ssl/async_ssl-0.9.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="An Async-pipe-based interface with OpenSSL."
+HOMEPAGE="https://github.com/janestreet/async_ssl"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+ dev-lang/ocaml:=
+ dev-ml/async:=
+ dev-ml/base:=
+ dev-ml/configurator:=
+ dev-ml/core:=
+ dev-ml/ppx_driver:=
+ dev-ml/ppx_jane:=
+ dev-ml/stdio:=
+ dev-ml/ocaml-ctypes:=
+ dev-libs/openssl:0=
+ dev-ml/ocaml-migrate-parsetree:=
+"
+DEPEND="${RDEPEND}
+ dev-ml/opam
+ dev-ml/jbuilder
+"
+
+src_install() {
+ opam-installer -i \
+ --prefix="${ED}/usr" \
+ --libdir="${D}/$(ocamlc -where)" \
+ --docdir="${ED}/usr/share/doc/${PF}" \
+ ${PN}.install || die
+}
diff --git a/dev-ml/async_ssl/metadata.xml b/dev-ml/async_ssl/metadata.xml
new file mode 100644
index 000000000000..630439141b0e
--- /dev/null
+++ b/dev-ml/async_ssl/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">janestreet/async_ssl</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/async_unix-0.9.0 b/dev-ml/async_unix-0.9.0
deleted file mode 100644
index f57508ebbb37..000000000000
--- a/dev-ml/async_unix-0.9.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=>=dev-lang/ocaml-4.02.0:= dev-ml/async_kernel:= dev-ml/core:= dev-ml/ppx_driver:= dev-ml/ppx_jane:= dev-ml/ocaml-migrate-parsetree:= <dev-ml/ppx_driver-100 <dev-ml/ppx_jane-100 dev-ml/opam dev-ml/jbuilder
-DESCRIPTION=Jane Street Capital's asynchronous execution library (unix)
-EAPI=6
-HOMEPAGE=https://github.com/janestreet/async_unix
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=>=dev-lang/ocaml-4.02.0:= dev-ml/async_kernel:= dev-ml/core:= dev-ml/ppx_driver:= dev-ml/ppx_jane:= dev-ml/ocaml-migrate-parsetree:= <dev-ml/ppx_driver-100 <dev-ml/ppx_jane-100
-SLOT=0/0.9.0
-SRC_URI=https://github.com/janestreet/async_unix/archive/v0.9.0.tar.gz -> async_unix-0.9.0.tar.gz
-_md5_=b0b006d85d758f578834c3ea13c6f922
diff --git a/dev-ml/async_unix/Manifest b/dev-ml/async_unix/Manifest
new file mode 100644
index 000000000000..43831f34ffae
--- /dev/null
+++ b/dev-ml/async_unix/Manifest
@@ -0,0 +1,3 @@
+DIST async_unix-0.9.0.tar.gz 156717 BLAKE2B cce40cb1074ae7a6f38fa8df80dc4787be24a500ed9576bd737fc5db8d1d3f31ccc14cad9b134bccc8257004e421201c410b7c3b19373a282b50817b3ccebd7c SHA512 cd3fb43ffcde8fe01386a0460beb52e2530786dc0abce318c5241243e123ebd57fbf4cff8c91300483f33ae5dc1c0cc591992dc55286dc6ec550be62afb33b42
+EBUILD async_unix-0.9.0.ebuild 800 BLAKE2B a0f78110c010fddf08e02a0961912bb5aec0f3b1cd5fef4d6074766ac39da197393f9ac8754c0f6b8a8dabe25fa47491b13afacc29da864cae78409f927b43ba SHA512 d6b9b39bfc40f3d1578885442eb7a60bbc78c9588836d4ad3e39ccf2033d85da2ecabb2f4aab7eef37a0b50c20b08f3232b002c0219d23b3b9d2f1ca43651172
+MISC metadata.xml 333 BLAKE2B afcba43a5e0945d5afbb2d009d83eeb8ebd5bb711d49743f1ad6ddd55efc0539e4ed93bc50df3f0629c2393104392b3eab5e1793c9aca50b1d8d44dc1589ccfc SHA512 a8df1f5354c4ae159464f9f1cd7bfcecf3bb1642e4d69dcacbd0825fa6ce5709b78361b709c1b5f5cc98e263481d5882f32e6d856875389a33535f19f4b36d70
diff --git a/dev-ml/async_unix/async_unix-0.9.0.ebuild b/dev-ml/async_unix/async_unix-0.9.0.ebuild
new file mode 100644
index 000000000000..aac9eccd0f0a
--- /dev/null
+++ b/dev-ml/async_unix/async_unix-0.9.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Jane Street Capital's asynchronous execution library (unix)"
+HOMEPAGE="https://github.com/janestreet/async_unix"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+ >=dev-lang/ocaml-4.02.0:=
+ dev-ml/async_kernel:=
+ dev-ml/core:=
+ dev-ml/ppx_driver:=
+ dev-ml/ppx_jane:=
+ dev-ml/ocaml-migrate-parsetree:=
+ <dev-ml/ppx_driver-100
+ <dev-ml/ppx_jane-100
+"
+DEPEND="${RDEPEND} dev-ml/opam dev-ml/jbuilder"
+
+src_install() {
+ opam-installer -i \
+ --prefix="${ED}/usr" \
+ --libdir="${D}/$(ocamlc -where)" \
+ --docdir="${ED}/usr/share/doc/${PF}" \
+ ${PN}.install || die
+}
diff --git a/dev-ml/async_unix/metadata.xml b/dev-ml/async_unix/metadata.xml
new file mode 100644
index 000000000000..59be8f51a754
--- /dev/null
+++ b/dev-ml/async_unix/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">janestreet/async_unix</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/atd-1.12.0 b/dev-ml/atd-1.12.0
deleted file mode 100644
index 2bf8258b0193..000000000000
--- a/dev-ml/atd-1.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=dev-lang/ocaml:=[ocamlopt?] dev-ml/easy-format:=[ocamlopt?] dev-ml/menhir:=[ocamlopt?] dev-ml/jbuilder dev-ml/opam test? ( dev-ml/biniou dev-ml/yojson ) >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Syntax for cross-language type definitions
-EAPI=6
-HOMEPAGE=https://github.com/mjambon/atd
-IUSE=+ocamlopt test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-lang/ocaml:=[ocamlopt?] dev-ml/easy-format:=[ocamlopt?] dev-ml/menhir:=[ocamlopt?]
-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
diff --git a/dev-ml/atd-1.2.0 b/dev-ml/atd-1.2.0
deleted file mode 100644
index d9735bfb0394..000000000000
--- a/dev-ml/atd-1.2.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=dev-lang/ocaml:=[ocamlopt?] dev-ml/easy-format:=[ocamlopt?] dev-ml/menhir:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Syntax for cross-language type definitions
-EAPI=6
-HOMEPAGE=https://github.com/mjambon/atd
-IUSE=+ocamlopt
-KEYWORDS=~amd64
-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
-_md5_=0af6dceaa99b639cdd667f369723185c
diff --git a/dev-ml/atd-1.2.1 b/dev-ml/atd-1.2.1
deleted file mode 100644
index 528aa239309b..000000000000
--- a/dev-ml/atd-1.2.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-lang/ocaml:=[ocamlopt?] dev-ml/easy-format:=[ocamlopt?] dev-ml/menhir:=[ocamlopt?] dev-ml/jbuilder dev-ml/opam >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Syntax for cross-language type definitions
-EAPI=6
-HOMEPAGE=https://github.com/mjambon/atd
-IUSE=+ocamlopt
-KEYWORDS=~amd64
-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
-_md5_=de637d3e27a98870a0608f7307b54b15
diff --git a/dev-ml/atd/Manifest b/dev-ml/atd/Manifest
new file mode 100644
index 000000000000..ffb11febbe26
--- /dev/null
+++ b/dev-ml/atd/Manifest
@@ -0,0 +1,7 @@
+DIST atd-1.12.0.tar.gz 145428 BLAKE2B d9cc3b98567383e1a5dbb068165f144fb033e17030f979eb20963837b96f93d9b950943d59d1d0f348fed28ec05c5906ce6672f848d428193379670f5c4b51c4 SHA512 c24601b276da7837bc896bb42b2e0fa91ebfbf07759560c2490ed44bef722dcf8d586aaba1e62abff262805cab89996835611ab9fb68aa096dfc84bb55365475
+DIST atd-1.2.0.tar.gz 41300 BLAKE2B 3919de0a2ca5b071d2cfdab8b74c6f528bc6c1b6965e6a29d8ddfda89ac6db0fd2b6e1012e052370a9ca555c392176f68339c193076b082c79ebbedcd4146817 SHA512 a52824c9784ac0f4d6f314972fa1d92be14730de3c6bde04032004579ac27408385bd4fa7d926f9d564657eb62050fd732a032f364bada62a1dc7a8acfacb727
+DIST atd-1.2.1.tar.gz 39018 BLAKE2B 313a3019428f187051209e8eb2bec99f9a8fdefdb4da342c50bd54b42378c0c5eda988e13413c567765f8504ee24599fc440fdad6b8a3e728189df0f3b9f1939 SHA512 5dde8dd1e6ca53ae2ff7efc873211079678a824ae7a9d4182d58e3e10ce50a9dcd705de7168a8cfb12ea3d030a0d01b2485d436e77bfa48c14df7628b47161dc
+EBUILD atd-1.12.0.ebuild 840 BLAKE2B b8de319b91b3a4bbe8c6d2f105e249575c531035e2330b35597f1172bf26cfe009fa76a210fca056b912755f0272416b1a029f7900cffdff50817b35cc18a792 SHA512 99c118a0ac6c6803a0bccc3b427b1dc292b2ba685bf59867b281919c129b14cddb603c9fbd7047acbba0d3cbd6ed652b239d57aeb4b2e8a9871f1e2fe45635c6
+EBUILD atd-1.2.0.ebuild 650 BLAKE2B 3122850c5263af96ddffe9672d5340d4a2bd9b6e261acb094cf5de2c8e7daabbe94014b8865113c1e42fdb0b389dc0b5064c4fe8bf5c9f24d24643bb77db2958 SHA512 727734e5c910ee7bd17fda58fa7135a82310ecab74854d6b2e854a85eed233baf8ee65909140907a0e86ad4fe2ec44f11bcdbfb183412c7eb83c5b8acc5c0c14
+EBUILD atd-1.2.1.ebuild 713 BLAKE2B 93dafa58ebd8b668e62cfe8c0af994f33324e423fc0914fda3bc6f9162f699c26d3e472542713cccf48903a2bde71fa73f367ab32e37af638b07b40018e745a9 SHA512 836c383552787eedb784c28069e82b07560d544c3c809c610a3d5ac46d4e35b88ead5e6f0fcb42d8678090a295cdf6c7ef7a42b38d81e2faecaf269fc0407377
+MISC metadata.xml 323 BLAKE2B 19ee0e4526b8d238a43ba6ac3d596896ea04d48289b961a284114e28c61b3ca967aa817c7d6bc0d001a4328896e46a12af6ff5709e4a6605699926c80bf4d980 SHA512 2a41feb51b979c76edda9a13dbb6ff48301387ccf0fdcf4225b49cab80c2d68b87caf463659619a41b9ed253b6cb76d6c392ea88e35b0083aa2849545701830d
diff --git a/dev-ml/atd/atd-1.12.0.ebuild b/dev-ml/atd/atd-1.12.0.ebuild
new file mode 100644
index 000000000000..5095732e9dd9
--- /dev/null
+++ b/dev-ml/atd/atd-1.12.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit findlib
+
+DESCRIPTION="Syntax for cross-language type definitions"
+HOMEPAGE="https://github.com/mjambon/atd"
+SRC_URI="https://github.com/mjambon/atd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="+ocamlopt test"
+
+DEPEND="
+ dev-lang/ocaml:=[ocamlopt?]
+ dev-ml/easy-format:=[ocamlopt?]
+ dev-ml/menhir:=[ocamlopt?]
+"
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND}
+ dev-ml/jbuilder
+ dev-ml/opam
+ test? (
+ dev-ml/biniou
+ dev-ml/yojson
+ )
+"
+
+src_compile() {
+ jbuilder build -p atd || die
+}
+
+oinstall() {
+ opam-installer -i \
+ --prefix="${ED}/usr" \
+ --libdir="${D}/$(ocamlc -where)" \
+ --docdir="${ED}/usr/share/doc/${PF}" \
+ ${1}.install || die
+}
+
+src_install() {
+ oinstall atd
+}
diff --git a/dev-ml/atd/atd-1.2.0.ebuild b/dev-ml/atd/atd-1.2.0.ebuild
new file mode 100644
index 000000000000..8f343658f391
--- /dev/null
+++ b/dev-ml/atd/atd-1.2.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit findlib
+
+DESCRIPTION="Syntax for cross-language type definitions"
+HOMEPAGE="https://github.com/mjambon/atd"
+SRC_URI="https://github.com/mjambon/atd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="+ocamlopt"
+
+DEPEND="
+ dev-lang/ocaml:=[ocamlopt?]
+ dev-ml/easy-format:=[ocamlopt?]
+ dev-ml/menhir:=[ocamlopt?]
+"
+RDEPEND="${DEPEND}"
+
+src_compile() {
+ emake -j1 all
+ use ocamlopt && emake opt
+}
+
+src_install() {
+ dodir /usr/bin
+ PREFIX="${ED}/usr" findlib_src_install
+ dodoc README.md
+}
diff --git a/dev-ml/atd/atd-1.2.1.ebuild b/dev-ml/atd/atd-1.2.1.ebuild
new file mode 100644
index 000000000000..d57bf461c6d4
--- /dev/null
+++ b/dev-ml/atd/atd-1.2.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit findlib
+
+DESCRIPTION="Syntax for cross-language type definitions"
+HOMEPAGE="https://github.com/mjambon/atd"
+SRC_URI="https://github.com/mjambon/atd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="+ocamlopt"
+
+DEPEND="
+ dev-lang/ocaml:=[ocamlopt?]
+ dev-ml/easy-format:=[ocamlopt?]
+ dev-ml/menhir:=[ocamlopt?]
+"
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND}
+ dev-ml/jbuilder
+ dev-ml/opam
+"
+
+src_install() {
+ opam-installer -i \
+ --prefix="${ED}/usr" \
+ --libdir="${D}/$(ocamlc -where)" \
+ --docdir="${ED}/usr/share/doc/${PF}" \
+ ${PN}.install || die
+}
diff --git a/dev-ml/atd/metadata.xml b/dev-ml/atd/metadata.xml
new file mode 100644
index 000000000000..42629fd4a5b4
--- /dev/null
+++ b/dev-ml/atd/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">mjambon/atd</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/atdgen-1.10.0 b/dev-ml/atdgen-1.10.0
deleted file mode 100644
index f75ac36d8d03..000000000000
--- a/dev-ml/atdgen-1.10.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=dev-lang/ocaml:=[ocamlopt?] dev-ml/atd:=[ocamlopt?] dev-ml/biniou:=[ocamlopt?] dev-ml/yojson:= >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Generates boilerplate OCaml code for JSON and Biniou IO from type definitions
-EAPI=6
-HOMEPAGE=https://github.com/mjambon/atdgen
-IUSE=+ocamlopt
-KEYWORDS=~amd64
-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
-_md5_=ea176d93883195c26483e055434f3aaa
diff --git a/dev-ml/atdgen-1.10.2 b/dev-ml/atdgen-1.10.2
deleted file mode 100644
index 732e77aeb7f6..000000000000
--- a/dev-ml/atdgen-1.10.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-lang/ocaml:=[ocamlopt?] dev-ml/atd:=[ocamlopt?] dev-ml/biniou:=[ocamlopt?] dev-ml/yojson:= dev-ml/jbuilder dev-ml/opam >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Generates boilerplate OCaml code for JSON and Biniou IO from type definitions
-EAPI=6
-HOMEPAGE=https://github.com/mjambon/atdgen
-IUSE=+ocamlopt
-KEYWORDS=~amd64
-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
-_md5_=d846ec8fe443ba95eea658b7c4e9fea4
diff --git a/dev-ml/atdgen-1.12.0 b/dev-ml/atdgen-1.12.0
deleted file mode 100644
index 77d71e0b95bc..000000000000
--- a/dev-ml/atdgen-1.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=dev-lang/ocaml:=[ocamlopt?] dev-ml/atd:= dev-ml/biniou:= dev-ml/yojson:= dev-ml/jbuilder dev-ml/opam >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Generates boilerplate OCaml code for JSON and Biniou IO from type definitions
-EAPI=6
-HOMEPAGE=https://github.com/mjambon/atd
-IUSE=+ocamlopt
-KEYWORDS=~amd64
-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
-_md5_=8f1b88749673137817dd51c9e760d696
diff --git a/dev-ml/atdgen/Manifest b/dev-ml/atdgen/Manifest
new file mode 100644
index 000000000000..36bb5a6b05ed
--- /dev/null
+++ b/dev-ml/atdgen/Manifest
@@ -0,0 +1,7 @@
+DIST atd-1.12.0.tar.gz 145428 BLAKE2B d9cc3b98567383e1a5dbb068165f144fb033e17030f979eb20963837b96f93d9b950943d59d1d0f348fed28ec05c5906ce6672f848d428193379670f5c4b51c4 SHA512 c24601b276da7837bc896bb42b2e0fa91ebfbf07759560c2490ed44bef722dcf8d586aaba1e62abff262805cab89996835611ab9fb68aa096dfc84bb55365475
+DIST atdgen-1.10.0.tar.gz 75447 BLAKE2B a3867f931b678ea4a5f7141447ed25418fb9b0b8154c5ab86320803badbcfaf98ceb453569837c88b12c76b37d0c405333fecf5894b0810fa7bc555370b7bbe0 SHA512 2dba16a0955b591a972bbd790a5344cf7f79c9485b5a064d3206643defe6c56413678aea389d831892ae1c72ff2fcb3a667731a236a7510fa7e9b4a60a128fb8
+DIST atdgen-1.10.2.tar.gz 73418 BLAKE2B 9b460fed859596c73fa24ebfb16bccecf7d95a1b1b627f43ed8ff32da7a37304df14d2641580cd0d38029ef344aa2132bac56c02e33034ac29b99d3adf1ea30a SHA512 5912e339c61516f942e7c80775faf4832007a96e5841e91115d120323a07fdd3945698b39876da3c25302da25ce30ecbab79a6920dd1496b9de4e30f4a2be73a
+EBUILD atdgen-1.10.0.ebuild 700 BLAKE2B c67984ece3d3d8ce2b570a2d046c40feddfeeafd4991db86964ffd04a05e779f3a5bed5038068ba2970a055b9ec33039e524c55ac9cb3121a96af7dd0a90b5ac SHA512 b84cd67ac003a0129bfe65b5a1784efba0eeec2db61e01f03552cbce5cb4e6d1f103edd7e7390d9166b0f14b5fba3c3c03445433f213d78321b567c7e4e84cd2
+EBUILD atdgen-1.10.2.ebuild 763 BLAKE2B fea1cb41c46b08f386fc305f3d15c359d04011069fdefcb43453d80976fc165dd8947456440ff378b2ce55fa8df74d898f2c306a437380acdedb8941a6903685 SHA512 59d289cea2d2925a720ffacb3e9011fc8315c1e7b664623c4b33df6ffa3648bd2b79e813fe4d2124fd988795278a95b47d178fea0e51db6856fc7cf98f634607
+EBUILD atdgen-1.12.0.ebuild 850 BLAKE2B f5383170056e608ec4ed8f7fbb375749e5d813b2a37d4add65f5643d2da215e8a18b49d84c82aa49c924faf3c922d1850b907b2f67d85ba788560337191b6692 SHA512 4a51365b5607a577712f617f4de683b4e740abd1b0b828a9e7c7cfa504aae6472a5c850c5a87456d21b5072abd042048a31706f0db8ed635b7b77e28bb0e2135
+MISC metadata.xml 326 BLAKE2B cf67575c6dc99a7981e16b750c6daa2d309bbfd9ab82d523a7f76282eb3a27b86684e715f63d40ad98da55e73f9c56d8a9277dea80e338f52b542643713efe9b SHA512 50ed189b3488c2a9fdb2c185194af291c20095d7f5358c18b02783b0e20cad33162d8b0ed5b50bfb81b2b1b4b13c65b2b7e2a4c463ef470cbb90fd29f3068803
diff --git a/dev-ml/atdgen/atdgen-1.10.0.ebuild b/dev-ml/atdgen/atdgen-1.10.0.ebuild
new file mode 100644
index 000000000000..3460991bad5f
--- /dev/null
+++ b/dev-ml/atdgen/atdgen-1.10.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit findlib
+
+DESCRIPTION="Generates boilerplate OCaml code for JSON and Biniou IO from type definitions"
+HOMEPAGE="https://github.com/mjambon/atdgen"
+SRC_URI="https://github.com/mjambon/atdgen/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="+ocamlopt"
+
+DEPEND="
+ dev-lang/ocaml:=[ocamlopt?]
+ dev-ml/atd:=[ocamlopt?]
+ dev-ml/biniou:=[ocamlopt?]
+ dev-ml/yojson:=
+"
+RDEPEND="${DEPEND}"
+
+src_compile() {
+ emake -j1 all
+ use ocamlopt && emake opt
+}
+
+src_install() {
+ dodir /usr/bin
+ PREFIX="${ED}/usr" findlib_src_install
+ dodoc README.md
+}
diff --git a/dev-ml/atdgen/atdgen-1.10.2.ebuild b/dev-ml/atdgen/atdgen-1.10.2.ebuild
new file mode 100644
index 000000000000..e9694f441a7b
--- /dev/null
+++ b/dev-ml/atdgen/atdgen-1.10.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit findlib
+
+DESCRIPTION="Generates boilerplate OCaml code for JSON and Biniou IO from type definitions"
+HOMEPAGE="https://github.com/mjambon/atdgen"
+SRC_URI="https://github.com/mjambon/atdgen/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="+ocamlopt"
+
+DEPEND="
+ dev-lang/ocaml:=[ocamlopt?]
+ dev-ml/atd:=[ocamlopt?]
+ dev-ml/biniou:=[ocamlopt?]
+ dev-ml/yojson:=
+"
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND}
+ dev-ml/jbuilder
+ dev-ml/opam
+"
+
+src_install() {
+ opam-installer -i \
+ --prefix="${ED}/usr" \
+ --libdir="${D}/$(ocamlc -where)" \
+ --docdir="${ED}/usr/share/doc/${PF}" \
+ ${PN}.install || die
+}
diff --git a/dev-ml/atdgen/atdgen-1.12.0.ebuild b/dev-ml/atdgen/atdgen-1.12.0.ebuild
new file mode 100644
index 000000000000..84fa4a2c68a5
--- /dev/null
+++ b/dev-ml/atdgen/atdgen-1.12.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit findlib
+
+DESCRIPTION="Generates boilerplate OCaml code for JSON and Biniou IO from type definitions"
+HOMEPAGE="https://github.com/mjambon/atd"
+SRC_URI="https://github.com/mjambon/atd/archive/v${PV}.tar.gz -> atd-${PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="+ocamlopt"
+
+DEPEND="
+ dev-lang/ocaml:=[ocamlopt?]
+ dev-ml/atd:=
+ dev-ml/biniou:=
+ dev-ml/yojson:=
+"
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND}
+ dev-ml/jbuilder
+ dev-ml/opam
+"
+
+S="${WORKDIR}/atd-${PV}"
+
+src_compile() {
+ jbuilder build -p atdgen || die
+}
+
+oinstall() {
+ opam-installer -i \
+ --prefix="${ED}/usr" \
+ --libdir="${D}/$(ocamlc -where)" \
+ --docdir="${ED}/usr/share/doc/${PF}" \
+ ${1}.install || die
+}
+
+src_install() {
+ oinstall atdgen
+}
diff --git a/dev-ml/atdgen/metadata.xml b/dev-ml/atdgen/metadata.xml
new file mode 100644
index 000000000000..3bc3fdf37cf0
--- /dev/null
+++ b/dev-ml/atdgen/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">mjambon/atdgen</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/base-0.9.1 b/dev-ml/base-0.9.1
deleted file mode 100644
index 2b073c85bf45..000000000000
--- a/dev-ml/base-0.9.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install test
-DEPEND=dev-lang/ocaml:= dev-ml/sexplib:= <dev-ml/sexplib-100 dev-ml/opam dev-ml/jbuilder
-DESCRIPTION=Standard library for OCaml
-EAPI=6
-HOMEPAGE=https://github.com/janestreet/base
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-lang/ocaml:= dev-ml/sexplib:= <dev-ml/sexplib-100
-SLOT=0/0.9.1
-SRC_URI=https://github.com/janestreet/base/archive/v0.9.1.tar.gz -> base-0.9.1.tar.gz
-_md5_=10997d98e72b417a7673a57635456216
diff --git a/dev-ml/base-0.9.2 b/dev-ml/base-0.9.2
deleted file mode 100644
index 64335585f85d..000000000000
--- a/dev-ml/base-0.9.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install test
-DEPEND=dev-lang/ocaml:= dev-ml/sexplib:= <dev-ml/sexplib-100 dev-ml/opam dev-ml/jbuilder
-DESCRIPTION=Standard library for OCaml
-EAPI=6
-HOMEPAGE=https://github.com/janestreet/base
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-lang/ocaml:= dev-ml/sexplib:= <dev-ml/sexplib-100
-SLOT=0/0.9.2
-SRC_URI=https://github.com/janestreet/base/archive/v0.9.2.tar.gz -> base-0.9.2.tar.gz
-_md5_=10997d98e72b417a7673a57635456216
diff --git a/dev-ml/base-0.9.3 b/dev-ml/base-0.9.3
deleted file mode 100644
index 1b7742490c28..000000000000
--- a/dev-ml/base-0.9.3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install test
-DEPEND=dev-lang/ocaml:= dev-ml/sexplib:= <dev-ml/sexplib-100 dev-ml/opam dev-ml/jbuilder
-DESCRIPTION=Standard library for OCaml
-EAPI=6
-HOMEPAGE=https://github.com/janestreet/base
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-lang/ocaml:= dev-ml/sexplib:= <dev-ml/sexplib-100
-SLOT=0/0.9.3
-SRC_URI=https://github.com/janestreet/base/archive/v0.9.3.tar.gz -> base-0.9.3.tar.gz
-_md5_=145714d16353d161bc07df1ca450d0d9
diff --git a/dev-ml/base-0.9.4 b/dev-ml/base-0.9.4
deleted file mode 100644
index d08c427d96a2..000000000000
--- a/dev-ml/base-0.9.4
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install test
-DEPEND=dev-lang/ocaml:= dev-ml/sexplib:= <dev-ml/sexplib-100 dev-ml/opam dev-ml/jbuilder
-DESCRIPTION=Standard library for OCaml
-EAPI=6
-HOMEPAGE=https://github.com/janestreet/base
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-lang/ocaml:= dev-ml/sexplib:= <dev-ml/sexplib-100
-SLOT=0/0.9.4
-SRC_URI=https://github.com/janestreet/base/archive/v0.9.4.tar.gz -> base-0.9.4.tar.gz
-_md5_=145714d16353d161bc07df1ca450d0d9
diff --git a/dev-ml/base/Manifest b/dev-ml/base/Manifest
new file mode 100644
index 000000000000..afccdf278c93
--- /dev/null
+++ b/dev-ml/base/Manifest
@@ -0,0 +1,9 @@
+DIST base-0.9.1.tar.gz 286498 BLAKE2B fc2b8b3894af1ee142e5f46f89fbc508aa0a57dd50624598137364f6e6c7bda33864d8131f84838840a86ed8b3dd0d14f3833484c29e6fe3a2ffabefc89cd9e9 SHA512 e1eb26eb07ee3489c8f42a886e2131bcc5eb5e965727eb29910e3aa37cdab6d23bfbf71421e16b77d9fe20a69392f9313ad6189c9618013794f0ed7df8c76c52
+DIST base-0.9.2.tar.gz 286533 BLAKE2B 851472c23c5a79436ee02cf45c0f797de21efbe52b7ca0a9dd8a4244b1808ff9f14b8e364654ebbbfb6d21bd7532f9ee1df0d2728a23154601d4abf69f916dd8 SHA512 9eae093c18e4fcbc02eb970b73bb7e49a94e0ccdd3fd6509d0668035b454ad8b5894bdbd10027a83681e993b4e1dec97db213b7fdfc293cb9737bae303002e11
+DIST base-0.9.3.tar.gz 286655 BLAKE2B 05a53a528a321fb627a2aba1521028b59741ce2de5e24a87cc4a448dedeb788bace907a6d7d49521ff90d56e1c302135dacfa32ff8ab4525e9f0c476fc376bd2 SHA512 7c7ca4439479230a6d338ce51b14c93225b71fd98242f47d82e06c08cbec092a33faa7385db8d21ce0302e7f4f3cf5d659a704e2d85ab3391e046c7d7ea3b62b
+DIST base-0.9.4.tar.gz 286689 BLAKE2B adf0da9f82aaa8884a99db2d307e72a40a232dbc2517b371af65671966d488f9f77e86c32425077cd513075b8a3546727f3f596eac7c46876b25198a46ac373b SHA512 9e25caee46ec09c835aa74857f415ac61adeb1ae8d6773334fa1b28699b9ebbac9ef95a698b1f324d0ad59c27ea52fea0e0df86bf4908b6ba3e5121eb8e26076
+EBUILD base-0.9.1.ebuild 702 BLAKE2B 604ee169030bb7aa3d81024da3ee846947a5dd891879d4f06b8eedc996aa145362a2af8194fb25e564551d9ca3879919b6d62d90741c39246d014485ef30d88b SHA512 fec860167885783b655536a434bb3472b949f95416cdb01ba3ce89482459c9248598e73edb09000567abbb48ce57ceb6006b8b7a96770bcd79bb18fb116bf2f6
+EBUILD base-0.9.2.ebuild 702 BLAKE2B 604ee169030bb7aa3d81024da3ee846947a5dd891879d4f06b8eedc996aa145362a2af8194fb25e564551d9ca3879919b6d62d90741c39246d014485ef30d88b SHA512 fec860167885783b655536a434bb3472b949f95416cdb01ba3ce89482459c9248598e73edb09000567abbb48ce57ceb6006b8b7a96770bcd79bb18fb116bf2f6
+EBUILD base-0.9.3.ebuild 712 BLAKE2B 26c21c6921e51c2314327587db47ffc7552615c5de04286e3d1461e86d96a364d90af24667b7fe69a0d3f50b21fa1c7563acc11c0061589629bad01f5418d729 SHA512 7eae087098b129eef8d7d3fc2b825b476e2b8c361f4e43d13f9276acdc412f7ee09c80627790ea4d79daea773194a0f8526074c05db5e49d506e6eb44b9dbad8
+EBUILD base-0.9.4.ebuild 712 BLAKE2B 26c21c6921e51c2314327587db47ffc7552615c5de04286e3d1461e86d96a364d90af24667b7fe69a0d3f50b21fa1c7563acc11c0061589629bad01f5418d729 SHA512 7eae087098b129eef8d7d3fc2b825b476e2b8c361f4e43d13f9276acdc412f7ee09c80627790ea4d79daea773194a0f8526074c05db5e49d506e6eb44b9dbad8
+MISC metadata.xml 327 BLAKE2B a3e0dde445b55a7e413fc654119aeac3d41b5b3956be7a3dbfbba82a6f4106d250b5b02b52f41283e7f1c44f746fbe1cdd779c940ab6d1a797aece1224a48924 SHA512 98fc8cf09cbf484d4b6c1ce63a2b422c1f66e8ba26e87990bb813c7f650cca486a973f1390785951ed2a7c50ae329859c848b165b7189d33eaa61da02334a291
diff --git a/dev-ml/base/base-0.9.1.ebuild b/dev-ml/base/base-0.9.1.ebuild
new file mode 100644
index 000000000000..b6a07e3d5965
--- /dev/null
+++ b/dev-ml/base/base-0.9.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Standard library for OCaml"
+HOMEPAGE="https://github.com/janestreet/base"
+SRC_URI="https://github.com/janestreet/base/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+ dev-lang/ocaml:=
+ dev-ml/sexplib:=
+ <dev-ml/sexplib-100
+"
+DEPEND="${RDEPEND} dev-ml/opam dev-ml/jbuilder"
+
+src_test() {
+ jbuilder runtest || die
+}
+
+src_install() {
+ opam-installer -i \
+ --prefix="${ED}/usr" \
+ --libdir="${D}/$(ocamlc -where)" \
+ --docdir="${ED}/usr/share/doc/${PF}" \
+ ${PN}.install || die
+ dodoc ROADMAP.md README.org
+}
diff --git a/dev-ml/base/base-0.9.2.ebuild b/dev-ml/base/base-0.9.2.ebuild
new file mode 100644
index 000000000000..b6a07e3d5965
--- /dev/null
+++ b/dev-ml/base/base-0.9.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Standard library for OCaml"
+HOMEPAGE="https://github.com/janestreet/base"
+SRC_URI="https://github.com/janestreet/base/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+ dev-lang/ocaml:=
+ dev-ml/sexplib:=
+ <dev-ml/sexplib-100
+"
+DEPEND="${RDEPEND} dev-ml/opam dev-ml/jbuilder"
+
+src_test() {
+ jbuilder runtest || die
+}
+
+src_install() {
+ opam-installer -i \
+ --prefix="${ED}/usr" \
+ --libdir="${D}/$(ocamlc -where)" \
+ --docdir="${ED}/usr/share/doc/${PF}" \
+ ${PN}.install || die
+ dodoc ROADMAP.md README.org
+}
diff --git a/dev-ml/base/base-0.9.3.ebuild b/dev-ml/base/base-0.9.3.ebuild
new file mode 100644
index 000000000000..05dc737ee91d
--- /dev/null
+++ b/dev-ml/base/base-0.9.3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Standard library for OCaml"
+HOMEPAGE="https://github.com/janestreet/base"
+SRC_URI="https://github.com/janestreet/base/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="
+ dev-lang/ocaml:=
+ dev-ml/sexplib:=
+ <dev-ml/sexplib-100
+"
+DEPEND="${RDEPEND} dev-ml/opam dev-ml/jbuilder"
+
+src_test() {
+ jbuilder runtest || die
+}
+
+src_install() {
+ opam-installer -i \
+ --prefix="${ED}/usr" \
+ --libdir="${D}/$(ocamlc -where)" \
+ --docdir="${ED}/usr/share/doc/${PF}" \
+ ${PN}.install || die
+ dodoc ROADMAP.md README.org
+}
diff --git a/dev-ml/base/base-0.9.4.ebuild b/dev-ml/base/base-0.9.4.ebuild
new file mode 100644
index 000000000000..05dc737ee91d
--- /dev/null
+++ b/dev-ml/base/base-0.9.4.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Standard library for OCaml"
+HOMEPAGE="https://github.com/janestreet/base"
+SRC_URI="https://github.com/janestreet/base/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="
+ dev-lang/ocaml:=
+ dev-ml/sexplib:=
+ <dev-ml/sexplib-100
+"
+DEPEND="${RDEPEND} dev-ml/opam dev-ml/jbuilder"
+
+src_test() {
+ jbuilder runtest || die
+}
+
+src_install() {
+ opam-installer -i \
+ --prefix="${ED}/usr" \
+ --libdir="${D}/$(ocamlc -where)" \
+ --docdir="${ED}/usr/share/doc/${PF}" \
+ ${PN}.install || die
+ dodoc ROADMAP.md README.org
+}
diff --git a/dev-ml/base/metadata.xml b/dev-ml/base/metadata.xml
new file mode 100644
index 000000000000..08acd8ba03fa
--- /dev/null
+++ b/dev-ml/base/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">janestreet/base</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/batteries-2.7.0 b/dev-ml/batteries-2.7.0
deleted file mode 100644
index 4fcb1d416deb..000000000000
--- a/dev-ml/batteries-2.7.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ml/camomile:= test? ( dev-ml/ounit dev-ml/iTeML ) >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=The community-maintained foundation library for your OCaml projects
-EAPI=5
-HOMEPAGE=https://github.com/ocaml-batteries-team/batteries-included/
-IUSE=test +ocamlopt debug
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1-with-linking-exception
-RDEPEND=dev-ml/camomile:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
-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 983774947da124fb7d542ce25a218bb1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e oasis 9256ed89af74c3365ec888c00bfdfe43 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3bb20054f840efe54ab07376895c7c5a
diff --git a/dev-ml/batteries/Manifest b/dev-ml/batteries/Manifest
new file mode 100644
index 000000000000..f1999de9b31a
--- /dev/null
+++ b/dev-ml/batteries/Manifest
@@ -0,0 +1,3 @@
+DIST batteries-2.7.0.tar.gz 768498 BLAKE2B ded30928d51bd6f6bc023803bb404a140a8bbc64d7dea3c6d63cd7ad4aacd470621a6179684772930c6e57530a57b3136711ca32df30332104db2081518f408c SHA512 ecb973c9cc535fce18db8efb1bfb9dfde73d7a7fc82cb6b0657547b6f7d173e9004015f698065ed5efeb9f89f1fcc1b548745b708139ce0d01eb6f63981421c9
+EBUILD batteries-2.7.0.ebuild 670 BLAKE2B 62ac606f17c6f80b2f888c9d4b56fadb59da1bf0478a925b232a9eb87cbd0aff8da407ec3a176a0ec7add982bb5a35b898a7b2d8bd4cae2a77a0b4f1ad7f6661 SHA512 e76610c9f031b0e818cc2ccc11326435b89791e18f5e6fda8d5f604920d7b4a514a1e4fd5df2ff63f3e42c074f7f4b612a7d947af0e7b5e29ef9698b44c6c604
+MISC metadata.xml 351 BLAKE2B f378c7afb7bced16f4ae5fac696bcc724995f79ecc49a84b3fab84c2f1bc58bbc5feb989ab8d4d5b29e5d2e0586e9e0b0b362b848c5025fe025775b37bad2f09 SHA512 12f12ef699bdbab80cb19ebf1a842d65bd53dc147d8e09568484988d9b5b8c86918c4e9afd90c27088426e8f85bbb9d2228544ac9ab4b9c9a60adadb2bda36fb
diff --git a/dev-ml/batteries/batteries-2.7.0.ebuild b/dev-ml/batteries/batteries-2.7.0.ebuild
new file mode 100644
index 000000000000..7a5afefceaf9
--- /dev/null
+++ b/dev-ml/batteries/batteries-2.7.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit oasis eutils
+
+DESCRIPTION="The community-maintained foundation library for your OCaml projects"
+HOMEPAGE="https://github.com/ocaml-batteries-team/batteries-included/"
+SRC_URI="https://github.com/ocaml-batteries-team/batteries-included/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-ml/camomile:="
+DEPEND="${RDEPEND}
+ test? ( dev-ml/ounit dev-ml/iTeML )"
+
+DOCS=( "ChangeLog" "FAQ" "README.folders" "README.md" )
+
+S="${WORKDIR}/${PN}-included-${PV}"
diff --git a/dev-ml/batteries/metadata.xml b/dev-ml/batteries/metadata.xml
new file mode 100644
index 000000000000..e1a9d13f792f
--- /dev/null
+++ b/dev-ml/batteries/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">ocaml-batteries-team/batteries-included</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/bignum-0.9.0 b/dev-ml/bignum-0.9.0
deleted file mode 100644
index fc50bc3870b7..000000000000
--- a/dev-ml/bignum-0.9.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-lang/ocaml:= dev-ml/core_kernel:= dev-ml/core_kernel:= dev-ml/ppx_driver:= dev-ml/ppx_jane:= dev-ml/typerep:= dev-ml/zarith:= <dev-ml/ppx_driver-100 <dev-ml/ppx_jane-100 dev-ml/opam dev-ml/jbuilder
-DESCRIPTION=Core-flavoured wrapper around zarith's arbitrary-precision rationals
-EAPI=6
-HOMEPAGE=https://github.com/janestreet/bignum
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-lang/ocaml:= dev-ml/core_kernel:= dev-ml/core_kernel:= dev-ml/ppx_driver:= dev-ml/ppx_jane:= dev-ml/typerep:= dev-ml/zarith:= <dev-ml/ppx_driver-100 <dev-ml/ppx_jane-100
-SLOT=0/0.9.0
-SRC_URI=https://github.com/janestreet/bignum/archive/v0.9.0.tar.gz -> bignum-0.9.0.tar.gz
-_md5_=8c9f18b6be5bfdfc66aa8c08adbff327
diff --git a/dev-ml/bignum/Manifest b/dev-ml/bignum/Manifest
new file mode 100644
index 000000000000..c1cb7bf87dba
--- /dev/null
+++ b/dev-ml/bignum/Manifest
@@ -0,0 +1,3 @@
+DIST bignum-0.9.0.tar.gz 28060 BLAKE2B c104d6040346464d9b8b3a97cb6a64298c93778225c149d3d6640562a32a1a728eaebe398a4044f1df5db2b40534ea18098e9aaaf948d8c5ddbac51d2515ab3e SHA512 ac80a9303cd177819db74ee6e3aaada76c4c97f9d654b902b99708b0123989b043e9c8db5f05e6d4bdf0453975b3826bed6fc18deff7e7c7ff194a7de908a5c5
+EBUILD bignum-0.9.0.ebuild 803 BLAKE2B cce09b4f0f30cabaac7fc2d510a1894169a8372ae23387c9d7167ec83d7d75e880132290914df2e19bf41602ed96a1d8aa3f5f537ac7119a596b9235923daae9 SHA512 01019345f819530ae490322ce7b6930fd414fb2c2017a9fe91bcc828ef3aa07f18294d0d1626579282a86421901899744125fc545597d0b00282d8b44bb9b6c5
+MISC metadata.xml 339 BLAKE2B f9ec2a64b4552eeb3ac4c543bc526d24ed8dcc4776cff6e29de64ab2c26facddf62fc756db0d0d8f2d6cd6a41a621eab6a7d114dc286e279f5264b8bd39739b2 SHA512 baa1e6d6c8d0efcd5607311e7286527095f0c880384d1ad807bcce1e44ca46f9346753e3b4b70ecac3d4544ce64a838590bfaaa0d7c914f43374913d51ed5adc
diff --git a/dev-ml/bignum/bignum-0.9.0.ebuild b/dev-ml/bignum/bignum-0.9.0.ebuild
new file mode 100644
index 000000000000..a2a5971bed66
--- /dev/null
+++ b/dev-ml/bignum/bignum-0.9.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Core-flavoured wrapper around zarith's arbitrary-precision rationals"
+HOMEPAGE="https://github.com/janestreet/bignum"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+ dev-lang/ocaml:=
+ dev-ml/core_kernel:=
+ dev-ml/core_kernel:=
+ dev-ml/ppx_driver:=
+ dev-ml/ppx_jane:=
+ dev-ml/typerep:=
+ dev-ml/zarith:=
+ <dev-ml/ppx_driver-100
+ <dev-ml/ppx_jane-100
+"
+DEPEND="${RDEPEND} dev-ml/opam dev-ml/jbuilder"
+
+src_install() {
+ opam-installer -i \
+ --prefix="${ED}/usr" \
+ --libdir="${D}/$(ocamlc -where)" \
+ --docdir="${ED}/usr/share/doc/${PF}" \
+ ${PN}.install || die
+}
diff --git a/dev-ml/bignum/metadata.xml b/dev-ml/bignum/metadata.xml
new file mode 100644
index 000000000000..bf7e34454b29
--- /dev/null
+++ b/dev-ml/bignum/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">janestreet/bignum</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/bin-prot-0.9.0 b/dev-ml/bin-prot-0.9.0
deleted file mode 100644
index cfce96961b67..000000000000
--- a/dev-ml/bin-prot-0.9.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install test
-DEPEND=dev-lang/ocaml:= dev-ml/base:= dev-ml/ppx_compare:= dev-ml/ppx_custom_printf:= dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_fields_conv:= dev-ml/ppx_sexp_conv:= dev-ml/ppx_type_conv:= dev-ml/ppx_variants_conv:= dev-ml/sexplib:= dev-ml/ocaml-migrate-parsetree:= dev-ml/opam dev-ml/jbuilder
-DESCRIPTION=Binary protocol generator
-EAPI=6
-HOMEPAGE=https://github.com/janestreet/bin_prot
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-lang/ocaml:= dev-ml/base:= dev-ml/ppx_compare:= dev-ml/ppx_custom_printf:= dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_fields_conv:= dev-ml/ppx_sexp_conv:= dev-ml/ppx_type_conv:= dev-ml/ppx_variants_conv:= dev-ml/sexplib:= dev-ml/ocaml-migrate-parsetree:=
-SLOT=0/0.9.0
-SRC_URI=https://github.com/janestreet/bin_prot/archive/v0.9.0.tar.gz -> bin-prot-0.9.0.tar.gz
-_md5_=ca7055131f1fcafb82f0ccb0307cf5d6
diff --git a/dev-ml/bin-prot-0.9.1 b/dev-ml/bin-prot-0.9.1
deleted file mode 100644
index bba9590d5efb..000000000000
--- a/dev-ml/bin-prot-0.9.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install test
-DEPEND=dev-lang/ocaml:= dev-ml/base:= dev-ml/ppx_compare:= dev-ml/ppx_custom_printf:= dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_fields_conv:= dev-ml/ppx_sexp_conv:= dev-ml/ppx_type_conv:= dev-ml/ppx_variants_conv:= dev-ml/sexplib:= dev-ml/ocaml-migrate-parsetree:= dev-ml/opam dev-ml/jbuilder
-DESCRIPTION=Binary protocol generator
-EAPI=6
-HOMEPAGE=https://github.com/janestreet/bin_prot
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-lang/ocaml:= dev-ml/base:= dev-ml/ppx_compare:= dev-ml/ppx_custom_printf:= dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_fields_conv:= dev-ml/ppx_sexp_conv:= dev-ml/ppx_type_conv:= dev-ml/ppx_variants_conv:= dev-ml/sexplib:= dev-ml/ocaml-migrate-parsetree:=
-SLOT=0/0.9.1
-SRC_URI=https://github.com/janestreet/bin_prot/archive/v0.9.1.tar.gz -> bin-prot-0.9.1.tar.gz
-_md5_=ca7055131f1fcafb82f0ccb0307cf5d6
diff --git a/dev-ml/bin-prot-0.9.2 b/dev-ml/bin-prot-0.9.2
deleted file mode 100644
index 082a19e75d12..000000000000
--- a/dev-ml/bin-prot-0.9.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install test
-DEPEND=dev-lang/ocaml:= dev-ml/base:= dev-ml/ppx_compare:= dev-ml/ppx_custom_printf:= dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_fields_conv:= dev-ml/ppx_sexp_conv:= dev-ml/ppx_type_conv:= dev-ml/ppx_variants_conv:= dev-ml/sexplib:= dev-ml/ocaml-migrate-parsetree:= dev-ml/opam dev-ml/jbuilder
-DESCRIPTION=Binary protocol generator
-EAPI=6
-HOMEPAGE=https://github.com/janestreet/bin_prot
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-lang/ocaml:= dev-ml/base:= dev-ml/ppx_compare:= dev-ml/ppx_custom_printf:= dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_fields_conv:= dev-ml/ppx_sexp_conv:= dev-ml/ppx_type_conv:= dev-ml/ppx_variants_conv:= dev-ml/sexplib:= dev-ml/ocaml-migrate-parsetree:=
-SLOT=0/0.9.2
-SRC_URI=https://github.com/janestreet/bin_prot/archive/v0.9.2.tar.gz -> bin-prot-0.9.2.tar.gz
-_md5_=ca7055131f1fcafb82f0ccb0307cf5d6
diff --git a/dev-ml/bin-prot/Manifest b/dev-ml/bin-prot/Manifest
new file mode 100644
index 000000000000..08024884edaa
--- /dev/null
+++ b/dev-ml/bin-prot/Manifest
@@ -0,0 +1,7 @@
+DIST bin-prot-0.9.0.tar.gz 338958 BLAKE2B 78b447f42f2c75d70d17dedd855c2c08b740ea847a489bdcff860b88f4ce3fbfd05d88f87d16d761b26314715507288035f708e5bb8267125a360abf4df70850 SHA512 111e0a9d07bdf22db6e3e7e9a165d196a264a3652e4cc363ec8f49c4ef385b8b76982a9d42fa8e0954e15a4a80c35ca6876c70fe6f20d7497fd8a2d53fab24c1
+DIST bin-prot-0.9.1.tar.gz 338969 BLAKE2B 249329c0093affc082a42b5a496f0f8861d761799104ef50d788331179e3a6965cb1cd03ee6530782a608677488a4970583e85f25e5ba220d2d179d3d16908c2 SHA512 6575f51931c6dfb0f640bc6eb8bb789fd1ca4b1ca95876df906bd5d5c3320dc8aebedd44b5c6feee6b66b40007bd0077da6cc628c791daba0c8cf806d7af7b9c
+DIST bin-prot-0.9.2.tar.gz 339008 BLAKE2B 3fcad0d5a88393b49b22d42b4669da485ddd9a61938cdda4183658eca5b0369265480005945bdaeb53cc8af5c324cc7cb158b4208e4a7a7f821db5c045502910 SHA512 a4aa453ff4d2037b8ed0e53186fafa876a96ecb970ef25e99cf133afa4615b8fc53de75234454519a4f7c11f771f98e8117f8fa37682dbb8f73d4fda8a1805f7
+EBUILD bin-prot-0.9.0.ebuild 963 BLAKE2B abf71b9621542821ebfc763e4fdb558f7fe7595c019aebc4397e2672f36b79e8b8f1c22ca224001027425246f19c83be149a2b68dcbd20182158f6fd6bf41a99 SHA512 a477691a125dcbc10fdd4d6fa0cee7315a4370e1b81bbc7823f25233c4d828a46fdbbfb5b97eeadb77212734b0a9b3c3a95ed1979acb7016c47f5c3369041024
+EBUILD bin-prot-0.9.1.ebuild 963 BLAKE2B abf71b9621542821ebfc763e4fdb558f7fe7595c019aebc4397e2672f36b79e8b8f1c22ca224001027425246f19c83be149a2b68dcbd20182158f6fd6bf41a99 SHA512 a477691a125dcbc10fdd4d6fa0cee7315a4370e1b81bbc7823f25233c4d828a46fdbbfb5b97eeadb77212734b0a9b3c3a95ed1979acb7016c47f5c3369041024
+EBUILD bin-prot-0.9.2.ebuild 963 BLAKE2B abf71b9621542821ebfc763e4fdb558f7fe7595c019aebc4397e2672f36b79e8b8f1c22ca224001027425246f19c83be149a2b68dcbd20182158f6fd6bf41a99 SHA512 a477691a125dcbc10fdd4d6fa0cee7315a4370e1b81bbc7823f25233c4d828a46fdbbfb5b97eeadb77212734b0a9b3c3a95ed1979acb7016c47f5c3369041024
+MISC metadata.xml 331 BLAKE2B 1d7b89f9fa73264f0a01488fecfb06eb12a4794944fb81a646c8474966579c7b975e89ddb7ff5a192c55bc249ade9ce558441c4d6b6c899d7a4f7f32d607e652 SHA512 ecc107c7d647ea3dd2500901a77c6a588d36952864ee3473c5fc20a88349f8278ec599ba4173a48d85cf65c7224f4525fdba58d2c71dbdbb87b39cbae89abef5
diff --git a/dev-ml/bin-prot/bin-prot-0.9.0.ebuild b/dev-ml/bin-prot/bin-prot-0.9.0.ebuild
new file mode 100644
index 000000000000..5c2d435fef0b
--- /dev/null
+++ b/dev-ml/bin-prot/bin-prot-0.9.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Binary protocol generator"
+HOMEPAGE="https://github.com/janestreet/bin_prot"
+SRC_URI="https://github.com/janestreet/bin_prot/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+ dev-lang/ocaml:=
+ dev-ml/base:=
+ dev-ml/ppx_compare:=
+ dev-ml/ppx_custom_printf:=
+ dev-ml/ppx_core:=
+ dev-ml/ppx_driver:=
+ dev-ml/ppx_fields_conv:=
+ dev-ml/ppx_sexp_conv:=
+ dev-ml/ppx_type_conv:=
+ dev-ml/ppx_variants_conv:=
+ dev-ml/sexplib:=
+ dev-ml/ocaml-migrate-parsetree:=
+"
+DEPEND="${RDEPEND} dev-ml/opam dev-ml/jbuilder"
+
+S="${WORKDIR}/bin_prot-${PV}"
+
+src_test() {
+ jbuilder runtest || die
+}
+
+src_install() {
+ opam-installer -i \
+ --prefix="${ED}/usr" \
+ --libdir="${D}/$(ocamlc -where)" \
+ --docdir="${ED}/usr/share/doc/${PF}" \
+ ${PN/-/_}.install || die
+ dodoc CHANGES.md README.md
+}
diff --git a/dev-ml/bin-prot/bin-prot-0.9.1.ebuild b/dev-ml/bin-prot/bin-prot-0.9.1.ebuild
new file mode 100644
index 000000000000..5c2d435fef0b
--- /dev/null
+++ b/dev-ml/bin-prot/bin-prot-0.9.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Binary protocol generator"
+HOMEPAGE="https://github.com/janestreet/bin_prot"
+SRC_URI="https://github.com/janestreet/bin_prot/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+ dev-lang/ocaml:=
+ dev-ml/base:=
+ dev-ml/ppx_compare:=
+ dev-ml/ppx_custom_printf:=
+ dev-ml/ppx_core:=
+ dev-ml/ppx_driver:=
+ dev-ml/ppx_fields_conv:=
+ dev-ml/ppx_sexp_conv:=
+ dev-ml/ppx_type_conv:=
+ dev-ml/ppx_variants_conv:=
+ dev-ml/sexplib:=
+ dev-ml/ocaml-migrate-parsetree:=
+"
+DEPEND="${RDEPEND} dev-ml/opam dev-ml/jbuilder"
+
+S="${WORKDIR}/bin_prot-${PV}"
+
+src_test() {
+ jbuilder runtest || die
+}
+
+src_install() {
+ opam-installer -i \
+ --prefix="${ED}/usr" \
+ --libdir="${D}/$(ocamlc -where)" \
+ --docdir="${ED}/usr/share/doc/${PF}" \
+ ${PN/-/_}.install || die
+ dodoc CHANGES.md README.md
+}
diff --git a/dev-ml/bin-prot/bin-prot-0.9.2.ebuild b/dev-ml/bin-prot/bin-prot-0.9.2.ebuild
new file mode 100644
index 000000000000..5c2d435fef0b
--- /dev/null
+++ b/dev-ml/bin-prot/bin-prot-0.9.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Binary protocol generator"
+HOMEPAGE="https://github.com/janestreet/bin_prot"
+SRC_URI="https://github.com/janestreet/bin_prot/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+ dev-lang/ocaml:=
+ dev-ml/base:=
+ dev-ml/ppx_compare:=
+ dev-ml/ppx_custom_printf:=
+ dev-ml/ppx_core:=
+ dev-ml/ppx_driver:=
+ dev-ml/ppx_fields_conv:=
+ dev-ml/ppx_sexp_conv:=
+ dev-ml/ppx_type_conv:=
+ dev-ml/ppx_variants_conv:=
+ dev-ml/sexplib:=
+ dev-ml/ocaml-migrate-parsetree:=
+"
+DEPEND="${RDEPEND} dev-ml/opam dev-ml/jbuilder"
+
+S="${WORKDIR}/bin_prot-${PV}"
+
+src_test() {
+ jbuilder runtest || die
+}
+
+src_install() {
+ opam-installer -i \
+ --prefix="${ED}/usr" \
+ --libdir="${D}/$(ocamlc -where)" \
+ --docdir="${ED}/usr/share/doc/${PF}" \
+ ${PN/-/_}.install || die
+ dodoc CHANGES.md README.md
+}
diff --git a/dev-ml/bin-prot/metadata.xml b/dev-ml/bin-prot/metadata.xml
new file mode 100644
index 000000000000..ddec9f7c9b8b
--- /dev/null
+++ b/dev-ml/bin-prot/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">janestreet/bin_prot</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/biniou-1.0.12 b/dev-ml/biniou-1.0.12
deleted file mode 100644
index 021debe39734..000000000000
--- a/dev-ml/biniou-1.0.12
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=>=dev-lang/ocaml-3.11:=[ocamlopt?] dev-ml/easy-format:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=A binary data serialization format inspired by JSON for OCaml
-EAPI=5
-HOMEPAGE=https://github.com/mjambon/biniou
-IUSE=+ocamlopt
-KEYWORDS=~amd64
-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
-_md5_=918cdf4fdd785509dd6d863cf65ca27a
diff --git a/dev-ml/biniou-1.0.13 b/dev-ml/biniou-1.0.13
deleted file mode 100644
index 723f4bdf5877..000000000000
--- a/dev-ml/biniou-1.0.13
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=>=dev-lang/ocaml-3.11:=[ocamlopt?] dev-ml/easy-format:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=A binary data serialization format inspired by JSON for OCaml
-EAPI=5
-HOMEPAGE=https://github.com/mjambon/biniou
-IUSE=+ocamlopt
-KEYWORDS=~amd64
-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
-_md5_=2d42a0143d49d564efa6218f47916204
diff --git a/dev-ml/biniou-1.1.0 b/dev-ml/biniou-1.1.0
deleted file mode 100644
index 4bd42582b786..000000000000
--- a/dev-ml/biniou-1.1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=>=dev-lang/ocaml-3.11:=[ocamlopt?] dev-ml/easy-format:=[ocamlopt?] dev-ml/jbuilder dev-ml/opam >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=A binary data serialization format inspired by JSON for OCaml
-EAPI=5
-HOMEPAGE=https://github.com/mjambon/biniou
-IUSE=+ocamlopt
-KEYWORDS=~amd64
-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
-_md5_=0737b25fd7076c9b7fd353f69672dcb4
diff --git a/dev-ml/biniou-1.2.0 b/dev-ml/biniou-1.2.0
deleted file mode 100644
index 12295737f4b8..000000000000
--- a/dev-ml/biniou-1.2.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=>=dev-lang/ocaml-3.11:=[ocamlopt?] dev-ml/easy-format:=[ocamlopt?] dev-ml/jbuilder dev-ml/opam >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=A binary data serialization format inspired by JSON for OCaml
-EAPI=5
-HOMEPAGE=https://github.com/mjambon/biniou
-IUSE=+ocamlopt
-KEYWORDS=~amd64
-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
-_md5_=0737b25fd7076c9b7fd353f69672dcb4
diff --git a/dev-ml/biniou/Manifest b/dev-ml/biniou/Manifest
new file mode 100644
index 000000000000..049b3ca09e85
--- /dev/null
+++ b/dev-ml/biniou/Manifest
@@ -0,0 +1,9 @@
+DIST biniou-1.0.12.tar.gz 24262 BLAKE2B c7dd3ff0d7cf47f7c464cf379fa1ac84e11c284399730c55d803d0da1e5c10ed0b974b51705d22e0a29513bf7a4774139720aacd7094a52685b6d7bc17067ad8 SHA512 df729e4064f6726efa409ceb5e6ff1987923d9cd28339d6e1c4c185a07c0738b027cafba33a139483eeb8f88e58f66fbb6a57d8e748e7355073a7622fb4d7a07
+DIST biniou-1.0.13.tar.gz 24327 BLAKE2B 19a69665805b917c9bc02ad459c8a98b8cb64f707f3664e863d5315fd1444e0cb5545549220494dab136287cf4f8ffab8d5246a2068bb154c2ea10553b63737d SHA512 2fe109e83260f546181dd26ea175d2c4f63d0f6604c6d26fa44ee31925ba1fdaac0139a436cd0271a31294de9cd8ea65f8dde0981403c652d31de721ef696788
+DIST biniou-1.1.0.tar.gz 23432 BLAKE2B 601e160c828c32f520c7cd18d5b3ca1abfe629dcb53250d83e9dc658dacafcb7f54296b5c9604dc38b8a95acbaf64d79d283d82fe345391e593023d7dfbc2933 SHA512 755e3dcfe2a967c08b86db5a7dc917f75713611f5deb64b4fe3499aecf8e698813a1d0620eb78aa1e77c404719936c5ef5088c0c394c02fc2d7fe2629e985669
+DIST biniou-1.2.0.tar.gz 23611 BLAKE2B 01f5afada666d23b74f31cf12b5f578f3622c85311d7a1b6eb319843beac4c3ebe8e8e314a47ec14ee0ef6f5c1a5b6dd849dcf24b0c3cc8a38ca6a54d89e4c4d SHA512 04c04c2dd5e3e1237106db257567ba6900bd94759b07b02ba2e0d9209d1bbdc9ed629864e06d44a8b61f72d46fbcc7a0ffc86f82feb223d9d99ca41afc625fab
+EBUILD biniou-1.0.12.ebuild 677 BLAKE2B f801ddbd349f5e051babbd7dcdafcc61495829fa36815c62139537616b0a6ba2520d32a11ae33b29e17676968cec4c68eac0ab727ba63b21d294e891692f85c3 SHA512 e91e497852f5137da68d66231278788935070dbce74391d5f88458c72e2f7d78e3d77db5a79678eddd3edfedda11f6e1629061c0f810d87decc101421a0654a5
+EBUILD biniou-1.0.13.ebuild 677 BLAKE2B a4a411760d10d59f4fd13ea058ac5c13d0b5207d080634a93d4c891f04602ddb0c6e5235426b4edf71a868c9a85f2ff4f3ffaefc5a1ec6b43f9755830ad29c88 SHA512 7da0d42ff932c302a3d6e37626fcee4d352604769d7cff94734084318c208aebb753b4911cb142f421c12ae8c6417368bd15e729c1dafa288043b00b3f2fbce8
+EBUILD biniou-1.1.0.ebuild 732 BLAKE2B f64f5a8ad8cf933c1866426cb035f52e0f61a43177dd00cb73b5ba427374cf08ed458421c2300b536892dfd04090227133d53abd3e7b345bf1c20ef56298ec5d SHA512 911cd2d6d7b53d34b9907b83b32b0824f3708d4dfa5a53fb3ec666efc91c089ac5b0fb8956e735e8f05e5be3991217c03c35f9e9fef45fb680dca54d3d4a7f84
+EBUILD biniou-1.2.0.ebuild 732 BLAKE2B f64f5a8ad8cf933c1866426cb035f52e0f61a43177dd00cb73b5ba427374cf08ed458421c2300b536892dfd04090227133d53abd3e7b345bf1c20ef56298ec5d SHA512 911cd2d6d7b53d34b9907b83b32b0824f3708d4dfa5a53fb3ec666efc91c089ac5b0fb8956e735e8f05e5be3991217c03c35f9e9fef45fb680dca54d3d4a7f84
+MISC metadata.xml 326 BLAKE2B cea3b4a69569724f05157da56190e5a8e3f29d669e0809b62872bab206d577b83711411e5c8094a61efd9dfef1f9f7d372d442448b0d87c285f97c747ed7a264 SHA512 61779829f00e272aba3abb750345302b9a23e4b26cb0eeebdce137060803aeeff39d5df00ac122bd283a8d1d2bee8d5506631af763a3ddc90fc0b1043f6b1630
diff --git a/dev-ml/biniou/biniou-1.0.12.ebuild b/dev-ml/biniou/biniou-1.0.12.ebuild
new file mode 100644
index 000000000000..81346198c7f1
--- /dev/null
+++ b/dev-ml/biniou/biniou-1.0.12.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit findlib
+
+DESCRIPTION="A binary data serialization format inspired by JSON for OCaml"
+HOMEPAGE="https://github.com/mjambon/biniou"
+SRC_URI="https://github.com/mjambon/biniou/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0/${PV}"
+LICENSE="BSD"
+KEYWORDS="~amd64"
+IUSE="+ocamlopt"
+
+RDEPEND=">=dev-lang/ocaml-3.11:=[ocamlopt?]
+ dev-ml/easy-format:=[ocamlopt?]
+"
+DEPEND="${RDEPEND}"
+
+src_compile() {
+ emake all
+ use ocamlopt && emake opt
+}
+
+src_install() {
+ use ocamlopt && dodir /usr/bin
+ findlib_src_install BINDIR="${ED}"/usr/bin
+ dodoc README.md Changes
+}
diff --git a/dev-ml/biniou/biniou-1.0.13.ebuild b/dev-ml/biniou/biniou-1.0.13.ebuild
new file mode 100644
index 000000000000..221435a17637
--- /dev/null
+++ b/dev-ml/biniou/biniou-1.0.13.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit findlib
+
+DESCRIPTION="A binary data serialization format inspired by JSON for OCaml"
+HOMEPAGE="https://github.com/mjambon/biniou"
+SRC_URI="https://github.com/mjambon/biniou/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0/${PV}"
+LICENSE="BSD"
+KEYWORDS="~amd64"
+IUSE="+ocamlopt"
+
+RDEPEND=">=dev-lang/ocaml-3.11:=[ocamlopt?]
+ dev-ml/easy-format:=[ocamlopt?]
+"
+DEPEND="${RDEPEND}"
+
+src_compile() {
+ emake all
+ use ocamlopt && emake opt
+}
+
+src_install() {
+ use ocamlopt && dodir /usr/bin
+ findlib_src_install BINDIR="${ED}"/usr/bin
+ dodoc README.md Changes
+}
diff --git a/dev-ml/biniou/biniou-1.1.0.ebuild b/dev-ml/biniou/biniou-1.1.0.ebuild
new file mode 100644
index 000000000000..6a9705355a2a
--- /dev/null
+++ b/dev-ml/biniou/biniou-1.1.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit findlib
+
+DESCRIPTION="A binary data serialization format inspired by JSON for OCaml"
+HOMEPAGE="https://github.com/mjambon/biniou"
+SRC_URI="https://github.com/mjambon/biniou/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0/${PV}"
+LICENSE="BSD"
+KEYWORDS="~amd64"
+IUSE="+ocamlopt"
+
+RDEPEND=">=dev-lang/ocaml-3.11:=[ocamlopt?]
+ dev-ml/easy-format:=[ocamlopt?]
+"
+DEPEND="${RDEPEND}
+ dev-ml/jbuilder
+ dev-ml/opam
+"
+
+src_install() {
+ opam-installer -i \
+ --prefix="${ED}/usr" \
+ --libdir="${D}/$(ocamlc -where)" \
+ --docdir="${ED}/usr/share/doc/${PF}" \
+ --mandir="${ED}/usr/share/man" \
+ ${PN}.install || die
+}
diff --git a/dev-ml/biniou/biniou-1.2.0.ebuild b/dev-ml/biniou/biniou-1.2.0.ebuild
new file mode 100644
index 000000000000..6a9705355a2a
--- /dev/null
+++ b/dev-ml/biniou/biniou-1.2.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit findlib
+
+DESCRIPTION="A binary data serialization format inspired by JSON for OCaml"
+HOMEPAGE="https://github.com/mjambon/biniou"
+SRC_URI="https://github.com/mjambon/biniou/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0/${PV}"
+LICENSE="BSD"
+KEYWORDS="~amd64"
+IUSE="+ocamlopt"
+
+RDEPEND=">=dev-lang/ocaml-3.11:=[ocamlopt?]
+ dev-ml/easy-format:=[ocamlopt?]
+"
+DEPEND="${RDEPEND}
+ dev-ml/jbuilder
+ dev-ml/opam
+"
+
+src_install() {
+ opam-installer -i \
+ --prefix="${ED}/usr" \
+ --libdir="${D}/$(ocamlc -where)" \
+ --docdir="${ED}/usr/share/doc/${PF}" \
+ --mandir="${ED}/usr/share/man" \
+ ${PN}.install || die
+}
diff --git a/dev-ml/biniou/metadata.xml b/dev-ml/biniou/metadata.xml
new file mode 100644
index 000000000000..2def74f5ec58
--- /dev/null
+++ b/dev-ml/biniou/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">mjambon/biniou</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/bolt-1.4 b/dev-ml/bolt-1.4
deleted file mode 100644
index 1a2e7cd9614b..000000000000
--- a/dev-ml/bolt-1.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=>=dev-lang/ocaml-3.11:=[ocamlopt] dev-ml/camlp4:= dev-ml/ocamlbuild >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Logging tool for the Objective Caml language
-EAPI=5
-HOMEPAGE=http://bolt.x9c.fr/
-IUSE=doc
-KEYWORDS=~amd64
-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
-_md5_=418d85c8966f60eaee067b60a6d25845
diff --git a/dev-ml/bolt/Manifest b/dev-ml/bolt/Manifest
new file mode 100644
index 000000000000..dc452f35dda5
--- /dev/null
+++ b/dev-ml/bolt/Manifest
@@ -0,0 +1,3 @@
+DIST bolt-1.4.tar.gz 638005 BLAKE2B 2d7c4266d3798b8f7d7c72ec6ea32324106fc845bfea1969538175225e74ff1e0bf65633bd1c5d260b4cf316f3216e32cfb1eab5ed61082ab56677e9de2141c2 SHA512 799ca80603fb4f0979ae7bf7ac5acdab7a0187713021a4277d5c3f5af31ffdea042ab312754a6d20a8849b90d36327aa0cad1d6efbc20cc07a3e86dd733e362e
+EBUILD bolt-1.4.ebuild 653 BLAKE2B 64e9b5700dcb2ce2b77bbbd67eb32375afcd24dc0d539119808e4c989ba01986a41871851a7f0abbb7d0dad88542c31fd3eb3d1a353f28c74217d4b6c7744f1e SHA512 afeb609fe52ac4a80f8fe2a7b92cf7b4d0bc568a4d763d1c8b88bc03c48fda9228f4696c166498e65a5b5a116e6487e035ca50a459a9489f767fd562183d00ff
+MISC metadata.xml 243 BLAKE2B 010ca240ae06e9a9f6d7ba213eb06df36d9ba862ff2d2458d98a9fea1a1e7f3026d13832a73bce1b3ad9345029425e6abfae9e03bf126f2329b3f030ed3753fd SHA512 1c5b4b2163017e496999d1f87e5c9c5ac6c11b2e9187450ccfb3df258f34e54d278972f04ee0e8429476c6f87e091a869ac2a28c6e8c8e6d20678c3e74061449
diff --git a/dev-ml/bolt/bolt-1.4.ebuild b/dev-ml/bolt/bolt-1.4.ebuild
new file mode 100644
index 000000000000..bc070efc1e0b
--- /dev/null
+++ b/dev-ml/bolt/bolt-1.4.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit findlib
+
+DESCRIPTION="Logging tool for the Objective Caml language"
+HOMEPAGE="http://bolt.x9c.fr/"
+SRC_URI="http://bolt.x9c.fr/distrib/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="doc"
+
+RDEPEND=">=dev-lang/ocaml-3.11:=[ocamlopt]
+ dev-ml/camlp4:="
+DEPEND="${RDEPEND}
+ dev-ml/ocamlbuild
+"
+
+src_configure() {
+ sh configure
+}
+
+src_compile() {
+ emake all
+ use doc && emake doc
+}
+
+src_test() {
+ emake tests
+}
+
+src_install() {
+ findlib_src_install
+ dodoc README CHANGES FEATURES
+ use doc && dohtml ocamldoc/*
+}
diff --git a/dev-ml/bolt/metadata.xml b/dev-ml/bolt/metadata.xml
new file mode 100644
index 000000000000..ffac4d7ebc01
--- /dev/null
+++ b/dev-ml/bolt/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-ml/bos-0.1.6 b/dev-ml/bos-0.1.6
deleted file mode 100644
index a00a95f1e018..000000000000
--- a/dev-ml/bos-0.1.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=dev-lang/ocaml:= dev-ml/rresult:= dev-ml/astring:= dev-ml/fpath:= dev-ml/fmt:= dev-ml/logs:= dev-ml/findlib dev-ml/ocamlbuild dev-ml/topkg test? ( dev-ml/mtime )
-DESCRIPTION=Basic OS interaction for OCaml
-EAPI=6
-HOMEPAGE=http://erratique.ch/software/bos https://github.com/dbuenzli/bos
-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:=
-SLOT=0/0.1.6
-SRC_URI=http://erratique.ch/software/bos/releases/bos-0.1.6.tbz
-_md5_=5feb11d48b357c79cd257e71a3d398cf
diff --git a/dev-ml/bos/Manifest b/dev-ml/bos/Manifest
new file mode 100644
index 000000000000..e10110be9d2a
--- /dev/null
+++ b/dev-ml/bos/Manifest
@@ -0,0 +1,3 @@
+DIST bos-0.1.6.tbz 39822 BLAKE2B 0e10eb14fb5d429b81c67659c936e8b700c4cd417d1f5be000c8bdb0304de8ad9130e597f6e2e7771380c29c148f4339817bacc458e72a8efa894be3b85965bf SHA512 f1f10a97a32da936a7d5a0c70632e723723ee523c79f9dfd23bc42c039a194e8d69658483e6e856c7911332b799a92bf8cabfe96cc387522d7450b8f3f8f8343
+EBUILD bos-0.1.6.ebuild 858 BLAKE2B 870601e1b4d65a5a86af585068e830842e281dd56df0a2bf22fc298403fbaaf3d8cf9923ce11ab15f490c49d6f35e7c2c714b6c6c87d5d84cc84f2753eff8fd5 SHA512 99ab9b22603d2f3dca75a3bf0ab126c05d369f59b018f725e5e3b5b2dfe3e96e57085beb34080331811b62e98c2f8b2d98102b28cab97da9bf9c741a845d0437
+MISC metadata.xml 324 BLAKE2B a5bf83785f111a8b8a09b6190b2915d6c83da08eca0ef39f5395288ae9004aee6168ee9a2151ae5093e6864cdc30f50a98794a653f78495b2b1956d9abd2bec1 SHA512 17ee576273bd89dec69b2e583910cfe8fd188ca634333a9cc4998ec0f2b1396fba090f611f890f385ea7833eab205bcca5a7828a5aff925ba7ce5f09b18db148
diff --git a/dev-ml/bos/bos-0.1.6.ebuild b/dev-ml/bos/bos-0.1.6.ebuild
new file mode 100644
index 000000000000..a3b7dc553e2e
--- /dev/null
+++ b/dev-ml/bos/bos-0.1.6.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Basic OS interaction for OCaml"
+HOMEPAGE="http://erratique.ch/software/bos https://github.com/dbuenzli/bos"
+SRC_URI="http://erratique.ch/software/bos/releases/${P}.tbz"
+
+LICENSE="ISC"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND="
+ dev-lang/ocaml:=
+ dev-ml/rresult:=
+ dev-ml/astring:=
+ dev-ml/fpath:=
+ dev-ml/fmt:=
+ dev-ml/logs:=
+"
+DEPEND="${RDEPEND}
+ dev-ml/findlib
+ dev-ml/ocamlbuild
+ dev-ml/topkg
+ test? ( dev-ml/mtime )
+"
+
+src_compile() {
+ ocaml pkg/pkg.ml build --tests $(usex test true false) || die
+}
+
+src_test() {
+ ocaml pkg/pkg.ml test || die
+}
+
+src_install() {
+ opam-installer -i \
+ --prefix="${ED}/usr" \
+ --libdir="${D}/$(ocamlc -where)" \
+ --docdir="${ED}/usr/share/doc/${PF}" \
+ ${PN}.install || die
+}
diff --git a/dev-ml/bos/metadata.xml b/dev-ml/bos/metadata.xml
new file mode 100644
index 000000000000..8ebac0e8d880
--- /dev/null
+++ b/dev-ml/bos/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">dbuenzli/bos</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/bson-0.89.3 b/dev-ml/bson-0.89.3
deleted file mode 100644
index 3b704280a8cc..000000000000
--- a/dev-ml/bson-0.89.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ml/camlp4:= >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=An ocaml implementation for bson
-EAPI=5
-HOMEPAGE=http://massd.github.io/
-IUSE=+ocamlopt debug
-KEYWORDS=~amd64
-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 983774947da124fb7d542ce25a218bb1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e oasis 9256ed89af74c3365ec888c00bfdfe43 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=21393e6ddf061bd0a070aca883812dbd
diff --git a/dev-ml/bson/Manifest b/dev-ml/bson/Manifest
new file mode 100644
index 000000000000..d1b21b7a0c90
--- /dev/null
+++ b/dev-ml/bson/Manifest
@@ -0,0 +1,3 @@
+DIST bson-0.89.3.tar.gz 64461 BLAKE2B 0dd45738a30dea90aeb0971cfd927ea39651fcf1faa7b835bdd7db58f5b869336149a1635fa3868543d94e66ce485d136de4e63de3e5a00fad2f35d2aba44e2a SHA512 013f082a3f053525981d3cd6b0daabacfe094061ee37345927e040981d74735c2927af2c3b16f7c4734a13599eb04366f0c0fc40e4aa60f122bdfacfe0dc01d3
+EBUILD bson-0.89.3.ebuild 392 BLAKE2B d4d79b5097aaa133914ca2236cb14ae70599e93147f3e6d760a54db8ab2ac717cb822b806eda5ffa758be82ad8913d123fe0b8afcab9e66ed317b911824d5ff3 SHA512 eeb6ae377a4686894ae705c3d0b8e0e1c0bfdd921b082aaa377b29ce2bf9d6a54cc04c75f12dcd2d76ea3ec1e92e08b844feef6cb410d7503b6302c1a509377a
+MISC metadata.xml 322 BLAKE2B b4655fe7ee91aa23b8ae5fafba0b4586170d66a47e4d5a0792edb9d54d6ecebbb3e6106d89b191799e3d830f7706e86e00c356466e32c39f1f5e3e99b4c71dd9 SHA512 6df5f3cc116ebe60b9781da01e83c4c668806174dbc2b51bf09be9b8abf1bece044fd7a8d9f8b769a2bc9c75fb915b1bc1f2c0cd9f5f9f4538efa08c475d6e19
diff --git a/dev-ml/bson/bson-0.89.3.ebuild b/dev-ml/bson/bson-0.89.3.ebuild
new file mode 100644
index 000000000000..bdf47aa26aa9
--- /dev/null
+++ b/dev-ml/bson/bson-0.89.3.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit oasis
+
+DESCRIPTION="An ocaml implementation for bson"
+HOMEPAGE="http://massd.github.io/"
+SRC_URI="https://github.com/MassD/bson/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="dev-ml/camlp4:="
+RDEPEND="${DEPEND}"
diff --git a/dev-ml/bson/metadata.xml b/dev-ml/bson/metadata.xml
new file mode 100644
index 000000000000..80a8bc536426
--- /dev/null
+++ b/dev-ml/bson/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">MassD/bson</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/cairo-ocaml-1.2.0 b/dev-ml/cairo-ocaml-1.2.0
deleted file mode 100644
index 6787b82c5874..000000000000
--- a/dev-ml/cairo-ocaml-1.2.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=dev-lang/ocaml:= x11-libs/cairo gtk? ( dev-ml/lablgtk:2= ) pango? ( x11-libs/pango ) svg? ( x11-libs/libsvg-cairo ) >=dev-ml/findlib-1.0.4-r1 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Ocaml bindings for the cairo vector graphics library
-EAPI=5
-HOMEPAGE=https://www.cairographics.org/cairo-ocaml/
-IUSE=doc examples gtk pango svg
-KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-2.1
-RDEPEND=dev-lang/ocaml:= x11-libs/cairo gtk? ( dev-ml/lablgtk:2= ) pango? ( x11-libs/pango ) svg? ( x11-libs/libsvg-cairo )
-SLOT=0/1.2.0
-SRC_URI=https://cgit.freedesktop.org/cairo-ocaml/snapshot/cairo-ocaml-1.2.0.tar.bz2
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=941649b0d3b646d48b16bf7844bf3762
diff --git a/dev-ml/cairo-ocaml/Manifest b/dev-ml/cairo-ocaml/Manifest
new file mode 100644
index 000000000000..3a8863ea3c7c
--- /dev/null
+++ b/dev-ml/cairo-ocaml/Manifest
@@ -0,0 +1,7 @@
+AUX 0001-Add-missing-libraries-used-by-the-stubs-to-CAIRO_LIB.patch 769 BLAKE2B b41ebc707315f75a552e9e0614f7180bf773bbc4893f01996db08ee366da33852639d4a6b11c35467d28a2e3c3aa71aed005fbcdf18ca3451b4e5c17f7bad65c SHA512 8312d7371ed073def0454ffefb564158ccf009a09e10eca4a272f93c0936731fe887674d94a2687b0cd4c5da28195c5007da6e050b9a509673fc0071debeb178
+AUX 0002-Fix-Makefile-to-avoid-recompiling-files-in-usr.patch 742 BLAKE2B a388b82271137f9d578cde618d63f52ddf93c5901ef892db143ce21469bfd9fcc0c45f4208aca10f6fe4556bec75fc18e4ccbe2782f2d4ba2d9a70f27a814c8c SHA512 8305da294c9e69ac56a9250afc3d70afe70ba9229ecde320767019df51b84fc9c09a753f10f0b189ab537b6e8fc5ef8c17d6179bca51fba3138122ccbae223a3
+AUX 0003-Fix-FTBFS-on-bytecode-architectures.patch 1135 BLAKE2B 90847d27617c1c63e77f294cbcec28c42a923aad1fd24a58f9a46739b23ce49038449e9f4618e608cb7bed721b0d9d3c67e3606c2d545a5a34380bb0b9ae2a4b SHA512 e4550c4c9315ce3c2a16361541ad2b3acccaa6d36d922c5361d1c26e1af22491e46713fe58291b6345d832fdf78466a1937c2327acfeaeb070508fddedfdb206
+AUX 0004-no-automagic.patch 1041 BLAKE2B 8cc95aabf25e768cbb03ea608b74a45aa36f7e86f72da7875bb19973512165a1e6ece9f80093ec887e49ffdbd86df23ae585317d2f65b791c186335b86fc2b50 SHA512 53bfa4cbc40b3725fa40454fb6e8521f21aaf61135dd6da1ec9fd3f1df256ceec1901022aa70dabd568c0291e37008b7c122d1d654856a13fe632f3bf2c271b8
+DIST cairo-ocaml-1.2.0.tar.bz2 44483 BLAKE2B 49a8c811100e3167a8c32ca87a0a6c256862d276c3703082b944aa55f8def7b56d478c0ed44b9d7f5de9194603b688daa5e42949db00417b71daa7376e17410b SHA512 5cac319cf27b94d31e955885ae89b40342c2ae4ffd1aca7c52366f7c3679185f74e513e0c73bd01260f89da29d43bb420dadd059fa1cf5509997db8f935704b4
+EBUILD cairo-ocaml-1.2.0.ebuild 2109 BLAKE2B 93928706aa770aaaed5b4f1d10045b4518c9018239259f44fadb901f5dc4d3343999dd968f1a4bc88260c702ab544a97aa0f6b2361dae480707263cf3aabcde4 SHA512 aace65f2bafa7c4a440e273aa18d56c81bb5539e7cf641e944863bcddc0b444206522dec4976665522569a1e0149fb6afb0a085810e441881c41114f4246554f
+MISC metadata.xml 572 BLAKE2B 55d9ae52f939a260daa0e05c073fb0e574a44383414e04274d58ded73bc68ae6713039ed1f51998a307c166313d93755066a9d06f7fea3525a154de856854ad0 SHA512 7ca7f4c88e7343d1ac5acbacef33cde7a437c5e70df3bede08ee893c7bea317b444585f4d4e9e010509b2ebae9586bbe5d94a5229f656b6ce996cabb895a60d2
diff --git a/dev-ml/cairo-ocaml/cairo-ocaml-1.2.0.ebuild b/dev-ml/cairo-ocaml/cairo-ocaml-1.2.0.ebuild
new file mode 100644
index 000000000000..5a13b6957e17
--- /dev/null
+++ b/dev-ml/cairo-ocaml/cairo-ocaml-1.2.0.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils findlib autotools
+
+DESCRIPTION="Ocaml bindings for the cairo vector graphics library"
+HOMEPAGE="https://www.cairographics.org/cairo-ocaml/"
+SRC_URI="https://cgit.freedesktop.org/cairo-ocaml/snapshot/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples gtk pango svg"
+
+RDEPEND="dev-lang/ocaml:=
+ x11-libs/cairo
+ gtk? ( dev-ml/lablgtk:2= )
+ pango? ( x11-libs/pango )
+ svg? ( x11-libs/libsvg-cairo )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ # 3 patches from debian and one for automagic on libsvg-cairo
+ epatch \
+ "${FILESDIR}"/0001-Add-missing-libraries-used-by-the-stubs-to-CAIRO_LIB.patch \
+ "${FILESDIR}"/0002-Fix-Makefile-to-avoid-recompiling-files-in-usr.patch \
+ "${FILESDIR}"/0003-Fix-FTBFS-on-bytecode-architectures.patch \
+ "${FILESDIR}"/0004-no-automagic.patch
+ AT_M4DIR=support eautoreconf
+}
+
+src_configure() {
+ econf \
+ $(use_with gtk) \
+ $(use_with pango pango-cairo) \
+ $(use_with svg svg-cairo)
+}
+
+src_compile() {
+ emake -j1
+ use doc && emake doc
+}
+
+src_install() {
+ findlib_src_install
+ dodoc README ChangeLog
+ if use examples; then
+ insinto /usr/share/doc/${PF}/examples
+ doins test/*.ml
+ fi
+ # ocamlfind support
+ cat <<-EOF > META
+ name = "${PN}"
+ description = "${DESCRIPTION}"
+ requires = "bigarray"
+ version = "${PV}"
+ archive(byte) = "cairo.cma"
+ archive(native) = "cairo.cmxa"
+ EOF
+ if use gtk; then
+ cat <<-EOF >> META
+ package "lablgtk2" (
+ requires = "cairo lablgtk2"
+ archive(byte) = "cairo_lablgtk.cma"
+ archive(native) = "cairo_lablgtk.cmxa"
+ )
+ EOF
+ fi
+ if use pango; then
+ cat <<-EOF >> META
+ package "pango" (
+ requires = "cairo"
+ archive(byte) = "pango_cairo.cma"
+ archive(native) = "pango_cairo.cmxa"
+ )
+ EOF
+ fi
+ if use svg; then
+ cat <<-EOF >> META
+ package "svg" (
+ requires = "cairo"
+ archive(byte) = "svg_cairo.cma"
+ archive(native) = "svg_cairo.cmxa"
+ )
+ EOF
+ fi
+ insinto /usr/$(get_libdir)/ocaml/cairo
+ doins META
+}
diff --git a/dev-ml/cairo-ocaml/files/0001-Add-missing-libraries-used-by-the-stubs-to-CAIRO_LIB.patch b/dev-ml/cairo-ocaml/files/0001-Add-missing-libraries-used-by-the-stubs-to-CAIRO_LIB.patch
new file mode 100644
index 000000000000..6b42f6d4fd52
--- /dev/null
+++ b/dev-ml/cairo-ocaml/files/0001-Add-missing-libraries-used-by-the-stubs-to-CAIRO_LIB.patch
@@ -0,0 +1,26 @@
+From: Stephane Glondu <steph@glondu.net>
+Date: Sun, 27 Feb 2011 13:31:22 +0100
+Subject: Add missing libraries used by the stubs to CAIRO_LIBS
+
+The recent changes in DSO linking highlighted this, and were
+preventing ocaml-melt from building.
+
+Signed-off-by: Stephane Glondu <steph@glondu.net>
+---
+ configure.ac | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 6c8c4e9..0cf1f11 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -6,7 +6,7 @@ AC_CONFIG_AUX_DIR(support)
+ AC_PROG_OCAML()
+
+ # Check for cairo
+-PKG_CHECK_MODULES(CAIRO, cairo >= 1.2 freetype2)
++PKG_CHECK_MODULES(CAIRO, cairo >= 1.2 cairo-ft cairo-fc cairo-ps cairo-pdf freetype2)
+
+ # Optional GTK support (for the X11 backend)
+ AC_ARG_WITH(gtk,
+--
diff --git a/dev-ml/cairo-ocaml/files/0002-Fix-Makefile-to-avoid-recompiling-files-in-usr.patch b/dev-ml/cairo-ocaml/files/0002-Fix-Makefile-to-avoid-recompiling-files-in-usr.patch
new file mode 100644
index 000000000000..fcb0f0583227
--- /dev/null
+++ b/dev-ml/cairo-ocaml/files/0002-Fix-Makefile-to-avoid-recompiling-files-in-usr.patch
@@ -0,0 +1,27 @@
+From: Stephane Glondu <steph@glondu.net>
+Date: Tue, 2 Aug 2011 15:34:21 +0200
+Subject: Fix Makefile to avoid recompiling files in /usr
+
+The "-I /path/to/lablgtk2" option should not be used when calling
+ocamldep, otherwise files there are considered as possible targets by
+the build system.
+
+Signed-off-by: Stephane Glondu <steph@glondu.net>
+---
+ src/Makefile | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/Makefile b/src/Makefile
+index 46a62f6..c9c64b7 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -117,7 +117,7 @@ clean :
+
+ .depend : $(wildcard *.ml *.mli)
+ @echo "making deps"
+- @$(OCAMLDEP) $(if $(LABLGTKDIR),-I $(LABLGTKDIR)) $^ > $@
++ @$(OCAMLDEP) $^ > $@
+
+ -include .depend
+ -include .depend_c
+--
diff --git a/dev-ml/cairo-ocaml/files/0003-Fix-FTBFS-on-bytecode-architectures.patch b/dev-ml/cairo-ocaml/files/0003-Fix-FTBFS-on-bytecode-architectures.patch
new file mode 100644
index 000000000000..8882ce0a4da8
--- /dev/null
+++ b/dev-ml/cairo-ocaml/files/0003-Fix-FTBFS-on-bytecode-architectures.patch
@@ -0,0 +1,39 @@
+From: Stephane Glondu <steph@glondu.net>
+Date: Tue, 2 Aug 2011 21:35:59 +0200
+Subject: Fix FTBFS on bytecode architectures
+
+The new ocaml.m4 defines OCAMLOPT to "no" (instead of not defining
+it); adapt src/Makefile accordingly.
+
+Signed-off-by: Stephane Glondu <steph@glondu.net>
+---
+ src/Makefile | 8 ++++++--
+ 1 files changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/src/Makefile b/src/Makefile
+index c9c64b7..bc223c7 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -14,7 +14,11 @@ ifdef LIBPANGOCAIRO_CFLAGS
+ TARGETS += pangocairo
+ endif
+
+-all : $(TARGETS) $(if $(OCAMLOPT),opt)
++ifneq ($(OCAMLOPT),no)
++OPT_TARGET = opt
++endif
++
++all : $(TARGETS) $(OPT_TARGET)
+ opt : $(addsuffix .opt,$(TARGETS))
+
+ cairo : cairo.cma libmlcairo.a
+@@ -89,7 +93,7 @@ $(call mloptobjs,$(pangocairo_SRC)) : INCFLAGS=-I $(LABLGTKDIR)
+ install: all
+ mkdir -p $(DESTDIR)$(INSTALLDIR) $(DESTDIR)$(OCAMLLIB)/stublibs
+ install -m 644 *.mli *.cmi *.cma lib*.a $(DESTDIR)$(INSTALLDIR)
+-ifdef OCAMLOPT
++ifneq ($(OCAMLOPT),no)
+ install -m644 *.cmxa *.a *.cmx $(DESTDIR)$(INSTALLDIR)
+ endif
+ install -m 755 dll*.so $(DESTDIR)$(INSTALLDIR)
+--
diff --git a/dev-ml/cairo-ocaml/files/0004-no-automagic.patch b/dev-ml/cairo-ocaml/files/0004-no-automagic.patch
new file mode 100644
index 000000000000..46b70013fa3a
--- /dev/null
+++ b/dev-ml/cairo-ocaml/files/0004-no-automagic.patch
@@ -0,0 +1,25 @@
+--- cairo-ocaml-1.2.0/configure.ac.orig 2012-06-17 20:58:38.000000000 +0100
++++ cairo-ocaml-1.2.0/configure.ac 2012-06-17 21:05:49.000000000 +0100
+@@ -27,10 +27,20 @@
+ fi
+
+ # Optional libsvg-cairo support
+-PKG_CHECK_MODULES(LIBSVG_CAIRO, libsvg-cairo, use_libsvg_cairo=yes, use_libsvg_cairo=no)
++AC_ARG_WITH(svg-cairo,
++ AS_HELP_STRING([--with-svg-cairo],[libsvg-cairo support]),
++ use_libsvg_cairo=$withval, use_libsvg_cairo=no)
++if test x$use_libsvg_cairo != xno; then
++ PKG_CHECK_MODULES(LIBSVG_CAIRO, libsvg-cairo, use_libsvg_cairo=yes, use_libsvg_cairo=no)
++fi
+
+ # Optional pango-cairo support
+-PKG_CHECK_MODULES(LIBPANGOCAIRO, pangocairo, use_libpangocairo=yes, use_libpangocairo=no)
++AC_ARG_WITH(pango-cairo,
++ AS_HELP_STRING([--with-pango-cairo],[pangocairo support]),
++ use_libpangocairo=$withval, use_libpangocairo=no)
++if test x$use_libpangocairo != xno; then
++ PKG_CHECK_MODULES(LIBPANGOCAIRO, pangocairo, use_libpangocairo=yes, use_libpangocairo=no)
++ fi
+
+ echo
+ echo " GTK+ support: $use_gtk"
diff --git a/dev-ml/cairo-ocaml/metadata.xml b/dev-ml/cairo-ocaml/metadata.xml
new file mode 100644
index 000000000000..0fedfcd6cbf8
--- /dev/null
+++ b/dev-ml/cairo-ocaml/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>sci@gentoo.org</email>
+ <name>Gentoo Science Project</name>
+</maintainer>
+<longdescription lang="en">
+ This package contains all the development stuff you need to use Cairo in
+ your OCaml programs. The folowing backends are supported: PostScript,
+ PDF, PNG, In-memory images and X11.
+</longdescription>
+<use>
+ <flag name="pango">Enable support for <pkg>x11-libs/pango</pkg></flag>
+</use>
+</pkgmetadata>
diff --git a/dev-ml/calendar-2.04 b/dev-ml/calendar-2.04
deleted file mode 100644
index 9d19e9dbb038..000000000000
--- a/dev-ml/calendar-2.04
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt] >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=An Ocaml library to handle dates and time
-EAPI=5
-HOMEPAGE=http://forge.ocamlcore.org/projects/calendar/
-IUSE=doc
-KEYWORDS=~amd64
-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 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=90f560df3cde1413499b2a5ec1fa6ea9
diff --git a/dev-ml/calendar/Manifest b/dev-ml/calendar/Manifest
new file mode 100644
index 000000000000..baed56bad218
--- /dev/null
+++ b/dev-ml/calendar/Manifest
@@ -0,0 +1,3 @@
+DIST calendar-2.04.tar.gz 271522 BLAKE2B e69d129324687cbee55c2217c1c7a89ce0817b60aff3eba8e26d94736e4cc771cf031c66857bc3f6438b9b389030e6f6ff54fd55d6734bef4c5ece0bc45ae419 SHA512 3941768428eda47f47912846cc2921ee82c722bda7cf6095c1c8bdcfebc19bb8f64ebb1a25475396d2a49c186b83421af63602a54a261684117b1c036a66cf3d
+EBUILD calendar-2.04.ebuild 640 BLAKE2B fac0e5142eb51753186d27ad1565ce796466c98409b96e2500df25a37ad8e6ee5c2c8ad8b4c7d75ce5fb813e5e5b2ed7aef64828b0e033ed053f61c14e80617e SHA512 01711ce24b697e1362012c72aad43e78d20b479c1fd670bbd3e26c0cb6b3a9055d90a9da3fce11b7fbc957377330c975a778db0193384a9a16ad2ba38390118e
+MISC metadata.xml 243 BLAKE2B 010ca240ae06e9a9f6d7ba213eb06df36d9ba862ff2d2458d98a9fea1a1e7f3026d13832a73bce1b3ad9345029425e6abfae9e03bf126f2329b3f030ed3753fd SHA512 1c5b4b2163017e496999d1f87e5c9c5ac6c11b2e9187450ccfb3df258f34e54d278972f04ee0e8429476c6f87e091a869ac2a28c6e8c8e6d20678c3e74061449
diff --git a/dev-ml/calendar/calendar-2.04.ebuild b/dev-ml/calendar/calendar-2.04.ebuild
new file mode 100644
index 000000000000..234cd57645b7
--- /dev/null
+++ b/dev-ml/calendar/calendar-2.04.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit findlib eutils
+
+DESCRIPTION="An Ocaml library to handle dates and time"
+HOMEPAGE="http://forge.ocamlcore.org/projects/calendar/"
+SRC_URI="http://forge.ocamlcore.org/frs/download.php/1481/${P}.tar.gz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="doc"
+
+DEPEND=">=dev-lang/ocaml-3.12:=[ocamlopt]"
+RDEPEND="${DEPEND}"
+
+src_compile() {
+ emake
+ use doc && emake doc
+}
+
+src_test() {
+ emake tests
+}
+
+src_install() {
+ findlib_src_install
+ dodoc README CHANGES
+ use doc && dohtml -r doc
+}
diff --git a/dev-ml/calendar/metadata.xml b/dev-ml/calendar/metadata.xml
new file mode 100644
index 000000000000..ffac4d7ebc01
--- /dev/null
+++ b/dev-ml/calendar/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-ml/camlbz2-0.6.0 b/dev-ml/camlbz2-0.6.0
deleted file mode 100644
index ac6cf78bfdaf..000000000000
--- a/dev-ml/camlbz2-0.6.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=app-arch/bzip2 >=dev-lang/ocaml-3.12:=[ocamlopt] >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=OCaml bindings for libbz (AKA, bzip2)
-EAPI=5
-HOMEPAGE=http://camlbz2.forge.ocamlcore.org/
-IUSE=doc
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
-LICENSE=LGPL-2.1
-RDEPEND=app-arch/bzip2 >=dev-lang/ocaml-3.12:=[ocamlopt]
-SLOT=0/0.6.0
-SRC_URI=http://forge.ocamlcore.org/frs/download.php/72/camlbz2-0.6.0.tar.gz
-_eclasses_=findlib 45d6030075064a68da8d7143726a1150
-_md5_=0ba8d11a5df6d82082e665cb66098d71
diff --git a/dev-ml/camlbz2/Manifest b/dev-ml/camlbz2/Manifest
new file mode 100644
index 000000000000..40686403e805
--- /dev/null
+++ b/dev-ml/camlbz2/Manifest
@@ -0,0 +1,3 @@
+DIST camlbz2-0.6.0.tar.gz 57771 BLAKE2B 5b4337ca547c37f6982c29c9b70f00ca3100983541a80bf16e8d549c2eabf64ef917ea3ba445c8bb5bbcdb1a652cc5cd586c95299d194a7abe8e68ea9f1a0599 SHA512 1052536bb08c9d9f9bdf4a063a5a01389445b55117ce423dd1732de00cd79db5e4befb4ce5c81c5db8a6d40b28a2ac4b897bb00598fdccf76ea92a2966592680
+EBUILD camlbz2-0.6.0.ebuild 645 BLAKE2B f40fb6ee805b2e07807a199db36d9f7148738e14942734039aec433fa347aeb79e1842b66343998b3c8665d7783d2b6d80d425d9fd24f506393791ed67b38aa1 SHA512 ad7b303c71c3c94f91b71849dc74c3ceb3294052d017dd87fc485ad69531774df34565ef37dadf43e57f7eacdc70fd977e2b27e5a98f91223d54dd52c617d2ed
+MISC metadata.xml 243 BLAKE2B 010ca240ae06e9a9f6d7ba213eb06df36d9ba862ff2d2458d98a9fea1a1e7f3026d13832a73bce1b3ad9345029425e6abfae9e03bf126f2329b3f030ed3753fd SHA512 1c5b4b2163017e496999d1f87e5c9c5ac6c11b2e9187450ccfb3df258f34e54d278972f04ee0e8429476c6f87e091a869ac2a28c6e8c8e6d20678c3e74061449
diff --git a/dev-ml/camlbz2/camlbz2-0.6.0.ebuild b/dev-ml/camlbz2/camlbz2-0.6.0.ebuild
new file mode 100644
index 000000000000..15884ba324e3
--- /dev/null
+++ b/dev-ml/camlbz2/camlbz2-0.6.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit findlib
+
+DESCRIPTION="OCaml bindings for libbz (AKA, bzip2)"
+HOMEPAGE="http://camlbz2.forge.ocamlcore.org/"
+SRC_URI="http://forge.ocamlcore.org/frs/download.php/72/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE="doc"
+
+DEPEND="app-arch/bzip2
+ >=dev-lang/ocaml-3.12:=[ocamlopt]"
+RDEPEND="${DEPEND}"
+
+src_compile() {
+ emake -j1
+}
+
+src_install() {
+ findlib_src_preinst
+ emake DESTDIR="${OCAMLFIND_DESTDIR}" install
+ dodoc ChangeLog README ROADMAP BUGS
+ use doc && dohtml doc/*
+}
diff --git a/dev-ml/camlbz2/metadata.xml b/dev-ml/camlbz2/metadata.xml
new file mode 100644
index 000000000000..ffac4d7ebc01
--- /dev/null
+++ b/dev-ml/camlbz2/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-ml/camldbm-1.0 b/dev-ml/camldbm-1.0
deleted file mode 100644
index 0094752299f9..000000000000
--- a/dev-ml/camldbm-1.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=|| ( >=sys-libs/gdbm-1.9.1-r2[berkdb] <sys-libs/gdbm-1.9.1-r2 ) >=dev-lang/ocaml-3.12:=[ocamlopt] !<dev-lang/ocaml-4[gdbm]
-DESCRIPTION=OCaml binding to the NDBM/GDBM Unix databases
-EAPI=5
-HOMEPAGE=http://forge.ocamlcore.org/projects/camldbm/
-KEYWORDS=amd64 arm ppc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=LGPL-2-with-linking-exception
-RDEPEND=|| ( >=sys-libs/gdbm-1.9.1-r2[berkdb] <sys-libs/gdbm-1.9.1-r2 ) >=dev-lang/ocaml-3.12:=[ocamlopt] !<dev-lang/ocaml-4[gdbm]
-SLOT=0/1.0
-SRC_URI=http://forge.ocamlcore.org/frs/download.php/728/camldbm-1.0.tgz
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=216e968fb48b00dc64fa4ab35900950c
diff --git a/dev-ml/camldbm/Manifest b/dev-ml/camldbm/Manifest
new file mode 100644
index 000000000000..f97ccb849a7a
--- /dev/null
+++ b/dev-ml/camldbm/Manifest
@@ -0,0 +1,5 @@
+AUX hasgotfix.patch 418 BLAKE2B f8f5a728cb1fa772db368faf3bfb6047fa570d0845155caff5d22e40b3a82d33b33844cf405ceb2021bfb5c3ec641cf59a0afe2546657cedc0f33c120b525c10 SHA512 3b936694976c962540734bcca51a762cd3a02f6d1d4678eeeb2c4ee283bd0defa0dcea90dc062475dbd542efe871041b7a76782b0437d34b682914b8f39a042d
+AUX include_fix.patch 512 BLAKE2B e99ff15b037c2db639f14ff234c51c2a34c7dc2a5c3395d58675c89c240e2f9928913f38956a70d87f7d6f522937f1f51a9f77d245f095df8ddb0c0a988c285f SHA512 46a05033c469ec8b668e044a799d230b82539e2bb43067383f89f46f9ac128a2b43e8a5439dda16e368f283c608d6561109389d2aab3c8cdde7fbdb957433cad
+DIST camldbm-1.0.tgz 14397 BLAKE2B 9b6971e30815ad6984254591af793819beb3859ddbf7bbd95ee744a2b09ce04968ecad9c7ff954e1606776d82988b3499f2569154586a937a61eb6d5c7b9465b SHA512 d0b752754650efb400f13f957e83fddccf1fc9ac9e1d11f453af94e9aa599546a316eb110685b3728b593c99cbf859cdc7bcf924c878cf8b6dead3dc413ccfbf
+EBUILD camldbm-1.0.ebuild 825 BLAKE2B cd246803cf07acfce7d1fb8661d3a47a91f1d9a0c4fc1688a9358d5db0dac1052c7f83551b2b3aeb517c6af9bc7680ed66ed57b1df3f4445adbfb57585a50bc1 SHA512 b784edb1421a8dce8243cde57197ee152a95080d6b33cadc31ecdab0d5b92449c4d251eaa3c72dbd86b0a4f5dfd736466bcdcbbab09328013b4d6a784a35d580
+MISC metadata.xml 243 BLAKE2B 010ca240ae06e9a9f6d7ba213eb06df36d9ba862ff2d2458d98a9fea1a1e7f3026d13832a73bce1b3ad9345029425e6abfae9e03bf126f2329b3f030ed3753fd SHA512 1c5b4b2163017e496999d1f87e5c9c5ac6c11b2e9187450ccfb3df258f34e54d278972f04ee0e8429476c6f87e091a869ac2a28c6e8c8e6d20678c3e74061449
diff --git a/dev-ml/camldbm/camldbm-1.0.ebuild b/dev-ml/camldbm/camldbm-1.0.ebuild
new file mode 100644
index 000000000000..94941d452955
--- /dev/null
+++ b/dev-ml/camldbm/camldbm-1.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit base
+
+DESCRIPTION="OCaml binding to the NDBM/GDBM Unix databases"
+HOMEPAGE="http://forge.ocamlcore.org/projects/camldbm/"
+SRC_URI="http://forge.ocamlcore.org/frs/download.php/728/${P}.tgz"
+
+LICENSE="LGPL-2-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="amd64 arm ppc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+DEPEND="|| ( >=sys-libs/gdbm-1.9.1-r2[berkdb] <sys-libs/gdbm-1.9.1-r2 )
+ >=dev-lang/ocaml-3.12:=[ocamlopt]
+ !<dev-lang/ocaml-4[gdbm]"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/hasgotfix.patch" "${FILESDIR}/include_fix.patch" )
+
+src_install() {
+ dodir "$(ocamlc -where)/stublibs" # required and makefile does not create it
+ emake LIBDIR="${D}/$(ocamlc -where)" install
+ dodoc README Changelog
+}
diff --git a/dev-ml/camldbm/files/hasgotfix.patch b/dev-ml/camldbm/files/hasgotfix.patch
new file mode 100644
index 000000000000..840ffcbe7f0f
--- /dev/null
+++ b/dev-ml/camldbm/files/hasgotfix.patch
@@ -0,0 +1,15 @@
+https://forge.ocamlcore.org/tracker/index.php?func=detail&aid=1202&group_id=278&atid=1189
+
+Index: camldbm-1.0/configure
+===================================================================
+--- camldbm-1.0.orig/configure
++++ camldbm-1.0/configure
+@@ -35,7 +35,7 @@ hasgot() {
+ ${CC:-cc} -I$1 -o hasgot.exe hasgot.c $3 $4
+ res=$?
+ rm -f hasgot.c hasgot.exe
+- return $?
++ return $res
+ }
+
+ dbm_include="not found"
diff --git a/dev-ml/camldbm/files/include_fix.patch b/dev-ml/camldbm/files/include_fix.patch
new file mode 100644
index 000000000000..16fb6bd1e96e
--- /dev/null
+++ b/dev-ml/camldbm/files/include_fix.patch
@@ -0,0 +1,15 @@
+https://forge.ocamlcore.org/tracker/index.php?func=detail&aid=1201&group_id=278&atid=1189
+
+Index: camldbm-1.0/Makefile
+===================================================================
+--- camldbm-1.0.orig/Makefile
++++ camldbm-1.0/Makefile
+@@ -51,7 +51,7 @@ libcamldbm.$(A): cldbm.$(O)
+ $(OCAMLOPT) -c $(COMPFLAGS) $<
+
+ .c.$(O):
+- $(OCAMLC) -c -ccopt "$(DBM_INCLUDE)" -ccopt "$(DBM_DEFINES)" $<
++ $(OCAMLC) -c -ccopt "$(DBM_INCLUDES)" -ccopt "$(DBM_DEFINES)" $<
+
+ depend:
+ $(OCAMLDEP) *.ml *.mli > .depend
diff --git a/dev-ml/camldbm/metadata.xml b/dev-ml/camldbm/metadata.xml
new file mode 100644
index 000000000000..ffac4d7ebc01
--- /dev/null
+++ b/dev-ml/camldbm/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-ml/camlidl-1.05-r1 b/dev-ml/camlidl-1.05-r1
deleted file mode 100644
index 338c04707aff..000000000000
--- a/dev-ml/camlidl-1.05-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=>=dev-lang/ocaml-3.10.2:=[ocamlopt]
-DESCRIPTION=CamlIDL is a stub code generator for using C/C++ libraries from O'Caml
-EAPI=5
-HOMEPAGE=http://caml.inria.fr/camlidl/
-KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux
-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 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b416fdadf6f3dc00428c0073c3057992
diff --git a/dev-ml/camlidl/Manifest b/dev-ml/camlidl/Manifest
new file mode 100644
index 000000000000..dea5eb29bb18
--- /dev/null
+++ b/dev-ml/camlidl/Manifest
@@ -0,0 +1,7 @@
+AUX META.camlidl 123 BLAKE2B ac345245b30f6df1f4ada64526e0f27b68c02311d8b426bee6eb62f91de34df868dacce3a7ba755c1924d5846790c9f90f6a46500b71fb347eea7828749f9476 SHA512 196727adb64e11b4f486419147c2d711a0d278f4f340dcec61318cd76fb816deea78e85c814f6fd4f14dae168a843fe41b0ecca3086d42387475f196519cb850
+AUX includes.patch 361 BLAKE2B 9e04253feb45286142c41bfa83482d9e85ed46a0e37d20f47d6d38f59c5cb5833a1aaa54cba0b241cc23efe497671d788960a294bb5305f5fa96aab4dc05a72c SHA512 e76690bba23d6ac3a4ef0f15feed6826cd203c38919b8fdf043c46c6f7311eef768c9c85b9855d217e1014b0b55086c7dfcea4c132320035aeafcb8e7de2bcd3
+AUX nowarn.patch 347 BLAKE2B 810cff7b2dbb40bac0b998a16684590747e6397195487ed4677a9dffdb778dfbc4a38599d54f5981226481fbf3e50b3f97bb4d88d7beda26a47f6b6da08fd604 SHA512 b436490d97b63ac428ddea2a473c3bf7c027331699234b875dd6215b5f39a3a6aaa5cc2ff7d841cf0ef8d012edcdff98a519437c857676fe6d8407c3610e3303
+AUX tests.patch 1061 BLAKE2B 45519125064c2be10be8e9b5e44b65c67fc70b58499d8cecb9abdcea2e312e03036c7a17861dd0a755d8773cf1b925b5a25ef962107cf6bb14a46c6dd8d6b036 SHA512 72234478b420edbebf48aaba4ab0078c35c3d8eced6634092b8ca605ba93a5791249e2f271ea656e86c62ac45561c25100a5e786f7827b8545ea4996e0f2850e
+DIST camlidl-1.05.tar.gz 100640 BLAKE2B 38cbcebd43ced26c44803608aabdacfbd33734357097a542ee2558223b9699d89cf7be388feba59630b10e4dc3977bffd08c669d3cf676d2136f54a6a8d52aab SHA512 e8857aca818a06f8c861e5f55dddd7e8e3ab1efae51647534460b4f092166709d86c6de1215c792a0489d668d72064ccfb7635e9a6d3854cd5a62f74541a9d18
+EBUILD camlidl-1.05-r1.ebuild 1292 BLAKE2B 21364af50b590384377442f95c58de1ce15e78b68cda2f52cdbf772ec5bcb9583c7698dd93a82447762e3f949470122329400dd17c73df66dde372e49499018c SHA512 21da9d939f6b867b786ca80b488e080ceb6c4e29a8b3b8b65fa4d2fbd72809317ad81886a2499c91d47ae7ac16f080431952fbe6b80e755ad08630a9bc3c2a8a
+MISC metadata.xml 253 BLAKE2B c787c1044c3f674eb5d2d7a0e830965ad53c7a2c8cdfcd95bece6b0557e35237f62afe28464ebe4c88468cd1fd543627349fd41a0aa760fceed1a7d52386eda2 SHA512 9285e04d22e8e41631e6de00e0ba02842cf0e772cd17a1d7ba3864e50eeea50abb06077ea4f9ac920eab3d520bfe28d389b3d04d5c3529af23a68ca68b6857d4
diff --git a/dev-ml/camlidl/camlidl-1.05-r1.ebuild b/dev-ml/camlidl/camlidl-1.05-r1.ebuild
new file mode 100644
index 000000000000..6dd3e9f5d3d3
--- /dev/null
+++ b/dev-ml/camlidl/camlidl-1.05-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="CamlIDL is a stub code generator for using C/C++ libraries from O'Caml"
+HOMEPAGE="http://caml.inria.fr/camlidl/"
+SRC_URI="http://caml.inria.fr/distrib/bazar-ocaml/${P}.tar.gz"
+LICENSE="QPL-1.0 LGPL-2"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
+IUSE=""
+DEPEND=">=dev-lang/ocaml-3.10.2:=[ocamlopt]"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ epatch "${FILESDIR}/tests.patch"
+ epatch "${FILESDIR}/includes.patch"
+ epatch "${FILESDIR}/nowarn.patch"
+}
+
+src_compile() {
+ # Use the UNIX makefile
+ libdir=`ocamlc -where`
+ sed -i -e "s|OCAMLLIB=.*|OCAMLLIB=${libdir}|" config/Makefile.unix
+ sed -i -e "s|BINDIR=.*|BINDIR=${EPREFIX}/usr/bin|" config/Makefile.unix
+ ln -s Makefile.unix config/Makefile
+
+ # Make
+ emake -j1
+}
+
+src_test() {
+ einfo "Running tests..."
+ cd tests
+ emake CCPP="$(tc-getCXX)"
+}
+
+src_install() {
+ libdir=`ocamlc -where`
+ dodir ${libdir#${EPREFIX}}/caml
+ dodir /usr/bin
+ # Install
+ emake BINDIR="${ED}/usr/bin" OCAMLLIB="${D}${libdir}" install
+
+ # Add package header
+ sed -e "s/@VERSION/${P}/g" "${FILESDIR}/META.camlidl" > "${D}${libdir}/META.camlidl" || die
+
+ # Documentation
+ dodoc README Changes
+}
diff --git a/dev-ml/camlidl/files/META.camlidl b/dev-ml/camlidl/files/META.camlidl
new file mode 100644
index 000000000000..b0aeaf231415
--- /dev/null
+++ b/dev-ml/camlidl/files/META.camlidl
@@ -0,0 +1,5 @@
+description = "Stub generator"
+version = "@VERSION"
+directory = "^"
+archive(byte) = "com.cma"
+archive(native) = "com.cmxa"
diff --git a/dev-ml/camlidl/files/includes.patch b/dev-ml/camlidl/files/includes.patch
new file mode 100644
index 000000000000..060aceefd0a5
--- /dev/null
+++ b/dev-ml/camlidl/files/includes.patch
@@ -0,0 +1,12 @@
+Index: camlidl-1.05/runtime/comerror.c
+===================================================================
+--- camlidl-1.05.orig/runtime/comerror.c
++++ camlidl-1.05/runtime/comerror.c
+@@ -22,6 +22,7 @@
+ #include <caml/callback.h>
+ #include <caml/fail.h>
+ #include <caml/alloc.h>
++#include <caml/printexc.h>
+ #include "camlidlruntime.h"
+ #include "comstuff.h"
+
diff --git a/dev-ml/camlidl/files/nowarn.patch b/dev-ml/camlidl/files/nowarn.patch
new file mode 100644
index 000000000000..8b457cf7ed1e
--- /dev/null
+++ b/dev-ml/camlidl/files/nowarn.patch
@@ -0,0 +1,13 @@
+Index: camlidl-1.05/compiler/Makefile
+===================================================================
+--- camlidl-1.05.orig/compiler/Makefile
++++ camlidl-1.05/compiler/Makefile
+@@ -29,7 +29,7 @@ PROG=camlidl$(EXE)
+ all: $(PROG)
+
+ $(PROG): $(OBJS)
+- $(OCAMLC) -o $(PROG) $(OBJS)
++ $(OCAMLC) -w -a -o $(PROG) $(OBJS)
+
+ clean::
+ rm -f $(PROG)
diff --git a/dev-ml/camlidl/files/tests.patch b/dev-ml/camlidl/files/tests.patch
new file mode 100644
index 000000000000..f7272424be80
--- /dev/null
+++ b/dev-ml/camlidl/files/tests.patch
@@ -0,0 +1,36 @@
+Index: camlidl-1.05/tests/unix.idl
+===================================================================
+--- camlidl-1.05.orig/tests/unix.idl
++++ camlidl-1.05/tests/unix.idl
+@@ -15,16 +15,16 @@ quote (C, "
+
+ union process_status { int code; };
+
+- enum { WEXITED, WSIGNALED, WSTOPPED };
++ enum { WEXITED2, WSIGNALED, WSTOPPED2 };
+
+ static void decode_status(int status, int * kind, union process_status * p)
+ {
+ if (WIFEXITED(status)) {
+- *kind = WEXITED; p->code = WEXITSTATUS(status);
++ *kind = WEXITED2; p->code = WEXITSTATUS(status);
+ } else if (WIFSIGNALED(status)) {
+ *kind = WSIGNALED; p->code = WTERMSIG(status);
+ } else {
+- *kind = WSTOPPED; p->code = WSTOPSIG(status);
++ *kind = WSTOPPED2; p->code = WSTOPSIG(status);
+ }
+ }
+
+@@ -59,9 +59,9 @@ int execve([in,string] char * path,
+ int fork(void);
+
+ union process_status {
+- case WEXITED: int code;
++ case WEXITED2: int code;
+ case WSIGNALED: int code;
+- case WSTOPPED: int code;
++ case WSTOPPED2: int code;
+ };
+
+ int wait([out] int * kind,
diff --git a/dev-ml/camlidl/metadata.xml b/dev-ml/camlidl/metadata.xml
new file mode 100644
index 000000000000..ffa6c6b4395b
--- /dev/null
+++ b/dev-ml/camlidl/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/dev-ml/camlimages-4.2.2 b/dev-ml/camlimages-4.2.2
deleted file mode 100644
index 6ea1d1740ed6..000000000000
--- a/dev-ml/camlimages-4.2.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=dev-util/omake virtual/pkgconfig dev-ml/findlib >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=An image manipulation library for ocaml
-EAPI=5
-HOMEPAGE=http://gallium.inria.fr/camlimages/
-IUSE=exif gif gtk jpeg png postscript tiff truetype X xpm
-KEYWORDS=~amd64 ppc x86
-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 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vcs-snapshot 3be1ab44131e8c0bbdaa75823008444b
-_md5_=4f677aece91eed2f7412d4e6a1418989
diff --git a/dev-ml/camlimages-4.2.3 b/dev-ml/camlimages-4.2.3
deleted file mode 100644
index 063e081bff42..000000000000
--- a/dev-ml/camlimages-4.2.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=dev-util/omake virtual/pkgconfig dev-ml/findlib >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=An image manipulation library for ocaml
-EAPI=5
-HOMEPAGE=http://gallium.inria.fr/camlimages/
-IUSE=exif gif gtk jpeg png postscript tiff truetype X xpm
-KEYWORDS=~amd64 ~ppc ~x86
-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 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vcs-snapshot 3be1ab44131e8c0bbdaa75823008444b
-_md5_=1c0a5f16028a6d0d96fcaf50a5a074b8
diff --git a/dev-ml/camlimages-4.2.4 b/dev-ml/camlimages-4.2.4
deleted file mode 100644
index 2d4a11a208b8..000000000000
--- a/dev-ml/camlimages-4.2.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=dev-util/omake virtual/pkgconfig dev-ml/findlib >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=An image manipulation library for ocaml
-EAPI=5
-HOMEPAGE=http://gallium.inria.fr/camlimages/
-IUSE=exif gif gtk jpeg png postscript tiff truetype X xpm
-KEYWORDS=~amd64 ~ppc ~x86
-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 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vcs-snapshot 3be1ab44131e8c0bbdaa75823008444b
-_md5_=1c0a5f16028a6d0d96fcaf50a5a074b8
diff --git a/dev-ml/camlimages/Manifest b/dev-ml/camlimages/Manifest
new file mode 100644
index 000000000000..e863cfead8e9
--- /dev/null
+++ b/dev-ml/camlimages/Manifest
@@ -0,0 +1,7 @@
+DIST camlimages-4.2.2.tar.bz2 789441 BLAKE2B 003a451b1b070ed82e5d0a1857cbb448270f46a4b3948096f93a28aaaeb820c100b7ac73f8ca1f94cfe6b3aa0dd68dbb18b597d37fcf5ebd014179ccee509ab5 SHA512 672e192255a9335c45d208b7589a344f712baa798dfc7bc7ccee7d3bda71e603bc06c7b012761f9c6372c683560c67ffa9d2af2742552884211ad4ffb541e3dd
+DIST camlimages-4.2.3.tar.bz2 789523 BLAKE2B 53bb5ea92d35855dd714e035734445ba100bd3ec4558edc8535a73af6911bf943558176e5c2919c337371df51ae255d97e3bfb1947f2bdfd275a3db9a269c737 SHA512 c67775394ab97d0c0111d3e4e49ceb8213a405d48e133c321db920e291dc2ad79e1e7876a0bdff8fe1ad3b3f27ea0effe79bd26d29f92d5bb1ebd74f03d13bd5
+DIST camlimages-4.2.4.tar.bz2 789623 BLAKE2B f10c34bdbb51ec1bff7d7557b49356eb57770715e42db1075f9306b1b07a67cdc219c4d98a1127b75e429361becb7199d3c557d7d756047dd898c31b761b71a0 SHA512 0c321c933d61df84456c56b0082dea80fbcb37e30dc616f84a7d12c5bfd36c157a2a9d31dc92da20b6bbfd0a87db8f4b14537ab56b1c5863b24c7cbb59f3e0e7
+EBUILD camlimages-4.2.2.ebuild 1639 BLAKE2B 4b2db9d0004fc96705de5bfc71853d717cc5b95cfe5267bdaee0b61d6cabb9db57463fcb6a085d6dce34c0a6167c61f1d852362ec74cccd7ea780a05baab5dbe SHA512 72db61f6e425dc005cd27407c42869f4a8864a02e2e925b00071ad85a903322afa4eaa6625fe530eb6da9b26d90204d34e34e86011863d0075844ff03446607e
+EBUILD camlimages-4.2.3.ebuild 1641 BLAKE2B 28c22252ffd760026a11391ea0aa374b4e66f55ecd2cba11647f9bb4b889ede83372a832251762a32eaed50d18788cf46f6eacfde40e9c76a6915cc2e6c49217 SHA512 2d08bdd201cff1b912665987c50f717c9125d3a2db724cee85fb5cbf1eaddb4981a9c7e0a52850debc13163128ec5fa7615c2b25ee7475420bcbf63e6754162c
+EBUILD camlimages-4.2.4.ebuild 1641 BLAKE2B 28c22252ffd760026a11391ea0aa374b4e66f55ecd2cba11647f9bb4b889ede83372a832251762a32eaed50d18788cf46f6eacfde40e9c76a6915cc2e6c49217 SHA512 2d08bdd201cff1b912665987c50f717c9125d3a2db724cee85fb5cbf1eaddb4981a9c7e0a52850debc13163128ec5fa7615c2b25ee7475420bcbf63e6754162c
+MISC metadata.xml 337 BLAKE2B 723cddb516462b7bdc4e778100727146749e89569dc41e219116f6ed962746c9f0ba7a316bb855d3268864aad4d77388b615f4e9f70d243be80f5a148636878a SHA512 e2c8dc16476b0d3cac0868674fa3fc680714c40242bd31e20a9937f3ab134740eaf70d2db38c20c6a446cbf1343db3ca3a9693c76331e657bd5d1a27e69624fd
diff --git a/dev-ml/camlimages/camlimages-4.2.2.ebuild b/dev-ml/camlimages/camlimages-4.2.2.ebuild
new file mode 100644
index 000000000000..8f825c780a51
--- /dev/null
+++ b/dev-ml/camlimages/camlimages-4.2.2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils vcs-snapshot findlib multilib
+
+DESCRIPTION="An image manipulation library for ocaml"
+HOMEPAGE="http://gallium.inria.fr/camlimages/"
+SRC_URI="https://bitbucket.org/camlspotter/camlimages/get/${PV}.tar.bz2 -> ${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ppc x86"
+IUSE="exif gif gtk jpeg png postscript tiff truetype X xpm"
+
+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
+ "
+DEPEND="${DEPEND}
+ dev-util/omake
+ virtual/pkgconfig
+ dev-ml/findlib"
+
+camlimages_arg_want() {
+ echo "ARG_WANT_${2}=$(usex $1 1 0)"
+}
+
+src_compile() {
+ omake \
+ $(camlimages_arg_want exif EXIF ) \
+ $(camlimages_arg_want gif GIF ) \
+ $(camlimages_arg_want png PNG ) \
+ $(camlimages_arg_want jpeg JPEG ) \
+ $(camlimages_arg_want tiff TIFF ) \
+ $(camlimages_arg_want xpm XPM ) \
+ $(camlimages_arg_want postscript GS ) \
+ $(camlimages_arg_want gtk LABLGTK2) \
+ $(camlimages_arg_want X GRAPHICS) \
+ $(camlimages_arg_want truetype FREETYPE) \
+ PATH_GS=/bin/true \
+ --force-dotomake || die
+}
+
+src_install() {
+ findlib_src_preinst
+ omake --force-dotomake DESTDIR="${D}" install || die
+ dodoc README.md
+}
diff --git a/dev-ml/camlimages/camlimages-4.2.3.ebuild b/dev-ml/camlimages/camlimages-4.2.3.ebuild
new file mode 100644
index 000000000000..9be34cb0db7b
--- /dev/null
+++ b/dev-ml/camlimages/camlimages-4.2.3.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils vcs-snapshot findlib multilib
+
+DESCRIPTION="An image manipulation library for ocaml"
+HOMEPAGE="http://gallium.inria.fr/camlimages/"
+SRC_URI="https://bitbucket.org/camlspotter/camlimages/get/${PV}.tar.bz2 -> ${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="exif gif gtk jpeg png postscript tiff truetype X xpm"
+
+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
+ "
+DEPEND="${DEPEND}
+ dev-util/omake
+ virtual/pkgconfig
+ dev-ml/findlib"
+
+camlimages_arg_want() {
+ echo "ARG_WANT_${2}=$(usex $1 1 0)"
+}
+
+src_compile() {
+ omake \
+ $(camlimages_arg_want exif EXIF ) \
+ $(camlimages_arg_want gif GIF ) \
+ $(camlimages_arg_want png PNG ) \
+ $(camlimages_arg_want jpeg JPEG ) \
+ $(camlimages_arg_want tiff TIFF ) \
+ $(camlimages_arg_want xpm XPM ) \
+ $(camlimages_arg_want postscript GS ) \
+ $(camlimages_arg_want gtk LABLGTK2) \
+ $(camlimages_arg_want X GRAPHICS) \
+ $(camlimages_arg_want truetype FREETYPE) \
+ PATH_GS=/bin/true \
+ --force-dotomake || die
+}
+
+src_install() {
+ findlib_src_preinst
+ omake --force-dotomake DESTDIR="${D}" install || die
+ dodoc README.md
+}
diff --git a/dev-ml/camlimages/camlimages-4.2.4.ebuild b/dev-ml/camlimages/camlimages-4.2.4.ebuild
new file mode 100644
index 000000000000..9be34cb0db7b
--- /dev/null
+++ b/dev-ml/camlimages/camlimages-4.2.4.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils vcs-snapshot findlib multilib
+
+DESCRIPTION="An image manipulation library for ocaml"
+HOMEPAGE="http://gallium.inria.fr/camlimages/"
+SRC_URI="https://bitbucket.org/camlspotter/camlimages/get/${PV}.tar.bz2 -> ${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="exif gif gtk jpeg png postscript tiff truetype X xpm"
+
+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
+ "
+DEPEND="${DEPEND}
+ dev-util/omake
+ virtual/pkgconfig
+ dev-ml/findlib"
+
+camlimages_arg_want() {
+ echo "ARG_WANT_${2}=$(usex $1 1 0)"
+}
+
+src_compile() {
+ omake \
+ $(camlimages_arg_want exif EXIF ) \
+ $(camlimages_arg_want gif GIF ) \
+ $(camlimages_arg_want png PNG ) \
+ $(camlimages_arg_want jpeg JPEG ) \
+ $(camlimages_arg_want tiff TIFF ) \
+ $(camlimages_arg_want xpm XPM ) \
+ $(camlimages_arg_want postscript GS ) \
+ $(camlimages_arg_want gtk LABLGTK2) \
+ $(camlimages_arg_want X GRAPHICS) \
+ $(camlimages_arg_want truetype FREETYPE) \
+ PATH_GS=/bin/true \
+ --force-dotomake || die
+}
+
+src_install() {
+ findlib_src_preinst
+ omake --force-dotomake DESTDIR="${D}" install || die
+ dodoc README.md
+}
diff --git a/dev-ml/camlimages/metadata.xml b/dev-ml/camlimages/metadata.xml
new file mode 100644
index 000000000000..76ac88771bc0
--- /dev/null
+++ b/dev-ml/camlimages/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="bitbucket">camlspotter/camlimages</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/camlp4-4.04_p1 b/dev-ml/camlp4-4.04_p1
deleted file mode 100644
index a656583369c4..000000000000
--- a/dev-ml/camlp4-4.04_p1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=>=dev-lang/ocaml-4.04_beta:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=System for writing extensible parsers for programming languages
-EAPI=5
-HOMEPAGE=https://github.com/ocaml/camlp4
-IUSE=+ocamlopt
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=LGPL-2-with-linking-exception
-RDEPEND=>=dev-lang/ocaml-4.04_beta:=[ocamlopt?] !<dev-lang/ocaml-4.02 !<dev-ml/findlib-1.5.5-r1
-SLOT=0/4.04_p1
-SRC_URI=https://github.com/ocaml/camlp4/archive/4.04+1.tar.gz -> camlp4-4.04_p1.tar.gz
-_md5_=4c4f2cefdaa20a810f5d4826839a34c7
diff --git a/dev-ml/camlp4-4.05_p1 b/dev-ml/camlp4-4.05_p1
deleted file mode 100644
index f8b17c4041f3..000000000000
--- a/dev-ml/camlp4-4.05_p1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=>=dev-lang/ocaml-4.05_beta:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=System for writing extensible parsers for programming languages
-EAPI=5
-HOMEPAGE=https://github.com/ocaml/camlp4
-IUSE=+ocamlopt
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=LGPL-2-with-linking-exception
-RDEPEND=>=dev-lang/ocaml-4.05_beta:=[ocamlopt?] !<dev-lang/ocaml-4.02 !<dev-ml/findlib-1.5.5-r1
-SLOT=0/4.05_p1
-SRC_URI=https://github.com/ocaml/camlp4/archive/4.05+1.tar.gz -> camlp4-4.05_p1.tar.gz
-_md5_=3870c54a6da06a02f4fb4611f56600c6
diff --git a/dev-ml/camlp4/Manifest b/dev-ml/camlp4/Manifest
new file mode 100644
index 000000000000..7b9e293dc801
--- /dev/null
+++ b/dev-ml/camlp4/Manifest
@@ -0,0 +1,5 @@
+DIST camlp4-4.04_p1.tar.gz 648320 BLAKE2B d383a366facaaa440b24184bb54a8e1c3bb22ae02387a0bc4f9ee4331ecdc60e5bf22715c1022c987041fb081eb448794a74026736df9f70e05c7213e08bfa44 SHA512 7db8eebcf3d230f60650ba62d9cb630c069394237e97b678a40b61d3dcaded752a2b7e089a50ff528f1ea0740d0291b722df123a072f2cee489cadc5201c6776
+DIST camlp4-4.05_p1.tar.gz 647566 BLAKE2B 068c1016a75616811787eb480b61349a32960997f03e0bc99d63e15357a8932a6019d9e7195541fd942ef99fc1d71c067fb5fcb0fd0c2c3efb77aac494589854 SHA512 0ee9720286d0d832fb7d2d21a8877856e0e47c94c86b1b58d28f8e757a18472eecb56a16e3a04ce815f240dd5048f5d597515461d084fd1cf4da1b121f97a3fe
+EBUILD camlp4-4.04_p1.ebuild 1021 BLAKE2B c1c00019747a1a398578858942462d6e0f9c180ac0cd058a0a87f914ebf53243ff3d21c61dc1802cc1b0a211ab7ce1ac396c6b355c3a639848fc373a0a9821bb SHA512 df3bdaabef1776a2e773f30149084890dddbff843ef9e13b0f3ccee9ca9fb390f6ec1a04c9a1cd4e7b4d0536d6be966dd89f46542dc367a3a030fd10853030bf
+EBUILD camlp4-4.05_p1.ebuild 1030 BLAKE2B 74797690733b8e1fa5ba86f492ae8f3ca15bc08ea6a25c90c7aeaac16fdfb46904c0e0710883d527ed371619790484b6d2f7bdc48baffbcfc1f9498767de17ad SHA512 ba799d8915c54c6d7e4c565505124d76d18aa93f581bcc4292742f239e5cffb951fdd82f549034a17129400e330e91133b43bfd01975fbb25e53193c90d88e5b
+MISC metadata.xml 334 BLAKE2B d60251e891f7bc81e706902964e6bbc05616a75204bc1b13da8f8a7a67e6514b8be0cd3c67775efdb084770e57c28129725b6549a57903c3b5d15f78565b400d SHA512 195b9f2bf651b9f57c1f4333dcb1e0b7766c1d39df2faafcf01b16e4aab28a67e2434c2368d62bff16bf14ea3763d66d0d5a47714ef9f2282cd90d00cc49328f
diff --git a/dev-ml/camlp4/camlp4-4.04_p1.ebuild b/dev-ml/camlp4/camlp4-4.04_p1.ebuild
new file mode 100644
index 000000000000..9a5152d03f33
--- /dev/null
+++ b/dev-ml/camlp4/camlp4-4.04_p1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+MY_PV=${PV/_p/+}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="System for writing extensible parsers for programming languages"
+HOMEPAGE="https://github.com/ocaml/camlp4"
+SRC_URI="https://github.com/ocaml/camlp4/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="+ocamlopt"
+
+DEPEND=">=dev-lang/ocaml-4.04_beta:=[ocamlopt?]"
+RDEPEND="${DEPEND}
+ !<dev-lang/ocaml-4.02
+ !<dev-ml/findlib-1.5.5-r1"
+DEPEND="${DEPEND}
+ dev-ml/ocamlbuild"
+
+S=${WORKDIR}/${P/_p/-}
+
+src_configure() {
+ ./configure \
+ --bindir="${EPREFIX}/usr/bin" \
+ --libdir="$(ocamlc -where)" \
+ --pkgdir="$(ocamlc -where)" \
+ || die
+}
+
+src_compile() {
+ emake byte
+ use ocamlopt && emake native
+}
+
+src_install() {
+ emake DESTDIR="${D}" install install-META
+ dodoc CHANGES.md README.md
+}
diff --git a/dev-ml/camlp4/camlp4-4.05_p1.ebuild b/dev-ml/camlp4/camlp4-4.05_p1.ebuild
new file mode 100644
index 000000000000..63a829b74226
--- /dev/null
+++ b/dev-ml/camlp4/camlp4-4.05_p1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+MY_PV=${PV/_p/+}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="System for writing extensible parsers for programming languages"
+HOMEPAGE="https://github.com/ocaml/camlp4"
+SRC_URI="https://github.com/ocaml/camlp4/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="+ocamlopt"
+
+DEPEND=">=dev-lang/ocaml-4.05_beta:=[ocamlopt?]"
+RDEPEND="${DEPEND}
+ !<dev-lang/ocaml-4.02
+ !<dev-ml/findlib-1.5.5-r1"
+DEPEND="${DEPEND}
+ dev-ml/ocamlbuild"
+
+S=${WORKDIR}/${P/_p/-}
+
+src_configure() {
+ ./configure \
+ --bindir="${EPREFIX}/usr/bin" \
+ --libdir="$(ocamlc -where)" \
+ --pkgdir="$(ocamlc -where)" \
+ || die
+}
+
+src_compile() {
+ emake byte
+ use ocamlopt && emake native
+}
+
+src_install() {
+ emake DESTDIR="${D}" install install-META
+ dodoc CHANGES.md README.md
+}
diff --git a/dev-ml/camlp4/metadata.xml b/dev-ml/camlp4/metadata.xml
new file mode 100644
index 000000000000..3cd96568fe64
--- /dev/null
+++ b/dev-ml/camlp4/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">ocaml/camlp4</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/camlp5-6.17 b/dev-ml/camlp5-6.17
deleted file mode 100644
index 9e5e059baefe..000000000000
--- a/dev-ml/camlp5-6.17
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=>=dev-lang/ocaml-3.10:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=A preprocessor-pretty-printer of ocaml
-EAPI=5
-HOMEPAGE=https://camlp5.github.io/
-IUSE=doc +ocamlopt
-KEYWORDS=alpha amd64 ppc x86 ~x86-fbsd
-LICENSE=BSD
-RDEPEND=>=dev-lang/ocaml-3.10:=[ocamlopt?]
-SLOT=0/6.17
-SRC_URI=https://github.com/camlp5/camlp5/archive/rel617.tar.gz -> camlp5-6.17.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=8d52b8b8ed3888d1259ce7a4aa43c161
diff --git a/dev-ml/camlp5-7.00 b/dev-ml/camlp5-7.00
deleted file mode 100644
index 5fd624c69e5a..000000000000
--- a/dev-ml/camlp5-7.00
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=>=dev-lang/ocaml-3.10:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=A preprocessor-pretty-printer of ocaml
-EAPI=5
-HOMEPAGE=https://camlp5.github.io/
-IUSE=doc +ocamlopt
-KEYWORDS=~alpha ~amd64 ~ppc ~x86 ~x86-fbsd
-LICENSE=BSD
-RDEPEND=>=dev-lang/ocaml-3.10:=[ocamlopt?]
-SLOT=0/7.00
-SRC_URI=https://github.com/camlp5/camlp5/archive/rel700.tar.gz -> camlp5-7.00.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=84461949274246dcdddac468c6c61f32
diff --git a/dev-ml/camlp5-7.01 b/dev-ml/camlp5-7.01
deleted file mode 100644
index 34d1a84c7179..000000000000
--- a/dev-ml/camlp5-7.01
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=>=dev-lang/ocaml-3.10:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=A preprocessor-pretty-printer of ocaml
-EAPI=5
-HOMEPAGE=https://camlp5.github.io/
-IUSE=doc +ocamlopt
-KEYWORDS=~alpha ~amd64 ~ppc ~x86 ~x86-fbsd
-LICENSE=BSD
-RDEPEND=>=dev-lang/ocaml-3.10:=[ocamlopt?]
-SLOT=0/7.01
-SRC_URI=https://github.com/camlp5/camlp5/archive/rel701.tar.gz -> camlp5-7.01.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=84461949274246dcdddac468c6c61f32
diff --git a/dev-ml/camlp5-7.03 b/dev-ml/camlp5-7.03
deleted file mode 100644
index 51ba53b400ed..000000000000
--- a/dev-ml/camlp5-7.03
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=>=dev-lang/ocaml-3.10:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=A preprocessor-pretty-printer of ocaml
-EAPI=5
-HOMEPAGE=https://camlp5.github.io/
-IUSE=doc +ocamlopt
-KEYWORDS=~alpha ~amd64 ~ppc ~x86 ~x86-fbsd
-LICENSE=BSD
-RDEPEND=>=dev-lang/ocaml-3.10:=[ocamlopt?]
-SLOT=0/7.03
-SRC_URI=https://github.com/camlp5/camlp5/archive/rel703.tar.gz -> camlp5-7.03.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=84461949274246dcdddac468c6c61f32
diff --git a/dev-ml/camlp5/Manifest b/dev-ml/camlp5/Manifest
new file mode 100644
index 000000000000..eeb9c254f41a
--- /dev/null
+++ b/dev-ml/camlp5/Manifest
@@ -0,0 +1,9 @@
+DIST camlp5-6.17.tar.gz 718935 BLAKE2B b0a573e1110d6ce0654325a1a7310ebee8c815998df3f1a2bec514a4c4755dedfe68349a55dd227c97a667dbbf36c3d896bd17400e32b0f05e3e9801142aa204 SHA512 c4bf32eb79202d6127375b940fe77fc57c7dc5f8c6763b50ba23ab52ae9f3edb0ba15148109af2f6f4808619348d78e927cfdf29901bf1141b17de0d3fd8ff30
+DIST camlp5-7.00.tar.gz 755750 BLAKE2B b047422ff34c4d15c21b65bd7473ccdad8bfc1f484a0075f1beeaa50fdca72b2f900b437333c847a4e4fd7bb8ae5c37aa4ed984e3a850c4dcba045d8678502c4 SHA512 2d63451229f86fffeb287735ed26901ad43bb964b6ede1716cb82737001a5c1e4b77479a969509606f6a4f14bb6dbff32275d82f4a9640e0c16bb6594779e849
+DIST camlp5-7.01.tar.gz 757118 BLAKE2B 5d7c6f39f24bfee545552aae5c126305d2c767d06762aa516c21bcc5b327b312b7c38d742717eb507b92ae1e27de9c0fcde4d616754a7ce616b5f56689c8dc5a SHA512 9930957f707d9d2c8903f87f5f3444f71bad3d84c944436c7abc6de19209595c974098cd60a6a391f8ae87c4fb53b5122cba8e42e34fcf46d798dbdc28840008
+DIST camlp5-7.03.tar.gz 758136 BLAKE2B 4e1169adf7e119f1f659fe684a8b06c4730db3bcd7807169552de0e3fc115f8d45bc11961f3aee0a9c2d86e1130ec776a1bb7753d7d4e95f661d65d1f841406c SHA512 0c76d469c5f8c727088f3136107b6690349b50791ef8baefffdaa90141230907f977a7a886a9e8d88d39d8fa315637d882d0205c57d752e16575c888a8a1f54d
+EBUILD camlp5-6.17.ebuild 1655 BLAKE2B d80a1f0e9243e0b50a8036d9c10cff0da9edff1ea1fc833178236ab879e74efc53c80d22a69b96f272e7cc132f2879192f82527c117e460259d089d86b7b906c SHA512 9ca905692a13fdb8783a0df0f3a13c7700ffcc03d526445b6ba79fae6ecb1c3dce40ce7b0a2d9f16adbcda2f0d1a5949a3c6718815280141df934e2dce0b193b
+EBUILD camlp5-7.00.ebuild 1462 BLAKE2B 053df6205db22d0704b51021f7a7af14e6ed57f68f7593c3b26826259ba51c9d19a0b2e1ab6e5e0ed840abd868e1869de9224e26b5efbb41c40bc2bf28956400 SHA512 6a03760cf9e53ef8f0595a161f7b49874f0a3df7df99002defc6b73ef7e7c92d32753e9371a4ddfc682dbb32582988c87c925ce08262cfb9bdf6dd04f52a4fd3
+EBUILD camlp5-7.01.ebuild 1462 BLAKE2B 053df6205db22d0704b51021f7a7af14e6ed57f68f7593c3b26826259ba51c9d19a0b2e1ab6e5e0ed840abd868e1869de9224e26b5efbb41c40bc2bf28956400 SHA512 6a03760cf9e53ef8f0595a161f7b49874f0a3df7df99002defc6b73ef7e7c92d32753e9371a4ddfc682dbb32582988c87c925ce08262cfb9bdf6dd04f52a4fd3
+EBUILD camlp5-7.03.ebuild 1462 BLAKE2B 053df6205db22d0704b51021f7a7af14e6ed57f68f7593c3b26826259ba51c9d19a0b2e1ab6e5e0ed840abd868e1869de9224e26b5efbb41c40bc2bf28956400 SHA512 6a03760cf9e53ef8f0595a161f7b49874f0a3df7df99002defc6b73ef7e7c92d32753e9371a4ddfc682dbb32582988c87c925ce08262cfb9bdf6dd04f52a4fd3
+MISC metadata.xml 325 BLAKE2B 427ef154bfad29601dc0caf2681c5cb4b44fe2caad04d4c718d9594fcc4a2c1ad85fa31b2dd84968e081b8e3501fbfa6f069d361f9691667a94725b7243a3779 SHA512 1497b891615104f0f6ce596be91ede868e9d20c401b6912794ff3187975e22d4372ec45eddae276c90b19e5a619146aa8bc49491fd305d723339bf2c9c0b0800
diff --git a/dev-ml/camlp5/camlp5-6.17.ebuild b/dev-ml/camlp5/camlp5-6.17.ebuild
new file mode 100644
index 000000000000..1e3bd458fdcd
--- /dev/null
+++ b/dev-ml/camlp5/camlp5-6.17.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit multilib findlib eutils versionator
+
+MY_P=${P%_p*}
+DESCRIPTION="A preprocessor-pretty-printer of ocaml"
+HOMEPAGE="https://camlp5.github.io/"
+SRC_URI="https://github.com/camlp5/camlp5/archive/rel$(replace_all_version_separators '').tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-rel$(replace_all_version_separators '')"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="alpha amd64 ppc x86 ~x86-fbsd"
+IUSE="doc +ocamlopt"
+
+DEPEND=">=dev-lang/ocaml-3.10:=[ocamlopt?]"
+RDEPEND="${DEPEND}"
+
+PATCHLEVEL=${PV#*_p}
+PATCHLIST=""
+
+if [ "${PATCHLEVEL}" != "${PV}" ] ; then
+ for (( i=1; i<=PATCHLEVEL; i++ )) ; do
+ SRC_URI="${SRC_URI}
+ http://pauillac.inria.fr/~ddr/camlp5/distrib/src/patch-${PV%_p*}-${i} -> ${MY_P}-patch-${i}.patch"
+ PATCHLIST="${PATCHLIST} ${MY_P}-patch-${i}.patch"
+ done
+fi
+
+src_prepare() {
+ for i in ${PATCHLIST} ; do
+ epatch "${DISTDIR}/${i}"
+ done
+ # ocaml 4.04.2 support
+ cp -a ocaml_stuff/4.04.1 ocaml_stuff/4.04.2 || die
+ cp ocaml_src/lib/versdep/4.04.{1,2}.ml || die
+ sed -i -e 's/4.04.1/4.04.2/' ocaml_stuff/4.04.2/utils/pconfig.ml || die
+}
+
+src_configure() {
+ ./configure \
+ --strict \
+ -prefix /usr \
+ -bindir /usr/bin \
+ -libdir /usr/$(get_libdir)/ocaml \
+ -mandir /usr/share/man || die "configure failed"
+}
+
+src_compile(){
+ emake out
+ if use ocamlopt; then
+ emake opt
+ emake opt.opt
+ fi
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ # findlib support
+ insinto "$(ocamlfind printconf destdir)/${PN}"
+ doins etc/META
+
+ use doc && dohtml -r doc/*
+
+ dodoc CHANGES DEVEL ICHANGES README UPGRADING MODE
+}
diff --git a/dev-ml/camlp5/camlp5-7.00.ebuild b/dev-ml/camlp5/camlp5-7.00.ebuild
new file mode 100644
index 000000000000..c0f52ab10e7f
--- /dev/null
+++ b/dev-ml/camlp5/camlp5-7.00.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit multilib findlib eutils versionator
+
+MY_P=${P%_p*}
+DESCRIPTION="A preprocessor-pretty-printer of ocaml"
+HOMEPAGE="https://camlp5.github.io/"
+SRC_URI="https://github.com/camlp5/camlp5/archive/rel$(replace_all_version_separators '').tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-rel$(replace_all_version_separators '')"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE="doc +ocamlopt"
+
+DEPEND=">=dev-lang/ocaml-3.10:=[ocamlopt?]"
+RDEPEND="${DEPEND}"
+
+PATCHLEVEL=${PV#*_p}
+PATCHLIST=""
+
+if [ "${PATCHLEVEL}" != "${PV}" ] ; then
+ for (( i=1; i<=PATCHLEVEL; i++ )) ; do
+ SRC_URI="${SRC_URI}
+ http://pauillac.inria.fr/~ddr/camlp5/distrib/src/patch-${PV%_p*}-${i} -> ${MY_P}-patch-${i}.patch"
+ PATCHLIST="${PATCHLIST} ${MY_P}-patch-${i}.patch"
+ done
+fi
+
+src_prepare() {
+ for i in ${PATCHLIST} ; do
+ epatch "${DISTDIR}/${i}"
+ done
+}
+
+src_configure() {
+ ./configure \
+ --strict \
+ -prefix /usr \
+ -bindir /usr/bin \
+ -libdir /usr/$(get_libdir)/ocaml \
+ -mandir /usr/share/man || die "configure failed"
+}
+
+src_compile(){
+ emake out
+ if use ocamlopt; then
+ emake opt
+ emake opt.opt
+ fi
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ # findlib support
+ insinto "$(ocamlfind printconf destdir)/${PN}"
+ doins etc/META
+
+ use doc && dohtml -r doc/*
+
+ dodoc CHANGES DEVEL ICHANGES README UPGRADING MODE
+}
diff --git a/dev-ml/camlp5/camlp5-7.01.ebuild b/dev-ml/camlp5/camlp5-7.01.ebuild
new file mode 100644
index 000000000000..c0f52ab10e7f
--- /dev/null
+++ b/dev-ml/camlp5/camlp5-7.01.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit multilib findlib eutils versionator
+
+MY_P=${P%_p*}
+DESCRIPTION="A preprocessor-pretty-printer of ocaml"
+HOMEPAGE="https://camlp5.github.io/"
+SRC_URI="https://github.com/camlp5/camlp5/archive/rel$(replace_all_version_separators '').tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-rel$(replace_all_version_separators '')"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE="doc +ocamlopt"
+
+DEPEND=">=dev-lang/ocaml-3.10:=[ocamlopt?]"
+RDEPEND="${DEPEND}"
+
+PATCHLEVEL=${PV#*_p}
+PATCHLIST=""
+
+if [ "${PATCHLEVEL}" != "${PV}" ] ; then
+ for (( i=1; i<=PATCHLEVEL; i++ )) ; do
+ SRC_URI="${SRC_URI}
+ http://pauillac.inria.fr/~ddr/camlp5/distrib/src/patch-${PV%_p*}-${i} -> ${MY_P}-patch-${i}.patch"
+ PATCHLIST="${PATCHLIST} ${MY_P}-patch-${i}.patch"
+ done
+fi
+
+src_prepare() {
+ for i in ${PATCHLIST} ; do
+ epatch "${DISTDIR}/${i}"
+ done
+}
+
+src_configure() {
+ ./configure \
+ --strict \
+ -prefix /usr \
+ -bindir /usr/bin \
+ -libdir /usr/$(get_libdir)/ocaml \
+ -mandir /usr/share/man || die "configure failed"
+}
+
+src_compile(){
+ emake out
+ if use ocamlopt; then
+ emake opt
+ emake opt.opt
+ fi
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ # findlib support
+ insinto "$(ocamlfind printconf destdir)/${PN}"
+ doins etc/META
+
+ use doc && dohtml -r doc/*
+
+ dodoc CHANGES DEVEL ICHANGES README UPGRADING MODE
+}
diff --git a/dev-ml/camlp5/camlp5-7.03.ebuild b/dev-ml/camlp5/camlp5-7.03.ebuild
new file mode 100644
index 000000000000..c0f52ab10e7f
--- /dev/null
+++ b/dev-ml/camlp5/camlp5-7.03.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit multilib findlib eutils versionator
+
+MY_P=${P%_p*}
+DESCRIPTION="A preprocessor-pretty-printer of ocaml"
+HOMEPAGE="https://camlp5.github.io/"
+SRC_URI="https://github.com/camlp5/camlp5/archive/rel$(replace_all_version_separators '').tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-rel$(replace_all_version_separators '')"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE="doc +ocamlopt"
+
+DEPEND=">=dev-lang/ocaml-3.10:=[ocamlopt?]"
+RDEPEND="${DEPEND}"
+
+PATCHLEVEL=${PV#*_p}
+PATCHLIST=""
+
+if [ "${PATCHLEVEL}" != "${PV}" ] ; then
+ for (( i=1; i<=PATCHLEVEL; i++ )) ; do
+ SRC_URI="${SRC_URI}
+ http://pauillac.inria.fr/~ddr/camlp5/distrib/src/patch-${PV%_p*}-${i} -> ${MY_P}-patch-${i}.patch"
+ PATCHLIST="${PATCHLIST} ${MY_P}-patch-${i}.patch"
+ done
+fi
+
+src_prepare() {
+ for i in ${PATCHLIST} ; do
+ epatch "${DISTDIR}/${i}"
+ done
+}
+
+src_configure() {
+ ./configure \
+ --strict \
+ -prefix /usr \
+ -bindir /usr/bin \
+ -libdir /usr/$(get_libdir)/ocaml \
+ -mandir /usr/share/man || die "configure failed"
+}
+
+src_compile(){
+ emake out
+ if use ocamlopt; then
+ emake opt
+ emake opt.opt
+ fi
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ # findlib support
+ insinto "$(ocamlfind printconf destdir)/${PN}"
+ doins etc/META
+
+ use doc && dohtml -r doc/*
+
+ dodoc CHANGES DEVEL ICHANGES README UPGRADING MODE
+}
diff --git a/dev-ml/camlp5/metadata.xml b/dev-ml/camlp5/metadata.xml
new file mode 100644
index 000000000000..dc16ce3e1f12
--- /dev/null
+++ b/dev-ml/camlp5/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">camlp5/camlp5</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/camlpdf-2.1.1 b/dev-ml/camlpdf-2.1.1
deleted file mode 100644
index 59d961d53562..000000000000
--- a/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 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=26e30cb25577f04803cd1915d654a3a1
diff --git a/dev-ml/camlpdf/Manifest b/dev-ml/camlpdf/Manifest
new file mode 100644
index 000000000000..169de865a649
--- /dev/null
+++ b/dev-ml/camlpdf/Manifest
@@ -0,0 +1,4 @@
+AUX ocaml43.patch 513 BLAKE2B 0e072dd9550e836739405bce85d81c38e5f03c4c8c6b400113c1b18a7719f65d82bb2e965337abbd41f9c4407dbad89ed9f289af9cb2b2d9eb8f501f8c346e97 SHA512 d0208633e71699fda0335b4542ef1d888ea8d090debe248dbbcaa0ce056df3f89cc7dc3d58d9fd8c3f329dc1b13b0481a1b0f5e0c832490d7efe314c4e5e3442
+DIST camlpdf-2.1.1.tar.gz 563633 BLAKE2B 3ff7ec46bbac70eabe6695911e834a5f2122136fecba661ff708c86dfb8d928694d67054504028670c3138c600f7f770b540d87c4e1a0ed1e04c71e083afdc23 SHA512 db6f9f61c43113e1f4d8741d88766bacc489a45b8e7164e4619f8bb88c527bc7cbeebdaaa673a77ab16c60dc3c90d21a69844e9fed92c222fc8fe0424f328cf2
+EBUILD camlpdf-2.1.1.ebuild 894 BLAKE2B 634572c7d71247b979133d041e3cb02bebe7be7f08e3afb0c054ac793b46b8887754b4d7ed28d216075bdeb015eb5c0a7dc07db8b2e3d46df90b207e0a420445 SHA512 5fb9224253ff7e7e00ca265be4cbea3894b9dc6604104f95b6a581449ea099f60c1796d248648fca59cb2bae1ce0fa9728a84834df1bc58e21860eb79a8045f1
+MISC metadata.xml 343 BLAKE2B 66027af918b340e99bb310ca9a0aa08b629ce77e509238a0bebba37825aab79787ca274f61b920e0aa23028d1cf4589fbf5634c9e1ccffe4c5b49f6933c6dd08 SHA512 242e854715e8106261330caa84e1b974d69659d004b21128d666011a3eac226667e3af5ce47b92433262be26a10570adce7dcd79d98970a779d63d962334fdd4
diff --git a/dev-ml/camlpdf/camlpdf-2.1.1.ebuild b/dev-ml/camlpdf/camlpdf-2.1.1.ebuild
new file mode 100644
index 000000000000..e2be0d457ace
--- /dev/null
+++ b/dev-ml/camlpdf/camlpdf-2.1.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit findlib eutils
+
+DESCRIPTION="OCaml library for reading, writing, and modifying PDF files"
+HOMEPAGE="https://github.com/johnwhitington/camlpdf/"
+SRC_URI="https://github.com/johnwhitington/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+# technically LGPL-2.1+ with linking exception
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples"
+
+RDEPEND="dev-lang/ocaml:="
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ has_version '>=dev-lang/ocaml-4.03.0_beta1' && epatch "${FILESDIR}/ocaml43.patch"
+}
+
+src_compile() {
+ # parallel make bugs
+ emake -j1
+}
+
+src_install() {
+ findlib_src_install
+ dodoc Changes README.md
+
+ if use doc ; then
+ dodoc introduction_to_camlpdf.pdf
+ dohtml doc/camlpdf/html/*
+ fi
+
+ use examples && dodoc -r examples
+}
diff --git a/dev-ml/camlpdf/files/ocaml43.patch b/dev-ml/camlpdf/files/ocaml43.patch
new file mode 100644
index 000000000000..86ffbe23eb14
--- /dev/null
+++ b/dev-ml/camlpdf/files/ocaml43.patch
@@ -0,0 +1,13 @@
+Index: camlpdf-2.1.1/flatestubs.c
+===================================================================
+--- camlpdf-2.1.1.orig/flatestubs.c
++++ camlpdf-2.1.1/flatestubs.c
+@@ -170,7 +170,7 @@ value camlzip_inflateEnd(value vzs)
+
+ value camlzip_update_crc32(value crc, value buf, value pos, value len)
+ {
+- return copy_int32(crc32((uint32) Int32_val(crc),
++ return copy_int32(crc32((uint32_t) Int32_val(crc),
+ &Byte_u(buf, Long_val(pos)),
+ Long_val(len)));
+ }
diff --git a/dev-ml/camlpdf/metadata.xml b/dev-ml/camlpdf/metadata.xml
new file mode 100644
index 000000000000..1e93b8f9e9d6
--- /dev/null
+++ b/dev-ml/camlpdf/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>radhermit@gentoo.org</email>
+ <name>Tim Harder</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">johnwhitington/camlpdf</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/camlzip-1.06 b/dev-ml/camlzip-1.06
deleted file mode 100644
index 833625c8b06b..000000000000
--- a/dev-ml/camlzip-1.06
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=>=dev-lang/ocaml-4.02:=[ocamlopt?] >=sys-libs/zlib-1.1.3 >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Compressed file access ML library (ZIP, GZIP and JAR)
-EAPI=5
-HOMEPAGE=http://forge.ocamlcore.org/projects/camlzip/
-IUSE=+ocamlopt
-KEYWORDS=amd64 ppc x86 ~x86-fbsd
-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 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=17e5235adaba7365f98dbcf914185e19
diff --git a/dev-ml/camlzip-1.07 b/dev-ml/camlzip-1.07
deleted file mode 100644
index 1faa0d0e9236..000000000000
--- a/dev-ml/camlzip-1.07
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=>=dev-lang/ocaml-4.02:=[ocamlopt?] >=sys-libs/zlib-1.1.3 >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Compressed file access ML library (ZIP, GZIP and JAR)
-EAPI=5
-HOMEPAGE=https://github.com/xavierleroy/camlzip
-IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86 ~x86-fbsd
-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 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=6ab7fdd83bf5a0dfa905b516036c13d9
diff --git a/dev-ml/camlzip/Manifest b/dev-ml/camlzip/Manifest
new file mode 100644
index 000000000000..c9b62b1852dd
--- /dev/null
+++ b/dev-ml/camlzip/Manifest
@@ -0,0 +1,5 @@
+DIST camlzip-1.06.tar.gz 26499 BLAKE2B a7a1dbe157c0dcb9847bcd6324bbb7cbaf39342d0fdbaed51d2c004ae7b03f8d655fb15da50dae6190b976675e405e28fa2d4fa35a2f4372c50519564d58f981 SHA512 5ef0172927106589620678897f12f054533503a5cf13df71bf4deda43f223d0cd6acce118977e87bce53afe289f367b851f192a8e693274c2bd13549121019dd
+DIST camlzip-1.07.tar.gz 26652 BLAKE2B f373ac0427faa9b6a846e9db8f3e48c00ec6885b8a11cc09fae96b5a7656908f172fda73dbea8ddd1b3dbfd98bcfa3e2e67ce9faf2942d1e260fc0a804813a05 SHA512 b92e9db002b9b398fd132c6ecd8098fac4cc7ddb3f770cc412990dcdf4bd62ba358c762d31fb0b5cd6b32f20d3bf4b3410ca6e86c511a438b92ece940f9831bd
+EBUILD camlzip-1.06.ebuild 688 BLAKE2B c1464425312b8825f76843ff05e913bd4fb85223ea7312c2b0dc7c0b6178f58c6df1b31474a1f69af286fafe586d6d234950612f1bf48214edae968089c40a9d SHA512 cd8ec9aadf5e74096c48c49b7316518a9af3a41dae9abbe92c9441dc5b83ba7b335808827722a7f795e5e42d44eaadafe9bd579ee4d15c2803651957ab56bb1b
+EBUILD camlzip-1.07.ebuild 823 BLAKE2B a569ebdb617046069ec484fa353c7fbbf550443667f96f4962480fdfe41e6ca33cca0859e0bceaddfc215d80096f0ac0fb68627317079630d8c50abcbc19eedf SHA512 36f894cac34b563204dc06b1df10d98332366ecbd66821f2513ed057fdc54650abe664f777b073e04730963b8cfe1514fc1aba3a45bc4c9ebdc6aedca947c703
+MISC metadata.xml 331 BLAKE2B ed79189ab7c0f0410de2ee3d342f0cfed3b37aaa91be8a69ecea9742c00a12f4180f7babf3be9fd3ab4be4c5b83702cacb5302ee98f39ad23d78d67121fdbb1c SHA512 f282b3605f8d97e4789545f6a8fe443dd25fa1af5f8d11f56dea6ffc513eb8ce3d858fc3335ed501f2d26dd7d38da41f1e3e3e21f90dd111de81107c56276310
diff --git a/dev-ml/camlzip/camlzip-1.06.ebuild b/dev-ml/camlzip/camlzip-1.06.ebuild
new file mode 100644
index 000000000000..360a11fbf5b7
--- /dev/null
+++ b/dev-ml/camlzip/camlzip-1.06.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit findlib eutils
+
+IUSE="+ocamlopt"
+
+DESCRIPTION="Compressed file access ML library (ZIP, GZIP and JAR)"
+HOMEPAGE="http://forge.ocamlcore.org/projects/camlzip/"
+SRC_URI="http://forge.ocamlcore.org/frs/download.php/1616/${P}.tar.gz"
+
+SLOT="1/${PV}"
+LICENSE="LGPL-2.1"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+
+RDEPEND=">=dev-lang/ocaml-4.02:=[ocamlopt?]
+ >=sys-libs/zlib-1.1.3"
+DEPEND="${RDEPEND}"
+
+src_compile() {
+ emake all
+ if use ocamlopt; then
+ emake allopt
+ fi
+}
+
+src_install() {
+ findlib_src_preinst
+ emake DESTDIR="${D}" install-findlib
+
+ dodoc README Changes
+}
diff --git a/dev-ml/camlzip/camlzip-1.07.ebuild b/dev-ml/camlzip/camlzip-1.07.ebuild
new file mode 100644
index 000000000000..23881c07e55b
--- /dev/null
+++ b/dev-ml/camlzip/camlzip-1.07.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit findlib eutils versionator
+
+IUSE="+ocamlopt"
+
+DESCRIPTION="Compressed file access ML library (ZIP, GZIP and JAR)"
+HOMEPAGE="https://github.com/xavierleroy/camlzip"
+SRC_URI="https://github.com/xavierleroy/camlzip/archive/rel$(delete_all_version_separators ${PV}).tar.gz -> ${P}.tar.gz"
+
+SLOT="1/${PV}"
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~x86-fbsd"
+
+RDEPEND=">=dev-lang/ocaml-4.02:=[ocamlopt?]
+ >=sys-libs/zlib-1.1.3"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${PN}-rel$(delete_all_version_separators ${PV})"
+
+src_compile() {
+ emake all
+ if use ocamlopt; then
+ emake allopt
+ fi
+}
+
+src_install() {
+ findlib_src_preinst
+ emake DESTDIR="${D}" install-findlib
+
+ dodoc README Changes
+}
diff --git a/dev-ml/camlzip/metadata.xml b/dev-ml/camlzip/metadata.xml
new file mode 100644
index 000000000000..a6ac295dcc2a
--- /dev/null
+++ b/dev-ml/camlzip/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">xavierleroy/camlzip</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/camomile-0.8.5-r1 b/dev-ml/camomile-0.8.5-r1
deleted file mode 100644
index d793dacece29..000000000000
--- a/dev-ml/camomile-0.8.5-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=>=dev-lang/ocaml-3.10.2:=[ocamlopt?] dev-ml/camlp4:= >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Camomile is a comprehensive Unicode library for ocaml
-EAPI=5
-HOMEPAGE=https://github.com/yoriyuki/Camomile/wiki
-IUSE=debug +ocamlopt
-KEYWORDS=amd64 ppc x86
-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 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=09234b3c14624f11f95d9f77e23a0bca
diff --git a/dev-ml/camomile/Manifest b/dev-ml/camomile/Manifest
new file mode 100644
index 000000000000..fef4b1f7e704
--- /dev/null
+++ b/dev-ml/camomile/Manifest
@@ -0,0 +1,4 @@
+AUX ocaml405.patch 1469 BLAKE2B 06ef619b7dd82b584e192eea1818de0b95e5005a9c5492bd2c8ee4430728a6577b0f125e63ba483d40593f08ec7e885e279bbf815896d1b36d4177910a95f9bf SHA512 b8951a401ee8b4c4e49e4a144c6ea5e0cc3c50ab62c95f34a4766fd46a4a93d9eea13c5d30b00eabaee00d70a3cc82a8251d110e622e00c623c8467867cc95ba
+DIST camomile-0.8.5.tar.bz2 2607084 BLAKE2B 5e0ff51cdd6d7ce41ee024189a793f3d3e4bec1bd9849e7c01d2722ff22ca2cb5f0d5bd5f95820e741469ebda2996edf3611827535df5fe095d3f6617ecfdd42 SHA512 ef4da32f955e69e0b2958b4b2bf12ae94e210d8aa7cee5a9030607b79ac43a884758549f3164c223fb07d987a4a50b15f0bc5083ff67120270409f7fb9928014
+EBUILD camomile-0.8.5-r1.ebuild 888 BLAKE2B 3b08a60d1798ce21950e2ded5212d28f39792710024e8cb3a2fd882639ae1cff6f1eee635cabe5cafeea018f59ee5e65468597303075a0a0e7f7966a4784ea56 SHA512 8adaa7baea01f24cec23a0ef28efd92a33d910a2b9eb3b3920fe2f180ef397198b9055f4f8880c5dab793295a59238fa13488e8c5f50b0fabfbabda97166f2c6
+MISC metadata.xml 339 BLAKE2B 29e7f7ac895463cf693b7c3cad7e0b767126b43c1b11162ca6718f2561f74e466502e5a136a9fa5b7b6312505e2b937590488185a1b76de22bd6bc980dba295d SHA512 32caf2bcfc2f9481faf5d86ba612d0da5887f767236aee93f5c8c647044f38e31f0dac30c63566c131be42037d22511147c8eedd2832082d731fe19a533964d0
diff --git a/dev-ml/camomile/camomile-0.8.5-r1.ebuild b/dev-ml/camomile/camomile-0.8.5-r1.ebuild
new file mode 100644
index 000000000000..68d9d15dcc3e
--- /dev/null
+++ b/dev-ml/camomile/camomile-0.8.5-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit findlib eutils
+
+DESCRIPTION="Camomile is a comprehensive Unicode library for ocaml"
+HOMEPAGE="https://github.com/yoriyuki/Camomile/wiki"
+SRC_URI="https://github.com/yoriyuki/Camomile/releases/download/rel-${PV}/${P}.tar.bz2"
+
+LICENSE="LGPL-2"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ppc x86"
+IUSE="debug +ocamlopt"
+
+RDEPEND="
+ >=dev-lang/ocaml-3.10.2:=[ocamlopt?]
+ dev-ml/camlp4:=
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ has_version '>=dev-lang/ocaml-4.05_beta' && epatch "${FILESDIR}/ocaml405.patch"
+}
+
+src_configure() {
+ econf $(use_enable debug)
+}
+
+src_compile() {
+ emake -j1 byte unidata unimaps charmap_data locale_data
+ if use ocamlopt; then
+ emake -j1 opt
+ fi
+}
+
+src_install() {
+ dodir /usr/bin
+ findlib_src_install DATADIR="${D}/usr/share" BINDIR="${D}/usr/bin"
+}
diff --git a/dev-ml/camomile/files/ocaml405.patch b/dev-ml/camomile/files/ocaml405.patch
new file mode 100644
index 000000000000..3fec6955a27c
--- /dev/null
+++ b/dev-ml/camomile/files/ocaml405.patch
@@ -0,0 +1,40 @@
+commit 0fa0a19f15998e89e4b04150dd74529bbd406f42
+Author: Gabriel Scherer <gabriel.scherer@gmail.com>
+Date: Fri Feb 24 22:30:23 2017 -0500
+
+ 4.05 compatibility: use explicit module signatures
+
+ In 4.05, checking for non-generalizable inference variable ('_a)
+ (forbidden in toplevel modules and functors) happens before checking
+ the .ml file against the .mli signature, so non-generalizable
+ variables that were previously resolved through the .mli constraint
+ are now underspecified and result in a compilation failure
+ (see MPR#7414, GPR#929). This commit adds enough annotations to avoid
+ such underspecified variables in functors.
+
+diff --git a/Camomile/internal/unimap.ml b/Camomile/internal/unimap.ml
+index b6fdbde..6a7cc30 100644
+--- a/Camomile/internal/unimap.ml
++++ b/Camomile/internal/unimap.ml
+@@ -58,7 +58,7 @@ val of_name : string -> t
+ end
+
+
+-module Make (Config : ConfigInt.Type) = struct
++module Make (Config : ConfigInt.Type) : Type = struct
+
+ type mapping = {no_char : int; tbl : Tbl31.Bytes.t}
+
+diff --git a/Camomile/public/uCharInfo.ml b/Camomile/public/uCharInfo.ml
+index 69bf141..6a0337a 100644
+--- a/Camomile/public/uCharInfo.ml
++++ b/Camomile/public/uCharInfo.ml
+@@ -298,7 +298,7 @@ val load_composition_exclusion_tbl : unit -> UCharTbl.Bool.t
+
+ end
+
+-module Make (Config : ConfigInt.Type) = struct
++module Make (Config : ConfigInt.Type) : Type = struct
+ include Unidata.Make(Config)
+
+ (* General category *)
diff --git a/dev-ml/camomile/metadata.xml b/dev-ml/camomile/metadata.xml
new file mode 100644
index 000000000000..82a7e9775c14
--- /dev/null
+++ b/dev-ml/camomile/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">yoriyuki/Camomile</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/capnp-ocaml-3.0.0 b/dev-ml/capnp-ocaml-3.0.0
deleted file mode 100644
index 1067f2984b90..000000000000
--- a/dev-ml/capnp-ocaml-3.0.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=dev-ml/core_kernel:= dev-ml/ocaml-extunix:= dev-ml/ocplib-endian:= dev-ml/res:= dev-ml/ocaml-uint:= dev-libs/capnproto:= test? ( dev-ml/core:= dev-ml/ounit ) dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=OCaml code generator plugin for the Cap'n Proto serialization framework
-EAPI=5
-HOMEPAGE=https://github.com/pelzlpj/capnp-ocaml
-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:=
-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 24b4a2529c1fd12f1304856d6c5a690d
-_md5_=a1e142261b117d0c118b1c79b7e385d5
diff --git a/dev-ml/capnp-ocaml-3.1.0 b/dev-ml/capnp-ocaml-3.1.0
deleted file mode 100644
index 1998923c9ca3..000000000000
--- a/dev-ml/capnp-ocaml-3.1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=dev-ml/core_kernel:= dev-ml/ocaml-extunix:= dev-ml/ocplib-endian:= dev-ml/res:= dev-ml/ocaml-uint:= dev-libs/capnproto:= test? ( dev-ml/core:= dev-ml/ounit ) dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=OCaml code generator plugin for the Cap'n Proto serialization framework
-EAPI=5
-HOMEPAGE=https://github.com/pelzlpj/capnp-ocaml
-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:=
-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 24b4a2529c1fd12f1304856d6c5a690d
-_md5_=a1e142261b117d0c118b1c79b7e385d5
diff --git a/dev-ml/capnp-ocaml/Manifest b/dev-ml/capnp-ocaml/Manifest
new file mode 100644
index 000000000000..eca5434180b8
--- /dev/null
+++ b/dev-ml/capnp-ocaml/Manifest
@@ -0,0 +1,5 @@
+DIST capnp-ocaml-3.0.0.tar.gz 140985 BLAKE2B 00d9bfec72ca60ae5b17730248554b5d5d7b0b85d007cc0dc3332043416125b1931e3d92b3d17ce12b40ae4094ff4ff212aaa327332588c6d00a853e31dea6a4 SHA512 5cdf678fa80e67c552f60123f1d04eb5facad81e6c29661c2234c06bbcb98312d1eba96f81f3e747fef0b4de986aff07b69aafcbfde60873ba40452a66d75075
+DIST capnp-ocaml-3.1.0.tar.gz 141189 BLAKE2B 503fa710f4940e4235b04d5090b29d5d43a351c057b6ec0dd07827c7b0f906261bf2ec3c8365b866190a6e202b9234e8b648d9846d8aaed8bb40b8601f8d9bcf SHA512 d3a24800ee334d5d0506a9b9f2db10994e475b205e347ae606d4f963cd846c7ab2ed8f60505495509cf2f3444c46b8aefe0501c6803874b5659b8b6429506b77
+EBUILD capnp-ocaml-3.0.0.ebuild 705 BLAKE2B 2552bc64b6342b4a730e73fb7c71316329b02e9791da3f55ddd6aa4138d99d1caae76fac8984bb1bf15186f329534d9938b638304517030086fceebbccf269e3 SHA512 0cf3b6440cc4db39eee8a9486b0e385af018713b31ca04d0e90e7e7748272a721016abf90d6684dee7c95618ffa90775c05b96aa575e5c8b7909aece0620e4e4
+EBUILD capnp-ocaml-3.1.0.ebuild 705 BLAKE2B 2552bc64b6342b4a730e73fb7c71316329b02e9791da3f55ddd6aa4138d99d1caae76fac8984bb1bf15186f329534d9938b638304517030086fceebbccf269e3 SHA512 0cf3b6440cc4db39eee8a9486b0e385af018713b31ca04d0e90e7e7748272a721016abf90d6684dee7c95618ffa90775c05b96aa575e5c8b7909aece0620e4e4
+MISC metadata.xml 331 BLAKE2B 4172955d0af56dceca74d19fe149a1c6231225d494de2bb026700940d246dc75a65d7907651d7f585e0a9c40a0d14a79f3751b629099b7ea366bc2a4434d5164 SHA512 c105113be48774c0cb057e038ab129c19290f9a46ef0b1de656905e8c2a5f42570381f691eafb23a99b2797126dbf95dee5381cd8826bb32d38fc56bb40c7268
diff --git a/dev-ml/capnp-ocaml/capnp-ocaml-3.0.0.ebuild b/dev-ml/capnp-ocaml/capnp-ocaml-3.0.0.ebuild
new file mode 100644
index 000000000000..4d060a2a99a2
--- /dev/null
+++ b/dev-ml/capnp-ocaml/capnp-ocaml-3.0.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit opam
+
+DESCRIPTION="OCaml code generator plugin for the Cap'n Proto serialization framework"
+HOMEPAGE="https://github.com/pelzlpj/capnp-ocaml"
+SRC_URI="https://github.com/pelzlpj/capnp-ocaml/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND="
+ dev-ml/core_kernel:=
+ dev-ml/ocaml-extunix:=
+ dev-ml/ocplib-endian:=
+ dev-ml/res:=
+ dev-ml/ocaml-uint:=
+ dev-libs/capnproto:=
+"
+DEPEND="${RDEPEND}
+ test? ( dev-ml/core:= dev-ml/ounit )
+ dev-ml/jbuilder
+"
+
+src_compile() {
+ emake build
+}
+
+src_install() {
+ opam_src_install capnp
+}
diff --git a/dev-ml/capnp-ocaml/capnp-ocaml-3.1.0.ebuild b/dev-ml/capnp-ocaml/capnp-ocaml-3.1.0.ebuild
new file mode 100644
index 000000000000..4d060a2a99a2
--- /dev/null
+++ b/dev-ml/capnp-ocaml/capnp-ocaml-3.1.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit opam
+
+DESCRIPTION="OCaml code generator plugin for the Cap'n Proto serialization framework"
+HOMEPAGE="https://github.com/pelzlpj/capnp-ocaml"
+SRC_URI="https://github.com/pelzlpj/capnp-ocaml/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND="
+ dev-ml/core_kernel:=
+ dev-ml/ocaml-extunix:=
+ dev-ml/ocplib-endian:=
+ dev-ml/res:=
+ dev-ml/ocaml-uint:=
+ dev-libs/capnproto:=
+"
+DEPEND="${RDEPEND}
+ test? ( dev-ml/core:= dev-ml/ounit )
+ dev-ml/jbuilder
+"
+
+src_compile() {
+ emake build
+}
+
+src_install() {
+ opam_src_install capnp
+}
diff --git a/dev-ml/capnp-ocaml/metadata.xml b/dev-ml/capnp-ocaml/metadata.xml
new file mode 100644
index 000000000000..d4602eeb2f4d
--- /dev/null
+++ b/dev-ml/capnp-ocaml/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">pelzlpj/capnp-ocaml</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/cmdliner-1.0.0 b/dev-ml/cmdliner-1.0.0
deleted file mode 100644
index e23508b5ddd7..000000000000
--- a/dev-ml/cmdliner-1.0.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/result:= dev-ml/topkg dev-ml/ocamlbuild >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Declarative definition of command line interfaces for OCaml
-EAPI=5
-HOMEPAGE=http://erratique.ch/software/cmdliner
-IUSE=+ocamlopt test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
-LICENSE=ISC
-RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/result:=
-SLOT=0/1.0.0
-SRC_URI=http://erratique.ch/software/cmdliner/releases/cmdliner-1.0.0.tbz
-_eclasses_=findlib 45d6030075064a68da8d7143726a1150
-_md5_=673c48e7a65d135d5665b2c36846e6eb
diff --git a/dev-ml/cmdliner-1.0.1 b/dev-ml/cmdliner-1.0.1
deleted file mode 100644
index a6d6175f197e..000000000000
--- a/dev-ml/cmdliner-1.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/result:= dev-ml/topkg dev-ml/ocamlbuild >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Declarative definition of command line interfaces for OCaml
-EAPI=5
-HOMEPAGE=http://erratique.ch/software/cmdliner
-IUSE=+ocamlopt test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
-LICENSE=ISC
-RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/result:=
-SLOT=0/1.0.1
-SRC_URI=http://erratique.ch/software/cmdliner/releases/cmdliner-1.0.1.tbz
-_eclasses_=findlib 45d6030075064a68da8d7143726a1150
-_md5_=673c48e7a65d135d5665b2c36846e6eb
diff --git a/dev-ml/cmdliner-1.0.2 b/dev-ml/cmdliner-1.0.2
deleted file mode 100644
index 15fe13883677..000000000000
--- a/dev-ml/cmdliner-1.0.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/result:= dev-ml/topkg dev-ml/ocamlbuild >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Declarative definition of command line interfaces for OCaml
-EAPI=5
-HOMEPAGE=http://erratique.ch/software/cmdliner
-IUSE=+ocamlopt test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
-LICENSE=ISC
-RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/result:=
-SLOT=0/1.0.2
-SRC_URI=http://erratique.ch/software/cmdliner/releases/cmdliner-1.0.2.tbz
-_eclasses_=findlib 45d6030075064a68da8d7143726a1150
-_md5_=673c48e7a65d135d5665b2c36846e6eb
diff --git a/dev-ml/cmdliner/Manifest b/dev-ml/cmdliner/Manifest
new file mode 100644
index 000000000000..adc4151f9da4
--- /dev/null
+++ b/dev-ml/cmdliner/Manifest
@@ -0,0 +1,7 @@
+DIST cmdliner-1.0.0.tbz 46542 BLAKE2B 7a667e218c298dbe4f5ba8ff034f15596e9b89b1a267fbdf7f6f811e42d61b103b08a2c8b9bd45e83bb249ae5ed078eb646630cd8a174af267354b25dc13ca54 SHA512 3fc87e49504167864ba4d81fde7bbaa01b7d58b06e2b68b36647857590f41fdc8b3bbd547418f8159b0e76628236b5c30301404b3d8d57e2ff3f082228eee73c
+DIST cmdliner-1.0.1.tbz 46614 BLAKE2B 609220b8dbb0aa5ade9f504f420ed7c6ee1ad9aa1f9cd02b1edba60b86791e59a12faca0ebe6ed9cbb5fbeefdfe25b524509bf311f1611022b6c62ae38df01c1 SHA512 b792dab3a7f53f69d74d07acbb013e48235614e29a477b7e9e7d7b58013d47ff842fbaeef50acda305434185325855ef83d839d5acb0ccf460276f0ca880ee7b
+DIST cmdliner-1.0.2.tbz 47350 BLAKE2B 226481c73e66fb45a69b563bef9f95c6a04b782072643fd8e66e4da4907f899a72e2b4e1217b46c3a1f417bf9e4be193c3528da09954808043e4abf47be4d5c2 SHA512 d718d9abe4fe0ea0e7453ed09e57de2a427cc450225cf2b56513d99af4b4218c3fe96ab08dcebd202b9ecf25a471bb7c67511262f35148dfe15684421be6d743
+EBUILD cmdliner-1.0.0.ebuild 1022 BLAKE2B 3b948b63af7bd1024c33649cb7ff517a9c375574928323bfbc0aefbc49baee56b6441e3f08608dddb0be7ad52617bc28780fc73ef2266e08e1921f82d6a4e31b SHA512 701c1e4ae603a4131dd19020e8e50f89107cc59270cb37ee9fa27dd7c9f3095540b99b7344eee3b0fa85138970d9488a4597037d2336322b0dada3803f8b709f
+EBUILD cmdliner-1.0.1.ebuild 1022 BLAKE2B 3b948b63af7bd1024c33649cb7ff517a9c375574928323bfbc0aefbc49baee56b6441e3f08608dddb0be7ad52617bc28780fc73ef2266e08e1921f82d6a4e31b SHA512 701c1e4ae603a4131dd19020e8e50f89107cc59270cb37ee9fa27dd7c9f3095540b99b7344eee3b0fa85138970d9488a4597037d2336322b0dada3803f8b709f
+EBUILD cmdliner-1.0.2.ebuild 1022 BLAKE2B 3b948b63af7bd1024c33649cb7ff517a9c375574928323bfbc0aefbc49baee56b6441e3f08608dddb0be7ad52617bc28780fc73ef2266e08e1921f82d6a4e31b SHA512 701c1e4ae603a4131dd19020e8e50f89107cc59270cb37ee9fa27dd7c9f3095540b99b7344eee3b0fa85138970d9488a4597037d2336322b0dada3803f8b709f
+MISC metadata.xml 243 BLAKE2B 010ca240ae06e9a9f6d7ba213eb06df36d9ba862ff2d2458d98a9fea1a1e7f3026d13832a73bce1b3ad9345029425e6abfae9e03bf126f2329b3f030ed3753fd SHA512 1c5b4b2163017e496999d1f87e5c9c5ac6c11b2e9187450ccfb3df258f34e54d278972f04ee0e8429476c6f87e091a869ac2a28c6e8c8e6d20678c3e74061449
diff --git a/dev-ml/cmdliner/cmdliner-1.0.0.ebuild b/dev-ml/cmdliner/cmdliner-1.0.0.ebuild
new file mode 100644
index 000000000000..262192ca7b53
--- /dev/null
+++ b/dev-ml/cmdliner/cmdliner-1.0.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit findlib
+
+DESCRIPTION="Declarative definition of command line interfaces for OCaml"
+HOMEPAGE="http://erratique.ch/software/cmdliner"
+SRC_URI="http://erratique.ch/software/${PN}/releases/${P}.tbz"
+
+LICENSE="ISC"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE="+ocamlopt test"
+
+RDEPEND="
+ >=dev-lang/ocaml-4:=[ocamlopt?]
+ dev-ml/result:=
+"
+DEPEND="${RDEPEND}
+ dev-ml/topkg
+ dev-ml/ocamlbuild"
+
+src_compile() {
+ ocaml pkg/pkg.ml build \
+ --tests $(usex test true false) \
+ || die
+}
+
+src_test() {
+ ocaml pkg/pkg.ml test || die
+}
+
+src_install() {
+ # Can't use opam-installer here as it is an opam dep...
+ findlib_src_preinst
+ local nativelibs=""
+ use ocamlopt && nativelibs="$(echo _build/src/cmdliner.cm{x,xa,xs} _build/src/cmdliner.a)"
+ ocamlfind install cmdliner _build/pkg/META \
+ _build/src/cmdliner.mli _build/src/cmdliner.cm{a,i} ${nativelibs} || die
+ dodoc README.md CHANGES.md
+}
diff --git a/dev-ml/cmdliner/cmdliner-1.0.1.ebuild b/dev-ml/cmdliner/cmdliner-1.0.1.ebuild
new file mode 100644
index 000000000000..262192ca7b53
--- /dev/null
+++ b/dev-ml/cmdliner/cmdliner-1.0.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit findlib
+
+DESCRIPTION="Declarative definition of command line interfaces for OCaml"
+HOMEPAGE="http://erratique.ch/software/cmdliner"
+SRC_URI="http://erratique.ch/software/${PN}/releases/${P}.tbz"
+
+LICENSE="ISC"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE="+ocamlopt test"
+
+RDEPEND="
+ >=dev-lang/ocaml-4:=[ocamlopt?]
+ dev-ml/result:=
+"
+DEPEND="${RDEPEND}
+ dev-ml/topkg
+ dev-ml/ocamlbuild"
+
+src_compile() {
+ ocaml pkg/pkg.ml build \
+ --tests $(usex test true false) \
+ || die
+}
+
+src_test() {
+ ocaml pkg/pkg.ml test || die
+}
+
+src_install() {
+ # Can't use opam-installer here as it is an opam dep...
+ findlib_src_preinst
+ local nativelibs=""
+ use ocamlopt && nativelibs="$(echo _build/src/cmdliner.cm{x,xa,xs} _build/src/cmdliner.a)"
+ ocamlfind install cmdliner _build/pkg/META \
+ _build/src/cmdliner.mli _build/src/cmdliner.cm{a,i} ${nativelibs} || die
+ dodoc README.md CHANGES.md
+}
diff --git a/dev-ml/cmdliner/cmdliner-1.0.2.ebuild b/dev-ml/cmdliner/cmdliner-1.0.2.ebuild
new file mode 100644
index 000000000000..262192ca7b53
--- /dev/null
+++ b/dev-ml/cmdliner/cmdliner-1.0.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit findlib
+
+DESCRIPTION="Declarative definition of command line interfaces for OCaml"
+HOMEPAGE="http://erratique.ch/software/cmdliner"
+SRC_URI="http://erratique.ch/software/${PN}/releases/${P}.tbz"
+
+LICENSE="ISC"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE="+ocamlopt test"
+
+RDEPEND="
+ >=dev-lang/ocaml-4:=[ocamlopt?]
+ dev-ml/result:=
+"
+DEPEND="${RDEPEND}
+ dev-ml/topkg
+ dev-ml/ocamlbuild"
+
+src_compile() {
+ ocaml pkg/pkg.ml build \
+ --tests $(usex test true false) \
+ || die
+}
+
+src_test() {
+ ocaml pkg/pkg.ml test || die
+}
+
+src_install() {
+ # Can't use opam-installer here as it is an opam dep...
+ findlib_src_preinst
+ local nativelibs=""
+ use ocamlopt && nativelibs="$(echo _build/src/cmdliner.cm{x,xa,xs} _build/src/cmdliner.a)"
+ ocamlfind install cmdliner _build/pkg/META \
+ _build/src/cmdliner.mli _build/src/cmdliner.cm{a,i} ${nativelibs} || die
+ dodoc README.md CHANGES.md
+}
diff --git a/dev-ml/cmdliner/metadata.xml b/dev-ml/cmdliner/metadata.xml
new file mode 100644
index 000000000000..ffac4d7ebc01
--- /dev/null
+++ b/dev-ml/cmdliner/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-ml/configurator-0.9.1 b/dev-ml/configurator-0.9.1
deleted file mode 100644
index 01d586cc23f9..000000000000
--- a/dev-ml/configurator-0.9.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-lang/ocaml:= dev-ml/base:= dev-ml/ppx_base:= dev-ml/ppx_driver:= dev-ml/stdio:= dev-ml/ocaml-migrate-parsetree:= dev-ml/opam dev-ml/jbuilder
-DESCRIPTION=Helper library for gathering system configuration
-EAPI=6
-HOMEPAGE=https://github.com/janestreet/configurator
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-lang/ocaml:= dev-ml/base:= dev-ml/ppx_base:= dev-ml/ppx_driver:= dev-ml/stdio:= dev-ml/ocaml-migrate-parsetree:=
-SLOT=0/0.9.1
-SRC_URI=https://github.com/janestreet/configurator/archive/v0.9.1.tar.gz -> configurator-0.9.1.tar.gz
-_md5_=fe39bc023608a20f675256fc67021e7e
diff --git a/dev-ml/configurator/Manifest b/dev-ml/configurator/Manifest
new file mode 100644
index 000000000000..d5f78125c8ed
--- /dev/null
+++ b/dev-ml/configurator/Manifest
@@ -0,0 +1,3 @@
+DIST configurator-0.9.1.tar.gz 10231 BLAKE2B e80deda7cf53a6fe2ef042696c5e815576a5f846e2cbe360b8b3e938ee2bd81b4e93f51141a1e10a18bb97a7b0ae41be64409bd85a9ad85eab4595ca36889ee2 SHA512 43d864d3317241dd66829747dd956ac42614cc687bbca23e2575cb1b3ab9d0c628dfbdd8f026bcd4d76cb87cf282d955d6a90f0e69543ee1ee1f01a1efa9b54b
+EBUILD configurator-0.9.1.ebuild 759 BLAKE2B 64a366966a07b283e36d366bb2d2f9586b077b6a6861c4e8f78ebdd2c48792f7cb4a53dccf2c70d48f462178502a9822605e8597710ed0fb22ce00213b188f9d SHA512 fe543f77813d1b892d379423199eff09b985a57b9b194f4827ddbb30312d3e04c00d1f312d82bc58148c5adf55436b7ed7d70bcc37daa31d060fe65e3becd922
+MISC metadata.xml 335 BLAKE2B 43149495ecfe838c2346c0d6c84b8faedd83a5b2bc11dbab6b1d3c6d28867012bc0c0f3e86336dff17f66fe55be92c52a770611d5565581fd39e06adb2401bbb SHA512 661360e00a85c70e5d1b28e2a4003d34fef28daa0e3efb909ac9bb748829e43ed50f5307d19c86e5c19142f64e1ab769845c583a45a2b4b93a9ddf2371ed96bb
diff --git a/dev-ml/configurator/configurator-0.9.1.ebuild b/dev-ml/configurator/configurator-0.9.1.ebuild
new file mode 100644
index 000000000000..76c8abbab093
--- /dev/null
+++ b/dev-ml/configurator/configurator-0.9.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Helper library for gathering system configuration"
+HOMEPAGE="https://github.com/janestreet/configurator"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="
+ dev-lang/ocaml:=
+ dev-ml/base:=
+ dev-ml/ppx_base:=
+ dev-ml/ppx_driver:=
+ dev-ml/stdio:=
+ dev-ml/ocaml-migrate-parsetree:=
+ "
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND} dev-ml/opam dev-ml/jbuilder"
+
+src_install() {
+ opam-installer -i \
+ --prefix="${ED}/usr" \
+ --libdir="${D}/$(ocamlc -where)" \
+ --docdir="${ED}/usr/share/doc/${PF}" \
+ ${PN}.install || die
+}
diff --git a/dev-ml/configurator/metadata.xml b/dev-ml/configurator/metadata.xml
new file mode 100644
index 000000000000..24f2767a0bc5
--- /dev/null
+++ b/dev-ml/configurator/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">janestreet/configurator</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/core-0.9.1-r1 b/dev-ml/core-0.9.1-r1
deleted file mode 100644
index e2b3910a6d8d..000000000000
--- a/dev-ml/core-0.9.1-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=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-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=Jane Street's alternative to the standard library
-EAPI=6
-HOMEPAGE=https://github.com/janestreet/core
-KEYWORDS=~amd64
-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 24b4a2529c1fd12f1304856d6c5a690d
-_md5_=df4572d1e1b80028c10da6de7016e9ff
diff --git a/dev-ml/core-0.9.2 b/dev-ml/core-0.9.2
deleted file mode 100644
index 2f92982b9104..000000000000
--- a/dev-ml/core-0.9.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=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-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=Jane Street's alternative to the standard library
-EAPI=6
-HOMEPAGE=https://github.com/janestreet/core
-KEYWORDS=~amd64
-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 24b4a2529c1fd12f1304856d6c5a690d
-_md5_=aee3b69142b609b9a4a6bf0f5895800f
diff --git a/dev-ml/core/Manifest b/dev-ml/core/Manifest
new file mode 100644
index 000000000000..c2bedc8b8b82
--- /dev/null
+++ b/dev-ml/core/Manifest
@@ -0,0 +1,6 @@
+AUX glibc225.patch 380 BLAKE2B e645ff6879f9a8f4cadb7514cdc8ba2ef0fb7da6db6e34ab888803db25e8db085ee185740d5b80b0c3d2dcc38a010c26379c56857807518f33d27316bf4a6025 SHA512 e41e396448dfc15fa6625bf0356a9059f70e7f013a6e158df377b6d59df1c5b6e922b3704a20e47bfa68d1062022db50d07edaaf075ae1c1163dd9187d798865
+DIST core-0.9.1.tar.gz 735006 BLAKE2B a85b66c810656aca74fbe82fda37a9d73ca295534b1ea5b2a784aef90c5efb8d571fe449d8b8d1f6c7d7365ed5d20a0a04c4d43374831e358ddc1147cc51f583 SHA512 2d4a7ff753cb0415cc6a957fff53037aad65053d3c3531070663b4bcf4462982c811a586a39ea3a223aca02cae9212c300b6788266ac60213437dc99ecc0a29a
+DIST core-0.9.2.tar.gz 735027 BLAKE2B d33b91d391446d8649ccb84d72f3533e72d2cdb5aca6359049dca0466ac6d23073dc59bc38bc1c9f7bbe47537731984d41a6ac67e4bf9f59ec7be47938bdfd71 SHA512 8cef59c353ff6f98b11bb007b99a583b64ee23f960a0de6559866c8ab59a58dd3ca4dae16275c87b780494b64ced7aaa24db8f9a6e6d309662e9d9206f04e335
+EBUILD core-0.9.1-r1.ebuild 681 BLAKE2B 73b1ba03211e57a0c87fad34c9f6c50f7eaeef7bf55ad9c3f73c60a65dcadc3f7415daa26307fe90788b2e3e9f49423bb17e1612db3233d4ac6adcd4dd2714d5 SHA512 206d1fb5e11e08ad599a73e533701db51ad3788dadb429c5de3b3ae5a76f5809fe67cd55022928dc2243979a5ff71662809f8fc00509f50925547966ea4c0759
+EBUILD core-0.9.2.ebuild 640 BLAKE2B c9d79ab6fe6f54599206c1ec6bf48ffadec856a65a61ad711be0902fbc025b25755d764a18b147235292cd2688c07e56d177909b4d8df8abc4d24cade4eb9d54 SHA512 d87ea809a90e5df898f3a19ea108d432f2f717c35b295294022a5500921412041e6ae8c7142c82d4dcacd484ba47a9c2a64f59b617a1de0188b42473f54c7837
+MISC metadata.xml 724 BLAKE2B a60edae8468f658128a46d975460d3e4b19f25c5d4ac5466a3aada583f3d399c0c784ea491d5ba4a58c3e5bc687839f68ff12d2678dbdc6d211de164efeb23ae SHA512 9ed4c6fe663fd72fc59c264370e343bf8856d54885c9ced805345216d38b8c3384e089e39a013f085c6381a02aabd66ec7536e780d0f2704c972812839a8db01
diff --git a/dev-ml/core/core-0.9.1-r1.ebuild b/dev-ml/core/core-0.9.1-r1.ebuild
new file mode 100644
index 000000000000..45cc74eb4553
--- /dev/null
+++ b/dev-ml/core/core-0.9.1-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit opam
+
+DESCRIPTION="Jane Street's alternative to the standard library"
+HOMEPAGE="https://github.com/janestreet/core"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+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:=
+"
+DEPEND="${RDEPEND} dev-ml/jbuilder"
+PATCHES=( "${FILESDIR}/glibc225.patch" )
diff --git a/dev-ml/core/core-0.9.2.ebuild b/dev-ml/core/core-0.9.2.ebuild
new file mode 100644
index 000000000000..d2dbd9555d39
--- /dev/null
+++ b/dev-ml/core/core-0.9.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit opam
+
+DESCRIPTION="Jane Street's alternative to the standard library"
+HOMEPAGE="https://github.com/janestreet/core"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+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:=
+"
+DEPEND="${RDEPEND} dev-ml/jbuilder"
diff --git a/dev-ml/core/files/glibc225.patch b/dev-ml/core/files/glibc225.patch
new file mode 100644
index 000000000000..1dd96c8b7b4b
--- /dev/null
+++ b/dev-ml/core/files/glibc225.patch
@@ -0,0 +1,12 @@
+Index: core-0.9.1/src/unix_stubs.c
+===================================================================
+--- core-0.9.1.orig/src/unix_stubs.c
++++ core-0.9.1/src/unix_stubs.c
+@@ -40,6 +40,7 @@
+ #include <arpa/inet.h>
+ #include <netdb.h>
+ #include <ifaddrs.h>
++#include <sys/sysmacros.h>
+
+ #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
+ #define stat64 stat
diff --git a/dev-ml/core/metadata.xml b/dev-ml/core/metadata.xml
new file mode 100644
index 000000000000..af16efe72137
--- /dev/null
+++ b/dev-ml/core/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <longdescription lang="en">
+ Core is Jane Street Capital's Ocaml standard library overlay. It
+ provides tail recursive versions of non tail recursive functions in
+ the standard library, changes the signature of many of the standard
+ modules, and adds new functionality.
+
+ Core_extended adds new functionality, but is only code reviewed on an
+ ad-hoc basis.
+ </longdescription>
+ <upstream>
+ <remote-id type="github">janestreet/core</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/core_bench-0.9.0 b/dev-ml/core_bench-0.9.0
deleted file mode 100644
index 014186951c23..000000000000
--- a/dev-ml/core_bench-0.9.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-lang/ocaml:= dev-ml/core:= dev-ml/core_extended:= dev-ml/ppx_driver:= dev-ml/ppx_jane:= dev-ml/textutils:= dev-ml/ocaml-migrate-parsetree:= dev-ml/ocaml-re:= dev-ml/opam dev-ml/jbuilder
-DESCRIPTION=Micro-benchmarking library for OCaml
-EAPI=6
-HOMEPAGE=https://github.com/janestreet/core_bench
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-lang/ocaml:= dev-ml/core:= dev-ml/core_extended:= dev-ml/ppx_driver:= dev-ml/ppx_jane:= dev-ml/textutils:= dev-ml/ocaml-migrate-parsetree:= dev-ml/ocaml-re:=
-SLOT=0/0.9.0
-SRC_URI=https://github.com/janestreet/core_bench/archive/v0.9.0.tar.gz -> core_bench-0.9.0.tar.gz
-_md5_=603b9e4802013db761988daa1ec67b52
diff --git a/dev-ml/core_bench/Manifest b/dev-ml/core_bench/Manifest
new file mode 100644
index 000000000000..65dcca1739fa
--- /dev/null
+++ b/dev-ml/core_bench/Manifest
@@ -0,0 +1,3 @@
+DIST core_bench-0.9.0.tar.gz 43091 BLAKE2B 3b94caf4515a15f26679a76b332a260f37aaaa79a87c164ccc244bc808b215d8064e56c69dc107b5ec3c8b69fc5a27a023ab954205004546e37bfc1b06d8cb0e SHA512 4860143276ca8d7966519435c151923ed0f0767fc9a654e6ba75a777f24aa0a66d1ebc4b5b2f8bbcb20bc8e869220ea0c93ccc9c9b5764fa82ef87c17bec761e
+EBUILD core_bench-0.9.0.ebuild 762 BLAKE2B 16edd77a7a1c13033b1813bb28782bf747eba7ad0ac040579d58b48b73c1bff30157d2f8153ce5b06d10e9807959cffa55e92989e276e027c242361e338ccdb3 SHA512 089af575a0d6087fe691dd25d47cc82db03ec7374f0d549bd848b242151422e39fafded9e90a41772eaecc734f42855a38212f7b2c8158b2e10693c6639daedc
+MISC metadata.xml 333 BLAKE2B 812a6a835b15c3e2662745ee4671504ad1b7ba7701d6dc47ce91e64ad333d1e1a398853bfaf97b6d3c4acd068da3b27da8abd2ac643ebc223570490282953014 SHA512 ff7342e47c593aa29c4665402533e809e8907e3a614bc60ee149dac7dfc1fdff34bb0db5e5c5d895c0f295dc1c11a25ac2cf9ca3d8eac2e89c58483b73a4b675
diff --git a/dev-ml/core_bench/core_bench-0.9.0.ebuild b/dev-ml/core_bench/core_bench-0.9.0.ebuild
new file mode 100644
index 000000000000..3ef6f6506421
--- /dev/null
+++ b/dev-ml/core_bench/core_bench-0.9.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Micro-benchmarking library for OCaml"
+HOMEPAGE="https://github.com/janestreet/core_bench"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+ dev-lang/ocaml:=
+ dev-ml/core:=
+ dev-ml/core_extended:=
+ dev-ml/ppx_driver:=
+ dev-ml/ppx_jane:=
+ dev-ml/textutils:=
+ dev-ml/ocaml-migrate-parsetree:=
+ dev-ml/ocaml-re:=
+"
+DEPEND="${RDEPEND} dev-ml/opam dev-ml/jbuilder"
+
+src_install() {
+ opam-installer -i \
+ --prefix="${ED}/usr" \
+ --libdir="${D}/$(ocamlc -where)" \
+ --docdir="${ED}/usr/share/doc/${PF}" \
+ ${PN}.install || die
+}
diff --git a/dev-ml/core_bench/metadata.xml b/dev-ml/core_bench/metadata.xml
new file mode 100644
index 000000000000..3071b550bf68
--- /dev/null
+++ b/dev-ml/core_bench/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">janestreet/core_bench</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/core_extended-0.9.0 b/dev-ml/core_extended-0.9.0
deleted file mode 100644
index cc63225a38dd..000000000000
--- a/dev-ml/core_extended-0.9.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-lang/ocaml:= dev-ml/bin-prot:= dev-ml/core:= dev-ml/core_kernel:= dev-ml/fieldslib:= dev-ml/ppx_driver:= dev-ml/ppx_jane:= dev-ml/re2:= dev-ml/sexplib:= dev-ml/textutils:= dev-ml/ocaml-migrate-parsetree:= <dev-ml/ppx_jane-100 <dev-ml/ppx_driver-100 dev-ml/opam dev-ml/jbuilder
-DESCRIPTION=Jane Street's alternative to the standard library
-EAPI=6
-HOMEPAGE=https://github.com/janestreet/core_extended
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-lang/ocaml:= dev-ml/bin-prot:= dev-ml/core:= dev-ml/core_kernel:= dev-ml/fieldslib:= dev-ml/ppx_driver:= dev-ml/ppx_jane:= dev-ml/re2:= dev-ml/sexplib:= dev-ml/textutils:= dev-ml/ocaml-migrate-parsetree:= <dev-ml/ppx_jane-100 <dev-ml/ppx_driver-100
-SLOT=0/0.9.0
-SRC_URI=https://github.com/janestreet/core_extended/archive/v0.9.0.tar.gz -> core_extended-0.9.0.tar.gz
-_md5_=03b7a6b4758eed8661b0c5044281a51b
diff --git a/dev-ml/core_extended/Manifest b/dev-ml/core_extended/Manifest
new file mode 100644
index 000000000000..b5aebcd573d3
--- /dev/null
+++ b/dev-ml/core_extended/Manifest
@@ -0,0 +1,3 @@
+DIST core_extended-0.9.0.tar.gz 234944 BLAKE2B 9c6985b2c9a34ca3fd3bd6016240140d09ccfad2cdf264923e826d1399ead3d827674b5438c90e75dee9511ed4005d945d2e4b73bb5778475b55871c59231a50 SHA512 16e64ba2e3bbe31a6bde03c0ca65d238445f19d8f2aa1f11157efd4f4fab76adb28607329e853eafab04de549f303b033522cc46c3e179094ac68071ce797a5e
+EBUILD core_extended-0.9.0.ebuild 875 BLAKE2B a23f1adf07cb937b216214aaa87ffb36b56c3969d9da01a28b121c49f3c9555873b36daa0c30739145840198eab10bc17d6b12cc40bc552ec6dc926404e1e642 SHA512 bed2b46dd4ac99c1fb0417d42422f61b0445d936c35ba69e161a079dafb8e4e6c57267452c3b181aae28d8acf0677461d3d80f9957640d48a9529f5235e7eee9
+MISC metadata.xml 336 BLAKE2B 582cbb070b12c0b383549eebe68eb5abbdd8b4b148a1859e8d9d03dac3737c58d8d0b07b41c181bdbc719f73b9890b2f53911888244e41b93b274f7c7712b197 SHA512 c546557c8b3d754d24f44230314064e1d221ccb0d3a7e2d7885fdcb1d93684c5e208d491d309197e7555a2a1883632f7d070071df17879e467cd001eeac9b6b4
diff --git a/dev-ml/core_extended/core_extended-0.9.0.ebuild b/dev-ml/core_extended/core_extended-0.9.0.ebuild
new file mode 100644
index 000000000000..4f17a7f52f95
--- /dev/null
+++ b/dev-ml/core_extended/core_extended-0.9.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Jane Street's alternative to the standard library"
+HOMEPAGE="https://github.com/janestreet/core_extended"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+ dev-lang/ocaml:=
+ dev-ml/bin-prot:=
+ dev-ml/core:=
+ dev-ml/core_kernel:=
+ dev-ml/fieldslib:=
+ dev-ml/ppx_driver:=
+ dev-ml/ppx_jane:=
+ dev-ml/re2:=
+ dev-ml/sexplib:=
+ dev-ml/textutils:=
+ dev-ml/ocaml-migrate-parsetree:=
+ <dev-ml/ppx_jane-100
+ <dev-ml/ppx_driver-100
+ "
+DEPEND="${RDEPEND} dev-ml/opam dev-ml/jbuilder"
+
+src_install() {
+ opam-installer -i \
+ --prefix="${ED}/usr" \
+ --libdir="${D}/$(ocamlc -where)" \
+ --docdir="${ED}/usr/share/doc/${PF}" \
+ ${PN}.install || die
+}
diff --git a/dev-ml/core_extended/metadata.xml b/dev-ml/core_extended/metadata.xml
new file mode 100644
index 000000000000..66beb889dbaa
--- /dev/null
+++ b/dev-ml/core_extended/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">janestreet/core_extended</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/core_kernel-0.9.0 b/dev-ml/core_kernel-0.9.0
deleted file mode 100644
index e5e7161f2db7..000000000000
--- a/dev-ml/core_kernel-0.9.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-lang/ocaml:= dev-ml/base:= dev-ml/bin-prot:= dev-ml/configurator:= dev-ml/fieldslib:= dev-ml/jane-street-headers:= dev-ml/ppx_assert:= dev-ml/ppx_base:= dev-ml/ppx_driver:= dev-ml/ppx_hash:= dev-ml/ppx_inline_test:= dev-ml/ppx_jane:= dev-ml/ppx_sexp_conv:= dev-ml/ppx_sexp_message:= dev-ml/sexplib:= dev-ml/stdio:= dev-ml/typerep:= dev-ml/variantslib:= dev-ml/ocaml-migrate-parsetree:= dev-ml/opam dev-ml/jbuilder
-DESCRIPTION=System-independent part of Core
-EAPI=6
-HOMEPAGE=https://github.com/janestreet/core_kernel
-KEYWORDS=~amd64
-LICENSE=LGPL-2.1-with-linking-exception
-RDEPEND=dev-lang/ocaml:= dev-ml/base:= dev-ml/bin-prot:= dev-ml/configurator:= dev-ml/fieldslib:= dev-ml/jane-street-headers:= dev-ml/ppx_assert:= dev-ml/ppx_base:= dev-ml/ppx_driver:= dev-ml/ppx_hash:= dev-ml/ppx_inline_test:= dev-ml/ppx_jane:= dev-ml/ppx_sexp_conv:= dev-ml/ppx_sexp_message:= dev-ml/sexplib:= dev-ml/stdio:= dev-ml/typerep:= dev-ml/variantslib:= dev-ml/ocaml-migrate-parsetree:=
-SLOT=0/0.9.0
-SRC_URI=https://github.com/janestreet/core_kernel/archive/v0.9.0.tar.gz -> core_kernel-0.9.0.tar.gz
-_md5_=6a1ecf3e5686e9d758f7d1f42218ef02
diff --git a/dev-ml/core_kernel-0.9.1 b/dev-ml/core_kernel-0.9.1
deleted file mode 100644
index 688fe1eda6d5..000000000000
--- a/dev-ml/core_kernel-0.9.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-lang/ocaml:= dev-ml/base:= dev-ml/bin-prot:= dev-ml/configurator:= dev-ml/fieldslib:= dev-ml/jane-street-headers:= dev-ml/ppx_assert:= dev-ml/ppx_base:= dev-ml/ppx_driver:= dev-ml/ppx_hash:= dev-ml/ppx_inline_test:= dev-ml/ppx_jane:= dev-ml/ppx_sexp_conv:= dev-ml/ppx_sexp_message:= dev-ml/sexplib:= dev-ml/stdio:= dev-ml/typerep:= dev-ml/variantslib:= dev-ml/ocaml-migrate-parsetree:= dev-ml/opam dev-ml/jbuilder
-DESCRIPTION=System-independent part of Core
-EAPI=6
-HOMEPAGE=https://github.com/janestreet/core_kernel
-KEYWORDS=~amd64
-LICENSE=LGPL-2.1-with-linking-exception
-RDEPEND=dev-lang/ocaml:= dev-ml/base:= dev-ml/bin-prot:= dev-ml/configurator:= dev-ml/fieldslib:= dev-ml/jane-street-headers:= dev-ml/ppx_assert:= dev-ml/ppx_base:= dev-ml/ppx_driver:= dev-ml/ppx_hash:= dev-ml/ppx_inline_test:= dev-ml/ppx_jane:= dev-ml/ppx_sexp_conv:= dev-ml/ppx_sexp_message:= dev-ml/sexplib:= dev-ml/stdio:= dev-ml/typerep:= dev-ml/variantslib:= dev-ml/ocaml-migrate-parsetree:=
-SLOT=0/0.9.1
-SRC_URI=https://github.com/janestreet/core_kernel/archive/v0.9.1.tar.gz -> core_kernel-0.9.1.tar.gz
-_md5_=6a1ecf3e5686e9d758f7d1f42218ef02
diff --git a/dev-ml/core_kernel/Manifest b/dev-ml/core_kernel/Manifest
new file mode 100644
index 000000000000..9d63914e734b
--- /dev/null
+++ b/dev-ml/core_kernel/Manifest
@@ -0,0 +1,5 @@
+DIST core_kernel-0.9.0.tar.gz 502937 BLAKE2B 88a4fdfae2dc0d45c794faf925bd97d7e59558231540a8614d548133d58c576eabf342d2af358ea792ba7e59a79317e4c66aad3a4ff0c2f4b94f012d73e98d7c SHA512 c262f25636d7a5105810c9588774a56e21e58cd156302781db3463898be0a42d9c8b1984ead739d0659d6f3eece4a305fc45c7cad4ed57149d26344affbdb668
+DIST core_kernel-0.9.1.tar.gz 502985 BLAKE2B c924b104f3e0c5bce84a01408f8ac773ec16eb37f6dddfd8261886355c08d8536af60e573ded56936a299af6d8a7a16f37147e9660d65fece5ac8aa7d42a7a95 SHA512 ec0c3f72c52b975ef3d28b89190e0de3d9a60a842cde13f9a71f2d90101af3ccced06b4640d061362b89127140fe761dc19733da3f7dfabab189faef78343b7b
+EBUILD core_kernel-0.9.0.ebuild 1021 BLAKE2B af589eef268b1f0cc51f73bb6b1c54f55a1c0d84494e891c8c02e45408cdad874e105bcbf704deb7be477757914136a7ab1de60760c5c7879975d22b61dca839 SHA512 601feb35cd75f2eb4486bcd283d8e05dae3cd9ba7affc57ae59dd9f93fdefea9c8dd8eaecd6cd822c1af19b43200e52ee5a18471dc9748ad2910d7d00a0f3e2a
+EBUILD core_kernel-0.9.1.ebuild 1021 BLAKE2B af589eef268b1f0cc51f73bb6b1c54f55a1c0d84494e891c8c02e45408cdad874e105bcbf704deb7be477757914136a7ab1de60760c5c7879975d22b61dca839 SHA512 601feb35cd75f2eb4486bcd283d8e05dae3cd9ba7affc57ae59dd9f93fdefea9c8dd8eaecd6cd822c1af19b43200e52ee5a18471dc9748ad2910d7d00a0f3e2a
+MISC metadata.xml 654 BLAKE2B 8acb72a71928b748637791bfde284558baa09e90c54c04ef9523f96b4268034575170f20bcac0f322b4a7631ecad4116509766a68ff119e00707ea94380b1d6b SHA512 b43f4b7cfa431f3d0cebdd8506a1f5fea27385e509171f0c92848cd5c17b164f0f245d36564d89b0040fc619c6dd5498b501833b76b20ed3f69ac57478e91d85
diff --git a/dev-ml/core_kernel/core_kernel-0.9.0.ebuild b/dev-ml/core_kernel/core_kernel-0.9.0.ebuild
new file mode 100644
index 000000000000..e725deed96b8
--- /dev/null
+++ b/dev-ml/core_kernel/core_kernel-0.9.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="System-independent part of Core"
+HOMEPAGE="https://github.com/janestreet/core_kernel"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+ dev-lang/ocaml:=
+ dev-ml/base:=
+ dev-ml/bin-prot:=
+ dev-ml/configurator:=
+ dev-ml/fieldslib:=
+ dev-ml/jane-street-headers:=
+ dev-ml/ppx_assert:=
+ dev-ml/ppx_base:=
+ dev-ml/ppx_driver:=
+ dev-ml/ppx_hash:=
+ dev-ml/ppx_inline_test:=
+ dev-ml/ppx_jane:=
+ dev-ml/ppx_sexp_conv:=
+ dev-ml/ppx_sexp_message:=
+ dev-ml/sexplib:=
+ dev-ml/stdio:=
+ dev-ml/typerep:=
+ dev-ml/variantslib:=
+ dev-ml/ocaml-migrate-parsetree:=
+"
+DEPEND="${RDEPEND}
+ dev-ml/opam
+ dev-ml/jbuilder
+"
+
+src_install() {
+ opam-installer -i \
+ --prefix="${ED}/usr" \
+ --libdir="${D}/$(ocamlc -where)" \
+ --docdir="${ED}/usr/share/doc/${PF}" \
+ ${PN}.install || die
+}
diff --git a/dev-ml/core_kernel/core_kernel-0.9.1.ebuild b/dev-ml/core_kernel/core_kernel-0.9.1.ebuild
new file mode 100644
index 000000000000..e725deed96b8
--- /dev/null
+++ b/dev-ml/core_kernel/core_kernel-0.9.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="System-independent part of Core"
+HOMEPAGE="https://github.com/janestreet/core_kernel"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+ dev-lang/ocaml:=
+ dev-ml/base:=
+ dev-ml/bin-prot:=
+ dev-ml/configurator:=
+ dev-ml/fieldslib:=
+ dev-ml/jane-street-headers:=
+ dev-ml/ppx_assert:=
+ dev-ml/ppx_base:=
+ dev-ml/ppx_driver:=
+ dev-ml/ppx_hash:=
+ dev-ml/ppx_inline_test:=
+ dev-ml/ppx_jane:=
+ dev-ml/ppx_sexp_conv:=
+ dev-ml/ppx_sexp_message:=
+ dev-ml/sexplib:=
+ dev-ml/stdio:=
+ dev-ml/typerep:=
+ dev-ml/variantslib:=
+ dev-ml/ocaml-migrate-parsetree:=
+"
+DEPEND="${RDEPEND}
+ dev-ml/opam
+ dev-ml/jbuilder
+"
+
+src_install() {
+ opam-installer -i \
+ --prefix="${ED}/usr" \
+ --libdir="${D}/$(ocamlc -where)" \
+ --docdir="${ED}/usr/share/doc/${PF}" \
+ ${PN}.install || die
+}
diff --git a/dev-ml/core_kernel/metadata.xml b/dev-ml/core_kernel/metadata.xml
new file mode 100644
index 000000000000..ec7db9c9396f
--- /dev/null
+++ b/dev-ml/core_kernel/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <longdescription lang="en">
+ Core_kernel is the system-independent part of Core. It is aimed for
+ cases when the full Core is not available, such as in Javascript. It
+ provides an overlay on the usual namespace, so the best way to use
+ Core is to start your file with:
+
+ open Core_kernel.Std
+ </longdescription>
+ <upstream>
+ <remote-id type="github">janestreet/core_kernel</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/core_profiler-0.9.0 b/dev-ml/core_profiler-0.9.0
deleted file mode 100644
index eb69f039a021..000000000000
--- a/dev-ml/core_profiler-0.9.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-lang/ocaml:= dev-ml/core:= dev-ml/core_extended:= dev-ml/ppx_driver:= dev-ml/ppx_jane:= dev-ml/re2:= dev-ml/textutils:= dev-ml/ocaml-migrate-parsetree:= dev-ml/opam dev-ml/jbuilder
-DESCRIPTION=Jane Street's profiling library
-EAPI=6
-HOMEPAGE=https://github.com/janestreet/core_profiler
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-lang/ocaml:= dev-ml/core:= dev-ml/core_extended:= dev-ml/ppx_driver:= dev-ml/ppx_jane:= dev-ml/re2:= dev-ml/textutils:= dev-ml/ocaml-migrate-parsetree:=
-SLOT=0/0.9.0
-SRC_URI=https://github.com/janestreet/core_profiler/archive/v0.9.0.tar.gz -> core_profiler-0.9.0.tar.gz
-_md5_=28b2a70c4a547b704c05ac8aff0c5e28
diff --git a/dev-ml/core_profiler/Manifest b/dev-ml/core_profiler/Manifest
new file mode 100644
index 000000000000..dc52b5867f57
--- /dev/null
+++ b/dev-ml/core_profiler/Manifest
@@ -0,0 +1,3 @@
+DIST core_profiler-0.9.0.tar.gz 60467 BLAKE2B 55880be45c1bbad1dd0277d966cbfaae76f54bf8dea7953ac78e98143160fba19bba5d355e0b5417e33f48bfaabe0b936a55defc0337efa252b11c279c2fc7db SHA512 6d3ad9cef7dd500642bf139503fc873668ca69733c29a4bcb224b27cad604422d87626431f38f29088807f577c4a6445fdc67531329bbcd842b0921976cbe5f9
+EBUILD core_profiler-0.9.0.ebuild 756 BLAKE2B c7ebc5be1f5d3912b020b861a3ebc53b165dd380ee580297b0d715dccee2d07051552f52cfcb6dd1f122c31ef8f6c2d7ed764228d9897eeacef0761efafdbc08 SHA512 42788056359786c3c9edb7e2536e043f2081d768a662aebf0345805c9e67999f3a94c0e7133256bd8d5167126582de94a3992a5caf9956ed67525ab66376af89
+MISC metadata.xml 336 BLAKE2B fd1422f17723a66dbd8701fe2ed07a91c385873039c8dba2384bf4ee7936e01e1749f482356d33945cff8162518f677e511808156defbe9b24c49059be9166fe SHA512 8f89302bc1ccb02758da857bd0051d1ea1f9211b00cfbd728ca6ee2fb5c81cf85f7e22340ff84559d988cde56ec5df272d4783c9a1b83307bf5a048e9968c899
diff --git a/dev-ml/core_profiler/core_profiler-0.9.0.ebuild b/dev-ml/core_profiler/core_profiler-0.9.0.ebuild
new file mode 100644
index 000000000000..bf5b496ea736
--- /dev/null
+++ b/dev-ml/core_profiler/core_profiler-0.9.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Jane Street's profiling library"
+HOMEPAGE="https://github.com/janestreet/core_profiler"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+ dev-lang/ocaml:=
+ dev-ml/core:=
+ dev-ml/core_extended:=
+ dev-ml/ppx_driver:=
+ dev-ml/ppx_jane:=
+ dev-ml/re2:=
+ dev-ml/textutils:=
+ dev-ml/ocaml-migrate-parsetree:=
+ "
+DEPEND="${RDEPEND} dev-ml/opam dev-ml/jbuilder"
+
+src_install() {
+ opam-installer -i \
+ --prefix="${ED}/usr" \
+ --libdir="${D}/$(ocamlc -where)" \
+ --docdir="${ED}/usr/share/doc/${PF}" \
+ ${PN}.install || die
+}
diff --git a/dev-ml/core_profiler/metadata.xml b/dev-ml/core_profiler/metadata.xml
new file mode 100644
index 000000000000..5547e488ffc3
--- /dev/null
+++ b/dev-ml/core_profiler/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">janestreet/core_profiler</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/cppo-1.4.1 b/dev-ml/cppo-1.4.1
deleted file mode 100644
index 308a4983ec9f..000000000000
--- a/dev-ml/cppo-1.4.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=>=dev-lang/ocaml-3.12:= dev-ml/ocamlbuild:= >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=An equivalent of the C preprocessor for OCaml programs
-EAPI=5
-HOMEPAGE=http://mjambon.com/cppo.html
-IUSE=examples
-KEYWORDS=amd64 ~arm ppc x86
-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
-_md5_=1fde101bf2915947b436f6b5eb28aeb6
diff --git a/dev-ml/cppo-1.5.0 b/dev-ml/cppo-1.5.0
deleted file mode 100644
index 33649730f37a..000000000000
--- a/dev-ml/cppo-1.5.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=An equivalent of the C preprocessor for OCaml programs
-EAPI=5
-HOMEPAGE=http://mjambon.com/cppo.html https://github.com/mjambon/cppo/
-IUSE=examples +ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
-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
-_md5_=7984fbcff953ecdf60fd061da222bb85
diff --git a/dev-ml/cppo/Manifest b/dev-ml/cppo/Manifest
new file mode 100644
index 000000000000..6898cf3fbebb
--- /dev/null
+++ b/dev-ml/cppo/Manifest
@@ -0,0 +1,5 @@
+DIST cppo-1.4.1.tar.gz 26547 BLAKE2B a93802fb36cfb622de32a00f6ad6d0fbc7c1022a65ab70558273654b817ca16a988fb8ce8c5dd0751e80eef066f3fcb82f25fc572edb312f346cd20830c08f5a SHA512 efbc82d2eb31b9e16c43ffbd7a2a56a5356934c32bee62205f55295a9342e4747ce13b9ad6572f3180e656b215a9255d402712ff7bae1ef9e8eccdabb2d00c16
+DIST cppo-1.5.0.tar.gz 26963 BLAKE2B 4118637bd8bcfc2edae4c7bf0d839b82ba3402c2f4df9de81bcb28685e4112ff364cb607dc9dcdc3512cc4fdf8dfb4cb85ceca945230bd7cd5d04e525d4e6587 SHA512 2cc144815b818242b6bb1dee213aa65345620eaf1afe59b25d118399d9a02d577aa9dc61dd5756661e44411acccdb2fc0320a8984e5f0d2a7390fcc816bac7e0
+EBUILD cppo-1.4.1.ebuild 695 BLAKE2B c7dc10a7114ce9b7ada88cca2e5364c7cee6e045001ce27c7c1dc0c0b9bb7ed1bbff96e17125d20d12da189b819f01bb0e6e35f996cb404d2ec51e294c9ea5ff SHA512 2848f76920077d4ebd0ea45fcb12328357d01ff1e4cfd96a2f748a996b940e4b31b910b4f76aed984db211592e19b5ef642fb9f1246d7041197e6b7eeec23bd5
+EBUILD cppo-1.5.0.ebuild 999 BLAKE2B 00c8f29088141900ed6606151fd1bfad75ad0ba17511fce651bcb24f8b7db5922554b40ecc7c9c96642e07532680511628aab81949de3ddd480b7942ec0521b6 SHA512 58870cc7de903b2951df2ca9535775c7b3c021880997f57f50dbc0104c1086de872f4cf86e008c104379b672d7893ee626c8891efffccaa43ab75ad61042b504
+MISC metadata.xml 324 BLAKE2B 6e33deee84011e98fb8f5f9190085ac06f213933a25ebe895baeba3b916f2e24e44431ebdf87cf26a64e0a077df44a5ff898fdc64f7aae5e61afca355face959 SHA512 18ce12b17096d2de1fddf54e1e1db287a53ccd0d77072806c2efe695dfa9f1d70a55c0ce546fd3a0a1f7db0931a3235231e35f8df93f4adfda81c416561b16ee
diff --git a/dev-ml/cppo/cppo-1.4.1.ebuild b/dev-ml/cppo/cppo-1.4.1.ebuild
new file mode 100644
index 000000000000..e9730dd44aa4
--- /dev/null
+++ b/dev-ml/cppo/cppo-1.4.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit findlib
+
+DESCRIPTION="An equivalent of the C preprocessor for OCaml programs"
+HOMEPAGE="http://mjambon.com/cppo.html"
+SRC_URI="https://github.com/mjambon/cppo/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0/${PV}"
+LICENSE="BSD"
+KEYWORDS="amd64 ~arm ppc x86"
+
+IUSE="examples"
+
+RDEPEND=">=dev-lang/ocaml-3.12:=
+ dev-ml/ocamlbuild:="
+DEPEND="${RDEPEND}"
+
+src_install() {
+ findlib_src_preinst
+ mkdir -p "${ED}"/usr/bin
+ emake PREFIX="${ED}"/usr install
+ dodoc README.md Changes
+ if use examples ; then
+ dodoc -r examples
+ docompress -x /usr/share/doc/${PF}/examples
+ fi
+}
diff --git a/dev-ml/cppo/cppo-1.5.0.ebuild b/dev-ml/cppo/cppo-1.5.0.ebuild
new file mode 100644
index 000000000000..edc62efc16d9
--- /dev/null
+++ b/dev-ml/cppo/cppo-1.5.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit findlib
+
+DESCRIPTION="An equivalent of the C preprocessor for OCaml programs"
+HOMEPAGE="http://mjambon.com/cppo.html https://github.com/mjambon/cppo/"
+SRC_URI="https://github.com/mjambon/cppo/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0/${PV}"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+
+IUSE="examples +ocamlopt"
+
+RDEPEND="
+ >=dev-lang/ocaml-3.12:=[ocamlopt?]
+ dev-ml/ocamlbuild:=[ocamlopt?]"
+DEPEND="${RDEPEND}"
+
+src_compile() {
+ use ocamlopt || sed -e 's/ocamlbuild_cppo.cmx/ocamlbuild_cppo.cmo/' -i Makefile
+ emake BEST="$(usex ocamlopt '.native' '.byte')" $(usex ocamlopt opt all) ocamlbuild
+}
+
+src_install() {
+ findlib_src_preinst
+ mkdir -p "${ED}"/usr/bin
+ emake PREFIX="${ED}"/usr BEST="$(usex ocamlopt '.native' '.byte')" install
+ dodoc README.md Changes
+ if use examples ; then
+ dodoc -r examples
+ docompress -x /usr/share/doc/${PF}/examples
+ fi
+}
diff --git a/dev-ml/cppo/metadata.xml b/dev-ml/cppo/metadata.xml
new file mode 100644
index 000000000000..2edf61a57ad6
--- /dev/null
+++ b/dev-ml/cppo/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">mjambon/cppo</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/cryptokit-1.10 b/dev-ml/cryptokit-1.10
deleted file mode 100644
index 1ab70ff5f783..000000000000
--- a/dev-ml/cryptokit-1.10
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=zlib? ( >=sys-libs/zlib-1.1 ) >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=Cryptographic primitives library for Objective Caml
-EAPI=5
-HOMEPAGE=http://forge.ocamlcore.org/projects/cryptokit/
-IUSE=zlib +ocamlopt debug doc test
-KEYWORDS=amd64 ppc x86 ~x86-fbsd
-LICENSE=LGPL-2
-RDEPEND=zlib? ( >=sys-libs/zlib-1.1 ) >=dev-lang/ocaml-3.12:=[ocamlopt?]
-SLOT=0/1.10
-SRC_URI=http://forge.ocamlcore.org/frs/download.php/1493/cryptokit-1.10.tar.gz
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e oasis 9256ed89af74c3365ec888c00bfdfe43 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=68b569a6c4f20b9cd4b4bec1d5a0f1f8
diff --git a/dev-ml/cryptokit-1.11 b/dev-ml/cryptokit-1.11
deleted file mode 100644
index 534279bb6ba6..000000000000
--- a/dev-ml/cryptokit-1.11
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=zlib? ( >=sys-libs/zlib-1.1 ) dev-ml/zarith:= >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=Cryptographic primitives library for Objective Caml
-EAPI=5
-HOMEPAGE=http://forge.ocamlcore.org/projects/cryptokit/
-IUSE=zlib +ocamlopt debug doc test
-KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
-LICENSE=LGPL-2
-RDEPEND=zlib? ( >=sys-libs/zlib-1.1 ) dev-ml/zarith:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
-REQUIRED_USE=test? ( ocamlopt )
-SLOT=0/1.11
-SRC_URI=http://forge.ocamlcore.org/frs/download.php/1618/cryptokit-1.11.tar.gz
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e oasis 9256ed89af74c3365ec888c00bfdfe43 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a1d8a7e5c6ea9c931f9e9b66d6dd4adf
diff --git a/dev-ml/cryptokit-1.12 b/dev-ml/cryptokit-1.12
deleted file mode 100644
index 34c35f290f3d..000000000000
--- a/dev-ml/cryptokit-1.12
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=zlib? ( >=sys-libs/zlib-1.1 ) dev-ml/zarith:= >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=Cryptographic primitives library for Objective Caml
-EAPI=5
-HOMEPAGE=https://github.com/xavierleroy/cryptokit
-IUSE=zlib +ocamlopt debug doc test
-KEYWORDS=~amd64 ~ppc ~x86-fbsd
-LICENSE=LGPL-2
-RDEPEND=zlib? ( >=sys-libs/zlib-1.1 ) dev-ml/zarith:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
-REQUIRED_USE=test? ( ocamlopt )
-SLOT=0/1.12
-SRC_URI=https://github.com/xavierleroy/cryptokit/archive/release112.tar.gz -> cryptokit-1.12.tar.gz
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e oasis 9256ed89af74c3365ec888c00bfdfe43 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=a9f83c04184416a465f5cbb993fda02a
diff --git a/dev-ml/cryptokit/Manifest b/dev-ml/cryptokit/Manifest
new file mode 100644
index 000000000000..deeb1ffd77af
--- /dev/null
+++ b/dev-ml/cryptokit/Manifest
@@ -0,0 +1,7 @@
+DIST cryptokit-1.10.tar.gz 152525 BLAKE2B 51c905757ad141292be89707bdab5c83a1f3e9e2665202cbf17e12b115591c57b77b759b4fa2967d1f00b4cf5bd87445a2189b4d222d5d1613e19c32e1054189 SHA512 22564e0151c492963d75fb81780b3a884a0bf613ad09380d9b5365740fd9c4bbdaa1c21fed50a1a4934dce920d90f5c86dc014f90e52677544789311f7bded4f
+DIST cryptokit-1.11.tar.gz 156905 BLAKE2B 3fc77321c0d525a32f5733d77963b5df4e618b3168f2f00aceeb1e13b16cc202e79b50afa93c0769f016b4e43061ff19851c8ba3f40ad7f8f0c9ff78a51d68e7 SHA512 cc641a05a67cd3d2e5ec481e8d426796db625ab60e89f79bde2e360730892c62f30ea2e37c4b028df16471220847e6d7ce4984deb9528fec6647a17fc4ae1b0d
+DIST cryptokit-1.12.tar.gz 157920 BLAKE2B c26d0642f02cf19502bfce043bfb542bfb7a8e80ac2c7dfbecce48b57d44eddd5f279ceec1166fd2e81e1a8446bb52fa748d89a3f7506860fe1c545784087469 SHA512 f99c50578360c7671029a0c4603b355912899596ea7baf55cb2f94e039658646396f1307417a24b3d87a535d272bed90e79d5e027af034c2c742140c44ec61ff
+EBUILD cryptokit-1.10.ebuild 1266 BLAKE2B cae93a94a2c881fd390be981e142b0661ff4d501910dd040294f6d9630020cd982e23fac5893416af0e608eef34d52324c4f9ecf5eb459acf86b7765313aeb94 SHA512 33a3784e4b33e688c0d5a2fcddf6d2c41fb172e1a3b1118ffdc4e99b4466b4981d8085f8f8c01527a9bbb9d04ced1d3f8b59e25032d358199634e29cf8f5fa5e
+EBUILD cryptokit-1.11.ebuild 1320 BLAKE2B 710bb49174d23d95bc5fe69cd55d8bb99093d7e7b0d6620d3c77a512e2091c80812c72c7c52d9d4c6aeb9ff37baa07c1ebdc96774c92c25ad2a83501e9fa5568 SHA512 83d29976e401df8b24abf397afe426ee34ab4e35ba9de5701821477148e8e5cbbdbc4493eca8cb9efcd1bed52e3096e7f397709151dc6361b99300ffa40f0ff5
+EBUILD cryptokit-1.12.ebuild 1441 BLAKE2B 9ec9d9f5d53747d4d16a226468e3565953cdc41406c681ad51656fb8508a07e82835adedee51475a8d014958396dfcd736987ee65aeffea5efcc9e58840869d1 SHA512 421abe70ebba3b17d44d7777e8ab6a522d06e4b1e64b0dd030d9c7b670eb40ed1bd24402032067b466238ef0b333eb02f79cf5be6317a9137a8601aa7d0957c0
+MISC metadata.xml 333 BLAKE2B 27b0324eacee9742b253832a6c851f2ff70be59371769c25c8a485e3dd183674bb29aac0ef0bc809d8c284fdfe5f39af1e4be010ea4d9f2a1d4db9a5b532ca86 SHA512 da33cc22253a2ff38de20b7ad0888aab7c3a88f26bb853c00ba8e75fc10d325b395ede9dff86035eb81a7c5e08cf9276eacb28ebd8ce2fb0edcfade71471ef71
diff --git a/dev-ml/cryptokit/cryptokit-1.10.ebuild b/dev-ml/cryptokit/cryptokit-1.10.ebuild
new file mode 100644
index 000000000000..e71c0d2103d8
--- /dev/null
+++ b/dev-ml/cryptokit/cryptokit-1.10.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+OASIS_BUILD_DOCS=1
+OASIS_BUILD_TESTS=1
+
+inherit oasis
+
+DESCRIPTION="Cryptographic primitives library for Objective Caml"
+HOMEPAGE="http://forge.ocamlcore.org/projects/cryptokit/"
+SRC_URI="http://forge.ocamlcore.org/frs/download.php/1493/${P}.tar.gz"
+LICENSE="LGPL-2"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+IUSE="zlib"
+
+DEPEND="zlib? ( >=sys-libs/zlib-1.1 )"
+RDEPEND="${DEPEND}"
+
+DOCS=( "Changes" "README.txt" "AUTHORS.txt" )
+
+src_configure() {
+ oasis_configure_opts="$(use_enable zlib)" \
+ oasis_src_configure
+}
+
+pkg_postinst() {
+ elog ""
+ elog "This library uses the /dev/random device to generate "
+ elog "random data and RSA keys. The device should either be"
+ elog "built into the kernel or provided as a module. An"
+ elog "alternative is to use the Entropy Gathering Daemon"
+ elog "(http://egd.sourceforge.net). Please note that the"
+ elog "remainder of the library will still work even in the"
+ elog "absence of a one of these sources of randomness."
+ elog ""
+}
+
+src_test() {
+ echo ""
+ einfo "You must have either /dev/random or the Entropy Gathering"
+ einfo "Daemon (EGD) for this test to succeed!"
+ echo ""
+
+ oasis_src_test
+}
diff --git a/dev-ml/cryptokit/cryptokit-1.11.ebuild b/dev-ml/cryptokit/cryptokit-1.11.ebuild
new file mode 100644
index 000000000000..bf0d90a57e84
--- /dev/null
+++ b/dev-ml/cryptokit/cryptokit-1.11.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+OASIS_BUILD_DOCS=1
+OASIS_BUILD_TESTS=1
+
+inherit oasis
+
+DESCRIPTION="Cryptographic primitives library for Objective Caml"
+HOMEPAGE="http://forge.ocamlcore.org/projects/cryptokit/"
+SRC_URI="http://forge.ocamlcore.org/frs/download.php/1618/${P}.tar.gz"
+LICENSE="LGPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE="zlib"
+
+DEPEND="zlib? ( >=sys-libs/zlib-1.1 )
+ dev-ml/zarith:="
+RDEPEND="${DEPEND}"
+
+DOCS=( "Changes" "README.txt" "AUTHORS.txt" )
+REQUIRED_USE="test? ( ocamlopt )"
+
+src_configure() {
+ oasis_configure_opts="$(use_enable zlib)" \
+ oasis_src_configure
+}
+
+pkg_postinst() {
+ elog ""
+ elog "This library uses the /dev/random device to generate "
+ elog "random data and RSA keys. The device should either be"
+ elog "built into the kernel or provided as a module. An"
+ elog "alternative is to use the Entropy Gathering Daemon"
+ elog "(http://egd.sourceforge.net). Please note that the"
+ elog "remainder of the library will still work even in the"
+ elog "absence of a one of these sources of randomness."
+ elog ""
+}
+
+src_test() {
+ echo ""
+ einfo "You must have either /dev/random or the Entropy Gathering"
+ einfo "Daemon (EGD) for this test to succeed!"
+ echo ""
+
+ oasis_src_test
+}
diff --git a/dev-ml/cryptokit/cryptokit-1.12.ebuild b/dev-ml/cryptokit/cryptokit-1.12.ebuild
new file mode 100644
index 000000000000..e728f55a1dde
--- /dev/null
+++ b/dev-ml/cryptokit/cryptokit-1.12.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+OASIS_BUILD_DOCS=1
+OASIS_BUILD_TESTS=1
+
+inherit oasis versionator
+
+DESCRIPTION="Cryptographic primitives library for Objective Caml"
+HOMEPAGE="https://github.com/xavierleroy/cryptokit"
+SRC_URI="https://github.com/xavierleroy/cryptokit/archive/release$(replace_all_version_separators '').tar.gz -> ${P}.tar.gz"
+LICENSE="LGPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~x86-fbsd"
+IUSE="zlib"
+
+DEPEND="zlib? ( >=sys-libs/zlib-1.1 )
+ dev-ml/zarith:="
+RDEPEND="${DEPEND}"
+
+DOCS=( "Changes" "README.txt" "AUTHORS.txt" )
+REQUIRED_USE="test? ( ocamlopt )"
+
+S="${WORKDIR}/${PN}-release$(replace_all_version_separators '')"
+
+src_configure() {
+ oasis_configure_opts="$(use_enable zlib)" \
+ oasis_src_configure
+}
+
+pkg_postinst() {
+ elog ""
+ elog "This library uses the /dev/random device to generate "
+ elog "random data and RSA keys. The device should either be"
+ elog "built into the kernel or provided as a module. An"
+ elog "alternative is to use the Entropy Gathering Daemon"
+ elog "(http://egd.sourceforge.net). Please note that the"
+ elog "remainder of the library will still work even in the"
+ elog "absence of a one of these sources of randomness."
+ elog ""
+}
+
+src_test() {
+ echo ""
+ einfo "You must have either /dev/random or the Entropy Gathering"
+ einfo "Daemon (EGD) for this test to succeed!"
+ echo ""
+
+ oasis_src_test
+}
diff --git a/dev-ml/cryptokit/metadata.xml b/dev-ml/cryptokit/metadata.xml
new file mode 100644
index 000000000000..fad2f6d52138
--- /dev/null
+++ b/dev-ml/cryptokit/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">xavierleroy/cryptokit</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/csv-1.5 b/dev-ml/csv-1.5
deleted file mode 100644
index c3446a149e6e..000000000000
--- a/dev-ml/csv-1.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=A pure OCaml library to read and write CSV files
-EAPI=5
-HOMEPAGE=https://github.com/Chris00/ocaml-csv
-IUSE=+ocamlopt debug doc test
-KEYWORDS=~amd64
-LICENSE=LGPL-2.1-with-linking-exception
-RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?]
-SLOT=0/1.5
-SRC_URI=https://github.com/Chris00/ocaml-csv/releases/download/1.5/csv-1.5.tar.gz
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e oasis 9256ed89af74c3365ec888c00bfdfe43 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7eecf398f6f1ab0cb7e76a9704061e26
diff --git a/dev-ml/csv-1.6 b/dev-ml/csv-1.6
deleted file mode 100644
index 25c11b954598..000000000000
--- a/dev-ml/csv-1.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=lwt? ( dev-ml/lwt:= ) >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=A pure OCaml library to read and write CSV files
-EAPI=5
-HOMEPAGE=https://github.com/Chris00/ocaml-csv
-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?]
-SLOT=0/1.6
-SRC_URI=https://github.com/Chris00/ocaml-csv/releases/download/1.6/csv-1.6.tar.gz
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e oasis 9256ed89af74c3365ec888c00bfdfe43 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b7846eaaef4cb64d34d3ef6d65a69a49
diff --git a/dev-ml/csv-1.7 b/dev-ml/csv-1.7
deleted file mode 100644
index de54a830e3a8..000000000000
--- a/dev-ml/csv-1.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=lwt? ( dev-ml/lwt:= ) dev-ml/oasis >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=A pure OCaml library to read and write CSV files
-EAPI=5
-HOMEPAGE=https://github.com/Chris00/ocaml-csv
-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?]
-SLOT=0/1.7
-SRC_URI=https://github.com/Chris00/ocaml-csv/archive/1.7.tar.gz -> csv-1.7.tar.gz
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e oasis 9256ed89af74c3365ec888c00bfdfe43 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=53da00c4126aa34709d4d08436dbe083
diff --git a/dev-ml/csv/Manifest b/dev-ml/csv/Manifest
new file mode 100644
index 000000000000..0ae6dcad6d17
--- /dev/null
+++ b/dev-ml/csv/Manifest
@@ -0,0 +1,7 @@
+DIST csv-1.5.tar.gz 83642 BLAKE2B e07303a4be8c4e75964b4ecc38da59de288e12b433ecb4a5d5450b21411b2343b38853cdf2737516185867d2f3963cc374c9ec34df96332b5844bbd850fb7c89 SHA512 1c8af0ce8abd8a5710115c194eee34928399964447309ee974665cf427396def42bca4f983904bfec706f7944aea419a87bf54bc6c379cb8b7372be801be4126
+DIST csv-1.6.tar.gz 98194 BLAKE2B 1c7975ec92bcd63cdeee369e8a3507b6ef95cf646cba2f5498983a18098f8147a26d7ae57a37904a3f1cc21085e7f2f2ffc9ec7bca836d6edc31a45d2de4c0a3 SHA512 689dae2dd57ec914ca1dd5e3d34ebd352aabb7d5da8933aa6c6fc9c6ec84dc538d1df8a1c46f3e172ab09e5917e9158be76afb2423ec8a92eef489ac5dfd5175
+DIST csv-1.7.tar.gz 45160 BLAKE2B 2f51f927d9099382a227e20471e60075f8796d7753152e266c121f705e4dab7036659937630302f152cd8f28d6db1aee3d5c72c339a45477292ee03c4bc461ab SHA512 cbe3d316e6f99318b3958bbfba3308225e709afb481a333d314adb66c20683171c23ac0565fc8d8e936b9dad13b9330b5208340b9fc671b4ccddf3a7d8b82b3e
+EBUILD csv-1.5.ebuild 517 BLAKE2B d03abc8fea95c38094dca18547eb57c188378a45250529cd0073e9dba05e39ce04617e8bb3e264b6cfce7d2d76386173ba83e61ad3754231e056337e3b1227a7 SHA512 cfcd84f23bd246fc5e225dbf02d81b1ef091f1af8e193689ec07bf69fed40585a81a4f4b97a72f91ee2246c37ea823a5be4ddeb002ef4564a5e6b51631677de9
+EBUILD csv-1.6.ebuild 629 BLAKE2B b0262894ce7b05662b24293efcb2cfb420d8afd820467669cb8d8677680f01a023645ffa680e4283af463cc599c838ba15d206c5044cc6ae658a0d1b50e3e012 SHA512 03093fca7d3c1e1d0391c4365cae27c2f68e4f12b86a625d426ec8112f5e44485adba2b3c332f6afc57c7b92c3c717e83aa4e261b3c659dcc9e3c22e7c8e1580
+EBUILD csv-1.7.ebuild 737 BLAKE2B 5a7e4901f97dff8c2f4c5d25b8ecc6b872bde2c5e57302a726820a7cb7bd8bc86975ee4a541dc6a4ec550e4d7ff89a27e490b59523468797d61f3630abe871bd SHA512 20e561d88b7598be72c68870d38fc16b73d41f8c56563bd906917e4f5683d3880976ac35bd873c8082664c75b0959ad485676b8030aca822c528be3ed75d9598
+MISC metadata.xml 429 BLAKE2B ce09ac06a35a459ef646749b55d32ce3086f7002cb0612dc7350e7884c7850ee739c2bf483b2a2758758ba34e4755e0e1a364a322b1da1d8fd181285c1a65a5d SHA512 1c23697559bc429062f42f54ab55e940eb22777efec99ce865280ba1342ee7f6f6f7a82a7b036a3a5db5d01b68e8e9990bc19e40b4ba7f372123d825b1bd12ff
diff --git a/dev-ml/csv/csv-1.5.ebuild b/dev-ml/csv/csv-1.5.ebuild
new file mode 100644
index 000000000000..29be7c1a8b6c
--- /dev/null
+++ b/dev-ml/csv/csv-1.5.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+OASIS_BUILD_DOCS=1
+OASIS_BUILD_TESTS=1
+
+inherit oasis
+
+DESCRIPTION="A pure OCaml library to read and write CSV files"
+HOMEPAGE="https://github.com/Chris00/ocaml-csv"
+SRC_URI="https://github.com/Chris00/ocaml-csv/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+DOCS=( "README.txt" "AUTHORS.txt" )
diff --git a/dev-ml/csv/csv-1.6.ebuild b/dev-ml/csv/csv-1.6.ebuild
new file mode 100644
index 000000000000..1d0efd903991
--- /dev/null
+++ b/dev-ml/csv/csv-1.6.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+OASIS_BUILD_DOCS=1
+OASIS_BUILD_TESTS=1
+
+inherit oasis
+
+DESCRIPTION="A pure OCaml library to read and write CSV files"
+HOMEPAGE="https://github.com/Chris00/ocaml-csv"
+SRC_URI="https://github.com/Chris00/ocaml-csv/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="+lwt"
+
+DEPEND="lwt? ( dev-ml/lwt:= )"
+RDEPEND="${DEPEND}"
+
+DOCS=( "README.txt" "AUTHORS.txt" )
+
+src_configure() {
+ oasis_configure_opts="$(use_enable lwt)" \
+ oasis_src_configure
+}
diff --git a/dev-ml/csv/csv-1.7.ebuild b/dev-ml/csv/csv-1.7.ebuild
new file mode 100644
index 000000000000..817e095edb27
--- /dev/null
+++ b/dev-ml/csv/csv-1.7.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+OASIS_BUILD_DOCS=1
+OASIS_BUILD_TESTS=1
+
+inherit oasis
+
+DESCRIPTION="A pure OCaml library to read and write CSV files"
+HOMEPAGE="https://github.com/Chris00/ocaml-csv"
+SRC_URI="https://github.com/Chris00/ocaml-csv/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="+lwt"
+
+DEPEND="lwt? ( dev-ml/lwt:= )"
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND}
+ dev-ml/oasis"
+
+DOCS=( "README.txt" "AUTHORS.txt" )
+
+S="${WORKDIR}/ocaml-${P}"
+
+src_prepare() {
+ default
+ oasis setup || die
+}
+
+src_configure() {
+ oasis_configure_opts="$(use_enable lwt)" \
+ oasis_src_configure
+}
diff --git a/dev-ml/csv/metadata.xml b/dev-ml/csv/metadata.xml
new file mode 100644
index 000000000000..5008ee553fa7
--- /dev/null
+++ b/dev-ml/csv/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">Chris00/ocaml-csv</remote-id>
+ </upstream>
+ <use>
+ <flag name="lwt">Enables the Lwt-based library for asynchronous operations.</flag>
+ </use>
+</pkgmetadata>
diff --git a/dev-ml/cudf-0.8-r1 b/dev-ml/cudf-0.8-r1
deleted file mode 100644
index 16b54ec87d80..000000000000
--- a/dev-ml/cudf-0.8-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/extlib:= dev-libs/glib:2 dev-ml/camlp4:= dev-ml/cppo:= test? ( dev-ml/ounit ) dev-ml/findlib dev-ml/ocamlbuild dev-lang/perl
-DESCRIPTION=Library to parse, pretty print, and evaluate CUDF documents
-EAPI=5
-HOMEPAGE=http://www.mancoosi.org/cudf/
-IUSE=+ocamlopt test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
-LICENSE=LGPL-3
-RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/extlib:= dev-libs/glib:2 dev-ml/camlp4:= dev-ml/cppo:=
-SLOT=0/0.8
-SRC_URI=https://gforge.inria.fr/frs/download.php/file/34659/cudf-0.8.tar.gz
-_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=be87acb995abe5a2dc59d3ea36c4be3e
diff --git a/dev-ml/cudf/Manifest b/dev-ml/cudf/Manifest
new file mode 100644
index 000000000000..3f3d2ed47fe3
--- /dev/null
+++ b/dev-ml/cudf/Manifest
@@ -0,0 +1,3 @@
+DIST cudf-0.8.tar.gz 55147 BLAKE2B c091a55e438979f73bfd5fd16f1e793ec984b24becc902e6eed856afea0f39586001174847b8626bbf162c2b51cbb98cdb60d9539c9aac0a1d651b693e686704 SHA512 cea9e51094076089b1beb657f6b2ccc6ac5f49660e06743f8ec646b277beb4c830f90156ae240a6903de55d09caee78fb0dc75efd76ca65fd2b40ab8756301e3
+EBUILD cudf-0.8-r1.ebuild 1325 BLAKE2B c742a2cec8fbb5163571c36bebe9b7ef08a1d19a5fcf84b6ae6e66d22bbe32f048afe1fb0ef05fa6e221248f90dc01a96a44739a6f86b4b5e6988501fa826bc5 SHA512 69172e1b6b05f3ad1f29821abf0238931bbd79fef9e35c43b2a4f95aea6debb3b7ebb604c1e977f5f4c3fbcf3a9f7a71def6891f3ff01f02a9e6484122783209
+MISC metadata.xml 243 BLAKE2B 010ca240ae06e9a9f6d7ba213eb06df36d9ba862ff2d2458d98a9fea1a1e7f3026d13832a73bce1b3ad9345029425e6abfae9e03bf126f2329b3f030ed3753fd SHA512 1c5b4b2163017e496999d1f87e5c9c5ac6c11b2e9187450ccfb3df258f34e54d278972f04ee0e8429476c6f87e091a869ac2a28c6e8c8e6d20678c3e74061449
diff --git a/dev-ml/cudf/cudf-0.8-r1.ebuild b/dev-ml/cudf/cudf-0.8-r1.ebuild
new file mode 100644
index 000000000000..4798b763acc6
--- /dev/null
+++ b/dev-ml/cudf/cudf-0.8-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit multilib toolchain-funcs
+
+DESCRIPTION="Library to parse, pretty print, and evaluate CUDF documents"
+HOMEPAGE="http://www.mancoosi.org/cudf/"
+SRC_URI="https://gforge.inria.fr/frs/download.php/file/34659/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE="+ocamlopt test"
+
+RDEPEND="
+ >=dev-lang/ocaml-3.12:=[ocamlopt?]
+ dev-ml/extlib:=
+ dev-libs/glib:2
+ dev-ml/camlp4:=
+ dev-ml/cppo:=
+"
+DEPEND="${RDEPEND}
+ test? ( dev-ml/ounit )
+ dev-ml/findlib
+ dev-ml/ocamlbuild
+ dev-lang/perl
+"
+
+src_prepare() {
+ sed -i \
+ -e 's|make|$(MAKE)|g' \
+ Makefile || die
+ sed -i \
+ -e 's|-lncurses|$(shell ${PKG_CONFIG} --libs ncurses glib-2.0)|g' \
+ c-lib/Makefile || die
+ sed -i \
+ -e 's|-lcurses|$(shell ${PKG_CONFIG} --libs ncurses glib-2.0)|g' \
+ c-lib/Makefile.variants || die
+
+ tc-export CC PKG_CONFIG
+
+ sed -i \
+ -e "s|-lncurses|$( $(tc-getPKG_CONFIG) --libs ncurses)|g" \
+ c-lib/cudf.pc.in || die
+}
+
+src_compile() {
+ emake -j1 all
+ emake c-lib
+ if use ocamlopt ; then
+ emake -j1 opt
+ emake c-lib-opt
+ fi
+}
+
+src_test() {
+ emake test
+ emake c-lib-test
+}
+
+src_install() {
+ emake DESTDIR="${ED}" LIBDIR="/usr/$(get_libdir)" install
+ dodoc BUGS ChangeLog README TODO
+}
diff --git a/dev-ml/cudf/metadata.xml b/dev-ml/cudf/metadata.xml
new file mode 100644
index 000000000000..ffac4d7ebc01
--- /dev/null
+++ b/dev-ml/cudf/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-ml/deriving-0.7.1 b/dev-ml/deriving-0.7.1
deleted file mode 100644
index cf1c03abedb0..000000000000
--- a/dev-ml/deriving-0.7.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-ml/type-conv-108:= dev-ml/optcomp:= dev-ml/findlib:= dev-ml/camlp4:= dev-ml/oasis >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=A deriving library for Ocsigen
-EAPI=5
-HOMEPAGE=https://github.com/ocsigen/deriving
-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?]
-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 983774947da124fb7d542ce25a218bb1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e oasis 9256ed89af74c3365ec888c00bfdfe43 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0fd38769fbc139df9d8f2e108fd910ac
diff --git a/dev-ml/deriving/Manifest b/dev-ml/deriving/Manifest
new file mode 100644
index 000000000000..41ec25a256a3
--- /dev/null
+++ b/dev-ml/deriving/Manifest
@@ -0,0 +1,3 @@
+DIST deriving-0.7.1.tar.gz 68550 BLAKE2B ded445dbc7f1b8402ae89742abd4f581754a6513aaeb0edcd08f3b0866e531e1731c235bcb50e587314929343fa6a4cfdd11aa9bd8527c03b0813c0a27949d98 SHA512 d4c4b38321f2fc5ed1a9ea7910ec4fae15b08485ae9067048a609d5b9d76188da02995cd18a034c561494cdd3aa8dbb57a1a1c69918b1f79d70f89c96a26d342
+EBUILD deriving-0.7.1.ebuild 664 BLAKE2B 95d4b81fb673975ea389f41a237870dc0fb5a4c6bd048e334e034527359cfd099abbaa1b51c369a095d6fffb4ddfec6dcfef42b0ad32e07966c1ce48c8634531 SHA512 aeb4b864a55a1e12ee23fd1f92c2c2422b02f681acc430f4d12d95ad3d7131870bc13e6b927f74fe8b91c8a93a4c413cd087981585eba03a8293f9b6a0bd049e
+MISC metadata.xml 338 BLAKE2B 113a6f07f12209df941bfc4150955073614250d517f1319c544da80fcf9dcf7ac6ddf03bed1465b1d404f84abbd47c87aa80fd50c525b581ed6db908fc34c18a SHA512 4bcb33bea5c3223f7f4cd7e40169f9436aa4f816c9cce78ffe5d2f0d9f2585d2f84a36014ca2890d8a0b17a94b68c3e3ae1716ad5cd1d86f2bfba633ce104b13
diff --git a/dev-ml/deriving/deriving-0.7.1.ebuild b/dev-ml/deriving/deriving-0.7.1.ebuild
new file mode 100644
index 000000000000..845c827a8b68
--- /dev/null
+++ b/dev-ml/deriving/deriving-0.7.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+OASIS_BUILD_TESTS=1
+
+inherit oasis
+
+DESCRIPTION="A deriving library for Ocsigen"
+HOMEPAGE="https://github.com/ocsigen/deriving"
+SRC_URI="https://github.com/ocsigen/deriving/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+ >=dev-ml/type-conv-108:=
+ dev-ml/optcomp:=
+ dev-ml/findlib:=
+ dev-ml/camlp4:=
+"
+DEPEND="${RDEPEND}
+ dev-ml/oasis"
+
+DOCS=( CHANGES README.md )
+oasis_configure_opts="--enable-tc"
+OASIS_SETUP_COMMAND="./setup.exe"
+
+src_configure() {
+ emake setup.exe
+ oasis_src_configure
+}
diff --git a/dev-ml/deriving/metadata.xml b/dev-ml/deriving/metadata.xml
new file mode 100644
index 000000000000..38747951f74a
--- /dev/null
+++ b/dev-ml/deriving/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">ocsigen/deriving</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/dns-1.0.0 b/dev-ml/dns-1.0.0
deleted file mode 100644
index 4eaab99fcd87..000000000000
--- a/dev-ml/dns-1.0.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=dev-ml/jbuilder >=dev-ml/ocaml-base64-2.0.0:= >=dev-ml/ocaml-cstruct-3.0.2:=[ppx] dev-ml/ocaml-hashcons:= >=dev-ml/ocaml-ipaddr-2.6.0:= dev-ml/ocaml-re:= >=dev-ml/ocaml-uri-1.7.0:= dev-ml/result:= !dev-ml/odns >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=A pure OCaml implementation of the DNS protocol
-EAPI=5
-HOMEPAGE=https://github.com/mirage/ocaml-dns https://mirage.io
-KEYWORDS=~amd64
-LICENSE=LGPL-2 LGPL-2.1-with-linking-exception ISC
-RDEPEND=>=dev-ml/ocaml-base64-2.0.0:= >=dev-ml/ocaml-cstruct-3.0.2:=[ppx] dev-ml/ocaml-hashcons:= >=dev-ml/ocaml-ipaddr-2.6.0:= dev-ml/ocaml-re:= >=dev-ml/ocaml-uri-1.7.0:= dev-ml/result:= !dev-ml/odns >=dev-lang/ocaml-4:=
-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 24b4a2529c1fd12f1304856d6c5a690d
-_md5_=6ce03d8214e5fe840ad2c595ed1061f5
diff --git a/dev-ml/dns-async-1.0.0 b/dev-ml/dns-async-1.0.0
deleted file mode 100644
index 5be06e2d1516..000000000000
--- a/dev-ml/dns-async-1.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=dev-ml/jbuilder test? ( dev-ml/dns-lwt-unix ) >=dev-lang/ocaml-4:= dev-ml/async:= dev-ml/dns:= >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=Async support of OCaml DNS
-EAPI=5
-HOMEPAGE=https://github.com/mirage/ocaml-dns https://mirage.io
-IUSE=test
-KEYWORDS=~amd64
-LICENSE=LGPL-2 LGPL-2.1-with-linking-exception ISC
-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 24b4a2529c1fd12f1304856d6c5a690d
-_md5_=e57db79757a5e68489eb92b7d3ab26ec
diff --git a/dev-ml/dns-async/Manifest b/dev-ml/dns-async/Manifest
new file mode 100644
index 000000000000..78d26984ff31
--- /dev/null
+++ b/dev-ml/dns-async/Manifest
@@ -0,0 +1,3 @@
+DIST ocaml-dns-1.0.0.tar.gz 99161 BLAKE2B f0fa068296ac7eb5331ff7f5f88ee60a3010ac146f4b5bfeeffc8db014e6e5563da4f516ee1090365d290fb50b2754576b14167d55b2a33e125046103d485c1e SHA512 199653605e985851dcaafc94f1efeba5c261c29cd5e5f8eaebc9f7d25a05c43adcf7620efb291b22f9549f7c05f8ac3f6abfbcf40e0d7762bd2f7cd623ebcb1c
+EBUILD dns-async-1.0.0.ebuild 754 BLAKE2B f2bdc731f24c85e82a1829cbe101f5461ca44712934035f103c10c53461db8131a7da98caddd7c017927fe8efba1eac5cc8d719fd38438f245a250a5f099f8d2 SHA512 52dc613bb6219b8a0e7f61563f20a1429230e441a204734828ef94fde4f28cbe724b6947a8d40af88f8b2e020e0e6d9980e37a9b0f4770235f7bb10b447908aa
+MISC metadata.xml 357 BLAKE2B e22ffef8d3776a5f01c87a83bf859dcde8f35940885c9e86535debf56beefc5e2ec5dc99c041f208304d2238118ecf814b95c6cd27b18368c10d0889416cbe59 SHA512 9e3065fb6377e861b64a34f9fafd75e33a0edb081d273a8918b494a1d6f79c63ffb2c9b33bd854bb893fa020652c15b575d3e16e08266895239c082f28429633
diff --git a/dev-ml/dns-async/dns-async-1.0.0.ebuild b/dev-ml/dns-async/dns-async-1.0.0.ebuild
new file mode 100644
index 000000000000..f7df7c7eccf3
--- /dev/null
+++ b/dev-ml/dns-async/dns-async-1.0.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit findlib opam
+
+MY_P=ocaml-dns-${PV}
+
+DESCRIPTION="Async support of OCaml DNS"
+HOMEPAGE="https://github.com/mirage/ocaml-dns https://mirage.io"
+SRC_URI="https://github.com/mirage/ocaml-dns/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="LGPL-2 LGPL-2.1-with-linking-exception ISC"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND="
+ >=dev-lang/ocaml-4:=
+ dev-ml/async:=
+ dev-ml/dns:=
+"
+DEPEND="
+ dev-ml/jbuilder
+ test? (
+ dev-ml/dns-lwt-unix
+ )
+ ${RDEPEND}
+"
+# Do not work
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_P}"
+
+src_compile() {
+ jbuilder build @install -p ${PN} || die
+}
+
+src_test() {
+ jbuilder runtest -p ${PN} || die
+}
diff --git a/dev-ml/dns-async/metadata.xml b/dev-ml/dns-async/metadata.xml
new file mode 100644
index 000000000000..2f4ef14adaa5
--- /dev/null
+++ b/dev-ml/dns-async/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">mirage/ocaml-dns</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/dns-lwt-1.0.0 b/dev-ml/dns-lwt-1.0.0
deleted file mode 100644
index c9642468a5e2..000000000000
--- a/dev-ml/dns-lwt-1.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=dev-ml/jbuilder test? ( dev-ml/dns-lwt-unix ) >=dev-lang/ocaml-4:= dev-ml/lwt:= dev-ml/dns:= dev-ml/mirage-profile:= >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=Lwt support of OCaml DNS
-EAPI=5
-HOMEPAGE=https://github.com/mirage/ocaml-dns https://mirage.io
-IUSE=test
-KEYWORDS=~amd64
-LICENSE=LGPL-2 LGPL-2.1-with-linking-exception ISC
-RDEPEND=>=dev-lang/ocaml-4:= dev-ml/lwt:= dev-ml/dns:= dev-ml/mirage-profile:= >=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 24b4a2529c1fd12f1304856d6c5a690d
-_md5_=14e4d9980c24a5e7b3c6530658f3183d
diff --git a/dev-ml/dns-lwt-unix-1.0.0 b/dev-ml/dns-lwt-unix-1.0.0
deleted file mode 100644
index 6da856c95e50..000000000000
--- a/dev-ml/dns-lwt-unix-1.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=dev-ml/jbuilder test? ( dev-ml/ounit ) >=dev-lang/ocaml-4:= dev-ml/dns-lwt:= dev-ml/dns:= dev-ml/cmdliner:= dev-ml/mirage-profile:= dev-ml/ocaml-ipaddr:= >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=Lwt support of OCaml DNS
-EAPI=5
-HOMEPAGE=https://github.com/mirage/ocaml-dns https://mirage.io
-IUSE=test
-KEYWORDS=~amd64
-LICENSE=LGPL-2 LGPL-2.1-with-linking-exception ISC
-RDEPEND=>=dev-lang/ocaml-4:= dev-ml/dns-lwt:= dev-ml/dns:= dev-ml/cmdliner:= dev-ml/mirage-profile:= dev-ml/ocaml-ipaddr:= >=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 24b4a2529c1fd12f1304856d6c5a690d
-_md5_=39b05dcbb156e96be60a30359275d00f
diff --git a/dev-ml/dns-lwt-unix/Manifest b/dev-ml/dns-lwt-unix/Manifest
new file mode 100644
index 000000000000..c5b1728eb19a
--- /dev/null
+++ b/dev-ml/dns-lwt-unix/Manifest
@@ -0,0 +1,3 @@
+DIST ocaml-dns-1.0.0.tar.gz 99161 BLAKE2B f0fa068296ac7eb5331ff7f5f88ee60a3010ac146f4b5bfeeffc8db014e6e5563da4f516ee1090365d290fb50b2754576b14167d55b2a33e125046103d485c1e SHA512 199653605e985851dcaafc94f1efeba5c261c29cd5e5f8eaebc9f7d25a05c43adcf7620efb291b22f9549f7c05f8ac3f6abfbcf40e0d7762bd2f7cd623ebcb1c
+EBUILD dns-lwt-unix-1.0.0.ebuild 814 BLAKE2B e372a572d541fa7fed10863932e6d21aece8e42714fbc767f3c2546f5d08318949ef6e7476b238aa15b3730c007bc7dfb0edae2c37103114fba6a94f3e0cdd92 SHA512 a2bcc276d0d4cf28ae7e0e957e04e58c3619a2f2439c089be602210a0831e8c593756eb0a416c82fe5cbb044d32b683305afa30419bf1c25624932d7984847b7
+MISC metadata.xml 357 BLAKE2B e22ffef8d3776a5f01c87a83bf859dcde8f35940885c9e86535debf56beefc5e2ec5dc99c041f208304d2238118ecf814b95c6cd27b18368c10d0889416cbe59 SHA512 9e3065fb6377e861b64a34f9fafd75e33a0edb081d273a8918b494a1d6f79c63ffb2c9b33bd854bb893fa020652c15b575d3e16e08266895239c082f28429633
diff --git a/dev-ml/dns-lwt-unix/dns-lwt-unix-1.0.0.ebuild b/dev-ml/dns-lwt-unix/dns-lwt-unix-1.0.0.ebuild
new file mode 100644
index 000000000000..0de745104dd6
--- /dev/null
+++ b/dev-ml/dns-lwt-unix/dns-lwt-unix-1.0.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit findlib opam
+
+MY_P=ocaml-dns-${PV}
+
+DESCRIPTION="Lwt support of OCaml DNS"
+HOMEPAGE="https://github.com/mirage/ocaml-dns https://mirage.io"
+SRC_URI="https://github.com/mirage/ocaml-dns/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="LGPL-2 LGPL-2.1-with-linking-exception ISC"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND="
+ >=dev-lang/ocaml-4:=
+ dev-ml/dns-lwt:=
+ dev-ml/dns:=
+ dev-ml/cmdliner:=
+ dev-ml/mirage-profile:=
+ dev-ml/ocaml-ipaddr:=
+"
+DEPEND="
+ dev-ml/jbuilder
+ test? (
+ dev-ml/ounit
+ )
+ ${RDEPEND}
+"
+# Do not work
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_P}"
+
+src_compile() {
+ jbuilder build @install -p ${PN} || die
+}
+
+src_test() {
+ jbuilder runtest -p ${PN} || die
+}
diff --git a/dev-ml/dns-lwt-unix/metadata.xml b/dev-ml/dns-lwt-unix/metadata.xml
new file mode 100644
index 000000000000..2f4ef14adaa5
--- /dev/null
+++ b/dev-ml/dns-lwt-unix/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">mirage/ocaml-dns</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/dns-lwt/Manifest b/dev-ml/dns-lwt/Manifest
new file mode 100644
index 000000000000..97595e63b095
--- /dev/null
+++ b/dev-ml/dns-lwt/Manifest
@@ -0,0 +1,3 @@
+DIST ocaml-dns-1.0.0.tar.gz 99161 BLAKE2B f0fa068296ac7eb5331ff7f5f88ee60a3010ac146f4b5bfeeffc8db014e6e5563da4f516ee1090365d290fb50b2754576b14167d55b2a33e125046103d485c1e SHA512 199653605e985851dcaafc94f1efeba5c261c29cd5e5f8eaebc9f7d25a05c43adcf7620efb291b22f9549f7c05f8ac3f6abfbcf40e0d7762bd2f7cd623ebcb1c
+EBUILD dns-lwt-1.0.0.ebuild 775 BLAKE2B 76f8ea369fc50f1f24387182bbcdc58146a003527174b5e9fd3594f41be33c171b662978d73c018c9600a22ac4f27d69a6cb8b5c10d05b9ce03cb03747d7b643 SHA512 89df989c480d0c1897c150d5dc3dc4c91cb83308f5778ee13c794bbd9a736595565e271b21a5d72e362f7c94f99f505560a0f0dc59c37a90619e89026591ad09
+MISC metadata.xml 357 BLAKE2B e22ffef8d3776a5f01c87a83bf859dcde8f35940885c9e86535debf56beefc5e2ec5dc99c041f208304d2238118ecf814b95c6cd27b18368c10d0889416cbe59 SHA512 9e3065fb6377e861b64a34f9fafd75e33a0edb081d273a8918b494a1d6f79c63ffb2c9b33bd854bb893fa020652c15b575d3e16e08266895239c082f28429633
diff --git a/dev-ml/dns-lwt/dns-lwt-1.0.0.ebuild b/dev-ml/dns-lwt/dns-lwt-1.0.0.ebuild
new file mode 100644
index 000000000000..850c1001b9f1
--- /dev/null
+++ b/dev-ml/dns-lwt/dns-lwt-1.0.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit findlib opam
+
+MY_P=ocaml-dns-${PV}
+
+DESCRIPTION="Lwt support of OCaml DNS"
+HOMEPAGE="https://github.com/mirage/ocaml-dns https://mirage.io"
+SRC_URI="https://github.com/mirage/ocaml-dns/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="LGPL-2 LGPL-2.1-with-linking-exception ISC"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND="
+ >=dev-lang/ocaml-4:=
+ dev-ml/lwt:=
+ dev-ml/dns:=
+ dev-ml/mirage-profile:=
+"
+DEPEND="
+ dev-ml/jbuilder
+ test? (
+ dev-ml/dns-lwt-unix
+ )
+ ${RDEPEND}
+"
+# do not work
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_P}"
+
+src_compile() {
+ jbuilder build @install -p ${PN} || die
+}
+
+src_test() {
+ jbuilder runtest -p ${PN} || die
+}
diff --git a/dev-ml/dns-lwt/metadata.xml b/dev-ml/dns-lwt/metadata.xml
new file mode 100644
index 000000000000..2f4ef14adaa5
--- /dev/null
+++ b/dev-ml/dns-lwt/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">mirage/ocaml-dns</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/dns/Manifest b/dev-ml/dns/Manifest
new file mode 100644
index 000000000000..73561950b5f8
--- /dev/null
+++ b/dev-ml/dns/Manifest
@@ -0,0 +1,3 @@
+DIST ocaml-dns-1.0.0.tar.gz 99161 BLAKE2B f0fa068296ac7eb5331ff7f5f88ee60a3010ac146f4b5bfeeffc8db014e6e5563da4f516ee1090365d290fb50b2754576b14167d55b2a33e125046103d485c1e SHA512 199653605e985851dcaafc94f1efeba5c261c29cd5e5f8eaebc9f7d25a05c43adcf7620efb291b22f9549f7c05f8ac3f6abfbcf40e0d7762bd2f7cd623ebcb1c
+EBUILD dns-1.0.0.ebuild 864 BLAKE2B fe94b1c1cbd9e1cf4c04a616c028d283290de0825fc111d9340fed5b795253593e0fa58c97af2d34de96a816a23a91a88fd50bcccd266aa77dbd424aa13da99e SHA512 c8d8a430e397dd6db98c9f1cf0cec5ab43d7789451f687e37a337449b8ca6b34030f1631a0fe2464ad1920397d73de2db242f927d78aa7845e4f2dbf10aba356
+MISC metadata.xml 357 BLAKE2B e22ffef8d3776a5f01c87a83bf859dcde8f35940885c9e86535debf56beefc5e2ec5dc99c041f208304d2238118ecf814b95c6cd27b18368c10d0889416cbe59 SHA512 9e3065fb6377e861b64a34f9fafd75e33a0edb081d273a8918b494a1d6f79c63ffb2c9b33bd854bb893fa020652c15b575d3e16e08266895239c082f28429633
diff --git a/dev-ml/dns/dns-1.0.0.ebuild b/dev-ml/dns/dns-1.0.0.ebuild
new file mode 100644
index 000000000000..1780cf1361f4
--- /dev/null
+++ b/dev-ml/dns/dns-1.0.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit findlib opam
+
+DESCRIPTION="A pure OCaml implementation of the DNS protocol"
+HOMEPAGE="https://github.com/mirage/ocaml-dns https://mirage.io"
+SRC_URI="https://github.com/mirage/${PN}/archive/v${PV}.tar.gz -> ocaml-${P}.tar.gz"
+
+LICENSE="LGPL-2 LGPL-2.1-with-linking-exception ISC"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+ >=dev-ml/ocaml-base64-2.0.0:=
+ >=dev-ml/ocaml-cstruct-3.0.2:=[ppx]
+ dev-ml/ocaml-hashcons:=
+ >=dev-ml/ocaml-ipaddr-2.6.0:=
+ dev-ml/ocaml-re:=
+ >=dev-ml/ocaml-uri-1.7.0:=
+ dev-ml/result:=
+ !dev-ml/odns
+"
+DEPEND="
+ dev-ml/jbuilder
+ ${RDEPEND}
+"
+
+# Do not work
+RESTRICT="test"
+
+S="${WORKDIR}/ocaml-${P}"
+
+src_compile() {
+ jbuilder build @install -p dns || die
+}
+
+src_test() {
+ jbuilder runtest -p dns || die
+}
diff --git a/dev-ml/dns/metadata.xml b/dev-ml/dns/metadata.xml
new file mode 100644
index 000000000000..2f4ef14adaa5
--- /dev/null
+++ b/dev-ml/dns/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">mirage/ocaml-dns</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/dose3-5.0.1 b/dev-ml/dose3-5.0.1
deleted file mode 100644
index c7c4bfface51..000000000000
--- a/dev-ml/dose3-5.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/cudf:= >=dev-ml/extlib-1.7.0:= dev-ml/ocaml-re:= dev-ml/cppo:= parmap? ( dev-ml/parmap:= ) zip? ( dev-ml/camlzip:= ) bzip2? ( dev-ml/camlbz2:= ) >=dev-ml/ocamlgraph-1.8.6:= xml? ( dev-ml/ocaml-expat:= dev-ml/xml-light:= ) curl? ( dev-ml/ocurl:= ) rpm4? ( app-arch/rpm ) dev-ml/findlib dev-ml/ocamlbuild test? ( dev-python/pyyaml[libyaml] )
-DESCRIPTION=Library to perform analysis on package repositories
-EAPI=5
-HOMEPAGE=http://www.mancoosi.org/software/ https://gforge.inria.fr/projects/dose
-IUSE=+ocamlopt parmap zip bzip2 xml curl rpm4 test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
-LICENSE=LGPL-3
-RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/cudf:= >=dev-ml/extlib-1.7.0:= dev-ml/ocaml-re:= dev-ml/cppo:= parmap? ( dev-ml/parmap:= ) zip? ( dev-ml/camlzip:= ) bzip2? ( dev-ml/camlbz2:= ) >=dev-ml/ocamlgraph-1.8.6:= xml? ( dev-ml/ocaml-expat:= dev-ml/xml-light:= ) curl? ( dev-ml/ocurl:= ) rpm4? ( app-arch/rpm )
-RESTRICT=test
-SLOT=0/5.0.1
-SRC_URI=https://gforge.inria.fr/frs/download.php/file/36063/dose3-5.0.1.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0bd92c44c5624b8fac4e4e806e1d3556
diff --git a/dev-ml/dose3/Manifest b/dev-ml/dose3/Manifest
new file mode 100644
index 000000000000..2fdec63adfe8
--- /dev/null
+++ b/dev-ml/dose3/Manifest
@@ -0,0 +1,3 @@
+DIST dose3-5.0.1.tar.gz 297433 BLAKE2B 74ae954604f26398f091b4f14d2a633132ae62102f52af13284af27e41cd7c47afb1b533b0821a8921ba33fa6658e94b3bb6bf5f104f48881a50e14517cd65e2 SHA512 e66526319446054041f138ee2633043d0832089f6a554cf566a28de899d10383acfb1aa6bf1a368811602939676510933a7d2404fd34dbeba15045b458f5af84
+EBUILD dose3-5.0.1.ebuild 1548 BLAKE2B 2e2348459b998cc2350787d7c41ebe1a7c7d2ee3f5eb4de538b2c62bb2854ba9ee354441a3b2cf6bdb0e0cc28c1d6e7de8b61ea6a44e0f91dbe5ddba0f2d9d40 SHA512 3b8054200e7077eafe369f339ad65aadde15ea0b75da3b1a28beffb742d90ce9915fb02061145bd9b10163372af4cbe05ea034280d01888e5c03f5f65cbc09c9
+MISC metadata.xml 477 BLAKE2B bab8c4dcccf018fc386a04eff221a119adaf4d322ebe20544a3287f3ec14d418f44f09c39ce9608e50d895db4b9b8d09d830c85d57dd33c69534db3e74aae114 SHA512 899e3f1db5541688a15afb5830f7f2578ec413273e1c7f0db1cc31f1695f01ea42df4377db4fda2f5e4a6703166217bcb58aebf417a99b086dbf7f6ff73a0f95
diff --git a/dev-ml/dose3/dose3-5.0.1.ebuild b/dev-ml/dose3/dose3-5.0.1.ebuild
new file mode 100644
index 000000000000..3d2b19a0b099
--- /dev/null
+++ b/dev-ml/dose3/dose3-5.0.1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+
+MY_P="${P/_beta/-beta}"
+DESCRIPTION="Library to perform analysis on package repositories"
+HOMEPAGE="http://www.mancoosi.org/software/ https://gforge.inria.fr/projects/dose"
+SRC_URI="https://gforge.inria.fr/frs/download.php/file/36063/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE="+ocamlopt parmap zip bzip2 xml curl rpm4 test"
+
+RDEPEND="
+ >=dev-lang/ocaml-3.12:=[ocamlopt?]
+ dev-ml/cudf:=
+ >=dev-ml/extlib-1.7.0:=
+ dev-ml/ocaml-re:=
+ dev-ml/cppo:=
+ parmap? ( dev-ml/parmap:= )
+ zip? ( dev-ml/camlzip:= )
+ bzip2? ( dev-ml/camlbz2:= )
+ >=dev-ml/ocamlgraph-1.8.6:=
+ xml? ( dev-ml/ocaml-expat:= dev-ml/xml-light:= )
+ curl? ( dev-ml/ocurl:= )
+ rpm4? ( app-arch/rpm )
+"
+DEPEND="${RDEPEND}
+ dev-ml/findlib
+ dev-ml/ocamlbuild
+ test? ( dev-python/pyyaml[libyaml] )
+"
+# missing test data
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+ sed -e 's/INSTALLOPTS=-s/INSTALLOPTS=/' -i Makefile.config.in || die
+}
+
+src_configure() {
+ econf \
+ $(use ocamlopt || echo "--with-bytecodeonly") \
+ $(use parmap && echo "--with-parmap") \
+ $(use zip && echo "--with-zip") \
+ $(use bzip2 && echo "--with-bz2") \
+ $(use xml && echo "--with-xml") \
+ $(use curl && echo "--with-curl") \
+ $(use rpm4 && echo "--with-rpm4")
+}
+
+src_compile() {
+ emake -j1
+}
+
+src_install() {
+ emake DESTDIR="${D}" BINDIR="${ED}/usr/bin" install || die
+ dodoc CHANGES CREDITS README.architecture TODO
+}
diff --git a/dev-ml/dose3/metadata.xml b/dev-ml/dose3/metadata.xml
new file mode 100644
index 000000000000..e4749fd2b534
--- /dev/null
+++ b/dev-ml/dose3/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <use>
+ <flag name="parmap">Adds multi-core CPU support via <pkg>dev-ml/parmap</pkg>.</flag>
+ <flag name="zip">Adds support for handling zip files.</flag>
+ <flag name="rpm4">Adds support for handling rpm4 files.</flag>
+ </use>
+</pkgmetadata>
diff --git a/dev-ml/easy-format-1.0.2 b/dev-ml/easy-format-1.0.2
deleted file mode 100644
index 2dce58b17220..000000000000
--- a/dev-ml/easy-format-1.0.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=dev-lang/ocaml:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Pretty-printing library for OCaml
-EAPI=5
-HOMEPAGE=http://mjambon.com/easy-format.html
-IUSE=examples +ocamlopt
-KEYWORDS=~amd64
-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
-_md5_=efc71a1d6389ea34bfdd4d040edd7f3b
diff --git a/dev-ml/easy-format-1.2.0 b/dev-ml/easy-format-1.2.0
deleted file mode 100644
index 46421c446047..000000000000
--- a/dev-ml/easy-format-1.2.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=dev-lang/ocaml:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Pretty-printing library for OCaml
-EAPI=5
-HOMEPAGE=https://github.com/mjambon/easy-format
-IUSE=examples +ocamlopt
-KEYWORDS=~amd64
-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
-_md5_=6e7952ad6480e325dea6b9fd42f83911
diff --git a/dev-ml/easy-format/Manifest b/dev-ml/easy-format/Manifest
new file mode 100644
index 000000000000..910b2fede1cc
--- /dev/null
+++ b/dev-ml/easy-format/Manifest
@@ -0,0 +1,5 @@
+DIST easy-format-1.0.2.tar.gz 13679 BLAKE2B 5f738e521ef8eb59edbcba92f599328ab6f5e497075d8144335191835906832ecb4e4a8c6233c65f6f7aa7c4105aadd1dc1e269ad59a2c3237c54af8b3856e41 SHA512 bb12c13b33a725f4a15616672f7a268398b50e6f054575203f1d26c49aa04978564233fa9fb88eec8b701d7fecbbaeda264422e8c31a60a52d0d8e64bfc5898f
+DIST easy-format-1.2.0.tar.gz 15632 BLAKE2B 0bf20b87050330e90f3ef5cbe47470049ddc470d22357240f6b0ddd75138d3297935306c071e4355f02ed2fdd01a3155461e90a91df1346fa33180833db77b57 SHA512 375849b1ecd2e37f4b32d1ee12197a95856b17a47e3eb06a7e7320a82234c241156c3c8bfb18ce17bbe73b93d31d755675478860505470aa7ab866277a99603f
+EBUILD easy-format-1.0.2.ebuild 634 BLAKE2B d97bb030ba1a078ad8b8398de74cb20a20c566eeef1c38435487df3dfb4a64bae60db26877215d989d8192c6bc8ce14cd375e13f714aa54f54f9028e33188609 SHA512 7b317147f087ed422fd6c138ed281da1317eaf8d00be1b2e17208e451907736629f43ca72c7908112f24611878dadacc934138420355dc4d62568f7a24507e66
+EBUILD easy-format-1.2.0.ebuild 667 BLAKE2B 29a46d20176330c80d0d9bf7132bec4eec2ce7c0bf54f0eb41759336aa0737b00b7fd0ea737154f20058eb5dfb443aedfd15c38e5b1b198bbf3ce51870625f80 SHA512 f21275174e49404dcccef768d41925edf46040147a246760e12fe851444d1ec75117d83d62b499100306a96eb0ddffe37c6d3f6f9f9c8cd171790bd388540559
+MISC metadata.xml 331 BLAKE2B 7974c4e4a7994295e1b017181f909eab3dedf0ba105ef320e955873823e7ef068348157e33b5043fe82bb312eb7b2bcc1ffa60af547336544e13e272543c3f20 SHA512 9fd5bc86471c482e9a27378c05c582e49cf0a139b5d84d0ec4eafa3f85e12f02a12dee50a68649599a0239fcc54119cd89dbbe73b656722c1db712bcfd46684e
diff --git a/dev-ml/easy-format/easy-format-1.0.2.ebuild b/dev-ml/easy-format/easy-format-1.0.2.ebuild
new file mode 100644
index 000000000000..db163f33fd49
--- /dev/null
+++ b/dev-ml/easy-format/easy-format-1.0.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit findlib
+
+DESCRIPTION="Pretty-printing library for OCaml"
+HOMEPAGE="http://mjambon.com/easy-format.html"
+SRC_URI="http://mjambon.com/releases/${PN}/${P}.tar.gz"
+
+SLOT="0/${PV}"
+LICENSE="BSD"
+KEYWORDS="~amd64"
+
+IUSE="examples +ocamlopt"
+
+RDEPEND="dev-lang/ocaml:=[ocamlopt?]"
+DEPEND="${RDEPEND}"
+
+src_compile() {
+ emake all
+ use ocamlopt && emake opt
+}
+
+src_install() {
+ findlib_src_install
+ dodoc README.md Changes
+ if use examples ; then
+ dodoc -r examples
+ docompress -x /usr/share/doc/${PF}/examples
+ fi
+}
diff --git a/dev-ml/easy-format/easy-format-1.2.0.ebuild b/dev-ml/easy-format/easy-format-1.2.0.ebuild
new file mode 100644
index 000000000000..669c69092068
--- /dev/null
+++ b/dev-ml/easy-format/easy-format-1.2.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit findlib
+
+DESCRIPTION="Pretty-printing library for OCaml"
+HOMEPAGE="https://github.com/mjambon/easy-format"
+SRC_URI="https://github.com/mjambon/easy-format/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0/${PV}"
+LICENSE="BSD"
+KEYWORDS="~amd64"
+
+IUSE="examples +ocamlopt"
+
+RDEPEND="dev-lang/ocaml:=[ocamlopt?]"
+DEPEND="${RDEPEND}"
+
+src_compile() {
+ emake all
+ use ocamlopt && emake opt
+}
+
+src_install() {
+ findlib_src_install
+ dodoc README.md Changes
+ if use examples ; then
+ dodoc -r examples
+ docompress -x /usr/share/doc/${PF}/examples
+ fi
+}
diff --git a/dev-ml/easy-format/metadata.xml b/dev-ml/easy-format/metadata.xml
new file mode 100644
index 000000000000..baf19ddebea0
--- /dev/null
+++ b/dev-ml/easy-format/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">mjambon/easy-format</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/eliom-6.2.0 b/dev-ml/eliom-6.2.0
deleted file mode 100644
index 5950a8173d58..000000000000
--- a/dev-ml/eliom-6.2.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=>=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:= ) dev-ml/ocamlbuild dev-ml/opam >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=A web framework to program client/server applications
-EAPI=5
-HOMEPAGE=http://ocsigen.org/eliom/
-IUSE=doc +ocamlopt +ppx
-KEYWORDS=~amd64
-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 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d832036c26a5349ca021f487b5f02256
diff --git a/dev-ml/eliom-9999 b/dev-ml/eliom-9999
deleted file mode 100644
index ae74e63123d2..000000000000
--- a/dev-ml/eliom-9999
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=>=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:= ) dev-ml/ocamlbuild dev-ml/opam >=dev-ml/findlib-1.0.4-r1 >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=A web framework to program client/server applications
-EAPI=5
-HOMEPAGE=http://ocsigen.org/eliom/
-IUSE=doc +ocamlopt +ppx
-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/9999
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 git-r3 8f6de46b0aa318aea0e8cac62ece098b ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e284de7fc5cd8d76d9d87d46bd334bba
diff --git a/dev-ml/eliom/Manifest b/dev-ml/eliom/Manifest
new file mode 100644
index 000000000000..1ab33d849e1e
--- /dev/null
+++ b/dev-ml/eliom/Manifest
@@ -0,0 +1,5 @@
+AUX lwt3.patch 1654 BLAKE2B 12f4072a740da3fa29070005634197ce2b442dab48ccb1f78e7b48076d5b9363fe0d669afe4578eab7fc684461cfa0539436f1a6710d924fd712330a777921cd SHA512 14b521b8622c07d472211af1e50b4a880ffa28ac18c3fb04d459a3302f22346ae31e1c76f9ace728d2ba6383c7222a3a1dcb7896552e5bdf3251b2db1878217b
+DIST eliom-6.2.0.tar.gz 724359 BLAKE2B f52805c83f71eb76e3a183637d9800690714dbe07cbe82ad1bac09ea02ac286cbae541b22dea73592bd8cfa095700264c2a8903ead5fae498e847c4f6bdc8d47 SHA512 02ea52c78470f222297dd9f82218e82427ea2d2d0c9f261d1a9c2decbe7644c0bf583b77b8cef2577d5662d363efd276755f400e7a4c29c89a2265e49ca850db
+EBUILD eliom-6.2.0.ebuild 1560 BLAKE2B a2465f81aead3b6f26a3e9eeb30f8f1f288d2d5fca2e0a2be18df606f19124d530b9f06844e0e152b44e8e89c3838ab17eace30bb4d7f555bb50556b81abb1ce SHA512 1c379215726329124bbaba467566ae228e6567fd615e313c8356e3501153cd9ed1c32674772eadf0f91220b674ea1002c77bdc47720847eeef83c46ae79428e9
+EBUILD eliom-9999.ebuild 1508 BLAKE2B 5efc3090fcb70bded4d7b703fa8b1e0a4b3229c2d30ae344d75c8d4614d7438f090d198be1adb7fc9a85571806c153237f36be72f884fb8a446cad2aa7793107 SHA512 dc07ae8e778ee456d0f89c7fd50bcf0a0ae8b1d692db7bd87c7568e4bc647b59bae38aa4019bdca53a0e107883c2c9d7b9e5e5876d7a187775d03f4fa8b68028
+MISC metadata.xml 403 BLAKE2B 4de6194854dc1b806bdf3aec3e4353dd1b8776c20fa423f4db50cce981b0859bc68db75df71cff4d505c0f78531ea42c7f28f4097b7aeaae6d11b89e172e5ecd SHA512 3fc7557229857dbfdd5d0e98fd43c35f81c4faa8099b1c4e31c1e347e3b6657457681b0bc143d6526ab25bfc7bcb26e731f8e8390c9749da3dad0c9ae1876002
diff --git a/dev-ml/eliom/eliom-6.2.0.ebuild b/dev-ml/eliom/eliom-6.2.0.ebuild
new file mode 100644
index 000000000000..b97e4135966f
--- /dev/null
+++ b/dev-ml/eliom/eliom-6.2.0.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils multilib findlib
+
+DESCRIPTION="A web framework to program client/server applications"
+HOMEPAGE="http://ocsigen.org/eliom/"
+
+if [ "${PV#9999}" != "${PV}" ] ; then
+ inherit git-r3
+ SRC_URI=""
+ EGIT_REPO_URI="https://github.com/ocsigen/eliom"
+ KEYWORDS=""
+else
+ SRC_URI="https://github.com/ocsigen/eliom/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64"
+fi
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+IUSE="doc +ocamlopt +ppx"
+
+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:= )"
+DEPEND="${RDEPEND}
+ dev-ml/ocamlbuild
+ dev-ml/opam"
+
+src_prepare() {
+ epatch "${FILESDIR}/lwt3.patch"
+}
+
+src_compile() {
+ if use ocamlopt ; then
+ emake PPX=$(usex ppx true false) all
+ else
+ emake PPX=$(usex ppx true false) byte
+ fi
+ use doc && emake doc
+ emake man
+}
+
+src_install() {
+ opam-installer \
+ --prefix="${ED}/usr" \
+ --libdir="${D}/$(ocamlc -where)" \
+ --docdir="${ED}/usr/share/doc/${PF}" \
+ --mandir="${ED}/usr/share/man" \
+ || die
+ dodoc CHANGES README.md
+ if use doc ; then
+ docinto client/html
+ dodoc -r _build/src/lib/client/api.docdir/*
+ docinto server/html
+ dodoc -r _build/src/lib/server/api.docdir/*
+ fi
+}
diff --git a/dev-ml/eliom/eliom-9999.ebuild b/dev-ml/eliom/eliom-9999.ebuild
new file mode 100644
index 000000000000..cffa1b2c77a6
--- /dev/null
+++ b/dev-ml/eliom/eliom-9999.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils multilib findlib
+
+DESCRIPTION="A web framework to program client/server applications"
+HOMEPAGE="http://ocsigen.org/eliom/"
+
+if [ "${PV#9999}" != "${PV}" ] ; then
+ inherit git-r3
+ SRC_URI=""
+ EGIT_REPO_URI="https://github.com/ocsigen/eliom"
+ KEYWORDS=""
+else
+ SRC_URI="https://github.com/ocsigen/eliom/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64"
+fi
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+IUSE="doc +ocamlopt +ppx"
+
+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:= )"
+DEPEND="${RDEPEND}
+ dev-ml/ocamlbuild
+ dev-ml/opam"
+
+src_compile() {
+ if use ocamlopt ; then
+ emake PPX=$(usex ppx true false) all
+ else
+ emake PPX=$(usex ppx true false) byte
+ fi
+ use doc && emake doc
+ emake man
+}
+
+src_install() {
+ opam-installer \
+ --prefix="${ED}/usr" \
+ --libdir="${D}/$(ocamlc -where)" \
+ --docdir="${ED}/usr/share/doc/${PF}" \
+ --mandir="${ED}/usr/share/man" \
+ || die
+ dodoc CHANGES README.md
+ if use doc ; then
+ docinto client/html
+ dodoc -r _build/src/lib/client/api.docdir/*
+ docinto server/html
+ dodoc -r _build/src/lib/server/api.docdir/*
+ fi
+}
diff --git a/dev-ml/eliom/files/lwt3.patch b/dev-ml/eliom/files/lwt3.patch
new file mode 100644
index 000000000000..6b8d993fb687
--- /dev/null
+++ b/dev-ml/eliom/files/lwt3.patch
@@ -0,0 +1,44 @@
+Index: eliom-6.2.0/pkg/META
+===================================================================
+--- eliom-6.2.0.orig/pkg/META
++++ eliom-6.2.0/pkg/META
+@@ -13,7 +13,7 @@ package "server" (
+ react,
+ reactiveData,
+ tyxml,
+- lwt.react,
++ lwt_react,
+ cryptokit,
+ reactiveData"
+ archive(byte) = "server.cma"
+@@ -49,7 +49,7 @@ package "client" (
+ js_of_ocaml.tyxml,
+ js_of_ocaml.log,
+ js_of_ocaml.weak,
+- lwt.react,
++ lwt_react,
+ react,
+ reactiveData,
+ tyxml.functor"
+Index: eliom-6.2.0/src/_tags
+===================================================================
+--- eliom-6.2.0.orig/src/_tags
++++ eliom-6.2.0/src/_tags
+@@ -11,7 +11,7 @@ true:keep_locs
+
+ <lib/server/*.ml{,i}>:thread
+ <lib/server/*.ml{,i}>:package(lwt,ocsigenserver,ocsigenserver.ext,tyxml.functor)
+-<lib/server/*.ml{,i}>:package(react,js_of_ocaml)
++<lib/server/*.ml{,i}>:package(lwt_react,react,js_of_ocaml)
+
+ <lib/server/*.ml{,i}>:package(js_of_ocaml.deriving.ppx)
+
+@@ -24,7 +24,7 @@ true:keep_locs
+ <lib/client/*.ml{,i}>: eliom_ppx
+ <lib/client/*.ml{,i}>:package(ocsigenserver.cookies,ocsigenserver.polytables,ocsigenserver.baselib.base)
+ <lib/client/*.ml{,i}>:package(deriving.runtime,js_of_ocaml.deriving)
+-<lib/client/*.ml{,i}>:package(lwt.react,tyxml.functor,js_of_ocaml.tyxml)
++<lib/client/*.ml{,i}>:package(lwt_react,tyxml.functor,js_of_ocaml.tyxml)
+ <lib/client/*.ml{,i}>:package(react,js_of_ocaml,reactiveData)
+
+ <lib/client/*.ml{,i}>:package(js_of_ocaml.deriving.ppx)
diff --git a/dev-ml/eliom/metadata.xml b/dev-ml/eliom/metadata.xml
new file mode 100644
index 000000000000..8cff44a8f0c9
--- /dev/null
+++ b/dev-ml/eliom/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">ocsigen/eliom</remote-id>
+ </upstream>
+ <use>
+ <flag name="ppx">Enable PPX syntax extension support.</flag>
+ </use>
+</pkgmetadata>
diff --git a/dev-ml/enumerate-111.08.00-r1 b/dev-ml/enumerate-111.08.00-r1
deleted file mode 100644
index 51553ec67bc4..000000000000
--- a/dev-ml/enumerate-111.08.00-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-ml/type-conv-111.13:= dev-ml/camlp4:= >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=Syntax extension to produce a list of all values of a type
-EAPI=5
-HOMEPAGE=http://www.janestreet.com/ocaml
-IUSE=+ocamlopt debug
-KEYWORDS=~amd64
-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 983774947da124fb7d542ce25a218bb1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e oasis 9256ed89af74c3365ec888c00bfdfe43 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d25559d71792177b9a76ea824e9a072c
diff --git a/dev-ml/enumerate/Manifest b/dev-ml/enumerate/Manifest
new file mode 100644
index 000000000000..e65700cd2b9f
--- /dev/null
+++ b/dev-ml/enumerate/Manifest
@@ -0,0 +1,3 @@
+DIST enumerate-111.08.00.tar.gz 52498 BLAKE2B 74a29099613fb83950d11d3e40298390f2c1675306b5cafea36560bb557088829c6165dfe6995a4221fa87c7aba8ec28f88d481e5e3199ae4299e67183faf6c9 SHA512 fdedc584923552e898e0932c75b9a9c48c7c90291239cf6b5b26860b0714f2f3582f1d00acc247fb28ecb8c6e26867fc1e56c7df18fefd70eb2910ef1dfdcc3c
+EBUILD enumerate-111.08.00-r1.ebuild 598 BLAKE2B 54da669a18bca436374f65bb3a421ede2306eb3b2708864d38e3aa1edd7c397feaff951802acd79ffab7bb125c4dab555b9c634eb985d07cd5283fec2b597cb1 SHA512 80d3ecdd743ca1c808d20b1f520b4ac526e89887b251aec25a1d7908539579f2cc610239a57c6cb530774b9f0a21e516fcf21d65787b07a8944c5493e7d045a3
+MISC metadata.xml 243 BLAKE2B 010ca240ae06e9a9f6d7ba213eb06df36d9ba862ff2d2458d98a9fea1a1e7f3026d13832a73bce1b3ad9345029425e6abfae9e03bf126f2329b3f030ed3753fd SHA512 1c5b4b2163017e496999d1f87e5c9c5ac6c11b2e9187450ccfb3df258f34e54d278972f04ee0e8429476c6f87e091a869ac2a28c6e8c8e6d20678c3e74061449
diff --git a/dev-ml/enumerate/enumerate-111.08.00-r1.ebuild b/dev-ml/enumerate/enumerate-111.08.00-r1.ebuild
new file mode 100644
index 000000000000..1ede1a690435
--- /dev/null
+++ b/dev-ml/enumerate/enumerate-111.08.00-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit oasis
+
+MY_P=${PN/-/_}-${PV}
+DESCRIPTION="Syntax extension to produce a list of all values of a type"
+HOMEPAGE="http://www.janestreet.com/ocaml"
+SRC_URI="http://ocaml.janestreet.com/ocaml-core/${PV%.*}.00/individual/${MY_P}.tar.gz
+ https://dev.gentoo.org/~aballier/distfiles/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+ >=dev-ml/type-conv-111.13:=
+ dev-ml/camlp4:="
+
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+DOCS=( README.md )
diff --git a/dev-ml/enumerate/metadata.xml b/dev-ml/enumerate/metadata.xml
new file mode 100644
index 000000000000..ffac4d7ebc01
--- /dev/null
+++ b/dev-ml/enumerate/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-ml/extlib-1.7.1 b/dev-ml/extlib-1.7.1
deleted file mode 100644
index 8acde82c02cc..000000000000
--- a/dev-ml/extlib-1.7.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=>=dev-lang/ocaml-3.10.2:=[ocamlopt?] dev-ml/cppo:= >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Standard library extensions for O'Caml
-EAPI=5
-HOMEPAGE=https://github.com/ygrek/ocaml-extlib
-IUSE=doc +ocamlopt
-KEYWORDS=amd64 ~arm ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
-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 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e7c9875ee0c6eed8e8398f02f7cc0a9d
diff --git a/dev-ml/extlib-1.7.2 b/dev-ml/extlib-1.7.2
deleted file mode 100644
index 82ccd437c7f1..000000000000
--- a/dev-ml/extlib-1.7.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=>=dev-lang/ocaml-3.10.2:=[ocamlopt?] dev-ml/cppo:= >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Standard library extensions for O'Caml
-EAPI=5
-HOMEPAGE=https://github.com/ygrek/ocaml-extlib
-IUSE=doc +ocamlopt
-KEYWORDS=~amd64 ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
-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 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4fadf18a6216fc35043292e9cb4cafa5
diff --git a/dev-ml/extlib/Manifest b/dev-ml/extlib/Manifest
new file mode 100644
index 000000000000..cbc97d4796a1
--- /dev/null
+++ b/dev-ml/extlib/Manifest
@@ -0,0 +1,6 @@
+AUX ocaml405.patch 1539 BLAKE2B d61c8398986a66664810684870351856ca94318a82d07194908c570aefc9b2b3196b95f651717b058e95b853e1862c3a27218afa71a809f766b908cde3e9cece SHA512 664c9b840b77d08095e03dbd398f6af3118237fbffe73499bc2b0ee0dc8e40311337e65f3e0e95b2f87dddb9e75b18d27d2b712b314f725d97fd537f2ca23e52
+DIST extlib-1.7.1.tar.gz 85397 BLAKE2B f2e924f651cc43ca29914c95400a26bfd062ecb4e7379d169533d394497215906b56e8f57ba29358965f0b8c125c33dcb9a0a95c09488404fd348261d075457f SHA512 42ea1be22a57ab31e5857df0c4c0f98a07e1b5958b34181cd5ab7c83ded112c208315d22cd3dd178d53e75ca109a70cb47ae479e95be8c47ea2087b1a158dc4d
+DIST extlib-1.7.2.tar.gz 85934 BLAKE2B fab7f5f99be414a83f46144bc8f2f54aeb545ef9041b62f227f9dafd267a3f8608b94388ffc39903b069ec7d481b4da8a6a2e9aa289c68263613cf64aa6a45e0 SHA512 d9f34f5bbd5e94a8dccc5bdbc1ec0e5015608675469c4f513461fa587a5eb7e1398542388fd885d7656591ca85ce30c0e2a9ee26b9722a9dd65189aac35d64ed
+EBUILD extlib-1.7.1.ebuild 891 BLAKE2B d6f027a141b65333b975fe0b07a2f91d93568f888e8d9d3c7017c372abf716458ba85e48be93b270a000579ac2413f10ed56be9b8a72b7a346d05f69f8118f05 SHA512 b349d8d19e5f8a4ea4370ea9301f44e292a28dcbe8426e3d068042e22c5d643c161c5b4131ce1ed66de155a681c9c99068dccbb569d710e8c0ffb1ef36ce0cba
+EBUILD extlib-1.7.2.ebuild 840 BLAKE2B 86d4c868a5a7a24a47849746b70ea15f21a8d69fb9b7ec82ae87217ccac760a04de02317132729ee0bdaa9ed8ad42ef0a11a1bb735afb82ae76cad11cc21c7b4 SHA512 c50cf98e44d44fe48f0c67ed398811cca2cbc0b2d94edf474c2d7d5bed5918263cb562df305b8aa31d501dc6e97417bc7acd4231e31bcefb7463b09161617211
+MISC metadata.xml 387 BLAKE2B f69d20e297ba1bf4de102818f365e5a4a6b51373aeefbf891d1449edd959562a9575f3764f01dc70d5f4fb1f50f3bf04b389d32dfd1bbf0e88142077f15ef39e SHA512 b2805065022f5449f11da6db984ad7ea09260a600e0ac44228944f70fbede3de0cd3637c4fef6f0d33c16cd974fbd43c90b7a0fd7177a8ad9667d7a3464d1484
diff --git a/dev-ml/extlib/extlib-1.7.1.ebuild b/dev-ml/extlib/extlib-1.7.1.ebuild
new file mode 100644
index 000000000000..33dffa043aaf
--- /dev/null
+++ b/dev-ml/extlib/extlib-1.7.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit findlib eutils
+
+DESCRIPTION="Standard library extensions for O'Caml"
+HOMEPAGE="https://github.com/ygrek/ocaml-extlib"
+SRC_URI="https://github.com/ygrek/ocaml-extlib/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="LGPL-2.1"
+DEPEND="
+ >=dev-lang/ocaml-3.10.2:=[ocamlopt?]
+ dev-ml/cppo:=
+"
+RDEPEND="${DEPEND}"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="doc +ocamlopt"
+S="${WORKDIR}/ocaml-${P}"
+
+src_prepare() {
+ epatch "${FILESDIR}/ocaml405.patch"
+}
+
+src_compile() {
+ cd src
+ emake -j1 all
+ if use ocamlopt; then
+ emake opt cmxs
+ fi
+
+ if use doc; then
+ emake doc
+ fi
+}
+
+src_test() {
+ emake -j1 test
+}
+
+src_install () {
+ findlib_src_install
+
+ # install documentation
+ dodoc README.md
+
+ if use doc; then
+ dohtml src/doc/*
+ fi
+}
diff --git a/dev-ml/extlib/extlib-1.7.2.ebuild b/dev-ml/extlib/extlib-1.7.2.ebuild
new file mode 100644
index 000000000000..4f53ed7d6c4a
--- /dev/null
+++ b/dev-ml/extlib/extlib-1.7.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit findlib eutils
+
+DESCRIPTION="Standard library extensions for O'Caml"
+HOMEPAGE="https://github.com/ygrek/ocaml-extlib"
+SRC_URI="https://github.com/ygrek/ocaml-extlib/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="LGPL-2.1"
+DEPEND="
+ >=dev-lang/ocaml-3.10.2:=[ocamlopt?]
+ dev-ml/cppo:=
+"
+RDEPEND="${DEPEND}"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="doc +ocamlopt"
+S="${WORKDIR}/ocaml-${P}"
+
+src_compile() {
+ cd src
+ emake -j1 all
+ if use ocamlopt; then
+ emake opt cmxs
+ fi
+
+ if use doc; then
+ emake doc
+ fi
+}
+
+src_test() {
+ emake -j1 test
+}
+
+src_install () {
+ findlib_src_install
+
+ # install documentation
+ dodoc README.md
+
+ if use doc; then
+ dohtml src/doc/*
+ fi
+}
diff --git a/dev-ml/extlib/files/ocaml405.patch b/dev-ml/extlib/files/ocaml405.patch
new file mode 100644
index 000000000000..4e3b04a1c8e5
--- /dev/null
+++ b/dev-ml/extlib/files/ocaml405.patch
@@ -0,0 +1,35 @@
+Index: ocaml-extlib-1.7.1/src/configure.ml
+===================================================================
+--- ocaml-extlib-1.7.1.orig/src/configure.ml
++++ ocaml-extlib-1.7.1/src/configure.ml
+@@ -3,5 +3,6 @@ let () =
+ print_endline (if Sys.ocaml_version >= "4.02.0" then "-D OCAML4_02 " else "");
+ print_endline (if Sys.ocaml_version >= "4.03.0" then "-D OCAML4_03 " else "");
+ print_endline (if Sys.ocaml_version >= "4.04.0" then "-D OCAML4_04 " else "");
++ print_endline (if Sys.ocaml_version >= "4.05.0" then "-D OCAML4_05 " else "");
+ let (_:int) = Sys.command "ocamlfind query -format \"-D WITH_BYTES\" bytes" in ();
+ exit 0
+Index: ocaml-extlib-1.7.1/src/extHashtbl.mli
+===================================================================
+--- ocaml-extlib-1.7.1.orig/src/extHashtbl.mli
++++ ocaml-extlib-1.7.1/src/extHashtbl.mli
+@@ -132,6 +132,9 @@ module type S =
+ val add : 'a t -> key -> 'a -> unit
+ val remove : 'a t -> key -> unit
+ val find : 'a t -> key -> 'a
++#ifdef OCAML4_05
++ val find_opt: 'a t -> key -> 'a option
++#endif
+ val find_all : 'a t -> key -> 'a list
+ val replace : 'a t -> key -> 'a -> unit
+ val mem : 'a t -> key -> bool
+@@ -167,6 +170,9 @@ module type SeededS =
+ val add : 'a t -> key -> 'a -> unit
+ val remove : 'a t -> key -> unit
+ val find : 'a t -> key -> 'a
++#ifdef OCAML4_05
++ val find_opt : 'a t -> key -> 'a option
++#endif
+ val find_all : 'a t -> key -> 'a list
+ val replace : 'a t -> key -> 'a -> unit
+ val mem : 'a t -> key -> bool
diff --git a/dev-ml/extlib/metadata.xml b/dev-ml/extlib/metadata.xml
new file mode 100644
index 000000000000..69a0f75ce938
--- /dev/null
+++ b/dev-ml/extlib/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="google-code">ocaml-extlib</remote-id>
+ <remote-id type="github">ygrek/ocaml-extlib</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/facile-1.1.3 b/dev-ml/facile-1.1.3
deleted file mode 100644
index 16c2483087b0..000000000000
--- a/dev-ml/facile-1.1.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare test
-DEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] sys-apps/sed
-DESCRIPTION=OCaml constraint programming library on integer & integer set finite domains
-EAPI=6
-HOMEPAGE=http://opti.recherche.enac.fr/
-IUSE=+ocamlopt
-KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?]
-SLOT=0/1.1.3
-SRC_URI=http://opti.recherche.enac.fr/facile/distrib/facile-1.1.3.tar.gz
-_md5_=2ac441dd726c21ad3c6cc3fd047f7b2d
diff --git a/dev-ml/facile/Manifest b/dev-ml/facile/Manifest
new file mode 100644
index 000000000000..f22e425c6381
--- /dev/null
+++ b/dev-ml/facile/Manifest
@@ -0,0 +1,4 @@
+AUX facile-1.1-make.patch 1613 BLAKE2B e469aa4820358b9d197251c6b3c6150c0aeaca8362d104441fc35e975e401776e1d23804a160cd6b37c545c769c0c856ff871d0428bbde47828fc9cc79125d20 SHA512 024132dfacce666c1f52f331fe5ec9f927dbabc1742b44aa11be7ae8851c25943afea5f2f99b3e544127b5c49af7d7337d4b59c60165a777990402855100ebc0
+DIST facile-1.1.3.tar.gz 99656 BLAKE2B 19d81c48c39b96083628cc40eb9aca7e8ad7dea4ae81c884bfb22daa56135ac411698d57b68f3112829a1fc53d29612627809901c6e30eb4672776508eee57b2 SHA512 78d315188e661245eb7306b645e9baaca94db0b9511112b57dbc8597bf2f75cab5604c8f4cf850209464e802c636f592552c8b492730cb28896d2acd7f413346
+EBUILD facile-1.1.3.ebuild 1382 BLAKE2B 57bc5e307ef4d3f1e2739a4b424bb5219305652b723a437af6223af852059f1555497b05219b971376578578e85dab3ca55e9bed89eceef7eab83105a325f71c SHA512 c6c7efef6229133f5dd486f15db813ba449fad79fabfc0a51f0c9bb913ba58e6efedfb1fe8933545086605bc5b5477c82e4c2af46db60a90e877d52da6a2893a
+MISC metadata.xml 357 BLAKE2B d06a43a03a328a01985ccb6d8f3c374215a678da2c7019fae195f49d86a55245cbd3fdd4b43641b0b1b92000a9546600451985421551bc1e10239cc4716c9d57 SHA512 8491e3bed96f117fe721e3e6d261d75480e0b183c06ec21d606ccf659263dc8c2642b1fd30f89aec63a2e70a725f71985119117c1c11fa3fe8b49b7c31db969c
diff --git a/dev-ml/facile/facile-1.1.3.ebuild b/dev-ml/facile/facile-1.1.3.ebuild
new file mode 100644
index 000000000000..3027374ee74d
--- /dev/null
+++ b/dev-ml/facile/facile-1.1.3.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="OCaml constraint programming library on integer & integer set finite domains"
+HOMEPAGE="http://opti.recherche.enac.fr/"
+SRC_URI="http://opti.recherche.enac.fr/facile/distrib/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd"
+IUSE="+ocamlopt"
+
+RDEPEND=">=dev-lang/ocaml-4:=[ocamlopt?]"
+DEPEND="${RDEPEND}
+ sys-apps/sed
+"
+
+DOCS=( README )
+
+PATCHES=( "${FILESDIR}/${PN}"-1.1-make.patch ) # Fix building on FreeBSD
+
+src_prepare() {
+ default
+
+ # Disable building native code objects if we dont have/want ocamlopt
+ if ! use ocamlopt; then
+ sed -i -e 's/\.opt//' src/Makefile || die "failed to change native code compiler to bytecode ones"
+ sed -i -e 's/ facile\.cmxa//' src/Makefile || die "failed to remove native code objects"
+ sed -i -e 's/\.opt/.out/g' \
+ -e 's: src/facile\.cmxa::'\
+ -e 's: src/facile\.a::'\
+ -e 's:^.*facile\.cmxa::'\
+ -e 's:^.*facile\.a::' Makefile || die "failed to remove native code objects"
+ fi
+}
+
+src_configure(){
+ # This is a custom configure script and it does not support standard options
+ ./configure --faciledir "${D}"$(ocamlc -where)/facile/ || die
+}
+
+src_test() {
+ emake check
+}
+
+src_install(){
+ dodir $(ocamlc -where)
+ emake install
+ einstalldocs
+}
diff --git a/dev-ml/facile/files/facile-1.1-make.patch b/dev-ml/facile/files/facile-1.1-make.patch
new file mode 100644
index 000000000000..7b77639d2277
--- /dev/null
+++ b/dev-ml/facile/files/facile-1.1-make.patch
@@ -0,0 +1,48 @@
+diff -ur a/Makefile b/Makefile
+--- a/Makefile 2004-09-08 10:51:02 +0100
++++ b/Makefile 2007-10-23 13:11:28 +0100
+@@ -3,7 +3,7 @@
+ include config_Makefile
+
+ compile:
+- cd src; make
++ cd src; $(MAKE)
+
+ install:
+ if test -d $(FACILEDIR); then : ; else mkdir $(FACILEDIR); fi
+@@ -14,10 +14,10 @@
+ chmod a+r $(FACILEDIR)/facile.a
+
+ clean:
+- cd src; make clean
++ cd src; $(MAKE) clean
+
+ distclean uninstall:
+ rm -fr $(FACILEDIR)
+
+ check:
+- cd examples; make FACILEDIR=../src queens.opt; ./queens.opt 8
++ cd examples; $(MAKE) FACILEDIR=../src queens.opt; ./queens.opt 8
+diff -ur a/src/Makefile b/src/Makefile
+--- a/src/Makefile 2004-09-08 10:51:02 +0100
++++ b/src/Makefile 2007-10-23 13:10:34 +0100
+@@ -28,7 +28,7 @@
+ # Version of the library to be linked with the -p (profiler) option
+ facile.p.cmxa : $(CSTR)
+ rm -fr $(CSTRCMX)
+- make facile.cmxa OPTOPT=-p
++ $(MAKE) facile.cmxa OPTOPT=-p
+ rm -fr $(CSTRCMX)
+ mv facile.cmxa $@
+ mv facile.a facile.p.a
+@@ -41,8 +41,8 @@
+ # Does not work with many modules (e.g. containing class expressions
+ facile.exp.cmxa : $(CSTR)
+ rm -fr $(CSTRCMX)
+- make fcl_stak.cmx fcl_cstr.cmx fcl_inv.cmx fcl_reify.cmx fcl_arith.cmx fcl_goals.cmx fcl_fdArray.cmx fcl_gcc.cmx fcl_alldiff.cmx fcl_sorting.cmx fcl_interval.cmx facile.cmx
+- make facile.cmxa OPTOPT="-pp inline_functors"
++ $(MAKE) fcl_stak.cmx fcl_cstr.cmx fcl_inv.cmx fcl_reify.cmx fcl_arith.cmx fcl_goals.cmx fcl_fdArray.cmx fcl_gcc.cmx fcl_alldiff.cmx fcl_sorting.cmx fcl_interval.cmx facile.cmx
++ $(MAKE) facile.cmxa OPTOPT="-pp inline_functors"
+ rm -fr $(CSTRCMX)
+ mv facile.cmxa $@
+ mv facile.a facile.exp.a
diff --git a/dev-ml/facile/metadata.xml b/dev-ml/facile/metadata.xml
new file mode 100644
index 000000000000..41bad2f652fd
--- /dev/null
+++ b/dev-ml/facile/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/dev-ml/fieldslib-0.9.0 b/dev-ml/fieldslib-0.9.0
deleted file mode 100644
index dc46753ca4d5..000000000000
--- a/dev-ml/fieldslib-0.9.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-lang/ocaml:= dev-ml/base:= dev-ml/ppx_driver:= dev-ml/ocaml-migrate-parsetree:= dev-ml/opam dev-ml/jbuilder
-DESCRIPTION=Folding over record fields
-EAPI=6
-HOMEPAGE=https://github.com/janestreet/fieldslib
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-lang/ocaml:= dev-ml/base:= dev-ml/ppx_driver:= dev-ml/ocaml-migrate-parsetree:=
-SLOT=0/0.9.0
-SRC_URI=https://github.com/janestreet/fieldslib/archive/v0.9.0.tar.gz -> fieldslib-0.9.0.tar.gz
-_md5_=7fc12f245029bde75fedbae3f1d28111
diff --git a/dev-ml/fieldslib/Manifest b/dev-ml/fieldslib/Manifest
new file mode 100644
index 000000000000..b28744f42b5e
--- /dev/null
+++ b/dev-ml/fieldslib/Manifest
@@ -0,0 +1,3 @@
+DIST fieldslib-0.9.0.tar.gz 5981 BLAKE2B 471e468bf731dfe2f8a237ba35df22dc3cfb5ee2e02c881dc0a82be577844a40607adbf807b9aadf3a120708687048e6219635b81216c92edc41c874118c8b63 SHA512 ac0ecbbb43f1d815462264ef5dd33b568aa8b479847789f0ac7eb5da5986849da6ca1c27db1c0643e64e83c625e98eb7abebb5e3045a95c4b7bf7384ea953720
+EBUILD fieldslib-0.9.0.ebuild 669 BLAKE2B 7a90dc54279ebd1065bb98b777104bdf2e3b870401ed7e8e9c711f7a1b6ee397f9ffc07f3fafe2544a0d01ea45f5bef64473a6004168387e27741c98a796f707 SHA512 d5a185bd4ca81a455e6926b8cdce4566e36b4b1ba17229e5672e9b135ce491b854cfa15dc22a8cfa7410e019d986ffa4d7821fe691c8f4a2194071093101fac3
+MISC metadata.xml 656 BLAKE2B a8b7137ffc79ff20a016d6fc51ee996b89d66396f33eacd649f6f6396d7e1ce6ae386eb9e5a468cbefbbfc325059e2ed1166be13d75a449afe2c8a9e3ad6dca2 SHA512 4c08857cecb56a2531f14f0646aeb0ed7c57666aa33e567e106f4bc3feeed9a600f89a1c06c2088c25f579fb3c2da8ac15b3eff6db206d57cedf7c49c16528c5
diff --git a/dev-ml/fieldslib/fieldslib-0.9.0.ebuild b/dev-ml/fieldslib/fieldslib-0.9.0.ebuild
new file mode 100644
index 000000000000..9f1092e48f00
--- /dev/null
+++ b/dev-ml/fieldslib/fieldslib-0.9.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Folding over record fields"
+HOMEPAGE="https://github.com/janestreet/fieldslib"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+ dev-lang/ocaml:=
+ dev-ml/base:=
+ dev-ml/ppx_driver:=
+ dev-ml/ocaml-migrate-parsetree:=
+"
+DEPEND="${RDEPEND} dev-ml/opam dev-ml/jbuilder"
+
+src_install() {
+ opam-installer -i \
+ --prefix="${ED}/usr" \
+ --libdir="${D}/$(ocamlc -where)" \
+ --docdir="${ED}/usr/share/doc/${PF}" \
+ ${PN}.install || die
+}
diff --git a/dev-ml/fieldslib/metadata.xml b/dev-ml/fieldslib/metadata.xml
new file mode 100644
index 000000000000..1ae462b1d075
--- /dev/null
+++ b/dev-ml/fieldslib/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <longdescription lang="en">
+ This library defines a syntax extension for OCaml using Camlp4 that
+ can be used to define first class values representing record fields,
+ and additional routines, to get and set record fields, iterate and fold
+ over all fields of a record and create new record values.
+ </longdescription>
+ <upstream>
+ <remote-id type="github">janestreet/fieldslib</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/findlib-1.7.1 b/dev-ml/findlib-1.7.1
deleted file mode 100644
index e5980e3ff68c..000000000000
--- a/dev-ml/findlib-1.7.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=>=dev-lang/ocaml-4.02.3-r1:=[ocamlopt?] tk? ( dev-ml/labltk:= )
-DESCRIPTION=OCaml tool to find/use non-standard packages
-EAPI=5
-HOMEPAGE=http://projects.camlcity.org/projects/findlib.html
-IUSE=doc +ocamlopt tk
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
-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 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=804705332225eb0004f32b058df57e60
diff --git a/dev-ml/findlib-1.7.2 b/dev-ml/findlib-1.7.2
deleted file mode 100644
index 5519cd5733bd..000000000000
--- a/dev-ml/findlib-1.7.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=>=dev-lang/ocaml-4.02.3-r1:=[ocamlopt?] tk? ( dev-ml/labltk:= )
-DESCRIPTION=OCaml tool to find/use non-standard packages
-EAPI=5
-HOMEPAGE=http://projects.camlcity.org/projects/findlib.html
-IUSE=doc +ocamlopt tk
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
-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 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5c06c4007dcd193c380bda573d435c75
diff --git a/dev-ml/findlib-1.7.3 b/dev-ml/findlib-1.7.3
deleted file mode 100644
index 7837e1c64b78..000000000000
--- a/dev-ml/findlib-1.7.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=>=dev-lang/ocaml-4.02.3-r1:=[ocamlopt?] tk? ( dev-ml/labltk:= )
-DESCRIPTION=OCaml tool to find/use non-standard packages
-EAPI=5
-HOMEPAGE=http://projects.camlcity.org/projects/findlib.html
-IUSE=doc +ocamlopt tk
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
-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 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f3ce9557707738b51506a299ac611e0e
diff --git a/dev-ml/findlib/Manifest b/dev-ml/findlib/Manifest
new file mode 100644
index 000000000000..b72a25c2af39
--- /dev/null
+++ b/dev-ml/findlib/Manifest
@@ -0,0 +1,10 @@
+AUX externalmeta4.patch 675 BLAKE2B 14c3b5c3a2cd0b0224849cce401752c32658a5d0426c36adb65cbf324ff10a96ce007975e2cba777e70e42b3d1c4bebdf3d2874f25bb8a7b1e67bf18c814bc4d SHA512 3aee50761934b6d6a418e6ed33f4ab3fba21df12379b41d86c3f8702fe467cbfe90b5bf25dafeee6c660eb7b4228c9a0dfb7296125a96cae2acfbf8786e4fb80
+AUX externalmeta5.patch 562 BLAKE2B 0618a1691472c3248f63f157f2ba36d886a7b34b1813d2e2fca76c1546bd883d4992c0fd14938b8be1c6c72a5597d52b92e1b324a6e59db58667493685fb3b9c SHA512 2a1e14a3eca3f95ee29e1902324469ab11f117012db60d2f34e0ab7818a44abaebd023562a6f521db7451691219461c453ba5f3fcf424e2fe65e407a11741863
+AUX externalmeta6.patch 546 BLAKE2B d0d5f75c46704b280ae4480ffe2ebca097adbc457c845615721888b45612da1a8e71b41bd6d8d9dadb16cdffa35108fc87a3dfd32313fa96d92f0021817e0112 SHA512 c112b7d44101e483d408c56dcd0d2524208b6e95b65a09dfe01f8ad6d09a20617020f9174cb4631473bab2550fec151329fb5e8d0e2e3378991f1ab88cce0301
+DIST findlib-1.7.1.tar.gz 256883 BLAKE2B 7459082dee3cd04045e8dbf59bc82075eb1c24bb8daff4a58d0002d7962ab19c5635ebb0551f29f99f37f1e08acd8eaa4dcd99d213438ff7a77cfc36ddadedd1 SHA512 1c8002dc2ed1804afc78c2aa92ab55d2b6501fbb021a7ca46698b4de0dea8ad6485a64f7bf9ec5f3df888da1a420ab270efb5e26f1e408cc8b78fa3ccb981ba4
+DIST findlib-1.7.2.tar.gz 257747 BLAKE2B 826993e9d3e5a9dab9084b006347a0324c848aa50a42ba1daa0d76010a0cdbf6e1ae9f0754dd3bef84f043ee43c3bd9775284a73ee5b130b678834d14d4ddb1c SHA512 f2aadaf8630482785ebfe6788bfea6716defdd6ba94e7f4e3b743c3415fa5b169e31301d605857823e9c74f7bd2f774399ee32a8acb35e64ce0cba5e98e4dd2c
+DIST findlib-1.7.3.tar.gz 257703 BLAKE2B d69687ee4b75bd7ba514c5507bd474764cfb76f0502ef613c3dd8d8e9e92b5f12704c101b9228d71f2d9f151ab5e63b4352b759a2c7a2694f23b10b6c4e724d2 SHA512 5fc8250c123e2f019406be487134523f964668d615b51b216551d74f6ec1999de43aa7babc9c2c75ebb87293b4b8c640548d562a98a6e5a6d7f663432869c886
+EBUILD findlib-1.7.1.ebuild 1646 BLAKE2B f1aa30d23fa0d711380b1c9dd604fa3b91cba3380c13747756015ca7c3f703e5b995abd14c0bc16f034ef6a8d5186bee1e9bb9170cfd27348dec13da11ce564c SHA512 58bc5f85b199ab7c2d83c652cf04e2608ac2eab442ec5fc10c623b4f5e1bae28c250af09ec38030e43af2f3d040ac290362fdda666d24c89b1e1903a1ebe9230
+EBUILD findlib-1.7.2.ebuild 1655 BLAKE2B d16880e456201f432021048dadb6e6b37b46a6167cba4d14448bc2abc27707e241eea6fdd22c4a1c11278d38a9650b2acca5fbefdfbf1bd20a8cd58d2bbe76d5 SHA512 6a0b49cea18ba2d1768c729f4adb74778f722d034c516dd1f77580e68eac709e2c07dc7ca73d0d9943851abd157b8a938b7f74b5672eab076fb764f565b6accb
+EBUILD findlib-1.7.3.ebuild 1668 BLAKE2B 01f7c3c7c535a8f4e4df75c23ca6ed3fcde62ab2d5c4dc9683065ebde4caebad6bb746c03d7b72302a614967ddcf958a31412107cc0bddbc96d26597ad0affc1 SHA512 598e099113e9b4f059379614c5dd65b46b3333dc812950c4ce3ebdcc023f320dee7f29d0d341060579630d2f1367064e5384943d1d1da0bc2de5ad479a603247
+MISC metadata.xml 247 BLAKE2B a49ba320a43edd431ae39eb274b77ddf0db171a7b06f4f0f0b8f75ee8e3b7f840dead108aa9c63fba75c609a44f7418268cd65c65877f3305d2a6d3ed3c678f6 SHA512 0f7ebd1264695f56fe6ab78e4e82c07866376f03ebfa12b22b60d0b2df819aa818832cb0d9eb2d77ab642a786b44cd127f579c348f0b2f57bc22e26b3b51c42b
diff --git a/dev-ml/findlib/files/externalmeta4.patch b/dev-ml/findlib/files/externalmeta4.patch
new file mode 100644
index 000000000000..a2bb4945f18c
--- /dev/null
+++ b/dev-ml/findlib/files/externalmeta4.patch
@@ -0,0 +1,16 @@
+Avoid installing META files for labltk, camlp4 and ocamlbuild: Those are provided by their
+respective packages now.
+
+Index: findlib-1.7.1/configure
+===================================================================
+--- findlib-1.7.1.orig/configure
++++ findlib-1.7.1/configure
+@@ -539,7 +539,7 @@ fi
+
+ # Generate the META files now.
+
+-l="$ldbm dynlink graphics num num-top str threads unix stdlib bigarray ocamldoc $llabltk $lcamlp4 $lobuild $lcomplibs $lbytes $lspacetime"
++l="$ldbm dynlink graphics num num-top str threads unix stdlib bigarray ocamldoc $lcomplibs $lbytes $lspacetime"
+
+ for dir in site-lib-src/*; do
+ # We do not really know if $dir is a directory.
diff --git a/dev-ml/findlib/files/externalmeta5.patch b/dev-ml/findlib/files/externalmeta5.patch
new file mode 100644
index 000000000000..ac90722de3b3
--- /dev/null
+++ b/dev-ml/findlib/files/externalmeta5.patch
@@ -0,0 +1,13 @@
+Index: findlib-1.7.2/configure
+===================================================================
+--- findlib-1.7.2.orig/configure
++++ findlib-1.7.2/configure
+@@ -557,7 +557,7 @@ fi
+
+ # Generate the META files now.
+
+-l="$ldbm dynlink graphics $lnum num-top str threads unix stdlib bigarray ocamldoc $llabltk $lcamlp4 $lobuild $lcomplibs $lbytes $lspacetime"
++l="$ldbm dynlink graphics $lnum num-top str threads unix stdlib bigarray ocamldoc $lcomplibs $lbytes $lspacetime"
+
+ for dir in site-lib-src/*; do
+ # We do not really know if $dir is a directory.
diff --git a/dev-ml/findlib/files/externalmeta6.patch b/dev-ml/findlib/files/externalmeta6.patch
new file mode 100644
index 000000000000..7dbe9aa48e00
--- /dev/null
+++ b/dev-ml/findlib/files/externalmeta6.patch
@@ -0,0 +1,13 @@
+Index: findlib-1.7.2/configure
+===================================================================
+--- findlib-1.7.2.orig/configure
++++ findlib-1.7.2/configure
+@@ -557,7 +557,7 @@ fi
+
+ # Generate the META files now.
+
+-l="$ldbm dynlink graphics $lnum str threads unix stdlib bigarray ocamldoc $llabltk $lcamlp4 $lobuild $lcomplibs $lbytes $lspacetime"
++l="$ldbm dynlink graphics $lnum str threads unix stdlib bigarray ocamldoc $lcomplibs $lbytes $lspacetime"
+
+ for dir in site-lib-src/*; do
+ # We do not really know if $dir is a directory.
diff --git a/dev-ml/findlib/findlib-1.7.1.ebuild b/dev-ml/findlib/findlib-1.7.1.ebuild
new file mode 100644
index 000000000000..b0e73f12c349
--- /dev/null
+++ b/dev-ml/findlib/findlib-1.7.1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit multilib eutils
+
+DESCRIPTION="OCaml tool to find/use non-standard packages"
+HOMEPAGE="http://projects.camlcity.org/projects/findlib.html"
+SRC_URI="http://download.camlcity.org/download/${P}.tar.gz"
+IUSE="doc +ocamlopt tk"
+
+LICENSE="MIT"
+
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+
+DEPEND=">=dev-lang/ocaml-4.02.3-r1:=[ocamlopt?]
+ tk? ( dev-ml/labltk:= )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ epatch "${FILESDIR}/externalmeta4.patch"
+ export ocamlfind_destdir="${EPREFIX}/usr/$(get_libdir)/ocaml"
+ export stublibs="${ocamlfind_destdir}/stublibs"
+}
+
+src_configure() {
+ local myconf
+ use tk && myconf="-with-toolbox"
+ ./configure -bindir "${EPREFIX}"/usr/bin -mandir "${EPREFIX}"/usr/share/man \
+ -sitelib ${ocamlfind_destdir} \
+ -config ${ocamlfind_destdir}/findlib/findlib.conf \
+ -no-custom \
+ ${myconf} || die "configure failed"
+}
+
+src_compile() {
+ emake -j1 all
+ if use ocamlopt; then
+ emake -j1 opt # optimized code
+ fi
+}
+
+src_install() {
+ emake prefix="${D}" install
+
+ dodir "${stublibs#${EPREFIX}}"
+
+ cd "${S}/doc"
+ dodoc QUICKSTART README DOCINFO
+ use doc && dohtml -r ref-html guide-html
+}
+
+check_stublibs() {
+ local ocaml_stdlib=`ocamlc -where`
+ local ldconf="${ocaml_stdlib}/ld.conf"
+
+ if [ ! -e ${ldconf} ]
+ then
+ echo "${ocaml_stdlib}" > ${ldconf}
+ echo "${ocaml_stdlib}/stublibs" >> ${ldconf}
+ fi
+
+ if [ -z `grep -e ${stublibs} ${ldconf}` ]
+ then
+ echo ${stublibs} >> ${ldconf}
+ fi
+}
+
+pkg_postinst() {
+ check_stublibs
+}
diff --git a/dev-ml/findlib/findlib-1.7.2.ebuild b/dev-ml/findlib/findlib-1.7.2.ebuild
new file mode 100644
index 000000000000..3e2ddccc7ea3
--- /dev/null
+++ b/dev-ml/findlib/findlib-1.7.2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit multilib eutils
+
+DESCRIPTION="OCaml tool to find/use non-standard packages"
+HOMEPAGE="http://projects.camlcity.org/projects/findlib.html"
+SRC_URI="http://download.camlcity.org/download/${P}.tar.gz"
+IUSE="doc +ocamlopt tk"
+
+LICENSE="MIT"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+
+DEPEND=">=dev-lang/ocaml-4.02.3-r1:=[ocamlopt?]
+ tk? ( dev-ml/labltk:= )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ epatch "${FILESDIR}/externalmeta5.patch"
+ export ocamlfind_destdir="${EPREFIX}/usr/$(get_libdir)/ocaml"
+ export stublibs="${ocamlfind_destdir}/stublibs"
+}
+
+src_configure() {
+ local myconf
+ use tk && myconf="-with-toolbox"
+ ./configure -bindir "${EPREFIX}"/usr/bin -mandir "${EPREFIX}"/usr/share/man \
+ -sitelib ${ocamlfind_destdir} \
+ -config ${ocamlfind_destdir}/findlib/findlib.conf \
+ -no-custom \
+ ${myconf} || die "configure failed"
+}
+
+src_compile() {
+ emake -j1 all
+ if use ocamlopt; then
+ emake -j1 opt # optimized code
+ fi
+}
+
+src_install() {
+ emake prefix="${D}" install
+
+ dodir "${stublibs#${EPREFIX}}"
+
+ cd "${S}/doc"
+ dodoc QUICKSTART README DOCINFO
+ use doc && dohtml -r ref-html guide-html
+}
+
+check_stublibs() {
+ local ocaml_stdlib=`ocamlc -where`
+ local ldconf="${ocaml_stdlib}/ld.conf"
+
+ if [ ! -e ${ldconf} ]
+ then
+ echo "${ocaml_stdlib}" > ${ldconf}
+ echo "${ocaml_stdlib}/stublibs" >> ${ldconf}
+ fi
+
+ if [ -z `grep -e ${stublibs} ${ldconf}` ]
+ then
+ echo ${stublibs} >> ${ldconf}
+ fi
+}
+
+pkg_postinst() {
+ check_stublibs
+}
diff --git a/dev-ml/findlib/findlib-1.7.3.ebuild b/dev-ml/findlib/findlib-1.7.3.ebuild
new file mode 100644
index 000000000000..584df36d4b12
--- /dev/null
+++ b/dev-ml/findlib/findlib-1.7.3.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit multilib eutils
+
+DESCRIPTION="OCaml tool to find/use non-standard packages"
+HOMEPAGE="http://projects.camlcity.org/projects/findlib.html"
+SRC_URI="http://download.camlcity.org/download/${P}.tar.gz"
+IUSE="doc +ocamlopt tk"
+
+LICENSE="MIT"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+
+DEPEND=">=dev-lang/ocaml-4.02.3-r1:=[ocamlopt?]
+ tk? ( dev-ml/labltk:= )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ epatch "${FILESDIR}/externalmeta6.patch"
+ export ocamlfind_destdir="${EPREFIX}/usr/$(get_libdir)/ocaml"
+ export stublibs="${ocamlfind_destdir}/stublibs"
+}
+
+src_configure() {
+ local myconf
+ use tk && myconf="-with-toolbox"
+ ./configure -bindir "${EPREFIX}"/usr/bin -mandir "${EPREFIX}"/usr/share/man \
+ -sitelib ${ocamlfind_destdir} \
+ -config ${ocamlfind_destdir}/findlib/findlib.conf \
+ -no-custom \
+ ${myconf} || die "configure failed"
+}
+
+src_compile() {
+ emake -j1 all
+ if use ocamlopt; then
+ emake -j1 opt # optimized code
+ fi
+}
+
+src_install() {
+ emake prefix="${D}" install
+
+ dodir "${stublibs#${EPREFIX}}"
+
+ cd "${S}/doc"
+ dodoc QUICKSTART README DOCINFO
+ use doc && dohtml -r ref-html guide-html
+}
+
+check_stublibs() {
+ local ocaml_stdlib=`ocamlc -where`
+ local ldconf="${ocaml_stdlib}/ld.conf"
+
+ if [ ! -e ${ldconf} ]
+ then
+ echo "${ocaml_stdlib}" > ${ldconf}
+ echo "${ocaml_stdlib}/stublibs" >> ${ldconf}
+ fi
+
+ if [ -z `grep -e ${stublibs} ${ldconf}` ]
+ then
+ echo ${stublibs} >> ${ldconf}
+ fi
+}
+
+pkg_postinst() {
+ check_stublibs
+}
diff --git a/dev-ml/findlib/metadata.xml b/dev-ml/findlib/metadata.xml
new file mode 100644
index 000000000000..75c9ea74812d
--- /dev/null
+++ b/dev-ml/findlib/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/dev-ml/flow_parser-0.50.0 b/dev-ml/flow_parser-0.50.0
deleted file mode 100644
index 7d23946e4a86..000000000000
--- a/dev-ml/flow_parser-0.50.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=dev-lang/ocaml:= dev-ml/sedlex:= dev-ml/ocamlbuild >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=JavaScript parser written in OCaml
-EAPI=6
-HOMEPAGE=https://github.com/facebook/flow/tree/master/src/parser
-KEYWORDS=~amd64
-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
-_md5_=2117e50326d7c232c53edc83efcc5ea0
diff --git a/dev-ml/flow_parser-0.51.0 b/dev-ml/flow_parser-0.51.0
deleted file mode 100644
index 6bb9c8621683..000000000000
--- a/dev-ml/flow_parser-0.51.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=dev-lang/ocaml:= dev-ml/sedlex:= dev-ml/ocamlbuild >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=JavaScript parser written in OCaml
-EAPI=6
-HOMEPAGE=https://github.com/facebook/flow/tree/master/src/parser
-KEYWORDS=~amd64
-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
-_md5_=2117e50326d7c232c53edc83efcc5ea0
diff --git a/dev-ml/flow_parser-0.52.0 b/dev-ml/flow_parser-0.52.0
deleted file mode 100644
index f0b2dd499f7a..000000000000
--- a/dev-ml/flow_parser-0.52.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=dev-lang/ocaml:= dev-ml/sedlex:= dev-ml/ocamlbuild >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=JavaScript parser written in OCaml
-EAPI=6
-HOMEPAGE=https://github.com/facebook/flow/tree/master/src/parser
-KEYWORDS=~amd64
-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
-_md5_=2117e50326d7c232c53edc83efcc5ea0
diff --git a/dev-ml/flow_parser/Manifest b/dev-ml/flow_parser/Manifest
new file mode 100644
index 000000000000..2bc46bd5610b
--- /dev/null
+++ b/dev-ml/flow_parser/Manifest
@@ -0,0 +1,7 @@
+DIST flow-0.50.0.tar.gz 2664071 BLAKE2B aa62952e956bf0c46e2a9b0b20d075a5178ee6ebbab13c64bb64c40b1dd0c67ca36340e3c795cfe2a233a26fba02de7f948c66d07d5ae181a544970bfc8fcdb6 SHA512 757adc6c07461ca71a132715a3f19e3dc36a08a165519793b94c667d116563eca9937593700db3efdd8d5cbb5709d5778a49345052de2392697f7bb2221e43e5
+DIST flow-0.51.0.tar.gz 2701608 BLAKE2B c4255b6d02d4f0064d08ea9d1b18eabaee8bbe7b935e4395bd4540d07f654846d9906f4225debd674dc8ad3cc0af3ffdc028f58502cae748e94f39df45061da9 SHA512 82422ff5e49b72c21a875461aa839e1217d369e632369f9c8fa375207da90d92eebbf653b2a0869ef08c8c1ffc07e11f729b77e8a791c9b44f5fc7daf71ec50a
+DIST flow-0.52.0.tar.gz 2718344 BLAKE2B e688c98bea494475e36d98856a0335ce06b5f9c5f0fdc0b2c07d06a6bcfe730b45dcc5c9167e0659143a2f8197989ccd16e4dfbf0272834eb1dd7ab78d9ba944 SHA512 aad2aaeb56448d1bd9a26ab1c68b1f61f107729347f6eabe1e62828395a06d624bca67f0706f2267e62920c56bab99c06fd7bc6bbb484e7c921a28d725cde670
+EBUILD flow_parser-0.50.0.ebuild 689 BLAKE2B 7224f513ef209acdb7a7c354138b0669450b5ca8a8e5b1b34a80240cb07f36d17248893333d7cc7b31f509c529dee8a6feba96a2b09b67f5fa90c3efc5ed76a7 SHA512 382db9d52834886a1e781896841433303be83fd47f67d89ee5190a9034fbffb22c8dc1d5b70bb187db8124a48cb0b8eb41b217aff374a7b9d4d8de0f0ba956f7
+EBUILD flow_parser-0.51.0.ebuild 689 BLAKE2B 7224f513ef209acdb7a7c354138b0669450b5ca8a8e5b1b34a80240cb07f36d17248893333d7cc7b31f509c529dee8a6feba96a2b09b67f5fa90c3efc5ed76a7 SHA512 382db9d52834886a1e781896841433303be83fd47f67d89ee5190a9034fbffb22c8dc1d5b70bb187db8124a48cb0b8eb41b217aff374a7b9d4d8de0f0ba956f7
+EBUILD flow_parser-0.52.0.ebuild 689 BLAKE2B 7224f513ef209acdb7a7c354138b0669450b5ca8a8e5b1b34a80240cb07f36d17248893333d7cc7b31f509c529dee8a6feba96a2b09b67f5fa90c3efc5ed76a7 SHA512 382db9d52834886a1e781896841433303be83fd47f67d89ee5190a9034fbffb22c8dc1d5b70bb187db8124a48cb0b8eb41b217aff374a7b9d4d8de0f0ba956f7
+MISC metadata.xml 325 BLAKE2B 45a349116ab7fb0d2c505903efccd6d012eb2eca56fbd6afbee45b91281af2ccb1a30e4c9dfb2f00bef3e97fa030b12ad8c0b931a8e6a05c519a49199a77ab28 SHA512 3e667d0135f0f386f4b8918ae462999ccbbb05635e32881f6aca2851a76f1b60919a9025858864778804f20fc24811a8bf77adf94a802137cc2ef395891e43c8
diff --git a/dev-ml/flow_parser/flow_parser-0.50.0.ebuild b/dev-ml/flow_parser/flow_parser-0.50.0.ebuild
new file mode 100644
index 000000000000..a36131a0f030
--- /dev/null
+++ b/dev-ml/flow_parser/flow_parser-0.50.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit findlib
+
+DESCRIPTION="JavaScript parser written in OCaml"
+HOMEPAGE="https://github.com/facebook/flow/tree/master/src/parser"
+SRC_URI="https://github.com/facebook/flow/archive/v${PV}.tar.gz -> flow-${PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+ dev-lang/ocaml:=
+ dev-ml/sedlex:=
+"
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND}
+ dev-ml/ocamlbuild"
+
+S="${WORKDIR}/flow-${PV}/src/parser"
+
+src_compile() {
+ emake build-parser
+}
+
+src_test() {
+ emake test-ocaml
+}
+
+src_install() {
+ findlib_src_preinst
+ emake ocamlfind-install
+ dodoc README.md
+}
diff --git a/dev-ml/flow_parser/flow_parser-0.51.0.ebuild b/dev-ml/flow_parser/flow_parser-0.51.0.ebuild
new file mode 100644
index 000000000000..a36131a0f030
--- /dev/null
+++ b/dev-ml/flow_parser/flow_parser-0.51.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit findlib
+
+DESCRIPTION="JavaScript parser written in OCaml"
+HOMEPAGE="https://github.com/facebook/flow/tree/master/src/parser"
+SRC_URI="https://github.com/facebook/flow/archive/v${PV}.tar.gz -> flow-${PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+ dev-lang/ocaml:=
+ dev-ml/sedlex:=
+"
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND}
+ dev-ml/ocamlbuild"
+
+S="${WORKDIR}/flow-${PV}/src/parser"
+
+src_compile() {
+ emake build-parser
+}
+
+src_test() {
+ emake test-ocaml
+}
+
+src_install() {
+ findlib_src_preinst
+ emake ocamlfind-install
+ dodoc README.md
+}
diff --git a/dev-ml/flow_parser/flow_parser-0.52.0.ebuild b/dev-ml/flow_parser/flow_parser-0.52.0.ebuild
new file mode 100644
index 000000000000..a36131a0f030
--- /dev/null
+++ b/dev-ml/flow_parser/flow_parser-0.52.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit findlib
+
+DESCRIPTION="JavaScript parser written in OCaml"
+HOMEPAGE="https://github.com/facebook/flow/tree/master/src/parser"
+SRC_URI="https://github.com/facebook/flow/archive/v${PV}.tar.gz -> flow-${PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+ dev-lang/ocaml:=
+ dev-ml/sedlex:=
+"
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND}
+ dev-ml/ocamlbuild"
+
+S="${WORKDIR}/flow-${PV}/src/parser"
+
+src_compile() {
+ emake build-parser
+}
+
+src_test() {
+ emake test-ocaml
+}
+
+src_install() {
+ findlib_src_preinst
+ emake ocamlfind-install
+ dodoc README.md
+}
diff --git a/dev-ml/flow_parser/metadata.xml b/dev-ml/flow_parser/metadata.xml
new file mode 100644
index 000000000000..44ea2b169869
--- /dev/null
+++ b/dev-ml/flow_parser/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">facebook/flow</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/fmt-0.8.4 b/dev-ml/fmt-0.8.4
deleted file mode 100644
index a58926d993f4..000000000000
--- a/dev-ml/fmt-0.8.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=dev-ml/result:=[ocamlopt] dev-lang/ocaml:=[ocamlopt] dev-ml/uchar:=[ocamlopt] dev-ml/cmdliner:=[ocamlopt] >=dev-ml/topkg-0.9 dev-ml/ocamlbuild dev-ml/findlib >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=Combinators to devise OCaml Format pretty-printing functions
-EAPI=5
-HOMEPAGE=http://erratique.ch/software/fmt https://github.com/dbuenzli/fmt
-IUSE=test
-KEYWORDS=~amd64
-LICENSE=ISC
-RDEPEND=dev-ml/result:=[ocamlopt] dev-lang/ocaml:=[ocamlopt] dev-ml/uchar:=[ocamlopt] dev-ml/cmdliner:=[ocamlopt] >=dev-lang/ocaml-4:=
-SLOT=0/0.8.4
-SRC_URI=http://erratique.ch/software/fmt/releases/fmt-0.8.4.tbz
-_eclasses_=findlib 45d6030075064a68da8d7143726a1150 opam 24b4a2529c1fd12f1304856d6c5a690d
-_md5_=3fa32445820b291255570863e7370f5f
diff --git a/dev-ml/fmt/Manifest b/dev-ml/fmt/Manifest
new file mode 100644
index 000000000000..9648475deb33
--- /dev/null
+++ b/dev-ml/fmt/Manifest
@@ -0,0 +1,3 @@
+DIST fmt-0.8.4.tbz 14079 BLAKE2B c4b6fc35a27734e8d878ef1abfa900b659d4acafc20757b0413aec1404378aed6e57c6a1a0e5c7dbda7e60fdd911d38fa1fecc76d670299ddf6ed14930fbcc28 SHA512 d17407f15447172ad444fa288b9a16962b0e4829cb73f62004b0f8dad2bec60a7911ad11fd05545d61d7fdb88099e53694548c73368399ba183c53383e1dfd31
+EBUILD fmt-0.8.4.ebuild 739 BLAKE2B 038709a7969bf7425bb522b4cb6df4ae1c15db70122631365b66de52cb809ae0338d3ab3ed20bb734304d4ad98cdd34ec65ee1f9d44466f9e4e78acad41eff56 SHA512 4cfa9e919996cd995e9627369f29c26f94ffb742b597db54f39b74cd54629e334b0ab2def6e5ceaaf3f0f14d6623053cac69a20335217c7b8b0208734ede8ce4
+MISC metadata.xml 324 BLAKE2B 4dee20ac6aa22eaff662820f7ca3373ef0c237020ac50e206c748503565976faff08d8233ccd3a0618ba99da8244788053f12a7e4f46362612070fabf6967b5c SHA512 f66912e2b4675364a04efea78003d4ed0c23b8c8d6978d18f6352f96c9bdca3bc66ef02ca1311be06b98190da2d0341ff00ef9980e4ef7e682e0d7b098b78078
diff --git a/dev-ml/fmt/fmt-0.8.4.ebuild b/dev-ml/fmt/fmt-0.8.4.ebuild
new file mode 100644
index 000000000000..19b27b4284d0
--- /dev/null
+++ b/dev-ml/fmt/fmt-0.8.4.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit findlib opam
+
+DESCRIPTION="Combinators to devise OCaml Format pretty-printing functions"
+HOMEPAGE="http://erratique.ch/software/fmt https://github.com/dbuenzli/fmt"
+SRC_URI="http://erratique.ch/software/fmt/releases/${P}.tbz"
+
+LICENSE="ISC"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND="dev-ml/result:=[ocamlopt]
+ dev-lang/ocaml:=[ocamlopt]
+ dev-ml/uchar:=[ocamlopt]
+ dev-ml/cmdliner:=[ocamlopt]"
+DEPEND="${RDEPEND}
+ >=dev-ml/topkg-0.9
+ dev-ml/ocamlbuild
+ dev-ml/findlib"
+
+src_compile() {
+ ocaml pkg/pkg.ml build --tests $(usex test 'true' 'false') || die
+}
+
+src_test() {
+ ocaml pkg/pkg.ml test || die
+}
diff --git a/dev-ml/fmt/metadata.xml b/dev-ml/fmt/metadata.xml
new file mode 100644
index 000000000000..655131108a30
--- /dev/null
+++ b/dev-ml/fmt/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">dbuenzli/fmt</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/fort-0.4.2 b/dev-ml/fort-0.4.2
deleted file mode 100644
index 0d90e3f82d22..000000000000
--- a/dev-ml/fort-0.4.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=dev-lang/ocaml:=
-DESCRIPTION=provides an environment for testing programs and Objective Caml modules
-EAPI=5
-HOMEPAGE=http://fort.sourceforge.net/
-KEYWORDS=amd64 ~ppc x86
-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 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e00157e1fd21faec6b38f513670db93f
diff --git a/dev-ml/fort/Manifest b/dev-ml/fort/Manifest
new file mode 100644
index 000000000000..d2fbad3f9b84
--- /dev/null
+++ b/dev-ml/fort/Manifest
@@ -0,0 +1,4 @@
+AUX fort-0.4.2-ocaml4.patch 648 BLAKE2B c10aafb2d283a61ebbfc3591d713ae85a83554a89fb67ac41452276c6c1413b2894bc6849b84c744db5298358d40b06411faf17410aa828091c47abd90476724 SHA512 e52bc74d890f4adcc767eb58e006f18b0a510b33ed1b056e6d0c9ef8716e2278b9a45e9f3c988d0dcd02e117fa4030e57b23402cc4e1e58319b062f7dce609f3
+DIST fort-0.4.2.tar.gz 6828 BLAKE2B de8c414246f37fa002782c8db18669acfcef2a0c0fe93dea1dccc5fc205aac31ea6139d44791d42a475fa35b134938207813125bd0c15f64e02e4d69ff7afc0b SHA512 59659bcc885f8d71985121a2abcfef756078eb472cadbd74ff97aef3378cd3f2a2a6da3a41a0a015b3175c18d98775e7f6b26c7a76262eb044b25122679c15a8
+EBUILD fort-0.4.2.ebuild 729 BLAKE2B 2276001d3fd5234ba6ea843efbb2b73f6bc39296766d699f1288b294d8a531876ba116c2ea78734291bb98ea43f6292cf991a048d30455429ad20b1c6e837570 SHA512 8d09cafb1d78359017b24fa4a9c2705fb342191e06c2d798cf4fae524efd3612f0a59bfd0e34075fd102a06cd2b3fcabdef0aae5fd3a86fbe87f1c2b46b9beef
+MISC metadata.xml 484 BLAKE2B a2b2440ddb65ed59a6879517668152a8d352585ebb8157b205f237a8b78a0452374425c7c2671cdc53c593f1505bb9ef81ee49bd6916fe8d522066e4f55f4526 SHA512 e1047ddee142489977415475313909db3b1d321dd9b6db3452cf8b889c4668e8169dc415c59db5b0867392c12ac747de2df00e53fa5589527279ea55e1e238e5
diff --git a/dev-ml/fort/files/fort-0.4.2-ocaml4.patch b/dev-ml/fort/files/fort-0.4.2-ocaml4.patch
new file mode 100644
index 000000000000..1c688a995446
--- /dev/null
+++ b/dev-ml/fort/files/fort-0.4.2-ocaml4.patch
@@ -0,0 +1,22 @@
+Index: fort-0.4.2/Makefile
+===================================================================
+--- fort-0.4.2.orig/Makefile
++++ fort-0.4.2/Makefile
+@@ -3,7 +3,7 @@
+
+ include Makefile.config
+
+-OCAMLC := ocamlc
++OCAMLC := ocamlc -I +compiler-libs
+
+ # FORT top-level interpreter
+ NAME := fort
+@@ -16,7 +16,7 @@ LIBS := unix
+ EXECUTABLE := $(NAME)$(EXEC_SUFFIX)
+
+ $(EXECUTABLE): $(OBJECTS)
+- $(OCAMLC) -linkall -o $@ toplevellib.cma $(LIBS:%=%.cma) $(OBJECTS)
++ $(OCAMLC) -linkall -o $@ ocamlcommon.cma ocamlbytecomp.cma ocamltoplevel.cma $(LIBS:%=%.cma) $(OBJECTS)
+
+ install: $(EXECUTABLE) $(OBJECTS)
+ mkdir -p $(DESTDIR)$(LIBDIR)
diff --git a/dev-ml/fort/fort-0.4.2.ebuild b/dev-ml/fort/fort-0.4.2.ebuild
new file mode 100644
index 000000000000..7471bf89ba24
--- /dev/null
+++ b/dev-ml/fort/fort-0.4.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit multilib eutils
+
+DESCRIPTION="provides an environment for testing programs and Objective Caml modules"
+HOMEPAGE="http://fort.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~ppc x86"
+IUSE=""
+
+DEPEND="dev-lang/ocaml:="
+RDEPEND="${DEPEND}"
+DOCS=( README )
+
+src_prepare() {
+ has_version '>=dev-lang/ocaml-4' && epatch "${FILESDIR}/${P}-ocaml4.patch"
+ sed -i -e "s:\$(BINDIR):\$(DESTDIR)&:"\
+ -e "s:\$(LIBDIR):\$(DESTDIR)&:" Makefile || die
+}
+
+src_configure() {
+ ./configure --bindir /usr/bin --libdir /usr/$(get_libdir)/ocaml || die
+}
diff --git a/dev-ml/fort/metadata.xml b/dev-ml/fort/metadata.xml
new file mode 100644
index 000000000000..f597a4e671d2
--- /dev/null
+++ b/dev-ml/fort/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <longdescription>
+ FORT (Framework for Ocaml Regression Testing) provides
+ an environment for testing programs and Objective Caml modules.
+ </longdescription>
+ <upstream>
+ <remote-id type="sourceforge">fort</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/fpath-0.7.2 b/dev-ml/fpath-0.7.2
deleted file mode 100644
index 5adb069e5414..000000000000
--- a/dev-ml/fpath-0.7.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=dev-ml/result:= dev-ml/astring:= dev-ml/topkg dev-ml/ocamlbuild dev-ml/findlib >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=File system paths for OCaml
-EAPI=6
-HOMEPAGE=http://erratique.ch/software/fpath https://github.com/dbuenzli/fpath
-KEYWORDS=~amd64
-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 24b4a2529c1fd12f1304856d6c5a690d
-_md5_=4f19f4661dd9d1c4a0500436dfb86298
diff --git a/dev-ml/fpath/Manifest b/dev-ml/fpath/Manifest
new file mode 100644
index 000000000000..449465197bf6
--- /dev/null
+++ b/dev-ml/fpath/Manifest
@@ -0,0 +1,3 @@
+DIST fpath-0.7.2.tbz 24142 BLAKE2B 5aa22a33d0155c2a446c3622d6feef0748be3eaa72f07e7e2770fda1993794864072a5f50a052537b9724e39935064967c87f82d860a2da17fbc86279a1930ab SHA512 d8ab8d6f183a1742d74a3a3220cc1d62e7df38a6f3ca1c04fad18426a0897152255382305ad14d058b5b85ab55a27536c39a62deffac8d46984a730a2a18405d
+EBUILD fpath-0.7.2.ebuild 539 BLAKE2B ac1601dc860e5429d767a550afa853df294d2a6e759653042e30fdd2592b9bdf42ea68251c327508c60beb6588db9f47f59deb8ef1c99f37c939b064a95fccc1 SHA512 aec8e379cc1471788bf7e9e3a61a4717c241d1cb3ed6a83997045c24364de0a5ccc8e3961c4206029c7b565d81c7f97daaa171a8c205097b33f3416e9dfe07c4
+MISC metadata.xml 326 BLAKE2B 6b491f96cbcfea382861276513ddff578b1fcc0a6387aa8f78ac1083878b49b590244576f5c570c7925129bfb90b389d44865e56e1cb6f4d84bab97a5a7db7a4 SHA512 b758e1405438ae20da6862bb580ecc264d452dfc948bc328d4fe680b8ffac1793cc2bc1f21fa58802682a58f4ff09c49dc3fc07a22ac9207a4ae17efbf9bd382
diff --git a/dev-ml/fpath/fpath-0.7.2.ebuild b/dev-ml/fpath/fpath-0.7.2.ebuild
new file mode 100644
index 000000000000..8a7ca78a2291
--- /dev/null
+++ b/dev-ml/fpath/fpath-0.7.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit opam
+
+DESCRIPTION="File system paths for OCaml"
+HOMEPAGE="http://erratique.ch/software/fpath https://github.com/dbuenzli/fpath"
+SRC_URI="http://erratique.ch/software/fpath/releases/${P}.tbz"
+
+LICENSE="ISC"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+ dev-ml/result:=
+ dev-ml/astring:=
+"
+DEPEND="${RDEPEND}
+ dev-ml/topkg
+ dev-ml/ocamlbuild
+ dev-ml/findlib
+"
+
+src_compile() {
+ ocaml pkg/pkg.ml build || die
+}
diff --git a/dev-ml/fpath/metadata.xml b/dev-ml/fpath/metadata.xml
new file mode 100644
index 000000000000..81ab008999ce
--- /dev/null
+++ b/dev-ml/fpath/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">dbuenzli/fpath</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/gd4o-1.0_alpha5 b/dev-ml/gd4o-1.0_alpha5
deleted file mode 100644
index 9356ff940070..000000000000
--- a/dev-ml/gd4o-1.0_alpha5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=>=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 >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=OCaml interface to the GD graphics library
-EAPI=5
-HOMEPAGE=https://sourceforge.net/projects/gd4o/
-IUSE=doc +ocamlopt
-KEYWORDS=~amd64
-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 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=340a184eea9fd03ab7ba7c7f684ce5e1
diff --git a/dev-ml/gd4o/Manifest b/dev-ml/gd4o/Manifest
new file mode 100644
index 000000000000..196201369862
--- /dev/null
+++ b/dev-ml/gd4o/Manifest
@@ -0,0 +1,3 @@
+DIST gd4o-1.0a5.tar.gz 885735 BLAKE2B e66a9de762bd6e0cce97fc47645edc7d91b6d01b3d7aad16bb7dcc9eae5604c134b14ddccacb11d83ec651676a9992340d032d63b5953940decd0abf6efaf72c SHA512 f582ff5dc4ece692b779c78ea97d1df90768564ab172a3933196bc0d9eedf31a53ca01c4745d7eacc81f977611b509dd2f912fac08b1bf0f70ec03605a40a85b
+EBUILD gd4o-1.0_alpha5.ebuild 991 BLAKE2B 63f8093b9ea80dbd7ee4a1bf2019782a962e32b590c10381d6a2f81f7b5f74482f2278c0d6f2a57b5c2963e34770fb6b788740f4bf246fdad86f66c0ede72ad8 SHA512 46e1217615dd67b2fa82e9707130a926d11bb3a793a89ce1ed6b488b28a870d895aee4287d42d6b8692a91efd52619fd4b70012d9b945171b17acbf01d7d4bf3
+MISC metadata.xml 321 BLAKE2B 4690a05a059e16e969f27cc6b5b57c79034e814e868f1874ceecaf23ad7bb5749452fbc0ea84c9afdda7e360cc4c1dbdcb6cee50b66c4f7c094683d6bc5e58e9 SHA512 7f6775dbcec3f1a9d91f3f02269581b4e7c1bea731a7a6974d79c5262d8af1d106e07ad0e50c9237853a4fe6b2e4bf0af030893a316558abce60d6a3ba210834
diff --git a/dev-ml/gd4o/gd4o-1.0_alpha5.ebuild b/dev-ml/gd4o/gd4o-1.0_alpha5.ebuild
new file mode 100644
index 000000000000..2c4ae20f3100
--- /dev/null
+++ b/dev-ml/gd4o/gd4o-1.0_alpha5.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit toolchain-funcs findlib
+
+MY_P="${P/_alpha/a}"
+
+DESCRIPTION="OCaml interface to the GD graphics library"
+HOMEPAGE="https://sourceforge.net/projects/gd4o/"
+SRC_URI="mirror://sourceforge/gd4o/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="doc +ocamlopt"
+
+DEPEND=">=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"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+ sed -i 's/CFLAGS =/CFLAGS += -fPIC/' Makefile || die
+}
+
+src_compile() {
+ emake CC="$(tc-getCC)"
+ if use ocamlopt ; then
+ emake CC="$(tc-getCC)" opt
+ fi
+ if use doc ; then
+ emake docs
+ fi
+}
+
+src_test() {
+ emake test
+ if use ocamlopt ; then
+ emake test.opt
+ fi
+}
+
+src_install() {
+ findlib_src_install
+ dodoc BUGS CHANGES README* TODO doc/manual.txt
+ use doc && dohtml -r doc
+}
diff --git a/dev-ml/gd4o/metadata.xml b/dev-ml/gd4o/metadata.xml
new file mode 100644
index 000000000000..253efdf99b59
--- /dev/null
+++ b/dev-ml/gd4o/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="sourceforge">gd4o</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/gen-0.4.0.1 b/dev-ml/gen-0.4.0.1
deleted file mode 100644
index a8bc134b7d51..000000000000
--- a/dev-ml/gen-0.4.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=test? ( dev-ml/ounit dev-ml/iTeML ) >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=Simple, efficient iterators for OCaml
-EAPI=5
-HOMEPAGE=https://github.com/c-cube/gen
-IUSE=+ocamlopt debug doc test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?]
-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 983774947da124fb7d542ce25a218bb1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e oasis 9256ed89af74c3365ec888c00bfdfe43 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a392610245c386561aa4f740d8bc4f92
diff --git a/dev-ml/gen/Manifest b/dev-ml/gen/Manifest
new file mode 100644
index 000000000000..000c54234539
--- /dev/null
+++ b/dev-ml/gen/Manifest
@@ -0,0 +1,3 @@
+DIST gen-0.4.0.1.tar.gz 72415 BLAKE2B 73fa4169b6c2c3790a7f455136be4fa3bc2ce328833b17293dba793383133f5f151c6e1a2372c3422c7f827ef29eb1c3925a69a28dba787af29f7609ec8c299d SHA512 30722cca6d9b360a9a7d4a97f7553935d5425d5e3d49a7ae265bd0aee5961628a20d182775767a125cf367e1cd218ce4e782f025951468a4f95975163a1f4d76
+EBUILD gen-0.4.0.1.ebuild 502 BLAKE2B c83710e2204e95f5c8e7580f1b23af089cc37705639f8b5f26ac9914db1193b88f2555d724908e1c632b838a74d2dea6a9e17a9257808b44f21e2473e69f47ad SHA512 4c786e785ecf66800b9ce1d79de74c2aa49a92386f024cf61472c17c47253ca9b25162ea63ffa4711f9680d2dfb9e5f68f11bb7bcc9f5f788e67959e3752429e
+MISC metadata.xml 322 BLAKE2B 1b25ae103dc45391ff4a28bf7d0c1ecb273c63f5c878b5ef8a054d2668daca28bc6acd6e92b501d03c15ff0f967dca7ffb7b386cde1c4096a4a55f03d5754aef SHA512 b1c5cc6e178f6efe83c2fdf9e1960b8593f52c6fdf7bb96aba4068f4559b6d3d35c3ffeeb3d854c515b8a55e1a44ce5a314614e6b23974209c10a7519119b3d6
diff --git a/dev-ml/gen/gen-0.4.0.1.ebuild b/dev-ml/gen/gen-0.4.0.1.ebuild
new file mode 100644
index 000000000000..13385f56421c
--- /dev/null
+++ b/dev-ml/gen/gen-0.4.0.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+OASIS_BUILD_TESTS=1
+OASIS_BUILD_DOCS=1
+
+inherit oasis
+
+DESCRIPTION="Simple, efficient iterators for OCaml"
+HOMEPAGE="https://github.com/c-cube/gen"
+SRC_URI="https://github.com/c-cube/gen/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+ test? ( dev-ml/ounit dev-ml/iTeML )
+"
+DOCS=( "README.md" "CHANGELOG.md" )
diff --git a/dev-ml/gen/metadata.xml b/dev-ml/gen/metadata.xml
new file mode 100644
index 000000000000..dec7a98cbdca
--- /dev/null
+++ b/dev-ml/gen/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">c-cube/gen</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/gen_js_api-1.0.3 b/dev-ml/gen_js_api-1.0.3
deleted file mode 100644
index 84af27bab2ce..000000000000
--- a/dev-ml/gen_js_api-1.0.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-lang/ocaml:= >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Easy OCaml bindings for Javascript libraries
-EAPI=6
-HOMEPAGE=https://github.com/LexiFi/gen_js_api
-KEYWORDS=~amd64
-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
-_md5_=0d43ddb582bc57237567d9b0e8fb3122
diff --git a/dev-ml/gen_js_api-1.0.4 b/dev-ml/gen_js_api-1.0.4
deleted file mode 100644
index 1c50d28b9e9b..000000000000
--- a/dev-ml/gen_js_api-1.0.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=>=dev-lang/ocaml-4.05:= >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Easy OCaml bindings for Javascript libraries
-EAPI=6
-HOMEPAGE=https://github.com/LexiFi/gen_js_api
-KEYWORDS=~amd64
-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
-_md5_=7e7335490a538e845794e67367438225
diff --git a/dev-ml/gen_js_api/Manifest b/dev-ml/gen_js_api/Manifest
new file mode 100644
index 000000000000..d478dae6bde1
--- /dev/null
+++ b/dev-ml/gen_js_api/Manifest
@@ -0,0 +1,5 @@
+DIST gen_js_api-1.0.3.tar.gz 39575 BLAKE2B 251c3a68897f6851d39cb980af5d49b4448ab5f932a1da8a3e8db10685de1cc7d5e89702edca4a2b6e7c8a8171ff6220d80c1096bb4004d9f0a854154a689732 SHA512 90526bc6cee02de9eed3110b4311f9cae52e61f2973f9127dc436c44016e663c195b571186eb260a261babe5f401ae8574c7683e431d3734820642299fc6ef82
+DIST gen_js_api-1.0.4.tar.gz 39593 BLAKE2B 81058c1eb215f98538283d5023013d9a72760208f8183512eb7e1f190d51e397b67dd5de0a147398f6ca749b4234e60c52e728edf9eb5df4ddbd76a27d76675d SHA512 db1599f349fa70c9797141fff0862e07a9a709097d713332ea9b1513a71e707b6022418a6c6980d12a3b215c09ed500eb74e4c62d0433740304fac306c49cdcb
+EBUILD gen_js_api-1.0.3.ebuild 572 BLAKE2B be143de201cad9a35eaddb51dda7b9b34d10ef641881843bbf5c29391fb38103f8f01546f90c44f2823f43545e0ac61062f47e6c91c55d3bb781df4c7acd59b7 SHA512 ee768fd2e33c5217aa29637353027897e71eace5d78110d00ed2faaa39af254eb65a61957dda2667ef0ec39e1873b3a8d4cbc9fb2d6f02d20e1f4f240878869e
+EBUILD gen_js_api-1.0.4.ebuild 579 BLAKE2B 5dfa5c8e60a600aad5f2d545b53ffec679fb3b856e0a8db77357403eac9bb4a6dd9da5b6e18211d63618c90554ed45045ca78eae133fb599d424fbeacc3e5b03 SHA512 5cd3f051ecb7a2790dcc7fcc457ecfae88c2b3ba5a024d67ebc758adc7a47f979c039612bfef25841d0894f77e912c1ba795e70b1aee9794e7aad010e876e77b
+MISC metadata.xml 329 BLAKE2B 510b28c6a705f04af929df38edd54f3c425ab1c873b5804a28b864b5a1da75292b4b647cfc620f63bf3f9dee84517391e75b930fa68ff6d06e0a3e859d6882b7 SHA512 3f4b6cc61b36b516e60ba4ccc739d5f972f09be70b5cb6699276aff124896ff7784e710d5d587ae4490c21d340f5cd5c5e21cca5713bc026bd27199e8c40ebf2
diff --git a/dev-ml/gen_js_api/gen_js_api-1.0.3.ebuild b/dev-ml/gen_js_api/gen_js_api-1.0.3.ebuild
new file mode 100644
index 000000000000..09b866b1233c
--- /dev/null
+++ b/dev-ml/gen_js_api/gen_js_api-1.0.3.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit findlib
+
+DESCRIPTION="Easy OCaml bindings for Javascript libraries"
+HOMEPAGE="https://github.com/LexiFi/gen_js_api"
+SRC_URI="https://github.com/LexiFi/gen_js_api/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="dev-lang/ocaml:="
+RDEPEND="${DEPEND}"
+
+src_install () {
+ findlib_src_install
+ dodoc CLASSES.md IMPLGEN.md LOW_LEVEL_BINDING.md NAMING.md PPX.md README.md TODO.md TYPES.md VALUES.md
+}
diff --git a/dev-ml/gen_js_api/gen_js_api-1.0.4.ebuild b/dev-ml/gen_js_api/gen_js_api-1.0.4.ebuild
new file mode 100644
index 000000000000..26b9dfbafdb9
--- /dev/null
+++ b/dev-ml/gen_js_api/gen_js_api-1.0.4.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit findlib
+
+DESCRIPTION="Easy OCaml bindings for Javascript libraries"
+HOMEPAGE="https://github.com/LexiFi/gen_js_api"
+SRC_URI="https://github.com/LexiFi/gen_js_api/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=">=dev-lang/ocaml-4.05:="
+RDEPEND="${DEPEND}"
+
+src_install () {
+ findlib_src_install
+ dodoc CLASSES.md IMPLGEN.md LOW_LEVEL_BINDING.md NAMING.md PPX.md README.md TODO.md TYPES.md VALUES.md
+}
diff --git a/dev-ml/gen_js_api/metadata.xml b/dev-ml/gen_js_api/metadata.xml
new file mode 100644
index 000000000000..92061115ba62
--- /dev/null
+++ b/dev-ml/gen_js_api/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">LexiFi/gen_js_api</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/gsl-ocaml-1.19.1 b/dev-ml/gsl-ocaml-1.19.1
deleted file mode 100644
index 0d9ccbabc5ea..000000000000
--- a/dev-ml/gsl-ocaml-1.19.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=sci-libs/gsl-1.19 >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=OCaml bindings for the GSL library (successor of dev-ml/ocamlgsl)
-EAPI=5
-HOMEPAGE=https://github.com/mmottl/gsl-ocaml
-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?]
-SLOT=0
-SRC_URI=https://github.com/mmottl/gsl-ocaml/releases/download/v1.19.1/gsl-ocaml-1.19.1.tar.gz
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e oasis 9256ed89af74c3365ec888c00bfdfe43 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9627e4bd10aec9b569f23141d2b7f820
diff --git a/dev-ml/gsl-ocaml/Manifest b/dev-ml/gsl-ocaml/Manifest
new file mode 100644
index 000000000000..b142ec2df2f1
--- /dev/null
+++ b/dev-ml/gsl-ocaml/Manifest
@@ -0,0 +1,3 @@
+DIST gsl-ocaml-1.19.1.tar.gz 167549 BLAKE2B 17d559b31a2be9583fd616b273f1d5cac5a42bebc7df2cf4882ba5bf7ddf411971b4f49dc36eb3bcdb0265ea204d0ea0ba19bc6c63f49a6b8b6075715bd0a967 SHA512 be199d46479f07a16d2f667d7a29675171bc4ecc5a6e5948335bf98f72e6f12474d16455a22e6bfc73683f1d67de3a186d75f817f398f6621241b640c333e07d
+EBUILD gsl-ocaml-1.19.1.ebuild 630 BLAKE2B d1c2477d7c581840399347dcda9944a0ba7c676f9a2d977167ab0e3d6ba039fd14f4fc00007625285b976967f6bf6c9a9ec8f15cb23c833ee801487690f4469f SHA512 9304332034dd36c7e2151388b8e3c9b56aedf8c1ab1f979908af19e8efb5d09da59de46662e97611ee51f81b4ac2635f1672a4ed36ef566c1d928b8dd7297d24
+MISC metadata.xml 480 BLAKE2B 0861e50067d48084fe0b0a25ba55bf878fdf23a78df50c1fc9c542453f75f834d9f208b9e8c744dcbf052fe2fd63237f6b6537e5c1867af62bee686f0a4477ec SHA512 5f1ad4ecf920b66b0a7d3ccd1b9f064ee04a0c422d13889db5d3c7329c47f03d08d8c151a03f8da8c0183147ed0140011b0dd73ad06d07840e5d737782e7518a
diff --git a/dev-ml/gsl-ocaml/gsl-ocaml-1.19.1.ebuild b/dev-ml/gsl-ocaml/gsl-ocaml-1.19.1.ebuild
new file mode 100644
index 000000000000..694f13126426
--- /dev/null
+++ b/dev-ml/gsl-ocaml/gsl-ocaml-1.19.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+OASIS_BUILD_DOCS=1
+OASIS_BUILD_TESTS=1
+
+inherit oasis
+
+DESCRIPTION="OCaml bindings for the GSL library (successor of dev-ml/ocamlgsl)"
+HOMEPAGE="https://github.com/mmottl/gsl-ocaml"
+SRC_URI="https://github.com/mmottl/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples test"
+
+DEPEND=">=sci-libs/gsl-1.19"
+RDEPEND="${DEPEND}
+ !dev-ml/ocamlgsl"
+
+DOCS=( CHANGES.txt README.md NOTES.md TODO.md )
+
+src_prepare() {
+ oasis_configure_opts="$(use_enable examples)"
+}
diff --git a/dev-ml/gsl-ocaml/metadata.xml b/dev-ml/gsl-ocaml/metadata.xml
new file mode 100644
index 000000000000..52ba8df11dd3
--- /dev/null
+++ b/dev-ml/gsl-ocaml/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>sci@gentoo.org</email>
+ <name>Gentoo Science Project</name>
+ </maintainer>
+ <longdescription lang="en">
+GSL interface for OCaml
+ </longdescription>
+ <upstream>
+ <remote-id type="bitbucket">mmottl/gsl-ocaml</remote-id>
+ <remote-id type="github">mmottl/gsl-ocaml</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/herelib-112.35.00 b/dev-ml/herelib-112.35.00
deleted file mode 100644
index 0804e23576b7..000000000000
--- a/dev-ml/herelib-112.35.00
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-lang/ocaml-4.00.0:= dev-ml/camlp4:= >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=Syntax extension for inserting the current location
-EAPI=5
-HOMEPAGE=http://www.janestreet.com/ocaml
-IUSE=+ocamlopt debug
-KEYWORDS=~amd64
-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 983774947da124fb7d542ce25a218bb1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e oasis 9256ed89af74c3365ec888c00bfdfe43 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6798d531c2c892b90c3c01c086ae7f57
diff --git a/dev-ml/herelib/Manifest b/dev-ml/herelib/Manifest
new file mode 100644
index 000000000000..e22bca3daff4
--- /dev/null
+++ b/dev-ml/herelib/Manifest
@@ -0,0 +1,3 @@
+DIST herelib-112.35.00.tar.gz 49201 BLAKE2B 6a5996b88e54473e3befc98c47b4f98c57d23b74a824301559ea2e4be1757627ab569bfe31f098da3854b5525eafc4490fee670634c38f133614df842ba0e91d SHA512 3b7fe743327e93526858004f90f102e5eb98cc493f22acea3d82e51bf99307679017389680456a143fb6fa9dce0a30bfd69abf90e5f0ea1367ec9c9c0726150f
+EBUILD herelib-112.35.00.ebuild 505 BLAKE2B e4b40339ce5ce956ac4b63d5ecd678c2106e0014b4778f60e7a55503f074b9cd8d22a502bc70f87651b02babb6d6bc7b8e6e3fd51b8db5b78eccf08e608cab54 SHA512 e6a63cddc08e24e11c87eca8f3b4a0ecd0a8f6d3b49334a354e08b49b3c856e2ccfb3886e56c615dc0e2e5ee007cd1cb0986eeb224d16063f8aed33587f70899
+MISC metadata.xml 243 BLAKE2B 010ca240ae06e9a9f6d7ba213eb06df36d9ba862ff2d2458d98a9fea1a1e7f3026d13832a73bce1b3ad9345029425e6abfae9e03bf126f2329b3f030ed3753fd SHA512 1c5b4b2163017e496999d1f87e5c9c5ac6c11b2e9187450ccfb3df258f34e54d278972f04ee0e8429476c6f87e091a869ac2a28c6e8c8e6d20678c3e74061449
diff --git a/dev-ml/herelib/herelib-112.35.00.ebuild b/dev-ml/herelib/herelib-112.35.00.ebuild
new file mode 100644
index 000000000000..54579ed85a6b
--- /dev/null
+++ b/dev-ml/herelib/herelib-112.35.00.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit oasis
+
+MY_P=${PN/-/_}-${PV}
+DESCRIPTION="Syntax extension for inserting the current location"
+HOMEPAGE="http://www.janestreet.com/ocaml"
+SRC_URI="http://ocaml.janestreet.com/ocaml-core/${PV%.*}/files/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+ >=dev-lang/ocaml-4.00.0:=
+ dev-ml/camlp4:=
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-ml/herelib/metadata.xml b/dev-ml/herelib/metadata.xml
new file mode 100644
index 000000000000..ffac4d7ebc01
--- /dev/null
+++ b/dev-ml/herelib/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-ml/iTeML-2.5 b/dev-ml/iTeML-2.5
deleted file mode 100644
index c6e9fbba1b32..000000000000
--- a/dev-ml/iTeML-2.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-ml/ounit:= dev-lang/ocaml:=[ocamlopt] >=dev-ml/qcheck-0.5:= dev-ml/ocamlbuild >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Inline (Unit) Tests for OCaml
-EAPI=5
-HOMEPAGE=https://github.com/vincent-hugot/iTeML
-KEYWORDS=~amd64 ~x86
-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
-_md5_=8b17093b979998210dd621ee22e3b8da
diff --git a/dev-ml/iTeML-2.6 b/dev-ml/iTeML-2.6
deleted file mode 100644
index fe9a6a1d14fd..000000000000
--- a/dev-ml/iTeML-2.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-ml/ounit:= dev-lang/ocaml:=[ocamlopt] >=dev-ml/qcheck-0.5:= dev-ml/ocamlbuild >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Inline (Unit) Tests for OCaml
-EAPI=5
-HOMEPAGE=https://github.com/vincent-hugot/iTeML
-KEYWORDS=~amd64 ~x86
-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
-_md5_=8b17093b979998210dd621ee22e3b8da
diff --git a/dev-ml/iTeML-2.7 b/dev-ml/iTeML-2.7
deleted file mode 100644
index 46376fed3a93..000000000000
--- a/dev-ml/iTeML-2.7
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-ml/ounit:= dev-lang/ocaml:=[ocamlopt] >=dev-ml/qcheck-0.5:= dev-ml/ocamlbuild >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Inline (Unit) Tests for OCaml
-EAPI=5
-HOMEPAGE=https://github.com/vincent-hugot/iTeML
-KEYWORDS=~amd64 ~x86
-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
-_md5_=8b17093b979998210dd621ee22e3b8da
diff --git a/dev-ml/iTeML/Manifest b/dev-ml/iTeML/Manifest
new file mode 100644
index 000000000000..b72a641198a2
--- /dev/null
+++ b/dev-ml/iTeML/Manifest
@@ -0,0 +1,7 @@
+DIST iTeML-2.5.tar.gz 33750 BLAKE2B 362dcbd0a2e44842832ec5e2307eb2f291013344e80b791f1e2c3e5ffc43633f67c7e736ad3a6545197467700d043649080b5f8889b55e460748f769ca7f404b SHA512 b8a2f842f0076bdf3f30a71983f686b931ac3f7fde73ad83041dae1d33d8bca2c7695b71dcc53ef942fbdee7422e2e4d22994f69b70d54e2b4d62bc1c64395c9
+DIST iTeML-2.6.tar.gz 34822 BLAKE2B feb7a1d7973f1710b245cb5d859d443b4c30a6128137523659768864cdd23eb18606a2b6d418d9fb37784bf2fe53fc45a4558e1565186e2402574df560a4afc5 SHA512 6c42856d8a8d6b9e76002fe94e4be0db2a108c4a033fd3d19849772a6c1db9b792beb960b0ac02973d40dc9dda4c4cf5ba13ae9f05534798cc3ccc283f8d3567
+DIST iTeML-2.7.tar.gz 34866 BLAKE2B c3d2df6901ca1c5a804b8e5becf2960f6de10a0edc88fab86fadd39ec25d35143d5ccb3765a1bb5e4d55f28d1dc8942085b964b343dc1f8622ea4438b842e9a6 SHA512 477b55332ab4f733bb225fb15741e5129314fc857900715851027b132fd87f169f8d402987762bd9a07e0a644b1d2bbd49e2f21de7cc23edbe89ff8b3f2bda65
+EBUILD iTeML-2.5.ebuild 616 BLAKE2B 8701d46e53561cfefc823af98c8912fe061321c7a5444c83757f7a2fea634f81124d4209a59cadfb5df9588bd9fc29285628932192fd39c826df85e1b0607b19 SHA512 201b4767bae5d86e8ee937f557b69396c97315f44c181803bc5aa8117fda265cb0eefdc3cf13cac6f6828a16040479ad9a03dbbd497877b0e44f65f7325fc8ea
+EBUILD iTeML-2.6.ebuild 616 BLAKE2B 8701d46e53561cfefc823af98c8912fe061321c7a5444c83757f7a2fea634f81124d4209a59cadfb5df9588bd9fc29285628932192fd39c826df85e1b0607b19 SHA512 201b4767bae5d86e8ee937f557b69396c97315f44c181803bc5aa8117fda265cb0eefdc3cf13cac6f6828a16040479ad9a03dbbd497877b0e44f65f7325fc8ea
+EBUILD iTeML-2.7.ebuild 616 BLAKE2B 8701d46e53561cfefc823af98c8912fe061321c7a5444c83757f7a2fea634f81124d4209a59cadfb5df9588bd9fc29285628932192fd39c826df85e1b0607b19 SHA512 201b4767bae5d86e8ee937f557b69396c97315f44c181803bc5aa8117fda265cb0eefdc3cf13cac6f6828a16040479ad9a03dbbd497877b0e44f65f7325fc8ea
+MISC metadata.xml 341 BLAKE2B efb397231b9a2c53e6229e93161a2c62c6fbf23b0b1b46441e1d43abe7485a399a6fb5cb9eb93aef2bbbf61c68b6042cd9909fed32f4fbf95a60cb84f286bd37 SHA512 c3f8f5f72ae96e9050b7c11de89ca754ac84019a857388e53a56cec3122020e06d7d6143b0cf9070f509cd62f1c32d4f52a2e4b3593a73b6fea8d41fc23d6385
diff --git a/dev-ml/iTeML/iTeML-2.5.ebuild b/dev-ml/iTeML/iTeML-2.5.ebuild
new file mode 100644
index 000000000000..7047a3ea4d8d
--- /dev/null
+++ b/dev-ml/iTeML/iTeML-2.5.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit findlib
+
+DESCRIPTION="Inline (Unit) Tests for OCaml"
+HOMEPAGE="https://github.com/vincent-hugot/iTeML"
+SRC_URI="https://github.com/vincent-hugot/iTeML/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-ml/ounit:=
+ dev-lang/ocaml:=[ocamlopt]
+ >=dev-ml/qcheck-0.5:=
+"
+DEPEND="${RDEPEND}
+ dev-ml/ocamlbuild
+"
+
+src_install() {
+ findlib_src_preinst
+ dodir /usr/bin
+ emake BIN="${ED}/usr/bin/" install
+ dodoc README.adoc HOWTO.adoc
+}
diff --git a/dev-ml/iTeML/iTeML-2.6.ebuild b/dev-ml/iTeML/iTeML-2.6.ebuild
new file mode 100644
index 000000000000..7047a3ea4d8d
--- /dev/null
+++ b/dev-ml/iTeML/iTeML-2.6.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit findlib
+
+DESCRIPTION="Inline (Unit) Tests for OCaml"
+HOMEPAGE="https://github.com/vincent-hugot/iTeML"
+SRC_URI="https://github.com/vincent-hugot/iTeML/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-ml/ounit:=
+ dev-lang/ocaml:=[ocamlopt]
+ >=dev-ml/qcheck-0.5:=
+"
+DEPEND="${RDEPEND}
+ dev-ml/ocamlbuild
+"
+
+src_install() {
+ findlib_src_preinst
+ dodir /usr/bin
+ emake BIN="${ED}/usr/bin/" install
+ dodoc README.adoc HOWTO.adoc
+}
diff --git a/dev-ml/iTeML/iTeML-2.7.ebuild b/dev-ml/iTeML/iTeML-2.7.ebuild
new file mode 100644
index 000000000000..7047a3ea4d8d
--- /dev/null
+++ b/dev-ml/iTeML/iTeML-2.7.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit findlib
+
+DESCRIPTION="Inline (Unit) Tests for OCaml"
+HOMEPAGE="https://github.com/vincent-hugot/iTeML"
+SRC_URI="https://github.com/vincent-hugot/iTeML/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-ml/ounit:=
+ dev-lang/ocaml:=[ocamlopt]
+ >=dev-ml/qcheck-0.5:=
+"
+DEPEND="${RDEPEND}
+ dev-ml/ocamlbuild
+"
+
+src_install() {
+ findlib_src_preinst
+ dodir /usr/bin
+ emake BIN="${ED}/usr/bin/" install
+ dodoc README.adoc HOWTO.adoc
+}
diff --git a/dev-ml/iTeML/metadata.xml b/dev-ml/iTeML/metadata.xml
new file mode 100644
index 000000000000..4e400b4f2b2a
--- /dev/null
+++ b/dev-ml/iTeML/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">vincent-hugot/iTeML</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/incremental-0.9.0 b/dev-ml/incremental-0.9.0
deleted file mode 100644
index 4d809ff6d1fd..000000000000
--- a/dev-ml/incremental-0.9.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-lang/ocaml:= dev-ml/core:= dev-ml/incremental_kernel:= dev-ml/ppx_driver:= dev-ml/ppx_jane:= dev-ml/ocaml-migrate-parsetree:= dev-ml/opam dev-ml/jbuilder
-DESCRIPTION=Library for incremental computations
-EAPI=6
-HOMEPAGE=https://github.com/janestreet/incremental
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-lang/ocaml:= dev-ml/core:= dev-ml/incremental_kernel:= dev-ml/ppx_driver:= dev-ml/ppx_jane:= dev-ml/ocaml-migrate-parsetree:=
-SLOT=0/0.9.0
-SRC_URI=https://github.com/janestreet/incremental/archive/v0.9.0.tar.gz -> incremental-0.9.0.tar.gz
-_md5_=c7da62dc11e948503b09cc116d5db992
diff --git a/dev-ml/incremental/Manifest b/dev-ml/incremental/Manifest
new file mode 100644
index 000000000000..fab5dc27165b
--- /dev/null
+++ b/dev-ml/incremental/Manifest
@@ -0,0 +1,3 @@
+DIST incremental-0.9.0.tar.gz 28822 BLAKE2B 0e369107c545e427609397d9d887a6d0eb295c222efa78fdd288bdf4e72000a79f49f3e40cacd593514f57dd94bfeaf23f2cb3fbecaee7bc09f3ede37165e3df SHA512 126b76e31920c56958b6c15319b636b5b5ea8bba56b8fab85c2b6fb2c3a4527b4759a05d0edfe3462e94e6348d7391e2578e82d35b160e31e6c88495c828f612
+EBUILD incremental-0.9.0.ebuild 747 BLAKE2B 114146f3645acf6c1c38e6aa1709a3ef433857b163931d637c60c42f5d777f0b043e08e03332d3dfa5229d554aae93646a1c537d37411d655404175c36b554ae SHA512 2f6eed60bc0e055aa020c6cb998663e31a2152386c630266ca76f6b119892914cfcd17d3832dd75665ba8b172bda255f49219083620bc4a1e286388a49e5983f
+MISC metadata.xml 334 BLAKE2B 6a31b530584abfa0cb44ac983c7f7342fada246a83259de5483cd5a34e652e13ef73a0d7b421a9a9cce3a56104c78a1951891ee145c8fd51230d38624891eeda SHA512 eb887e2f503198daf9e74c9b8321826dcc97bb98f51202b9a82ed0375427e639cc13a9f4b5f024007225e78065adaaa58d099a85e7b77ccc0b8b77bebb3a80b2
diff --git a/dev-ml/incremental/incremental-0.9.0.ebuild b/dev-ml/incremental/incremental-0.9.0.ebuild
new file mode 100644
index 000000000000..9137fce7860c
--- /dev/null
+++ b/dev-ml/incremental/incremental-0.9.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Library for incremental computations"
+HOMEPAGE="https://github.com/janestreet/incremental"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+ dev-lang/ocaml:=
+ dev-ml/core:=
+ dev-ml/incremental_kernel:=
+ dev-ml/ppx_driver:=
+ dev-ml/ppx_jane:=
+ dev-ml/ocaml-migrate-parsetree:=
+"
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND} dev-ml/opam dev-ml/jbuilder"
+
+src_install() {
+ opam-installer -i \
+ --prefix="${ED}/usr" \
+ --libdir="${D}/$(ocamlc -where)" \
+ --docdir="${ED}/usr/share/doc/${PF}" \
+ ${PN}.install || die
+}
diff --git a/dev-ml/incremental/metadata.xml b/dev-ml/incremental/metadata.xml
new file mode 100644
index 000000000000..a9552f869fb0
--- /dev/null
+++ b/dev-ml/incremental/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">janestreet/incremental</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/incremental_kernel-0.9.0 b/dev-ml/incremental_kernel-0.9.0
deleted file mode 100644
index 9b786d5c8cb6..000000000000
--- a/dev-ml/incremental_kernel-0.9.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-lang/ocaml:= dev-ml/core_kernel:= dev-ml/ppx_driver:= dev-ml/ppx_jane:= dev-ml/ocaml-migrate-parsetree:= <dev-ml/ppx_jane-100 <dev-ml/ppx_driver-100 dev-ml/opam dev-ml/jbuilder
-DESCRIPTION=Library for incremental computations depending only on Core_kernel
-EAPI=6
-HOMEPAGE=https://github.com/janestreet/incremental_kernel
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-lang/ocaml:= dev-ml/core_kernel:= dev-ml/ppx_driver:= dev-ml/ppx_jane:= dev-ml/ocaml-migrate-parsetree:= <dev-ml/ppx_jane-100 <dev-ml/ppx_driver-100
-SLOT=0/0.9.0
-SRC_URI=https://github.com/janestreet/incremental_kernel/archive/v0.9.0.tar.gz -> incremental_kernel-0.9.0.tar.gz
-_md5_=49080ea3672ab8c286f04e6f2b4f0783
diff --git a/dev-ml/incremental_kernel/Manifest b/dev-ml/incremental_kernel/Manifest
new file mode 100644
index 000000000000..4e4ac0037e0f
--- /dev/null
+++ b/dev-ml/incremental_kernel/Manifest
@@ -0,0 +1,3 @@
+DIST incremental_kernel-0.9.0.tar.gz 74255 BLAKE2B 160f3d3c91a54a0541ae7723bf6e5b34b0bc38d86425f066642b29e620159865b58f284c54ac1ed8b36756c5a84b8914c2fc50549fee5baa9860283b2f0d17b1 SHA512 e6e7abb736e838ef373153e0678965ad3b599cfe34299a3f2131b5afa198a1991b043be75ef348d0010f7b85babd407cbedca84efc43fa51b3abb016d721c52d
+EBUILD incremental_kernel-0.9.0.ebuild 808 BLAKE2B d1daea4e3e691e239a92b8650cb4eff8cad5bfa1f62b9fb894712693b0ae82955fd964f86b97a9c60e626dc48f8d55b7fe7901cbf0a812ed004f6826ebf0875c SHA512 649347a8c87b3bd786f998e22578277ae14e9dcf5f99de9c479ee70036db72c56f41220dfe5c6252d7f7db02d3a5570926748334cfe2a13d4b10179a4b31d1fe
+MISC metadata.xml 341 BLAKE2B b50f650e3d9ced564635efb1adc9d5b466cb04ec41cb52c6ca493d702d233fbc8cf5b1b300cf54bc602628c1c351195bf30a2f9651c5410253e9fc1687c3c901 SHA512 d2b9243474f1b98c68468de53cd028709a538d63cb3d0a840f1ed4e1eb0228aeab6021c49acfdc117c23c21a7d4b4aa407e8725bafd85684cbdacb009308b1d1
diff --git a/dev-ml/incremental_kernel/incremental_kernel-0.9.0.ebuild b/dev-ml/incremental_kernel/incremental_kernel-0.9.0.ebuild
new file mode 100644
index 000000000000..051daef8f837
--- /dev/null
+++ b/dev-ml/incremental_kernel/incremental_kernel-0.9.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Library for incremental computations depending only on Core_kernel"
+HOMEPAGE="https://github.com/janestreet/incremental_kernel"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+ dev-lang/ocaml:=
+ dev-ml/core_kernel:=
+ dev-ml/ppx_driver:=
+ dev-ml/ppx_jane:=
+ dev-ml/ocaml-migrate-parsetree:=
+ <dev-ml/ppx_jane-100
+ <dev-ml/ppx_driver-100
+"
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND} dev-ml/opam dev-ml/jbuilder"
+
+src_install() {
+ opam-installer -i \
+ --prefix="${ED}/usr" \
+ --libdir="${D}/$(ocamlc -where)" \
+ --docdir="${ED}/usr/share/doc/${PF}" \
+ ${PN}.install || die
+}
diff --git a/dev-ml/incremental_kernel/metadata.xml b/dev-ml/incremental_kernel/metadata.xml
new file mode 100644
index 000000000000..f6b329b16d64
--- /dev/null
+++ b/dev-ml/incremental_kernel/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">janestreet/incremental_kernel</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/integers-0.2.2 b/dev-ml/integers-0.2.2
deleted file mode 100644
index 0e68b1c8abfd..000000000000
--- a/dev-ml/integers-0.2.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=dev-lang/ocaml:= dev-ml/ocamlbuild dev-ml/opam dev-ml/topkg dev-ml/findlib
-DESCRIPTION=Various signed and unsigned integer types for OCaml
-EAPI=6
-HOMEPAGE=https://github.com/ocamllabs/ocaml-integers
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=MIT
-RDEPEND=dev-lang/ocaml:=
-SLOT=0/0.2.2
-SRC_URI=https://github.com/ocamllabs/ocaml-integers/releases/download/v0.2.2/integers-0.2.2.tbz
-_md5_=248014a6fbf873cfe7f96fb16208c3c6
diff --git a/dev-ml/integers/Manifest b/dev-ml/integers/Manifest
new file mode 100644
index 000000000000..6e2e2868e928
--- /dev/null
+++ b/dev-ml/integers/Manifest
@@ -0,0 +1,3 @@
+DIST integers-0.2.2.tbz 9155 BLAKE2B 7dcbf0a10cdd2f65683c590dcc18ab7a67540eb39b78500506b303afaf881d6322ac8014dff9a772d7b43cb9b4765dbf85cdb2d31a3a5a78cf5a8e674f18dfea SHA512 957ec87f385916a847eeccef1142d706cf2bf9024a4f0b97120f73a2eda4c049261078bc27227db14bfed53bf014da14a93ef75b515a851af72088bd8b04081a
+EBUILD integers-0.2.2.ebuild 724 BLAKE2B b8a46e4a19a2ba854cbdfad4844e44d18da832d3ebfffa61599f37168125643c7f9973026f70317106ce58f0032b696f8509f5420cf0cd8fcccb689a269156a1 SHA512 e70e8cb10db7e476ed2590025f8b7ae23657199dce1c2bdf4ed2e8a2a8a0dd876ea10c3aa3882d59f9a426bc24db02268c1f58f53d7d4c1cc6c1f2622bceca59
+MISC metadata.xml 336 BLAKE2B f48e8874302f1baebe61f0c9f1f44ce0a9cc75755c35b8b53bad762b17847d0b9b2d535135798fa67956e15c770d0d2f1aef49f3e67e4c54449f5127f08a5da3 SHA512 b7461b0c3d899ba8cc254fdecc4665d7238296516d3ce8d2aac02ba14a65fd1352eafa20762979f9f9d4118d832a365100488c09b136c9916906608d3d718635
diff --git a/dev-ml/integers/integers-0.2.2.ebuild b/dev-ml/integers/integers-0.2.2.ebuild
new file mode 100644
index 000000000000..4c4999134304
--- /dev/null
+++ b/dev-ml/integers/integers-0.2.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Various signed and unsigned integer types for OCaml"
+HOMEPAGE="https://github.com/ocamllabs/ocaml-integers"
+SRC_URI="https://github.com/ocamllabs/ocaml-integers/releases/download/v${PV}/${P}.tbz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="dev-lang/ocaml:="
+DEPEND="${RDEPEND}
+ dev-ml/ocamlbuild
+ dev-ml/opam
+ dev-ml/topkg
+ dev-ml/findlib"
+
+src_compile() {
+ ocaml pkg/pkg.ml build || die
+}
+
+src_install() {
+ opam-installer -i \
+ --prefix="${ED}/usr" \
+ --libdir="${D}/$(ocamlc -where)" \
+ --docdir="${ED}/usr/share/doc/${PF}" \
+ ${PN}.install || die
+}
diff --git a/dev-ml/integers/metadata.xml b/dev-ml/integers/metadata.xml
new file mode 100644
index 000000000000..637f8241fbad
--- /dev/null
+++ b/dev-ml/integers/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">ocamllabs/ocaml-integers</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/io-page-1.6.0 b/dev-ml/io-page-1.6.0
deleted file mode 100644
index 5eee836b734e..000000000000
--- a/dev-ml/io-page-1.6.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=test? ( dev-ml/ounit ) >=dev-lang/ocaml-4:= >=dev-ml/ocaml-cstruct-1.1.0:= >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=IO memory page library for Mirage backends
-EAPI=5
-HOMEPAGE=https://github.com/mirage/io-page https://mirage.io
-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?]
-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 983774947da124fb7d542ce25a218bb1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e oasis 9256ed89af74c3365ec888c00bfdfe43 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5f133b8102000fe96d1b3e549abf8129
diff --git a/dev-ml/io-page/Manifest b/dev-ml/io-page/Manifest
new file mode 100644
index 000000000000..ca95a5d0e44a
--- /dev/null
+++ b/dev-ml/io-page/Manifest
@@ -0,0 +1,3 @@
+DIST io-page-1.6.0.tar.gz 53078 BLAKE2B 97bca15ef93b2a7af507642465efb34345c670fde7223b17b81e0486a99f59cdcd6c88e83a84b8480ec416a3ec901d659715a4c89ea30b376b2d1a81fc4ff37e SHA512 f20394b72cd4104be53a3639d22a287f8a5c32f05e60a31123c15d8deb1feb9ca28b77d953b186b9e5667332c8992ddecb8980883ad64c41f06d4f5b6cda7cb6
+EBUILD io-page-1.6.0.ebuild 548 BLAKE2B 1470b706d7ffee9646ace4627b267cb929855e756ad6178b41d29c8a576728515adb483a7034fa3bc138601fe9da2cab318766941d4c8ccfa0114fc1d3c30e7a SHA512 9eadc10ac01fb3eeeb34321ccc780a3011f0da848b8472f7842ee2caa9dc69bd699eb5107b14d554db8813eb887db972bc6c9305bfb4eb67a8e9da70b89c1430
+MISC metadata.xml 356 BLAKE2B aa4e507e58fea44ff543db1b451ba61bd896ceb6a884753ed2b13fe26ed53f930042061aef1979155b4e36e4e80a0e9cfa657ac7172cf7dc44f5dc425821241d SHA512 ab13ecbb79aa01b0b7677920c6d018597da4dc25ebe0bced372d6330aaa50c70b4f6a5028846dfa18fd401170f0af7dc58325a9435c396e3f9123a8c0d03d234
diff --git a/dev-ml/io-page/io-page-1.6.0.ebuild b/dev-ml/io-page/io-page-1.6.0.ebuild
new file mode 100644
index 000000000000..3811923910e4
--- /dev/null
+++ b/dev-ml/io-page/io-page-1.6.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+OASIS_BUILD_TESTS=1
+
+inherit oasis
+
+DESCRIPTION="IO memory page library for Mirage backends"
+HOMEPAGE="https://github.com/mirage/io-page https://mirage.io"
+SRC_URI="https://github.com/mirage/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+ >=dev-lang/ocaml-4:=
+ >=dev-ml/ocaml-cstruct-1.1.0:=
+"
+DEPEND="
+ test? ( dev-ml/ounit )
+ ${RDEPEND}
+"
+
+DOCS=( CHANGES README.md )
diff --git a/dev-ml/io-page/metadata.xml b/dev-ml/io-page/metadata.xml
new file mode 100644
index 000000000000..fe15850868be
--- /dev/null
+++ b/dev-ml/io-page/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">mirage/io-page</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/jane-street-headers-0.9.0 b/dev-ml/jane-street-headers-0.9.0
deleted file mode 100644
index 1606ffd3aacb..000000000000
--- a/dev-ml/jane-street-headers-0.9.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-lang/ocaml:= dev-ml/opam dev-ml/jbuilder
-DESCRIPTION=Jane Street header files
-EAPI=6
-HOMEPAGE=https://github.com/janestreet/jane-street-headers
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-lang/ocaml:=
-SLOT=0/0.9.0
-SRC_URI=https://github.com/janestreet/jane-street-headers/archive/v0.9.0.tar.gz -> jane-street-headers-0.9.0.tar.gz
-_md5_=6ef42218f48fa6b61eb33f32782d9f86
diff --git a/dev-ml/jane-street-headers/Manifest b/dev-ml/jane-street-headers/Manifest
new file mode 100644
index 000000000000..ab1231e2425a
--- /dev/null
+++ b/dev-ml/jane-street-headers/Manifest
@@ -0,0 +1,3 @@
+DIST jane-street-headers-0.9.0.tar.gz 6713 BLAKE2B fa8461922ad5e9c28fecb29bfb630d6b1578c8440ad82ab841da17c32ebdfef8ecac90ca66721aef06321a085e2b927904ced4c5a1c8ee6b3cc969dfcbf761bd SHA512 dbd1198b7eb45f06f7df6e9c5b66589b6004e9424f2ecdd50d20c3dc2f35048c42f9220f1d03b4b6564e7a79d00dbe3b3c9c767600e78d066266093b8d93ad46
+EBUILD jane-street-headers-0.9.0.ebuild 626 BLAKE2B 53aa369402df9d8377cdc0aa23f7b02e35f6f8abce6d603d2188d12ced722549c50b2fa41fae3173275154dfabbcb9ffe87eb3ef883fdaeffc46dedbe4cd22b5 SHA512 3194fe61bb91c720740fa9562dfde9d08bdd821df9aa8880de8ebe339febd69aa45b08c9d11b34bafc22b47360fbb4f89d0f6a36ee063162dcd3629d3f031b17
+MISC metadata.xml 342 BLAKE2B d1bc0555577546974da28cb33fa788bbfcb9cf44b0c677706b0fe9a026d4d10931c80230e158cab957c6578e6e44b99f322e83af4d8e646d89ef37a6f4aa124f SHA512 c8e7ab444e40902a96344cb2af90c78567fadde0387f2cbb0660bfd4d3de1aaebeb6130824567808a1d2406d09fb557063b1cf0b7b2c1d0e264b51359d57f2ab
diff --git a/dev-ml/jane-street-headers/jane-street-headers-0.9.0.ebuild b/dev-ml/jane-street-headers/jane-street-headers-0.9.0.ebuild
new file mode 100644
index 000000000000..66f7cb6cec81
--- /dev/null
+++ b/dev-ml/jane-street-headers/jane-street-headers-0.9.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Jane Street header files"
+HOMEPAGE="https://github.com/janestreet/jane-street-headers"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+ dev-lang/ocaml:=
+ "
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND} dev-ml/opam dev-ml/jbuilder"
+
+src_install() {
+ opam-installer -i \
+ --prefix="${ED}/usr" \
+ --libdir="${D}/$(ocamlc -where)" \
+ --docdir="${ED}/usr/share/doc/${PF}" \
+ ${PN}.install || die
+}
diff --git a/dev-ml/jane-street-headers/metadata.xml b/dev-ml/jane-street-headers/metadata.xml
new file mode 100644
index 000000000000..8da2fe7c5030
--- /dev/null
+++ b/dev-ml/jane-street-headers/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">janestreet/jane-street-headers</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/jbuilder-1.0_beta14 b/dev-ml/jbuilder-1.0_beta14
deleted file mode 100644
index 50fd6012baa8..000000000000
--- a/dev-ml/jbuilder-1.0_beta14
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=test? ( dev-ml/menhir ) >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=A composable build system for OCaml
-EAPI=5
-HOMEPAGE=https://github.com/janestreet/jbuilder
-IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-lang/ocaml-4:=
-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 24b4a2529c1fd12f1304856d6c5a690d
-_md5_=281533637252a9fb9df3516f20d92c45
diff --git a/dev-ml/jbuilder/Manifest b/dev-ml/jbuilder/Manifest
new file mode 100644
index 000000000000..01d7b242d9c2
--- /dev/null
+++ b/dev-ml/jbuilder/Manifest
@@ -0,0 +1,3 @@
+DIST jbuilder-1.0-beta14.tar.gz 268571 BLAKE2B 509fded43004426fa0bc0d692c50ef2fcc97dc3aa22010bf306f993a3964110cc3f5b3b0ae33a0ea64d00500d70e846450f73142edfef74af75931b99977e9fd SHA512 0258067b0b48dbd22c0d25b65fcb1fe9a7e65f9389031f954fab7cccf4e0791fe2242f85d441f23e284d13a0b1a3f4485546f94008211adef7b58fd14c4091d3
+EBUILD jbuilder-1.0_beta14.ebuild 718 BLAKE2B f15663a9bf73f56951e90a82b9cd0abaf7e750cc13ef9f2a956c055f5ee7578292bc3a2691c78c7dbc52454899d768eebfa6cd21bdba76f7f994af541dd1b096 SHA512 4859e7419752b4426531a4f49ff62d7c1e368421d182c21b592520fc742eae7108cbc35d5274c1e01bac06465cd978bd13c39b8cb9669ff6a0593ad7be433687
+MISC metadata.xml 331 BLAKE2B c553879cf1d35a284445312c208152b9307aa76394c92c4af1d5a3b59e2924ee102fbe326793334daa4b509ba82a07d4b07d7f1770f4b613377f25833880e22a SHA512 7049d46a80d47edb789903a4585524ebeeeb85f7c1aca23ac79a21c49f97879b89e76d46c2c0a55463e7fceb9a46fdd56458f5ce88076b447a14c08f4c189073
diff --git a/dev-ml/jbuilder/jbuilder-1.0_beta14.ebuild b/dev-ml/jbuilder/jbuilder-1.0_beta14.ebuild
new file mode 100644
index 000000000000..73b64735ff87
--- /dev/null
+++ b/dev-ml/jbuilder/jbuilder-1.0_beta14.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit opam
+
+MY_PV="${PV/_/+}"
+MY_P="${PN}-${PV/_/-}"
+
+DESCRIPTION="A composable build system for OCaml"
+HOMEPAGE="https://github.com/janestreet/jbuilder"
+SRC_URI="https://github.com/janestreet/jbuilder/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE="test"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND}
+ test? ( dev-ml/menhir )
+"
+OPAMSWITCH="system"
+
+S="${WORKDIR}/${MY_P}"
+OPAMROOT="${D}"
+
+src_prepare() {
+ # Disable Werror like behavior, doesnt build with ocaml 4.05 otherwise
+ sed -i -e 's/--dev//' Makefile || die
+}
diff --git a/dev-ml/jbuilder/metadata.xml b/dev-ml/jbuilder/metadata.xml
new file mode 100644
index 000000000000..9f016f75c9de
--- /dev/null
+++ b/dev-ml/jbuilder/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">janestreet/jbuilder</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/js-build-tools-113.33.04 b/dev-ml/js-build-tools-113.33.04
deleted file mode 100644
index 813a5eeee583..000000000000
--- a/dev-ml/js-build-tools-113.33.04
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ml/ocamlbuild:= dev-ml/opam >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=Collection of tools to help building Jane Street Packages
-EAPI=5
-HOMEPAGE=https://github.com/janestreet/js-build-tools
-IUSE=+ocamlopt debug doc test
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-ml/ocamlbuild:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
-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 983774947da124fb7d542ce25a218bb1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e oasis 9256ed89af74c3365ec888c00bfdfe43 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=fdc5f59e4232d59f6388e9cfc27c8b6f
diff --git a/dev-ml/js-build-tools-113.33.06 b/dev-ml/js-build-tools-113.33.06
deleted file mode 100644
index dbad6051e03c..000000000000
--- a/dev-ml/js-build-tools-113.33.06
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ml/ocamlbuild:= dev-ml/opam >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=Collection of tools to help building Jane Street Packages
-EAPI=5
-HOMEPAGE=https://github.com/janestreet/js-build-tools
-IUSE=+ocamlopt debug doc test
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-ml/ocamlbuild:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
-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 983774947da124fb7d542ce25a218bb1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e oasis 9256ed89af74c3365ec888c00bfdfe43 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=fdc5f59e4232d59f6388e9cfc27c8b6f
diff --git a/dev-ml/js-build-tools/Manifest b/dev-ml/js-build-tools/Manifest
new file mode 100644
index 000000000000..01bf26824977
--- /dev/null
+++ b/dev-ml/js-build-tools/Manifest
@@ -0,0 +1,5 @@
+DIST js-build-tools-113.33.04.tar.gz 53125 BLAKE2B a9754aae8bd4cc8a043d846ad3dfcf27d7bd18fca90c3a3ec470f3ec2b02361b84205fca68ebf5de3bac03cac94121f551c97815fd678584f87fa8681a17897e SHA512 80e5ec052a3957fe0871d3ddf5ce7cb18f6942360388508cf0afaa6fb251a3a37cdb72b8bf5ae05b390e781bec2e78cb546e460772aad4ef563a49137c5d378a
+DIST js-build-tools-113.33.06.tar.gz 53942 BLAKE2B d8c09180781be5cf7998175d46678cc9d74299d6b2c95297e9b682b53961b9cd006e675ad72d944d7e773dd8cad6ab72dfe9840f18212ed29c2a14612bf871c0 SHA512 69e755843971cc8944033ff9539ca26b8c56a3492e11cb8778bb35a40e1af2cbacad30d67de1734ca70722e1aaa68d4d5d405794315f2848cec358dd9736b14c
+EBUILD js-build-tools-113.33.04.ebuild 803 BLAKE2B 7b2322f44a5fc2d79362f5d79c255754eeea16b64ea93d86e6c8845afcc0fcc0664cbcca3832835e02c6a27b5d6bceb1235faa7f38b514fab388c4174889eb8e SHA512 bf5d330df8de790a637911b4403905bc8369b4e047145632035831438811de97256ddb1497991613f4c8b9e005ca716fb21eb7b9212e496c16a35b950ec4a06e
+EBUILD js-build-tools-113.33.06.ebuild 803 BLAKE2B 7b2322f44a5fc2d79362f5d79c255754eeea16b64ea93d86e6c8845afcc0fcc0664cbcca3832835e02c6a27b5d6bceb1235faa7f38b514fab388c4174889eb8e SHA512 bf5d330df8de790a637911b4403905bc8369b4e047145632035831438811de97256ddb1497991613f4c8b9e005ca716fb21eb7b9212e496c16a35b950ec4a06e
+MISC metadata.xml 410 BLAKE2B a63b49f5c2e5d9452a340f6f9470ad882d1150a5ff4cd8194ffc6cf843b701767e81f0b372759f3c5dfe979576b63c0e86cfebecf58f46d1484855e0735ba0dd SHA512 297ba1ee1793237261de4b3ee7364efc01bb676d38169f3ad6ccc2f1da6b69aa9617b101963af9530f2a9a11910530ea8c580dbddac61e0aa5fd7804d5acf759
diff --git a/dev-ml/js-build-tools/js-build-tools-113.33.04.ebuild b/dev-ml/js-build-tools/js-build-tools-113.33.04.ebuild
new file mode 100644
index 000000000000..a1e9e8f0ee66
--- /dev/null
+++ b/dev-ml/js-build-tools/js-build-tools-113.33.04.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+OASIS_BUILD_DOCS=1
+OASIS_BUILD_TESTS=1
+
+inherit oasis
+
+DESCRIPTION="Collection of tools to help building Jane Street Packages"
+HOMEPAGE="https://github.com/janestreet/js-build-tools"
+SRC_URI="http://ocaml.janestreet.com/ocaml-core/${PV%.*}/files/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="dev-ml/ocamlbuild:="
+DEPEND="${RDEPEND} dev-ml/opam"
+
+src_configure() {
+ emake setup.exe
+ OASIS_SETUP_COMMAND="./setup.exe" oasis_src_configure
+}
+
+src_compile() {
+ emake
+}
+
+src_install() {
+ opam-installer -i \
+ --prefix="${ED}/usr" \
+ --libdir="${D}/$(ocamlc -where)" \
+ --docdir="${ED}/usr/share/doc/${PF}" \
+ ${PN}.install || die
+ dodoc README.md
+}
diff --git a/dev-ml/js-build-tools/js-build-tools-113.33.06.ebuild b/dev-ml/js-build-tools/js-build-tools-113.33.06.ebuild
new file mode 100644
index 000000000000..a1e9e8f0ee66
--- /dev/null
+++ b/dev-ml/js-build-tools/js-build-tools-113.33.06.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+OASIS_BUILD_DOCS=1
+OASIS_BUILD_TESTS=1
+
+inherit oasis
+
+DESCRIPTION="Collection of tools to help building Jane Street Packages"
+HOMEPAGE="https://github.com/janestreet/js-build-tools"
+SRC_URI="http://ocaml.janestreet.com/ocaml-core/${PV%.*}/files/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="dev-ml/ocamlbuild:="
+DEPEND="${RDEPEND} dev-ml/opam"
+
+src_configure() {
+ emake setup.exe
+ OASIS_SETUP_COMMAND="./setup.exe" oasis_src_configure
+}
+
+src_compile() {
+ emake
+}
+
+src_install() {
+ opam-installer -i \
+ --prefix="${ED}/usr" \
+ --libdir="${D}/$(ocamlc -where)" \
+ --docdir="${ED}/usr/share/doc/${PF}" \
+ ${PN}.install || die
+ dodoc README.md
+}
diff --git a/dev-ml/js-build-tools/metadata.xml b/dev-ml/js-build-tools/metadata.xml
new file mode 100644
index 000000000000..632af8452e65
--- /dev/null
+++ b/dev-ml/js-build-tools/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="bitbucket">yminsky/ocaml-core</remote-id>
+ <remote-id type="github">janestreet/js-build-tools</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/js_of_ocaml-2.8.4-r2 b/dev-ml/js_of_ocaml-2.8.4-r2
deleted file mode 100644
index 17136e34126f..000000000000
--- a/dev-ml/js_of_ocaml-2.8.4-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?,X?] >=dev-ml/lwt-2.4.4:=[camlp4(+)] react? ( dev-ml/react:= dev-ml/reactiveData:= ) xml? ( >=dev-ml/tyxml-4:= ) ppx? ( dev-ml/ppx_tools:= dev-ml/ppx_deriving:= dev-ml/ppx_driver:= ) dev-ml/cmdliner:= dev-ml/menhir:= dev-ml/ocaml-base64:= dev-ml/camlp4:= dev-ml/cppo:= dev-ml/uchar:= dev-ml/ocamlbuild:= dev-ml/yojson:= dev-ml/ocaml-migrate-parsetree:= deriving? ( >=dev-ml/deriving-0.6:= ) >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=A compiler from OCaml bytecode to javascript
-EAPI=5
-HOMEPAGE=http://ocsigen.org/js_of_ocaml/
-IUSE=+ocamlopt doc +deriving +ppx +react +xml X
-KEYWORDS=~amd64
-LICENSE=LGPL-2.1-with-linking-exception
-RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?,X?] >=dev-ml/lwt-2.4.4:=[camlp4(+)] react? ( dev-ml/react:= dev-ml/reactiveData:= ) xml? ( >=dev-ml/tyxml-4:= ) ppx? ( dev-ml/ppx_tools:= dev-ml/ppx_deriving:= dev-ml/ppx_driver:= ) dev-ml/cmdliner:= dev-ml/menhir:= dev-ml/ocaml-base64:= dev-ml/camlp4:= dev-ml/cppo:= dev-ml/uchar:= dev-ml/ocamlbuild:= dev-ml/yojson:= 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 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d1076348e2e995e922fb6497b7e252ba
diff --git a/dev-ml/js_of_ocaml-3.0.0 b/dev-ml/js_of_ocaml-3.0.0
deleted file mode 100644
index a9bb750ce7d9..000000000000
--- a/dev-ml/js_of_ocaml-3.0.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=>=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:= ) dev-ml/jbuilder dev-ml/opam test? ( dev-util/patdiff ) >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=A compiler from OCaml bytecode to javascript
-EAPI=5
-HOMEPAGE=http://ocsigen.org/js_of_ocaml/
-IUSE=+ocamlopt +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 )
-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 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7b0ac6d60087ed4e9921892d3d8547b6
diff --git a/dev-ml/js_of_ocaml-9999 b/dev-ml/js_of_ocaml-9999
deleted file mode 100644
index ad87acd4ccd5..000000000000
--- a/dev-ml/js_of_ocaml-9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=>=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:= ) dev-ml/jbuilder dev-ml/opam test? ( dev-util/patdiff ) >=dev-ml/findlib-1.0.4-r1 >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=A compiler from OCaml bytecode to javascript
-EAPI=5
-HOMEPAGE=http://ocsigen.org/js_of_ocaml/
-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 )
-SLOT=0/9999
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 git-r3 8f6de46b0aa318aea0e8cac62ece098b ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1409ef1c5ac0ae0ade05e3662d0ce652
diff --git a/dev-ml/js_of_ocaml/Manifest b/dev-ml/js_of_ocaml/Manifest
new file mode 100644
index 000000000000..c54245439547
--- /dev/null
+++ b/dev-ml/js_of_ocaml/Manifest
@@ -0,0 +1,8 @@
+AUX ocaml405.patch 1795 BLAKE2B 63db628b51cbf8ef91d223f20109d82d4e4de971219b2974a135d76ef587ac72e61445875fe875f309c07b99c795da0e329823727446ce6cd563e116a5359448 SHA512 6256e9042d3077fdb1b39ed3972abc80a05719be74d63bd049cc35084e07f8eca2d57b74d0aeb299954d49c5c4f8609c2c052fb0a050957d81438a4fd6579370
+AUX ppx.patch 542 BLAKE2B 4ec12f99067e811412564f648ed63c0b894849fb1b19779df9ad6a504ae54eba1c9c26f9f269a742d53f50b2dd28d42d0ad64e484c0b13674e78767a3a8d8ff6 SHA512 f8220bad4ee7df4191d0e69d3283e09bb167769ddd14e7906780c0ef31308074fcffa063a28fb0b6479724f72e28c23592f57388e256f44701a50de309b6e7f7
+DIST js_of_ocaml-2.8.4.tar.gz 1344082 BLAKE2B f7f24e422a906d14ccf26b65de00c4d08726058cb14113c60527e337a14b6e2e65fc6dcda76dcffe3139c5fc7b5b2c1111ecb3ceaf820697581fed7cd35d097d SHA512 8dc65bac7d60f2d3534e31e0fddb061f1b97bfd8146b1a34b4a1a516574c6a39f66d115646aa9767b7e24a51ec76949b05841088601f97d76972c8899a50c4fd
+DIST js_of_ocaml-3.0.0.tar.gz 1433377 BLAKE2B c4d696adc90c8caacf725f7b691b9f57199385f6137356da8562d63b95c5089317064e36d343f524713df600e07f04d8b530b591cb5532f0dffa4ae143dd8f4b SHA512 dc4bbbfdacb43338aa7f97b7012b6de8a2eac5d7c5f535ceb9565c477c961a212ce5b2a75b1719fcd9f2d57938ee2162f6f04d3364397a469d7a13d1fe4e3908
+EBUILD js_of_ocaml-2.8.4-r2.ebuild 1939 BLAKE2B 1a4df5f22dbfb072132a1071950d98b5d1fc5b2e3c32600c8835b3c7ea7f767876316dad6fbbca07a81d16b1c5bd91b68ad430fcf430f0b78ddc15842f680ddb SHA512 ad5ccdb110f22c0d58b7c4e45833033a6cddd4320f800f5248536c71af6b7df307ad9d411b1b1c064afbae4d72e3cad89b080e86ca570e212b023b96ca76dc6f
+EBUILD js_of_ocaml-3.0.0.ebuild 1692 BLAKE2B d7c2d13b0d51c62ee8f0ccfbb74bfcc7e7584d8d005669aadb3773d0a59c08b87b41b5d1d97ea3098d0b39f6b40a5a58c2c7c4069912ab6733a8cd22350e6f59 SHA512 8e98827f163d82d7d0f1b9f52e3e0a946ae3c64a2c696b2461519b732e16a947dc4e04e01a63f083a9f8c84909ad31ea024b199d58aaf992723f198f2705f145
+EBUILD js_of_ocaml-9999.ebuild 1616 BLAKE2B 41a9a14e319f2560264a197ea12adacf7d40941a61e054f16d05c1028f76df158d36261564673cac38145c41bc596b0f233dfdd8c1ceff7921f4f81e8b1716df SHA512 6e751689aabce36b5868e36d7174849a674a9a86b2f7ccd29bbdc1fcab12794ac11ff12951b0b38ff88120512521a2931161c80a586029aca8ea9aaa14d544c8
+MISC metadata.xml 716 BLAKE2B 84f799a7fce1817468f82d16e4cea7bd78b1ce9b958e5ff8a3862239777bf382f73ebc7e98390d03e627d21e23c8cf52ddd3fb00f34b012b17048962fdcca026 SHA512 1029dde32c4d38fe8a9fcd23b071f7c6c66a51c5cb07aad75f36711eba76b6764b837ed97c076eb68203b754e35c0360be5fd7a2f08697621f51892ebaf32696
diff --git a/dev-ml/js_of_ocaml/files/ocaml405.patch b/dev-ml/js_of_ocaml/files/ocaml405.patch
new file mode 100644
index 000000000000..552dff425c46
--- /dev/null
+++ b/dev-ml/js_of_ocaml/files/ocaml405.patch
@@ -0,0 +1,41 @@
+Index: js_of_ocaml-2.8.4/lib/ppx/ppx_js.ml
+===================================================================
+--- js_of_ocaml-2.8.4.orig/lib/ppx/ppx_js.ml
++++ js_of_ocaml-2.8.4/lib/ppx/ppx_js.ml
+@@ -162,7 +162,8 @@ let invoker ?(extra_types = []) uplift d
+ {[ fun (type res t0 t1 ..) arg1 arg2 -> e ]}
+ *)
+ let local_types =
+- res :: List.map Arg.name (extra_types @ arguments)
++ List.map Location.mknoloc
++ (res :: List.map Arg.name (extra_types @ arguments))
+ in
+ let result = List.fold_right Exp.newtype local_types invoker in
+
+@@ -210,7 +211,7 @@ let method_call ~loc obj meth args =
+ (Exp.fun_ ~loc ~attrs:[merlin_noloc] Label.nolabel None
+ (Pat.var ~loc ~attrs:[merlin_noloc] (Location.mknoloc "x"))
+ (Exp.send ~loc ~attrs:[merlin_noloc]
+- (Exp.ident ~loc:gloc (lid ~loc:gloc "x")) meth))]
++ (Exp.ident ~loc:gloc (lid ~loc:gloc "x")) (Location.mknoloc meth)))]
+ )
+
+ (* {[ obj##.prop ]} generates
+@@ -244,7 +245,7 @@ let prop_get ~loc:_ ~prop_loc obj prop =
+ (Exp.fun_ ~loc:gloc Label.nolabel None
+ (Pat.var ~loc:gloc ~attrs:[merlin_noloc] (Location.mknoloc "x"))
+ (Exp.send ~loc:prop_loc ~attrs:[merlin_noloc]
+- (Exp.ident ~loc:gloc (lid ~loc:gloc "x")) prop))
++ (Exp.ident ~loc:gloc (lid ~loc:gloc "x")) (Location.mknoloc prop)))
+ ]
+ )
+
+@@ -289,7 +290,7 @@ let prop_set ~loc ~prop_loc obj prop val
+ (Exp.fun_ ~loc Label.nolabel None
+ (Pat.var ~loc:gloc ~attrs:[merlin_noloc] (Location.mknoloc "x"))
+ (Exp.send ~loc:prop_loc ~attrs:[merlin_noloc]
+- (Exp.ident ~loc:gloc (lid ~loc:gloc "x")) prop))
++ (Exp.ident ~loc:gloc (lid ~loc:gloc "x")) (Location.mknoloc prop)))
+ ]
+ )
+
diff --git a/dev-ml/js_of_ocaml/files/ppx.patch b/dev-ml/js_of_ocaml/files/ppx.patch
new file mode 100644
index 000000000000..c46293f546da
--- /dev/null
+++ b/dev-ml/js_of_ocaml/files/ppx.patch
@@ -0,0 +1,11 @@
+Index: js_of_ocaml-2.8.4/lib/ppx_driver/ppx_js_driver.ml
+===================================================================
+--- js_of_ocaml-2.8.4.orig/lib/ppx_driver/ppx_js_driver.ml
++++ js_of_ocaml-2.8.4/lib/ppx_driver/ppx_js_driver.ml
+@@ -1,5 +1,5 @@
+ let () =
+ let js_mapper = Ppx_js.js_mapper [] in
+- Ppx_driver.register_transformation "js_of_ocaml"
++ Ppx_driver.register_transformation_using_ocaml_current_ast "js_of_ocaml"
+ ~impl:(js_mapper.Ast_mapper.structure js_mapper)
+ ~intf:(js_mapper.Ast_mapper.signature js_mapper)
diff --git a/dev-ml/js_of_ocaml/js_of_ocaml-2.8.4-r2.ebuild b/dev-ml/js_of_ocaml/js_of_ocaml-2.8.4-r2.ebuild
new file mode 100644
index 000000000000..ebc669e81c2a
--- /dev/null
+++ b/dev-ml/js_of_ocaml/js_of_ocaml-2.8.4-r2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit findlib eutils
+
+DESCRIPTION="A compiler from OCaml bytecode to javascript"
+HOMEPAGE="http://ocsigen.org/js_of_ocaml/"
+
+if [ "${PV#9999}" != "${PV}" ] ; then
+ inherit git-r3
+ SRC_URI=""
+ EGIT_REPO_URI="https://github.com/ocsigen/js_of_ocaml"
+ KEYWORDS=""
+else
+ SRC_URI="https://github.com/ocsigen/js_of_ocaml/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64"
+fi
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+IUSE="+ocamlopt doc +deriving +ppx +react +xml X"
+
+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:= )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ epatch "${FILESDIR}/ppx.patch"
+ has_version '>=dev-lang/ocaml-4.05_rc' && epatch "${FILESDIR}/ocaml405.patch"
+}
+
+src_configure() {
+ printf "\n\n" >> Makefile.conf
+ use ocamlopt || echo "BEST := byte" >> Makefile.conf
+ use ocamlopt || echo "NATDYNLINK := NO" >> Makefile.conf
+ use deriving || echo "WITH_DERIVING := NO" >> Makefile.conf
+ use X || echo "WITH_GRAPHICS := NO" >> Makefile.conf
+ use react || echo "WITH_REACT := NO" >> Makefile.conf
+ use ppx || echo "WITH_PPX := NO" >> Makefile.conf
+ use ppx || echo "WITH_PPX_DERIVING := NO" >> Makefile.conf
+ use ppx || echo "WITH_PPX_DRIVER := NO" >> Makefile.conf
+ echo "WITH_ASYNC := NO" >> Makefile.conf
+}
+
+src_compile() {
+ emake -j1
+ use doc && emake doc
+}
+
+src_install() {
+ findlib_src_preinst
+ emake BINDIR="${ED}/usr/bin/" install
+ dodoc CHANGES README.md
+ use doc && dohtml -r doc/api/html/
+}
diff --git a/dev-ml/js_of_ocaml/js_of_ocaml-3.0.0.ebuild b/dev-ml/js_of_ocaml/js_of_ocaml-3.0.0.ebuild
new file mode 100644
index 000000000000..b7f93be62778
--- /dev/null
+++ b/dev-ml/js_of_ocaml/js_of_ocaml-3.0.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit findlib eutils
+
+DESCRIPTION="A compiler from OCaml bytecode to javascript"
+HOMEPAGE="http://ocsigen.org/js_of_ocaml/"
+
+if [ "${PV#9999}" != "${PV}" ] ; then
+ inherit git-r3
+ SRC_URI=""
+ EGIT_REPO_URI="https://github.com/ocsigen/js_of_ocaml"
+ KEYWORDS=""
+else
+ SRC_URI="https://github.com/ocsigen/js_of_ocaml/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ # Breaks dev-ml/eliom dev-ml/async_js dev-ml/ocsigen-toolkit
+ KEYWORDS=""
+ #KEYWORDS="~amd64"
+fi
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+IUSE="+ocamlopt +camlp4 +lwt doc +deriving +ppx +xml test"
+
+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:= )
+"
+DEPEND="${RDEPEND}
+ dev-ml/jbuilder
+ dev-ml/opam
+ test? ( dev-util/patdiff )
+"
+REQUIRED_USE="xml? ( ppx )"
+
+src_compile() {
+ emake
+ use doc && emake doc
+}
+
+oinstall() {
+ opam-installer -i \
+ --prefix="${ED}/usr" \
+ --libdir="${D}/$(ocamlc -where)" \
+ --docdir="${ED}/usr/share/doc/${PF}" \
+ --mandir="${ED}/usr/share/man" \
+ ${1}.install || die
+}
+
+src_install() {
+ use camlp4 && oinstall js_of_ocaml-camlp4
+ oinstall js_of_ocaml-compiler
+ use lwt && oinstall js_of_ocaml-lwt
+ oinstall js_of_ocaml-ocamlbuild
+ oinstall js_of_ocaml
+ use ppx && oinstall js_of_ocaml-ppx
+ use ppx && oinstall js_of_ocaml-toplevel
+ use xml && oinstall js_of_ocaml-tyxml
+}
diff --git a/dev-ml/js_of_ocaml/js_of_ocaml-9999.ebuild b/dev-ml/js_of_ocaml/js_of_ocaml-9999.ebuild
new file mode 100644
index 000000000000..9fe8dff84edd
--- /dev/null
+++ b/dev-ml/js_of_ocaml/js_of_ocaml-9999.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit findlib eutils
+
+DESCRIPTION="A compiler from OCaml bytecode to javascript"
+HOMEPAGE="http://ocsigen.org/js_of_ocaml/"
+
+if [ "${PV#9999}" != "${PV}" ] ; then
+ inherit git-r3
+ SRC_URI=""
+ EGIT_REPO_URI="https://github.com/ocsigen/js_of_ocaml"
+ KEYWORDS=""
+else
+ SRC_URI="https://github.com/ocsigen/js_of_ocaml/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64"
+fi
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+IUSE="+ocamlopt +camlp4 +lwt doc +deriving +ppx +xml test"
+
+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:= )
+"
+DEPEND="${RDEPEND}
+ dev-ml/jbuilder
+ dev-ml/opam
+ test? ( dev-util/patdiff )
+"
+REQUIRED_USE="xml? ( ppx )"
+
+src_compile() {
+ emake
+ use doc && emake doc
+}
+
+oinstall() {
+ opam-installer -i \
+ --prefix="${ED}/usr" \
+ --libdir="${D}/$(ocamlc -where)" \
+ --docdir="${ED}/usr/share/doc/${PF}" \
+ --mandir="${ED}/usr/share/man" \
+ ${1}.install || die
+}
+
+src_install() {
+ use camlp4 && oinstall js_of_ocaml-camlp4
+ oinstall js_of_ocaml-compiler
+ use lwt && oinstall js_of_ocaml-lwt
+ oinstall js_of_ocaml-ocamlbuild
+ oinstall js_of_ocaml
+ use ppx && oinstall js_of_ocaml-ppx
+ use ppx && oinstall js_of_ocaml-toplevel
+ use xml && oinstall js_of_ocaml-tyxml
+}
diff --git a/dev-ml/js_of_ocaml/metadata.xml b/dev-ml/js_of_ocaml/metadata.xml
new file mode 100644
index 000000000000..0e7d31b0a342
--- /dev/null
+++ b/dev-ml/js_of_ocaml/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <use>
+ <flag name="camlp4">Build with camlp4 syntax extensions.</flag>
+ <flag name="deriving">Enable <pkg>dev-ml/deriving</pkg> support for improving the type safety.</flag>
+ <flag name="lwt">Enable <pkg>dev-ml/lwt</pkg> support.</flag>
+ <flag name="ppx">Enables the ppx syntax extension</flag>
+ <flag name="react">Enable functionnal reactive programming support.</flag>
+ </use>
+ <upstream>
+ <remote-id type="github">ocsigen/js_of_ocaml</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/jsonm-1.0.1 b/dev-ml/jsonm-1.0.1
deleted file mode 100644
index 553d25e0fcf6..000000000000
--- a/dev-ml/jsonm-1.0.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=>=dev-ml/uutf-1.0.0:= dev-lang/ocaml:= dev-ml/uchar:= dev-ml/topkg dev-ml/ocamlbuild dev-ml/findlib >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Non-blocking streaming JSON codec for OCaml
-EAPI=5
-HOMEPAGE=http://erratique.ch/software/jsonm
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
-LICENSE=ISC
-RDEPEND=>=dev-ml/uutf-1.0.0:= dev-lang/ocaml:= dev-ml/uchar:=
-SLOT=0/1.0.1
-SRC_URI=http://erratique.ch/software/jsonm/releases/jsonm-1.0.1.tbz
-_eclasses_=findlib 45d6030075064a68da8d7143726a1150
-_md5_=b43f5749f7d472155a39fdfb392a7d7b
diff --git a/dev-ml/jsonm/Manifest b/dev-ml/jsonm/Manifest
new file mode 100644
index 000000000000..5d45c4205b56
--- /dev/null
+++ b/dev-ml/jsonm/Manifest
@@ -0,0 +1,3 @@
+DIST jsonm-1.0.1.tbz 21608 BLAKE2B 4d3ce2a3430176df0876aeb6276a48bf23e51ebee2a1a46e5b25a370b26ba27c9ba09ff01365396123de4851d8f263c4c86c3176b13118910fd458ad3b23d80b SHA512 e86e225073b429f71063af14ad39b87498609db6a122b39e1a739c5b77fcde487bf6b17235b2f9742b7d22aca0f6d475fdba1b0bab2a6329cf7e681fe43d31a6
+EBUILD jsonm-1.0.1.ebuild 956 BLAKE2B 69f855de32d5f768286d00c9aaa4fcfc61d72d50dc18b9f859f31a8852ad7882677f69a12a3c95d3d33ec9f73cd8e4076b47c6f6759981be65c6d074521615a1 SHA512 94979d56db050b8ab3a834de1915f3fe95c679193643b738dc66fa47772a65983d12874fdbe25d39b7ff1e76bbcccd49783852f9ad9fdc975b9203ccad7c3ae7
+MISC metadata.xml 243 BLAKE2B 010ca240ae06e9a9f6d7ba213eb06df36d9ba862ff2d2458d98a9fea1a1e7f3026d13832a73bce1b3ad9345029425e6abfae9e03bf126f2329b3f030ed3753fd SHA512 1c5b4b2163017e496999d1f87e5c9c5ac6c11b2e9187450ccfb3df258f34e54d278972f04ee0e8429476c6f87e091a869ac2a28c6e8c8e6d20678c3e74061449
diff --git a/dev-ml/jsonm/jsonm-1.0.1.ebuild b/dev-ml/jsonm/jsonm-1.0.1.ebuild
new file mode 100644
index 000000000000..301132978611
--- /dev/null
+++ b/dev-ml/jsonm/jsonm-1.0.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit findlib
+
+DESCRIPTION="Non-blocking streaming JSON codec for OCaml"
+HOMEPAGE="http://erratique.ch/software/jsonm"
+SRC_URI="http://erratique.ch/software/jsonm/releases/${P}.tbz"
+
+LICENSE="ISC"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND=">=dev-ml/uutf-1.0.0:=
+ dev-lang/ocaml:=
+ dev-ml/uchar:="
+DEPEND="${RDEPEND}
+ dev-ml/topkg
+ dev-ml/ocamlbuild
+ dev-ml/findlib"
+
+DOCS=( CHANGES README )
+
+src_compile() {
+ ocaml pkg/pkg.ml build || die
+}
+
+src_install() {
+ # Can't use opam-installer here as it is an opam dep...
+ findlib_src_preinst
+ local nativelibs="$(echo _build/src/${PN}.cm{x,xa,xs,ti} _build/src/${PN}.a)"
+ ocamlfind install ${PN} _build/pkg/META _build/src/${PN}.mli _build/src/${PN}.cm{a,i} ${nativelibs} || die
+ newbin _build/test/jsontrip.native jsontrip
+ dodoc CHANGES.md TODO.md README.md
+}
diff --git a/dev-ml/jsonm/metadata.xml b/dev-ml/jsonm/metadata.xml
new file mode 100644
index 000000000000..ffac4d7ebc01
--- /dev/null
+++ b/dev-ml/jsonm/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-ml/kaputt-1.2 b/dev-ml/kaputt-1.2
deleted file mode 100644
index 76eac8825651..000000000000
--- a/dev-ml/kaputt-1.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=>=dev-lang/ocaml-3.11:=[ocamlopt] dev-ml/ocamlbuild >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Unit testing tool for the Objective Caml language
-EAPI=5
-HOMEPAGE=http://kaputt.x9c.fr/
-KEYWORDS=~amd64
-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
-_md5_=2ab3b9ba1637817a70218f644e46d242
diff --git a/dev-ml/kaputt/Manifest b/dev-ml/kaputt/Manifest
new file mode 100644
index 000000000000..b5da2afb1126
--- /dev/null
+++ b/dev-ml/kaputt/Manifest
@@ -0,0 +1,3 @@
+DIST kaputt-1.2.tar.gz 299828 BLAKE2B c38e5c1b92d7f4d2eff607833b171558b48685ae247d8fce2796328d9ee473771dd7a5702f3fb3a8efdc80d62fc844cf626b76504713814cefd6e899bf3f90de SHA512 7e30379410ac2e45e59462086956a510e4da06538cd27fd360999e3ff656dc82bfdae18e545699241a01612d9ec7ab28e298847b4a2f6178294dc6c2db8f8671
+EBUILD kaputt-1.2.ebuild 618 BLAKE2B 0e4dfcccb82e86d55e13876ea5101dfe4d60179efc1f9b48a61a184ccd3e45e388d6db38f3d5ae00b330113b84738b2f7c0d002e96aceb2b0d63ac475d3fe088 SHA512 5321389609a1d3ab026550d3ea2e75f909a95816c0677db00026ab676cef25df3ebd8f56bd76e8e2bb7ce5784a54093dd4dd4b24dcd79daaad3d930f3d886961
+MISC metadata.xml 243 BLAKE2B 010ca240ae06e9a9f6d7ba213eb06df36d9ba862ff2d2458d98a9fea1a1e7f3026d13832a73bce1b3ad9345029425e6abfae9e03bf126f2329b3f030ed3753fd SHA512 1c5b4b2163017e496999d1f87e5c9c5ac6c11b2e9187450ccfb3df258f34e54d278972f04ee0e8429476c6f87e091a869ac2a28c6e8c8e6d20678c3e74061449
diff --git a/dev-ml/kaputt/kaputt-1.2.ebuild b/dev-ml/kaputt/kaputt-1.2.ebuild
new file mode 100644
index 000000000000..89ce7b66f515
--- /dev/null
+++ b/dev-ml/kaputt/kaputt-1.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit findlib
+
+DESCRIPTION="Unit testing tool for the Objective Caml language"
+HOMEPAGE="http://kaputt.x9c.fr/"
+SRC_URI="http://kaputt.x9c.fr/distrib/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND=">=dev-lang/ocaml-3.11:=[ocamlopt]"
+DEPEND="${RDEPEND}
+ dev-ml/ocamlbuild"
+
+src_configure() {
+ chmod +x configure
+ ./configure || die
+}
+
+src_compile() {
+ emake all
+}
+
+src_test() {
+ emake -j1 tests
+}
+
+src_install() {
+ findlib_src_install
+ dodoc README FEATURES CHANGES
+}
diff --git a/dev-ml/kaputt/metadata.xml b/dev-ml/kaputt/metadata.xml
new file mode 100644
index 000000000000..ffac4d7ebc01
--- /dev/null
+++ b/dev-ml/kaputt/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-ml/lablgl-1.05-r1 b/dev-ml/lablgl-1.05-r1
deleted file mode 100644
index 15bdb729ac6b..000000000000
--- a/dev-ml/lablgl-1.05-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=>=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:= )
-DESCRIPTION=Objective CAML interface for OpenGL
-EAPI=5
-HOMEPAGE=http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgl.html
-IUSE=doc glut +ocamlopt tk
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
-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 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f3c71d4b279b9c1bf2754211fb485a80
diff --git a/dev-ml/lablgl/Manifest b/dev-ml/lablgl/Manifest
new file mode 100644
index 000000000000..502f3a8b4efe
--- /dev/null
+++ b/dev-ml/lablgl/Manifest
@@ -0,0 +1,3 @@
+DIST lablgl-1.05.tar.gz 296597 BLAKE2B 01fff39607f0b4e965737c6fec53cbd3b154bb2df3528fd37626ac87c6cb46a29f97881a242206310b1bd576fb9dfc72ede1eb24cf287ddfc55194b8d55eb83d SHA512 e8bf7d993610912d50ec3a6c18a24d2ff7d0727a41fe102e745050bb83ee02a9995e8b1b8c7dbd94f6b2a8363145f22e9772e36253dced762a63ec3c6c54379d
+EBUILD lablgl-1.05-r1.ebuild 2066 BLAKE2B 98cadf2da09e22c2992f4668ad6565742400664e7dd6f5bcb8cea04d4904e1c3099902ac58d1db3d73def80313fe9b6edf6a9a564a345369c5f7b9951387697f SHA512 1c9144c89cd01ae1cf10b3f8f0d946789f50731d4f58322b27bc71680265f520e9f09be39e34f2d705f0ed8333926112914b75cda61cac5f7e6df8c2838d5bf1
+MISC metadata.xml 253 BLAKE2B c787c1044c3f674eb5d2d7a0e830965ad53c7a2c8cdfcd95bece6b0557e35237f62afe28464ebe4c88468cd1fd543627349fd41a0aa760fceed1a7d52386eda2 SHA512 9285e04d22e8e41631e6de00e0ba02842cf0e772cd17a1d7ba3864e50eeea50abb06077ea4f9ac920eab3d520bfe28d389b3d04d5c3529af23a68ca68b6857d4
diff --git a/dev-ml/lablgl/lablgl-1.05-r1.ebuild b/dev-ml/lablgl/lablgl-1.05-r1.ebuild
new file mode 100644
index 000000000000..d5f3958cde19
--- /dev/null
+++ b/dev-ml/lablgl/lablgl-1.05-r1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit multilib eutils toolchain-funcs
+
+IUSE="doc glut +ocamlopt tk"
+
+DESCRIPTION="Objective CAML interface for OpenGL"
+HOMEPAGE="http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgl.html"
+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:=
+ )
+ "
+
+DEPEND="${RDEPEND}"
+
+SRC_URI="http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/${P}.tar.gz"
+SLOT="0/${PV}"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+
+src_configure() {
+ # make configuration file
+ echo "BINDIR=/usr/bin" > Makefile.config
+ echo "GLLIBS = -lGL -lGLU" >> Makefile.config
+ if use glut; then
+ echo "GLUTLIBS = -lglut" >> Makefile.config
+ else
+ echo "GLUTLIBS = " >> Makefile.config
+ fi
+ echo "XLIBS = -lXext -lXmu -lX11" >> Makefile.config
+ echo "RANLIB = $(tc-getRANLIB)" >> Makefile.config
+ echo 'COPTS = -c -O $(CFLAGS)' >> Makefile.config
+ echo 'INCLUDES = $(TKINCLUDES) $(GLINCLUDES) $(XINCLUDES)' >> Makefile.config
+}
+
+src_compile() {
+ if use tk; then
+ emake togl
+ if use ocamlopt; then
+ emake toglopt
+ fi
+ fi
+
+ emake lib
+ if use ocamlopt; then
+ emake libopt
+ fi
+
+ if use glut; then
+ emake glut
+ if use ocamlopt; then
+ emake glutopt
+ fi
+ fi
+}
+
+src_install () {
+ # Makefile do not use mkdir so the library is not installed
+ # but copied as a 'stublibs' file.
+ dodir /usr/$(get_libdir)/ocaml/stublibs
+
+ # Same for lablglut's toplevel
+ dodir /usr/bin
+
+ BINDIR=${ED}/usr/bin
+ BASE=${ED}/usr/$(get_libdir)/ocaml
+ emake BINDIR="${BINDIR}" INSTALLDIR="${BASE}/lablGL" DLLDIR="${BASE}/stublibs" install
+
+ dodoc README CHANGES
+
+ if use doc ; then
+ insinto /usr/share/doc/${PF}
+ mv Togl/examples{,.togl}
+ doins -r Togl/examples.togl
+
+ mv LablGlut/examples{,.glut}
+ doins -r LablGlut/examples.glut
+ fi
+}
diff --git a/dev-ml/lablgl/metadata.xml b/dev-ml/lablgl/metadata.xml
new file mode 100644
index 000000000000..ffa6c6b4395b
--- /dev/null
+++ b/dev-ml/lablgl/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/dev-ml/lablgtk-2.18.5 b/dev-ml/lablgtk-2.18.5
deleted file mode 100644
index 172f99e22c0f..000000000000
--- a/dev-ml/lablgtk-2.18.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst
-DEPEND=>=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:= virtual/pkgconfig >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Objective CAML interface for Gtk+2
-EAPI=5
-HOMEPAGE=http://lablgtk.forge.ocamlcore.org/
-IUSE=debug examples glade gnomecanvas sourceview +ocamlopt opengl spell svg
-KEYWORDS=alpha amd64 ~arm ~arm64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
-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 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=ac377eb2285034882e30884579b82b4c
diff --git a/dev-ml/lablgtk/Manifest b/dev-ml/lablgtk/Manifest
new file mode 100644
index 000000000000..5756b7f570f2
--- /dev/null
+++ b/dev-ml/lablgtk/Manifest
@@ -0,0 +1,3 @@
+DIST lablgtk-2.18.5.tar.gz 808005 BLAKE2B 279fd9f018948438b616a12ab60fca3019330504a79d8b76c58fa0a99a7b36df9bf78f57f0e60c4eea6f0bad60f94c06b26490518ec25a5a72c342e4b7c42501 SHA512 7b6ba1a4dfa82cc3bbc502082ff4fccc23cc06ee4f30d01a2e423f3f99e945a4befe450d230b5aa19c5b810e9f46f2838655099d49da2db7c8a2e52eac213024
+EBUILD lablgtk-2.18.5.ebuild 2503 BLAKE2B 2e00aee0e4c02be0d3f26f99fc4032c7390af4743bdb65db279f802801043e7e2617ef667e76b068c6db805c9da67576ea52dcb97a79f4b4cf221c665d0946d5 SHA512 70925cc5f13be37fb907c8d3e12e6c44bfad72cdb088892120f971892b44f0f59f5355c5b443b57e1c95ebe04cc76ca68048c2fc55eedbb2b7bdfdbbc407ed14
+MISC metadata.xml 461 BLAKE2B 5776bff1f1a99ef5402f9e2c6039833859f718f459997a72df83ccbe6c81b5178f7adff612c965f9a45a02778c7e35fdb73b1ff26b8da95a22790198b111891e SHA512 4401c55a7286fcfac919ac0bcec77d590641c79826eaf126a7df338e1a3d19e38d930eb8b0bb1716f9b5bedea0bd54961dea34fb3133b9bd4f621138cfedf78d
diff --git a/dev-ml/lablgtk/lablgtk-2.18.5.ebuild b/dev-ml/lablgtk/lablgtk-2.18.5.ebuild
new file mode 100644
index 000000000000..2fb8b47ff861
--- /dev/null
+++ b/dev-ml/lablgtk/lablgtk-2.18.5.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit multilib findlib
+
+IUSE="debug examples glade gnomecanvas sourceview +ocamlopt opengl spell svg"
+
+DESCRIPTION="Objective CAML interface for Gtk+2"
+HOMEPAGE="http://lablgtk.forge.ocamlcore.org/"
+SRC_URI="https://forge.ocamlcore.org/frs/download.php/1627/${P}.tar.gz"
+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:=
+ "
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+SLOT="2/${PV}"
+KEYWORDS="alpha amd64 ~arm ~arm64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+
+src_configure() {
+ econf $(use_enable debug) \
+ $(use_with svg rsvg) \
+ $(use_with glade) \
+ --without-gnomeui \
+ --without-panel \
+ $(use_with opengl gl) \
+ $(use_with spell gtkspell) \
+ --without-gtksourceview \
+ $(use_with sourceview gtksourceview2) \
+ $(use_with gnomecanvas)
+}
+
+src_compile() {
+ emake -j1 all
+ if use ocamlopt; then
+ emake -j1 opt
+ fi
+}
+
+install_examples() {
+ insinto /usr/share/doc/${P}/examples
+ doins examples/*.ml examples/*.rgb examples/*.png examples/*.xpm
+
+ # Install examples for optional components
+ use gnomecanvas && insinto /usr/share/doc/${PF}/examples/canvas && doins examples/canvas/*.ml examples/canvas/*.png
+ use svg && insinto /usr/share/doc/${PF}/examples/rsvg && doins examples/rsvg/*.ml examples/rsvg/*.svg
+ use glade && insinto /usr/share/doc/${PF}/examples/glade && doins examples/glade/*.ml examples/glade/*.glade*
+ use sourceview && insinto /usr/share/doc/${PF}/examples/sourceview && doins examples/sourceview/*.ml examples/sourceview/*.lang
+ use opengl && insinto /usr/share/doc/${PF}/examples/GL && doins examples/GL/*.ml
+
+ docompress -x /usr/share/doc/${PF}/examples
+}
+
+src_install () {
+ findlib_src_preinst
+ export OCAMLPATH="${OCAMLFIND_DESTDIR}"
+ emake install DESTDIR="${D}"
+
+ rm -f "${ED}/usr/$(get_libdir)/ocaml/ld.conf"
+
+ dodoc CHANGES README CHANGES.API
+ use examples && install_examples
+}
+
+pkg_postinst () {
+ if use examples; then
+ elog "To run the examples you can use the lablgtk2 toplevel."
+ elog "e.g: lablgtk2 /usr/share/doc/${PF}/examples/testgtk.ml"
+ fi
+}
diff --git a/dev-ml/lablgtk/metadata.xml b/dev-ml/lablgtk/metadata.xml
new file mode 100644
index 000000000000..0775baadb151
--- /dev/null
+++ b/dev-ml/lablgtk/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+<use>
+ <flag name="glade">Enable libglade bindings compilation.</flag>
+ <flag name="gnomecanvas">Enable libgnomecanvas bindings compilation.</flag>
+ <flag name="sourceview">Enable GtkSourceView support</flag>
+</use>
+</pkgmetadata>
diff --git a/dev-ml/labltk-8.06.2 b/dev-ml/labltk-8.06.2
deleted file mode 100644
index ee0764ad612d..000000000000
--- a/dev-ml/labltk-8.06.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=>=dev-lang/tk-8.0.3:= >=dev-lang/ocaml-4.04:=[ocamlopt?,X?] >=dev-ml/findlib-1.5.5-r1 >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=OCaml interface to the Tcl/Tk GUI framework
-EAPI=5
-HOMEPAGE=https://forge.ocamlcore.org/projects/labltk/
-IUSE=+ocamlopt X
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
-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 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=66194d977f728d0342f0ae8da40c6d49
diff --git a/dev-ml/labltk-8.06.3 b/dev-ml/labltk-8.06.3
deleted file mode 100644
index b744c8200607..000000000000
--- a/dev-ml/labltk-8.06.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=>=dev-lang/tk-8.0.3:= >=dev-lang/ocaml-4.04:=[ocamlopt?,X?] >=dev-ml/findlib-1.5.5-r1 >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=OCaml interface to the Tcl/Tk GUI framework
-EAPI=5
-HOMEPAGE=https://forge.ocamlcore.org/projects/labltk/
-IUSE=+ocamlopt X
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
-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 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=336735bc31653055fb7952f0bd9aaa96
diff --git a/dev-ml/labltk/Manifest b/dev-ml/labltk/Manifest
new file mode 100644
index 000000000000..ba4715006732
--- /dev/null
+++ b/dev-ml/labltk/Manifest
@@ -0,0 +1,7 @@
+AUX findlib.patch 645 BLAKE2B 63c8dc3a2b332129bf90af98b908e1ade5a15381a903ec9591973b6a2c3843fe254fb0001ce627ec831df5d4c6885d01de679f3d7b74e6538692de08a1fcf608 SHA512 4f5172bc7d603375bda331d40708ad14e7e9e7374f97cbd11da56473ca704421f7c801559dbcc753fe8004a809b80142158974a1c5c469eb2894580121cc9442
+AUX ocaml405.patch 13731 BLAKE2B 36ce4825b8e004720d966d7a7c1a769c84e4e3b044c07ce8112ee456acd819315a21625acb33a8423ad317d026bb03ddffa2b3dcba63dec1549254815c14d7e7 SHA512 a246af35b932e773e0c58b745d3885f98162892945f359dc4781489d76715c0564efa2ea985a43808e431fb8fd4225d4ad7b6a753abd54a8f12dc65ae43cfa9d
+DIST labltk-8.06.2.tar.gz 369508 BLAKE2B df0a5fb1cf352c52bf3177e83be2cadde961c2a7ba0496f45dc515141931d13715b4c253f74e5f280f9a6c310488236e6bc598c0ceffc408028ef5f524f2bcf2 SHA512 d9342d49ba8769edd7a4ed051844f6ae5d3e62a7c2c76e895bfd1162d0433c4ea54f2314b29b708551fba63daec1123553b56f0abb6412807ab00d7bb40b73d6
+DIST labltk-8.06.3.tar.gz 369924 BLAKE2B fa8b974572826abccc42eb2b07cdc28e1d611178d683b3f5b270051602cc940d1281d15d93c02a56bb15cdba0580c1371c91f2516e6ebb72e4e824f9d3877622 SHA512 c2002d519c1fcfdd2b13ae6d5836880273dac2660f07f6ee0e7bb932e3fec6f5cc959202efdf712758a17d24dbe50c3f6697c7b125e3123fa8153130d7ece979
+EBUILD labltk-8.06.2.ebuild 1118 BLAKE2B 896c6960f693e0763aa394140918700d66e7eecdc01a536893625707941cc73a062a42527b08c26013e72d062d7cf26477b911784eef7c2e6f48fd7aedbffb1d SHA512 387bcab89c39ed0ed80dac5e878bbf4f1dc4e62dd6b8384db9b3a68a57ab5f360e095ff05e41b5785b44c773dde25ef8f6941b64d0935473410067a9c4e48baa
+EBUILD labltk-8.06.3.ebuild 1044 BLAKE2B d2f44add0331c745c83ecb1a6f38316b207a751c5d6b1dc9afb4ee30c7449dec4b299a7ea84ea1c40c2915b15a0c1e1615808ed3725488f811bfb3edd1b2b5f4 SHA512 eb8948252b7aa811219bc2980a436d8d7b1cb5121d3025a908f32cf6cab3105982560509397fd65d09e93fb93c036644f4e5906f1c17292fd7bdaa01d95e3d56
+MISC metadata.xml 243 BLAKE2B 010ca240ae06e9a9f6d7ba213eb06df36d9ba862ff2d2458d98a9fea1a1e7f3026d13832a73bce1b3ad9345029425e6abfae9e03bf126f2329b3f030ed3753fd SHA512 1c5b4b2163017e496999d1f87e5c9c5ac6c11b2e9187450ccfb3df258f34e54d278972f04ee0e8429476c6f87e091a869ac2a28c6e8c8e6d20678c3e74061449
diff --git a/dev-ml/labltk/files/findlib.patch b/dev-ml/labltk/files/findlib.patch
new file mode 100644
index 000000000000..9b9a63bdede8
--- /dev/null
+++ b/dev-ml/labltk/files/findlib.patch
@@ -0,0 +1,20 @@
+Index: labltk-8.06.0/lib/Makefile
+===================================================================
+--- labltk-8.06.0.orig/lib/Makefile
++++ labltk-8.06.0/lib/Makefile
+@@ -84,7 +84,7 @@ install-script: $(LIBNAME)
+ install-batch:
+ cp labltk.bat $(INSTALLBINDIR)
+
+-ifeq ($USE_FINDLIB,yes)
++ifeq ($(USE_FINDLIB),yes)
+ install:
+ ocamlfind install labltk -add $(LIBNAME).cma $(LIBNAME)top$(EXE)
+ chmod 755 $(INSTALLDIR)/$(LIBNAME)top$(EXE)
+@@ -114,4 +114,4 @@ installopt:
+ cd $(INSTALLDIR); $(RANLIB) $(LIBNAME).$(A)
+ chmod 644 $(INSTALLDIR)/$(LIBNAME).cmxa
+ chmod 644 $(INSTALLDIR)/$(LIBNAME).$(A)
+-endif
+\ No newline at end of file
++endif
diff --git a/dev-ml/labltk/files/ocaml405.patch b/dev-ml/labltk/files/ocaml405.patch
new file mode 100644
index 000000000000..8503646f71ec
--- /dev/null
+++ b/dev-ml/labltk/files/ocaml405.patch
@@ -0,0 +1,382 @@
+Index: labltk-8.06.2/support/cltkCaml.c
+===================================================================
+--- labltk-8.06.2.orig/support/cltkCaml.c
++++ labltk-8.06.2/support/cltkCaml.c
+@@ -39,7 +39,7 @@ int CamlCBCmd(ClientData clientdata, Tcl
+ int id;
+ if (Tcl_GetInt(interp, argv[1], &id) != TCL_OK)
+ return TCL_ERROR;
+- callback2(*handler_code,Val_int(id),
++ caml_callback2(*handler_code,Val_int(id),
+ copy_string_list(argc - 2,(char **)&argv[2]));
+ /* Never fails (OCaml would have raised an exception) */
+ /* but result may have been set by callback */
+@@ -65,7 +65,7 @@ CAMLprim value camltk_return (value v)
+ /* Note: raise_with_string WILL copy the error message */
+ CAMLprim void tk_error(const char *errmsg)
+ {
+- raise_with_string(*tkerror_exn, errmsg);
++ caml_raise_with_string(*tkerror_exn, errmsg);
+ }
+
+
+Index: labltk-8.06.2/support/cltkDMain.c
+===================================================================
+--- labltk-8.06.2.orig/support/cltkDMain.c
++++ labltk-8.06.2/support/cltkDMain.c
+@@ -56,7 +56,7 @@ void invoke_pending_caml_signals (client
+ /* Rearm timer */
+ Tk_CreateTimerHandler(SIGNAL_INTERVAL, invoke_pending_caml_signals, NULL);
+ signal_events = 1;
+- leave_blocking_section();
++ caml_leave_blocking_section();
+ }
+ /* The following is taken from byterun/startup.c */
+ header_t atom_table[256];
+@@ -222,10 +222,10 @@ int Caml_Init(interp)
+ strcat(f, RCNAME);
+ if (0 == access(f,R_OK))
+ if (TCL_OK != Tcl_EvalFile(cltclinterp,f)) {
+- stat_free(f);
++ caml_stat_free(f);
+ tk_error(Tcl_GetStringResult(cltclinterp));
+ };
+- stat_free(f);
++ caml_stat_free(f);
+ }
+ }
+
+Index: labltk-8.06.2/support/cltkEval.c
+===================================================================
+--- labltk-8.06.2.orig/support/cltkEval.c
++++ labltk-8.06.2/support/cltkEval.c
+@@ -45,7 +45,7 @@ value copy_string_list(int argc, char **
+ for (i = argc-1; i >= 0; i--) {
+ oldres = res;
+ str = tcl_string_to_caml(argv[i]);
+- res = alloc(2, 0);
++ res = caml_alloc(2, 0);
+ Field(res, 0) = str;
+ Field(res, 1) = oldres;
+ }
+@@ -71,7 +71,7 @@ CAMLprim value camltk_tcl_eval(value str
+ Tcl_ResetResult(cltclinterp);
+ cmd = caml_string_to_tcl(str);
+ code = Tcl_Eval(cltclinterp, cmd);
+- stat_free(cmd);
++ caml_stat_free(cmd);
+
+ switch (code) {
+ case TCL_OK:
+@@ -143,8 +143,8 @@ int fill_args (char **argv, int where, v
+ fill_args(tmpargv,0,Field(v,0));
+ tmpargv[size] = NULL;
+ merged = Tcl_Merge(size,(const char *const*)tmpargv);
+- for(i = 0; i<size; i++){ stat_free(tmpargv[i]); }
+- stat_free((char *)tmpargv);
++ for(i = 0; i<size; i++){ caml_stat_free(tmpargv[i]); }
++ caml_stat_free((char *)tmpargv);
+ /* must be freed by stat_free */
+ argv[where] = (char*)caml_stat_alloc(strlen(merged)+1);
+ strcpy(argv[where], merged);
+@@ -227,10 +227,10 @@ CAMLprim value camltk_tcl_direct_eval(va
+
+ /* Free the various things we allocated */
+ for(i=0; i< size; i ++){
+- stat_free((char *) allocated[i]);
++ caml_stat_free((char *) allocated[i]);
+ }
+- stat_free((char *)argv);
+- stat_free((char *)allocated);
++ caml_stat_free((char *)argv);
++ caml_stat_free((char *)allocated);
+
+ switch (result) {
+ case TCL_OK:
+Index: labltk-8.06.2/support/cltkEvent.c
+===================================================================
+--- labltk-8.06.2.orig/support/cltkEvent.c
++++ labltk-8.06.2/support/cltkEvent.c
+@@ -49,6 +49,6 @@ CAMLprim value camltk_dooneevent(value f
+
+ CheckInit();
+
+- ret = Tk_DoOneEvent(convert_flag_list(flags, event_flag_table));
++ ret = Tk_DoOneEvent(caml_convert_flag_list(flags, event_flag_table));
+ return Val_int(ret);
+ }
+Index: labltk-8.06.2/support/cltkFile.c
+===================================================================
+--- labltk-8.06.2.orig/support/cltkFile.c
++++ labltk-8.06.2/support/cltkFile.c
+@@ -33,7 +33,7 @@
+
+ void FileProc(ClientData clientdata, int mask)
+ {
+- callback2(*handler_code,Val_int(clientdata),Val_int(0));
++ caml_callback2(*handler_code,Val_int(clientdata),Val_int(0));
+ }
+
+ /* Map Unix.file_descr values to Tcl file handles */
+Index: labltk-8.06.2/support/cltkImg.c
+===================================================================
+--- labltk-8.06.2.orig/support/cltkImg.c
++++ labltk-8.06.2/support/cltkImg.c
+@@ -47,7 +47,7 @@ CAMLprim value camltk_getimgdata (value
+
+ code = Tk_PhotoGetImage(ph,&pib); /* never fails ? */
+ size = pib.width * pib.height * pib.pixelSize;
+- res = alloc_string(size);
++ res = caml_alloc_string(size);
+
+ /* no holes, default format ? */
+ if ((pib.pixelSize == 3) &&
+Index: labltk-8.06.2/support/cltkMain.c
+===================================================================
+--- labltk-8.06.2.orig/support/cltkMain.c
++++ labltk-8.06.2/support/cltkMain.c
+@@ -51,11 +51,11 @@ int signal_events = 0; /* do we have a p
+ void invoke_pending_caml_signals (ClientData clientdata)
+ {
+ signal_events = 0;
+- enter_blocking_section(); /* triggers signal handling */
++ caml_enter_blocking_section(); /* triggers signal handling */
+ /* Rearm timer */
+ Tk_CreateTimerHandler(SIGNAL_INTERVAL, invoke_pending_caml_signals, NULL);
+ signal_events = 1;
+- leave_blocking_section();
++ caml_leave_blocking_section();
+ }
+
+ /* Now the real Tk stuff */
+@@ -77,7 +77,7 @@ CAMLprim value camltk_opentk(value argv)
+ tmp = Val_unit;
+
+ if ( argv == Val_int(0) ){
+- failwith("camltk_opentk: argv is empty");
++ caml_failwith("camltk_opentk: argv is empty");
+ }
+ argv0 = String_val( Field( argv, 0 ) );
+
+@@ -91,7 +91,7 @@ CAMLprim value camltk_opentk(value argv)
+ /* Register cltclinterp for use in other related extensions */
+ value *interp = caml_named_value("cltclinterp");
+ if (interp != NULL)
+- Store_field(*interp,0,copy_nativeint((intnat)cltclinterp));
++ Store_field(*interp,0,caml_copy_nativeint((intnat)cltclinterp));
+ }
+
+ if (Tcl_Init(cltclinterp) != TCL_OK)
+@@ -128,7 +128,7 @@ CAMLprim value camltk_opentk(value argv)
+ args = Tcl_Merge(argc, (const char *const*)tkargv); /* args must be freed by Tcl_Free */
+ Tcl_SetVar(cltclinterp, "argv", args, TCL_GLOBAL_ONLY);
+ Tcl_Free(args);
+- stat_free( tkargv );
++ caml_stat_free( tkargv );
+ }
+ }
+ if (Tk_Init(cltclinterp) != TCL_OK)
+@@ -164,10 +164,10 @@ CAMLprim value camltk_opentk(value argv)
+ strcat(f, RCNAME);
+ if (0 == access(f,R_OK))
+ if (TCL_OK != Tcl_EvalFile(cltclinterp,f)) {
+- stat_free(f);
++ caml_stat_free(f);
+ tk_error(Tcl_GetStringResult(cltclinterp));
+ };
+- stat_free(f);
++ caml_stat_free(f);
+ }
+ }
+
+Index: labltk-8.06.2/support/cltkMisc.c
+===================================================================
+--- labltk-8.06.2.orig/support/cltkMisc.c
++++ labltk-8.06.2/support/cltkMisc.c
+@@ -41,12 +41,12 @@ CAMLprim value camltk_splitlist (value v
+ { value res = copy_string_list(argc,argv);
+ Tcl_Free((char *)argv); /* only one large block was allocated */
+ /* argv points into utf: utf must be freed after argv are freed */
+- stat_free( utf );
++ caml_stat_free( utf );
+ return res;
+ }
+ case TCL_ERROR:
+ default:
+- stat_free( utf );
++ caml_stat_free( utf );
+ tk_error(Tcl_GetStringResult(cltclinterp));
+ }
+ }
+@@ -54,7 +54,7 @@ CAMLprim value camltk_splitlist (value v
+ /* Copy an OCaml string to the C heap. Should deallocate with stat_free */
+ char *string_to_c(value s)
+ {
+- int l = string_length(s);
++ int l = caml_string_length(s);
+ char *res = caml_stat_alloc(l + 1);
+ memmove (res, String_val (s), l);
+ res[l] = '\0';
+Index: labltk-8.06.2/support/cltkTimer.c
+===================================================================
+--- labltk-8.06.2.orig/support/cltkTimer.c
++++ labltk-8.06.2/support/cltkTimer.c
+@@ -26,7 +26,7 @@
+ /* Basically the same thing as FileProc */
+ void TimerProc (ClientData clientdata)
+ {
+- callback2(*handler_code,Val_long(clientdata),Val_int(0));
++ caml_callback2(*handler_code,Val_long(clientdata),Val_int(0));
+ }
+
+ CAMLprim value camltk_add_timer(value milli, value cbid)
+Index: labltk-8.06.2/support/cltkUtf.c
+===================================================================
+--- labltk-8.06.2.orig/support/cltkUtf.c
++++ labltk-8.06.2/support/cltkUtf.c
+@@ -76,14 +76,14 @@ value tcl_string_to_caml( const char *s
+ char *str;
+
+ str = utf_to_external( s );
+- res = copy_string(str);
+- stat_free(str);
++ res = caml_copy_string(str);
++ caml_stat_free(str);
+ CAMLreturn(res);
+ }
+
+ #else
+
+ char *caml_string_to_tcl(value s){ return string_to_c(s); }
+-value tcl_string_to_caml(char *s){ return copy_string(s); }
++value tcl_string_to_caml(char *s){ return caml_copy_string(s); }
+
+ #endif
+Index: labltk-8.06.2/support/cltkVar.c
+===================================================================
+--- labltk-8.06.2.orig/support/cltkVar.c
++++ labltk-8.06.2/support/cltkVar.c
+@@ -35,7 +35,7 @@ CAMLprim value camltk_getvar(value var)
+ stable_var = string_to_c(var);
+ s = (char *)Tcl_GetVar(cltclinterp,stable_var,
+ TCL_GLOBAL_ONLY|TCL_LEAVE_ERR_MSG);
+- stat_free(stable_var);
++ caml_stat_free(stable_var);
+
+ if (s == NULL)
+ tk_error(Tcl_GetStringResult(cltclinterp));
+@@ -57,11 +57,11 @@ CAMLprim value camltk_setvar(value var,
+ utf_contents = caml_string_to_tcl(contents);
+ s = (char *)Tcl_SetVar(cltclinterp,stable_var, utf_contents,
+ TCL_GLOBAL_ONLY|TCL_LEAVE_ERR_MSG);
+- stat_free(stable_var);
++ caml_stat_free(stable_var);
+ if( s == utf_contents ){
+ tk_error("camltk_setvar: Tcl_SetVar returned strange result. Call the author of mlTk!");
+ }
+- stat_free(utf_contents);
++ caml_stat_free(utf_contents);
+
+ if (s == NULL)
+ tk_error(Tcl_GetStringResult(cltclinterp));
+@@ -84,7 +84,7 @@ static char * tracevar(clientdata, inter
+ Tcl_UntraceVar2(interp, name1, name2,
+ TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
+ tracevar, clientdata);
+- callback2(*handler_code,Val_int(clientdata),Val_unit);
++ caml_callback2(*handler_code,Val_int(clientdata),Val_unit);
+ return (char *)NULL;
+ }
+
+@@ -103,10 +103,10 @@ CAMLprim value camltk_trace_var(value va
+ tracevar,
+ (ClientData) (Long_val(cbid)))
+ != TCL_OK) {
+- stat_free(cvar);
++ caml_stat_free(cvar);
+ tk_error(Tcl_GetStringResult(cltclinterp));
+ };
+- stat_free(cvar);
++ caml_stat_free(cvar);
+ return Val_unit;
+ }
+
+@@ -123,6 +123,6 @@ CAMLprim value camltk_untrace_var(value
+ TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
+ tracevar,
+ (ClientData) (Long_val(cbid)));
+- stat_free(cvar);
++ caml_stat_free(cvar);
+ return Val_unit;
+ }
+Index: labltk-8.06.2/support/cltkWait.c
+===================================================================
+--- labltk-8.06.2.orig/support/cltkWait.c
++++ labltk-8.06.2/support/cltkWait.c
+@@ -54,8 +54,8 @@ static void WaitVisibilityProc(clientDat
+ Tk_DeleteEventHandler(vis->win, VisibilityChangeMask,
+ WaitVisibilityProc, clientData);
+
+- stat_free((char *)vis);
+- callback2(*handler_code,cbid,Val_int(0));
++ caml_stat_free((char *)vis);
++ caml_callback2(*handler_code,cbid,Val_int(0));
+ }
+
+ /* Sets up a callback upon Visibility of a window */
+@@ -65,7 +65,7 @@ CAMLprim value camltk_wait_vis(value win
+ (struct WinCBData *)caml_stat_alloc(sizeof(struct WinCBData));
+ vis->win = Tk_NameToWindow(cltclinterp, String_val(win), cltk_mainWindow);
+ if (vis -> win == NULL) {
+- stat_free((char *)vis);
++ caml_stat_free((char *)vis);
+ tk_error(Tcl_GetStringResult(cltclinterp));
+ };
+ vis->cbid = Int_val(cbid);
+@@ -79,9 +79,9 @@ static void WaitWindowProc(ClientData cl
+ if (eventPtr->type == DestroyNotify) {
+ struct WinCBData *vis = clientData;
+ value cbid = Val_int(vis->cbid);
+- stat_free((char *)clientData);
++ caml_stat_free((char *)clientData);
+ /* The handler is destroyed by Tk itself */
+- callback2(*handler_code,cbid,Val_int(0));
++ caml_callback2(*handler_code,cbid,Val_int(0));
+ }
+ }
+
+@@ -92,7 +92,7 @@ CAMLprim value camltk_wait_des(value win
+ (struct WinCBData *)caml_stat_alloc(sizeof(struct WinCBData));
+ vis->win = Tk_NameToWindow(cltclinterp, String_val(win), cltk_mainWindow);
+ if (vis -> win == NULL) {
+- stat_free((char *)vis);
++ caml_stat_free((char *)vis);
+ tk_error(Tcl_GetStringResult(cltclinterp));
+ };
+ vis->cbid = Int_val(cbid);
+Index: labltk-8.06.2/browser/searchpos.ml
+===================================================================
+--- labltk-8.06.2.orig/browser/searchpos.ml
++++ labltk-8.06.2/browser/searchpos.ml
+@@ -782,7 +782,7 @@ and search_pos_expr ~pos exp =
+ search_pos_expr exp' ~pos
+ end;
+ search_pos_expr exp ~pos
+- | Texp_function (_, l, _) ->
++ | Texp_function { arg_label = _; param = _ ; cases = l; partial = _; } ->
+ List.iter l ~f:(search_case ~pos)
+ | Texp_apply (exp, l) ->
+ List.iter l ~f:(fun (_, x) -> Misc.may (search_pos_expr ~pos) x);
+Index: labltk-8.06.2/jpf/fileselect.ml
+===================================================================
+--- labltk-8.06.2.orig/jpf/fileselect.ml
++++ labltk-8.06.2/jpf/fileselect.ml
+@@ -55,7 +55,7 @@ let myentry_create p ~variable =
+ let subshell cmd =
+ let r,w = pipe () in
+ match fork () with
+- 0 -> close r; dup2 ~src:w ~dst:stdout;
++ 0 -> close r; dup2 ~cloexec:false ~src:w ~dst:stdout;
+ execv ~prog:"/bin/sh" ~args:[| "/bin/sh"; "-c"; cmd |]
+ | id ->
+ close w;
diff --git a/dev-ml/labltk/labltk-8.06.2.ebuild b/dev-ml/labltk/labltk-8.06.2.ebuild
new file mode 100644
index 000000000000..8181f906cb12
--- /dev/null
+++ b/dev-ml/labltk/labltk-8.06.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit findlib eutils
+
+DESCRIPTION="OCaml interface to the Tcl/Tk GUI framework"
+HOMEPAGE="https://forge.ocamlcore.org/projects/labltk/"
+SRC_URI="https://forge.ocamlcore.org/frs/download.php/1628/${P}.tar.gz"
+
+LICENSE="QPL-1.0 LGPL-2"
+SLOT="0/${PV}"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="+ocamlopt X"
+
+RDEPEND=">=dev-lang/tk-8.0.3:=
+ >=dev-lang/ocaml-4.04:=[ocamlopt?,X?]"
+DEPEND="${RDEPEND}
+ >=dev-ml/findlib-1.5.5-r1"
+
+src_prepare() {
+ epatch "${FILESDIR}/findlib.patch"
+ has_version '>=dev-lang/ocaml-4.05.0_beta' && epatch "${FILESDIR}/ocaml405.patch"
+}
+
+src_configure() {
+ ./configure --use-findlib --verbose $(use X || echo "--tk-no-x11") || die "configure failed!"
+}
+
+src_compile() {
+ emake -j1
+ use ocamlopt && emake -j1 opt
+}
+
+src_install() {
+ findlib_src_preinst
+ dodir /usr/bin
+ emake \
+ INSTALLDIR="${D}$(ocamlc -where)/labltk" \
+ INSTALLBINDIR="${ED}/usr/bin/" \
+ install
+ dodoc Changes README.mlTk
+}
diff --git a/dev-ml/labltk/labltk-8.06.3.ebuild b/dev-ml/labltk/labltk-8.06.3.ebuild
new file mode 100644
index 000000000000..7bf520571181
--- /dev/null
+++ b/dev-ml/labltk/labltk-8.06.3.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit findlib eutils
+
+DESCRIPTION="OCaml interface to the Tcl/Tk GUI framework"
+HOMEPAGE="https://forge.ocamlcore.org/projects/labltk/"
+SRC_URI="https://forge.ocamlcore.org/frs/download.php/1701/${P}.tar.gz"
+
+LICENSE="QPL-1.0 LGPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="+ocamlopt X"
+
+RDEPEND=">=dev-lang/tk-8.0.3:=
+ >=dev-lang/ocaml-4.04:=[ocamlopt?,X?]"
+DEPEND="${RDEPEND}
+ >=dev-ml/findlib-1.5.5-r1"
+
+src_prepare() {
+ epatch "${FILESDIR}/findlib.patch"
+}
+
+src_configure() {
+ ./configure --use-findlib --verbose $(use X || echo "--tk-no-x11") || die "configure failed!"
+}
+
+src_compile() {
+ emake -j1
+ use ocamlopt && emake -j1 opt
+}
+
+src_install() {
+ findlib_src_preinst
+ dodir /usr/bin
+ emake \
+ INSTALLDIR="${D}$(ocamlc -where)/labltk" \
+ INSTALLBINDIR="${ED}/usr/bin/" \
+ install
+ dodoc Changes README.mlTk
+}
diff --git a/dev-ml/labltk/metadata.xml b/dev-ml/labltk/metadata.xml
new file mode 100644
index 000000000000..ffac4d7ebc01
--- /dev/null
+++ b/dev-ml/labltk/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-ml/lambda-term-1.11 b/dev-ml/lambda-term-1.11
deleted file mode 100644
index be0e567115d1..000000000000
--- a/dev-ml/lambda-term-1.11
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-ml/lwt_react:= >=dev-ml/lwt-2.4.0:= >=dev-ml/zed-1.2:= >=dev-ml/react-1.2:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=A cross-platform library for manipulating the terminal
-EAPI=6
-HOMEPAGE=https://github.com/diml/lambda-term
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-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 24b4a2529c1fd12f1304856d6c5a690d
-_md5_=76322c6e5fe7ed17b151542c87c7d98f
diff --git a/dev-ml/lambda-term/Manifest b/dev-ml/lambda-term/Manifest
new file mode 100644
index 000000000000..3397212775c9
--- /dev/null
+++ b/dev-ml/lambda-term/Manifest
@@ -0,0 +1,4 @@
+AUX lwtreact.patch 499 BLAKE2B c0702fd27ad84f69b051dd039c2a11747b185305f9ea87e464c21af2a8b18831f03191e14041a1b0ef24346bcd0c56cff474aae3ae983f2c66424d27c66f835b SHA512 d021213e10fc1b22762bf5e0a077fa18931131c6fe46f777289491cc50fbbfbc8fc672c56ba29de0d664098f367a87feb069cd777d368a43a289b033bdd11050
+DIST lambda-term-1.11.tar.gz 125906 BLAKE2B ddaee0a10d7136c4a168eb833953f439fb17eb6329d523d3bc9e7efe8954b73f55ce4c3fd853afb6bcb06557dc6749d5c16411d9400748ddbfa7a87ef28140ed SHA512 38654effe668d36766047f9e0ef74117c39a9f720322b92b9b8dcc5262c58de63fa36730c6a9c7d4921bf7bfd147753ce5d5a2da1c6df6171ee604b5bb224c27
+EBUILD lambda-term-1.11.ebuild 579 BLAKE2B b948453decd503435ee2be0fb75ffb3d81dda8f88e09a8dafc20b360c0cabceed9e7f9925e0e349549a7eb85c5d38eca6dfde78ca1604c3705409d8a31cd9172 SHA512 a5cab35c542775af1cf015f5d5bbc00ac2b3f138fd67b0c622d7b8fd577a4faa766d0dfb520a17cbdb566f3fa26d20d89d31c0cfd89882a6aaccba392abe8bb0
+MISC metadata.xml 338 BLAKE2B 75f94a7452f5a6f23ccf53e354394304396307538c10c5edda84bd23a6d46f60e211139f2b101fffeb924ef8db2994b94b9269f8990855803fd0f5aae94add4b SHA512 7767b2368b1794d4b2972360ae4113fe895abf5f9dea75f207c06d438cb09d5cbf832337e0ac463c1981b7cf947847a932708fbbe0935c575a5f8211abc33c7a
diff --git a/dev-ml/lambda-term/files/lwtreact.patch b/dev-ml/lambda-term/files/lwtreact.patch
new file mode 100644
index 000000000000..b613d17595f5
--- /dev/null
+++ b/dev-ml/lambda-term/files/lwtreact.patch
@@ -0,0 +1,13 @@
+Index: lambda-term-1.11/src/jbuild
+===================================================================
+--- lambda-term-1.11.orig/src/jbuild
++++ lambda-term-1.11/src/jbuild
+@@ -26,7 +26,7 @@ let () =
+ ((name lambda_term)
+ (public_name lambda-term)
+ (wrapped false)
+- (libraries (lwt lwt.unix lwt.react zed))
++ (libraries (lwt lwt.unix lwt_react zed))
+ (synopsis "Cross-platform library for terminal manipulation")
+ (c_names (lTerm_term_stubs lTerm_unix_stubs lTerm_windows_stubs))
+ %s))
diff --git a/dev-ml/lambda-term/lambda-term-1.11.ebuild b/dev-ml/lambda-term/lambda-term-1.11.ebuild
new file mode 100644
index 000000000000..040947b2c279
--- /dev/null
+++ b/dev-ml/lambda-term/lambda-term-1.11.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit opam
+
+DESCRIPTION="A cross-platform library for manipulating the terminal"
+HOMEPAGE="https://github.com/diml/lambda-term"
+SRC_URI="https://github.com/diml/lambda-term/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+ dev-ml/lwt_react:=
+ >=dev-ml/lwt-2.4.0:=
+ >=dev-ml/zed-1.2:=
+ >=dev-ml/react-1.2:=
+"
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND}
+ dev-ml/jbuilder
+"
+
+PATCHES=( "${FILESDIR}/lwtreact.patch" )
diff --git a/dev-ml/lambda-term/metadata.xml b/dev-ml/lambda-term/metadata.xml
new file mode 100644
index 000000000000..4088a549d92b
--- /dev/null
+++ b/dev-ml/lambda-term/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">diml/lambda-term</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/llvm-ocaml-4.0.1 b/dev-ml/llvm-ocaml-4.0.1
deleted file mode 100644
index 65e0c32f59a8..000000000000
--- a/dev-ml/llvm-ocaml-4.0.1
+++ /dev/null
@@ -1,14 +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-4.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_RISCV?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_X86?,llvm_targets_XCore?] !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=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_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-4.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_RISCV?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_X86?,llvm_targets_XCore?] !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_X86 llvm_targets_XCore )
-SLOT=0/4.0.1
-SRC_URI=https://releases.llvm.org/4.0.1/llvm-4.0.1.src.tar.xz
-_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 llvm f9e74238f1b5743ea5d7214fcc7dbb36 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 6faea633ae2f79f6d55dcfd431b79fbf python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a87913004b08a415b168591759b4383e
diff --git a/dev-ml/llvm-ocaml-5.0.1 b/dev-ml/llvm-ocaml-5.0.1
deleted file mode 100644
index 4692f6fa9bb7..000000000000
--- a/dev-ml/llvm-ocaml-5.0.1
+++ /dev/null
@@ -1,14 +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-5.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-5.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 )
-SLOT=0/5.0.1
-SRC_URI=https://releases.llvm.org/5.0.1/llvm-5.0.1.src.tar.xz
-_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 llvm f9e74238f1b5743ea5d7214fcc7dbb36 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 6faea633ae2f79f6d55dcfd431b79fbf python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b43a74182fa50885f22cd00b5d3e1fc1
diff --git a/dev-ml/llvm-ocaml-5.0.2 b/dev-ml/llvm-ocaml-5.0.2
deleted file mode 100644
index 05c9b521e88b..000000000000
--- a/dev-ml/llvm-ocaml-5.0.2
+++ /dev/null
@@ -1,14 +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-5.0.2:=[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-5.0.2:=[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 )
-SLOT=0/5.0.2
-SRC_URI=https://releases.llvm.org/5.0.2/llvm-5.0.2.src.tar.xz
-_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 llvm f9e74238f1b5743ea5d7214fcc7dbb36 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 6faea633ae2f79f6d55dcfd431b79fbf python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b43a74182fa50885f22cd00b5d3e1fc1
diff --git a/dev-ml/llvm-ocaml-6.0.0 b/dev-ml/llvm-ocaml-6.0.0
deleted file mode 100644
index a10881d4a4c4..000000000000
--- a/dev-ml/llvm-ocaml-6.0.0
+++ /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.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
-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.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(-)]
-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.0
-SRC_URI=https://releases.llvm.org/6.0.0/llvm-6.0.0.src.tar.xz
-_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 llvm f9e74238f1b5743ea5d7214fcc7dbb36 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 6faea633ae2f79f6d55dcfd431b79fbf python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=51ff3d0f7375bd578e35a9ef3c01d5e6
diff --git a/dev-ml/llvm-ocaml-6.0.1 b/dev-ml/llvm-ocaml-6.0.1
deleted file mode 100644
index ea726869d00e..000000000000
--- a/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 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 llvm f9e74238f1b5743ea5d7214fcc7dbb36 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 6faea633ae2f79f6d55dcfd431b79fbf python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=51ff3d0f7375bd578e35a9ef3c01d5e6
diff --git a/dev-ml/llvm-ocaml-6.0.9999 b/dev-ml/llvm-ocaml-6.0.9999
deleted file mode 100644
index 9a4e7cd20032..000000000000
--- a/dev-ml/llvm-ocaml-6.0.9999
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-6.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_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 >=dev-vcs/git-1.8.2.1[curl]
-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
-LICENSE=UoI-NCSA
-RDEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-6.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_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.9999
-_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 git-r3 8f6de46b0aa318aea0e8cac62ece098b llvm f9e74238f1b5743ea5d7214fcc7dbb36 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 6faea633ae2f79f6d55dcfd431b79fbf python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e61600a5a1be5d0318d8e4d2f2dffeb1
diff --git a/dev-ml/llvm-ocaml-9999 b/dev-ml/llvm-ocaml-9999
deleted file mode 100644
index f9f59e7b836c..000000000000
--- a/dev-ml/llvm-ocaml-9999
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-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_Sparc?,llvm_targets_SystemZ?,llvm_targets_X86?,llvm_targets_XCore?,llvm_targets_AVR?,llvm_targets_Nios2?,llvm_targets_RISCV?,llvm_targets_WebAssembly?,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 >=dev-vcs/git-1.8.2.1[curl]
-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 llvm_targets_AVR llvm_targets_Nios2 llvm_targets_RISCV llvm_targets_WebAssembly
-LICENSE=UoI-NCSA
-RDEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-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_Sparc?,llvm_targets_SystemZ?,llvm_targets_X86?,llvm_targets_XCore?,llvm_targets_AVR?,llvm_targets_Nios2?,llvm_targets_RISCV?,llvm_targets_WebAssembly?,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 llvm_targets_AVR llvm_targets_Nios2 llvm_targets_RISCV llvm_targets_WebAssembly )
-RESTRICT=!test? ( test )
-SLOT=0/9999
-_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 git-r3 8f6de46b0aa318aea0e8cac62ece098b llvm f9e74238f1b5743ea5d7214fcc7dbb36 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 6faea633ae2f79f6d55dcfd431b79fbf python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=48c4d131674844f5c73428cb3bb8afa1
diff --git a/dev-ml/llvm-ocaml/Manifest b/dev-ml/llvm-ocaml/Manifest
new file mode 100644
index 000000000000..243d6681d826
--- /dev/null
+++ b/dev-ml/llvm-ocaml/Manifest
@@ -0,0 +1,13 @@
+DIST llvm-4.0.1.src.tar.xz 21065652 BLAKE2B 6327eed2d1feb108440f22d2581d1ff86c10a10c29793538d8d899c7e2dc83d3f7b147d3fd4bcce2bd2bf57c071b08c624aeafe40a3e7a3914506e7751727e6c SHA512 16adc39b34ddb628f81b171119a8e2a0e9138b25011e803ef0b688e2fbea116fc4953d3a1b61b90a98a75e33619f81566b7cb06a9a2ea4d04ac5e0eb303a2d1d
+DIST llvm-5.0.1.src.tar.xz 23428720 BLAKE2B 3db4d33df21018d17eef0042c0d8d82a8412bd5daa99cfb5405a6ec83c5774178fa76b220e8731c2a9a64dabf898aa90fe29c685327bd63a4f078e8e94a9a77e SHA512 bee1d45fca15ce725b1f2b1339b13eb6f750a3a321cfd099075477ec25835a8ca55b5366172c4aad46592dfd8afe372349ecf264f581463d017f9cee2d63c1cb
+DIST llvm-5.0.2.src.tar.xz 23451868 BLAKE2B b7082be2e4ad557b29b9f6869811f262adcf5c73d552faf91b339bede75cf5eab58afefa12fa779a38be71fe2b8f4ea297c3213ee4e8370cc01972c59249d91c SHA512 3588be5ed969c3f7f6f16f56a12a6af2814d3d3c960d4a36ffebb0446cc75f19220bccee7fc605f9b01f5d5c188a905a046193cc12dec42dd5922048b5c27fe1
+DIST llvm-6.0.0.src.tar.xz 25296048 BLAKE2B 7ea90bb63d6f26cfbc1c1ed2f243b0fcd8ad2ceb7963cf768d262cd55e9a0c71a9cfdea0333fb220faacf4540d924d2512532774dcfb52b52490ad74e38c09e0 SHA512 a71fdd5ddc46f01327ad891cfcc198febdbe10769c57f14d8a4fb7d514621ee4080e1a641200d3353c16a16731d390270499ec6cd3dc98fadc570f3eb6b52b8c
+DIST llvm-6.0.1.src.tar.xz 25306628 BLAKE2B 60232d4d22f8096b565cc8d81fea0639f24f14e8fc4f66ade69fa15479181f07f655f26dff3fa24bf105762b495da316c5c9352db234bd0af6b9c3fff6d4d881 SHA512 cbbb00eb99cfeb4aff623ee1a5ba075e7b5a76fc00c5f9f539ff28c108598f5708a0369d5bd92683def5a20c2fe60cab7827b42d628dbfcc79b57e0e91b84dd9
+EBUILD llvm-ocaml-4.0.1.ebuild 2800 BLAKE2B 2d8d5a7d6c13eaece0f0b98251bb28b5cd2c8257c2057a00810cce6e1f76ce0f1caca21e9ee00419bf335098a32dc7d748699f8032fd54e4e5cf843889129e3d SHA512 9684444e4c92601e7654520fb13f563f7c9f886f9f50363f470b023801d14179c542fdc1fc5a519ce73b33774f7a2180b1109f03eb43d7035a79ed2e5387e08e
+EBUILD llvm-ocaml-5.0.1.ebuild 2984 BLAKE2B 723a1e859c8e35f2ece65cc8dd6fdd4ef13017fa0ea8ded0c2c1e343a996828194097389b6db5fb2fd5f6c62fcfb9f443e72def7c6549037ae51816c3c7d9f64 SHA512 ba6033dab81c3abd7d9fe2e664b229cfa7f2674193287794ac1cf106a31f35db8d31795362787567d6f0703cdd216f36af3997055c594301dc29e93bd7336615
+EBUILD llvm-ocaml-5.0.2.ebuild 2984 BLAKE2B 723a1e859c8e35f2ece65cc8dd6fdd4ef13017fa0ea8ded0c2c1e343a996828194097389b6db5fb2fd5f6c62fcfb9f443e72def7c6549037ae51816c3c7d9f64 SHA512 ba6033dab81c3abd7d9fe2e664b229cfa7f2674193287794ac1cf106a31f35db8d31795362787567d6f0703cdd216f36af3997055c594301dc29e93bd7336615
+EBUILD llvm-ocaml-6.0.0.ebuild 3148 BLAKE2B 08a61098a9782694f57d4a56dd450200abdc1fb117ff327e4005c8f81d1b5cb861bba0fdadb19e94e3d4c409b1431a5ce361bc77b0ce590c69b855b1d866e1f5 SHA512 b0cc43ae38254cf01688e4a5b375452c8d17e9a8cae89a43ea1635383516d217850f16e605de3c45c8cef993ec9c95fbcf98f4333e27770000cae6899615e631
+EBUILD llvm-ocaml-6.0.1.ebuild 3148 BLAKE2B 08a61098a9782694f57d4a56dd450200abdc1fb117ff327e4005c8f81d1b5cb861bba0fdadb19e94e3d4c409b1431a5ce361bc77b0ce590c69b855b1d866e1f5 SHA512 b0cc43ae38254cf01688e4a5b375452c8d17e9a8cae89a43ea1635383516d217850f16e605de3c45c8cef993ec9c95fbcf98f4333e27770000cae6899615e631
+EBUILD llvm-ocaml-6.0.9999.ebuild 3160 BLAKE2B a8c6dbc6fb1ba9fbb875cdf61c27dea4a4f1a9b10b94970e50bf869f6a5699213a33ccb4905a94edc87c1a47c91a3a1867c0005353cdf6b3dda8a0bdd0c33061 SHA512 2653d2b061e7f12d7d383611de05ee4813afc03498359fbd8e3302f930522dfe3e32601f7adff14856cc499985b27ae17698385d9cc4e6f33bb060f41d101d76
+EBUILD llvm-ocaml-9999.ebuild 3386 BLAKE2B a935bebd7fccdf631999ba3be52a70072c5cccf1fdceaf48c72a584f0409afa82c0956913d3682eefed4d01f35afe1b91dd323721bfe0599cdf8f2fdabd3a8b3 SHA512 01fbc7546f9da6aea63888b3b1fb65971555a323dee902611e1c240145d91ce60e46aaed7331797ffde6f7864d0bc270bb9ef8ab3cbaa16dfcff92414aac0e2f
+MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-4.0.1.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-4.0.1.ebuild
new file mode 100644
index 000000000000..5eda59e817ee
--- /dev/null
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-4.0.1.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+# (needed due to CMAKE_BUILD_TYPE != Gentoo)
+CMAKE_MIN_VERSION=3.7.0-r1
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils llvm python-any-r1
+
+MY_P=llvm-${PV/_/}
+DESCRIPTION="OCaml bindings for LLVM"
+HOMEPAGE="https://llvm.org/"
+SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P/_/}.src.tar.xz"
+
+# Keep in sync with sys-devel/llvm
+ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
+ NVPTX PowerPC RISCV Sparc SystemZ X86 XCore )
+ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
+LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
+
+LICENSE="UoI-NCSA"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="test ${ALL_LLVM_TARGETS[*]}"
+
+RDEPEND="
+ >=dev-lang/ocaml-4.00.0:0=
+ dev-ml/ocaml-ctypes:=
+ ~sys-devel/llvm-${PV}:=[${LLVM_TARGET_USEDEPS// /,}]
+ !sys-devel/llvm[ocaml(-)]"
+# configparser-3.2 breaks the build (3.3 or none at all are fine)
+DEPEND="${RDEPEND}
+ dev-lang/perl
+ dev-ml/findlib
+ test? ( dev-ml/ounit )
+ !!<dev-python/configparser-3.3.0.2
+ ${PYTHON_DEPS}"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ || ( ${ALL_LLVM_TARGETS[*]} )"
+
+S=${WORKDIR}/${MY_P/_/}.src
+
+# least intrusive of all
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+pkg_setup() {
+ LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
+ python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ # Python is needed to run tests using lit
+ python_setup
+
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ local libdir=$(get_libdir)
+ local mycmakeargs=(
+ -DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+
+ -DBUILD_SHARED_LIBS=ON
+ -DLLVM_OCAML_OUT_OF_TREE=ON
+ -DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
+ -DLLVM_BUILD_TESTS=$(usex test)
+
+ # disable various irrelevant deps and settings
+ -DLLVM_ENABLE_FFI=OFF
+ -DLLVM_ENABLE_TERMINFO=OFF
+ -DHAVE_HISTEDIT_H=NO
+ -DWITH_POLLY=OFF
+ -DLLVM_ENABLE_ASSERTIONS=OFF
+ -DLLVM_ENABLE_EH=ON
+ -DLLVM_ENABLE_RTTI=ON
+
+ -DLLVM_HOST_TRIPLE="${CHOST}"
+
+ # disable go bindings
+ -DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND
+
+ # TODO: ocamldoc
+ )
+
+ cmake-utils_src_configure
+
+ local llvm_libdir=$(llvm-config --libdir)
+ # an ugly hack; TODO: figure out a way to pass -L to ocaml...
+ cd "${BUILD_DIR}/${libdir}" || die
+ ln -s "${llvm_libdir}"/*.so . || die
+
+ if use test; then
+ local llvm_bindir=$(llvm-config --bindir)
+ # Force using system-installed tools.
+ sed -i -e "/llvm_tools_dir/s@\".*\"@\"${llvm_bindir}\"@" \
+ "${BUILD_DIR}"/test/lit.site.cfg || die
+ fi
+}
+
+src_compile() {
+ cmake-utils_src_compile ocaml_all
+}
+
+src_test() {
+ # respect TMPDIR!
+ local -x LIT_PRESERVES_TMP=1
+ cmake-utils_src_make check-llvm-bindings-ocaml
+}
+
+src_install() {
+ DESTDIR="${D}" \
+ cmake -P "${BUILD_DIR}"/bindings/ocaml/cmake_install.cmake || die
+
+ dodoc bindings/ocaml/README.txt
+}
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-5.0.1.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-5.0.1.ebuild
new file mode 100644
index 000000000000..ca74c5a91283
--- /dev/null
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-5.0.1.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+# (needed due to CMAKE_BUILD_TYPE != Gentoo)
+CMAKE_MIN_VERSION=3.7.0-r1
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils llvm python-any-r1
+
+MY_P=llvm-${PV/_/}.src
+DESCRIPTION="OCaml bindings for LLVM"
+HOMEPAGE="https://llvm.org/"
+SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz"
+
+# Keep in sync with sys-devel/llvm
+ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
+ NVPTX PowerPC Sparc SystemZ X86 XCore )
+ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
+LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
+
+LICENSE="UoI-NCSA"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug test ${ALL_LLVM_TARGETS[*]}"
+
+RDEPEND="
+ >=dev-lang/ocaml-4.00.0:0=
+ dev-ml/ocaml-ctypes:=
+ ~sys-devel/llvm-${PV}:=[${LLVM_TARGET_USEDEPS// /,},debug?]
+ !sys-devel/llvm[ocaml(-)]"
+# configparser-3.2 breaks the build (3.3 or none at all are fine)
+DEPEND="${RDEPEND}
+ dev-lang/perl
+ dev-ml/findlib
+ test? ( dev-ml/ounit )
+ !!<dev-python/configparser-3.3.0.2
+ ${PYTHON_DEPS}"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ || ( ${ALL_LLVM_TARGETS[*]} )"
+
+S=${WORKDIR}/${MY_P}
+
+# least intrusive of all
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+pkg_setup() {
+ LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
+ python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ # Python is needed to run tests using lit
+ python_setup
+
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ local libdir=$(get_libdir)
+ local mycmakeargs=(
+ -DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+
+ -DBUILD_SHARED_LIBS=ON
+ -DLLVM_OCAML_OUT_OF_TREE=ON
+ -DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
+ -DLLVM_BUILD_TESTS=$(usex test)
+
+ # disable various irrelevant deps and settings
+ -DLLVM_ENABLE_FFI=OFF
+ -DLLVM_ENABLE_TERMINFO=OFF
+ -DHAVE_HISTEDIT_H=NO
+ -DWITH_POLLY=OFF
+ -DLLVM_ENABLE_ASSERTIONS=$(usex debug)
+ -DLLVM_ENABLE_EH=ON
+ -DLLVM_ENABLE_RTTI=ON
+
+ -DLLVM_HOST_TRIPLE="${CHOST}"
+
+ # disable go bindings
+ -DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND
+
+ # TODO: ocamldoc
+ )
+
+ # LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+ # also: custom rules for OCaml do not work for CPPFLAGS
+ use debug || local -x CFLAGS="${CFLAGS} -DNDEBUG"
+ cmake-utils_src_configure
+
+ local llvm_libdir=$(llvm-config --libdir)
+ # an ugly hack; TODO: figure out a way to pass -L to ocaml...
+ cd "${BUILD_DIR}/${libdir}" || die
+ ln -s "${llvm_libdir}"/*.so . || die
+
+ if use test; then
+ local llvm_bindir=$(llvm-config --bindir)
+ # Force using system-installed tools.
+ sed -i -e "/llvm_tools_dir/s@\".*\"@\"${llvm_bindir}\"@" \
+ "${BUILD_DIR}"/test/lit.site.cfg || die
+ fi
+}
+
+src_compile() {
+ cmake-utils_src_compile ocaml_all
+}
+
+src_test() {
+ # respect TMPDIR!
+ local -x LIT_PRESERVES_TMP=1
+ cmake-utils_src_make check-llvm-bindings-ocaml
+}
+
+src_install() {
+ DESTDIR="${D}" \
+ cmake -P "${BUILD_DIR}"/bindings/ocaml/cmake_install.cmake || die
+
+ dodoc bindings/ocaml/README.txt
+}
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-5.0.2.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-5.0.2.ebuild
new file mode 100644
index 000000000000..ca74c5a91283
--- /dev/null
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-5.0.2.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+# (needed due to CMAKE_BUILD_TYPE != Gentoo)
+CMAKE_MIN_VERSION=3.7.0-r1
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils llvm python-any-r1
+
+MY_P=llvm-${PV/_/}.src
+DESCRIPTION="OCaml bindings for LLVM"
+HOMEPAGE="https://llvm.org/"
+SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz"
+
+# Keep in sync with sys-devel/llvm
+ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
+ NVPTX PowerPC Sparc SystemZ X86 XCore )
+ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
+LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
+
+LICENSE="UoI-NCSA"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug test ${ALL_LLVM_TARGETS[*]}"
+
+RDEPEND="
+ >=dev-lang/ocaml-4.00.0:0=
+ dev-ml/ocaml-ctypes:=
+ ~sys-devel/llvm-${PV}:=[${LLVM_TARGET_USEDEPS// /,},debug?]
+ !sys-devel/llvm[ocaml(-)]"
+# configparser-3.2 breaks the build (3.3 or none at all are fine)
+DEPEND="${RDEPEND}
+ dev-lang/perl
+ dev-ml/findlib
+ test? ( dev-ml/ounit )
+ !!<dev-python/configparser-3.3.0.2
+ ${PYTHON_DEPS}"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ || ( ${ALL_LLVM_TARGETS[*]} )"
+
+S=${WORKDIR}/${MY_P}
+
+# least intrusive of all
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+pkg_setup() {
+ LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
+ python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ # Python is needed to run tests using lit
+ python_setup
+
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ local libdir=$(get_libdir)
+ local mycmakeargs=(
+ -DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+
+ -DBUILD_SHARED_LIBS=ON
+ -DLLVM_OCAML_OUT_OF_TREE=ON
+ -DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
+ -DLLVM_BUILD_TESTS=$(usex test)
+
+ # disable various irrelevant deps and settings
+ -DLLVM_ENABLE_FFI=OFF
+ -DLLVM_ENABLE_TERMINFO=OFF
+ -DHAVE_HISTEDIT_H=NO
+ -DWITH_POLLY=OFF
+ -DLLVM_ENABLE_ASSERTIONS=$(usex debug)
+ -DLLVM_ENABLE_EH=ON
+ -DLLVM_ENABLE_RTTI=ON
+
+ -DLLVM_HOST_TRIPLE="${CHOST}"
+
+ # disable go bindings
+ -DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND
+
+ # TODO: ocamldoc
+ )
+
+ # LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+ # also: custom rules for OCaml do not work for CPPFLAGS
+ use debug || local -x CFLAGS="${CFLAGS} -DNDEBUG"
+ cmake-utils_src_configure
+
+ local llvm_libdir=$(llvm-config --libdir)
+ # an ugly hack; TODO: figure out a way to pass -L to ocaml...
+ cd "${BUILD_DIR}/${libdir}" || die
+ ln -s "${llvm_libdir}"/*.so . || die
+
+ if use test; then
+ local llvm_bindir=$(llvm-config --bindir)
+ # Force using system-installed tools.
+ sed -i -e "/llvm_tools_dir/s@\".*\"@\"${llvm_bindir}\"@" \
+ "${BUILD_DIR}"/test/lit.site.cfg || die
+ fi
+}
+
+src_compile() {
+ cmake-utils_src_compile ocaml_all
+}
+
+src_test() {
+ # respect TMPDIR!
+ local -x LIT_PRESERVES_TMP=1
+ cmake-utils_src_make check-llvm-bindings-ocaml
+}
+
+src_install() {
+ DESTDIR="${D}" \
+ cmake -P "${BUILD_DIR}"/bindings/ocaml/cmake_install.cmake || die
+
+ dodoc bindings/ocaml/README.txt
+}
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-6.0.0.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-6.0.0.ebuild
new file mode 100644
index 000000000000..0e64a225bb7b
--- /dev/null
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-6.0.0.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+# (needed due to CMAKE_BUILD_TYPE != Gentoo)
+CMAKE_MIN_VERSION=3.7.0-r1
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils llvm multiprocessing python-any-r1
+
+MY_P=llvm-${PV/_/}.src
+DESCRIPTION="OCaml bindings for LLVM"
+HOMEPAGE="https://llvm.org/"
+SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz"
+
+# Keep in sync with sys-devel/llvm
+ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
+ NVPTX PowerPC Sparc SystemZ X86 XCore )
+ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
+LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
+
+LICENSE="UoI-NCSA"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug test ${ALL_LLVM_TARGETS[*]}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=dev-lang/ocaml-4.00.0:0=
+ dev-ml/ocaml-ctypes:=
+ ~sys-devel/llvm-${PV}:=[${LLVM_TARGET_USEDEPS// /,},debug?]
+ !sys-devel/llvm[ocaml(-)]"
+# configparser-3.2 breaks the build (3.3 or none at all are fine)
+DEPEND="${RDEPEND}
+ dev-lang/perl
+ dev-ml/findlib
+ test? ( dev-ml/ounit )
+ !!<dev-python/configparser-3.3.0.2
+ ${PYTHON_DEPS}"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ || ( ${ALL_LLVM_TARGETS[*]} )"
+
+S=${WORKDIR}/${MY_P}
+
+# least intrusive of all
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+pkg_setup() {
+ LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
+ python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ # Python is needed to run tests using lit
+ python_setup
+
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ local libdir=$(get_libdir)
+ local mycmakeargs=(
+ -DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+
+ -DBUILD_SHARED_LIBS=ON
+ -DLLVM_OCAML_OUT_OF_TREE=ON
+ -DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
+ -DLLVM_BUILD_TESTS=$(usex test)
+
+ # disable various irrelevant deps and settings
+ -DLLVM_ENABLE_FFI=OFF
+ -DLLVM_ENABLE_TERMINFO=OFF
+ -DHAVE_HISTEDIT_H=NO
+ -DWITH_POLLY=OFF
+ -DLLVM_ENABLE_ASSERTIONS=$(usex debug)
+ -DLLVM_ENABLE_EH=ON
+ -DLLVM_ENABLE_RTTI=ON
+
+ -DLLVM_HOST_TRIPLE="${CHOST}"
+
+ # disable go bindings
+ -DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND
+
+ # TODO: ocamldoc
+ )
+
+ use test && mycmakeargs+=(
+ -DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
+ )
+
+ # LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+ # also: custom rules for OCaml do not work for CPPFLAGS
+ use debug || local -x CFLAGS="${CFLAGS} -DNDEBUG"
+ cmake-utils_src_configure
+
+ local llvm_libdir=$(llvm-config --libdir)
+ # an ugly hack; TODO: figure out a way to pass -L to ocaml...
+ cd "${BUILD_DIR}/${libdir}" || die
+ ln -s "${llvm_libdir}"/*.so . || die
+
+ if use test; then
+ local llvm_bindir=$(llvm-config --bindir)
+ # Force using system-installed tools.
+ sed -i -e "/llvm_tools_dir/s@\".*\"@\"${llvm_bindir}\"@" \
+ "${BUILD_DIR}"/test/lit.site.cfg.py || die
+ fi
+}
+
+src_compile() {
+ cmake-utils_src_compile ocaml_all
+}
+
+src_test() {
+ # respect TMPDIR!
+ local -x LIT_PRESERVES_TMP=1
+ cmake-utils_src_make check-llvm-bindings-ocaml
+}
+
+src_install() {
+ DESTDIR="${D}" \
+ cmake -P "${BUILD_DIR}"/bindings/ocaml/cmake_install.cmake || die
+
+ dodoc bindings/ocaml/README.txt
+}
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-6.0.1.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-6.0.1.ebuild
new file mode 100644
index 000000000000..0e64a225bb7b
--- /dev/null
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-6.0.1.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+# (needed due to CMAKE_BUILD_TYPE != Gentoo)
+CMAKE_MIN_VERSION=3.7.0-r1
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils llvm multiprocessing python-any-r1
+
+MY_P=llvm-${PV/_/}.src
+DESCRIPTION="OCaml bindings for LLVM"
+HOMEPAGE="https://llvm.org/"
+SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz"
+
+# Keep in sync with sys-devel/llvm
+ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
+ NVPTX PowerPC Sparc SystemZ X86 XCore )
+ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
+LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
+
+LICENSE="UoI-NCSA"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug test ${ALL_LLVM_TARGETS[*]}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=dev-lang/ocaml-4.00.0:0=
+ dev-ml/ocaml-ctypes:=
+ ~sys-devel/llvm-${PV}:=[${LLVM_TARGET_USEDEPS// /,},debug?]
+ !sys-devel/llvm[ocaml(-)]"
+# configparser-3.2 breaks the build (3.3 or none at all are fine)
+DEPEND="${RDEPEND}
+ dev-lang/perl
+ dev-ml/findlib
+ test? ( dev-ml/ounit )
+ !!<dev-python/configparser-3.3.0.2
+ ${PYTHON_DEPS}"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ || ( ${ALL_LLVM_TARGETS[*]} )"
+
+S=${WORKDIR}/${MY_P}
+
+# least intrusive of all
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+pkg_setup() {
+ LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
+ python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ # Python is needed to run tests using lit
+ python_setup
+
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ local libdir=$(get_libdir)
+ local mycmakeargs=(
+ -DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+
+ -DBUILD_SHARED_LIBS=ON
+ -DLLVM_OCAML_OUT_OF_TREE=ON
+ -DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
+ -DLLVM_BUILD_TESTS=$(usex test)
+
+ # disable various irrelevant deps and settings
+ -DLLVM_ENABLE_FFI=OFF
+ -DLLVM_ENABLE_TERMINFO=OFF
+ -DHAVE_HISTEDIT_H=NO
+ -DWITH_POLLY=OFF
+ -DLLVM_ENABLE_ASSERTIONS=$(usex debug)
+ -DLLVM_ENABLE_EH=ON
+ -DLLVM_ENABLE_RTTI=ON
+
+ -DLLVM_HOST_TRIPLE="${CHOST}"
+
+ # disable go bindings
+ -DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND
+
+ # TODO: ocamldoc
+ )
+
+ use test && mycmakeargs+=(
+ -DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
+ )
+
+ # LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+ # also: custom rules for OCaml do not work for CPPFLAGS
+ use debug || local -x CFLAGS="${CFLAGS} -DNDEBUG"
+ cmake-utils_src_configure
+
+ local llvm_libdir=$(llvm-config --libdir)
+ # an ugly hack; TODO: figure out a way to pass -L to ocaml...
+ cd "${BUILD_DIR}/${libdir}" || die
+ ln -s "${llvm_libdir}"/*.so . || die
+
+ if use test; then
+ local llvm_bindir=$(llvm-config --bindir)
+ # Force using system-installed tools.
+ sed -i -e "/llvm_tools_dir/s@\".*\"@\"${llvm_bindir}\"@" \
+ "${BUILD_DIR}"/test/lit.site.cfg.py || die
+ fi
+}
+
+src_compile() {
+ cmake-utils_src_compile ocaml_all
+}
+
+src_test() {
+ # respect TMPDIR!
+ local -x LIT_PRESERVES_TMP=1
+ cmake-utils_src_make check-llvm-bindings-ocaml
+}
+
+src_install() {
+ DESTDIR="${D}" \
+ cmake -P "${BUILD_DIR}"/bindings/ocaml/cmake_install.cmake || die
+
+ dodoc bindings/ocaml/README.txt
+}
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-6.0.9999.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-6.0.9999.ebuild
new file mode 100644
index 000000000000..a2e4b9a3c0e6
--- /dev/null
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-6.0.9999.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+# (needed due to CMAKE_BUILD_TYPE != Gentoo)
+CMAKE_MIN_VERSION=3.7.0-r1
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils git-r3 llvm multiprocessing python-any-r1
+
+DESCRIPTION="OCaml bindings for LLVM"
+HOMEPAGE="https://llvm.org/"
+SRC_URI=""
+EGIT_REPO_URI="https://git.llvm.org/git/llvm.git
+ https://github.com/llvm-mirror/llvm.git"
+EGIT_BRANCH="release_60"
+
+# Keep in sync with sys-devel/llvm
+ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
+ NVPTX PowerPC Sparc SystemZ X86 XCore )
+ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
+LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
+
+LICENSE="UoI-NCSA"
+SLOT="0/${PV}"
+KEYWORDS=""
+IUSE="debug test ${ALL_LLVM_TARGETS[*]}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=dev-lang/ocaml-4.00.0:0=
+ dev-ml/ocaml-ctypes:=
+ ~sys-devel/llvm-${PV}:=[${LLVM_TARGET_USEDEPS// /,},debug?]
+ !sys-devel/llvm[ocaml(-)]"
+# configparser-3.2 breaks the build (3.3 or none at all are fine)
+DEPEND="${RDEPEND}
+ dev-lang/perl
+ dev-ml/findlib
+ test? ( dev-ml/ounit )
+ !!<dev-python/configparser-3.3.0.2
+ ${PYTHON_DEPS}"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ || ( ${ALL_LLVM_TARGETS[*]} )"
+
+# least intrusive of all
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+pkg_setup() {
+ LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
+ python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ # Python is needed to run tests using lit
+ python_setup
+
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ local libdir=$(get_libdir)
+ local mycmakeargs=(
+ -DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+
+ -DBUILD_SHARED_LIBS=ON
+ -DLLVM_OCAML_OUT_OF_TREE=ON
+ -DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
+ -DLLVM_BUILD_TESTS=$(usex test)
+
+ # disable various irrelevant deps and settings
+ -DLLVM_ENABLE_FFI=OFF
+ -DLLVM_ENABLE_TERMINFO=OFF
+ -DHAVE_HISTEDIT_H=NO
+ -DWITH_POLLY=OFF
+ -DLLVM_ENABLE_ASSERTIONS=$(usex debug)
+ -DLLVM_ENABLE_EH=ON
+ -DLLVM_ENABLE_RTTI=ON
+
+ -DLLVM_HOST_TRIPLE="${CHOST}"
+
+ # disable go bindings
+ -DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND
+
+ # TODO: ocamldoc
+ )
+
+ use test && mycmakeargs+=(
+ -DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
+ )
+
+ # LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+ # also: custom rules for OCaml do not work for CPPFLAGS
+ use debug || local -x CFLAGS="${CFLAGS} -DNDEBUG"
+ cmake-utils_src_configure
+
+ local llvm_libdir=$(llvm-config --libdir)
+ # an ugly hack; TODO: figure out a way to pass -L to ocaml...
+ cd "${BUILD_DIR}/${libdir}" || die
+ ln -s "${llvm_libdir}"/*.so . || die
+
+ if use test; then
+ local llvm_bindir=$(llvm-config --bindir)
+ # Force using system-installed tools.
+ sed -i -e "/llvm_tools_dir/s@\".*\"@\"${llvm_bindir}\"@" \
+ "${BUILD_DIR}"/test/lit.site.cfg.py || die
+ fi
+}
+
+src_compile() {
+ cmake-utils_src_compile ocaml_all
+}
+
+src_test() {
+ # respect TMPDIR!
+ local -x LIT_PRESERVES_TMP=1
+ cmake-utils_src_make check-llvm-bindings-ocaml
+}
+
+src_install() {
+ DESTDIR="${D}" \
+ cmake -P "${BUILD_DIR}"/bindings/ocaml/cmake_install.cmake || die
+
+ dodoc bindings/ocaml/README.txt
+}
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-9999.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-9999.ebuild
new file mode 100644
index 000000000000..6fa322a6fd10
--- /dev/null
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-9999.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+# (needed due to CMAKE_BUILD_TYPE != Gentoo)
+CMAKE_MIN_VERSION=3.7.0-r1
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils git-r3 llvm multiprocessing python-any-r1
+
+DESCRIPTION="OCaml bindings for LLVM"
+HOMEPAGE="https://llvm.org/"
+SRC_URI=""
+EGIT_REPO_URI="https://git.llvm.org/git/llvm.git
+ https://github.com/llvm-mirror/llvm.git"
+
+# Keep in sync with sys-devel/llvm
+ALL_LLVM_EXPERIMENTAL_TARGETS=( AVR Nios2 RISCV WebAssembly )
+ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
+ NVPTX PowerPC Sparc SystemZ X86 XCore
+ "${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}" )
+ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
+LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
+
+LICENSE="UoI-NCSA"
+SLOT="0/${PV}"
+KEYWORDS=""
+IUSE="debug test ${ALL_LLVM_TARGETS[*]}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=dev-lang/ocaml-4.00.0:0=
+ dev-ml/ocaml-ctypes:=
+ ~sys-devel/llvm-${PV}:=[${LLVM_TARGET_USEDEPS// /,},debug?]
+ !sys-devel/llvm[ocaml(-)]"
+# configparser-3.2 breaks the build (3.3 or none at all are fine)
+DEPEND="${RDEPEND}
+ dev-lang/perl
+ dev-ml/findlib
+ test? ( dev-ml/ounit )
+ !!<dev-python/configparser-3.3.0.2
+ ${PYTHON_DEPS}"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ || ( ${ALL_LLVM_TARGETS[*]} )"
+
+# least intrusive of all
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+pkg_setup() {
+ llvm_pkg_setup
+ python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ # Python is needed to run tests using lit
+ python_setup
+
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ local libdir=$(get_libdir)
+ local mycmakeargs=(
+ -DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+
+ -DBUILD_SHARED_LIBS=ON
+ -DLLVM_OCAML_OUT_OF_TREE=ON
+ # cheap hack: LLVM combines both anyway, and the only difference
+ # is that the former list is explicitly verified at cmake time
+ -DLLVM_TARGETS_TO_BUILD=""
+ -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
+ -DLLVM_BUILD_TESTS=$(usex test)
+
+ # disable various irrelevant deps and settings
+ -DLLVM_ENABLE_FFI=OFF
+ -DLLVM_ENABLE_TERMINFO=OFF
+ -DHAVE_HISTEDIT_H=NO
+ -DWITH_POLLY=OFF
+ -DLLVM_ENABLE_ASSERTIONS=$(usex debug)
+ -DLLVM_ENABLE_EH=ON
+ -DLLVM_ENABLE_RTTI=ON
+
+ -DLLVM_HOST_TRIPLE="${CHOST}"
+
+ # disable go bindings
+ -DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND
+
+ # TODO: ocamldoc
+ )
+
+ use test && mycmakeargs+=(
+ -DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
+ )
+
+ # LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+ # also: custom rules for OCaml do not work for CPPFLAGS
+ use debug || local -x CFLAGS="${CFLAGS} -DNDEBUG"
+ cmake-utils_src_configure
+
+ local llvm_libdir=$(llvm-config --libdir)
+ # an ugly hack; TODO: figure out a way to pass -L to ocaml...
+ cd "${BUILD_DIR}/${libdir}" || die
+ ln -s "${llvm_libdir}"/*.so . || die
+
+ if use test; then
+ local llvm_bindir=$(llvm-config --bindir)
+ # Force using system-installed tools.
+ sed -i -e "/llvm_tools_dir/s@\".*\"@\"${llvm_bindir}\"@" \
+ "${BUILD_DIR}"/test/lit.site.cfg.py || die
+ fi
+}
+
+src_compile() {
+ cmake-utils_src_compile ocaml_all
+}
+
+src_test() {
+ # respect TMPDIR!
+ local -x LIT_PRESERVES_TMP=1
+ cmake-utils_src_make check-llvm-bindings-ocaml
+}
+
+src_install() {
+ DESTDIR="${D}" \
+ cmake -P "${BUILD_DIR}"/bindings/ocaml/cmake_install.cmake || die
+
+ dodoc bindings/ocaml/README.txt
+}
diff --git a/dev-ml/llvm-ocaml/metadata.xml b/dev-ml/llvm-ocaml/metadata.xml
new file mode 100644
index 000000000000..89c4bdb96049
--- /dev/null
+++ b/dev-ml/llvm-ocaml/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>llvm@gentoo.org</email>
+ </maintainer>
+</pkgmetadata>
diff --git a/dev-ml/logs-0.6.2 b/dev-ml/logs-0.6.2
deleted file mode 100644
index 0080d23d18fc..000000000000
--- a/dev-ml/logs-0.6.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=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:= ) dev-ml/opam dev-ml/topkg dev-ml/ocamlbuild dev-ml/findlib test? ( dev-ml/mtime ) >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Logging infrastructure for OCaml
-EAPI=5
-HOMEPAGE=http://erratique.ch/software/logs https://github.com/dbuenzli/logs
-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:= )
-SLOT=0/0.6.2
-SRC_URI=http://erratique.ch/software/logs/releases/logs-0.6.2.tbz
-_eclasses_=findlib 45d6030075064a68da8d7143726a1150
-_md5_=fe8d609bbec62c8c124aa8ecc0cac5bd
diff --git a/dev-ml/logs/Manifest b/dev-ml/logs/Manifest
new file mode 100644
index 000000000000..b8e89a971a79
--- /dev/null
+++ b/dev-ml/logs/Manifest
@@ -0,0 +1,3 @@
+DIST logs-0.6.2.tbz 18558 BLAKE2B 824bad0b568c3cc08343cb99eab3848d6e8f7deca548599caf12a05f5980e5ecf78978480e5fd95e938ca4b06fb94cee8b4ecf241f4a0238c3d3851c4be8c9f5 SHA512 a669e373652bac6789626ad1d58e414c6d156c646bf0706c9d55b04151850113d45a5c28077707514d1a27d46fcc0f90b39b8652ce7a3980f79675e9874db8b4
+EBUILD logs-0.6.2.ebuild 1206 BLAKE2B 6d6850b9430306ad482c6fea20c77c488052fbfbe5e2092b5c945ac15a97578c55f41fd7ef3586c84157cadfbe5575108749baece42da1c05dc848a5ed524c65 SHA512 e579a30fe8e591f08df2080253d6c4ffff6db4dc736051bf0ac886e1858341bbbfa3ce455a246db395d315b5d0d11f06d86ea9809e8d11dfcf5e6f07b20d7c15
+MISC metadata.xml 601 BLAKE2B abddc0fba65ed335ef50ce87e576a9b522bdddd6317c8f3a6c3efe701f44d0ac911948428db6ea9f0175d101b81cd13a7eaaea228da3f7e459b0d1e37674735c SHA512 1dd217ce0c2e77bd1cddde1b4ef71a58cd1199895ba8d8361a28fa2792725d1367d49b188f118bfd5db64ac080d27d4f935ba3b0e11615dca65917021833d1be
diff --git a/dev-ml/logs/logs-0.6.2.ebuild b/dev-ml/logs/logs-0.6.2.ebuild
new file mode 100644
index 000000000000..65f024a9d4b1
--- /dev/null
+++ b/dev-ml/logs/logs-0.6.2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit findlib
+
+DESCRIPTION="Logging infrastructure for OCaml"
+HOMEPAGE="http://erratique.ch/software/logs https://github.com/dbuenzli/logs"
+SRC_URI="http://erratique.ch/software/logs/releases/${P}.tbz"
+
+LICENSE="ISC"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="javascript +fmt cli +lwt test"
+
+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:= )
+"
+DEPEND="${RDEPEND}
+ dev-ml/opam
+ dev-ml/topkg
+ dev-ml/ocamlbuild
+ dev-ml/findlib
+ test? ( dev-ml/mtime )
+"
+
+src_compile() {
+ ocaml pkg/pkg.ml build \
+ --with-js_of_ocaml $(usex javascript true false) \
+ --with-fmt $(usex fmt true false) \
+ --with-cmdliner $(usex cli true false) \
+ --with-lwt $(usex fmt true false) \
+ --tests $(usex test true false) \
+ || die
+}
+
+src_test() {
+ ocaml pkg/pkg.ml test || die
+}
+
+src_install() {
+ opam-installer -i \
+ --prefix="${ED}/usr" \
+ --libdir="${D}/$(ocamlc -where)" \
+ --docdir="${ED}/usr/share/doc/${PF}" \
+ ${PN}.install || die
+ dodoc CHANGES.md README.md
+}
diff --git a/dev-ml/logs/metadata.xml b/dev-ml/logs/metadata.xml
new file mode 100644
index 000000000000..181c271e3665
--- /dev/null
+++ b/dev-ml/logs/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <use>
+ <flag name="cli">Enables the Logs_cli library that provides command line support for controlling Logs.</flag>
+ <flag name="fmt">Enables the Logs_fmt reporter.</flag>
+ <flag name="lwt">Enables the Logs_lwt library that provides Lwt logging functions.</flag>
+ </use>
+ <upstream>
+ <remote-id type="github">dbuenzli/logs</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/lwt-3.0.0 b/dev-ml/lwt-3.0.0
deleted file mode 100644
index 3479f9c02b5c..000000000000
--- a/dev-ml/lwt-3.0.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-libs/libev >=dev-lang/ocaml-4.02:= dev-ml/result:= ppx? ( dev-ml/ppx_tools:= ) camlp4? ( dev-ml/camlp4:= ) dev-ml/cppo >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=Cooperative light-weight thread library for OCaml
-EAPI=5
-HOMEPAGE=http://ocsigen.org/lwt
-IUSE=+camlp4 +ppx +ocamlopt debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86 ~x86-fbsd
-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?]
-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 983774947da124fb7d542ce25a218bb1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e oasis 9256ed89af74c3365ec888c00bfdfe43 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b8a6a71729d9afb887a489da2be768ae
diff --git a/dev-ml/lwt-3.1.0 b/dev-ml/lwt-3.1.0
deleted file mode 100644
index fe95f71eabb0..000000000000
--- a/dev-ml/lwt-3.1.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=>=dev-lang/ocaml-4.02:= dev-ml/result:= dev-ml/ocaml-migrate-parsetree:= dev-ml/ppx_tools_versioned:= libev? ( dev-libs/libev ) camlp4? ( dev-ml/camlp4:= ) dev-ml/cppo dev-ml/findlib dev-ml/jbuilder dev-ml/opam
-DESCRIPTION=Cooperative light-weight thread library for OCaml
-EAPI=5
-HOMEPAGE=http://ocsigen.org/lwt
-IUSE=+camlp4 +libev
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86 ~x86-fbsd
-LICENSE=LGPL-2.1-with-linking-exception
-RDEPEND=>=dev-lang/ocaml-4.02:= dev-ml/result:= dev-ml/ocaml-migrate-parsetree:= dev-ml/ppx_tools_versioned:= libev? ( dev-libs/libev ) camlp4? ( dev-ml/camlp4:= ) !<www-servers/ocsigen-1.1
-SLOT=0/3.1.0
-SRC_URI=https://github.com/ocsigen/lwt/archive/3.1.0.tar.gz -> lwt-3.1.0.tar.gz
-_md5_=15ff3b91f82d9b733fb1c34848b99d88
diff --git a/dev-ml/lwt/Manifest b/dev-ml/lwt/Manifest
new file mode 100644
index 000000000000..beb3c956cc20
--- /dev/null
+++ b/dev-ml/lwt/Manifest
@@ -0,0 +1,5 @@
+DIST lwt-3.0.0.tar.gz 285864 BLAKE2B d14f8f8a9e71a61c57bd7c208575849667dab4a4770b56a0d94e93024b22be9b7d88d10c0fa24eb8060b67c75e72c2c8bbfa0362f3aa815c76c93575225ce056 SHA512 270a6dc2fc58950380eecf72767782c72a5d72226f4af0e9a4f9b0e70b788eeb1d2727348ab8da4411ee59374a19524a6a793b14a26fe7051d51f987ef0e42b8
+DIST lwt-3.1.0.tar.gz 285309 BLAKE2B ffc3a416491d4c7b7e7c0da67b48d9eeb5b7fa50e3637d4f0cfcd1689b75626b48c8dd6d91e87c93022047809a3774683c41ce620e07ee4d3e1409185e7f8d16 SHA512 0b2269e53f2e8a57e1ffd6f237c6b22de39a3b6b0d57276c7cb9371392aabc9fb6364b2617a6408ed0049ed64f71de0c540209cf83ce43899fd025295342eb0d
+EBUILD lwt-3.0.0.ebuild 878 BLAKE2B 29ca018034c3b02cac0f2bb438bb7f65bdf09f4518f6db8fd127fdf5dbb8d3b630f432039ee6adadd6d754d82f1d4c493d6898ec43c436799c3b716109d76a6e SHA512 6daa0c825946ae4f0362eb7ae368bdbaddb97d45a652350f0e6059a2454f7fb09184b33ce78cc861d9c81bb4dad3b139344f514d2646915bd3d4e053b3526f12
+EBUILD lwt-3.1.0.ebuild 1204 BLAKE2B 036b971a0f84a33861eeb51d85bd5214499953a06c11f77ddb5775ed258ce45955ee3de0b5c92e663e9eb73888915bc2d83009600c6b3fd6849abdb7428e73c9 SHA512 6265b5c996c2e63bead2f9eddd239804ebcb18875dadf84439b61c9f1e42bcd4ab71f05613ad7df35047d172cbb907a2fc2e366d72d320a4c49ddad0b290f9f6
+MISC metadata.xml 537 BLAKE2B a893b5cc9020877642327286bbe351ce97bc40e2108b106d738a883bb714b2962bf3a4ed85e6bcec774a851ec7d02bb61d6dc04df875b880c1b2c4ef4dad6d00 SHA512 6af3b63f018a1ff98c5431ba23ec4f6266436ac269862579858edbe4d34509c73ec75aaf6ce70e387371eb9b61212dde3b8a9612b333dd8c8bff5ce26df5f48f
diff --git a/dev-ml/lwt/lwt-3.0.0.ebuild b/dev-ml/lwt/lwt-3.0.0.ebuild
new file mode 100644
index 000000000000..e811ad86da8a
--- /dev/null
+++ b/dev-ml/lwt/lwt-3.0.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+OASIS_BUILD_TESTS=1
+OASIS_BUILD_DOCS=1
+
+inherit oasis
+
+DESCRIPTION="Cooperative light-weight thread library for OCaml"
+SRC_URI="https://github.com/ocsigen/lwt/archive/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="http://ocsigen.org/lwt"
+
+IUSE="+camlp4 +ppx"
+
+DEPEND="
+ dev-libs/libev
+ >=dev-lang/ocaml-4.02:=
+ dev-ml/result:=
+ ppx? ( dev-ml/ppx_tools:= )
+ camlp4? ( dev-ml/camlp4:= )"
+
+RDEPEND="${DEPEND}
+ !<www-servers/ocsigen-1.1"
+DEPEND="${DEPEND}
+ dev-ml/cppo"
+
+SLOT="0/${PV}"
+LICENSE="LGPL-2.1-with-linking-exception"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~x86-fbsd"
+
+DOCS=( "CHANGES" "README.md" )
+
+src_configure() {
+ oasis_configure_opts="
+ --disable-glib
+ --disable-react
+ --disable-ssl
+ $(use_enable camlp4)
+ $(use_enable ppx)" \
+ oasis_src_configure
+}
diff --git a/dev-ml/lwt/lwt-3.1.0.ebuild b/dev-ml/lwt/lwt-3.1.0.ebuild
new file mode 100644
index 000000000000..98584bf66213
--- /dev/null
+++ b/dev-ml/lwt/lwt-3.1.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="Cooperative light-weight thread library for OCaml"
+SRC_URI="https://github.com/ocsigen/lwt/archive/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="http://ocsigen.org/lwt"
+
+IUSE="+camlp4 +libev"
+
+DEPEND="
+ >=dev-lang/ocaml-4.02:=
+ dev-ml/result:=
+ dev-ml/ocaml-migrate-parsetree:=
+ dev-ml/ppx_tools_versioned:=
+ libev? ( dev-libs/libev )
+ camlp4? ( dev-ml/camlp4:= )"
+
+RDEPEND="${DEPEND}
+ !<www-servers/ocsigen-1.1"
+DEPEND="${DEPEND}
+ dev-ml/cppo
+ dev-ml/findlib
+ dev-ml/jbuilder
+ dev-ml/opam"
+
+SLOT="0/${PV}"
+LICENSE="LGPL-2.1-with-linking-exception"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~x86-fbsd"
+
+src_configure() {
+ ocaml src/util/configure.ml \
+ -use-libev $(usex libev true false) \
+ -use-camlp4 $(usex camlp4 true false) \
+ || die
+}
+
+src_compile() {
+ jbuilder build -p lwt || die
+ ocaml src/util/install_filter.ml || die
+}
+
+src_test() {
+ jbuilder runtest -p lwt || die
+}
+
+src_install() {
+ opam-installer -i \
+ --prefix="${ED}/usr" \
+ --libdir="${D}/$(ocamlc -where)" \
+ --docdir="${ED}/usr/share/doc/${PF}" \
+ --mandir="${ED}/usr/share/man" \
+ ${PN}.install || die
+}
diff --git a/dev-ml/lwt/metadata.xml b/dev-ml/lwt/metadata.xml
new file mode 100644
index 000000000000..c3aa15b13c0c
--- /dev/null
+++ b/dev-ml/lwt/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <use>
+ <flag name="camlp4">Enable camlp4 syntax extension</flag>
+ <flag name="libev">Enable the <pkg>dev-libs/libev</pkg>-based backend.</flag>
+ <flag name="ppx">Enables the ppx syntax extension</flag>
+ </use>
+ <upstream>
+ <remote-id type="github">ocsigen/lwt</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/lwt_glib-1.0.1 b/dev-ml/lwt_glib-1.0.1
deleted file mode 100644
index 5276f3f9e090..000000000000
--- a/dev-ml/lwt_glib-1.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-ml/lwt-3.0.0:= dev-libs/glib:2 >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=GLib integration for Lwt
-EAPI=5
-HOMEPAGE=http://ocsigen.org/lwt
-IUSE=+ocamlopt debug doc
-KEYWORDS=~amd64 ~arm ~ppc ~x86-fbsd
-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 983774947da124fb7d542ce25a218bb1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e oasis 9256ed89af74c3365ec888c00bfdfe43 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=357b8eabdca391f351d1b37baabab893
diff --git a/dev-ml/lwt_glib/Manifest b/dev-ml/lwt_glib/Manifest
new file mode 100644
index 000000000000..e38bee92f39c
--- /dev/null
+++ b/dev-ml/lwt_glib/Manifest
@@ -0,0 +1,3 @@
+DIST lwt_glib-1.0.1.tar.gz 51837 BLAKE2B 0570bca2b697b7afd5072a938be4330e39fb6b1285690ddf44c7cf051fd29bd620e53f441cc03afa93f3c03e466fd8aceb9d4a200085e3797afd7346afbd0146 SHA512 b66057fcfd110808ebabe6ec0ab653ddbb11342614265c7af58201854078b4a6315aa56836e719c2b8b3edc3e4a87f9fede7913a9b462ef65d21ae3bb1dcbd6c
+EBUILD lwt_glib-1.0.1.ebuild 503 BLAKE2B 2277ea486790c053bc03fa4dccb0c22445591e47f72c607d3de3ecd50f6339b098325d160931e65871a15a5f0c1f9f01a1cabfc3fbaa5709acbeaeee7e4ce03d SHA512 36ed36b7bf5bea9ebb9a1496b47d72baac0f700cbd36a2dbf1b1076eda5cca87bde822a5a4e97a564a789350e9036c2ae276c4e3d8b9ebed329802a8c4f2e2e2
+MISC metadata.xml 323 BLAKE2B 698f215f56abf79d1cdccc81fee3c54ada81390b9ed0e05afd0b2df5fb5c710cb212b27ad6c96d849c89781daaefdc54c87019e508a6020e0eab88b98bde9280 SHA512 1ace9bf42638a4eb0579f2a65a075e6f57b766f42289f582aa535e143fc389508c4fdb14307b435121ad9d110e76b2cd369bb8496e706ee76c280546c90d20b6
diff --git a/dev-ml/lwt_glib/lwt_glib-1.0.1.ebuild b/dev-ml/lwt_glib/lwt_glib-1.0.1.ebuild
new file mode 100644
index 000000000000..0a45b425a40f
--- /dev/null
+++ b/dev-ml/lwt_glib/lwt_glib-1.0.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+OASIS_BUILD_DOCS=1
+
+LWT_VER=3.0.0
+
+inherit oasis
+
+DESCRIPTION="GLib integration for Lwt"
+SRC_URI="https://github.com/ocsigen/lwt/releases/download/${LWT_VER}/${P}.tar.gz"
+HOMEPAGE="http://ocsigen.org/lwt"
+
+IUSE=""
+
+DEPEND="
+ >=dev-ml/lwt-${LWT_VER}:=
+ dev-libs/glib:2
+"
+
+RDEPEND="${DEPEND}"
+
+SLOT="0/${PV}"
+LICENSE="LGPL-2.1-with-linking-exception"
+KEYWORDS="~amd64 ~arm ~ppc ~x86-fbsd"
diff --git a/dev-ml/lwt_glib/metadata.xml b/dev-ml/lwt_glib/metadata.xml
new file mode 100644
index 000000000000..c3df6b569544
--- /dev/null
+++ b/dev-ml/lwt_glib/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">ocsigen/lwt</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/lwt_react-1.0.1 b/dev-ml/lwt_react-1.0.1
deleted file mode 100644
index 6fdfee226526..000000000000
--- a/dev-ml/lwt_react-1.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-ml/lwt-3.0.0:= >=dev-ml/react-1.2:= >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=GLib integration for Lwt
-EAPI=5
-HOMEPAGE=http://ocsigen.org/lwt
-IUSE=+ocamlopt debug doc
-KEYWORDS=~amd64 ~arm ~ppc ~x86-fbsd
-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 983774947da124fb7d542ce25a218bb1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e oasis 9256ed89af74c3365ec888c00bfdfe43 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=10540c8d369486073fd3c69c963d7db7
diff --git a/dev-ml/lwt_react/Manifest b/dev-ml/lwt_react/Manifest
new file mode 100644
index 000000000000..9154e0c8ab43
--- /dev/null
+++ b/dev-ml/lwt_react/Manifest
@@ -0,0 +1,3 @@
+DIST lwt_react-1.0.1.tar.gz 50329 BLAKE2B 30de048131a0b2b3cc2711efdfa3cd9832d676f7d279871e911c7cf7291dc8a30fb8351f8dc4ee42ca0d01b44fc1b370b5045aeee36dd28bae2f731f3da377f0 SHA512 cd2dcc32ca87a3d26d1771d5bf51bd9f444c75cba028f7ff71e96cb9bc12387d66d6d0c59b6c8d4bac84fb42c6e2e969c385ef1d2f6cbc8e912963304a49eda8
+EBUILD lwt_react-1.0.1.ebuild 508 BLAKE2B e806691ef6a74d28856d0cc0dcfdff98ce8283164a5cc2f619b89bfdf4a9d304bcd9ea3545cbdb581a15346b0b7a2483a0783ec3933e292007413e345349e301 SHA512 7849ced130c0a2dcd7ff09728af64c9b9101b9780d8c424bf7142714f1ca396b71dd4f3460356a48b5f681c3a987c01c6cc4809ba84caa7d8f70e01ee3773512
+MISC metadata.xml 323 BLAKE2B 698f215f56abf79d1cdccc81fee3c54ada81390b9ed0e05afd0b2df5fb5c710cb212b27ad6c96d849c89781daaefdc54c87019e508a6020e0eab88b98bde9280 SHA512 1ace9bf42638a4eb0579f2a65a075e6f57b766f42289f582aa535e143fc389508c4fdb14307b435121ad9d110e76b2cd369bb8496e706ee76c280546c90d20b6
diff --git a/dev-ml/lwt_react/lwt_react-1.0.1.ebuild b/dev-ml/lwt_react/lwt_react-1.0.1.ebuild
new file mode 100644
index 000000000000..87b8ba33199a
--- /dev/null
+++ b/dev-ml/lwt_react/lwt_react-1.0.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+OASIS_BUILD_DOCS=1
+
+LWT_VER=3.0.0
+
+inherit oasis
+
+DESCRIPTION="GLib integration for Lwt"
+SRC_URI="https://github.com/ocsigen/lwt/releases/download/${LWT_VER}/${P}.tar.gz"
+HOMEPAGE="http://ocsigen.org/lwt"
+
+IUSE=""
+
+DEPEND="
+ >=dev-ml/lwt-${LWT_VER}:=
+ >=dev-ml/react-1.2:=
+"
+
+RDEPEND="${DEPEND}"
+
+SLOT="0/${PV}"
+LICENSE="LGPL-2.1-with-linking-exception"
+KEYWORDS="~amd64 ~arm ~ppc ~x86-fbsd"
diff --git a/dev-ml/lwt_react/metadata.xml b/dev-ml/lwt_react/metadata.xml
new file mode 100644
index 000000000000..c3df6b569544
--- /dev/null
+++ b/dev-ml/lwt_react/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">ocsigen/lwt</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/lwt_ssl-1.0.1 b/dev-ml/lwt_ssl-1.0.1
deleted file mode 100644
index 18296b63f985..000000000000
--- a/dev-ml/lwt_ssl-1.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-ml/lwt-3.0.0:= >=dev-ml/ocaml-ssl-0.4.0:= >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=GLib integration for Lwt
-EAPI=5
-HOMEPAGE=http://ocsigen.org/lwt
-IUSE=+ocamlopt debug doc
-KEYWORDS=~amd64 ~arm ~ppc ~x86-fbsd
-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 983774947da124fb7d542ce25a218bb1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e oasis 9256ed89af74c3365ec888c00bfdfe43 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2e8746608139f2b4ff2662832af038c9
diff --git a/dev-ml/lwt_ssl-1.1.1 b/dev-ml/lwt_ssl-1.1.1
deleted file mode 100644
index e30452bd5bf5..000000000000
--- a/dev-ml/lwt_ssl-1.1.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=>=dev-ml/lwt-3.1:= >=dev-ml/ocaml-ssl-0.4.0:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=GLib integration for Lwt
-EAPI=5
-HOMEPAGE=http://ocsigen.org/lwt
-KEYWORDS=~amd64 ~arm ~ppc ~x86-fbsd
-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 24b4a2529c1fd12f1304856d6c5a690d
-_md5_=51f90ae3b248ad86c837cdd6ed49601f
diff --git a/dev-ml/lwt_ssl/Manifest b/dev-ml/lwt_ssl/Manifest
new file mode 100644
index 000000000000..095cd1c0b5f6
--- /dev/null
+++ b/dev-ml/lwt_ssl/Manifest
@@ -0,0 +1,5 @@
+DIST lwt_ssl-1.0.1.tar.gz 48964 BLAKE2B deb6b48ef0249f7ab5c9bbb4507ce7be048c547c8aeeb9421a96cd1215c4292b6a4330ee6c6aeaf6ff092e7eaba0ef7f689ff0de2e97ff68b576cd27084719bf SHA512 429e2ee6b45e53b8f3347a0ad02531fa3ee6b3842dbf6475cf079a214f3a59bbb25f3c1c882ff32f01263711db034cc8900be827e27e6a8b0562812e4bd8e52d
+DIST lwt_ssl-1.1.1.tar.gz 288603 BLAKE2B ba22a078597c71ed51142c91d215c339f5ab9aae3a4f94f8111985ad76fba7faf60878ed3e549d79983130d8203531326c408a2f18e0f902e6171b383f26abda SHA512 207ccf8ccde13d88eb58d4ff45279f7cbde90ed5c20a941e7efa9501d9c1b8a71d7655178960c826bb52c6403c348faa5053cefc0ac197ad690a96daa55d1a32
+EBUILD lwt_ssl-1.0.1.ebuild 514 BLAKE2B de0264e18c0d0a67eb68e1b64035f67775ce17dde06e852d5fab24aecaa1eede29f8be098c1e3f7a8168245155c5dbf5995e19e6b891178dfb4fdc5bdf61ff59 SHA512 9c89135b3a809dc8f31492f8a6cf5f8bc2a37a8f2914e500df4427e16f8d9673bda8f5b6f3d30672fa3c0545911b9211cce77e75cc8c74cc70992d134f68f834
+EBUILD lwt_ssl-1.1.1.ebuild 593 BLAKE2B 46db04743e73bd5c097ff957a3cb46dd807cdec2da6d4581b8cb10d90bc5f65fa79325cc43605e340d935dbb32e9da0dadfd108b828e879b66b089dd69f04c48 SHA512 6a81d754469c806c5c9d06c304df6a7aefd4d3b5f4265ca6fe1c7a8f14551b4f69112978bed70793f3931ed51bb0bd85228563bb82412830eaaf33d4f3de612a
+MISC metadata.xml 323 BLAKE2B 698f215f56abf79d1cdccc81fee3c54ada81390b9ed0e05afd0b2df5fb5c710cb212b27ad6c96d849c89781daaefdc54c87019e508a6020e0eab88b98bde9280 SHA512 1ace9bf42638a4eb0579f2a65a075e6f57b766f42289f582aa535e143fc389508c4fdb14307b435121ad9d110e76b2cd369bb8496e706ee76c280546c90d20b6
diff --git a/dev-ml/lwt_ssl/lwt_ssl-1.0.1.ebuild b/dev-ml/lwt_ssl/lwt_ssl-1.0.1.ebuild
new file mode 100644
index 000000000000..bf1fd3c421be
--- /dev/null
+++ b/dev-ml/lwt_ssl/lwt_ssl-1.0.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+OASIS_BUILD_DOCS=1
+
+LWT_VER=3.0.0
+
+inherit oasis
+
+DESCRIPTION="GLib integration for Lwt"
+SRC_URI="https://github.com/ocsigen/lwt/releases/download/${LWT_VER}/${P}.tar.gz"
+HOMEPAGE="http://ocsigen.org/lwt"
+
+IUSE=""
+
+DEPEND="
+ >=dev-ml/lwt-${LWT_VER}:=
+ >=dev-ml/ocaml-ssl-0.4.0:=
+"
+
+RDEPEND="${DEPEND}"
+
+SLOT="0/${PV}"
+LICENSE="LGPL-2.1-with-linking-exception"
+KEYWORDS="~amd64 ~arm ~ppc ~x86-fbsd"
diff --git a/dev-ml/lwt_ssl/lwt_ssl-1.1.1.ebuild b/dev-ml/lwt_ssl/lwt_ssl-1.1.1.ebuild
new file mode 100644
index 000000000000..acc14d95595a
--- /dev/null
+++ b/dev-ml/lwt_ssl/lwt_ssl-1.1.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit opam
+
+DESCRIPTION="GLib integration for Lwt"
+SRC_URI="https://github.com/ocsigen/lwt/archive/${P}.tar.gz"
+HOMEPAGE="http://ocsigen.org/lwt"
+
+IUSE=""
+
+RDEPEND="
+ >=dev-ml/lwt-3.1:=
+ >=dev-ml/ocaml-ssl-0.4.0:=
+"
+DEPEND="${RDEPEND}
+ dev-ml/jbuilder"
+
+SLOT="0/${PV}"
+LICENSE="LGPL-2.1-with-linking-exception"
+KEYWORDS="~amd64 ~arm ~ppc ~x86-fbsd"
+S="${WORKDIR}/lwt-${P}/"
+
+src_compile() {
+ jbuilder build -p ${PN} || die
+}
+
+src_test() {
+ jbuilder runtest -p ${PN} || die
+}
diff --git a/dev-ml/lwt_ssl/metadata.xml b/dev-ml/lwt_ssl/metadata.xml
new file mode 100644
index 000000000000..c3df6b569544
--- /dev/null
+++ b/dev-ml/lwt_ssl/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">ocsigen/lwt</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/macaque-0.7.4 b/dev-ml/macaque-0.7.4
deleted file mode 100644
index ed23013e4208..000000000000
--- a/dev-ml/macaque-0.7.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-ml/pgocaml-2.1:= dev-ml/camlp4:= dev-ml/oasis >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=DSL for SQL Queries in Caml
-EAPI=5
-HOMEPAGE=http://ocsigen.org/macaque/
-IUSE=+ocamlopt debug
-KEYWORDS=~amd64
-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 983774947da124fb7d542ce25a218bb1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e oasis 9256ed89af74c3365ec888c00bfdfe43 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e94c1b8ad8a730144111484da5ede78f
diff --git a/dev-ml/macaque/Manifest b/dev-ml/macaque/Manifest
new file mode 100644
index 000000000000..ed6ea09a0f1a
--- /dev/null
+++ b/dev-ml/macaque/Manifest
@@ -0,0 +1,3 @@
+DIST macaque-0.7.4.tar.gz 64896 BLAKE2B d0a0fcb09bd468cb5de75551ee62278282f98de4d4477c71b55c065d35bc1d6483614c578ba18f609e5cdc98bd52d93943efa9948d9c01a95b8a3d1608e246bb SHA512 db664226e58ad3db2dc00e920dcc757242b0bcc8d1b6406e6743afe6cdbe789546af131a00c07a5e2e63ed39b9017c2d8e2f5bbce63a741df58bf14633aae89a
+EBUILD macaque-0.7.4.ebuild 584 BLAKE2B e8bddd4563ba150bb189eaaa992f312e6852dac76f17427c73e0e0b42d481380429060907e42b6c2e8d3e3d97f08609c31b316599e3b180d8b84121e468710ab SHA512 b77b2a83370c075cf5901b15626018f6ce4ad4451392b9b8afb92a6c075f52dbfc6cac18d77ab91a1deece425032d11aa097256dcc603b4ee3aa5f54bdaa9cc1
+MISC metadata.xml 337 BLAKE2B f9d286b06e06dc7ad897e805871dd39051cd3f7469170ebc60fad50aca71b73a6482ccadeee9619a9fe9439746fba774246ea4decebc0a2ee59ac64febfae22c SHA512 1c5a4ffff4b5e11f229eae1f992998af381bfb774eb92d1b024d5df8401f5480223b636f48acab6a76f88938b1561101a15e9d0c73db8f05f1494f7ceff435d0
diff --git a/dev-ml/macaque/macaque-0.7.4.ebuild b/dev-ml/macaque/macaque-0.7.4.ebuild
new file mode 100644
index 000000000000..f8b8e3fb069d
--- /dev/null
+++ b/dev-ml/macaque/macaque-0.7.4.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit oasis
+
+DESCRIPTION="DSL for SQL Queries in Caml"
+HOMEPAGE="http://ocsigen.org/macaque/"
+SRC_URI="https://github.com/ocsigen/macaque/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND=">=dev-ml/pgocaml-2.1:=
+ dev-ml/camlp4:="
+DEPEND="${RDEPEND}
+ dev-ml/oasis"
+DOCS=( Changelog README.md )
+OASIS_SETUP_COMMAND="./setup.exe"
+
+src_configure() {
+ emake setup.exe
+ oasis_src_configure
+}
diff --git a/dev-ml/macaque/metadata.xml b/dev-ml/macaque/metadata.xml
new file mode 100644
index 000000000000..c4e0b775c9af
--- /dev/null
+++ b/dev-ml/macaque/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">ocsigen/macaque</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/markup-0.7.5 b/dev-ml/markup-0.7.5
deleted file mode 100644
index db475826c411..000000000000
--- a/dev-ml/markup-0.7.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=dev-lang/ocaml:=[ocamlopt] dev-ml/lwt:=[ocamlopt(+)] >=dev-ml/uutf-1.0:=[ocamlopt] test? ( dev-ml/ounit ) dev-ml/ocamlbuild >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Error-recovering streaming HTML5 and XML parsers
-EAPI=5
-HOMEPAGE=https://github.com/aantron/markup.ml
-IUSE=doc test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-lang/ocaml:=[ocamlopt] dev-ml/lwt:=[ocamlopt(+)] >=dev-ml/uutf-1.0:=[ocamlopt]
-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 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7f8c29b4ea209c7e079c79557c3ba214
diff --git a/dev-ml/markup/Manifest b/dev-ml/markup/Manifest
new file mode 100644
index 000000000000..14a6e8914e8a
--- /dev/null
+++ b/dev-ml/markup/Manifest
@@ -0,0 +1,3 @@
+DIST markup-0.7.5.tar.gz 278654 BLAKE2B 5338d4b546c74ade522c84c5a0583ad08b09e4ca3ecb96712725dd33792e401f66f076e47cf24986047f36236c53134272cadcd2abe322307377bb79055bf39a SHA512 19350df7a3a619c479fa030b8772009bc32f3e9830494f5707e05f85b9ee9ff0ddf382d292c7a11bbd3b63c8c108e6a84b2d01f5e983f49d7cdf63ee3c4545c8
+EBUILD markup-0.7.5.ebuild 771 BLAKE2B ad4a9dc1289cba27a73ef76ed35a4608cb703065224e73404511632c12551b8716670f089283f152d5d0f1f5d46dac5d28c080d65fec535989795079d3916348 SHA512 94bb0daf5318ad09bc89df90972b1f247ae932300c4d3548785a929cd97a531b40e2a1999a35099ad3649b0722cbf9680fbc2a4bd6210a2c7aa00a03fa1e533c
+MISC metadata.xml 339 BLAKE2B 2cc964584a884b63522373a90e38a9521df07f66dd2e610a2265946424af32509a815bd3dfb94272fca4e9fd2da2cba6c8b39b7f24af366754e2ea5b7c19d831 SHA512 6bfd336707285ff31847e877573b2c63c1b45dcbc15793b0bf663922bf48b331e5a89b2cd0e98833017733844047f11ac21dd365ed62be8c0aa93da10b6e8bc2
diff --git a/dev-ml/markup/markup-0.7.5.ebuild b/dev-ml/markup/markup-0.7.5.ebuild
new file mode 100644
index 000000000000..66c1698789fe
--- /dev/null
+++ b/dev-ml/markup/markup-0.7.5.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit findlib eutils
+
+DESCRIPTION="Error-recovering streaming HTML5 and XML parsers"
+HOMEPAGE="https://github.com/aantron/markup.ml"
+SRC_URI="https://github.com/aantron/markup.ml/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}p1"
+KEYWORDS="~amd64"
+IUSE="doc test"
+
+DEPEND="
+ dev-lang/ocaml:=[ocamlopt]
+ dev-ml/lwt:=[ocamlopt(+)]
+ >=dev-ml/uutf-1.0:=[ocamlopt]
+"
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND}
+ test? ( dev-ml/ounit )
+ dev-ml/ocamlbuild"
+S="${WORKDIR}/${PN}.ml-${PV}"
+
+src_compile() {
+ emake
+ use doc && emake docs
+}
+
+src_install() {
+ findlib_src_preinst
+ emake ocamlfind-install
+ dodoc README.md
+ use doc && dohtml doc/html/*
+}
diff --git a/dev-ml/markup/metadata.xml b/dev-ml/markup/metadata.xml
new file mode 100644
index 000000000000..ecd1021328e1
--- /dev/null
+++ b/dev-ml/markup/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">aantron/markup.ml</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/mccs-1.1.2c b/dev-ml/mccs-1.1.2c
deleted file mode 100644
index ce6720acc77e..000000000000
--- a/dev-ml/mccs-1.1.2c
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=dev-ml/cudf:= sci-mathematics/glpk:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=Multi Criteria CUDF Solver
-EAPI=6
-HOMEPAGE=http://www.i3s.unice.fr/~cpjm/misc/ https://github.com/AltGr/ocaml-mccs/issues
-KEYWORDS=~amd64
-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 24b4a2529c1fd12f1304856d6c5a690d versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=7ebcdca046cbdc52757a030e540c7ab4
diff --git a/dev-ml/mccs/Manifest b/dev-ml/mccs/Manifest
new file mode 100644
index 000000000000..e80a549d171c
--- /dev/null
+++ b/dev-ml/mccs/Manifest
@@ -0,0 +1,3 @@
+DIST mccs-1.1.2c.tar.gz 54497 BLAKE2B 4d60942b83bd8c80c758abcd126726ff96b220d61c53b838d239f77e6509edc1c5e7287333eb2710e1402f671198df2dcacd4eed8f1b26565fd55be60dbd8a21 SHA512 53a96aab7abe02cc77ec35341f4e1ca3c5896fb13f7dc36902a014bfba29d50dfebe0457178abcc12dc065aa1e98b8175c2128fc9a799fd696d6ce9348b2281b
+EBUILD mccs-1.1.2c.ebuild 657 BLAKE2B 95574ba074c451b60cb3cc347e8fb06b5c4df6cd9154aa91f6b3c6c82e6954ac8c81db340d3d2451e413e3e84215bb3be6d73297b1d3505b0be3c47dcbbaac48 SHA512 0fc8e1ef0a4ce753b7de7595e0049bd0cddc2c6e45f589c243a6c4adae923f8ff04a59639a87e1efea5d818efa24c9e60f6f5141fa83b9fb44578796074a84de
+MISC metadata.xml 328 BLAKE2B 81cef5bae394a8d49fc51352e73c056ada8bbcdf792e977e3e299327a7adca455528e325f8e72b78b3aecef39698812bed340f868f205e3fd16961cf8abc9108 SHA512 4eb718b3423eeb98bf51bd303bb6fde1a33f9838805dbf2a4ed2a6487f0de3136858afc4b142f81d86eff86fcdeb6d383097c22f3d33f3d47f848f323b3a26d8
diff --git a/dev-ml/mccs/mccs-1.1.2c.ebuild b/dev-ml/mccs/mccs-1.1.2c.ebuild
new file mode 100644
index 000000000000..3451a9f9423a
--- /dev/null
+++ b/dev-ml/mccs/mccs-1.1.2c.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit versionator opam
+
+MY_PV=$(replace_version_separator 2 '+')
+
+DESCRIPTION="Multi Criteria CUDF Solver"
+HOMEPAGE="http://www.i3s.unice.fr/~cpjm/misc/ https://github.com/AltGr/ocaml-mccs/issues"
+SRC_URI="https://github.com/AltGr/ocaml-mccs/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+ dev-ml/cudf:=
+ sci-mathematics/glpk:=
+"
+DEPEND="${RDEPEND}
+ dev-ml/jbuilder"
+
+S=${WORKDIR}/ocaml-${PN}-$(replace_version_separator 2 '-')
+
+src_compile() {
+ jbuilder build -p ${PN} || die
+}
diff --git a/dev-ml/mccs/metadata.xml b/dev-ml/mccs/metadata.xml
new file mode 100644
index 000000000000..966e8b481be6
--- /dev/null
+++ b/dev-ml/mccs/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">AltGr/ocaml-mccs</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/menhir-20170712 b/dev-ml/menhir-20170712
deleted file mode 100644
index fcd098177aa9..000000000000
--- a/dev-ml/menhir-20170712
+++ /dev/null
@@ -1,13 +0,0 @@
-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=5
-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/20170712
-SRC_URI=http://gallium.inria.fr/~fpottier/menhir/menhir-20170712.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9107d7895b69fb99e36071feaf352336
diff --git a/dev-ml/menhir-20171013 b/dev-ml/menhir-20171013
deleted file mode 100644
index 6a20df5f4b5c..000000000000
--- a/dev-ml/menhir-20171013
+++ /dev/null
@@ -1,13 +0,0 @@
-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=5
-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/20171013
-SRC_URI=http://gallium.inria.fr/~fpottier/menhir/menhir-20171013.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9107d7895b69fb99e36071feaf352336
diff --git a/dev-ml/menhir/Manifest b/dev-ml/menhir/Manifest
new file mode 100644
index 000000000000..d48f6b4aaf45
--- /dev/null
+++ b/dev-ml/menhir/Manifest
@@ -0,0 +1,5 @@
+DIST menhir-20170712.tar.gz 855262 BLAKE2B 259a165f30f18720ff2fb3457a8ee51dc63202860a9ad097ad6e49e2666480019b7011a11764f2c3780cf12a246c313058a35f07d100c891e07ba3ed7cb20cca SHA512 7850fa031a2bd69e9cf17db6d8f82f716ab5f9e60b34d1a53591a3ff46750fb01880f3282a7194465441abc4c2ba60f543646097f5f0eef6fe78b36266a3dbdc
+DIST menhir-20171013.tar.gz 854000 BLAKE2B d50ce48d32d3bfd588520d6e5a8af4ea628089010fb286df6f87ee3f773273427f9ac6956b4b4bc1c27592aaea1f29447f0223b6b29d9cd0533c47d10eecb318 SHA512 ba6359c471aee62c996bd6495612f444e7ac226f7aad9991a76e4daa2df00cdec2387c488c6a29246ca48079bd8199b94de09a44f1fb05465cbeddff0b39df54
+EBUILD menhir-20170712.ebuild 894 BLAKE2B e62e9439edd990293f8ab860de8603a3acfcebaeb8d1822362722eca9fbe2cdd6d515ce744c40a03c7ea97f903c29f8a8c874ec004fc2b7e30cd32a529ac255f SHA512 aa34340bdb35e4e928513c2bed7c5d6f146385d8b5b6bc5a5a1e82ec9d2bf9fb4cf2c4d172f92ba547ddfc2a7b042d0138490e856228dc35c4dd0b8254e8f3c1
+EBUILD menhir-20171013.ebuild 894 BLAKE2B e62e9439edd990293f8ab860de8603a3acfcebaeb8d1822362722eca9fbe2cdd6d515ce744c40a03c7ea97f903c29f8a8c874ec004fc2b7e30cd32a529ac255f SHA512 aa34340bdb35e4e928513c2bed7c5d6f146385d8b5b6bc5a5a1e82ec9d2bf9fb4cf2c4d172f92ba547ddfc2a7b042d0138490e856228dc35c4dd0b8254e8f3c1
+MISC metadata.xml 243 BLAKE2B 010ca240ae06e9a9f6d7ba213eb06df36d9ba862ff2d2458d98a9fea1a1e7f3026d13832a73bce1b3ad9345029425e6abfae9e03bf126f2329b3f030ed3753fd SHA512 1c5b4b2163017e496999d1f87e5c9c5ac6c11b2e9187450ccfb3df258f34e54d278972f04ee0e8429476c6f87e091a869ac2a28c6e8c8e6d20678c3e74061449
diff --git a/dev-ml/menhir/menhir-20170712.ebuild b/dev-ml/menhir/menhir-20170712.ebuild
new file mode 100644
index 000000000000..51e7184f445c
--- /dev/null
+++ b/dev-ml/menhir/menhir-20170712.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit findlib eutils
+
+DESCRIPTION="LR(1) parser generator for the OCaml language"
+HOMEPAGE="http://gallium.inria.fr/~fpottier/menhir/"
+SRC_URI="http://gallium.inria.fr/~fpottier/menhir/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE="examples +ocamlopt"
+
+RDEPEND=">=dev-lang/ocaml-4.02:=[ocamlopt?]"
+DEPEND="${RDEPEND}
+ dev-ml/ocamlbuild"
+
+src_configure() {
+ if ! use ocamlopt ; then
+ export TARGET=byte
+ fi
+}
+
+src_compile() {
+ emake PREFIX="${EPREFIX}"/usr -j1
+}
+
+src_install() {
+ findlib_src_preinst
+ emake PREFIX="${ED}"/usr docdir="${ED}"/usr/share/doc/"${PF}" $(use examples || echo "DOCS=manual.pdf") install
+ use examples && docompress -x /usr/share/doc/${PF}/demos
+ dodoc README.md CHANGES.md
+}
diff --git a/dev-ml/menhir/menhir-20171013.ebuild b/dev-ml/menhir/menhir-20171013.ebuild
new file mode 100644
index 000000000000..51e7184f445c
--- /dev/null
+++ b/dev-ml/menhir/menhir-20171013.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit findlib eutils
+
+DESCRIPTION="LR(1) parser generator for the OCaml language"
+HOMEPAGE="http://gallium.inria.fr/~fpottier/menhir/"
+SRC_URI="http://gallium.inria.fr/~fpottier/menhir/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE="examples +ocamlopt"
+
+RDEPEND=">=dev-lang/ocaml-4.02:=[ocamlopt?]"
+DEPEND="${RDEPEND}
+ dev-ml/ocamlbuild"
+
+src_configure() {
+ if ! use ocamlopt ; then
+ export TARGET=byte
+ fi
+}
+
+src_compile() {
+ emake PREFIX="${EPREFIX}"/usr -j1
+}
+
+src_install() {
+ findlib_src_preinst
+ emake PREFIX="${ED}"/usr docdir="${ED}"/usr/share/doc/"${PF}" $(use examples || echo "DOCS=manual.pdf") install
+ use examples && docompress -x /usr/share/doc/${PF}/demos
+ dodoc README.md CHANGES.md
+}
diff --git a/dev-ml/menhir/metadata.xml b/dev-ml/menhir/metadata.xml
new file mode 100644
index 000000000000..ffac4d7ebc01
--- /dev/null
+++ b/dev-ml/menhir/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-ml/merlin-2.5.3 b/dev-ml/merlin-2.5.3
deleted file mode 100644
index 6de286caa973..000000000000
--- a/dev-ml/merlin-2.5.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm
-DEPEND=dev-lang/ocaml:= dev-ml/yojson:= >=dev-ml/findlib-1.0.4-r1 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=Context sensitive completion for OCaml in Vim and Emacs
-EAPI=6
-HOMEPAGE=https://github.com/ocaml/merlin
-KEYWORDS=~amd64
-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
-_md5_=8f11d3c8ca5ff7c5ca6556735193bc36
diff --git a/dev-ml/merlin-2.5.4 b/dev-ml/merlin-2.5.4
deleted file mode 100644
index 486a51e7e02f..000000000000
--- a/dev-ml/merlin-2.5.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm
-DEPEND=dev-lang/ocaml:= dev-ml/yojson:= >=dev-ml/findlib-1.0.4-r1 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=Context sensitive completion for OCaml in Vim and Emacs
-EAPI=6
-HOMEPAGE=https://github.com/ocaml/merlin
-KEYWORDS=~amd64
-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
-_md5_=8f11d3c8ca5ff7c5ca6556735193bc36
diff --git a/dev-ml/merlin-2.5.5 b/dev-ml/merlin-2.5.5
deleted file mode 100644
index 5d10aa03d308..000000000000
--- a/dev-ml/merlin-2.5.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm
-DEPEND=dev-lang/ocaml:= dev-ml/yojson:= >=dev-ml/findlib-1.0.4-r1 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=Context sensitive completion for OCaml in Vim and Emacs
-EAPI=6
-HOMEPAGE=https://github.com/ocaml/merlin
-KEYWORDS=~amd64
-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
-_md5_=8f11d3c8ca5ff7c5ca6556735193bc36
diff --git a/dev-ml/merlin-3.0.0 b/dev-ml/merlin-3.0.0
deleted file mode 100644
index d1e43645aad2..000000000000
--- a/dev-ml/merlin-3.0.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm
-DEPEND=dev-lang/ocaml:= dev-ml/yojson:= >=dev-ml/findlib-1.0.4-r1 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=Context sensitive completion for OCaml in Vim and Emacs
-EAPI=6
-HOMEPAGE=https://github.com/ocaml/merlin
-KEYWORDS=~amd64
-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
-_md5_=8f11d3c8ca5ff7c5ca6556735193bc36
diff --git a/dev-ml/merlin-3.0.1 b/dev-ml/merlin-3.0.1
deleted file mode 100644
index 90dec8026942..000000000000
--- a/dev-ml/merlin-3.0.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm
-DEPEND=dev-lang/ocaml:= dev-ml/yojson:= >=dev-ml/findlib-1.0.4-r1 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=Context sensitive completion for OCaml in Vim and Emacs
-EAPI=6
-HOMEPAGE=https://github.com/ocaml/merlin
-KEYWORDS=~amd64
-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
-_md5_=8f11d3c8ca5ff7c5ca6556735193bc36
diff --git a/dev-ml/merlin-3.0.2 b/dev-ml/merlin-3.0.2
deleted file mode 100644
index dd988b17ce5b..000000000000
--- a/dev-ml/merlin-3.0.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm
-DEPEND=dev-lang/ocaml:= dev-ml/yojson:= >=dev-ml/findlib-1.0.4-r1 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=Context sensitive completion for OCaml in Vim and Emacs
-EAPI=6
-HOMEPAGE=https://github.com/ocaml/merlin
-KEYWORDS=~amd64
-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
-_md5_=8f11d3c8ca5ff7c5ca6556735193bc36
diff --git a/dev-ml/merlin-3.0.3 b/dev-ml/merlin-3.0.3
deleted file mode 100644
index 191963862eb6..000000000000
--- a/dev-ml/merlin-3.0.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm
-DEPEND=dev-lang/ocaml:= dev-ml/yojson:= >=dev-ml/findlib-1.0.4-r1 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=Context sensitive completion for OCaml in Vim and Emacs
-EAPI=6
-HOMEPAGE=https://github.com/ocaml/merlin
-KEYWORDS=~amd64
-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
-_md5_=8f11d3c8ca5ff7c5ca6556735193bc36
diff --git a/dev-ml/merlin-extend-0.3 b/dev-ml/merlin-extend-0.3
deleted file mode 100644
index a4f5dd9f10d1..000000000000
--- a/dev-ml/merlin-extend-0.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-lang/ocaml:= dev-ml/cppo >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=SDK to extend Merlin
-EAPI=5
-HOMEPAGE=https://github.com/let-def/merlin-extend
-KEYWORDS=~amd64
-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
-_md5_=315271c0ec42214ddf1359e876b5fab4
diff --git a/dev-ml/merlin-extend/Manifest b/dev-ml/merlin-extend/Manifest
new file mode 100644
index 000000000000..a7712a387cf2
--- /dev/null
+++ b/dev-ml/merlin-extend/Manifest
@@ -0,0 +1,3 @@
+DIST merlin-extend-0.3.tar.gz 15422 BLAKE2B cfd658c9afa6f4500899c342c86c75399cbbef89fe5817c2a957ec93ba02c360fff66e01b81890d19c87a89380ba1cd352a2ffdc10a2dc53c7d535e8af5f720a SHA512 1e6436299b38c7fa57ae5b681a1409795545bc6f5956d6b1c37cbfdbdabfd90da476c030067fe2e016c823d60d1e5498c4536c869bf58425e1a6ff78295efba4
+EBUILD merlin-extend-0.3.ebuild 492 BLAKE2B 4ed8eb7aaa477e5f495419700a1c4aa1751dc3be1c1bdf9931d14255355334fcf8f697fbf6939ca33e3c0c5cd489c19e11a0e31ade2f508e218d577c98985f00 SHA512 15dfc2073b2436d73de836fe08ed785511ac0a6ea052c7503e012bed094a837dbae527972247d75222b80b15e3cc0ebe382ed3e8c2756ac929eaf59833de9dd6
+MISC metadata.xml 333 BLAKE2B 61be05e28c6e64840a0403b4ff33c5a1608c0239bbd8a1fe27ca321f0cea4021ff094819ca91aacecbc8baa1c96f816fabd22e74a7a68a0231e4f01a599ef371 SHA512 321e5555b9bc1ee6db3ccb04958a8da680b4d50b1c19285da4cd629d458676c8f0c49ebbe7a927957f54ccd421e7595e4785f0adcbafae969154995d7a50d814
diff --git a/dev-ml/merlin-extend/merlin-extend-0.3.ebuild b/dev-ml/merlin-extend/merlin-extend-0.3.ebuild
new file mode 100644
index 000000000000..66c4758edc08
--- /dev/null
+++ b/dev-ml/merlin-extend/merlin-extend-0.3.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit findlib
+
+DESCRIPTION="SDK to extend Merlin"
+HOMEPAGE="https://github.com/let-def/merlin-extend"
+SRC_URI="https://github.com/let-def/merlin-extend/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="dev-lang/ocaml:="
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND}
+ dev-ml/cppo"
+
+src_install() {
+ findlib_src_preinst
+ default
+}
diff --git a/dev-ml/merlin-extend/metadata.xml b/dev-ml/merlin-extend/metadata.xml
new file mode 100644
index 000000000000..6bdf083edd14
--- /dev/null
+++ b/dev-ml/merlin-extend/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">let-def/merlin-extend</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/merlin/Manifest b/dev-ml/merlin/Manifest
new file mode 100644
index 000000000000..d16556154776
--- /dev/null
+++ b/dev-ml/merlin/Manifest
@@ -0,0 +1,15 @@
+DIST merlin-2.5.3.tar.gz 3090459 BLAKE2B a1f6dbbc1e903955100d3001bbe7485deda02fbef3cd50abd14e91fff6a0c7fbc1ba17ca9824b5cdaf983dfceecd9233b2c8ef97b357521d406a432c3e8e6358 SHA512 7399b8afc3cd6c0c26fab44aec80cc7614cbe148bafea3512be9a4165b0ba0c93bc738e2d7e5dcc4b51208c9b9f185cc83e408c484e38b2e72e357cefb9ad5f0
+DIST merlin-2.5.4.tar.gz 3094234 BLAKE2B c59f8a6257d33150ac51704454f09e4d24f448d94c13452a9f77489a409aaa8c2467eb173fc0fb106d305b465db1261e5c9c2022c06e0af3780bf6aeef9550e3 SHA512 ca6a1cc1da0b0211bac4f0e8b9c78b531fdd0ed97f7d978ae740b7bf7a97bb02d318bde97d8a9f143b6207b72bd47eb626748b86feebf6a60bcd222d5bddb759
+DIST merlin-2.5.5.tar.gz 3094071 BLAKE2B 5ed62b0fb02ed455f5302050488b6857cce27f399cad9654f081c1bcfc59ea0a5c710bbb79a9182e270ae9de5d78b6400183b4db6bdc7e6578f329abf962c079 SHA512 9ba79f2fd2e2cdefe94da60b52096696bf08dcfd332188496c35074377a106bb3987025069784a96846a6c1cef1c0793b0525781aed8192227dd0c67266baaf1
+DIST merlin-3.0.0.tar.gz 3971353 BLAKE2B 6122ede68af116549e63709fa71fa2647336431c83014cc81cd8d6555363d9b1ad9ac6273fb1b8a28252b05bedbe84cb7ddc3bfbc07f87ece7a58230df9d680d SHA512 674495c01d4afef8273e904f656475d1e05e6c06b9f8a39ce2e3eb8aacd870a2e721ba510dccd2d9d154f5b6fbfb42840603d189819a573d136a3bcc85ff4551
+DIST merlin-3.0.1.tar.gz 3971680 BLAKE2B 9e5962cab960dcec31c50187e0cef30027c8735e2e3e70e9b74bd8c49315c09b4df0ae6e6aa7d25ea37819d4abf0ffc59bcbb53f962dbbe21e1ebb47a1a47280 SHA512 7f6bedba954fde712b5eda80910c27f80f74f1346c67b0c29b896944c7d51dd268db0aa996610a1dda6edc0798b322369390bb3213f8c42584676790756542ec
+DIST merlin-3.0.2.tar.gz 3971755 BLAKE2B 41d39679a7e7fe3ebed38ee40a074e95dd1d5f413ef88ed8a52f4009f401ca9b709d65efadcefd51f3659e94cb6e63f5cf3c98a6b19870d91984da203901b447 SHA512 3f7ae1981a95a58f694928a8b2d5186a304750219655e52d360f1f6fd6f832d5390f3346cf2c58c8618e6de34ab920f92a6c077d241fac5ce41241d7bed4476a
+DIST merlin-3.0.3.tar.gz 3979949 BLAKE2B 49fe4f201bff44a3e62e119cae3ab470e4581cff64e9ac4600e94700c36b62ddea8b1a7328fac25492c471ec8c6e5dea9f169c4efefd14863222ce9f2b90dafb SHA512 54532c7e0c2e724d96bea4f60d5368b1aed2b9ac4dc4c81ebeb05486b2c649ef1b911610a7beddce03f81be807efa0bb13fbc1e7e0d598cd92217bf84e9f87f7
+EBUILD merlin-2.5.3.ebuild 669 BLAKE2B 9f9fdcbe78a36f0f1a5aacbd87e37cdba5e79a19ffcd4a1a9df6dacc2fe07882d5e92bb2a03777cddc5a194e9a4e70d2314623770e20406ad42e5e4effa070bb SHA512 c9d610954472e2c997f1d2bda40510198d07eae43d71db052079d01adf710b406ea446088d9f8fa6bea3dddf34230a21c6b7faf54ff01e67c4db085fe0ed602e
+EBUILD merlin-2.5.4.ebuild 669 BLAKE2B 9f9fdcbe78a36f0f1a5aacbd87e37cdba5e79a19ffcd4a1a9df6dacc2fe07882d5e92bb2a03777cddc5a194e9a4e70d2314623770e20406ad42e5e4effa070bb SHA512 c9d610954472e2c997f1d2bda40510198d07eae43d71db052079d01adf710b406ea446088d9f8fa6bea3dddf34230a21c6b7faf54ff01e67c4db085fe0ed602e
+EBUILD merlin-2.5.5.ebuild 669 BLAKE2B 9f9fdcbe78a36f0f1a5aacbd87e37cdba5e79a19ffcd4a1a9df6dacc2fe07882d5e92bb2a03777cddc5a194e9a4e70d2314623770e20406ad42e5e4effa070bb SHA512 c9d610954472e2c997f1d2bda40510198d07eae43d71db052079d01adf710b406ea446088d9f8fa6bea3dddf34230a21c6b7faf54ff01e67c4db085fe0ed602e
+EBUILD merlin-3.0.0.ebuild 669 BLAKE2B 9f9fdcbe78a36f0f1a5aacbd87e37cdba5e79a19ffcd4a1a9df6dacc2fe07882d5e92bb2a03777cddc5a194e9a4e70d2314623770e20406ad42e5e4effa070bb SHA512 c9d610954472e2c997f1d2bda40510198d07eae43d71db052079d01adf710b406ea446088d9f8fa6bea3dddf34230a21c6b7faf54ff01e67c4db085fe0ed602e
+EBUILD merlin-3.0.1.ebuild 669 BLAKE2B 9f9fdcbe78a36f0f1a5aacbd87e37cdba5e79a19ffcd4a1a9df6dacc2fe07882d5e92bb2a03777cddc5a194e9a4e70d2314623770e20406ad42e5e4effa070bb SHA512 c9d610954472e2c997f1d2bda40510198d07eae43d71db052079d01adf710b406ea446088d9f8fa6bea3dddf34230a21c6b7faf54ff01e67c4db085fe0ed602e
+EBUILD merlin-3.0.2.ebuild 669 BLAKE2B 9f9fdcbe78a36f0f1a5aacbd87e37cdba5e79a19ffcd4a1a9df6dacc2fe07882d5e92bb2a03777cddc5a194e9a4e70d2314623770e20406ad42e5e4effa070bb SHA512 c9d610954472e2c997f1d2bda40510198d07eae43d71db052079d01adf710b406ea446088d9f8fa6bea3dddf34230a21c6b7faf54ff01e67c4db085fe0ed602e
+EBUILD merlin-3.0.3.ebuild 669 BLAKE2B 9f9fdcbe78a36f0f1a5aacbd87e37cdba5e79a19ffcd4a1a9df6dacc2fe07882d5e92bb2a03777cddc5a194e9a4e70d2314623770e20406ad42e5e4effa070bb SHA512 c9d610954472e2c997f1d2bda40510198d07eae43d71db052079d01adf710b406ea446088d9f8fa6bea3dddf34230a21c6b7faf54ff01e67c4db085fe0ed602e
+MISC metadata.xml 324 BLAKE2B 846e0f2710717f0c5c7ff474596b7359eb2d5ce2d41669bb8e6ddf8bae0bd84a7756a5e6eaf1282fc91d2089cffdeec82424e82b55d9ad31cb474606f93997c7 SHA512 39bd6ccc4f2820b236935e3abe9ff9de9246f55f68ddf95d75aa038a3333b55139c5097336669ddf848e3d93d7455681f5b99ae7a4ab3bbe65b16ff1252f851f
diff --git a/dev-ml/merlin/merlin-2.5.3.ebuild b/dev-ml/merlin/merlin-2.5.3.ebuild
new file mode 100644
index 000000000000..609f9767e4cc
--- /dev/null
+++ b/dev-ml/merlin/merlin-2.5.3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit findlib vim-plugin
+
+DESCRIPTION="Context sensitive completion for OCaml in Vim and Emacs"
+HOMEPAGE="https://github.com/ocaml/merlin"
+SRC_URI="https://github.com/ocaml/merlin/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+ dev-lang/ocaml:=
+ dev-ml/yojson:=
+"
+RDEPEND="${DEPEND}
+ || ( app-editors/vim[python] app-editors/gvim[python] )"
+
+src_configure() {
+ ./configure \
+ --prefix "${EPREFIX}/usr" \
+ --vimdir "${EPREFIX}//usr/share/vim/vimfiles" \
+ || die
+}
+
+src_install() {
+ default
+}
diff --git a/dev-ml/merlin/merlin-2.5.4.ebuild b/dev-ml/merlin/merlin-2.5.4.ebuild
new file mode 100644
index 000000000000..609f9767e4cc
--- /dev/null
+++ b/dev-ml/merlin/merlin-2.5.4.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit findlib vim-plugin
+
+DESCRIPTION="Context sensitive completion for OCaml in Vim and Emacs"
+HOMEPAGE="https://github.com/ocaml/merlin"
+SRC_URI="https://github.com/ocaml/merlin/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+ dev-lang/ocaml:=
+ dev-ml/yojson:=
+"
+RDEPEND="${DEPEND}
+ || ( app-editors/vim[python] app-editors/gvim[python] )"
+
+src_configure() {
+ ./configure \
+ --prefix "${EPREFIX}/usr" \
+ --vimdir "${EPREFIX}//usr/share/vim/vimfiles" \
+ || die
+}
+
+src_install() {
+ default
+}
diff --git a/dev-ml/merlin/merlin-2.5.5.ebuild b/dev-ml/merlin/merlin-2.5.5.ebuild
new file mode 100644
index 000000000000..609f9767e4cc
--- /dev/null
+++ b/dev-ml/merlin/merlin-2.5.5.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit findlib vim-plugin
+
+DESCRIPTION="Context sensitive completion for OCaml in Vim and Emacs"
+HOMEPAGE="https://github.com/ocaml/merlin"
+SRC_URI="https://github.com/ocaml/merlin/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+ dev-lang/ocaml:=
+ dev-ml/yojson:=
+"
+RDEPEND="${DEPEND}
+ || ( app-editors/vim[python] app-editors/gvim[python] )"
+
+src_configure() {
+ ./configure \
+ --prefix "${EPREFIX}/usr" \
+ --vimdir "${EPREFIX}//usr/share/vim/vimfiles" \
+ || die
+}
+
+src_install() {
+ default
+}
diff --git a/dev-ml/merlin/merlin-3.0.0.ebuild b/dev-ml/merlin/merlin-3.0.0.ebuild
new file mode 100644
index 000000000000..609f9767e4cc
--- /dev/null
+++ b/dev-ml/merlin/merlin-3.0.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit findlib vim-plugin
+
+DESCRIPTION="Context sensitive completion for OCaml in Vim and Emacs"
+HOMEPAGE="https://github.com/ocaml/merlin"
+SRC_URI="https://github.com/ocaml/merlin/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+ dev-lang/ocaml:=
+ dev-ml/yojson:=
+"
+RDEPEND="${DEPEND}
+ || ( app-editors/vim[python] app-editors/gvim[python] )"
+
+src_configure() {
+ ./configure \
+ --prefix "${EPREFIX}/usr" \
+ --vimdir "${EPREFIX}//usr/share/vim/vimfiles" \
+ || die
+}
+
+src_install() {
+ default
+}
diff --git a/dev-ml/merlin/merlin-3.0.1.ebuild b/dev-ml/merlin/merlin-3.0.1.ebuild
new file mode 100644
index 000000000000..609f9767e4cc
--- /dev/null
+++ b/dev-ml/merlin/merlin-3.0.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit findlib vim-plugin
+
+DESCRIPTION="Context sensitive completion for OCaml in Vim and Emacs"
+HOMEPAGE="https://github.com/ocaml/merlin"
+SRC_URI="https://github.com/ocaml/merlin/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+ dev-lang/ocaml:=
+ dev-ml/yojson:=
+"
+RDEPEND="${DEPEND}
+ || ( app-editors/vim[python] app-editors/gvim[python] )"
+
+src_configure() {
+ ./configure \
+ --prefix "${EPREFIX}/usr" \
+ --vimdir "${EPREFIX}//usr/share/vim/vimfiles" \
+ || die
+}
+
+src_install() {
+ default
+}
diff --git a/dev-ml/merlin/merlin-3.0.2.ebuild b/dev-ml/merlin/merlin-3.0.2.ebuild
new file mode 100644
index 000000000000..609f9767e4cc
--- /dev/null
+++ b/dev-ml/merlin/merlin-3.0.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit findlib vim-plugin
+
+DESCRIPTION="Context sensitive completion for OCaml in Vim and Emacs"
+HOMEPAGE="https://github.com/ocaml/merlin"
+SRC_URI="https://github.com/ocaml/merlin/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+ dev-lang/ocaml:=
+ dev-ml/yojson:=
+"
+RDEPEND="${DEPEND}
+ || ( app-editors/vim[python] app-editors/gvim[python] )"
+
+src_configure() {
+ ./configure \
+ --prefix "${EPREFIX}/usr" \
+ --vimdir "${EPREFIX}//usr/share/vim/vimfiles" \
+ || die
+}
+
+src_install() {
+ default
+}
diff --git a/dev-ml/merlin/merlin-3.0.3.ebuild b/dev-ml/merlin/merlin-3.0.3.ebuild
new file mode 100644
index 000000000000..609f9767e4cc
--- /dev/null
+++ b/dev-ml/merlin/merlin-3.0.3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit findlib vim-plugin
+
+DESCRIPTION="Context sensitive completion for OCaml in Vim and Emacs"
+HOMEPAGE="https://github.com/ocaml/merlin"
+SRC_URI="https://github.com/ocaml/merlin/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+ dev-lang/ocaml:=
+ dev-ml/yojson:=
+"
+RDEPEND="${DEPEND}
+ || ( app-editors/vim[python] app-editors/gvim[python] )"
+
+src_configure() {
+ ./configure \
+ --prefix "${EPREFIX}/usr" \
+ --vimdir "${EPREFIX}//usr/share/vim/vimfiles" \
+ || die
+}
+
+src_install() {
+ default
+}
diff --git a/dev-ml/merlin/metadata.xml b/dev-ml/merlin/metadata.xml
new file mode 100644
index 000000000000..99e15dd27c26
--- /dev/null
+++ b/dev-ml/merlin/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">ocaml/merlin</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/metadata.xml b/dev-ml/metadata.xml
new file mode 100644
index 000000000000..54ef546c0f26
--- /dev/null
+++ b/dev-ml/metadata.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<catmetadata>
+ <longdescription lang="en">
+ The dev-ml category contains libraries and utilities relevant to the
+ ML programming language.
+ </longdescription>
+ <longdescription lang="de">
+ Die Kategorie dev-ml enthält Bibliotheken und Werkzeuge für die
+ Programmiersprache ML.
+ </longdescription>
+ <longdescription lang="es">
+ La categoría dev-ml contiene librerías y utilidades referentes al
+ lenguaje de programación ML.
+ </longdescription>
+ <longdescription lang="ja">
+ dev-ml カテゴリーにはMLプログラミング言語に関連したライブラリーと
+ ユーティリティが含まれます。
+ </longdescription>
+ <longdescription lang="nl">
+ De dev-ml categorie bevat bibliotheken en hulpmiddelen voor het gebruik
+ van de programmeertaal ML.
+ </longdescription>
+ <longdescription lang="vi">
+ Nhóm dev-ml chứa các thư viện và tiện ích liên quan
+ đến ngôn ngữ lập trình ML.
+ </longdescription>
+ <longdescription lang="it">
+ La categoría dev-ml contiene librerie ed utilità per il linguaggio di programmazione ML.
+ </longdescription>
+ <longdescription lang="pt">
+ A categoria dev-ml contém bibliotecas e utilitários referentes
+ à linguagem de programação ML.
+ </longdescription>
+ <longdescription lang="pl">
+ Kategoria dev-ml zawiera biblioteki i narzędzia związane z
+ językiem programowania ML.
+ </longdescription>
+</catmetadata>
+
diff --git a/dev-ml/mirage-profile-0.7.0-r1 b/dev-ml/mirage-profile-0.7.0-r1
deleted file mode 100644
index 090ec7eb38ea..000000000000
--- a/dev-ml/mirage-profile-0.7.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-lang/ocaml-4:= dev-ml/io-page:= dev-ml/lwt:= >=dev-ml/ocaml-cstruct-1.9.0:=[ppx(-)] dev-ml/ppx_tools:= dev-ml/ocplib-endian:= >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=Collect profiling information
-EAPI=5
-HOMEPAGE=https://github.com/mirage/mirage-profile https://mirage.io
-IUSE=+ocamlopt debug test
-KEYWORDS=~amd64
-LICENSE=BSD-2
-RDEPEND=>=dev-lang/ocaml-4:= dev-ml/io-page:= dev-ml/lwt:= >=dev-ml/ocaml-cstruct-1.9.0:=[ppx(-)] dev-ml/ppx_tools:= dev-ml/ocplib-endian:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
-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 983774947da124fb7d542ce25a218bb1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e oasis 9256ed89af74c3365ec888c00bfdfe43 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9e556f6325fe6751c91df87fb2422b10
diff --git a/dev-ml/mirage-profile/Manifest b/dev-ml/mirage-profile/Manifest
new file mode 100644
index 000000000000..64c6aba6b001
--- /dev/null
+++ b/dev-ml/mirage-profile/Manifest
@@ -0,0 +1,3 @@
+DIST mirage-profile-0.7.0.tar.gz 55531 BLAKE2B 1432d187b5e99723cd7135980495e03b7119f41686b1e8dc1c947227436154abce53eae3d17f8eceb8e87a0b01b03d5d995e85a566a3d566aee05ac7104bda30 SHA512 58a6224942f8395ec78936b29d1a0f39eb0228cdb6a139a942f4bf675b35e0e9157d3e57d0c8953cf168fc5ba4356158e339a31b3719cdaf534f52c51c7a0b47
+EBUILD mirage-profile-0.7.0-r1.ebuild 665 BLAKE2B d555972fab0d7fa9950267f7e77e9b494ccfa2a769583267990c8dd156d4ac37a03a52450cc3810b1ba547cacf9142d8bdb8917f163967f722bf21f15d9d6d01 SHA512 761c5fae2a482586dae71374593420964fc807a9a2aca98566602c23f0f8421501635f2017112f65e88af00365034998532e1158a515d8ac85d6fe654534a56f
+MISC metadata.xml 361 BLAKE2B 6698e9229857b3f4a37f0f44abde15ad871ed24f777ffac1ad250ca9b70a16ef2d803f948f35036326380cf31409dc50f66386a1d0f803d60ee3e1fcd3d5043f SHA512 af65e9f8fb6e484b7c5a54a219b928929b3010bcb60a28e1e29ee7f6ae5aab46e6ce28235442f659ef1f92a330927129e97d6472c82753a3877c65e8e7ccfa9e
diff --git a/dev-ml/mirage-profile/metadata.xml b/dev-ml/mirage-profile/metadata.xml
new file mode 100644
index 000000000000..6ed0938f83b5
--- /dev/null
+++ b/dev-ml/mirage-profile/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">mirage/mirage-profile</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/mirage-profile/mirage-profile-0.7.0-r1.ebuild b/dev-ml/mirage-profile/mirage-profile-0.7.0-r1.ebuild
new file mode 100644
index 000000000000..1757681ac744
--- /dev/null
+++ b/dev-ml/mirage-profile/mirage-profile-0.7.0-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+OASIS_BUILD_TESTS=1
+
+inherit oasis
+
+DESCRIPTION="Collect profiling information"
+HOMEPAGE="https://github.com/mirage/mirage-profile https://mirage.io"
+SRC_URI="https://github.com/mirage/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+# https://github.com/mirage/mirage-profile/issues/11
+RESTRICT="test"
+
+RDEPEND="
+ >=dev-lang/ocaml-4:=
+ dev-ml/io-page:=
+ dev-ml/lwt:=
+ >=dev-ml/ocaml-cstruct-1.9.0:=[ppx(-)]
+ dev-ml/ppx_tools:=
+ dev-ml/ocplib-endian:=
+"
+DEPEND="
+ ${RDEPEND}
+"
+
+DOCS=( README.md )
diff --git a/dev-ml/mongo-0.67.2 b/dev-ml/mongo-0.67.2
deleted file mode 100644
index ab6b83ac3265..000000000000
--- a/dev-ml/mongo-0.67.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ml/bson:= dev-ml/lwt:= dev-ml/oasis >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=An ocaml driver for mongodb
-EAPI=5
-HOMEPAGE=http://massd.github.io/
-IUSE=+ocamlopt debug
-KEYWORDS=~amd64
-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 983774947da124fb7d542ce25a218bb1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e oasis 9256ed89af74c3365ec888c00bfdfe43 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5be6d71754f5b3b9ab1ce2c99d4f7ed6
diff --git a/dev-ml/mongo/Manifest b/dev-ml/mongo/Manifest
new file mode 100644
index 000000000000..9c3ee9017a1c
--- /dev/null
+++ b/dev-ml/mongo/Manifest
@@ -0,0 +1,4 @@
+AUX noinstalltest.patch 292 BLAKE2B 268d7b6e415577cea73e9d31bdf6f589d44f5eac2a38cc4a65ee4fa14e7b2f44a2803ef82ce2893c75ef0cbb463f3053cc9b223daad1da38e359b2a6bd5c8b85 SHA512 82005dc7487bb2ebc21e0abc48d38bc7d436a00ced327047c9fc8f37efbeac94d6e599c7a6f9690413091d76638e66a8af0d9d3a5517031be940cc2d4e33c3e0
+DIST mongo-0.67.2.tar.gz 81611 BLAKE2B 4ce07f7699d2a3a420dc453171b27887634078a2609658fa0cc6574bc493fb707d1f9495a5949dfbbc77e6e05e50d73dbf0fd540f67c7b3cc3e8e9872b61f21a SHA512 779e214b10eb50fe06b9336cd515566b8091bd678b86ad91f5d437dd25b81d3e6996f2f09226061b836fad5c994a9c30edafdb76b7ef5d617fb701d830191c9d
+EBUILD mongo-0.67.2.ebuild 498 BLAKE2B 4d61148d7f85708e395cd6a15df897a8fdcc65e26a7fabb1e0260be63680dc6cd83003219683961f7c17f3ad0561255f677045ae8250b572ec716959a686df39 SHA512 1cb8e7278b78da28cba9c3d4f6e1fff007bfe96b37fd0564fb758b7284c1cdff16e42dfb7705f398a9749ec6825ff28e0036d3d127e192d9a46e6809716a5008
+MISC metadata.xml 323 BLAKE2B b2b2dd58e095dbf2cd83ba625b8059138ca1bcca1f7701a28959f21d357c2bc70141d092ee93df215eccde649c01a827488f04092c6714f2411cd24865cd9099 SHA512 91c993a2b11d848062b6de25a077de3151d4e3922f4a7a54fd457fc4255e2eb70172c4a0ebc86efe29010fd64c78eef50a5b44e1c06fcd84273039d3df64529a
diff --git a/dev-ml/mongo/files/noinstalltest.patch b/dev-ml/mongo/files/noinstalltest.patch
new file mode 100644
index 000000000000..4166a70fdb4b
--- /dev/null
+++ b/dev-ml/mongo/files/noinstalltest.patch
@@ -0,0 +1,9 @@
+Index: mongo-0.67.2/_oasis
+===================================================================
+--- mongo-0.67.2.orig/_oasis
++++ mongo-0.67.2/_oasis
+@@ -51,3 +51,4 @@ Executable test
+ BuildTools: ocamlbuild
+ BuildDepends: unix, mongo, bson
+ CompiledObject: native
++ Install: false
diff --git a/dev-ml/mongo/metadata.xml b/dev-ml/mongo/metadata.xml
new file mode 100644
index 000000000000..6179c498d658
--- /dev/null
+++ b/dev-ml/mongo/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">MassD/mongo</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/mongo/mongo-0.67.2.ebuild b/dev-ml/mongo/mongo-0.67.2.ebuild
new file mode 100644
index 000000000000..59c090ed88be
--- /dev/null
+++ b/dev-ml/mongo/mongo-0.67.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit oasis
+
+DESCRIPTION="An ocaml driver for mongodb"
+HOMEPAGE="http://massd.github.io/"
+SRC_URI="https://github.com/MassD/mongo/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+ dev-ml/bson:=
+ dev-ml/lwt:=
+"
+DEPEND="${RDEPEND} dev-ml/oasis"
+
+src_prepare() {
+ epatch "${FILESDIR}/noinstalltest.patch"
+ oasis setup || die
+}
diff --git a/dev-ml/mtime-1.1.0 b/dev-ml/mtime-1.1.0
deleted file mode 100644
index 4d37734465e1..000000000000
--- a/dev-ml/mtime-1.1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=dev-lang/ocaml:=[ocamlopt] javascript? ( dev-ml/js_of_ocaml:= ) dev-ml/topkg dev-ml/ocamlbuild dev-ml/findlib >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=OCaml module to access monotonic wall-clock time
-EAPI=5
-HOMEPAGE=http://erratique.ch/software/mtime https://github.com/dbuenzli/mtime
-IUSE=javascript test
-KEYWORDS=~amd64
-LICENSE=ISC
-RDEPEND=dev-lang/ocaml:=[ocamlopt] javascript? ( dev-ml/js_of_ocaml:= ) >=dev-lang/ocaml-4:=
-SLOT=0/1.1.0
-SRC_URI=http://erratique.ch/software/mtime/releases/mtime-1.1.0.tbz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e opam 24b4a2529c1fd12f1304856d6c5a690d preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=24e3ec0e91fa8a013f4e7d8dde5223a6
diff --git a/dev-ml/mtime/Manifest b/dev-ml/mtime/Manifest
new file mode 100644
index 000000000000..ec291d2344ee
--- /dev/null
+++ b/dev-ml/mtime/Manifest
@@ -0,0 +1,3 @@
+DIST mtime-1.1.0.tbz 15467 BLAKE2B 975fdb01c6a4806035a5fbc256d192d6c2f45bdfb750045293b10a732c5613108d9bce897d3c1be660af60d6e9bafbf299dedbc0d872d1c09f65f47b11c9a6b6 SHA512 8ed5dae589dd27fc6e748218a9d9fb9d7d954d231fc2100d61c1b336e0ed38a215bc608cdea9965547729177c78c868c1de6a5ceac6735686a3de1c4a791746c
+EBUILD mtime-1.1.0.ebuild 751 BLAKE2B 352b9c36fcc237b9ce1283d924adeeafeef40103f900a11ec9b7bbece60a4431a5a5f8488f609a9d01aa5e56072d33ceed6979c9a112760dacfcd44034602e7e SHA512 4670c05084bfbc8e082d47176ea9b5b508a3bb866171068c529465ee574d354531668295e8fa44447cfa09caa522104e5f3c8402669409f8b55c833d60274a63
+MISC metadata.xml 326 BLAKE2B 617fef626604151e29aa817f6130196263b4557f1c71e3547024c06c0a884387072117bfc55281a16576ac665987a590be59ea0fecb8a5871586aa4d3854d22f SHA512 ba290dcdad4e4b159614e24e8b84cbf033ce704d354eee237a4aaee5b7810d88696f60931ca4d51fdc3782b35be958d6fcac2fea44a419d881d62b212d67e8ab
diff --git a/dev-ml/mtime/metadata.xml b/dev-ml/mtime/metadata.xml
new file mode 100644
index 000000000000..1a0e75172ffb
--- /dev/null
+++ b/dev-ml/mtime/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">dbuenzli/mtime</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/mtime/mtime-1.1.0.ebuild b/dev-ml/mtime/mtime-1.1.0.ebuild
new file mode 100644
index 000000000000..1c5185f3abd3
--- /dev/null
+++ b/dev-ml/mtime/mtime-1.1.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils opam
+
+DESCRIPTION="OCaml module to access monotonic wall-clock time"
+HOMEPAGE="http://erratique.ch/software/mtime https://github.com/dbuenzli/mtime"
+SRC_URI="http://erratique.ch/software/mtime/releases/${P}.tbz"
+
+LICENSE="ISC"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="javascript test"
+
+RDEPEND="dev-lang/ocaml:=[ocamlopt]
+ javascript? ( dev-ml/js_of_ocaml:= )
+"
+DEPEND="${RDEPEND}
+ dev-ml/topkg
+ dev-ml/ocamlbuild
+ dev-ml/findlib"
+
+src_compile() {
+ ocaml pkg/pkg.ml build \
+ --with-js_of_ocaml $(usex javascript true false) \
+ --tests $(usex test true false) \
+ || die
+}
+
+src_test() {
+ ocaml pkg/pkg.ml test || die
+}
diff --git a/dev-ml/oasis-0.4.10 b/dev-ml/oasis-0.4.10
deleted file mode 100644
index e90cdbb32b87..000000000000
--- a/dev-ml/oasis-0.4.10
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-ml/ocaml-data-notation-0.0.11:= dev-ml/ocamlbuild:=[ocamlopt] dev-ml/camlp4:= >=dev-ml/findlib-1.3.1 dev-ml/ocamlify dev-ml/ocamlmod !<sci-chemistry/oasis-4.0-r3 test? ( >=dev-ml/ocaml-fileutils-0.4.2 >=dev-ml/ounit-2.0.0 >=dev-ml/ocaml-expect-0.0.4 dev-ml/pcre-ocaml dev-ml/extlib ) >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=Tool to integrate a configure, build and install system in OCaml project
-EAPI=5
-HOMEPAGE=http://oasis.forge.ocamlcore.org/index.php
-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?]
-SLOT=0/0.4.10
-SRC_URI=http://forge.ocamlcore.org/frs/download.php/1694/oasis-0.4.10.tar.gz
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e oasis 9256ed89af74c3365ec888c00bfdfe43 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=93b545ae74e64fbe378935d5af0319c9
diff --git a/dev-ml/oasis-0.4.8 b/dev-ml/oasis-0.4.8
deleted file mode 100644
index cda0d733f338..000000000000
--- a/dev-ml/oasis-0.4.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-ml/ocaml-data-notation-0.0.11:= dev-ml/ocamlbuild:=[ocamlopt] >=dev-ml/findlib-1.3.1 dev-ml/ocamlify dev-ml/ocamlmod !<sci-chemistry/oasis-4.0-r3 test? ( >=dev-ml/ocaml-fileutils-0.4.2 >=dev-ml/ounit-2.0.0 >=dev-ml/ocaml-expect-0.0.4 dev-ml/pcre-ocaml dev-ml/extlib ) >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=Tool to integrate a configure, build and install system in OCaml project
-EAPI=5
-HOMEPAGE=http://oasis.forge.ocamlcore.org/index.php
-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?]
-SLOT=0/0.4.8
-SRC_URI=http://forge.ocamlcore.org/frs/download.php/1669/oasis-0.4.8.tar.gz
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e oasis 9256ed89af74c3365ec888c00bfdfe43 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=49a6d3aa7edd861745eccd659a6eb873
diff --git a/dev-ml/oasis/Manifest b/dev-ml/oasis/Manifest
new file mode 100644
index 000000000000..5a61699a06a7
--- /dev/null
+++ b/dev-ml/oasis/Manifest
@@ -0,0 +1,5 @@
+DIST oasis-0.4.10.tar.gz 394732 BLAKE2B 6347e532d595e33a3a62f63669625d6de0081e8be90568a0e9f334b9745a40ec2593e7c79d21174f3119728c4831393efff0a3ab6d1aeadc594a0f96e5112a72 SHA512 c173a3a774d13a7cb21ddb44f89dadef210d331ab5f3a1e7ff1705e815572f70e22815736cc3f3788b6d8f784c21a309b45c5bf5e984e583b31931847bf107fd
+DIST oasis-0.4.8.tar.gz 389565 BLAKE2B 50103f261fd4c9d11fea1d7c26abc047fd0f30ab17b871672cb1ce0a89fd47d378fd4f31d48f1a6835361ddb74761a0ad9fe4bc5ca514e470a4cf3594f30c762 SHA512 e0baf0f048647c25eac5472db0d2a22d0fcaf85fe61ebd88ec5a101c20d4916ecfa9d10fae069ba4479abb22b90c44f18312b9252727a8c7c7de4aa2d8d72663
+EBUILD oasis-0.4.10.ebuild 934 BLAKE2B d8ffbc2f5e5d3e80e81ed636d1e37e37bc18d11112741f773597763c274029bc7dc2c89c0fee6436c66a2c56bafe270c7276c7b69f74b5e402320a0f651a3154 SHA512 ed409a6005f3accc39d4ee7e59869d8c0a9615ef3510eebdf9e40d8fce0f121139bc902a9cc434b7a2e2b005498342503903e144eade2ad894c346cd33951de4
+EBUILD oasis-0.4.8.ebuild 916 BLAKE2B 60f34a25a418dd0912aeb7506be67204aa15a74b09e149541a6efd721eb9e1ea4a28f7705d975202bfb9c8028dbd938eeaa5b5452582bf36d9635c93f5f0e8de SHA512 038a210bb0d225a6064401b0c4beee4a5f306272f1c48c63e1f6e4cbd666d6fe24704e70023893e1c064d9e26d775bcb9befb0f893c4b11d81bfd14a85695358
+MISC metadata.xml 247 BLAKE2B a49ba320a43edd431ae39eb274b77ddf0db171a7b06f4f0f0b8f75ee8e3b7f840dead108aa9c63fba75c609a44f7418268cd65c65877f3305d2a6d3ed3c678f6 SHA512 0f7ebd1264695f56fe6ab78e4e82c07866376f03ebfa12b22b60d0b2df819aa818832cb0d9eb2d77ab642a786b44cd127f579c348f0b2f57bc22e26b3b51c42b
diff --git a/dev-ml/oasis/metadata.xml b/dev-ml/oasis/metadata.xml
new file mode 100644
index 000000000000..75c9ea74812d
--- /dev/null
+++ b/dev-ml/oasis/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/dev-ml/oasis/oasis-0.4.10.ebuild b/dev-ml/oasis/oasis-0.4.10.ebuild
new file mode 100644
index 000000000000..03927db12119
--- /dev/null
+++ b/dev-ml/oasis/oasis-0.4.10.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+OASIS_BUILD_TESTS=1
+OASIS_BUILD_DOCS=1
+
+inherit oasis
+
+MY_P=${P/_/\~}
+DESCRIPTION="Tool to integrate a configure, build and install system in OCaml project"
+HOMEPAGE="http://oasis.forge.ocamlcore.org/index.php"
+SRC_URI="http://forge.ocamlcore.org/frs/download.php/1694/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-ml/ocaml-data-notation-0.0.11:=
+ dev-ml/ocamlbuild:=[ocamlopt]
+ dev-ml/camlp4:=
+"
+DEPEND="${RDEPEND}
+ >=dev-ml/findlib-1.3.1
+ dev-ml/ocamlify
+ dev-ml/ocamlmod
+ !<sci-chemistry/oasis-4.0-r3
+ test? (
+ >=dev-ml/ocaml-fileutils-0.4.2
+ >=dev-ml/ounit-2.0.0
+ >=dev-ml/ocaml-expect-0.0.4
+ dev-ml/pcre-ocaml
+ dev-ml/extlib
+ )"
+
+STRIP_MASK="*/bin/*"
+S="${WORKDIR}/${MY_P}"
+DOCS=( "README.md" "TODO.txt" "AUTHORS.md" "CHANGES.txt" )
diff --git a/dev-ml/oasis/oasis-0.4.8.ebuild b/dev-ml/oasis/oasis-0.4.8.ebuild
new file mode 100644
index 000000000000..e2f5056918fe
--- /dev/null
+++ b/dev-ml/oasis/oasis-0.4.8.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+OASIS_BUILD_TESTS=1
+OASIS_BUILD_DOCS=1
+
+inherit oasis
+
+MY_P=${P/_/\~}
+DESCRIPTION="Tool to integrate a configure, build and install system in OCaml project"
+HOMEPAGE="http://oasis.forge.ocamlcore.org/index.php"
+SRC_URI="http://forge.ocamlcore.org/frs/download.php/1669/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-ml/ocaml-data-notation-0.0.11:=
+ dev-ml/ocamlbuild:=[ocamlopt]"
+DEPEND="${RDEPEND}
+ >=dev-ml/findlib-1.3.1
+ dev-ml/ocamlify
+ dev-ml/ocamlmod
+ !<sci-chemistry/oasis-4.0-r3
+ test? (
+ >=dev-ml/ocaml-fileutils-0.4.2
+ >=dev-ml/ounit-2.0.0
+ >=dev-ml/ocaml-expect-0.0.4
+ dev-ml/pcre-ocaml
+ dev-ml/extlib
+ )"
+
+STRIP_MASK="*/bin/*"
+S="${WORKDIR}/${MY_P}"
+DOCS=( "README.md" "TODO.txt" "AUTHORS.md" "CHANGES.txt" )
diff --git a/dev-ml/ocaml-augeas-0.5 b/dev-ml/ocaml-augeas-0.5
deleted file mode 100644
index 5b64c849656d..000000000000
--- a/dev-ml/ocaml-augeas-0.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=app-admin/augeas dev-ml/ocaml-autoconf dev-ml/findlib dev-lang/ocaml >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Ocaml bindings for Augeas
-EAPI=5
-HOMEPAGE=http://augeas.net/
-KEYWORDS=~amd64 ~x86
-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
-_md5_=4355e192967773a0d7fa5db572cd1e75
diff --git a/dev-ml/ocaml-augeas/Manifest b/dev-ml/ocaml-augeas/Manifest
new file mode 100644
index 000000000000..6d4c97aac599
--- /dev/null
+++ b/dev-ml/ocaml-augeas/Manifest
@@ -0,0 +1,3 @@
+DIST ocaml-augeas-0.5.tar.gz 59908 BLAKE2B f9f51afa0aec82e95d7bd81811e93e10587f1f2c1905338c0bbe47de61d983c24c0e5ab77aff1ca319834bf2199040a482b453177fa3c774e24ab72c3a534c14 SHA512 dfbad89790c6b5ada0e1239d002cb61a56a15350b2687d0987e0c61108d905e0c03756c08db7a3121eac3966fbeed86500e6f3c3c416cea2b974d9f50b8adabf
+EBUILD ocaml-augeas-0.5.ebuild 535 BLAKE2B 5c22974a02fb59c004f2bebe621fc1cce46c7c5b4a6c55066890309c2cfb1dfcddbb32cabe93e6e0fef2f80b93a5301710969fc699aaefed94b8168f2083e1e1 SHA512 4ab435b7610e29bef7ac6bda323eb407e1fcf3dbcbb8ae36de5e84ec54b56d392a543b9ec4b84c61dac29044be20617ed5ebbce4a4116c699a4615e9698ff4cf
+MISC metadata.xml 323 BLAKE2B f31d76fa76a0c9694f797b3d2b84a5d3181c96abaaf6ed00d69da79d5d448fe34c0f376b8e90e28695767597e801bcb47e6cac45dd4787f9f27cf6c8c2a07841 SHA512 e27d87c3ca068609ddd7af63aa00cf7a158c23c2412c0ce9c3cb2d0f298407a2bd2206639db9264c8b74bfb12d555cb47ffff03922757fb48d686b991b262818
diff --git a/dev-ml/ocaml-augeas/metadata.xml b/dev-ml/ocaml-augeas/metadata.xml
new file mode 100644
index 000000000000..738d47c70f34
--- /dev/null
+++ b/dev-ml/ocaml-augeas/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+<email>prometheanfire@gentoo.org</email>
+</maintainer>
+<longdescription lang="en">
+ocaml-augeas is a set of Ocaml bindings around augeas.
+</longdescription>
+</pkgmetadata>
diff --git a/dev-ml/ocaml-augeas/ocaml-augeas-0.5.ebuild b/dev-ml/ocaml-augeas/ocaml-augeas-0.5.ebuild
new file mode 100644
index 000000000000..f0a89730569b
--- /dev/null
+++ b/dev-ml/ocaml-augeas/ocaml-augeas-0.5.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit findlib
+
+DESCRIPTION="Ocaml bindings for Augeas"
+HOMEPAGE="http://augeas.net/"
+#SRC_URI="http://augeas.net/download/ocaml/${P}.tar.gz"
+SRC_URI="https://people.redhat.com/~rjones/augeas/files/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="app-admin/augeas
+ dev-ml/ocaml-autoconf
+ dev-ml/findlib
+ dev-lang/ocaml"
+RDEPEND="${DEPEND}"
+
+src_install() {
+ findlib_src_install
+}
diff --git a/dev-ml/ocaml-autoconf-1.1 b/dev-ml/ocaml-autoconf-1.1
deleted file mode 100644
index 7042d6a6d7b3..000000000000
--- a/dev-ml/ocaml-autoconf-1.1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=autoconf macros to support configuration of OCaml programs and libraries
-EAPI=2
-HOMEPAGE=http://ocaml-autoconf.forge.ocamlcore.org/
-KEYWORDS=amd64 ~arm ~arm64 ppc x86
-LICENSE=BSD
-SLOT=0
-SRC_URI=http://forge.ocamlcore.org/frs/download.php/282/ocaml-autoconf-1.1.tar.gz
-_md5_=7b6aa4f0485dcec1bbbb90c5fab9fd9a
diff --git a/dev-ml/ocaml-autoconf/Manifest b/dev-ml/ocaml-autoconf/Manifest
new file mode 100644
index 000000000000..ab25f4dbddf1
--- /dev/null
+++ b/dev-ml/ocaml-autoconf/Manifest
@@ -0,0 +1,3 @@
+DIST ocaml-autoconf-1.1.tar.gz 10987 BLAKE2B 830a5f5055866054fe251a5e67aad51985b047c1fa8f233453cea95cbc2a41c76e89bc1cf61c56562b0f2880fd6a40695358aea8c36a13df89f7f7ece2309e54 SHA512 ee99766df98b003a3caf33d1109fb0e0c068cecd16a4ea77f39adab910df3198981de45302bdedf17d9ae6b4801a1c45ce5a5f47860d789ba06027910aeea3a5
+EBUILD ocaml-autoconf-1.1.ebuild 513 BLAKE2B bca8d71871934d24f1bd6b5d041a073423a79c74ae8e0840bed91d0334f34be4c7b9d2db7172bedd45208326d09fa96e06b307b1df718c65e0b79cebb347ab1d SHA512 dbfda7562ded9badc90b04863cee8affa5d9c6e4f51896068f22b8eefd777b13b54c3dbdbe3f59b91adae858a8c8a35c64f85e6a81d0f3afae19a81cd1063201
+MISC metadata.xml 243 BLAKE2B 010ca240ae06e9a9f6d7ba213eb06df36d9ba862ff2d2458d98a9fea1a1e7f3026d13832a73bce1b3ad9345029425e6abfae9e03bf126f2329b3f030ed3753fd SHA512 1c5b4b2163017e496999d1f87e5c9c5ac6c11b2e9187450ccfb3df258f34e54d278972f04ee0e8429476c6f87e091a869ac2a28c6e8c8e6d20678c3e74061449
diff --git a/dev-ml/ocaml-autoconf/metadata.xml b/dev-ml/ocaml-autoconf/metadata.xml
new file mode 100644
index 000000000000..ffac4d7ebc01
--- /dev/null
+++ b/dev-ml/ocaml-autoconf/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-ml/ocaml-autoconf/ocaml-autoconf-1.1.ebuild b/dev-ml/ocaml-autoconf/ocaml-autoconf-1.1.ebuild
new file mode 100644
index 000000000000..194d83a15951
--- /dev/null
+++ b/dev-ml/ocaml-autoconf/ocaml-autoconf-1.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+
+DESCRIPTION="autoconf macros to support configuration of OCaml programs and libraries"
+HOMEPAGE="http://ocaml-autoconf.forge.ocamlcore.org/"
+SRC_URI="http://forge.ocamlcore.org/frs/download.php/282/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ppc x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+src_install() {
+ emake DESTDIR="${D}" prefix="/usr" install || die
+ dodoc README
+}
diff --git a/dev-ml/ocaml-base64-2.2.0 b/dev-ml/ocaml-base64-2.2.0
deleted file mode 100644
index 4d7a94213b76..000000000000
--- a/dev-ml/ocaml-base64-2.2.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-ml/jbuilder test? ( dev-ml/rresult dev-ml/bos dev-ml/alcotest ) >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=Library for radix-64 representation (de)coding
-EAPI=6
-HOMEPAGE=https://github.com/mirage/ocaml-base64
-IUSE=test
-KEYWORDS=~amd64
-LICENSE=ISC
-RDEPEND=>=dev-lang/ocaml-4:=
-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 24b4a2529c1fd12f1304856d6c5a690d
-_md5_=9232f5a16cae33937ada6cc94028e909
diff --git a/dev-ml/ocaml-base64/Manifest b/dev-ml/ocaml-base64/Manifest
new file mode 100644
index 000000000000..f3ec7d5abe96
--- /dev/null
+++ b/dev-ml/ocaml-base64/Manifest
@@ -0,0 +1,3 @@
+DIST ocaml-base64-2.2.0.tar.gz 5056 BLAKE2B c8a95d31646e5cad741dbece511e3f0fb736c31e5f90b560e2dffe5787810cd218966016840eef0c67517e790d0e4c67111c3382303c740791475647bac27de1 SHA512 0390c450076786777baeb596bc81bc3357074619894334a9608f958a2a10113e22afdbd3a2b368bc93c5c5636828fc2600818399847704309e2cc6092b10f3b0
+EBUILD ocaml-base64-2.2.0.ebuild 544 BLAKE2B 19d5c72a2a532c07d7ee58db7f872ef3accae417b1f989c8a88f877ccc8d1a582c700cb81282f8dc632f1ffc79cc1b0132fc85fd57c72a1ce0ab22fb35af7f87 SHA512 9bb8e3bb9c523f651a8e7fa33d8c92fdc4e03cf5a1926f02077de99002461cfdbfae967fa4f91f2073514fcf64d064ca5ee77e4df063399b1397d572487a74c6
+MISC metadata.xml 341 BLAKE2B 3cdd6a266c1315b4f8c3cd7b1eed18301312ff225ecc4694f1f7648326a7933507e153c59911d4725bda4cce21dd4369ccb4585d755508bd03ec5a7b1d06c7e2 SHA512 64fbfdebb9759fa2af0d070a13c1b7ed9662c095bf1ab78c64e43dae274f52f2b25801544a2a56c942c0d920383673eaf6860fd54335e1c84976ec9a68fc6234
diff --git a/dev-ml/ocaml-base64/metadata.xml b/dev-ml/ocaml-base64/metadata.xml
new file mode 100644
index 000000000000..535fa8d4ec98
--- /dev/null
+++ b/dev-ml/ocaml-base64/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">mirage/ocaml-base64</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/ocaml-base64/ocaml-base64-2.2.0.ebuild b/dev-ml/ocaml-base64/ocaml-base64-2.2.0.ebuild
new file mode 100644
index 000000000000..35d4f2abf2bf
--- /dev/null
+++ b/dev-ml/ocaml-base64/ocaml-base64-2.2.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit findlib opam
+
+DESCRIPTION="Library for radix-64 representation (de)coding"
+HOMEPAGE="https://github.com/mirage/ocaml-base64"
+SRC_URI="https://github.com/mirage/ocaml-base64/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+ dev-ml/jbuilder
+ test? ( dev-ml/rresult dev-ml/bos dev-ml/alcotest )
+"
+
+src_install() {
+ opam_src_install base64
+}
diff --git a/dev-ml/ocaml-bigstring-0.1.1 b/dev-ml/ocaml-bigstring-0.1.1
deleted file mode 100644
index de85d81bec54..000000000000
--- a/dev-ml/ocaml-bigstring-0.1.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-lang/ocaml:= dev-ml/ocamlbuild test? ( dev-ml/iTeML ) >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Overlay over bigarrays of chars
-EAPI=6
-HOMEPAGE=https://github.com/c-cube/ocaml-bigstring/
-IUSE=test
-KEYWORDS=~amd64
-LICENSE=BSD-2
-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
-_md5_=4b78435acee46389e32195623ea2a9b7
diff --git a/dev-ml/ocaml-bigstring/Manifest b/dev-ml/ocaml-bigstring/Manifest
new file mode 100644
index 000000000000..81473819da85
--- /dev/null
+++ b/dev-ml/ocaml-bigstring/Manifest
@@ -0,0 +1,3 @@
+DIST ocaml-bigstring-0.1.1.tar.gz 7671 BLAKE2B 2754445a2eb6d2cfe52a07cdf55b970c736d007578962be730bdac3c793981565a3ba64b7429cae532aee21f72ae7f5cefabbecf554c6238fad791c45e4fc200 SHA512 96aee494b9407b556b6eb554b0da66e24622f77d88aae6d822da60a3fb21477da8e7ae120f95f4f3c742b085ca4838f10ca0c8b2bcc4d23e35fd7de6af8532b3
+EBUILD ocaml-bigstring-0.1.1.ebuild 587 BLAKE2B 8ea1bb18545b00387ebca4ecaa9fc564886ddb46c9cc2ccbdaa6f7a26422c59d8d854c63214627e36c51f4909341a96ecd4b96e631f125b017ad577a5228a3cd SHA512 eaedd972b16651dc798fbdd74fd74f96257cca2237e530eb751bfbcf9a4281ab75669aec8ae3d098a802dbc696b16eee633b32a7b7d25242eb59de70556c8416
+MISC metadata.xml 334 BLAKE2B c34682734b68db6fe5563dde2d9c15177a9107d47e5a69f81d0864afa682b77b723cdf0737fd5cf74ea36b699fbd2b577016024288ed1d86eddb528792336fbe SHA512 abeb551e902ab6b403cf0b8b4fe5d5b405cbbbfc64cc47e39793cdfb554f45e04e10a306ff0de097ba7154e739a397575ce1fb8833cc84cebaabd16d78f20314
diff --git a/dev-ml/ocaml-bigstring/metadata.xml b/dev-ml/ocaml-bigstring/metadata.xml
new file mode 100644
index 000000000000..2e4acd905351
--- /dev/null
+++ b/dev-ml/ocaml-bigstring/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">c-cube/ocaml-bigstring</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/ocaml-bigstring/ocaml-bigstring-0.1.1.ebuild b/dev-ml/ocaml-bigstring/ocaml-bigstring-0.1.1.ebuild
new file mode 100644
index 000000000000..84098f18ecbe
--- /dev/null
+++ b/dev-ml/ocaml-bigstring/ocaml-bigstring-0.1.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit findlib
+
+DESCRIPTION="Overlay over bigarrays of chars"
+HOMEPAGE="https://github.com/c-cube/ocaml-bigstring/"
+SRC_URI="https://github.com/c-cube/ocaml-bigstring/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="test"
+
+# ocamlfind: Package `QTest2Lib' not found
+RESTRICT="test"
+
+RDEPEND="
+ dev-lang/ocaml:=
+"
+DEPEND="${RDEPEND}
+ dev-ml/ocamlbuild
+ test? ( dev-ml/iTeML )
+"
+
+src_install() {
+ findlib_src_preinst
+ default
+}
diff --git a/dev-ml/ocaml-cairo-0.5 b/dev-ml/ocaml-cairo-0.5
deleted file mode 100644
index 4bee76dd24bc..000000000000
--- a/dev-ml/ocaml-cairo-0.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=gtk? ( dev-ml/lablgtk:= ) x11-libs/cairo[svg(+)] >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=OCaml Binding to Cairo
-EAPI=5
-HOMEPAGE=https://github.com/Chris00/ocaml-cairo
-IUSE=gtk +ocamlopt debug doc
-KEYWORDS=~amd64
-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 983774947da124fb7d542ce25a218bb1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e oasis 9256ed89af74c3365ec888c00bfdfe43 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=cfb314e28d4a1ba4719fb56785be5058
diff --git a/dev-ml/ocaml-cairo/Manifest b/dev-ml/ocaml-cairo/Manifest
new file mode 100644
index 000000000000..5f7fbe443288
--- /dev/null
+++ b/dev-ml/ocaml-cairo/Manifest
@@ -0,0 +1,3 @@
+DIST ocaml-cairo-0.5.tar.gz 137433 BLAKE2B 81ed70630ae67f33cc5453e13c23eb0317cd62f9d9984b43580107d0ef57a57b824399aaeedae3656851813cfe863e32efef58a185d81f9dbea6f3dbcfdde199 SHA512 c946739e4d0e7ca1c7f2ffa547c138ad47265bc7f59da17242ee8a78a31b7a2ce777835dc3f4070963a7303891d2fba831171e0252a5bd908083e66515aba083
+EBUILD ocaml-cairo-0.5.ebuild 651 BLAKE2B 02ed720de71bb3f37a17efdcc5c046356b508de68355502168526f367e6a29ef65cc5ef8a179cbdcb6e51a5c6cf080b9edc379a896e1476797a83b5ef7e6601d SHA512 55dc54359aaee2c65f9321a042a3deb01f9cc0a57ae2185df0ef0a94b48dce4b657445881b6e8feff11b95bf1722bd5e81bad379bd9a2119e67024ed34ac8764
+MISC metadata.xml 331 BLAKE2B 6d107142c4958e1bcb1a09c6fd7c5df8686b722d41f218f68d33d1b3530abdeac9f20f7ce229be61d5d2d209e21d9dbeee5e559e8d00f73deff55d6150fa7b74 SHA512 b0db3059fb2726aed36c4983d88f593c8e86c57d1ba7bea81d79f718bcee6d9b73f77aff90607f9a65c586136f50bed403c7a1c2a480da50fdb6813c73d09ea9
diff --git a/dev-ml/ocaml-cairo/metadata.xml b/dev-ml/ocaml-cairo/metadata.xml
new file mode 100644
index 000000000000..4f1aeadab838
--- /dev/null
+++ b/dev-ml/ocaml-cairo/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">Chris00/ocaml-cairo</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/ocaml-cairo/ocaml-cairo-0.5.ebuild b/dev-ml/ocaml-cairo/ocaml-cairo-0.5.ebuild
new file mode 100644
index 000000000000..627d5f40b95a
--- /dev/null
+++ b/dev-ml/ocaml-cairo/ocaml-cairo-0.5.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+OASIS_BUILD_DOCS=1
+
+inherit oasis
+
+DESCRIPTION="OCaml Binding to Cairo"
+HOMEPAGE="https://github.com/Chris00/ocaml-cairo"
+SRC_URI="https://github.com/Chris00/ocaml-cairo/releases/download/0.5/cairo2-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="gtk"
+
+DEPEND="
+ gtk? ( dev-ml/lablgtk:= )
+ x11-libs/cairo[svg(+)]
+"
+RDEPEND="${DEPEND}"
+DOCS=( README.md )
+S="${WORKDIR}/cairo2-${PV}/"
+
+src_configure() {
+ oasis_configure_opts="$(use_enable gtk lablgtk2)" oasis_src_configure
+}
diff --git a/dev-ml/ocaml-cohttp-0.22.0 b/dev-ml/ocaml-cohttp-0.22.0
deleted file mode 100644
index 4824936f93ae..000000000000
--- a/dev-ml/ocaml-cohttp-0.22.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=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] ) test? ( dev-ml/ounit dev-ml/alcotest ) >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=Very lightweight HTTP server using Lwt or Async
-EAPI=5
-HOMEPAGE=https://github.com/mirage/ocaml-cohttp
-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?]
-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 983774947da124fb7d542ce25a218bb1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e oasis 9256ed89af74c3365ec888c00bfdfe43 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e2e90dd6c1cc7b082502bf8dae1676b9
diff --git a/dev-ml/ocaml-cohttp/Manifest b/dev-ml/ocaml-cohttp/Manifest
new file mode 100644
index 000000000000..7b39db74abd5
--- /dev/null
+++ b/dev-ml/ocaml-cohttp/Manifest
@@ -0,0 +1,3 @@
+DIST ocaml-cohttp-0.22.0.tar.gz 194568 BLAKE2B 220c291cdf50c1720e553cc224f6b3c7723add13a637cedd33deb162d4f420a8577b716f073c2b6a630de4458bdc9ac69d8eeeb1ccd44cb310b1a1262188c680 SHA512 60ae828a3e2085d5468f5d177f50a8e7a02ed47b8036af5548996ba3d36d8eef756662259abc65035c5d1f4158c9760762ac5f85376d6bfc76a7f027f01fa5b2
+EBUILD ocaml-cohttp-0.22.0.ebuild 1204 BLAKE2B e816d4c682a6558f112becb249574df5373d80fd76c6ca6ed9abf6f448707674461e80f0ccd655352ab66371e43bcf2e8e17170785334d7a861b61a91e79c478 SHA512 9e6d2156ff1a41800b22aee74a9cc171b8322b156f2ead735532ad710b43697fc350bc26558e2e964727bc967a696a743515225c2f839d2ff0d0b0c9eed63a89
+MISC metadata.xml 567 BLAKE2B d8bd4fef986fb074d741550341df612bb69790dae6807bda2b6ce3aae2bd481550ec27ba3a685fc18d26ba6f5fc62383f095dbd6ab0ec5621b2f25c990106364 SHA512 6f139e3724deb005b008c56149bdad83a7fa145cc32e72586e097aa2c435ce65a21cfe0a37dfbd5848670d03fbc10121f55c5414970c92baba69115099c3bea0
diff --git a/dev-ml/ocaml-cohttp/metadata.xml b/dev-ml/ocaml-cohttp/metadata.xml
new file mode 100644
index 000000000000..01cbb468ae34
--- /dev/null
+++ b/dev-ml/ocaml-cohttp/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <use>
+ <flag name="async">Enables support for the <pkg>dev-ml/async</pkg> asynchronous execution library.</flag>
+ <flag name="lwt">Enables support for the <pkg>dev-ml/lwt</pkg> cooperative light-weight thread library.</flag>
+ </use>
+ <upstream>
+ <remote-id type="github">mirage/ocaml-cohttp</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/ocaml-cohttp/ocaml-cohttp-0.22.0.ebuild b/dev-ml/ocaml-cohttp/ocaml-cohttp-0.22.0.ebuild
new file mode 100644
index 000000000000..bb00e40e1629
--- /dev/null
+++ b/dev-ml/ocaml-cohttp/ocaml-cohttp-0.22.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+OASIS_BUILD_TESTS=1
+OASIS_BUILD_DOCS=1
+
+inherit oasis
+
+DESCRIPTION="Very lightweight HTTP server using Lwt or Async"
+HOMEPAGE="https://github.com/mirage/ocaml-cohttp"
+SRC_URI="https://github.com/mirage/ocaml-cohttp/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="async javascript +lwt"
+
+DEPEND="
+ 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]
+ )
+"
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND}
+ test? (
+ dev-ml/ounit
+ dev-ml/alcotest
+ )
+"
+DOCS=( README.md CHANGES DESIGN.md TODO.md )
+
+src_configure() {
+ local oasis_configure_opts="
+ $(use_enable lwt) $(use_enable lwt lwt-unix)
+ $(use_enable async)
+ $(use_enable javascript js)
+ "
+ oasis_src_configure
+}
diff --git a/dev-ml/ocaml-compiler-libs-0.9.0 b/dev-ml/ocaml-compiler-libs-0.9.0
deleted file mode 100644
index 2b1c77689bb4..000000000000
--- a/dev-ml/ocaml-compiler-libs-0.9.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=Repackage the OCaml compiler libs so they do not expose everything at toplevel
-EAPI=6
-HOMEPAGE=https://github.com/janestreet/ocaml-compiler-libs
-KEYWORDS=~amd64 ~ppc ~x86
-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 24b4a2529c1fd12f1304856d6c5a690d
-_md5_=85278258dffbf8bdfe72848d2ed4c816
diff --git a/dev-ml/ocaml-compiler-libs/Manifest b/dev-ml/ocaml-compiler-libs/Manifest
new file mode 100644
index 000000000000..b3f4df8c24c3
--- /dev/null
+++ b/dev-ml/ocaml-compiler-libs/Manifest
@@ -0,0 +1,3 @@
+DIST ocaml-compiler-libs-0.9.0.tar.gz 6937 BLAKE2B d53a8312ffabfed0b137d435497b4d7953239f57176481f522cbb70fd49a1a8045850d7572830455aefff1a91c6c461c03f40392b386bacb03afda3f72e39005 SHA512 ee0751bcfb9cb75d272f7af4f7da184c0a8e348384a2481da9dea0245a4133de908a23d0a324e0353397a4f0c5bfd71d40a6a46dbd8e4acea922bad7cdc5ef64
+EBUILD ocaml-compiler-libs-0.9.0.ebuild 503 BLAKE2B 33c52b9fcc53493a2ff3ccf0382727a646ea1f22c1584bafad31be9167e581003986d58cd25693d1d933fbbf92cdc1ce3aa5ece8ad300a7d4d70f9f982283b60 SHA512 0dbffb4360a13f62719e16ca2487eca8c09bca5ea1b32fe7f1608790c92e46d4a56f5693cfe697cf9df6369cc450a7c0df5d70d4ce820829b71cb65485042838
+MISC metadata.xml 342 BLAKE2B 14c6d8ef32e2fead1993077a13af3474e398dd861e663216ffb0a0a8b7e82dbc9cc7f67da48949a6e2e78e2d6fd7dfb325dd1e5e778a255ceb2c25ccddc1ffa1 SHA512 6fc014610d8008f2215be854a93d1e2ea5759be991f7e107cbc38e5f754cdfde4ae770ee654163da88ffd1e071364e5562fd8e6aade66803f0dee7d103968d29
diff --git a/dev-ml/ocaml-compiler-libs/metadata.xml b/dev-ml/ocaml-compiler-libs/metadata.xml
new file mode 100644
index 000000000000..9edbba42aa69
--- /dev/null
+++ b/dev-ml/ocaml-compiler-libs/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">janestreet/ocaml-compiler-libs</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/ocaml-compiler-libs/ocaml-compiler-libs-0.9.0.ebuild b/dev-ml/ocaml-compiler-libs/ocaml-compiler-libs-0.9.0.ebuild
new file mode 100644
index 000000000000..05a9b54ea1de
--- /dev/null
+++ b/dev-ml/ocaml-compiler-libs/ocaml-compiler-libs-0.9.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit opam
+
+DESCRIPTION="Repackage the OCaml compiler libs so they do not expose everything at toplevel"
+HOMEPAGE="https://github.com/janestreet/ocaml-compiler-libs"
+SRC_URI="https://github.com/janestreet/ocaml-compiler-libs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+ dev-ml/jbuilder"
diff --git a/dev-ml/ocaml-conduit-0.15.4 b/dev-ml/ocaml-conduit-0.15.4
deleted file mode 100644
index 1a2a578f1403..000000000000
--- a/dev-ml/ocaml-conduit-0.15.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=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:= dev-ml/findlib dev-ml/ocamlbuild dev-ml/ppx_driver dev-ml/ppx_optcomp dev-ml/ppx_sexp_conv >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Dereference URIs into communication channels for Async or Lwt
-EAPI=5
-HOMEPAGE=https://github.com/mirage/ocaml-conduit
-KEYWORDS=~amd64
-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 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5bc408aead33a6d10f7e49493460bf10
diff --git a/dev-ml/ocaml-conduit/Manifest b/dev-ml/ocaml-conduit/Manifest
new file mode 100644
index 000000000000..e773f83f521c
--- /dev/null
+++ b/dev-ml/ocaml-conduit/Manifest
@@ -0,0 +1,3 @@
+DIST ocaml-conduit-0.15.4.tar.gz 38960 BLAKE2B 3f4631a6a67ab00ecc0d903f0f0b832035b61d3fceec57db50bea0f56454292b4fa3911f4eeb5e05f8fb9fb68f13ca0f9e6c3c078d3bd5d0a1bb7c4bcac18495 SHA512 12f61828c943cb60b2c9be080fb32c8fe5ba16d8bac46a8b788f2ea9b8b7a3a53563defbb05271d516365d18cddafe57051125391ac018328608c4f6537ec5b0
+EBUILD ocaml-conduit-0.15.4.ebuild 868 BLAKE2B b250c496f80c67c851df0ba3ad2e4b8b709149febb5d01c5c10c1314ee9db2c690fc0bdce24b5492b6dbc425553025abefc07187323daa0e31c2f3ad39d8bdab SHA512 a10c6ff240d4f2ea9fd32bf99956d25dbc8e84e733cb0a54f3a631e4ebebb603a13ad19b2724ac7b61e1f43247ad2b95ef00468ec64d410a46efc4bbf7b5435c
+MISC metadata.xml 332 BLAKE2B e3794e4c144793fc78991ac450171d22ac2c868bd03a9c120f826f609ed5a9ddfd3a460b4c46d5b4f8a2c0fa2aeecb2f174c6178250c189bd71a45e6c5ef66dc SHA512 66b243700b34216aca33384ebe7dfef68e83b8eb6b755118f56643bdf45f2f83d71db375295b72b52ebacf237849b985ed598fbd0eb52fe1fd58a9f436f2d87a
diff --git a/dev-ml/ocaml-conduit/metadata.xml b/dev-ml/ocaml-conduit/metadata.xml
new file mode 100644
index 000000000000..06a872f18368
--- /dev/null
+++ b/dev-ml/ocaml-conduit/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">mirage/ocaml-conduit</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/ocaml-conduit/ocaml-conduit-0.15.4.ebuild b/dev-ml/ocaml-conduit/ocaml-conduit-0.15.4.ebuild
new file mode 100644
index 000000000000..5690ccf9541d
--- /dev/null
+++ b/dev-ml/ocaml-conduit/ocaml-conduit-0.15.4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit findlib eutils
+
+DESCRIPTION="Dereference URIs into communication channels for Async or Lwt"
+HOMEPAGE="https://github.com/mirage/ocaml-conduit"
+SRC_URI="https://github.com/mirage/ocaml-conduit/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+ 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:=
+"
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND}
+ dev-ml/findlib
+ dev-ml/ocamlbuild
+ dev-ml/ppx_driver
+ dev-ml/ppx_optcomp
+ dev-ml/ppx_sexp_conv
+"
+
+DOCS=( TODO.md README.md CHANGES )
+
+src_install() {
+ findlib_src_preinst
+ default
+}
diff --git a/dev-ml/ocaml-containers-1.3 b/dev-ml/ocaml-containers-1.3
deleted file mode 100644
index 164540afed49..000000000000
--- a/dev-ml/ocaml-containers-1.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ml/result:= >=dev-ml/sequence-0.9:= dev-ml/cppo test? ( dev-ml/iTeML dev-ml/ounit dev-ml/gen ) >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=A modular standard library focused on data structures
-EAPI=5
-HOMEPAGE=https://github.com/c-cube/ocaml-containers
-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?]
-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 983774947da124fb7d542ce25a218bb1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e oasis 9256ed89af74c3365ec888c00bfdfe43 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=91f2cc8c0efc208f7a66e46397deefb0
diff --git a/dev-ml/ocaml-containers-1.4 b/dev-ml/ocaml-containers-1.4
deleted file mode 100644
index 81f210a1f0f5..000000000000
--- a/dev-ml/ocaml-containers-1.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ml/result:= >=dev-ml/sequence-0.9:= dev-ml/cppo test? ( dev-ml/iTeML dev-ml/ounit dev-ml/gen ) >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=A modular standard library focused on data structures
-EAPI=5
-HOMEPAGE=https://github.com/c-cube/ocaml-containers
-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?]
-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 983774947da124fb7d542ce25a218bb1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e oasis 9256ed89af74c3365ec888c00bfdfe43 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=91f2cc8c0efc208f7a66e46397deefb0
diff --git a/dev-ml/ocaml-containers/Manifest b/dev-ml/ocaml-containers/Manifest
new file mode 100644
index 000000000000..c928b6ecb12f
--- /dev/null
+++ b/dev-ml/ocaml-containers/Manifest
@@ -0,0 +1,5 @@
+DIST ocaml-containers-1.3.tar.gz 299928 BLAKE2B f6c0c419e0696dc5f45bb1f1db76952aef3a9d39346a59370deaabfb787b4477e7dec2a446f5ebe8c06716ed47e0befd4dde23d8f82c6d79c80962d0e257bb02 SHA512 d4402be1d11fee883bdf2b4fcc339df6ef175ac2d6532ee865c36656473c4882290e45f2efd9b90af7298fc3ffa0ce27fb83d8c7166edeafff798ceccad929e8
+DIST ocaml-containers-1.4.tar.gz 302136 BLAKE2B abb70e4141443d84680090cf1610b293203839ab1a6daa77ebd4980ae6f60a25f63fd8206693612b1104e4f289c16a313e83901297c4104cbdd02ed2917903b3 SHA512 f96c83a139cc277bb60f572966965eb3b669afe6dadd926f9baf42e8effb5f47fb4ba7628ee91ce3896a270f12e5828bc4dd9364cc6f187e800b07305fadce75
+EBUILD ocaml-containers-1.3.ebuild 681 BLAKE2B f2d88f4e3a3b25b0c5d051735cbbb116c5722d40a82118b644ef2180e2ef73a93b80d8c76e5f503cfdb8220de48fca72b2ccd3fe9c34a2c8778677a256712eaf SHA512 1050976dffe785acd9b6f562a3fe66f72b815ee78a0ac5045aa624427366b33f5586d435ea27294b89b7bc666e32de1bf889eef888556b520c9cf0a4bc514bd1
+EBUILD ocaml-containers-1.4.ebuild 681 BLAKE2B f2d88f4e3a3b25b0c5d051735cbbb116c5722d40a82118b644ef2180e2ef73a93b80d8c76e5f503cfdb8220de48fca72b2ccd3fe9c34a2c8778677a256712eaf SHA512 1050976dffe785acd9b6f562a3fe66f72b815ee78a0ac5045aa624427366b33f5586d435ea27294b89b7bc666e32de1bf889eef888556b520c9cf0a4bc514bd1
+MISC metadata.xml 335 BLAKE2B 85b3e5873d248d4120a19de4845c3c905d4640333aec2eecfca08c4cfb0eae285b226b630065d6a31b4ca011fa40eeaed76ef04bffdbf60c6473d4e79e33eb45 SHA512 9c960d71be6f05d8d34283cbe8d29f3134648b19587288ffeffad63c844c93c47f662bc181fc644c3b02a19901c6f859baacc6802db0947a002b9835867980a0
diff --git a/dev-ml/ocaml-containers/metadata.xml b/dev-ml/ocaml-containers/metadata.xml
new file mode 100644
index 000000000000..6cc1172e3347
--- /dev/null
+++ b/dev-ml/ocaml-containers/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">c-cube/ocaml-containers</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/ocaml-containers/ocaml-containers-1.3.ebuild b/dev-ml/ocaml-containers/ocaml-containers-1.3.ebuild
new file mode 100644
index 000000000000..33e8871a4f73
--- /dev/null
+++ b/dev-ml/ocaml-containers/ocaml-containers-1.3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+OASIS_BUILD_TESTS=1
+OASIS_BUILD_DOCS=1
+
+inherit oasis
+
+DESCRIPTION="A modular standard library focused on data structures"
+HOMEPAGE="https://github.com/c-cube/ocaml-containers"
+SRC_URI="https://github.com/c-cube/ocaml-containers/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND="
+ dev-ml/result:=
+ >=dev-ml/sequence-0.9:=
+"
+DEPEND="${RDEPEND} dev-ml/cppo
+ test? ( dev-ml/iTeML dev-ml/ounit dev-ml/gen )"
+
+src_configure() {
+ oasis_configure_opts="
+ --enable-unix
+ --disable-bench
+ " oasis_src_configure
+}
diff --git a/dev-ml/ocaml-containers/ocaml-containers-1.4.ebuild b/dev-ml/ocaml-containers/ocaml-containers-1.4.ebuild
new file mode 100644
index 000000000000..33e8871a4f73
--- /dev/null
+++ b/dev-ml/ocaml-containers/ocaml-containers-1.4.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+OASIS_BUILD_TESTS=1
+OASIS_BUILD_DOCS=1
+
+inherit oasis
+
+DESCRIPTION="A modular standard library focused on data structures"
+HOMEPAGE="https://github.com/c-cube/ocaml-containers"
+SRC_URI="https://github.com/c-cube/ocaml-containers/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND="
+ dev-ml/result:=
+ >=dev-ml/sequence-0.9:=
+"
+DEPEND="${RDEPEND} dev-ml/cppo
+ test? ( dev-ml/iTeML dev-ml/ounit dev-ml/gen )"
+
+src_configure() {
+ oasis_configure_opts="
+ --enable-unix
+ --disable-bench
+ " oasis_src_configure
+}
diff --git a/dev-ml/ocaml-cstruct-3.1.1 b/dev-ml/ocaml-cstruct-3.1.1
deleted file mode 100644
index 7d0f28249ec9..000000000000
--- a/dev-ml/ocaml-cstruct-3.1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=dev-ml/jbuilder test? ( dev-ml/ounit ppx? ( dev-ml/ppx_driver dev-ml/ppx_sexp_conv ) ) async? ( dev-ml/async_kernel:= dev-ml/async_unix:= dev-ml/core_kernel:= ) lwt? ( dev-ml/lwt:= ) ppx? ( dev-ml/ppx_tools:= dev-ml/ocaml-migrate-parsetree:= >=dev-ml/ppx_tools_versioned-5.0.1:= ) dev-ml/ocplib-endian:= dev-ml/sexplib:= dev-ml/type-conv:= >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=Map OCaml arrays onto C-like structs
-EAPI=5
-HOMEPAGE=https://github.com/mirage/ocaml-cstruct https://mirage.io
-IUSE=async +lwt +ppx test
-KEYWORDS=~amd64
-LICENSE=ISC
-RDEPEND=async? ( dev-ml/async_kernel:= dev-ml/async_unix:= dev-ml/core_kernel:= ) lwt? ( dev-ml/lwt:= ) ppx? ( dev-ml/ppx_tools:= dev-ml/ocaml-migrate-parsetree:= >=dev-ml/ppx_tools_versioned-5.0.1:= ) dev-ml/ocplib-endian:= dev-ml/sexplib:= dev-ml/type-conv:= >=dev-lang/ocaml-4:=
-SLOT=0/3.1.1
-SRC_URI=https://github.com/mirage/ocaml-cstruct/archive/v3.1.1.tar.gz -> ocaml-cstruct-3.1.1.tar.gz
-_eclasses_=findlib 45d6030075064a68da8d7143726a1150 opam 24b4a2529c1fd12f1304856d6c5a690d
-_md5_=60a5b9226fb3932386dc49b611ae6b0a
diff --git a/dev-ml/ocaml-cstruct/Manifest b/dev-ml/ocaml-cstruct/Manifest
new file mode 100644
index 000000000000..9d4ab6ed6884
--- /dev/null
+++ b/dev-ml/ocaml-cstruct/Manifest
@@ -0,0 +1,3 @@
+DIST ocaml-cstruct-3.1.1.tar.gz 208725 BLAKE2B 2818c5695c4ab3d102cfa08a288e80e80d7fa4372a5d97aac831429f0681e21cb6b03baac245c7c1171a8efa23b8d6bca661ee74db0efe8c2649727d9be56505 SHA512 22ec8fe027dbebee537ff950c2aa9a494d0c4c000d8c4df848eae157b1c9502b73c208bb92c21fa4c13ba0291b7750de31e4c96b3a0571397402f841c3e01c21
+EBUILD ocaml-cstruct-3.1.1.ebuild 1286 BLAKE2B 73783886dbe41051cf24db9149f55aaef3f625416d740752a152245dbda7c9f7d0158ebe15134bcebd84d99008e428e4b7e24640dd33382fbe8bdfd1d1aaa773 SHA512 f0952f9fac13cceccf9c02620da596c61e134f9580110f009b821feea85c03ecdce3649fed7b4b87408a6df1b3f973f53e4738b148cc14118383cb3fa0e381d7
+MISC metadata.xml 569 BLAKE2B bfe51e629d78d5ddda2f30667a2e8665d7d8f6ea21be3a308c9a3dafa75898323ecf78f3738c8b789de9f36050b020a1037f9624eec56eb54619a93bed49997b SHA512 842931d7b44d9425ee70782b1e7931bb6ee89f0e0d4da55dab36917ecd6f49b237d9e0d5681659e2db91ab4ff6d3c9d0faf4574bf9f4a7cc3c2574248513ad7f
diff --git a/dev-ml/ocaml-cstruct/metadata.xml b/dev-ml/ocaml-cstruct/metadata.xml
new file mode 100644
index 000000000000..3770faddf424
--- /dev/null
+++ b/dev-ml/ocaml-cstruct/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <use>
+ <flag name="async">Support for asynchronous execution</flag>
+ <flag name="lwt">Enable threads via lwt</flag>
+ <flag name="ppx">Enable the ppx syntax extension</flag>
+ </use>
+ <upstream>
+ <remote-id type="github">mirage/ocaml-cstruct</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/ocaml-cstruct/ocaml-cstruct-3.1.1.ebuild b/dev-ml/ocaml-cstruct/ocaml-cstruct-3.1.1.ebuild
new file mode 100644
index 000000000000..1b42677acb65
--- /dev/null
+++ b/dev-ml/ocaml-cstruct/ocaml-cstruct-3.1.1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit findlib opam
+
+DESCRIPTION="Map OCaml arrays onto C-like structs"
+HOMEPAGE="https://github.com/mirage/ocaml-cstruct https://mirage.io"
+SRC_URI="https://github.com/mirage/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="async +lwt +ppx test"
+
+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:=
+"
+DEPEND="
+ dev-ml/jbuilder
+ test? (
+ dev-ml/ounit
+ ppx? ( dev-ml/ppx_driver dev-ml/ppx_sexp_conv )
+ )
+ ${RDEPEND}
+"
+
+get_targets() {
+ local tgt="cstruct,cstruct-unix"
+ use lwt && tgt+=",cstruct-lwt"
+ use async && tgt+=",cstruct-async"
+ use ppx && tgt+=",ppx_cstruct"
+ echo "${tgt}"
+}
+
+src_compile() {
+ jbuilder build -p $(get_targets) || die
+}
+
+src_test() {
+ jbuilder runtest -p $(get_targets) || die
+}
+
+src_install() {
+ opam-install cstruct
+ opam-install cstruct-unix
+ use lwt && opam-install cstruct-lwt
+ use async && opam-install cstruct-async
+ use ppx && opam-install ppx_cstruct
+}
diff --git a/dev-ml/ocaml-ctypes-0.11.2 b/dev-ml/ocaml-ctypes-0.11.2
deleted file mode 100644
index 5cd18bd082ed..000000000000
--- a/dev-ml/ocaml-ctypes-0.11.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=>=dev-lang/ocaml-4.02:=[ocamlopt] virtual/libffi test? ( dev-ml/ounit ) >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Library for binding to C libraries using pure OCaml
-EAPI=5
-HOMEPAGE=https://github.com/ocamllabs/ocaml-ctypes
-IUSE=test
-KEYWORDS=amd64 arm x86
-LICENSE=MIT
-RDEPEND=>=dev-lang/ocaml-4.02:=[ocamlopt] virtual/libffi
-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
diff --git a/dev-ml/ocaml-ctypes-0.11.3 b/dev-ml/ocaml-ctypes-0.11.3
deleted file mode 100644
index bc4f41e43ad7..000000000000
--- a/dev-ml/ocaml-ctypes-0.11.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=>=dev-lang/ocaml-4.02:=[ocamlopt] virtual/libffi test? ( dev-ml/ounit ) >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Library for binding to C libraries using pure OCaml
-EAPI=5
-HOMEPAGE=https://github.com/ocamllabs/ocaml-ctypes
-IUSE=test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=MIT
-RDEPEND=>=dev-lang/ocaml-4.02:=[ocamlopt] virtual/libffi
-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
diff --git a/dev-ml/ocaml-ctypes-0.12.1 b/dev-ml/ocaml-ctypes-0.12.1
deleted file mode 100644
index f2c48a124304..000000000000
--- a/dev-ml/ocaml-ctypes-0.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=>=dev-lang/ocaml-4.02:=[ocamlopt] virtual/libffi dev-ml/integers:= test? ( dev-ml/ounit dev-ml/lwt ) >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Library for binding to C libraries using pure OCaml
-EAPI=5
-HOMEPAGE=https://github.com/ocamllabs/ocaml-ctypes
-IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-lang/ocaml-4.02:=[ocamlopt] virtual/libffi dev-ml/integers:=
-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
diff --git a/dev-ml/ocaml-ctypes-0.13.0 b/dev-ml/ocaml-ctypes-0.13.0
deleted file mode 100644
index 94d9869b1ce1..000000000000
--- a/dev-ml/ocaml-ctypes-0.13.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=>=dev-lang/ocaml-4.02:=[ocamlopt] virtual/libffi dev-ml/integers:= test? ( dev-ml/ounit dev-ml/lwt ) >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Library for binding to C libraries using pure OCaml
-EAPI=5
-HOMEPAGE=https://github.com/ocamllabs/ocaml-ctypes
-IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-lang/ocaml-4.02:=[ocamlopt] virtual/libffi dev-ml/integers:=
-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
diff --git a/dev-ml/ocaml-ctypes/Manifest b/dev-ml/ocaml-ctypes/Manifest
new file mode 100644
index 000000000000..4d261d3c1ea2
--- /dev/null
+++ b/dev-ml/ocaml-ctypes/Manifest
@@ -0,0 +1,9 @@
+DIST ocaml-ctypes-0.11.2.tar.gz 203564 BLAKE2B 2a8c0ee8f8dcd78c3f93b506e92f2c3476c1505d8b58be9273405b4c198500d8e5ff4b0689f76599cc3e92ebb1f5db685c025e2f6a29f590ef21e36c4ac4c3ed SHA512 f3d75e9e596f68438733090fea8c675624c3b186a77c3adf1eca8f12cc2da336f0f5b1688c2ee788726e873bbb0c4dce1d237d53d1637d78e4ad6a8eae1f912a
+DIST ocaml-ctypes-0.11.3.tar.gz 204959 BLAKE2B f3863e29d355479f9306c39786d56839ab05a119dfd5a64de1a784d71e8d931d5fad0f306402aadb50bc5e8147ab7668ac026b5bfbbaff2b6530d7a33f9f38cc SHA512 e7698954a6b683869a1482af8fe1bbeb5ccf693c2bb8583e2c19c5da92ed2730466e373c6f53d9ff9f09c2bdedf102da3f76b75511d7f9b7d266ac0765999f94
+DIST ocaml-ctypes-0.12.1.tar.gz 199686 BLAKE2B d131bb8ebe8448c6d252d32b6a6de2e555f4c7802bec0da83f33ac402d1fd1c73db9abb97fe9f7065fbeaddc782c0976bb05ef6ee6aa80e20b46074a48c343c3 SHA512 801c66395d843c9e410736a06ab5e03bbe22851a364dc9b9444f49dc133e0f5e0b7a1c31e88de56d23a21817cb35595a1b6743c430c8c1a689b7ae12adc8856f
+DIST ocaml-ctypes-0.13.0.tar.gz 200959 BLAKE2B 9f7274099924bd5502fc8115a1e5ed32f9b56902ce284f5530710c948d6d735a2abfd30affa5f1f7803edb33e062c288963946846be29977af87f19f47dd0fbe SHA512 ba2e4cd77d42cf032d823e26f94a8cc37d81ac12bafd40c5d61685d66c97e18996a286dd8d486c94ad4a34e4214e55104e6283158962871e7f0722b2144f7a7d
+EBUILD ocaml-ctypes-0.11.2.ebuild 645 BLAKE2B 46088b6d321709358896618962230cbf4c140f476e4cdcd78c18abedb2b4ddf7f888e40cd54ba2c91284850e1c1bcdd147e3b2a86e2fcace52449ab89c8fbc7f SHA512 c9369287eda67ad9607044d24c677e1e5ee32b1c4fe8bcf67266d517de48289fac416c7a6baafa9c4336d13a85a715d18439660e1d49553dba21c793174b8f61
+EBUILD ocaml-ctypes-0.11.3.ebuild 648 BLAKE2B 9bb03bd6f9a5eff567892edc5d79d90a5ffc388b83eee5433b9d98a8fa91847325b211ceb7b277bfff69c276a90d462be7df10f0db00e4c338bbdf024765d8c8 SHA512 875eeac58bdc39cfde58e00880d30cc61d1c2e684d8a14a62cd98c553c1c7a3f2fb1f2a667f2577a345aca30c98704edca64fa6803d5f3bde7e17cad3c2ba602
+EBUILD ocaml-ctypes-0.12.1.ebuild 685 BLAKE2B 41ec3c0041cb0a2d6232f2786482dfaba28be12bd24f2af00ceff3eec21512a99ea52cba3b2c4349cf82a3d2a0f5ba371652e470356a85e091f8f4d0fbe49def SHA512 e07f03100d3893d783bd88cb56a90e356cf3c1f71d7ffc8835d124d6751170b5093497a27fcfb0d75b6fd072520e63925527658f948cfab58824c40b09300672
+EBUILD ocaml-ctypes-0.13.0.ebuild 685 BLAKE2B 41ec3c0041cb0a2d6232f2786482dfaba28be12bd24f2af00ceff3eec21512a99ea52cba3b2c4349cf82a3d2a0f5ba371652e470356a85e091f8f4d0fbe49def SHA512 e07f03100d3893d783bd88cb56a90e356cf3c1f71d7ffc8835d124d6751170b5093497a27fcfb0d75b6fd072520e63925527658f948cfab58824c40b09300672
+MISC metadata.xml 344 BLAKE2B 8fa3285bd3abb697a5a009ccd4f912287d5fe401d1f45b087cfd28587494943593c11da05de0493c3c05f590b78966e926c69231146e8b9a414ee92959a81c09 SHA512 2b6b7c412feffa4bdfab820b2cafd5fc842f2e56b045642f3c9c0ed371817917714e7f20015ba57710a366cc622a4d7883f2d40e86f7128da2aaf19a2a1f5551
diff --git a/dev-ml/ocaml-ctypes/metadata.xml b/dev-ml/ocaml-ctypes/metadata.xml
new file mode 100644
index 000000000000..5a35bed8fb15
--- /dev/null
+++ b/dev-ml/ocaml-ctypes/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">ocamllabs/ocaml-ctypes</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/ocaml-ctypes/ocaml-ctypes-0.11.2.ebuild b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.11.2.ebuild
new file mode 100644
index 000000000000..b7c40ad550cd
--- /dev/null
+++ b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.11.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit findlib
+
+DESCRIPTION="Library for binding to C libraries using pure OCaml"
+HOMEPAGE="https://github.com/ocamllabs/ocaml-ctypes"
+SRC_URI="https://github.com/ocamllabs/ocaml-ctypes/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 arm x86"
+IUSE="test"
+
+RDEPEND="
+ >=dev-lang/ocaml-4.02:=[ocamlopt]
+ virtual/libffi
+"
+DEPEND="${RDEPEND}
+ test? ( dev-ml/ounit )"
+
+src_compile() {
+ emake -j1
+}
+
+src_test() {
+ emake -j1 test
+}
+
+src_install() {
+ findlib_src_install
+ dodoc CHANGES.md README.md
+}
diff --git a/dev-ml/ocaml-ctypes/ocaml-ctypes-0.11.3.ebuild b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.11.3.ebuild
new file mode 100644
index 000000000000..a46755cc0678
--- /dev/null
+++ b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.11.3.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit findlib
+
+DESCRIPTION="Library for binding to C libraries using pure OCaml"
+HOMEPAGE="https://github.com/ocamllabs/ocaml-ctypes"
+SRC_URI="https://github.com/ocamllabs/ocaml-ctypes/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="test"
+
+RDEPEND="
+ >=dev-lang/ocaml-4.02:=[ocamlopt]
+ virtual/libffi
+"
+DEPEND="${RDEPEND}
+ test? ( dev-ml/ounit )"
+
+src_compile() {
+ emake -j1
+}
+
+src_test() {
+ emake -j1 test
+}
+
+src_install() {
+ findlib_src_install
+ dodoc CHANGES.md README.md
+}
diff --git a/dev-ml/ocaml-ctypes/ocaml-ctypes-0.12.1.ebuild b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.12.1.ebuild
new file mode 100644
index 000000000000..f2c3d64f44a8
--- /dev/null
+++ b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.12.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit findlib
+
+DESCRIPTION="Library for binding to C libraries using pure OCaml"
+HOMEPAGE="https://github.com/ocamllabs/ocaml-ctypes"
+SRC_URI="https://github.com/ocamllabs/ocaml-ctypes/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="test"
+
+RDEPEND="
+ >=dev-lang/ocaml-4.02:=[ocamlopt]
+ virtual/libffi
+ dev-ml/integers:=
+"
+DEPEND="${RDEPEND}
+ test? ( dev-ml/ounit dev-ml/lwt )"
+
+src_compile() {
+ emake -j1
+}
+
+src_test() {
+ emake -j1 test
+}
+
+src_install() {
+ findlib_src_install
+ dodoc CHANGES.md README.md
+}
diff --git a/dev-ml/ocaml-ctypes/ocaml-ctypes-0.13.0.ebuild b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.13.0.ebuild
new file mode 100644
index 000000000000..f2c3d64f44a8
--- /dev/null
+++ b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.13.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit findlib
+
+DESCRIPTION="Library for binding to C libraries using pure OCaml"
+HOMEPAGE="https://github.com/ocamllabs/ocaml-ctypes"
+SRC_URI="https://github.com/ocamllabs/ocaml-ctypes/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="test"
+
+RDEPEND="
+ >=dev-lang/ocaml-4.02:=[ocamlopt]
+ virtual/libffi
+ dev-ml/integers:=
+"
+DEPEND="${RDEPEND}
+ test? ( dev-ml/ounit dev-ml/lwt )"
+
+src_compile() {
+ emake -j1
+}
+
+src_test() {
+ emake -j1 test
+}
+
+src_install() {
+ findlib_src_install
+ dodoc CHANGES.md README.md
+}
diff --git a/dev-ml/ocaml-data-notation-0.0.11-r1 b/dev-ml/ocaml-data-notation-0.0.11-r1
deleted file mode 100644
index cc5969c0b57d..000000000000
--- a/dev-ml/ocaml-data-notation-0.0.11-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-ml/type-conv-108.07.01:= dev-ml/camlp4:= test? ( >=dev-ml/ounit-2.0.0[ocamlopt?] dev-ml/ocaml-fileutils[ocamlopt?] ) >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=Use type-conv to dump OCaml data structure using OCaml data notation
-EAPI=5
-HOMEPAGE=http://forge.ocamlcore.org/projects/odn
-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?]
-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 983774947da124fb7d542ce25a218bb1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e oasis 9256ed89af74c3365ec888c00bfdfe43 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=005d13437cf9b8e2ce34595884e8d793
diff --git a/dev-ml/ocaml-data-notation/Manifest b/dev-ml/ocaml-data-notation/Manifest
new file mode 100644
index 000000000000..3e78a5190e5d
--- /dev/null
+++ b/dev-ml/ocaml-data-notation/Manifest
@@ -0,0 +1,3 @@
+DIST ocaml-data-notation-0.0.11.tar.gz 63968 BLAKE2B bc01d71c6d98b5fa9aa2bbc5889e203f23b08e1e7b0c5bb5cd94170ad1be962aefb847ff6c263a52f93ec938a6ab2d2ebe7877b0c27e8018d8f05b170b13b67d SHA512 010c6105b0745c4dbf426186915078cd71d02d56e19ca01089a37f803c9d81c02a22e64184b9b4a42d44450834527a050ff20430f8c2d8a972610717f4c653d7
+EBUILD ocaml-data-notation-0.0.11-r1.ebuild 632 BLAKE2B c9bf8f64127beb3a815d17482f8e242bec5d9e037cf5da3bc22506b4170c4e4f65bf037c3a20d51d55c996c1c0865fcc0342b2dd2f5fb62cb44ba1e25ca1bf17 SHA512 4dc93949590437e5c85c6c0ec934589ed71ddfb94c5e21a5d1145a4a68d63631fd4ce16844eb74595d8e94aa97f211b2d5815c50a973e56aed79dc72d9f3d4f5
+MISC metadata.xml 243 BLAKE2B 010ca240ae06e9a9f6d7ba213eb06df36d9ba862ff2d2458d98a9fea1a1e7f3026d13832a73bce1b3ad9345029425e6abfae9e03bf126f2329b3f030ed3753fd SHA512 1c5b4b2163017e496999d1f87e5c9c5ac6c11b2e9187450ccfb3df258f34e54d278972f04ee0e8429476c6f87e091a869ac2a28c6e8c8e6d20678c3e74061449
diff --git a/dev-ml/ocaml-data-notation/metadata.xml b/dev-ml/ocaml-data-notation/metadata.xml
new file mode 100644
index 000000000000..ffac4d7ebc01
--- /dev/null
+++ b/dev-ml/ocaml-data-notation/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-ml/ocaml-data-notation/ocaml-data-notation-0.0.11-r1.ebuild b/dev-ml/ocaml-data-notation/ocaml-data-notation-0.0.11-r1.ebuild
new file mode 100644
index 000000000000..625122a633ef
--- /dev/null
+++ b/dev-ml/ocaml-data-notation/ocaml-data-notation-0.0.11-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+OASIS_BUILD_TESTS=1
+
+inherit oasis
+
+DESCRIPTION="Use type-conv to dump OCaml data structure using OCaml data notation"
+HOMEPAGE="http://forge.ocamlcore.org/projects/odn"
+SRC_URI="http://forge.ocamlcore.org/frs/download.php/1310/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-ml/type-conv-108.07.01:=
+ dev-ml/camlp4:=
+ "
+DEPEND="${RDEPEND}
+ test? ( >=dev-ml/ounit-2.0.0[ocamlopt?] dev-ml/ocaml-fileutils[ocamlopt?] )"
+
+DOCS=( "README.txt" "AUTHORS.txt" "CHANGES.txt" )
diff --git a/dev-ml/ocaml-dispatch-0.3.0 b/dev-ml/ocaml-dispatch-0.3.0
deleted file mode 100644
index 118e5b9b0d9f..000000000000
--- a/dev-ml/ocaml-dispatch-0.3.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=javascript? ( dev-ml/js_of_ocaml:=[ppx,ocamlopt?] ) dev-ml/result:=[ocamlopt?] test? ( dev-ml/ounit[ocamlopt?] ) >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=Path-based dispatching for client- and server-side applications
-EAPI=5
-HOMEPAGE=https://github.com/inhabitedtype/ocaml-dispatch
-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?]
-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 983774947da124fb7d542ce25a218bb1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e oasis 9256ed89af74c3365ec888c00bfdfe43 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a905da72b9363914dad5d686a7176dd6
diff --git a/dev-ml/ocaml-dispatch-0.4.0 b/dev-ml/ocaml-dispatch-0.4.0
deleted file mode 100644
index bcc8829058fe..000000000000
--- a/dev-ml/ocaml-dispatch-0.4.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=dev-ml/result:= dev-lang/ocaml:= dev-ml/jbuilder dev-ml/opam test? ( dev-ml/ounit ) >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Path-based dispatching for client- and server-side applications
-EAPI=5
-HOMEPAGE=https://github.com/inhabitedtype/ocaml-dispatch
-IUSE=test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ml/result:= dev-lang/ocaml:=
-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
diff --git a/dev-ml/ocaml-dispatch/Manifest b/dev-ml/ocaml-dispatch/Manifest
new file mode 100644
index 000000000000..9b5e66b8d1b1
--- /dev/null
+++ b/dev-ml/ocaml-dispatch/Manifest
@@ -0,0 +1,5 @@
+DIST ocaml-dispatch-0.3.0.tar.gz 51453 BLAKE2B bd7965396a82a9f767abd05079496a5e0c1f12c3fe02d8c1d79b41db10010eefd89edf3351d8d05f132f0df3c3ab79533902a98752e571bfd09d4f2798f1db57 SHA512 0f09eae45a2ecae27d07e247b6a47f307e074342e337e7be262f5183f77090f0aef81fb5c0bf499732bd0a711d4d51775cbcea5e463011f43a1777582d78806b
+DIST ocaml-dispatch-0.4.0.tar.gz 7554 BLAKE2B 9bbe102df8a27642cbf54ad876caa276ba966ca3b19af53ac8f957799d0ca98b030c0d5ec055cc2868b2c374d71371c6e91ef0b89f4b5a072fbe2c47133df919 SHA512 d5318bda4079c21820fce5b21d178ed88fd0535a5cdc559dd6ceeb4d06ffb08456ee5aec1e56efd40b6d4f456f7d5c7eda17dc728666e6514dc936898b605b36
+EBUILD ocaml-dispatch-0.3.0.ebuild 764 BLAKE2B 646d1d85f42a526e3d40a1fd8a9f421fd40353f56fb4ef57c7b4935b346113ed13408291adbadd3e02a6514781d424f71bc3737621256d71c82069e2a3523208 SHA512 27e4714792648b99cf1ca4c317f4b25c67dba6f0b64be21e2b51f4dfce49594d5a2625e5299840dac9b3022272beef6a5e50411c18fcebea11cb27a4b7499a01
+EBUILD ocaml-dispatch-0.4.0.ebuild 854 BLAKE2B 8552541c0c85cbe64fae5fde8bd95174b1cc79cf70bc59b6b370aa6eda255d5ab8ed6aa316e1b99622a6fb9d1d3760d9439b49e7748ab2c719b10a6810e9b1c0 SHA512 08e4d8469acadd2ba28d382ccf6b896fc40fb93b2b8714e1d4d26b3697bfe9c2ec84929328c3b5163ae5a42b54123f299657ecce8f9b191ffe24add142145909
+MISC metadata.xml 340 BLAKE2B cdcf194ca8d81e634432ffda134a91d805afdc8b36404bfdd04fae410d7240611b87a16d41e94215a290a9a01d53cc64ed9ce7931e8cf7f913ed6fb051e4907f SHA512 5e4269d0759bc87bd0addce4092da3ce6832b4cbb49eb78780d2a3a2fb00ac1bedefe29ca35c3e8525a0c9c7d49dc64c3568c3b2e9c1f7517fedfbca14a099d4
diff --git a/dev-ml/ocaml-dispatch/metadata.xml b/dev-ml/ocaml-dispatch/metadata.xml
new file mode 100644
index 000000000000..44eccfc3febe
--- /dev/null
+++ b/dev-ml/ocaml-dispatch/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">inhabitedtype/ocaml-dispatch</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/ocaml-dispatch/ocaml-dispatch-0.3.0.ebuild b/dev-ml/ocaml-dispatch/ocaml-dispatch-0.3.0.ebuild
new file mode 100644
index 000000000000..0056e666f79f
--- /dev/null
+++ b/dev-ml/ocaml-dispatch/ocaml-dispatch-0.3.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+OASIS_BUILD_DOCS=1
+OASIS_BUILD_TESTS=1
+
+inherit oasis
+
+DESCRIPTION="Path-based dispatching for client- and server-side applications"
+HOMEPAGE="https://github.com/inhabitedtype/ocaml-dispatch"
+SRC_URI="https://github.com/inhabitedtype/ocaml-dispatch/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="javascript"
+
+DEPEND="
+ javascript? ( dev-ml/js_of_ocaml:=[ppx,ocamlopt?] )
+ dev-ml/result:=[ocamlopt?]
+"
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND}
+ test? ( dev-ml/ounit[ocamlopt?] )
+"
+
+DOCS=( "README.md" )
+
+src_configure() {
+ oasis_configure_opts="$(use_enable javascript js-of-ocaml)" \
+ oasis_src_configure
+}
diff --git a/dev-ml/ocaml-dispatch/ocaml-dispatch-0.4.0.ebuild b/dev-ml/ocaml-dispatch/ocaml-dispatch-0.4.0.ebuild
new file mode 100644
index 000000000000..562ef548b9a1
--- /dev/null
+++ b/dev-ml/ocaml-dispatch/ocaml-dispatch-0.4.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit findlib
+
+DESCRIPTION="Path-based dispatching for client- and server-side applications"
+HOMEPAGE="https://github.com/inhabitedtype/ocaml-dispatch"
+SRC_URI="https://github.com/inhabitedtype/ocaml-dispatch/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="test"
+
+DEPEND="
+ dev-ml/result:=
+ dev-lang/ocaml:=
+"
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND}
+ dev-ml/jbuilder
+ dev-ml/opam
+ test? ( dev-ml/ounit )
+"
+
+src_compile() {
+ jbuilder build -p dispatch || die
+}
+
+oinstall() {
+ opam-installer -i \
+ --prefix="${ED}/usr" \
+ --libdir="${D}/$(ocamlc -where)" \
+ --docdir="${ED}/usr/share/doc/${PF}" \
+ --mandir="${ED}/usr/share/man" \
+ ${1}.install || die
+}
+
+src_install() {
+ oinstall dispatch
+}
diff --git a/dev-ml/ocaml-doc-4.04 b/dev-ml/ocaml-doc-4.04
deleted file mode 100644
index d27f478cab4a..000000000000
--- a/dev-ml/ocaml-doc-4.04
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst
-DESCRIPTION=Ocaml reference manual (html)
-EAPI=5
-HOMEPAGE=http://caml.inria.fr/pub/docs/manual-ocaml/
-KEYWORDS=amd64 ~ppc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://caml.inria.fr/pub/distrib/ocaml-4.04/ocaml-4.04-refman-html.tar.gz
-_md5_=5ea245eaf42416e632d96ad232e1c33e
diff --git a/dev-ml/ocaml-doc-4.05 b/dev-ml/ocaml-doc-4.05
deleted file mode 100644
index 41c824b8b3ec..000000000000
--- a/dev-ml/ocaml-doc-4.05
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst
-DESCRIPTION=Ocaml reference manual (html)
-EAPI=5
-HOMEPAGE=http://caml.inria.fr/pub/docs/manual-ocaml/
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://caml.inria.fr/pub/distrib/ocaml-4.05/ocaml-4.05-refman-html.tar.gz
-_md5_=b8f6b2434ce22ffee8cd694886b17db1
diff --git a/dev-ml/ocaml-doc/Manifest b/dev-ml/ocaml-doc/Manifest
new file mode 100644
index 000000000000..a1c301ce537a
--- /dev/null
+++ b/dev-ml/ocaml-doc/Manifest
@@ -0,0 +1,5 @@
+DIST ocaml-4.04-refman-html.tar.gz 833166 BLAKE2B 556534193cf23c3648c69465c139956695b68474a523ef6ca2bbfe9a40cdde86ab62a8077ab16759d3db4aa2b7e6f2bb615fc769ab0bf3aa46dc4c23231994aa SHA512 027ad5ea08488beb5ce65ec97a8aaf04197317d7d3194de771a4170dea9f8b90fc4309fd917b4176cd930dd0835c84448771b84fa92a735cfc60668ef0a6a413
+DIST ocaml-4.05-refman-html.tar.gz 882419 BLAKE2B 01ecd83c4d517a98c11564303bd31806fdd75c71f4492e25a71568941b3fb0b527944399fdd375a690557cf718c98f522577de37a946a5dfebf363d88962c944 SHA512 84688b06e61904345bc961d7244a74427025879c8e7365073887d76a560e5a373227d75c9f645f7bc16adbd05ea6a58918738beb13b5001cedc6b8289ed70bde
+EBUILD ocaml-doc-4.04.ebuild 523 BLAKE2B 06728af6f977dd69516b2caebdad8af7ca809e77b75b160b4400c66f27068c285c88618645cd411b703bf86342b55360b50526da99ddb75bbd430779a7660315 SHA512 95630bb77361f680537f17e30fa25005c0d87a2ef34ff6291a8856eeb623b4036fa254ce850c4ffe6d8551fbf002a82c932af192b66bbf45b4ce2573ca0f6486
+EBUILD ocaml-doc-4.05.ebuild 525 BLAKE2B 9549e81b825219587b30f3d5da2ce29655afb9bec81cc6bdf8544c0ec274e12da11d4a20f6c4d2982d9936187c626b504decb0d01a73271f9b1702660288d930 SHA512 271bfb48a846316799c22925abece1b703d08e2f163a6c1ed8b37990058a5c0a8f259dddebf41a9d8621cffc3ce03c4dff2b10e207c11878a179327d03d3107c
+MISC metadata.xml 247 BLAKE2B a49ba320a43edd431ae39eb274b77ddf0db171a7b06f4f0f0b8f75ee8e3b7f840dead108aa9c63fba75c609a44f7418268cd65c65877f3305d2a6d3ed3c678f6 SHA512 0f7ebd1264695f56fe6ab78e4e82c07866376f03ebfa12b22b60d0b2df819aa818832cb0d9eb2d77ab642a786b44cd127f579c348f0b2f57bc22e26b3b51c42b
diff --git a/dev-ml/ocaml-doc/metadata.xml b/dev-ml/ocaml-doc/metadata.xml
new file mode 100644
index 000000000000..75c9ea74812d
--- /dev/null
+++ b/dev-ml/ocaml-doc/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/dev-ml/ocaml-doc/ocaml-doc-4.04.ebuild b/dev-ml/ocaml-doc/ocaml-doc-4.04.ebuild
new file mode 100644
index 000000000000..46e0e0b6687c
--- /dev/null
+++ b/dev-ml/ocaml-doc/ocaml-doc-4.04.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="Ocaml reference manual (html)"
+HOMEPAGE="http://caml.inria.fr/pub/docs/manual-ocaml/"
+SRC_URI="http://caml.inria.fr/pub/distrib/ocaml-${PV}/ocaml-${PV}-refman-html.tar.gz"
+LICENSE="GPL-2"
+
+KEYWORDS="amd64 ~ppc x86"
+
+SLOT="0"
+IUSE=""
+
+S=${WORKDIR}/htmlman
+
+src_install() {
+ dohtml -r *
+}
+
+pkg_postinst() {
+ elog "This manual is available online at http://caml.inria.fr/pub/docs/manual-ocaml/"
+}
diff --git a/dev-ml/ocaml-doc/ocaml-doc-4.05.ebuild b/dev-ml/ocaml-doc/ocaml-doc-4.05.ebuild
new file mode 100644
index 000000000000..198cd811e65f
--- /dev/null
+++ b/dev-ml/ocaml-doc/ocaml-doc-4.05.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="Ocaml reference manual (html)"
+HOMEPAGE="http://caml.inria.fr/pub/docs/manual-ocaml/"
+SRC_URI="http://caml.inria.fr/pub/distrib/ocaml-${PV}/ocaml-${PV}-refman-html.tar.gz"
+LICENSE="GPL-2"
+
+KEYWORDS="~amd64 ~ppc ~x86"
+
+SLOT="0"
+IUSE=""
+
+S=${WORKDIR}/htmlman
+
+src_install() {
+ dohtml -r *
+}
+
+pkg_postinst() {
+ elog "This manual is available online at http://caml.inria.fr/pub/docs/manual-ocaml/"
+}
diff --git a/dev-ml/ocaml-expat-1.0.0 b/dev-ml/ocaml-expat-1.0.0
deleted file mode 100644
index d599ac13b36c..000000000000
--- a/dev-ml/ocaml-expat-1.0.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=dev-libs/expat >=dev-lang/ocaml-3.10.2:=[ocamlopt?] test? ( dev-ml/ounit ) >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=OCaml bindings for expat
-EAPI=5
-HOMEPAGE=https://github.com/whitequark/ocaml-expat
-IUSE=doc +ocamlopt test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
-LICENSE=MIT
-RDEPEND=dev-libs/expat >=dev-lang/ocaml-3.10.2:=[ocamlopt?]
-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 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f6505a2a75e932fb8cbfe8f64cf9898a
diff --git a/dev-ml/ocaml-expat-1.1.0 b/dev-ml/ocaml-expat-1.1.0
deleted file mode 100644
index 2cc266aee0d6..000000000000
--- a/dev-ml/ocaml-expat-1.1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=dev-libs/expat >=dev-lang/ocaml-3.10.2:=[ocamlopt?] test? ( dev-ml/ounit ) >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=OCaml bindings for expat
-EAPI=5
-HOMEPAGE=https://github.com/whitequark/ocaml-expat
-IUSE=doc +ocamlopt test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
-LICENSE=MIT
-RDEPEND=dev-libs/expat >=dev-lang/ocaml-3.10.2:=[ocamlopt?]
-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 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f6505a2a75e932fb8cbfe8f64cf9898a
diff --git a/dev-ml/ocaml-expat/Manifest b/dev-ml/ocaml-expat/Manifest
new file mode 100644
index 000000000000..fd16ae20cf09
--- /dev/null
+++ b/dev-ml/ocaml-expat/Manifest
@@ -0,0 +1,5 @@
+DIST ocaml-expat-1.0.0.tar.gz 58149 BLAKE2B 0bd99a8a5eb8f4fe1a04d1d53edc5dc662a51ae880c5297de9dbc93561896e5c3acf3db4b7edc5122a328be4c17fd924a66a2e0e08c9bd74aac704257f5dc569 SHA512 217d602ac8fabf7713dcd8fd274206b81ff467402a9bca5b15b13f3b1d68e8e5f2c2970adeafb2378c0993b39c7d98a420dee07f30ad9eb88fd40665a2f98897
+DIST ocaml-expat-1.1.0.tar.gz 58318 BLAKE2B 137bc65c5c867180ba547de17041bd0f588da395928e92eabef45cdbb76a1d139d7cd0d80d33337e1fbff92c9fa3cab2339c0f340f50f467b8fe7d64cba10b1e SHA512 9407f91f5007d6835643719294d4e4907bfc40464d054911591ce80c31d173ddcc7b06157a19c0d3ddd78775806242dc68aea7847e588ca9fd1909def1df4d23
+EBUILD ocaml-expat-1.0.0.ebuild 799 BLAKE2B 137cc7772f36c526fcd5e87a7334dd91b56810f8dfc90ed1fc6e7caa120234ad872aac22aeecd8c9b011e2b7280ba31610827d90151b2bf381353bceb9b68f86 SHA512 441c8b375de084746533a41b878edb94a5ed5494b080da3ca6c9cb57730388f9e79503e2dee486e5d0807e025fcad7c41f5aca669a4e81c9b181a79eceff3d73
+EBUILD ocaml-expat-1.1.0.ebuild 799 BLAKE2B 137cc7772f36c526fcd5e87a7334dd91b56810f8dfc90ed1fc6e7caa120234ad872aac22aeecd8c9b011e2b7280ba31610827d90151b2bf381353bceb9b68f86 SHA512 441c8b375de084746533a41b878edb94a5ed5494b080da3ca6c9cb57730388f9e79503e2dee486e5d0807e025fcad7c41f5aca669a4e81c9b181a79eceff3d73
+MISC metadata.xml 344 BLAKE2B 7968da004efd860ae18b16dc89e80d5fdc070761be64a4a4ab02f70b50bc8defff894f87371e8ff271b629a92dc94a2df7adcad166c14b94a1e6bfdbfd12fa45 SHA512 55896d776b185342170d38e2b36d98359a9bbab592f7740bf0d8de90d3cb8a6184381e824a2dcb22e8497b2d4322362770b538a55c0d3f6cb64cc81f7f58303c
diff --git a/dev-ml/ocaml-expat/metadata.xml b/dev-ml/ocaml-expat/metadata.xml
new file mode 100644
index 000000000000..6b7290909864
--- /dev/null
+++ b/dev-ml/ocaml-expat/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">whitequark/ocaml-expat</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/ocaml-expat/ocaml-expat-1.0.0.ebuild b/dev-ml/ocaml-expat/ocaml-expat-1.0.0.ebuild
new file mode 100644
index 000000000000..00eeb198ef8d
--- /dev/null
+++ b/dev-ml/ocaml-expat/ocaml-expat-1.0.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit findlib eutils
+
+IUSE="doc +ocamlopt test"
+
+DESCRIPTION="OCaml bindings for expat"
+SRC_URI="https://github.com/whitequark/ocaml-expat/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/whitequark/ocaml-expat"
+
+RDEPEND="dev-libs/expat
+ >=dev-lang/ocaml-3.10.2:=[ocamlopt?]"
+
+DEPEND="${RDEPEND}
+ test? ( dev-ml/ounit )"
+
+SLOT="0/${PV}"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+
+src_compile() {
+ emake depend
+ emake all
+ if use ocamlopt; then
+ emake allopt
+ fi
+}
+
+src_test() {
+ emake test
+ if use ocamlopt; then
+ emake testopt
+ fi
+}
+src_install() {
+ findlib_src_preinst
+ emake install
+
+ if use doc ; then
+ dohtml -r doc/html/*
+ fi
+ dodoc README
+}
diff --git a/dev-ml/ocaml-expat/ocaml-expat-1.1.0.ebuild b/dev-ml/ocaml-expat/ocaml-expat-1.1.0.ebuild
new file mode 100644
index 000000000000..00eeb198ef8d
--- /dev/null
+++ b/dev-ml/ocaml-expat/ocaml-expat-1.1.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit findlib eutils
+
+IUSE="doc +ocamlopt test"
+
+DESCRIPTION="OCaml bindings for expat"
+SRC_URI="https://github.com/whitequark/ocaml-expat/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/whitequark/ocaml-expat"
+
+RDEPEND="dev-libs/expat
+ >=dev-lang/ocaml-3.10.2:=[ocamlopt?]"
+
+DEPEND="${RDEPEND}
+ test? ( dev-ml/ounit )"
+
+SLOT="0/${PV}"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+
+src_compile() {
+ emake depend
+ emake all
+ if use ocamlopt; then
+ emake allopt
+ fi
+}
+
+src_test() {
+ emake test
+ if use ocamlopt; then
+ emake testopt
+ fi
+}
+src_install() {
+ findlib_src_preinst
+ emake install
+
+ if use doc ; then
+ dohtml -r doc/html/*
+ fi
+ dodoc README
+}
diff --git a/dev-ml/ocaml-expect-0.0.5 b/dev-ml/ocaml-expect-0.0.5
deleted file mode 100644
index 3af6553b4354..000000000000
--- a/dev-ml/ocaml-expect-0.0.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ml/batteries:= dev-ml/pcre-ocaml:= test? ( >=dev-ml/ounit-2.0.0 ) >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=Ocaml implementation of expect to help building unitary testing
-EAPI=5
-HOMEPAGE=http://forge.ocamlcore.org/projects/ocaml-expect/
-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?]
-SLOT=0/0.0.5
-SRC_URI=http://forge.ocamlcore.org/frs/download.php/1372/ocaml-expect-0.0.5.tar.gz
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e oasis 9256ed89af74c3365ec888c00bfdfe43 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9b484d41378ba0439ba4eaedc218a31b
diff --git a/dev-ml/ocaml-expect/Manifest b/dev-ml/ocaml-expect/Manifest
new file mode 100644
index 000000000000..846f697d93a0
--- /dev/null
+++ b/dev-ml/ocaml-expect/Manifest
@@ -0,0 +1,3 @@
+DIST ocaml-expect-0.0.5.tar.gz 63245 BLAKE2B 8435db55e74f4e245c38f75a686b91b9389e1050a515f674e86308fb270a1090827af40fa9890982ab60ab3e3c5df494accf1a54c232c06c274b36a9a8a2b1f4 SHA512 fbb2ae41c12e57db4440e67d80740380d4cd7bab0f8fdf59d3b69ff91eb6e35a82ca718cf32ad2c791ae76be8a08174a5b3a95e8910351413cc98afd3105a63c
+EBUILD ocaml-expect-0.0.5.ebuild 607 BLAKE2B 061b4b73599800af7a332b382ca570586737e13b39765f258ca4c1e9199cf94ce062fb4d28a32c152e1b19e3d1070e6d0d05bb843424f005f078a17d4509c879 SHA512 cceb77b9d8471629f77189fc9c42454c9c067dcabee71eaf413a5a4df07cf027c777ba1672dde1cd9699618ae968a2b34215eaf5ee61741d08708ac4e8258eb6
+MISC metadata.xml 243 BLAKE2B 010ca240ae06e9a9f6d7ba213eb06df36d9ba862ff2d2458d98a9fea1a1e7f3026d13832a73bce1b3ad9345029425e6abfae9e03bf126f2329b3f030ed3753fd SHA512 1c5b4b2163017e496999d1f87e5c9c5ac6c11b2e9187450ccfb3df258f34e54d278972f04ee0e8429476c6f87e091a869ac2a28c6e8c8e6d20678c3e74061449
diff --git a/dev-ml/ocaml-expect/metadata.xml b/dev-ml/ocaml-expect/metadata.xml
new file mode 100644
index 000000000000..ffac4d7ebc01
--- /dev/null
+++ b/dev-ml/ocaml-expect/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-ml/ocaml-expect/ocaml-expect-0.0.5.ebuild b/dev-ml/ocaml-expect/ocaml-expect-0.0.5.ebuild
new file mode 100644
index 000000000000..7fe5e81a48f6
--- /dev/null
+++ b/dev-ml/ocaml-expect/ocaml-expect-0.0.5.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+OASIS_BUILD_DOCS=1
+OASIS_BUILD_TESTS=1
+
+inherit oasis
+
+DESCRIPTION="Ocaml implementation of expect to help building unitary testing"
+HOMEPAGE="http://forge.ocamlcore.org/projects/ocaml-expect/"
+SRC_URI="http://forge.ocamlcore.org/frs/download.php/1372/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+ dev-ml/batteries:=
+ dev-ml/pcre-ocaml:="
+DEPEND="${RDEPEND}
+ test? ( >=dev-ml/ounit-2.0.0 )"
+
+DOCS=( "README.txt" "CHANGES.txt" "AUTHORS.txt" )
diff --git a/dev-ml/ocaml-extunix-0.1.4 b/dev-ml/ocaml-extunix-0.1.4
deleted file mode 100644
index 614709383466..000000000000
--- a/dev-ml/ocaml-extunix-0.1.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ml/camlp4:= test? ( dev-ml/ounit ) >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=Thin bindings to various low-level system APIs
-EAPI=5
-HOMEPAGE=http://extunix.forge.ocamlcore.org/
-IUSE=+ocamlopt debug doc test
-KEYWORDS=~amd64
-LICENSE=LGPL-2.1-with-linking-exception
-RDEPEND=dev-ml/camlp4:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
-SLOT=0/0.1.4
-SRC_URI=http://ygrek.org.ua/p/release/ocaml-extunix/ocaml-extunix-0.1.4.tar.gz
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e oasis 9256ed89af74c3365ec888c00bfdfe43 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e4e931406484c2d590cc790d7e934198
diff --git a/dev-ml/ocaml-extunix-0.1.5 b/dev-ml/ocaml-extunix-0.1.5
deleted file mode 100644
index 6d75aa80fb41..000000000000
--- a/dev-ml/ocaml-extunix-0.1.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ml/camlp4:= test? ( dev-ml/ounit ) >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=Thin bindings to various low-level system APIs
-EAPI=5
-HOMEPAGE=http://ygrek.org.ua/p/ocaml-extunix/ https://github.com/ygrek/extunix
-IUSE=+ocamlopt debug doc test
-KEYWORDS=~amd64
-LICENSE=LGPL-2.1-with-linking-exception
-RDEPEND=dev-ml/camlp4:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
-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 983774947da124fb7d542ce25a218bb1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e oasis 9256ed89af74c3365ec888c00bfdfe43 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8e1685ddddfd38492dc9e72589b5fdd0
diff --git a/dev-ml/ocaml-extunix/Manifest b/dev-ml/ocaml-extunix/Manifest
new file mode 100644
index 000000000000..0959ed05eaf6
--- /dev/null
+++ b/dev-ml/ocaml-extunix/Manifest
@@ -0,0 +1,5 @@
+DIST ocaml-extunix-0.1.4.tar.gz 104306 BLAKE2B a1941b0456cce45ec750c0d98e7f0f29bf137335de777664cbe827653bc5003860d52d0c2cce1a31a0b9f7c7348fe5112e389973ff58cc13279289d4684193dc SHA512 a2226235a5aa527a588bb5cfc163fb0767b0d8eb888cd0c902f69d6084f2252d38695c9f98b74e72726ab55753d739483cf5b9a9387206fd35b0b0578a7c30df
+DIST ocaml-extunix-0.1.5.tar.gz 109375 BLAKE2B 78ab5e29b8fe876be54fa79104f9d9bda3ad146b62aa1cf276d8c4ac5b3ae1301362044ded4138967560b15a27706855a391f7532171fe35ab0083f90a00af95 SHA512 8c6f519bcd076be056424a295c7fdc678c1aedd8faa3c5a74c9849236f8102bf074ac7fe0b55c819206e8ad2c24878fe61a9a8df7ca785e8f6c71bb6a92e503c
+EBUILD ocaml-extunix-0.1.4.ebuild 542 BLAKE2B 9d004cccf249a9091b6c26ff8b838ab5af014b457c22e366ffd589aa23028dc6f948c9fafba19a688eb62c072b645e0717966858b83edc6bdc53360b45071c29 SHA512 124d8160ff264456d0fab7a71e144e8dc3f388cad22dd7c955ba40a7509ade1f72660aa264a80a82ebcb20e95415640f9bfd43ca98686eeaa03d48849e518351
+EBUILD ocaml-extunix-0.1.5.ebuild 590 BLAKE2B d08f3697cf0e97baa6064117742afe83cc722aca2c2206506acd346e89a12bfdbcedd09cfb82ef670f644ddcc761e2cfc5ff21fe27711acf86597dc09e1d2528 SHA512 531dcee91521b5b0a342fbfcf119a3bd5741956a82a0b69b7b301c126eeb0e42b081dd397698a202fb3bb84a43264ede0aa7ef01fb3756436eb668d60c068421
+MISC metadata.xml 325 BLAKE2B c2bc586ac833ea59c1264ec4fbe10653541bbb3a9de7bdc283c4060f3feff472a7fd1310c46d08851167d6676d42ce4758aa353c830000a33f75cd9c18ba06d8 SHA512 e6b13d96dec4f8afa65c929a43bcaeeea0bbb7a1f406866d36300ea392d18f3a27a4fccf165636059a1a7a250db4fde592aad19789eebe3160897d7ac47e5d13
diff --git a/dev-ml/ocaml-extunix/metadata.xml b/dev-ml/ocaml-extunix/metadata.xml
new file mode 100644
index 000000000000..d986b72622e7
--- /dev/null
+++ b/dev-ml/ocaml-extunix/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">ygrek/extunix</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/ocaml-extunix/ocaml-extunix-0.1.4.ebuild b/dev-ml/ocaml-extunix/ocaml-extunix-0.1.4.ebuild
new file mode 100644
index 000000000000..13c89e4cce25
--- /dev/null
+++ b/dev-ml/ocaml-extunix/ocaml-extunix-0.1.4.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+OASIS_BUILD_TESTS=1
+OASIS_BUILD_DOCS=1
+
+inherit oasis
+
+DESCRIPTION="Thin bindings to various low-level system APIs"
+HOMEPAGE="http://extunix.forge.ocamlcore.org/"
+SRC_URI="http://ygrek.org.ua/p/release/ocaml-extunix/${P}.tar.gz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="dev-ml/camlp4:="
+DEPEND="${RDEPEND}
+ test? ( dev-ml/ounit )"
+DOCS=( "README.md" "TODO" "CHANGES.txt" )
diff --git a/dev-ml/ocaml-extunix/ocaml-extunix-0.1.5.ebuild b/dev-ml/ocaml-extunix/ocaml-extunix-0.1.5.ebuild
new file mode 100644
index 000000000000..e2f0e0c0cc9c
--- /dev/null
+++ b/dev-ml/ocaml-extunix/ocaml-extunix-0.1.5.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+OASIS_BUILD_TESTS=1
+OASIS_BUILD_DOCS=1
+
+inherit oasis
+
+DESCRIPTION="Thin bindings to various low-level system APIs"
+HOMEPAGE="http://ygrek.org.ua/p/ocaml-extunix/ https://github.com/ygrek/extunix"
+SRC_URI="https://github.com/ygrek/extunix/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="dev-ml/camlp4:="
+DEPEND="${RDEPEND}
+ test? ( dev-ml/ounit )"
+DOCS=( "README.md" "TODO" "CHANGES.txt" )
diff --git a/dev-ml/ocaml-fileutils-0.5.1 b/dev-ml/ocaml-fileutils-0.5.1
deleted file mode 100644
index bcb0ec8e2eed..000000000000
--- a/dev-ml/ocaml-fileutils-0.5.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-ml/ounit-2.0.0 >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=Pure OCaml functions to manipulate real file (POSIX like) and filename
-EAPI=5
-HOMEPAGE=http://forge.ocamlcore.org/projects/ocaml-fileutils
-IUSE=+ocamlopt debug doc test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1-with-linking-exception
-RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?]
-SLOT=0/0.5.1
-SRC_URI=http://forge.ocamlcore.org/frs/download.php/1651/ocaml-fileutils-0.5.1.tar.gz
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e oasis 9256ed89af74c3365ec888c00bfdfe43 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9b2fefa65fee2cd3125f18ca6ec20ceb
diff --git a/dev-ml/ocaml-fileutils-0.5.2 b/dev-ml/ocaml-fileutils-0.5.2
deleted file mode 100644
index 9f06bf8f0763..000000000000
--- a/dev-ml/ocaml-fileutils-0.5.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-ml/ounit-2.0.0 >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=Pure OCaml functions to manipulate real file (POSIX like) and filename
-EAPI=5
-HOMEPAGE=http://forge.ocamlcore.org/projects/ocaml-fileutils
-IUSE=+ocamlopt debug doc test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1-with-linking-exception
-RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?]
-SLOT=0/0.5.2
-SRC_URI=http://forge.ocamlcore.org/frs/download.php/1695/ocaml-fileutils-0.5.2.tar.gz
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e oasis 9256ed89af74c3365ec888c00bfdfe43 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f52a6a98edabfa271fe3897bc8d592a9
diff --git a/dev-ml/ocaml-fileutils/Manifest b/dev-ml/ocaml-fileutils/Manifest
new file mode 100644
index 000000000000..e6840222ed68
--- /dev/null
+++ b/dev-ml/ocaml-fileutils/Manifest
@@ -0,0 +1,5 @@
+DIST ocaml-fileutils-0.5.1.tar.gz 129639 BLAKE2B 12f4b33eb70caf3a106e87a484411f31d6924aae68c964350080698b723b39c7bae236d5a732a0546cd6a52b4215c9ddf2b46da613c171a1ef384ef5eee3d5fe SHA512 e2f60d16d9c25f43ea6bf5fcdf5810ae1722ef30a37e9ffcb6302a87bf3aa89777f3e3d43860258fb7c284861df1eafb4e5e2b6bd3f8d78d347ef8d139e460e8
+DIST ocaml-fileutils-0.5.2.tar.gz 129676 BLAKE2B 2534c28d134b297cf9f7838c6f33f6fe4a7fde6875cf7ae15990b1d2c2fd53be425ce8b37b6836642b26722fa0042f741e91d1c32211a2618e5f80345b6c63cb SHA512 264282c54ff693686ca9e60f371038f8ea9bce219d04556297dc7b6028c9f65c5a03b7cd263c3519cb212e29665200db1c95c88874bb2cb3d7b610e3b832018d
+EBUILD ocaml-fileutils-0.5.1.ebuild 597 BLAKE2B a2ff461f89767542ac3b0a26f3bd5136e81b4073dee298bb69ed55eac666850a4da224778f3ecefa769b253356ebfae2048af112f2ed85c88265306ba81e5747 SHA512 720b4de52aeeab6f1cd74ed4109b7844b4a458ac4169f7e0787de4d463e441049eea325cbb14354cead0a5b32fff653f14fddb43ac7bccedf805d4b0dfa27253
+EBUILD ocaml-fileutils-0.5.2.ebuild 597 BLAKE2B 15afd6b65d77f0589ad5e61b6f4f3495c4ce460b68b3fb9261234fbc9dfa1bb2bcf523881ca075800ee2ba7dcd5b0f6097a32ca34279d474d6db2ded6f682a7b SHA512 7f0709bea28f184905380f2f10f4e2693805fc30f3fe004a7d44c29614e294dba8da2e11cfc7c1fc5c2f949cdff5f2107229c9707630d51bd5362278ab852681
+MISC metadata.xml 243 BLAKE2B 010ca240ae06e9a9f6d7ba213eb06df36d9ba862ff2d2458d98a9fea1a1e7f3026d13832a73bce1b3ad9345029425e6abfae9e03bf126f2329b3f030ed3753fd SHA512 1c5b4b2163017e496999d1f87e5c9c5ac6c11b2e9187450ccfb3df258f34e54d278972f04ee0e8429476c6f87e091a869ac2a28c6e8c8e6d20678c3e74061449
diff --git a/dev-ml/ocaml-fileutils/metadata.xml b/dev-ml/ocaml-fileutils/metadata.xml
new file mode 100644
index 000000000000..ffac4d7ebc01
--- /dev/null
+++ b/dev-ml/ocaml-fileutils/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-ml/ocaml-fileutils/ocaml-fileutils-0.5.1.ebuild b/dev-ml/ocaml-fileutils/ocaml-fileutils-0.5.1.ebuild
new file mode 100644
index 000000000000..9e105e66a76c
--- /dev/null
+++ b/dev-ml/ocaml-fileutils/ocaml-fileutils-0.5.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+OASIS_BUILD_DOCS=1
+OASIS_BUILD_TESTS=1
+
+inherit oasis
+
+DESCRIPTION="Pure OCaml functions to manipulate real file (POSIX like) and filename"
+HOMEPAGE="http://forge.ocamlcore.org/projects/ocaml-fileutils"
+SRC_URI="http://forge.ocamlcore.org/frs/download.php/1651/${P}.tar.gz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+ >=dev-ml/ounit-2.0.0"
+
+DOCS=( "AUTHORS.txt" "README.txt" "CHANGELOG.txt" "TODO.txt" )
diff --git a/dev-ml/ocaml-fileutils/ocaml-fileutils-0.5.2.ebuild b/dev-ml/ocaml-fileutils/ocaml-fileutils-0.5.2.ebuild
new file mode 100644
index 000000000000..40d4d20f42d6
--- /dev/null
+++ b/dev-ml/ocaml-fileutils/ocaml-fileutils-0.5.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+OASIS_BUILD_DOCS=1
+OASIS_BUILD_TESTS=1
+
+inherit oasis
+
+DESCRIPTION="Pure OCaml functions to manipulate real file (POSIX like) and filename"
+HOMEPAGE="http://forge.ocamlcore.org/projects/ocaml-fileutils"
+SRC_URI="http://forge.ocamlcore.org/frs/download.php/1695/${P}.tar.gz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+ >=dev-ml/ounit-2.0.0"
+
+DOCS=( "AUTHORS.txt" "README.txt" "CHANGELOG.txt" "TODO.txt" )
diff --git a/dev-ml/ocaml-gettext-0.3.5-r1 b/dev-ml/ocaml-gettext-0.3.5-r1
deleted file mode 100644
index 038a9f9c7b7d..000000000000
--- a/dev-ml/ocaml-gettext-0.3.5-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=>=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:= doc? ( app-text/docbook-xsl-stylesheets dev-libs/libxslt ) test? ( dev-ml/ounit ) >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Provides support for internationalization of OCaml program
-EAPI=5
-HOMEPAGE=http://forge.ocamlcore.org/projects/ocaml-gettext
-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:=
-SLOT=0/0.3.5
-SRC_URI=http://forge.ocamlcore.org/frs/download.php/1433/ocaml-gettext-0.3.5.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=60c0ecb70409a954b411ad5b4fa7619f
diff --git a/dev-ml/ocaml-gettext-0.3.7 b/dev-ml/ocaml-gettext-0.3.7
deleted file mode 100644
index eb31b6ebf4cf..000000000000
--- a/dev-ml/ocaml-gettext-0.3.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=>=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:= doc? ( app-text/docbook-xsl-stylesheets dev-libs/libxslt ) test? ( dev-ml/ounit ) >=dev-ml/findlib-1.0.4-r1 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Provides support for internationalization of OCaml program
-EAPI=5
-HOMEPAGE=https://github.com/gildor478/ocaml-gettext
-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:=
-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 d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9f15677795ff8198a71302427f9d54e2
diff --git a/dev-ml/ocaml-gettext/Manifest b/dev-ml/ocaml-gettext/Manifest
new file mode 100644
index 000000000000..f438bb507336
--- /dev/null
+++ b/dev-ml/ocaml-gettext/Manifest
@@ -0,0 +1,6 @@
+AUX oc43.patch 773 BLAKE2B 8b5d3892c5cc050000a6c2512a84e890871df90d93c62f952d68309949776a6cd17dc1a38b0bdab6c4698c22198a4fcc98f595efbc28e37e3620c71d1c5297fa SHA512 99d2a01f3a7db768d5832e6527adc77e4272675b1027c96972171e5da71b29654ddf06a91b0882f957419aa19a651da92ba7b1eef5e0cde9542f812ed386cf4a
+DIST ocaml-gettext-0.3.5.tar.gz 165238 BLAKE2B 3da80a80cf3e722dc2a765e005bff0e7613967a5810d13c9d3c0a5b70a919b092627d398dc777775dd2b51dfc7bbe12040b844c609027b4c60cb5d23eda47198 SHA512 a60d51c09dad3076415ef24a9bb3121f84ad649d7a9fa1b9a7da719dd385e4ed7cd9ffbabefbade7ea0daf7b0a5a5eb71b1d0ed21b369914b49f66d0d918c446
+DIST ocaml-gettext-0.3.7.tar.gz 134316 BLAKE2B 9de6ef9e04afbb6001ddc5ef145a687ad88a20eef1c27d3a3e6136f81ad46100cc6496cb66e3edfbf0f7eacfa8abbccb44d846d2f676862c96b8ceb860d8f424 SHA512 1358320359b9d2f3fd97a47d69b2a619942a65605c1e5cbf25e33ef42a10273167b526bca15e6c9523b87d8ea9dfd3215334050ad8eb84a8c41d4feef880a27a
+EBUILD ocaml-gettext-0.3.5-r1.ebuild 1208 BLAKE2B 4f45556c72e5f7897faa9d9204ad7c52968e61178311a1319b34bc007ae26330048740f3569bfa34c11f887ac358305588dc7d66893c0a1bf07cfa5601e91083 SHA512 29a51f8ee0be651fbcaf1ec934324adf2172a71c5a61174225795eb6237d0a74fa08a4647dafad726a80d46fe89a6fb1b44d718ceb6400b7a789af5796c10728
+EBUILD ocaml-gettext-0.3.7.ebuild 1170 BLAKE2B eaa6fb22039c6898194b3e0de5630a96b779814901b5aa0b93852dec23af9af811d1424587482fa0bec4c9bd4e75b19c1e0ba8bb3824e1d340ff0fc3dc58a6ce SHA512 ba0fb334acebe1a8d2e63d066f63f520643774758f2fc93abaaf1308b8a2a3714590624d70a1ba58daf4397a7006d2b6d8685d2c10576854c809422410ccf6dc
+MISC metadata.xml 335 BLAKE2B d13ce1fc3ec77320c3ed994f7ead20d2a74a08fa2834a20de1c032680be125bc0139700af166f5962919f50d837112333bce176fc8181c21b8c3da14b3241e4f SHA512 cd4278de58e8df0fbd2aca45475ae972e665c98c229bfc53c0422d15ca85fc650dc09473d0712d9bc446f44523889c5c70463b0f34c81f9f2fc4adb820444a82
diff --git a/dev-ml/ocaml-gettext/files/oc43.patch b/dev-ml/ocaml-gettext/files/oc43.patch
new file mode 100644
index 000000000000..41996b941122
--- /dev/null
+++ b/dev-ml/ocaml-gettext/files/oc43.patch
@@ -0,0 +1,12 @@
+Index: ocaml-gettext-0.3.5/ocaml-gettext/Makefile
+===================================================================
+--- ocaml-gettext-0.3.5.orig/ocaml-gettext/Makefile
++++ ocaml-gettext-0.3.5/ocaml-gettext/Makefile
+@@ -64,7 +64,6 @@ uninstall: ocaml-xgettext-uninstall
+ ocaml-xgettext: $(BUILDBIN)
+ $(OCAMLC) \
+ -I +camlp4 dynlink.cma camlp4lib.cma \
+- unix.cma \
+ `$(OCAMLFIND) query -r -predicates byte gettext.extract -i-format` \
+ `$(OCAMLFIND) query -r -predicates byte gettext.extract -a-format` \
+ `$(OCAMLFIND) query -r -predicates byte gettext.extract -o-format` \
diff --git a/dev-ml/ocaml-gettext/metadata.xml b/dev-ml/ocaml-gettext/metadata.xml
new file mode 100644
index 000000000000..885b2e79d01d
--- /dev/null
+++ b/dev-ml/ocaml-gettext/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">gildor478/ocaml-gettext</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/ocaml-gettext/ocaml-gettext-0.3.5-r1.ebuild b/dev-ml/ocaml-gettext/ocaml-gettext-0.3.5-r1.ebuild
new file mode 100644
index 000000000000..bfa850f00bed
--- /dev/null
+++ b/dev-ml/ocaml-gettext/ocaml-gettext-0.3.5-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit findlib eutils
+
+DESCRIPTION="Provides support for internationalization of OCaml program"
+HOMEPAGE="http://forge.ocamlcore.org/projects/ocaml-gettext"
+SRC_URI="http://forge.ocamlcore.org/frs/download.php/1433/${P}.tar.gz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+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:=
+ "
+DEPEND="${RDEPEND}
+ doc? ( app-text/docbook-xsl-stylesheets dev-libs/libxslt )
+ test? ( dev-ml/ounit )"
+
+src_prepare() {
+ has_version '>=dev-lang/ocaml-4.03' && epatch "${FILESDIR}/oc43.patch"
+}
+
+src_configure() {
+ econf \
+ --with-docbook-stylesheet="${EPREFIX}/usr/share/sgml/docbook/xsl-stylesheets/" \
+ $(use_enable doc) \
+ $(use_enable test)
+}
+
+src_compile() {
+ emake -j1
+}
+
+src_install() {
+ findlib_src_preinst
+ emake -j1 DESTDIR="${D}" \
+ BINDIR="${ED}/usr/bin" \
+ PODIR="${ED}/usr/share/locale/" \
+ DOCDIR="${ED}/usr/share/doc/${PF}" \
+ MANDIR="${ED}/usr/share/man" \
+ install
+ dodoc CHANGELOG README THANKS TODO
+}
diff --git a/dev-ml/ocaml-gettext/ocaml-gettext-0.3.7.ebuild b/dev-ml/ocaml-gettext/ocaml-gettext-0.3.7.ebuild
new file mode 100644
index 000000000000..90649dc623b9
--- /dev/null
+++ b/dev-ml/ocaml-gettext/ocaml-gettext-0.3.7.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit findlib eutils autotools
+
+DESCRIPTION="Provides support for internationalization of OCaml program"
+HOMEPAGE="https://github.com/gildor478/ocaml-gettext"
+SRC_URI="https://github.com/gildor478/ocaml-gettext/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+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:=
+ "
+DEPEND="${RDEPEND}
+ doc? ( app-text/docbook-xsl-stylesheets dev-libs/libxslt )
+ test? ( dev-ml/ounit )"
+
+src_prepare() {
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --with-docbook-stylesheet="${EPREFIX}/usr/share/sgml/docbook/xsl-stylesheets/" \
+ $(use_enable doc) \
+ $(use_enable test)
+}
+
+src_compile() {
+ emake -j1
+}
+
+src_install() {
+ findlib_src_preinst
+ emake -j1 DESTDIR="${D}" \
+ BINDIR="${ED}/usr/bin" \
+ PODIR="${ED}/usr/share/locale/" \
+ DOCDIR="${ED}/usr/share/doc/${PF}" \
+ MANDIR="${ED}/usr/share/man" \
+ install
+ dodoc CHANGELOG README THANKS TODO
+}
diff --git a/dev-ml/ocaml-hashcons-1.2 b/dev-ml/ocaml-hashcons-1.2
deleted file mode 100644
index e0ead3af67cc..000000000000
--- a/dev-ml/ocaml-hashcons-1.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=dev-lang/ocaml:=[ocamlopt?] >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=OCaml hash-consing library
-EAPI=5
-HOMEPAGE=https://github.com/backtracking/ocaml-hashcons
-IUSE=+ocamlopt
-KEYWORDS=~amd64
-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 d0e5375d47f4c809f406eb892e531513 findlib 45d6030075064a68da8d7143726a1150 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=0d1738214c2a8dbeb35fbe1e9118c68c
diff --git a/dev-ml/ocaml-hashcons-1.3 b/dev-ml/ocaml-hashcons-1.3
deleted file mode 100644
index 9cef7f8472f3..000000000000
--- a/dev-ml/ocaml-hashcons-1.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=dev-lang/ocaml:=[ocamlopt?] >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=OCaml hash-consing library
-EAPI=5
-HOMEPAGE=https://github.com/backtracking/ocaml-hashcons
-IUSE=+ocamlopt
-KEYWORDS=~amd64
-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 d0e5375d47f4c809f406eb892e531513 findlib 45d6030075064a68da8d7143726a1150 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=ea0dcaeade9713d11f14cc5684c340cc
diff --git a/dev-ml/ocaml-hashcons/Manifest b/dev-ml/ocaml-hashcons/Manifest
new file mode 100644
index 000000000000..126b2cbf0de3
--- /dev/null
+++ b/dev-ml/ocaml-hashcons/Manifest
@@ -0,0 +1,5 @@
+DIST ocaml-hashcons-1.2.tar.gz 19775 BLAKE2B 7bef506cb7de3177168cc582245f8e2ece3ca7e9da78985ff604a32be675bcd36901ed920c7898aa0e3087251494f425c164cd1125485549de0bbfd867bdbfa6 SHA512 167ed8d74c5080ef14af0ac1232ea16faee3f0e09e0a65cd72447266939ce7ed5416f4cf6a3021e5ca8215726df129d3f05c9e0c12dcd36f845b060fd93072b2
+DIST ocaml-hashcons-1.3.tar.gz 19495 BLAKE2B 0d29a529fb1d6953e7294e3992e6f41c094e8b4ea607ed4f2f0d97c558b2c9a6e8703de0aca06727b845ad3f3989ef99c634e248f221c95fbffc2321cd73e961 SHA512 fd194d48a3231e72ca8bf3d324e5e1f6442d965da9149973a1763cf70aa82398805fa00648bdd12de3d3daada8e90bdc575c73886f949b5183e79bea75beadc8
+EBUILD ocaml-hashcons-1.2.ebuild 856 BLAKE2B b294fa9c408a097a29e15d9f9716261388e46fd804050f0919cc6d834fd86bdc3a25fd11bb0ddbc620ae1224060a6143c55a7dd0723ea6b7745ee4db183e92ab SHA512 7a0ff44d93330c4ecdd7cfc0f28ec595944d8b917ec427b9ebd09a6fc904fbc02aeecb7012b911f2200cc03abc790af421927b0f04ee3e3adc1e5061cc45c182
+EBUILD ocaml-hashcons-1.3.ebuild 856 BLAKE2B e8d2f6d399d40ca83b447c7c5a18ba8ed34c5d0b5b272852119ff8352dbe9111923e732a3ae5d01c33be478efff7e3c9174e6011f7216d149ae2f3807aefac38 SHA512 4b0f2ac976990f2086bbb37f8168b3756ec0fd845483db3eae2ca7f3c7ee7424ba6bdbb14b33b31dbf434654c34fe66cf9d14ec00aa4f833c8b2df8285523714
+MISC metadata.xml 339 BLAKE2B 17a4a6f567af051db79cb7d2ded9b551dca15bb9e93e2072549ee31167cde5f5ff935ff5feb7843fccefb300ef3492e5ae47d18dc4e91e286e859cb207f96273 SHA512 13e7485cf097bb06448b4336b2fd99e6d21c56aff07ffee4bebe77b7fe7c844d4ce212746e335cd5aec2ad370a61db492d537662d5f1add2f2277107a1b51507
diff --git a/dev-ml/ocaml-hashcons/metadata.xml b/dev-ml/ocaml-hashcons/metadata.xml
new file mode 100644
index 000000000000..a079c25ecc03
--- /dev/null
+++ b/dev-ml/ocaml-hashcons/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">backtracking/ocaml-hashcons</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/ocaml-hashcons/ocaml-hashcons-1.2.ebuild b/dev-ml/ocaml-hashcons/ocaml-hashcons-1.2.ebuild
new file mode 100644
index 000000000000..e2f3672faae6
--- /dev/null
+++ b/dev-ml/ocaml-hashcons/ocaml-hashcons-1.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools findlib
+
+DESCRIPTION="OCaml hash-consing library"
+HOMEPAGE="https://github.com/backtracking/ocaml-hashcons"
+SRC_URI="https://github.com/backtracking/ocaml-hashcons/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="+ocamlopt"
+
+RDEPEND="dev-lang/ocaml:=[ocamlopt?]"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ eautoreconf
+ sed -i -e 's/$(OCAMLFIND) remove/#/' Makefile.in || die
+}
+
+src_compile() {
+ if use ocamlopt; then
+ emake opt byte
+ else
+ emake byte
+ fi
+}
+
+src_install() {
+ dodir "$(ocamlfind printconf destdir)/hashcons"
+ emake DESTDIR="-destdir ${D}/$(ocamlfind printconf destdir)/" $(usex ocamlopt install-opt install-byte)
+ dodoc README.md CHANGES
+}
diff --git a/dev-ml/ocaml-hashcons/ocaml-hashcons-1.3.ebuild b/dev-ml/ocaml-hashcons/ocaml-hashcons-1.3.ebuild
new file mode 100644
index 000000000000..7b027961ea87
--- /dev/null
+++ b/dev-ml/ocaml-hashcons/ocaml-hashcons-1.3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools findlib
+
+DESCRIPTION="OCaml hash-consing library"
+HOMEPAGE="https://github.com/backtracking/ocaml-hashcons"
+SRC_URI="https://github.com/backtracking/ocaml-hashcons/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="+ocamlopt"
+
+RDEPEND="dev-lang/ocaml:=[ocamlopt?]"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ eautoreconf
+ sed -i -e 's/$(OCAMLFIND) remove/#/' Makefile.in || die
+}
+
+src_compile() {
+ if use ocamlopt; then
+ emake opt byte
+ else
+ emake byte
+ fi
+}
+
+src_install() {
+ dodir "$(ocamlfind printconf destdir)/hashcons"
+ emake DESTDIR="-destdir ${D}/$(ocamlfind printconf destdir)/" $(usex ocamlopt install-opt install-byte)
+ dodoc README.md CHANGES
+}
diff --git a/dev-ml/ocaml-ipaddr-2.8.0 b/dev-ml/ocaml-ipaddr-2.8.0
deleted file mode 100644
index 90ec705001b1..000000000000
--- a/dev-ml/ocaml-ipaddr-2.8.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-ml/sexplib:= dev-ml/ppx_sexp_conv:= dev-ml/ppx_core:= dev-ml/ppx_type_conv:= dev-lang/ocaml:=[ocamlopt?] dev-ml/jbuilder dev-ml/findlib test? ( dev-ml/ounit ) >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=OCaml library for manipulation of IP (and MAC) address representations
-EAPI=5
-HOMEPAGE=https://github.com/mirage/ocaml-ipaddr
-IUSE=+ocamlopt test
-KEYWORDS=~amd64
-LICENSE=ISC
-RDEPEND=dev-ml/sexplib:= dev-ml/ppx_sexp_conv:= dev-ml/ppx_core:= dev-ml/ppx_type_conv:= dev-lang/ocaml:=[ocamlopt?] >=dev-lang/ocaml-4:=
-SLOT=0/2.8.0
-SRC_URI=https://github.com/mirage/ocaml-ipaddr/archive/2.8.0.tar.gz -> ocaml-ipaddr-2.8.0.tar.gz
-_eclasses_=opam 24b4a2529c1fd12f1304856d6c5a690d
-_md5_=47b583b39ce07bc7e5cee44984a9660c
diff --git a/dev-ml/ocaml-ipaddr/Manifest b/dev-ml/ocaml-ipaddr/Manifest
new file mode 100644
index 000000000000..aa88c4448d0e
--- /dev/null
+++ b/dev-ml/ocaml-ipaddr/Manifest
@@ -0,0 +1,3 @@
+DIST ocaml-ipaddr-2.8.0.tar.gz 22134 BLAKE2B b6e9d49fd6ac69bd4cd4884e97490a744e863541084270f55847768c2fe312334feb00fc9404028664864cc1dffccf8cf2df004a341429e78122dc64bfe0a087 SHA512 1714ee4d6b2afa17b987844f37a9896f01d7b674770fa6804b03222dba656130f9ee0d2d1409b67e770e21f973682c7d1d5c550abb0a5d94bc0c04a1a97e8e3c
+EBUILD ocaml-ipaddr-2.8.0.ebuild 667 BLAKE2B dcaa454f6079c638e75098752d1a5ac1535ad39c2cb9fdcde09210537753c7a26df98c751cc495c46a0c0aa26ed3619fda636ef2618f0aebbd4067bc6ee4925f SHA512 a6f90573a6b2b6558883cc3e34d96af353e8e254e519705fd0a76c533a0a0815ac5a7f8f74e420e836163104f88e1fbcf4bba95325afca2fd0e703dbcfc0852e
+MISC metadata.xml 341 BLAKE2B d312ec476799bf0e386ee556291a24165504d67927f5bf34f533f7fc11bbee5dc7591e96b1a4955ef693bc126838ca420b8b1683983ffbadf27951a5814509b3 SHA512 1a8f24a3a717ee7afd59e82ae1000116df14fbd47cd46fd9fdbf69d2a68dd0cf7e5e7109c1ae1f7a757ab17ece18f042bf64bb01da53acb2d8f990c3c2399eb5
diff --git a/dev-ml/ocaml-ipaddr/metadata.xml b/dev-ml/ocaml-ipaddr/metadata.xml
new file mode 100644
index 000000000000..1d6e7b2fd2e2
--- /dev/null
+++ b/dev-ml/ocaml-ipaddr/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">mirage/ocaml-ipaddr</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/ocaml-ipaddr/ocaml-ipaddr-2.8.0.ebuild b/dev-ml/ocaml-ipaddr/ocaml-ipaddr-2.8.0.ebuild
new file mode 100644
index 000000000000..c4a103f9a450
--- /dev/null
+++ b/dev-ml/ocaml-ipaddr/ocaml-ipaddr-2.8.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit opam
+
+DESCRIPTION="OCaml library for manipulation of IP (and MAC) address representations"
+HOMEPAGE="https://github.com/mirage/ocaml-ipaddr"
+SRC_URI="https://github.com/mirage/ocaml-ipaddr/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="+ocamlopt test"
+
+RDEPEND="dev-ml/sexplib:=
+ dev-ml/ppx_sexp_conv:=
+ dev-ml/ppx_core:=
+ dev-ml/ppx_type_conv:=
+ dev-lang/ocaml:=[ocamlopt?]
+"
+DEPEND="${RDEPEND}
+ dev-ml/jbuilder
+ dev-ml/findlib
+ test? ( dev-ml/ounit )
+"
+
+src_install() {
+ opam_src_install ipaddr
+}
diff --git a/dev-ml/ocaml-magic-mime-1.0.0 b/dev-ml/ocaml-magic-mime-1.0.0
deleted file mode 100644
index 9531a9eb3843..000000000000
--- a/dev-ml/ocaml-magic-mime-1.0.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=Convert file extensions to MIME types
-EAPI=5
-HOMEPAGE=https://github.com/mirage/ocaml-magic-mime
-IUSE=+ocamlopt debug
-KEYWORDS=~amd64
-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 983774947da124fb7d542ce25a218bb1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e oasis 9256ed89af74c3365ec888c00bfdfe43 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0692fee9c679c335f7e5989f86824f37
diff --git a/dev-ml/ocaml-magic-mime-1.1.0 b/dev-ml/ocaml-magic-mime-1.1.0
deleted file mode 100644
index a1a71c9a4cc6..000000000000
--- a/dev-ml/ocaml-magic-mime-1.1.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-lang/ocaml:= dev-ml/jbuilder dev-ml/opam
-DESCRIPTION=Convert file extensions to MIME types
-EAPI=6
-HOMEPAGE=https://github.com/mirage/ocaml-magic-mime
-KEYWORDS=~amd64
-LICENSE=ISC
-RDEPEND=dev-lang/ocaml:=
-SLOT=0/1.1.0
-SRC_URI=https://github.com/mirage/ocaml-magic-mime/archive/v1.1.0.tar.gz -> ocaml-magic-mime-1.1.0.tar.gz
-_md5_=c9635953e39de2f700dc4318c3ee4e12
diff --git a/dev-ml/ocaml-magic-mime/Manifest b/dev-ml/ocaml-magic-mime/Manifest
new file mode 100644
index 000000000000..2ed24fa8b362
--- /dev/null
+++ b/dev-ml/ocaml-magic-mime/Manifest
@@ -0,0 +1,5 @@
+DIST ocaml-magic-mime-1.0.0.tar.gz 53937 BLAKE2B 202968b4038f66e61b458b84d6505b1c143b8994ff32cd6c2e11d7feec31a4e99af26fddb84b72d19ce1a37cc01d6dd0bcf6e9648b6434f0a1509120fabda251 SHA512 e6a050e0adc465d174083b101b66805e3261b0498cd20d19bd4d2da52859d6c792f8e13e1c787d54f81e1ff65048f4fb3c38367f1a60c8e5c94367f5f685dc8e
+DIST ocaml-magic-mime-1.1.0.tar.gz 13228 BLAKE2B 105f9fdd71a752bc5e0f660af40dc4f212a721964091e8719b55499f3ab046c6b40894b8a21defdca4cfc14ac2cbed874c189d96cb83633ad95fab7fd7e2d793 SHA512 41daa6d85a1398498f03dc54d6e5c5057c79c9c7e4063fb67e73c1b497e69a0c67796640c837fcf3715e8bea7590288f1cf84e41c7ab46d910c6d8d32156efe5
+EBUILD ocaml-magic-mime-1.0.0.ebuild 413 BLAKE2B 2be617ad44dc2e64013ea4312ac3c5d72741fe1efc41e00e37617e076b235768f55af9597145702464b97afd8a72ced4aeff44dc5a1b2658f92d59fb6302357e SHA512 a7f2c1522bf4ebdbb409d4a49f52f81785484a3e6bd62190aa1b2dfea433164ab76ab9825d030bb89e4b32565c552f7fb8bc7d70d999fb686265e33d6901ff73
+EBUILD ocaml-magic-mime-1.1.0.ebuild 617 BLAKE2B f1514f2fb4c123941dba40f7b7c512c4eeee74a36723ddc5ff77a9ff020862a8ed8c998a5a65fae05c2894511aff4a24aa99849bf3e894e6b39da33c8b845022 SHA512 c8841ebf25ef1f8898f22765a7e1fbb4e13febaa9b9867a0ea41fc7d7556ceea18b2d7a85568025bee7a26e12e357e6d9d727ab38fa6983bbd66fae5ce135dd7
+MISC metadata.xml 335 BLAKE2B c73f884540b8b9210f8c4e465c0b5ac5dff7da15d6a6b35fa33f1a8b84672191948360ba12687549408cbc181fb62f448130cb079e920efbad711a661bc4d3b4 SHA512 d302e7216896061a7f154f2aca29d4e8f79f4cfdefd30c7535aa8565467e0b1878ecf90da5cfdadc0792a178338668ced99e9ea0dc3597857d5bacd29ea0ad05
diff --git a/dev-ml/ocaml-magic-mime/metadata.xml b/dev-ml/ocaml-magic-mime/metadata.xml
new file mode 100644
index 000000000000..ecc5aac550f5
--- /dev/null
+++ b/dev-ml/ocaml-magic-mime/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">mirage/ocaml-magic-mime</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/ocaml-magic-mime/ocaml-magic-mime-1.0.0.ebuild b/dev-ml/ocaml-magic-mime/ocaml-magic-mime-1.0.0.ebuild
new file mode 100644
index 000000000000..7693ae06464f
--- /dev/null
+++ b/dev-ml/ocaml-magic-mime/ocaml-magic-mime-1.0.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit oasis
+
+DESCRIPTION="Convert file extensions to MIME types"
+HOMEPAGE="https://github.com/mirage/ocaml-magic-mime"
+SRC_URI="https://github.com/mirage/ocaml-magic-mime/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="ISC"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
diff --git a/dev-ml/ocaml-magic-mime/ocaml-magic-mime-1.1.0.ebuild b/dev-ml/ocaml-magic-mime/ocaml-magic-mime-1.1.0.ebuild
new file mode 100644
index 000000000000..17c16d0e2fa3
--- /dev/null
+++ b/dev-ml/ocaml-magic-mime/ocaml-magic-mime-1.1.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Convert file extensions to MIME types"
+HOMEPAGE="https://github.com/mirage/ocaml-magic-mime"
+SRC_URI="https://github.com/mirage/ocaml-magic-mime/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="ISC"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="dev-lang/ocaml:="
+DEPEND="${RDEPEND}
+ dev-ml/jbuilder
+ dev-ml/opam
+"
+
+src_install() {
+ opam-installer -i \
+ --prefix="${ED}/usr" \
+ --libdir="${D}/$(ocamlc -where)" \
+ --docdir="${ED}/usr/share/doc/${PF}" \
+ magic-mime.install || die
+}
diff --git a/dev-ml/ocaml-make-6.37.0 b/dev-ml/ocaml-make-6.37.0
deleted file mode 100644
index f75b56bad48c..000000000000
--- a/dev-ml/ocaml-make-6.37.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Generic O'Caml Makefile for GNU Make
-EAPI=4
-HOMEPAGE=https://bitbucket.org/mmottl/ocaml-makefile
-IUSE=examples
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-lang/ocaml-3.06-r1 >=dev-ml/findlib-0.8
-SLOT=0
-SRC_URI=https://bitbucket.org/mmottl/ocaml-makefile/downloads/ocaml-makefile-6.37.0.tar.gz
-_md5_=0e98e88dc9d9ed559eaf950c3e3148be
diff --git a/dev-ml/ocaml-make-6.39.0 b/dev-ml/ocaml-make-6.39.0
deleted file mode 100644
index 530ec6ea1047..000000000000
--- a/dev-ml/ocaml-make-6.39.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Generic O'Caml Makefile for GNU Make
-EAPI=4
-HOMEPAGE=http://mmottl.github.io/ocaml-makefile/ https://github.com/mmottl/ocaml-makefile
-IUSE=examples
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-lang/ocaml-3.06-r1 >=dev-ml/findlib-0.8
-SLOT=0
-SRC_URI=https://github.com/mmottl/ocaml-makefile/releases/download/6.39.0/ocaml-makefile-6.39.0.tbz
-_md5_=08682ba84fcd504cf4eb76df7348270c
diff --git a/dev-ml/ocaml-make/Manifest b/dev-ml/ocaml-make/Manifest
new file mode 100644
index 000000000000..c03c1cf109e8
--- /dev/null
+++ b/dev-ml/ocaml-make/Manifest
@@ -0,0 +1,5 @@
+DIST ocaml-makefile-6.37.0.tar.gz 49202 BLAKE2B e636b3baf2e088507deb3b6c98f682cd21857988963801ede02a0b8acac4c9bec3f9ae48d76122ab96a6d16d3ede5bcda2a62e351f7f34c230497ee99a1081d8 SHA512 19d318f8b03116c3e999b61c1a2708f483873ab7ae9260225df79888a86eb39e77867fdefe0df23a50ac1fd422b3b774f96b5b58d9dec449710527df1075a36d
+DIST ocaml-makefile-6.39.0.tbz 42477 BLAKE2B 35cffde17f8554f09da24aa1dbc0036b75fcf97516d87d727359899e48c2ccd512d4ae8fcac5319ff30c26e2c9ef813419926a8be103b9de4a9ad6418d1f253e SHA512 54a52c243ce23eba286502aa28ccdbb412aba7cf3ed90e3079ab1b187e61edc8a3197536d5c054b03a871eadbdd0e3b93c47904cb0594ccc2c4ce66ed31daa21
+EBUILD ocaml-make-6.37.0.ebuild 799 BLAKE2B 423db2be2d77ff6851ebcf8ec7b93527e154f1c172a94bbacf6acc8ec2a094c35286bd642dc320ab2e793a4d64b51e74bc70fc1532c6231cab0fac63e67e2b63 SHA512 e3f814e965557044ee1d4ec766a3f5a18b03883ef003014904325a8b40e8d8615849d71331820101f8a0b288dc500fa4adf5bdece7c2e4a07a36c866730feb35
+EBUILD ocaml-make-6.39.0.ebuild 848 BLAKE2B fb26e664cd58b8cfbaecab2cb0146a5315e9f823fd175a6237f9a502b587abbac076916d925597e07f59020fe8dec00945194810dc4e40e1a05916fc49be214f SHA512 d18f31321f9f1f7c57535f362cd350b74ef052441bb518b72cea8dd6ac66526194cbe35db7d41afe217442ff1dcbe8d4b0e18a4cd121e569e0064250502e1f6b
+MISC metadata.xml 343 BLAKE2B 24b622f0de17f80211cf6a0ea88ff59738681022921fb3f7865fc118ee00dd955691450016ee74502a4d164f61b7424ced1aff06b3bd6f40a3e61e7cbb2cb6e6 SHA512 e83447839fb8050aab2981a2a42b953cf3850957d18f8779638c632536d613ed0170de5d01ec11098dc5566975ea6ac2c8dfe653a645e137f7557c2baf47e50f
diff --git a/dev-ml/ocaml-make/metadata.xml b/dev-ml/ocaml-make/metadata.xml
new file mode 100644
index 000000000000..c6bc6c199a22
--- /dev/null
+++ b/dev-ml/ocaml-make/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">mmottl/ocaml-makefile</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/ocaml-make/ocaml-make-6.37.0.ebuild b/dev-ml/ocaml-make/ocaml-make-6.37.0.ebuild
new file mode 100644
index 000000000000..35b705224bc0
--- /dev/null
+++ b/dev-ml/ocaml-make/ocaml-make-6.37.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+DESCRIPTION="Generic O'Caml Makefile for GNU Make"
+HOMEPAGE="https://bitbucket.org/mmottl/ocaml-makefile"
+LICENSE="LGPL-2.1"
+
+DEPEND=""
+RDEPEND=">=dev-lang/ocaml-3.06-r1
+ >=dev-ml/findlib-0.8"
+SRC_URI="https://bitbucket.org/mmottl/ocaml-makefile/downloads/${PN}file-${PV}.tar.gz"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="examples"
+S="${WORKDIR}/${PN}file-${PV}"
+
+src_install () {
+ # Just put the OCamlMakefile into /usr/include
+ # where GNU Make will automatically pick it up.
+ insinto /usr/include
+ doins OCamlMakefile
+ # install documentation
+ dodoc README.md CHANGES.txt
+
+ if use examples; then
+ insinto /usr/share/doc/${PF}
+ doins -r calc camlp4 gtk idl threads
+ fi
+}
diff --git a/dev-ml/ocaml-make/ocaml-make-6.39.0.ebuild b/dev-ml/ocaml-make/ocaml-make-6.39.0.ebuild
new file mode 100644
index 000000000000..e220e306ac95
--- /dev/null
+++ b/dev-ml/ocaml-make/ocaml-make-6.39.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+DESCRIPTION="Generic O'Caml Makefile for GNU Make"
+HOMEPAGE="http://mmottl.github.io/ocaml-makefile/ https://github.com/mmottl/ocaml-makefile"
+LICENSE="LGPL-2.1"
+
+DEPEND=""
+RDEPEND=">=dev-lang/ocaml-3.06-r1
+ >=dev-ml/findlib-0.8"
+SRC_URI="https://github.com/mmottl/ocaml-makefile/releases/download/${PV}/ocaml-makefile-${PV}.tbz"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="examples"
+S="${WORKDIR}/${PN}file-${PV}"
+
+src_install () {
+ # Just put the OCamlMakefile into /usr/include
+ # where GNU Make will automatically pick it up.
+ insinto /usr/include
+ doins OCamlMakefile
+ # install documentation
+ dodoc README.md CHANGES.md
+
+ if use examples; then
+ insinto /usr/share/doc/${PF}
+ doins -r calc camlp4 gtk idl threads
+ fi
+}
diff --git a/dev-ml/ocaml-migrate-parsetree-1.0.5 b/dev-ml/ocaml-migrate-parsetree-1.0.5
deleted file mode 100644
index f2f39ff8de96..000000000000
--- a/dev-ml/ocaml-migrate-parsetree-1.0.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-ml/result:= dev-ml/jbuilder >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=Convert OCaml parsetrees between different major versions
-EAPI=6
-HOMEPAGE=https://github.com/let-def/ocaml-migrate-parsetree
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-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 24b4a2529c1fd12f1304856d6c5a690d
-_md5_=a7fc26cc5faf6788d179572ea4635368
diff --git a/dev-ml/ocaml-migrate-parsetree-1.0.6 b/dev-ml/ocaml-migrate-parsetree-1.0.6
deleted file mode 100644
index 5ea5197d2211..000000000000
--- a/dev-ml/ocaml-migrate-parsetree-1.0.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-ml/result:= dev-ml/jbuilder >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=Convert OCaml parsetrees between different major versions
-EAPI=6
-HOMEPAGE=https://github.com/let-def/ocaml-migrate-parsetree
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-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 24b4a2529c1fd12f1304856d6c5a690d
-_md5_=a7fc26cc5faf6788d179572ea4635368
diff --git a/dev-ml/ocaml-migrate-parsetree-1.0.7 b/dev-ml/ocaml-migrate-parsetree-1.0.7
deleted file mode 100644
index ecf364acc958..000000000000
--- a/dev-ml/ocaml-migrate-parsetree-1.0.7
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-ml/result:= dev-ml/jbuilder >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=Convert OCaml parsetrees between different major versions
-EAPI=6
-HOMEPAGE=https://github.com/let-def/ocaml-migrate-parsetree
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-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 24b4a2529c1fd12f1304856d6c5a690d
-_md5_=a7fc26cc5faf6788d179572ea4635368
diff --git a/dev-ml/ocaml-migrate-parsetree/Manifest b/dev-ml/ocaml-migrate-parsetree/Manifest
new file mode 100644
index 000000000000..4425f8e1a90b
--- /dev/null
+++ b/dev-ml/ocaml-migrate-parsetree/Manifest
@@ -0,0 +1,7 @@
+DIST ocaml-migrate-parsetree-1.0.5.tar.gz 209078 BLAKE2B f56bd7c142280c3da6439f2e8d72ca43a9c2f5068775fb7ae5e4b73b8f8824ead04d9646b3dfcacc1db6acef2245038b7e4dcfc927c4e7d79e1e90229b143bf5 SHA512 eff87416eeb6175820bedfa3160160fa7328bcee3d05e066b5a94db25a476299f3f5ad07db22eb192f84e5b83804cf2e3a66d77561c984d658d9255c43660b90
+DIST ocaml-migrate-parsetree-1.0.6.tar.gz 209199 BLAKE2B 5682cf02ea17e53f352a9ed8d198bb5a8a8aceedac6754f3d60644a7f21e1fc9cd4daecc24cc8d65f790846cd8518daf874710a6e4ee9ef8c27aec0f7fd43162 SHA512 b44b9fc59cef787a0188245be357685fe7ecd5cc81368b5677b3389e8d09834e5e40f94a3cd7be762f3eb27657a628c0a228c4cefe4443ad1dc8ce012f2552b4
+DIST ocaml-migrate-parsetree-1.0.7.tar.gz 209251 BLAKE2B ad221fd6a3a91d546d3bc75495f32914b99eb0dcdcf3fbe6f76cb80f85a46346815a21bffa872f2aefe09109ab162d19f7019a8d0441d4f9f7ce22c0ada13f2e SHA512 3ba1bfe4840b2664b5053068b3659eb6a2ca216f29ece3f4522d1e7c5d87cb643bfb59ebe0563264cafdc31b9aa572007b4261fd3df8b27607fad47ff6168892
+EBUILD ocaml-migrate-parsetree-1.0.5.ebuild 535 BLAKE2B 893a1313777f92eadff064fe684981a34fd75cb7e9f307efe0e82a6d0a6490b3400fd57a382d43dafed295cc4382681c8456e56284453cdc1405fefdc9878bf4 SHA512 3689a644a17ca76067c7c1559a23a25d8035a78c51d35fc5d7ec5d123d0f172583406b3c30665f57ad6cee1d73c6895019384a90926d0c95812c484a2fe3a6e3
+EBUILD ocaml-migrate-parsetree-1.0.6.ebuild 535 BLAKE2B 893a1313777f92eadff064fe684981a34fd75cb7e9f307efe0e82a6d0a6490b3400fd57a382d43dafed295cc4382681c8456e56284453cdc1405fefdc9878bf4 SHA512 3689a644a17ca76067c7c1559a23a25d8035a78c51d35fc5d7ec5d123d0f172583406b3c30665f57ad6cee1d73c6895019384a90926d0c95812c484a2fe3a6e3
+EBUILD ocaml-migrate-parsetree-1.0.7.ebuild 535 BLAKE2B 893a1313777f92eadff064fe684981a34fd75cb7e9f307efe0e82a6d0a6490b3400fd57a382d43dafed295cc4382681c8456e56284453cdc1405fefdc9878bf4 SHA512 3689a644a17ca76067c7c1559a23a25d8035a78c51d35fc5d7ec5d123d0f172583406b3c30665f57ad6cee1d73c6895019384a90926d0c95812c484a2fe3a6e3
+MISC metadata.xml 343 BLAKE2B db9e54eb3d99cb46bd08b452ace28c925ae37c038808b4e48bf6ebbbf011f17d4d62c6b362d22e014a0f49c23dfe8d46788e6dd01b09f93bad6e85fc154484ab SHA512 21dab98a6df0be04a7256797e7dd6d0056a16018fe20e9c83470d0e6fe7c2a792d9251d691faf92a4e00c1ced2f34d1a5b7fd7c901104d5d78739d1c465f391d
diff --git a/dev-ml/ocaml-migrate-parsetree/metadata.xml b/dev-ml/ocaml-migrate-parsetree/metadata.xml
new file mode 100644
index 000000000000..9354118a9b53
--- /dev/null
+++ b/dev-ml/ocaml-migrate-parsetree/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">let-def/ocaml-migrate-parsetree</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/ocaml-migrate-parsetree/ocaml-migrate-parsetree-1.0.5.ebuild b/dev-ml/ocaml-migrate-parsetree/ocaml-migrate-parsetree-1.0.5.ebuild
new file mode 100644
index 000000000000..da28219a5424
--- /dev/null
+++ b/dev-ml/ocaml-migrate-parsetree/ocaml-migrate-parsetree-1.0.5.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit findlib opam
+
+DESCRIPTION="Convert OCaml parsetrees between different major versions"
+HOMEPAGE="https://github.com/let-def/ocaml-migrate-parsetree"
+SRC_URI="https://github.com/let-def/ocaml-migrate-parsetree/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="dev-ml/result:="
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND}
+ dev-ml/jbuilder"
diff --git a/dev-ml/ocaml-migrate-parsetree/ocaml-migrate-parsetree-1.0.6.ebuild b/dev-ml/ocaml-migrate-parsetree/ocaml-migrate-parsetree-1.0.6.ebuild
new file mode 100644
index 000000000000..da28219a5424
--- /dev/null
+++ b/dev-ml/ocaml-migrate-parsetree/ocaml-migrate-parsetree-1.0.6.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit findlib opam
+
+DESCRIPTION="Convert OCaml parsetrees between different major versions"
+HOMEPAGE="https://github.com/let-def/ocaml-migrate-parsetree"
+SRC_URI="https://github.com/let-def/ocaml-migrate-parsetree/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="dev-ml/result:="
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND}
+ dev-ml/jbuilder"
diff --git a/dev-ml/ocaml-migrate-parsetree/ocaml-migrate-parsetree-1.0.7.ebuild b/dev-ml/ocaml-migrate-parsetree/ocaml-migrate-parsetree-1.0.7.ebuild
new file mode 100644
index 000000000000..da28219a5424
--- /dev/null
+++ b/dev-ml/ocaml-migrate-parsetree/ocaml-migrate-parsetree-1.0.7.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit findlib opam
+
+DESCRIPTION="Convert OCaml parsetrees between different major versions"
+HOMEPAGE="https://github.com/let-def/ocaml-migrate-parsetree"
+SRC_URI="https://github.com/let-def/ocaml-migrate-parsetree/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="dev-ml/result:="
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND}
+ dev-ml/jbuilder"
diff --git a/dev-ml/ocaml-mysql-1.2.1 b/dev-ml/ocaml-mysql-1.2.1
deleted file mode 100644
index f69313287871..000000000000
--- a/dev-ml/ocaml-mysql-1.2.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=>=dev-lang/ocaml-3.10.2:=[ocamlopt?] sys-libs/zlib >=virtual/mysql-4.0 >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=A package for ocaml that provides access to mysql databases
-EAPI=5
-HOMEPAGE=http://ocaml-mysql.forge.ocamlcore.org/
-IUSE=+ocamlopt
-KEYWORDS=~amd64 ppc x86
-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 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6b3cf6579a67f8d63afa98356e26a2d8
diff --git a/dev-ml/ocaml-mysql-1.2.2 b/dev-ml/ocaml-mysql-1.2.2
deleted file mode 100644
index 4861c2ee0096..000000000000
--- a/dev-ml/ocaml-mysql-1.2.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=>=dev-lang/ocaml-3.10.2:=[ocamlopt?] sys-libs/zlib >=virtual/mysql-4.0 >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=A package for ocaml that provides access to mysql databases
-EAPI=5
-HOMEPAGE=http://ocaml-mysql.forge.ocamlcore.org/
-IUSE=+ocamlopt
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=LGPL-2
-RDEPEND=>=dev-lang/ocaml-3.10.2:=[ocamlopt?] sys-libs/zlib >=virtual/mysql-4.0
-SLOT=0/1.2.2
-SRC_URI=http://ygrek.org.ua/p/release/ocaml-mysql/ocaml-mysql-1.2.2.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=924b59cd58dbed8c26ad3c0c31a92d2b
diff --git a/dev-ml/ocaml-mysql/Manifest b/dev-ml/ocaml-mysql/Manifest
new file mode 100644
index 000000000000..2a699eff82a2
--- /dev/null
+++ b/dev-ml/ocaml-mysql/Manifest
@@ -0,0 +1,5 @@
+DIST ocaml-mysql-1.2.1.tar.gz 99250 BLAKE2B 576eb7cc7ccf9e747f207faa100adb7f10a17be2083dbd4f1fb352f8a023425eb7917d7bd4756ddafd663657375324207596e97d959f69c704fb1f5126b7d63d SHA512 bf9b4a1bfcc1a8d356a2d74ea9d8de8dd201973b9dc89c06349e814c2368871f5f6ccc2eca25b33fa5fabf4b6d19a5b4b436a1e055b90468f16f575257121e64
+DIST ocaml-mysql-1.2.2.tar.gz 99136 BLAKE2B dcc18b51514d7a9bd7bfdf97c3f410aa959cf1b2285bd6d347cd1ebdd51952f687222b16c250d8553f7b2235bff7201978bc8debe22996566412925373c3d9d7 SHA512 2af13de017b73a31c23e0536fd10679eaf5c0692741d19729b08ab58f4d2585f8f7faf0cfac1e3ccc3d3ceffcbd1740f62621ba678c50f545fc3a3a36a17742f
+EBUILD ocaml-mysql-1.2.1.ebuild 670 BLAKE2B 29f9378548b7e97f2f3195458dc2d6513c55b98e5d5f4c000ef4cabcb6d332a3673abed39cd550a9bfe0b5f449fad891b64413ebcc694ed8e9ad59830f976d00 SHA512 fdb0a2a4e5aba6379382541a7bcbbec6266945720b64f2b698eb62e566ba8461de2cc4d8a247629dd7256e7f97a6f1ce2846c8607923aaebed3fecbb1d41692e
+EBUILD ocaml-mysql-1.2.2.ebuild 676 BLAKE2B e45d2790293307cdce31965748534d0b820dd4e4a48828137ac92eb762082afbe54aaa2ddc7689f34433bad60501f4bdb2b1ca892407bdda0f327a149179d9b7 SHA512 51bd1d5048c591f4040ca00355b4af0c0c4382ff03254f03da0b47fe25bfd8ea189838038af65b124c7e552bbe6ed741f2cb117b8ca0348c58e15d2d33f71e10
+MISC metadata.xml 253 BLAKE2B c787c1044c3f674eb5d2d7a0e830965ad53c7a2c8cdfcd95bece6b0557e35237f62afe28464ebe4c88468cd1fd543627349fd41a0aa760fceed1a7d52386eda2 SHA512 9285e04d22e8e41631e6de00e0ba02842cf0e772cd17a1d7ba3864e50eeea50abb06077ea4f9ac920eab3d520bfe28d389b3d04d5c3529af23a68ca68b6857d4
diff --git a/dev-ml/ocaml-mysql/metadata.xml b/dev-ml/ocaml-mysql/metadata.xml
new file mode 100644
index 000000000000..ffa6c6b4395b
--- /dev/null
+++ b/dev-ml/ocaml-mysql/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/dev-ml/ocaml-mysql/ocaml-mysql-1.2.1.ebuild b/dev-ml/ocaml-mysql/ocaml-mysql-1.2.1.ebuild
new file mode 100644
index 000000000000..061aa0eae84e
--- /dev/null
+++ b/dev-ml/ocaml-mysql/ocaml-mysql-1.2.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit findlib eutils
+
+IUSE="+ocamlopt"
+
+DESCRIPTION="A package for ocaml that provides access to mysql databases"
+SRC_URI="http://ygrek.org.ua/p/release/ocaml-mysql/${P}.tar.gz"
+HOMEPAGE="http://ocaml-mysql.forge.ocamlcore.org/"
+
+DEPEND=">=dev-lang/ocaml-3.10.2:=[ocamlopt?]
+ sys-libs/zlib
+ >=virtual/mysql-4.0"
+
+RDEPEND="$DEPEND"
+
+SLOT="0/${PV}"
+LICENSE="LGPL-2"
+KEYWORDS="~amd64 ppc x86"
+
+src_compile()
+{
+ emake all
+ if use ocamlopt; then
+ emake opt
+ fi
+}
+
+src_install()
+{
+ findlib_src_preinst
+ emake install
+
+ dodoc CHANGES README VERSION || die
+}
diff --git a/dev-ml/ocaml-mysql/ocaml-mysql-1.2.2.ebuild b/dev-ml/ocaml-mysql/ocaml-mysql-1.2.2.ebuild
new file mode 100644
index 000000000000..a1afca457cf1
--- /dev/null
+++ b/dev-ml/ocaml-mysql/ocaml-mysql-1.2.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit findlib eutils
+
+IUSE="+ocamlopt"
+
+DESCRIPTION="A package for ocaml that provides access to mysql databases"
+SRC_URI="http://ygrek.org.ua/p/release/ocaml-mysql/${P}.tar.gz"
+HOMEPAGE="http://ocaml-mysql.forge.ocamlcore.org/"
+
+DEPEND=">=dev-lang/ocaml-3.10.2:=[ocamlopt?]
+ sys-libs/zlib
+ >=virtual/mysql-4.0"
+
+RDEPEND="$DEPEND"
+
+SLOT="0/${PV}"
+LICENSE="LGPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+src_compile()
+{
+ emake all
+ if use ocamlopt; then
+ emake -j1 opt
+ fi
+}
+
+src_install()
+{
+ findlib_src_preinst
+ emake install
+
+ dodoc CHANGES README VERSION || die
+}
diff --git a/dev-ml/ocaml-pcap-0.4.0 b/dev-ml/ocaml-pcap-0.4.0
deleted file mode 100644
index f4badcf104a9..000000000000
--- a/dev-ml/ocaml-pcap-0.4.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=test? ( dev-ml/ounit >=dev-ml/lwt-2.4.0 ) dev-ml/ocaml-ipaddr:= !dev-ml/mirage-net-socket !<dev-ml/mirage-0.9.2 >=dev-ml/ocaml-cstruct-0.6.0:=[ppx(-)] >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=Read and write pcap-formatted network packet traces.
-EAPI=5
-HOMEPAGE=https://github.com/mirage/ocaml-pcap https://mirage.io
-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?]
-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 983774947da124fb7d542ce25a218bb1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e oasis 9256ed89af74c3365ec888c00bfdfe43 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=50f00de8ffe1ade9655588898b67d8a0
diff --git a/dev-ml/ocaml-pcap/Manifest b/dev-ml/ocaml-pcap/Manifest
new file mode 100644
index 000000000000..041ed7ff0bce
--- /dev/null
+++ b/dev-ml/ocaml-pcap/Manifest
@@ -0,0 +1,3 @@
+DIST ocaml-pcap-0.4.0.tar.gz 52694 BLAKE2B f5d9777b836ea569819ef904d128a72d4782d1cbcb60c0ba98e39aa92d374a5f6355e8549108b5ca7166e3d0cb6e0297e7e93983851f10817897dda20c59156b SHA512 cbcd33d7a557f1a05e5f12013e8dbe226a81a64822689452614dffedeecf8641ce2498e9c9322f80066977ef56a4130ee016816911b6871609d11a988cfcad0e
+EBUILD ocaml-pcap-0.4.0.ebuild 758 BLAKE2B 139398e0e6a6f9fb13058ecbb0fdc551073189f1c4076475728cc4a4d3a078507818ba295f362656cfc82eac1df54d8600d51e30b5cb088bc34afbc49d224611 SHA512 0636a09eca0a81787029ca47992e4ec036d70993a21032cf9480c053b51def1a5e17e9e0f6223c1632b52de4d86b4c935abfe3d1fbef1b0fb002cb91f4ed74cb
+MISC metadata.xml 357 BLAKE2B e13c42876839bc84581c39db1f0bf491d7c93ffa1d602782a10bc1d7d6d73ddaea546a2f8902377c598bbee6bd02e747f744654f4919519c5e690d03406444a6 SHA512 097085d891d7942c3f10f0c6815f7d257f9d969ffacdd7667214df8f1bc7faceb246f97c59e88713f098c41ac822e44d3af2ddb0b7eb9b01df5f460d35cc4d99
diff --git a/dev-ml/ocaml-pcap/metadata.xml b/dev-ml/ocaml-pcap/metadata.xml
new file mode 100644
index 000000000000..02d28ef415aa
--- /dev/null
+++ b/dev-ml/ocaml-pcap/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">mirage/ocaml-pcap</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/ocaml-pcap/ocaml-pcap-0.4.0.ebuild b/dev-ml/ocaml-pcap/ocaml-pcap-0.4.0.ebuild
new file mode 100644
index 000000000000..01eb83b0bfc0
--- /dev/null
+++ b/dev-ml/ocaml-pcap/ocaml-pcap-0.4.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+OASIS_BUILD_DOCS=1
+OASIS_BUILD_TESTS=1
+
+inherit oasis
+
+DESCRIPTION="Read and write pcap-formatted network packet traces."
+HOMEPAGE="https://github.com/mirage/ocaml-pcap https://mirage.io"
+SRC_URI="https://github.com/mirage/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+# Blockers taken from opam file and only relevant
+# if MirageOS should enter portage.
+RDEPEND="
+ dev-ml/ocaml-ipaddr:=
+ !dev-ml/mirage-net-socket
+ !<dev-ml/mirage-0.9.2
+ >=dev-ml/ocaml-cstruct-0.6.0:=[ppx(-)]
+"
+DEPEND="
+ test? ( dev-ml/ounit
+ >=dev-ml/lwt-2.4.0 )
+ ${RDEPEND}
+"
+
+DOCS=( CHANGES MAINTAINERS README.md )
diff --git a/dev-ml/ocaml-re-1.7.1 b/dev-ml/ocaml-re-1.7.1
deleted file mode 100644
index 25adb8dae798..000000000000
--- a/dev-ml/ocaml-re-1.7.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-lang/ocaml-4.02:= test? ( dev-ml/ounit ) >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=Regular expression library for OCaml
-EAPI=5
-HOMEPAGE=https://github.com/ocaml/ocaml-re
-IUSE=test +ocamlopt debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
-LICENSE=LGPL-2-with-linking-exception
-RDEPEND=>=dev-lang/ocaml-4.02:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
-SLOT=0/1.7.1
-SRC_URI=https://github.com/ocaml/ocaml-re/archive/1.7.1.tar.gz -> ocaml-re-1.7.1.tar.gz
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e oasis 9256ed89af74c3365ec888c00bfdfe43 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3ac6ddcaf5838eaa7219126af17b7423
diff --git a/dev-ml/ocaml-re/Manifest b/dev-ml/ocaml-re/Manifest
new file mode 100644
index 000000000000..70ade7274a37
--- /dev/null
+++ b/dev-ml/ocaml-re/Manifest
@@ -0,0 +1,3 @@
+DIST ocaml-re-1.7.1.tar.gz 132948 BLAKE2B 79a3114cb6221742e7e26187080a7029c8e17f728066ce4f4420c0b69be6377bb651f143a97f55f7976074ce9e48913489a51c586f9c79ed6adbcb6c9a595924 SHA512 0df5b0db4c8ab7017576516adbd8edf2e7774afbdca63383cbdb0f2f2b023efb7215366a6679c8810f3b70d542e0181e6b6d4a212b30531cb5d0bef0a6033747
+EBUILD ocaml-re-1.7.1.ebuild 576 BLAKE2B 0e74cb7fdd3cc5bec7d3023e5867e4386a333fd1b3497262bc86cc8ea6399d40912391dd2f380957adf43d4321351c644663e8812d750b83dc640ad0cfa82748 SHA512 dd6a545ae2248d505f228fb65ae991aac2bb27b189fe30482807eb7246a839c9385e0fcd4b6682d6e5c72ca77ba499ed77169f11240fd9325413333c5a4f120a
+MISC metadata.xml 336 BLAKE2B 1fb6ac83de1c59502f81d6d5cbae8c58219febadfe06858b265cba7c71c1ee11f62c72c552994fc8cb5c0cac1eb75d8d35edbfcd4a9f866143c55778a279d3b2 SHA512 fda73130580115b8758991ed0dfe16e58b06ee1a3bfa442c7287d23fb8fb9f19b672a06b30ec3e52825790c8d23bbf6cda6fbb62aaf7d569305ed09dbb247a0b
diff --git a/dev-ml/ocaml-re/metadata.xml b/dev-ml/ocaml-re/metadata.xml
new file mode 100644
index 000000000000..abe6645e39bb
--- /dev/null
+++ b/dev-ml/ocaml-re/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">ocaml/ocaml-re</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/ocaml-re/ocaml-re-1.7.1.ebuild b/dev-ml/ocaml-re/ocaml-re-1.7.1.ebuild
new file mode 100644
index 000000000000..c8cec900da50
--- /dev/null
+++ b/dev-ml/ocaml-re/ocaml-re-1.7.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+OASIS_BUILD_DOCS=1
+OASIS_BUILD_TESTS=1
+
+inherit oasis
+
+DESCRIPTION="Regular expression library for OCaml"
+HOMEPAGE="https://github.com/ocaml/ocaml-re"
+SRC_URI="https://github.com/ocaml/ocaml-re/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE="test"
+
+RDEPEND=">=dev-lang/ocaml-4.02:="
+DEPEND="${RDEPEND}
+ test? ( dev-ml/ounit )"
+DOCS=( "CHANGES" "TODO.txt" "README.md" )
diff --git a/dev-ml/ocaml-redis-0.3.5 b/dev-ml/ocaml-redis-0.3.5
deleted file mode 100644
index 14cacbee5a87..000000000000
--- a/dev-ml/ocaml-redis-0.3.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=dev-lang/ocaml:= dev-ml/ocaml-re:= dev-ml/uuidm:= dev-ml/jbuilder test? ( dev-ml/ounit dev-db/redis dev-ml/lwt ) >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=Redis bindings for OCaml
-EAPI=5
-HOMEPAGE=http://0xffea.github.io/ocaml-redis/ https://github.com/0xffea/ocaml-redis/
-IUSE=test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-lang/ocaml:= dev-ml/ocaml-re:= dev-ml/uuidm:= >=dev-lang/ocaml-4:=
-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 24b4a2529c1fd12f1304856d6c5a690d
-_md5_=fd19c9c0ee42fcba57e67e66138e4c62
diff --git a/dev-ml/ocaml-redis-lwt-0.3.5 b/dev-ml/ocaml-redis-lwt-0.3.5
deleted file mode 100644
index d745a0541f57..000000000000
--- a/dev-ml/ocaml-redis-lwt-0.3.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=dev-lang/ocaml:= dev-ml/ocaml-redis:= dev-ml/lwt:= dev-ml/jbuilder dev-ml/opam test? ( dev-ml/ounit ) >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Redis bindings for OCaml via Lwt
-EAPI=5
-HOMEPAGE=http://0xffea.github.io/ocaml-redis/ https://github.com/0xffea/ocaml-redis/
-IUSE=test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-lang/ocaml:= dev-ml/ocaml-redis:= dev-ml/lwt:=
-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
diff --git a/dev-ml/ocaml-redis-lwt/Manifest b/dev-ml/ocaml-redis-lwt/Manifest
new file mode 100644
index 000000000000..3be46597672b
--- /dev/null
+++ b/dev-ml/ocaml-redis-lwt/Manifest
@@ -0,0 +1,3 @@
+DIST ocaml-redis-0.3.5.tar.gz 31217 BLAKE2B 25b83a77526e430dc3df02e3646f838240b7e43de4990f04d699f813e5ecc5a5f5bb66e643759cf9f3dd4d3a041eebeeac74d72f1fe1e4fd61b78b5ddb7160bc SHA512 dfd2779635fddc73ab76cd66943267c3de984edeb471728f8d6d9506cd37e9cf4b1875519c7547b90de80fd876abc7fbe6a4c9c0674fcb6a00bbe91afa6c625d
+EBUILD ocaml-redis-lwt-0.3.5.ebuild 863 BLAKE2B 1382665760c245afd45297b2770b3c44a135f4a20963995d713d7cf72276a94a09aabf504ca09b688b8ba584bb1c643535d1869f3bbdd2c3128037d368471af0 SHA512 457d0e1a5b3d8dde714b4f1090ab23126f79e6cd198a7e97cef5f116b234d5ccc9b6f9bcd03990cfb5ebc99ab32f319c3c8aa0810378bd3b786a6cf636943015
+MISC metadata.xml 330 BLAKE2B 27699d6a017169526bb65a4bc31af2a74c17d8e2bc1743e2dd6583c7f4554ae1297cbe3d651fb3d3e1d74908b43aad82fe5c7118f6f4f0666f468ba91daba85c SHA512 1194d161c4b83600e6035335c45fa912a6745700e16d36f336cf7e79d33b413b145ff7ae4b561d7e13ff35cae38004102d9bcfdbf0ae37ef24da16135c75d9d8
diff --git a/dev-ml/ocaml-redis-lwt/metadata.xml b/dev-ml/ocaml-redis-lwt/metadata.xml
new file mode 100644
index 000000000000..20d1ed52023f
--- /dev/null
+++ b/dev-ml/ocaml-redis-lwt/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">0xffea/ocaml-redis</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/ocaml-redis-lwt/ocaml-redis-lwt-0.3.5.ebuild b/dev-ml/ocaml-redis-lwt/ocaml-redis-lwt-0.3.5.ebuild
new file mode 100644
index 000000000000..a5e2d5969dd5
--- /dev/null
+++ b/dev-ml/ocaml-redis-lwt/ocaml-redis-lwt-0.3.5.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit findlib
+
+DESCRIPTION="Redis bindings for OCaml via Lwt"
+HOMEPAGE="http://0xffea.github.io/ocaml-redis/ https://github.com/0xffea/ocaml-redis/"
+SRC_URI="https://github.com/0xffea/ocaml-redis/archive/${PV}.tar.gz -> ocaml-redis-${PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND="
+ dev-lang/ocaml:=
+ dev-ml/ocaml-redis:=
+ dev-ml/lwt:=
+"
+DEPEND="${RDEPEND}
+ dev-ml/jbuilder
+ dev-ml/opam
+ test? ( dev-ml/ounit )"
+
+S=${WORKDIR}/ocaml-redis-${PV}
+
+src_compile() {
+ jbuilder build -p redis-lwt || die
+}
+
+src_test() {
+ jbuilder runtest || die
+}
+
+src_install() {
+ opam-installer -i \
+ --prefix="${ED}/usr" \
+ --libdir="${D}/$(ocamlc -where)" \
+ --docdir="${ED}/usr/share/doc/${PF}" \
+ redis-lwt.install || die
+}
diff --git a/dev-ml/ocaml-redis-sync-0.3.5 b/dev-ml/ocaml-redis-sync-0.3.5
deleted file mode 100644
index 10922d3660eb..000000000000
--- a/dev-ml/ocaml-redis-sync-0.3.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=dev-lang/ocaml:= dev-ml/ocaml-redis:= dev-ml/jbuilder dev-ml/opam test? ( dev-ml/ounit ) >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Synchronous redis bindings for OCaml
-EAPI=5
-HOMEPAGE=http://0xffea.github.io/ocaml-redis/ https://github.com/0xffea/ocaml-redis/
-IUSE=test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-lang/ocaml:= dev-ml/ocaml-redis:=
-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
diff --git a/dev-ml/ocaml-redis-sync/Manifest b/dev-ml/ocaml-redis-sync/Manifest
new file mode 100644
index 000000000000..b3820dc46ef5
--- /dev/null
+++ b/dev-ml/ocaml-redis-sync/Manifest
@@ -0,0 +1,3 @@
+DIST ocaml-redis-0.3.5.tar.gz 31217 BLAKE2B 25b83a77526e430dc3df02e3646f838240b7e43de4990f04d699f813e5ecc5a5f5bb66e643759cf9f3dd4d3a041eebeeac74d72f1fe1e4fd61b78b5ddb7160bc SHA512 dfd2779635fddc73ab76cd66943267c3de984edeb471728f8d6d9506cd37e9cf4b1875519c7547b90de80fd876abc7fbe6a4c9c0674fcb6a00bbe91afa6c625d
+EBUILD ocaml-redis-sync-0.3.5.ebuild 855 BLAKE2B 00c6c76fdc5210e07159f63bb926da874c1a7fc79210672c99553861203e7c7b72a0a2a9d73240fab312600abefbf075adac0848b018fef78deeee66aec63429 SHA512 5c46b2d0fb8dd72022809d1c3885fedaa956d708d75782da9d7fcb3fc7522529c9ec5cd21ddb751e95d676f9386f57d57bd4742e51c1cb8693e83c5c335d5dd8
+MISC metadata.xml 330 BLAKE2B 27699d6a017169526bb65a4bc31af2a74c17d8e2bc1743e2dd6583c7f4554ae1297cbe3d651fb3d3e1d74908b43aad82fe5c7118f6f4f0666f468ba91daba85c SHA512 1194d161c4b83600e6035335c45fa912a6745700e16d36f336cf7e79d33b413b145ff7ae4b561d7e13ff35cae38004102d9bcfdbf0ae37ef24da16135c75d9d8
diff --git a/dev-ml/ocaml-redis-sync/metadata.xml b/dev-ml/ocaml-redis-sync/metadata.xml
new file mode 100644
index 000000000000..20d1ed52023f
--- /dev/null
+++ b/dev-ml/ocaml-redis-sync/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">0xffea/ocaml-redis</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/ocaml-redis-sync/ocaml-redis-sync-0.3.5.ebuild b/dev-ml/ocaml-redis-sync/ocaml-redis-sync-0.3.5.ebuild
new file mode 100644
index 000000000000..54105358e9cd
--- /dev/null
+++ b/dev-ml/ocaml-redis-sync/ocaml-redis-sync-0.3.5.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit findlib
+
+DESCRIPTION="Synchronous redis bindings for OCaml"
+HOMEPAGE="http://0xffea.github.io/ocaml-redis/ https://github.com/0xffea/ocaml-redis/"
+SRC_URI="https://github.com/0xffea/ocaml-redis/archive/${PV}.tar.gz -> ocaml-redis-${PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND="
+ dev-lang/ocaml:=
+ dev-ml/ocaml-redis:=
+"
+DEPEND="${RDEPEND}
+ dev-ml/jbuilder
+ dev-ml/opam
+ test? ( dev-ml/ounit )"
+
+S=${WORKDIR}/ocaml-redis-${PV}
+
+src_compile() {
+ jbuilder build -p redis-sync || die
+}
+
+src_test() {
+ jbuilder runtest || die
+}
+
+src_install() {
+ opam-installer -i \
+ --prefix="${ED}/usr" \
+ --libdir="${D}/$(ocamlc -where)" \
+ --docdir="${ED}/usr/share/doc/${PF}" \
+ redis-sync.install || die
+}
diff --git a/dev-ml/ocaml-redis/Manifest b/dev-ml/ocaml-redis/Manifest
new file mode 100644
index 000000000000..2b49b8815f59
--- /dev/null
+++ b/dev-ml/ocaml-redis/Manifest
@@ -0,0 +1,3 @@
+DIST ocaml-redis-0.3.5.tar.gz 31217 BLAKE2B 25b83a77526e430dc3df02e3646f838240b7e43de4990f04d699f813e5ecc5a5f5bb66e643759cf9f3dd4d3a041eebeeac74d72f1fe1e4fd61b78b5ddb7160bc SHA512 dfd2779635fddc73ab76cd66943267c3de984edeb471728f8d6d9506cd37e9cf4b1875519c7547b90de80fd876abc7fbe6a4c9c0674fcb6a00bbe91afa6c625d
+EBUILD ocaml-redis-0.3.5.ebuild 890 BLAKE2B 84899b7e85a9326c41f4d2780f554fe6f5255a1afbd4c1dc2b60c30251638d479a8cf62a7f87ce672780cb759d294ba9562e5fbe2e9be37cd2290b9441a7af1a SHA512 6f66cf7a0fb611cdeaa3fb5fde046feb43139d686aa5e2d73b645063ca9a4055b2cf349229975d3a8f0794700d18e0b76429e98d0002d17be4beb4d9fdd18658
+MISC metadata.xml 330 BLAKE2B 27699d6a017169526bb65a4bc31af2a74c17d8e2bc1743e2dd6583c7f4554ae1297cbe3d651fb3d3e1d74908b43aad82fe5c7118f6f4f0666f468ba91daba85c SHA512 1194d161c4b83600e6035335c45fa912a6745700e16d36f336cf7e79d33b413b145ff7ae4b561d7e13ff35cae38004102d9bcfdbf0ae37ef24da16135c75d9d8
diff --git a/dev-ml/ocaml-redis/metadata.xml b/dev-ml/ocaml-redis/metadata.xml
new file mode 100644
index 000000000000..20d1ed52023f
--- /dev/null
+++ b/dev-ml/ocaml-redis/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">0xffea/ocaml-redis</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/ocaml-redis/ocaml-redis-0.3.5.ebuild b/dev-ml/ocaml-redis/ocaml-redis-0.3.5.ebuild
new file mode 100644
index 000000000000..97c63e8a8de4
--- /dev/null
+++ b/dev-ml/ocaml-redis/ocaml-redis-0.3.5.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit findlib opam
+
+DESCRIPTION="Redis bindings for OCaml"
+HOMEPAGE="http://0xffea.github.io/ocaml-redis/ https://github.com/0xffea/ocaml-redis/"
+SRC_URI="https://github.com/0xffea/ocaml-redis/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND="
+ dev-lang/ocaml:=
+ dev-ml/ocaml-re:=
+ dev-ml/uuidm:=
+"
+DEPEND="${RDEPEND}
+ dev-ml/jbuilder
+ test? ( dev-ml/ounit dev-db/redis dev-ml/lwt )"
+
+src_compile() {
+ jbuilder build -p redis || die
+}
+
+src_test() {
+ einfo "Starting test redis server"
+ local port=4567
+ /usr/sbin/redis-server --port ${port} &
+ local rpid=$!
+ export OCAML_REDIS_TEST_PORT=${port}
+ sleep 1
+ jbuilder runtest || { kill ${rpid}; die; }
+ kill ${rpid} || die
+}
+
+src_install() {
+ opam_src_install redis
+}
diff --git a/dev-ml/ocaml-safepass-2.0 b/dev-ml/ocaml-safepass-2.0
deleted file mode 100644
index 8267d2cbe748..000000000000
--- a/dev-ml/ocaml-safepass-2.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=A library offering facilities for the safe storage of user passwords
-EAPI=5
-HOMEPAGE=http://ocaml-safepass.forge.ocamlcore.org/ https://github.com/darioteixeira/ocaml-safepass
-IUSE=+ocamlopt debug doc
-KEYWORDS=~amd64
-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 983774947da124fb7d542ce25a218bb1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e oasis 9256ed89af74c3365ec888c00bfdfe43 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=68477a1419ea69047341351177e60324
diff --git a/dev-ml/ocaml-safepass/Manifest b/dev-ml/ocaml-safepass/Manifest
new file mode 100644
index 000000000000..7e1f55e4cb48
--- /dev/null
+++ b/dev-ml/ocaml-safepass/Manifest
@@ -0,0 +1,3 @@
+DIST ocaml-safepass-2.0.tar.gz 72314 BLAKE2B 63ad0b61b287bc65f61da93a01f9742842c869f63dbe964c593194d2a9d71565a67f75c6763ef6e3b1786ebaa17c41b3a6ca943ef6c99359f16d927855611120 SHA512 a5475b9e1f7233393fc255ae52c44d4f4373fcddf99764bb17dafb86dfbd3b3c5fa01f74254e10fe9a9889e3e5d2ee8d190ed728aad0ed5f0fdfb71856c5754d
+EBUILD ocaml-safepass-2.0.ebuild 577 BLAKE2B b93a9a109bc3f8e2971c148e7c9626cf161bcf9acf8600d16ff55149038dfd981ef51436f935a6280de61a59efc4e22d4e062c039409d8c69dc59028ce45c7a8 SHA512 43257b8e7359322fa7b9481cd0a169126b43ce7e42970822247ff1e6fd17e02909ae5ef01f1acd6581d176b302fb1b360199e012101b9c08a31830919c490955
+MISC metadata.xml 340 BLAKE2B 703cb71c60b862056477dc5e51e31d44f65548a036e2677717b3214b83c1279c125cf2155d3ec4d765f8213132c1309a46736ba53af34f45877b50b71ae7dae6 SHA512 7501b2a1a67717e1e9fc56fe235c99e292c0f80b227353ae81564e2db08e6058242fdbe845680aa3f9c39bd7aca25d4b4d1bc2b1adb785874614e32e87e3d828
diff --git a/dev-ml/ocaml-safepass/metadata.xml b/dev-ml/ocaml-safepass/metadata.xml
new file mode 100644
index 000000000000..230b5f6b744e
--- /dev/null
+++ b/dev-ml/ocaml-safepass/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">darioteixeira/ocaml-safepass</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/ocaml-safepass/ocaml-safepass-2.0.ebuild b/dev-ml/ocaml-safepass/ocaml-safepass-2.0.ebuild
new file mode 100644
index 000000000000..e1b02155d572
--- /dev/null
+++ b/dev-ml/ocaml-safepass/ocaml-safepass-2.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+OASIS_BUILD_DOCS=1
+
+inherit oasis
+
+DESCRIPTION="A library offering facilities for the safe storage of user passwords"
+HOMEPAGE="http://ocaml-safepass.forge.ocamlcore.org/ https://github.com/darioteixeira/ocaml-safepass"
+SRC_URI="https://github.com/darioteixeira/ocaml-safepass/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+DOCS=( "README" "CHANGELOG" )
diff --git a/dev-ml/ocaml-sha-1.9 b/dev-ml/ocaml-sha-1.9
deleted file mode 100644
index dd3823f4c087..000000000000
--- a/dev-ml/ocaml-sha-1.9
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt] >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=A binding for SHA interface code in OCaml
-EAPI=5
-HOMEPAGE=https://github.com/vincenthz/ocaml-sha
-KEYWORDS=~amd64
-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 3be1ab44131e8c0bbdaa75823008444b
-_md5_=88f377e5a329869a11ab99c4493a3161
diff --git a/dev-ml/ocaml-sha/Manifest b/dev-ml/ocaml-sha/Manifest
new file mode 100644
index 000000000000..fb0cdd42c139
--- /dev/null
+++ b/dev-ml/ocaml-sha/Manifest
@@ -0,0 +1,3 @@
+DIST ocaml-sha-v1.9.tar.gz 12872 BLAKE2B 382431814ef1fd4b88e69ff727fade617a7a6e2757a70e7538e2fc5b2708572a731b6800e9c36b7ddcb1c6103b57a1ccd14c5bc6886e83f56ebc388de9f67c90 SHA512 e49f725f0544a423c57199b2534519a005916f24a17bf7761e744ec963c5712b8b0b82b052d87c55fdfd3143f194f44283c7332ab08f480328c0c21642ae5778
+EBUILD ocaml-sha-1.9.ebuild 589 BLAKE2B 2f1416778a27394908a0f964c4533e7c3d18cb18da1a4774f91d62c0003b233e8795b0d506c160a3b4dec169d5fbc022e65dec7a3e74f1f874e6b88261c9f743 SHA512 d638d64f7ba75a12dc0106d14f68257afaa422ff5721a7a905612d7c00e8c6520fb877f34afb13e499afed6659f69b03412c1e2df6e1cfde5fdfa9d27ab19100
+MISC metadata.xml 341 BLAKE2B 18b973592d9c3d2d911ef36f206339eea91bc7b39da886ee5d1c59ad733c20c63bf13260741daf378257a458f44bd001283e676b843913b1539a91045c8f4381 SHA512 0944b63ad7a82f331296d7ae17f705de27793719a5ae023f84ec046c062d1b1de0f8910131b2b86e7f50190349e4788c149c46c85dd31ac3928964830d968aab
diff --git a/dev-ml/ocaml-sha/metadata.xml b/dev-ml/ocaml-sha/metadata.xml
new file mode 100644
index 000000000000..3499afc663c2
--- /dev/null
+++ b/dev-ml/ocaml-sha/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">vincenthz/ocaml-sha</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/ocaml-sha/ocaml-sha-1.9.ebuild b/dev-ml/ocaml-sha/ocaml-sha-1.9.ebuild
new file mode 100644
index 000000000000..d8d3f5e48761
--- /dev/null
+++ b/dev-ml/ocaml-sha/ocaml-sha-1.9.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit findlib vcs-snapshot
+
+DESCRIPTION="A binding for SHA interface code in OCaml"
+HOMEPAGE="https://github.com/vincenthz/ocaml-sha"
+SRC_URI="https://github.com/vincenthz/ocaml-sha/archive/${PN}-v${PV}.tar.gz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=">=dev-lang/ocaml-3.12:=[ocamlopt]"
+RDEPEND="${DEPEND}"
+S="${WORKDIR}/${PN}-v${PV}"
+
+src_compile() {
+ emake -j1
+}
+
+src_install() {
+ findlib_src_install
+ dodoc README
+}
diff --git a/dev-ml/ocaml-snappy-0.1.0 b/dev-ml/ocaml-snappy-0.1.0
deleted file mode 100644
index 8d2bd6b0c4d6..000000000000
--- a/dev-ml/ocaml-snappy-0.1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=app-arch/snappy:= >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=OCaml bindings to snappy fast compression/decompression library
-EAPI=5
-HOMEPAGE=http://ygrek.org.ua/p/ocaml-snappy/
-IUSE=+ocamlopt debug doc
-KEYWORDS=~amd64
-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 983774947da124fb7d542ce25a218bb1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e oasis 9256ed89af74c3365ec888c00bfdfe43 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=919116bde15639822f81fd31255bdb7c
diff --git a/dev-ml/ocaml-snappy/Manifest b/dev-ml/ocaml-snappy/Manifest
new file mode 100644
index 000000000000..a5f8c74ed833
--- /dev/null
+++ b/dev-ml/ocaml-snappy/Manifest
@@ -0,0 +1,3 @@
+DIST ocaml-snappy-0.1.0.tar.gz 41907 BLAKE2B 875b600ebcbaf1484282ccceda7193a5cb2d28fcdd783fd888a920dbccd53ee2ebce1e54ffb78a44f9844f0941f17d80525c227c15a4ca55c956830603b82c79 SHA512 2ff3db23eee90e3d9e61ab6a77e5d6c174486d5e54a8bb1206e63299929da6a3fad4a89ffdfaf5c6f8b97c33a7cbc00bd3c34d39dc0f7e8fbd0dc2b84fd9f3c2
+EBUILD ocaml-snappy-0.1.0.ebuild 465 BLAKE2B 9c8161d044f7910059d36a9a637c651f83da87f34ac6f514a886b0a85fdd80075b4842c32616dac457fe751737c3fac9aee574bc32c96c342f0325e006b24e8b SHA512 827a7838f9d4c79383a155160b280954456e3821e198fc8963f7ab22b517c0da7663249b610fb9307e3c6fcfc7a90f5d8b41ace26de47b0459652ae94feab33f
+MISC metadata.xml 330 BLAKE2B baf92d3e9f23111129099eac6d133a37541055bf74e65a96cf6506edc5d5c4217615ee42a229896959aa1b59fa72cb7175b0f203da3def90cccbc2bc2016c855 SHA512 839c3cd55375005786c53834dc1e1c1ca8e778a8cf6db6b728915f7ca0016c73dbe380a35a0681777cf9ea3a1cdab752bed87057f35948ba097b8dd7defcfd19
diff --git a/dev-ml/ocaml-snappy/metadata.xml b/dev-ml/ocaml-snappy/metadata.xml
new file mode 100644
index 000000000000..ed271f5f83cf
--- /dev/null
+++ b/dev-ml/ocaml-snappy/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">ygrek/ocaml-snappy</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/ocaml-snappy/ocaml-snappy-0.1.0.ebuild b/dev-ml/ocaml-snappy/ocaml-snappy-0.1.0.ebuild
new file mode 100644
index 000000000000..65defc38b16d
--- /dev/null
+++ b/dev-ml/ocaml-snappy/ocaml-snappy-0.1.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+OASIS_BUILD_DOCS=1
+
+inherit oasis
+
+DESCRIPTION="OCaml bindings to snappy fast compression/decompression library"
+HOMEPAGE="http://ygrek.org.ua/p/ocaml-snappy/"
+SRC_URI="https://github.com/ygrek/ocaml-snappy/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="app-arch/snappy:="
+RDEPEND="${DEPEND}"
diff --git a/dev-ml/ocaml-sqlite3-4.1.2 b/dev-ml/ocaml-sqlite3-4.1.2
deleted file mode 100644
index a87145e4895f..000000000000
--- a/dev-ml/ocaml-sqlite3-4.1.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-db/sqlite-3.3.3 >=dev-ml/findlib-1.3.2 >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=A package for ocaml that provides access to SQLite databases
-EAPI=5
-HOMEPAGE=http://mmottl.github.io/sqlite3-ocaml/
-IUSE=+ocamlopt debug doc test
-KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
-LICENSE=MIT
-RDEPEND=>=dev-db/sqlite-3.3.3 >=dev-ml/findlib-1.3.2 >=dev-lang/ocaml-3.12:=[ocamlopt?]
-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 983774947da124fb7d542ce25a218bb1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e oasis 9256ed89af74c3365ec888c00bfdfe43 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=86de93defdd841505256b8a29e4102ec
diff --git a/dev-ml/ocaml-sqlite3-4.1.3 b/dev-ml/ocaml-sqlite3-4.1.3
deleted file mode 100644
index a06ea065c418..000000000000
--- a/dev-ml/ocaml-sqlite3-4.1.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-db/sqlite-3.3.3 >=dev-ml/findlib-1.3.2 >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=A package for ocaml that provides access to SQLite databases
-EAPI=5
-HOMEPAGE=http://mmottl.github.io/sqlite3-ocaml/
-IUSE=+ocamlopt debug doc test
-KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
-LICENSE=MIT
-RDEPEND=>=dev-db/sqlite-3.3.3 >=dev-ml/findlib-1.3.2 >=dev-lang/ocaml-3.12:=[ocamlopt?]
-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 983774947da124fb7d542ce25a218bb1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e oasis 9256ed89af74c3365ec888c00bfdfe43 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=86de93defdd841505256b8a29e4102ec
diff --git a/dev-ml/ocaml-sqlite3-4.2.0 b/dev-ml/ocaml-sqlite3-4.2.0
deleted file mode 100644
index 948c122cec3f..000000000000
--- a/dev-ml/ocaml-sqlite3-4.2.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=>=dev-db/sqlite-3.3.3 dev-ml/jbuilder dev-ml/base dev-ml/stdio dev-ml/configurator >=dev-ml/findlib-1.3.2 >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=A package for ocaml that provides access to SQLite databases
-EAPI=5
-HOMEPAGE=http://mmottl.github.io/sqlite3-ocaml/
-KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
-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 24b4a2529c1fd12f1304856d6c5a690d
-_md5_=450d9c798a78265f250486f3434cfcd2
diff --git a/dev-ml/ocaml-sqlite3-4.3.0 b/dev-ml/ocaml-sqlite3-4.3.0
deleted file mode 100644
index 8589ccbc9827..000000000000
--- a/dev-ml/ocaml-sqlite3-4.3.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=>=dev-db/sqlite-3.3.3 dev-ml/jbuilder dev-ml/base dev-ml/stdio dev-ml/configurator >=dev-ml/findlib-1.3.2 >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=A package for ocaml that provides access to SQLite databases
-EAPI=5
-HOMEPAGE=http://mmottl.github.io/sqlite3-ocaml/
-KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
-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 24b4a2529c1fd12f1304856d6c5a690d
-_md5_=450d9c798a78265f250486f3434cfcd2
diff --git a/dev-ml/ocaml-sqlite3/Manifest b/dev-ml/ocaml-sqlite3/Manifest
new file mode 100644
index 000000000000..05c88814072b
--- /dev/null
+++ b/dev-ml/ocaml-sqlite3/Manifest
@@ -0,0 +1,9 @@
+DIST sqlite3-4.2.0.tbz 22167 BLAKE2B b5f874f592fb7873060d3f33b82ea9282fe0a04aab8683f5355a96b0a7a78e19daefc6d3f72b9e796dcc718347f8b13bc210eb4a61622cf12460b263bf088c86 SHA512 3221ba03eae64c59c3ffa57271585a1fe76848504d56edf33e953fad270929ba300b5828788f6cbb3f145acf743ad51bc019d151ac68472f6dbf7ab43263ae86
+DIST sqlite3-4.3.0.tbz 22498 BLAKE2B c57d8edbc0897229cb415d48efb02ae41dff1d87fabc667a40b984807c5c5885201dca3d7f523872435b7e18b450c15707212eeeafc0a75f1ad28d7e7671b4c7 SHA512 f09d425830ac24ea835a403bc51d257c265b6e77b1dce01367c715545cbd98f3ad2694e6dfdbc7491d590aa809c0313329e81c9614228170f90197f2a94200c9
+DIST sqlite3-ocaml-4.1.2.tar.gz 76879 BLAKE2B be02c4df79f78b69e859fc465242e3e513d0b557364614e4fe73f78b6020e77fd971f274e45e4d2b79c99ea6e110358dc23ab2f79183915e242244b9ff6a6de8 SHA512 880f82fa9eba06114695bda56305245d2d9062f8136db85675463e97fbb8aee210df310d8d65d78e9eb1f882421581a97c4b7f20a790881f699b4d494be066f5
+DIST sqlite3-ocaml-4.1.3.tar.gz 76989 BLAKE2B d5f5e5c91faaf7308c47431d2f5292952e5c6ddf8854897aa2d54946b312bd3321f4ec6ecca7455778707b082e7af676ac50ab5b16686176623058c082973cc6 SHA512 59865b4c5d99d319ee6f5e1ecb8d71b4c07bd7f77876fafb73d3c882dbf434b67313f4caf7762f2194dc819f75af9582dd4df002f0f68cb8690996b857c08a1b
+EBUILD ocaml-sqlite3-4.1.2.ebuild 664 BLAKE2B 0fecb384ef075f5868f85fb7ea50e2bd3533554814da3b83a10a00b72f766eb6305cc8120dc9f5ebe77c9827c6ee2889635f9ec53a7b42c32062c4a8affe6c86 SHA512 d3377afb7d2618a520f3108c4d80a67f565fb2a6748392ba3ee25b01271c1d67f91dab63196aed97dc12026531b69c10d714b5882bff06480d761c847da88a7e
+EBUILD ocaml-sqlite3-4.1.3.ebuild 664 BLAKE2B 0fecb384ef075f5868f85fb7ea50e2bd3533554814da3b83a10a00b72f766eb6305cc8120dc9f5ebe77c9827c6ee2889635f9ec53a7b42c32062c4a8affe6c86 SHA512 d3377afb7d2618a520f3108c4d80a67f565fb2a6748392ba3ee25b01271c1d67f91dab63196aed97dc12026531b69c10d714b5882bff06480d761c847da88a7e
+EBUILD ocaml-sqlite3-4.2.0.ebuild 719 BLAKE2B 32b03d9381ac55d89fb8049ef35626206c5b2179936fc55bf51a20d57d13236401844055932b4cdebd0ccb8c2bb2681fa908fbcb5b51f5b1d80aa52a47721591 SHA512 2da2e5c41a95b4e556cc94b209dd11ad9a8e0669fb83de041281abc48b01fdd29af0d6e919b9002e5308259819f3d4dab72903560257a15516a7d99a53ba888a
+EBUILD ocaml-sqlite3-4.3.0.ebuild 719 BLAKE2B 32b03d9381ac55d89fb8049ef35626206c5b2179936fc55bf51a20d57d13236401844055932b4cdebd0ccb8c2bb2681fa908fbcb5b51f5b1d80aa52a47721591 SHA512 2da2e5c41a95b4e556cc94b209dd11ad9a8e0669fb83de041281abc48b01fdd29af0d6e919b9002e5308259819f3d4dab72903560257a15516a7d99a53ba888a
+MISC metadata.xml 407 BLAKE2B 6babd01c3c9382ec5c49be3d2eef86537509fa3c7be168c0be67bfa418964edbf1afea23bb83ce4f761b7abf9097fe913cb161195330c1887ff7fd8ea8ae3e9c SHA512 d25e7f93b44c178b2035f4ab292cd9d2dbddc904b57ac9a02be971e7bf057e0ee070e9a7baa88f36bc32c404e8e64a7b2e87b6c66b2ca2d070ef9ec4b122d2a0
diff --git a/dev-ml/ocaml-sqlite3/metadata.xml b/dev-ml/ocaml-sqlite3/metadata.xml
new file mode 100644
index 000000000000..b46941e6674e
--- /dev/null
+++ b/dev-ml/ocaml-sqlite3/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">mmottl/sqlite3-ocaml</remote-id>
+ <remote-id type="bitbucket">mmottl/sqlite3-ocaml</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/ocaml-sqlite3/ocaml-sqlite3-4.1.2.ebuild b/dev-ml/ocaml-sqlite3/ocaml-sqlite3-4.1.2.ebuild
new file mode 100644
index 000000000000..87a48cacf8ba
--- /dev/null
+++ b/dev-ml/ocaml-sqlite3/ocaml-sqlite3-4.1.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+OASIS_BUILD_TESTS=1
+OASIS_BUILD_DOCS=1
+
+inherit oasis
+
+MY_PN="sqlite3-ocaml"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A package for ocaml that provides access to SQLite databases"
+HOMEPAGE="http://mmottl.github.io/sqlite3-ocaml/"
+SRC_URI="https://github.com/mmottl/sqlite3-ocaml/releases/download/v${PV}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=">=dev-db/sqlite-3.3.3
+ >=dev-ml/findlib-1.3.2"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+DOCS=( "AUTHORS.txt" "CHANGES.txt" "README.md" "TODO.md" )
diff --git a/dev-ml/ocaml-sqlite3/ocaml-sqlite3-4.1.3.ebuild b/dev-ml/ocaml-sqlite3/ocaml-sqlite3-4.1.3.ebuild
new file mode 100644
index 000000000000..87a48cacf8ba
--- /dev/null
+++ b/dev-ml/ocaml-sqlite3/ocaml-sqlite3-4.1.3.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+OASIS_BUILD_TESTS=1
+OASIS_BUILD_DOCS=1
+
+inherit oasis
+
+MY_PN="sqlite3-ocaml"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A package for ocaml that provides access to SQLite databases"
+HOMEPAGE="http://mmottl.github.io/sqlite3-ocaml/"
+SRC_URI="https://github.com/mmottl/sqlite3-ocaml/releases/download/v${PV}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=">=dev-db/sqlite-3.3.3
+ >=dev-ml/findlib-1.3.2"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+DOCS=( "AUTHORS.txt" "CHANGES.txt" "README.md" "TODO.md" )
diff --git a/dev-ml/ocaml-sqlite3/ocaml-sqlite3-4.2.0.ebuild b/dev-ml/ocaml-sqlite3/ocaml-sqlite3-4.2.0.ebuild
new file mode 100644
index 000000000000..ba15673a0eb3
--- /dev/null
+++ b/dev-ml/ocaml-sqlite3/ocaml-sqlite3-4.2.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit opam
+
+MY_PN="sqlite3"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A package for ocaml that provides access to SQLite databases"
+HOMEPAGE="http://mmottl.github.io/sqlite3-ocaml/"
+SRC_URI="https://github.com/mmottl/sqlite3-ocaml/releases/download/${PV}/${MY_P}.tbz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=dev-db/sqlite-3.3.3"
+DEPEND="${RDEPEND}
+ dev-ml/jbuilder
+ dev-ml/base
+ dev-ml/stdio
+ dev-ml/configurator
+ >=dev-ml/findlib-1.3.2"
+
+S=${WORKDIR}/${MY_P}
+
+src_compile() {
+ jbuilder build @install || die
+}
+
+src_install() {
+ opam_src_install "${MY_PN}"
+}
diff --git a/dev-ml/ocaml-sqlite3/ocaml-sqlite3-4.3.0.ebuild b/dev-ml/ocaml-sqlite3/ocaml-sqlite3-4.3.0.ebuild
new file mode 100644
index 000000000000..ba15673a0eb3
--- /dev/null
+++ b/dev-ml/ocaml-sqlite3/ocaml-sqlite3-4.3.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit opam
+
+MY_PN="sqlite3"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A package for ocaml that provides access to SQLite databases"
+HOMEPAGE="http://mmottl.github.io/sqlite3-ocaml/"
+SRC_URI="https://github.com/mmottl/sqlite3-ocaml/releases/download/${PV}/${MY_P}.tbz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=dev-db/sqlite-3.3.3"
+DEPEND="${RDEPEND}
+ dev-ml/jbuilder
+ dev-ml/base
+ dev-ml/stdio
+ dev-ml/configurator
+ >=dev-ml/findlib-1.3.2"
+
+S=${WORKDIR}/${MY_P}
+
+src_compile() {
+ jbuilder build @install || die
+}
+
+src_install() {
+ opam_src_install "${MY_PN}"
+}
diff --git a/dev-ml/ocaml-ssl-0.5.3 b/dev-ml/ocaml-ssl-0.5.3
deleted file mode 100644
index d91d025ba886..000000000000
--- a/dev-ml/ocaml-ssl-0.5.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=dev-libs/openssl:0= >=dev-lang/ocaml-3.10:= >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=OCaml bindings for OpenSSL
-EAPI=5
-HOMEPAGE=https://github.com/savonet/ocaml-ssl
-IUSE=doc
-KEYWORDS=amd64 ~arm ppc x86 ~x86-fbsd
-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 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6eb8ca795a2a6c84de5b5f32f19f113e
diff --git a/dev-ml/ocaml-ssl-0.5.4 b/dev-ml/ocaml-ssl-0.5.4
deleted file mode 100644
index 3009d2da6653..000000000000
--- a/dev-ml/ocaml-ssl-0.5.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=dev-libs/openssl:0= >=dev-lang/ocaml-3.10:= >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=OCaml bindings for OpenSSL
-EAPI=5
-HOMEPAGE=https://github.com/savonet/ocaml-ssl
-IUSE=doc
-KEYWORDS=~amd64 ~arm ~ppc ~x86 ~x86-fbsd
-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 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0c978856c6643299210aae8d31522d19
diff --git a/dev-ml/ocaml-ssl-0.5.5 b/dev-ml/ocaml-ssl-0.5.5
deleted file mode 100644
index 87ffe63f6095..000000000000
--- a/dev-ml/ocaml-ssl-0.5.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=dev-libs/openssl:0= >=dev-lang/ocaml-3.10:= >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=OCaml bindings for OpenSSL
-EAPI=5
-HOMEPAGE=https://github.com/savonet/ocaml-ssl
-IUSE=doc
-KEYWORDS=~amd64 ~arm ~ppc ~x86 ~x86-fbsd
-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 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0c978856c6643299210aae8d31522d19
diff --git a/dev-ml/ocaml-ssl/Manifest b/dev-ml/ocaml-ssl/Manifest
new file mode 100644
index 000000000000..bba839a69614
--- /dev/null
+++ b/dev-ml/ocaml-ssl/Manifest
@@ -0,0 +1,7 @@
+DIST ocaml-ssl-0.5.3.tar.gz 125431 BLAKE2B e95b6757f27fcac16dda1087880bb49ad854108755719210aeeeebd0e14cfee9b6244986f21ddbf86a970ea4b4f9eb2bb8e0a5a888dafe2a7262f004194a26ba SHA512 c0dc38ab21c8adc104a42ec89b8a58de976205887a23a407f1ffee1181d526ddb8aa91877508f8a974c6df8583d6d8611558a995680e313fc78ad0cac184cf52
+DIST ocaml-ssl-0.5.4.tar.gz 125833 BLAKE2B 983f1c1301c2dd313d91c180e8654baef39b1de2f3f3688ba40d920d5c16fd1626b1cf9dc8a6f172045ab4b8cd75b4048b3956ff9835a57c534bacdb1ddce32d SHA512 4a221bd8f5c11871040f6f117d3152ec2fca28f0311dfcc2ac39d2ed55c66203e12ad3242368273d8f17f1ca87c1b5d929ab7fec8ec7a03a564c7c25ade3d289
+DIST ocaml-ssl-0.5.5.tar.gz 125778 BLAKE2B 7be315a349df7948adc69b64cce65d29ce0d7cc8b492d4f3948a3a72e64951c323b8f5d3fa48825fe0119ff5d8c94a03d95e36ec695768aae0751f5f3df4397b SHA512 4e3a78426bc2a5cec0ade43b1b324366b4bf0d93be6e7bc73f1152499f2ab0642d3edcf4484a519ea6ec0b44bc76c0c984b9bba59121f93bc065b1c0355969c0
+EBUILD ocaml-ssl-0.5.3.ebuild 630 BLAKE2B aead8927a8745a73c39c4b0128f2b42548b0ac46330b1805487a1cb87728bc61eb39cfa3a89083a4442befbb91426e106ad92776fd4f677d7f8874d31963445f SHA512 dcd9b3c8bc4a9c38a13badc536902b0c7a1488c453d6d3530893d3e6362d6e85e282af3a5460b7927cb3dee150b579be1ec9c87330e3647d970a1bc90e144815
+EBUILD ocaml-ssl-0.5.4.ebuild 633 BLAKE2B a206756058897313a67355e6d0be1bbb9a5f99c6cf705741f7687dd0407bae259b91459806b5e37e5aea4ceb906c71280975ddf244fa49b6c41cace6c36058b0 SHA512 484a8fe25071c157e29ff6aebac027bd96d74b0c41c93986ea88a3ffd83119cf4a7020019ec14404cbb95349e4dd82b295dd6b9babba9c4d09485a3a34054faf
+EBUILD ocaml-ssl-0.5.5.ebuild 633 BLAKE2B a206756058897313a67355e6d0be1bbb9a5f99c6cf705741f7687dd0407bae259b91459806b5e37e5aea4ceb906c71280975ddf244fa49b6c41cace6c36058b0 SHA512 484a8fe25071c157e29ff6aebac027bd96d74b0c41c93986ea88a3ffd83119cf4a7020019ec14404cbb95349e4dd82b295dd6b9babba9c4d09485a3a34054faf
+MISC metadata.xml 381 BLAKE2B 8b32ccd8a5f4a5b9eb0ae5927afef667582a178524b535d52e2e1a3407a8e8c5481d541a6bee7aae0516935d92a6102652f93312847494002e4ab41d2d0dface SHA512 647667be5ba0a6c985cd80a3a7e9abb2023592bb211d4da73ac8bd2a1d9fed5768c478df29fe3c7bb4b86fd34dd27189f6b7cbcb0c03e9cc6dbefde9555c7d1a
diff --git a/dev-ml/ocaml-ssl/metadata.xml b/dev-ml/ocaml-ssl/metadata.xml
new file mode 100644
index 000000000000..45ec17d6bfc4
--- /dev/null
+++ b/dev-ml/ocaml-ssl/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="sourceforge">savonet</remote-id>
+ <remote-id type="github">savonet/ocaml-ssl</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/ocaml-ssl/ocaml-ssl-0.5.3.ebuild b/dev-ml/ocaml-ssl/ocaml-ssl-0.5.3.ebuild
new file mode 100644
index 000000000000..30aa83fbba2e
--- /dev/null
+++ b/dev-ml/ocaml-ssl/ocaml-ssl-0.5.3.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit findlib eutils
+
+IUSE="doc"
+
+DESCRIPTION="OCaml bindings for OpenSSL"
+SRC_URI="https://github.com/savonet/ocaml-ssl/releases/download/${PV}/${P}.tar.gz"
+HOMEPAGE="https://github.com/savonet/ocaml-ssl"
+
+DEPEND="dev-libs/openssl:0=
+ >=dev-lang/ocaml-3.10:="
+RDEPEND="${DEPEND}"
+
+SLOT="0/${PV}"
+LICENSE="LGPL-2.1"
+KEYWORDS="amd64 ~arm ppc x86 ~x86-fbsd"
+
+src_compile() {
+ emake -j1
+}
+
+src_install() {
+ findlib_src_preinst
+ emake install
+
+ if use doc; then
+ dohtml -r doc/html/*
+ fi
+ dodoc CHANGES README.md
+}
diff --git a/dev-ml/ocaml-ssl/ocaml-ssl-0.5.4.ebuild b/dev-ml/ocaml-ssl/ocaml-ssl-0.5.4.ebuild
new file mode 100644
index 000000000000..93d736e30add
--- /dev/null
+++ b/dev-ml/ocaml-ssl/ocaml-ssl-0.5.4.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit findlib eutils
+
+IUSE="doc"
+
+DESCRIPTION="OCaml bindings for OpenSSL"
+SRC_URI="https://github.com/savonet/ocaml-ssl/releases/download/${PV}/${P}.tar.gz"
+HOMEPAGE="https://github.com/savonet/ocaml-ssl"
+
+DEPEND="dev-libs/openssl:0=
+ >=dev-lang/ocaml-3.10:="
+RDEPEND="${DEPEND}"
+
+SLOT="0/${PV}"
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd"
+
+src_compile() {
+ emake -j1
+}
+
+src_install() {
+ findlib_src_preinst
+ emake install
+
+ if use doc; then
+ dohtml -r doc/html/*
+ fi
+ dodoc CHANGES README.md
+}
diff --git a/dev-ml/ocaml-ssl/ocaml-ssl-0.5.5.ebuild b/dev-ml/ocaml-ssl/ocaml-ssl-0.5.5.ebuild
new file mode 100644
index 000000000000..93d736e30add
--- /dev/null
+++ b/dev-ml/ocaml-ssl/ocaml-ssl-0.5.5.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit findlib eutils
+
+IUSE="doc"
+
+DESCRIPTION="OCaml bindings for OpenSSL"
+SRC_URI="https://github.com/savonet/ocaml-ssl/releases/download/${PV}/${P}.tar.gz"
+HOMEPAGE="https://github.com/savonet/ocaml-ssl"
+
+DEPEND="dev-libs/openssl:0=
+ >=dev-lang/ocaml-3.10:="
+RDEPEND="${DEPEND}"
+
+SLOT="0/${PV}"
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd"
+
+src_compile() {
+ emake -j1
+}
+
+src_install() {
+ findlib_src_preinst
+ emake install
+
+ if use doc; then
+ dohtml -r doc/html/*
+ fi
+ dodoc CHANGES README.md
+}
diff --git a/dev-ml/ocaml-stdint-0.4.2 b/dev-ml/ocaml-stdint-0.4.2
deleted file mode 100644
index 1cec6b9288de..000000000000
--- a/dev-ml/ocaml-stdint-0.4.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=Various signed and unsigned integers for OCaml
-EAPI=5
-HOMEPAGE=https://github.com/andrenth/ocaml-stdint
-IUSE=+ocamlopt debug doc
-KEYWORDS=~amd64
-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 983774947da124fb7d542ce25a218bb1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e oasis 9256ed89af74c3365ec888c00bfdfe43 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ccd77af0377bf14d5a92355f941f44d9
diff --git a/dev-ml/ocaml-stdint-0.5.0 b/dev-ml/ocaml-stdint-0.5.0
deleted file mode 100644
index 36633233241c..000000000000
--- a/dev-ml/ocaml-stdint-0.5.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=Various signed and unsigned integers for OCaml
-EAPI=5
-HOMEPAGE=https://github.com/andrenth/ocaml-stdint
-IUSE=+ocamlopt debug doc
-KEYWORDS=~amd64
-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 983774947da124fb7d542ce25a218bb1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e oasis 9256ed89af74c3365ec888c00bfdfe43 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ccd77af0377bf14d5a92355f941f44d9
diff --git a/dev-ml/ocaml-stdint/Manifest b/dev-ml/ocaml-stdint/Manifest
new file mode 100644
index 000000000000..205d3bd1bb55
--- /dev/null
+++ b/dev-ml/ocaml-stdint/Manifest
@@ -0,0 +1,5 @@
+DIST ocaml-stdint-0.4.2.tar.gz 79749 BLAKE2B 1edef2cab7a09025e9d5e91bce00f69c3727929961e15797020d53a9b50893f8094c94cb8067a6b6d9163e54d7a12d38d07410e6f21294f45c051407aa8b2351 SHA512 0663a54dca8951fadf1121b69db32590c6ec3fc26b3366271c7941841b0a95047d0a57b5f7337bc7fbc37d3730cb5ed20952c0a3d6ab71f273646bc197951125
+DIST ocaml-stdint-0.5.0.tar.gz 80106 BLAKE2B 00a201d7f0417ad4b568800d7a798a9a9008e4afdcf0b3a88edc315ebbb2ca45f7c82a9e42238ea7bce38d7cf8dd6accfd44e84e621c2d6bc7f5cbd528670784 SHA512 fa5470e587e445c0b1ba72ddb6e641db0e41c32490c3ca6dbffb73a8a39e14afe7395d55e9d22be8dddf1d4311257b5443b05cde05b25b7939600b4f74359a8e
+EBUILD ocaml-stdint-0.4.2.ebuild 438 BLAKE2B 474fd44b3c93b3a65623fc88a9f5aa179208c9cc7cb5abc38787ed100fa805af9aa1ef1005edc85368e1a5f75058cb53e04ab2da8435f69217f82dcf5869177a SHA512 d7b24af0517829bb6bf470e676c87e6a3eccce47d957f6ee825d6c15ba2ff9af561ab599bf5c7464eeaf70b3b169b979fc9fb5c2a794395470bcf86bfe95f09a
+EBUILD ocaml-stdint-0.5.0.ebuild 438 BLAKE2B 474fd44b3c93b3a65623fc88a9f5aa179208c9cc7cb5abc38787ed100fa805af9aa1ef1005edc85368e1a5f75058cb53e04ab2da8435f69217f82dcf5869177a SHA512 d7b24af0517829bb6bf470e676c87e6a3eccce47d957f6ee825d6c15ba2ff9af561ab599bf5c7464eeaf70b3b169b979fc9fb5c2a794395470bcf86bfe95f09a
+MISC metadata.xml 333 BLAKE2B f8c758b6441b58c86f5b9262ea953ecac5cc48fa723d2fd93673443ee9853336541747270b293294a5095d2f335ec60422be21fc1f406061de19e5b6d7811f65 SHA512 fa85ebef0ee33741dd167dd0352345a8d9f8d2cc412d18c04fb0d5e1aa3fdcc85454d2dfe5063b2a750b25edcb83d773237c3a08c37f03edb3199f78d0c618c3
diff --git a/dev-ml/ocaml-stdint/metadata.xml b/dev-ml/ocaml-stdint/metadata.xml
new file mode 100644
index 000000000000..39e337bfb000
--- /dev/null
+++ b/dev-ml/ocaml-stdint/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">andrenth/ocaml-stdint</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/ocaml-stdint/ocaml-stdint-0.4.2.ebuild b/dev-ml/ocaml-stdint/ocaml-stdint-0.4.2.ebuild
new file mode 100644
index 000000000000..f2c7b3938e6b
--- /dev/null
+++ b/dev-ml/ocaml-stdint/ocaml-stdint-0.4.2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+OASIS_BUILD_DOCS=1
+
+inherit oasis
+
+DESCRIPTION="Various signed and unsigned integers for OCaml"
+HOMEPAGE="https://github.com/andrenth/ocaml-stdint"
+SRC_URI="https://github.com/andrenth/ocaml-stdint/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
diff --git a/dev-ml/ocaml-stdint/ocaml-stdint-0.5.0.ebuild b/dev-ml/ocaml-stdint/ocaml-stdint-0.5.0.ebuild
new file mode 100644
index 000000000000..f2c7b3938e6b
--- /dev/null
+++ b/dev-ml/ocaml-stdint/ocaml-stdint-0.5.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+OASIS_BUILD_DOCS=1
+
+inherit oasis
+
+DESCRIPTION="Various signed and unsigned integers for OCaml"
+HOMEPAGE="https://github.com/andrenth/ocaml-stdint"
+SRC_URI="https://github.com/andrenth/ocaml-stdint/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
diff --git a/dev-ml/ocaml-text-0.8 b/dev-ml/ocaml-text-0.8
deleted file mode 100644
index 968cf78e5a06..000000000000
--- a/dev-ml/ocaml-text-0.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=virtual/libiconv dev-ml/camlp4:= pcre? ( dev-ml/pcre-ocaml:=[ocamlopt(+)?] ) doc? ( dev-tex/rubber virtual/latex-base ) >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=Library for dealing with 'text'
-EAPI=5
-HOMEPAGE=https://github.com/vbmithr/ocaml-text/
-IUSE=pcre +ocamlopt debug doc test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=virtual/libiconv dev-ml/camlp4:= pcre? ( dev-ml/pcre-ocaml:=[ocamlopt(+)?] ) >=dev-lang/ocaml-3.12:=[ocamlopt?]
-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 983774947da124fb7d542ce25a218bb1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e oasis 9256ed89af74c3365ec888c00bfdfe43 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e3adbb9233448a15831d90c3cf66e1b2
diff --git a/dev-ml/ocaml-text/Manifest b/dev-ml/ocaml-text/Manifest
new file mode 100644
index 000000000000..971b66cb37e7
--- /dev/null
+++ b/dev-ml/ocaml-text/Manifest
@@ -0,0 +1,3 @@
+DIST ocaml-text-0.8.tar.gz 80898 BLAKE2B 9e7395e43a488e6371e04a21a24aaa81eff82bb82802428d0bd64937a8f9e0c7b19a543b99453713d6e99b9c39b9d0fad02b0e627819346800b18f3c22c8e4b8 SHA512 712afd21f615a81dc361ce7f5d89aff0c341ed91cd0e4cce6a2000361023b006b10731ce0cc6c025bde5f5fe7d07fa85ca2af65a8ad4d50647e8dfa8ff7ad81f
+EBUILD ocaml-text-0.8.ebuild 751 BLAKE2B c6906563c3df23daa9227c85093f9ab9dbfd87bfe0b7604e2cd0bbad80d628311ea2360bfbd74b64e2d1d4a2284aafdbca19ab8f8ab5cce83bbcdd7943333742 SHA512 b7cd6e045542a3e0482e73b4d16a763bdc10d999bceb5b6bd1ad29252f0e5d8b78a5301827bcd6707af87ef02144c9a0daed439a87e4d0a532f8a9c5232e7471
+MISC metadata.xml 340 BLAKE2B aae58057fcfffe57f0731a333c548e9a3229d3a83c5b89a7f84c6d4851399a1edea074d39058374da133f463fa4722dd8be79e3e1c7cc65dcb73ada13b559b48 SHA512 049fa8156d68686aca85097d491a8c3e755dd92c95fbaa790bd2bb06772853ba5a4ff16689e02c7dc6187a500931c9992abdef9de50946554c5ad9ecae9c6660
diff --git a/dev-ml/ocaml-text/metadata.xml b/dev-ml/ocaml-text/metadata.xml
new file mode 100644
index 000000000000..d5f4e9943f9a
--- /dev/null
+++ b/dev-ml/ocaml-text/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">vbmithr/ocaml-text</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/ocaml-text/ocaml-text-0.8.ebuild b/dev-ml/ocaml-text/ocaml-text-0.8.ebuild
new file mode 100644
index 000000000000..ebcdda2a93f6
--- /dev/null
+++ b/dev-ml/ocaml-text/ocaml-text-0.8.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+OASIS_BUILD_DOCS=1
+OASIS_BUILD_TESTS=1
+
+inherit oasis
+
+DESCRIPTION="Library for dealing with 'text'"
+HOMEPAGE="https://github.com/vbmithr/ocaml-text/"
+SRC_URI="https://github.com/vbmithr/ocaml-text/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="pcre"
+
+RDEPEND="virtual/libiconv
+ dev-ml/camlp4:=
+ pcre? ( dev-ml/pcre-ocaml:=[ocamlopt(+)?] )"
+DEPEND="${RDEPEND}
+ doc? ( dev-tex/rubber virtual/latex-base )"
+
+DOCS=( "README" "CHANGES" )
+
+src_configure() {
+ oasis_configure_opts="$(use_enable pcre)" \
+ oasis_src_configure
+}
+
+src_install() {
+ oasis_src_install
+ use doc && dodoc manual/*.pdf
+}
diff --git a/dev-ml/ocaml-uint-1.2.0 b/dev-ml/ocaml-uint-1.2.0
deleted file mode 100644
index 38cdc5014b28..000000000000
--- a/dev-ml/ocaml-uint-1.2.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=Unsigned ints for OCaml
-EAPI=5
-HOMEPAGE=https://forge.ocamlcore.org/projects/ocaml-uint/
-IUSE=+ocamlopt debug doc
-KEYWORDS=~amd64
-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 983774947da124fb7d542ce25a218bb1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e oasis 9256ed89af74c3365ec888c00bfdfe43 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c24059996cd9a9ab2ba15ad19b92b7c5
diff --git a/dev-ml/ocaml-uint/Manifest b/dev-ml/ocaml-uint/Manifest
new file mode 100644
index 000000000000..c5eaae67bfb8
--- /dev/null
+++ b/dev-ml/ocaml-uint/Manifest
@@ -0,0 +1,3 @@
+DIST ocaml-uint-1.2.0.tar.gz 53467 BLAKE2B 3fd50623f518a8c0e9d97e31dc089591d6183b6bbeeec3e6808479c27b825e9027139eca442790556eba102b1746159c7d4c034d83bcc4b2169bcd80b9dca360 SHA512 74209cd04fc61debe8b846e7ca60efb9d8f274e4066abac9878fa68e048e5a9822278cfd7a65527c5c1933b0301cd4a92d9815db673fbfa4eae90fb2ee4fb77b
+EBUILD ocaml-uint-1.2.0.ebuild 408 BLAKE2B f95cf5f9ae8a97b131f2fa539d6a39ad95518ee8060fae796bdf2f82821718170771494a85a8c5e7a5b6b2bd745a1e50cd4fff3a0d3c09974b5efd26db9b0bf4 SHA512 85359a1375b19ee236eb677178f59ccfc60c637a4a9f197ac020b4ca343104a100c6a49a640052b8d12303372ff56636143d15edca2ec2ade47884ecea6c19de
+MISC metadata.xml 243 BLAKE2B 010ca240ae06e9a9f6d7ba213eb06df36d9ba862ff2d2458d98a9fea1a1e7f3026d13832a73bce1b3ad9345029425e6abfae9e03bf126f2329b3f030ed3753fd SHA512 1c5b4b2163017e496999d1f87e5c9c5ac6c11b2e9187450ccfb3df258f34e54d278972f04ee0e8429476c6f87e091a869ac2a28c6e8c8e6d20678c3e74061449
diff --git a/dev-ml/ocaml-uint/metadata.xml b/dev-ml/ocaml-uint/metadata.xml
new file mode 100644
index 000000000000..ffac4d7ebc01
--- /dev/null
+++ b/dev-ml/ocaml-uint/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-ml/ocaml-uint/ocaml-uint-1.2.0.ebuild b/dev-ml/ocaml-uint/ocaml-uint-1.2.0.ebuild
new file mode 100644
index 000000000000..b1ac5795a0c0
--- /dev/null
+++ b/dev-ml/ocaml-uint/ocaml-uint-1.2.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+OASIS_BUILD_DOCS=1
+
+inherit oasis
+
+DESCRIPTION="Unsigned ints for OCaml"
+HOMEPAGE="https://forge.ocamlcore.org/projects/ocaml-uint/"
+SRC_URI="https://forge.ocamlcore.org/frs/download.php/1516/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
diff --git a/dev-ml/ocaml-uri-1.9.4 b/dev-ml/ocaml-uri-1.9.4
deleted file mode 100644
index f2fa8976f656..000000000000
--- a/dev-ml/ocaml-uri-1.9.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-ml/ocaml-re:= dev-ml/sexplib:= dev-ml/ppx_sexp_conv:= dev-ml/ppx_core:= dev-ml/ppx_type_conv:= dev-ml/stringext:= dev-ml/type-conv:= test? ( >=dev-ml/ounit-1.0.2 ) dev-ml/jbuilder >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=RFC3986 URI parsing library for OCaml
-EAPI=5
-HOMEPAGE=https://github.com/mirage/ocaml-uri https://mirage.io
-IUSE=test
-KEYWORDS=~amd64
-LICENSE=ISC
-RDEPEND=dev-ml/ocaml-re:= dev-ml/sexplib:= dev-ml/ppx_sexp_conv:= dev-ml/ppx_core:= dev-ml/ppx_type_conv:= dev-ml/stringext:= dev-ml/type-conv:= >=dev-lang/ocaml-4:=
-SLOT=0/1.9.4
-SRC_URI=https://github.com/mirage/ocaml-uri/archive/v1.9.4.tar.gz -> ocaml-uri-1.9.4.tar.gz
-_eclasses_=findlib 45d6030075064a68da8d7143726a1150 opam 24b4a2529c1fd12f1304856d6c5a690d
-_md5_=936dee0ca12d3dd49a70c83a83827df3
diff --git a/dev-ml/ocaml-uri/Manifest b/dev-ml/ocaml-uri/Manifest
new file mode 100644
index 000000000000..56dda47612d4
--- /dev/null
+++ b/dev-ml/ocaml-uri/Manifest
@@ -0,0 +1,3 @@
+DIST ocaml-uri-1.9.4.tar.gz 213917 BLAKE2B 3b76ae2f39a7a97e581791e32e7ec302faacaf883ae82bb635497f205a7bb12b331f2ef34f834c4b22b56433fef75b6ba2c60db6b66f13997290e108f6f0f38b SHA512 c2314c55d1d89bb7824e6bd2aad57fa2bdc4889d5e6c0b4ce75f4ca33660d510d7ab125ff0f340f4688930f3ddac13193d34762f912cc70c4ce30aa206f32ddc
+EBUILD ocaml-uri-1.9.4.ebuild 662 BLAKE2B cfcb89038e02acf1459996271e66c20427ea627f78b16fe35e8301ee461a5ccd5fac2b9c5209890fed528cf5663d00c11e4465399c9a5306ee4c5f2550d032df SHA512 cb4a2fe73b6fd7f9148e38ee3ae62cfada521ccea926f7217e5b8e49718dab8bd22fbae4adb7f0b0470e468d4bc32c1397c4bebe6b54908388d295d04eb200b5
+MISC metadata.xml 357 BLAKE2B 3977236c1143a41d3f8893b1b15484578dacb36306bcb415ee1e5484204ad00ae9ba1f79ad130e3be45f1b2b061b0669191c686c20c810fc1397229e74e6c73c SHA512 6dee6f70da15edb4559f0e3c82e1b46e3e72ce98666bf122fc5e61d905e72629716d724f8d77d03025c7952bfcc13fdebca4b1e0e96da3806548286bf7df3edd
diff --git a/dev-ml/ocaml-uri/metadata.xml b/dev-ml/ocaml-uri/metadata.xml
new file mode 100644
index 000000000000..b6a6ada36e6c
--- /dev/null
+++ b/dev-ml/ocaml-uri/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">mirage/ocaml-uri</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/ocaml-uri/ocaml-uri-1.9.4.ebuild b/dev-ml/ocaml-uri/ocaml-uri-1.9.4.ebuild
new file mode 100644
index 000000000000..53b7fbd0612d
--- /dev/null
+++ b/dev-ml/ocaml-uri/ocaml-uri-1.9.4.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit findlib opam
+
+DESCRIPTION="RFC3986 URI parsing library for OCaml"
+HOMEPAGE="https://github.com/mirage/ocaml-uri https://mirage.io"
+SRC_URI="https://github.com/mirage/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="test"
+
+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:=
+"
+DEPEND="${RDEPEND}
+ test? ( >=dev-ml/ounit-1.0.2 )
+ dev-ml/jbuilder
+"
+
+src_install() {
+ opam_src_install uri
+}
diff --git a/dev-ml/ocaml-webmachine-0.4.0 b/dev-ml/ocaml-webmachine-0.4.0
deleted file mode 100644
index b871c2e2bcd0..000000000000
--- a/dev-ml/ocaml-webmachine-0.4.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ml/calendar:= dev-ml/ocaml-cohttp:=[ocamlopt?] dev-ml/ocaml-dispatch:=[ocamlopt(+)?] dev-ml/ocaml-re:=[ocamlopt?] dev-ml/ocaml-uri:=[ocamlopt(+)?] test? ( dev-ml/ounit[ocamlopt?] ) >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=A REST toolkit for OCaml
-EAPI=5
-HOMEPAGE=https://github.com/inhabitedtype/ocaml-webmachine
-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?]
-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 983774947da124fb7d542ce25a218bb1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e oasis 9256ed89af74c3365ec888c00bfdfe43 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7076f45155bc05998df45b4bc4c07ccd
diff --git a/dev-ml/ocaml-webmachine/Manifest b/dev-ml/ocaml-webmachine/Manifest
new file mode 100644
index 000000000000..6c2df4fd6a59
--- /dev/null
+++ b/dev-ml/ocaml-webmachine/Manifest
@@ -0,0 +1,3 @@
+DIST ocaml-webmachine-0.4.0.tar.gz 74818 BLAKE2B cc9491a8761ebec463ec9c496e7cc84944d554bc6e43d8b20af55af9fd5d597783816f81a68bd9866a462e24dab09fd5da6c7ff327295177981677ddf91e6a08 SHA512 5ea06ae41f6c156786b72ea7a164bd0c96cf9b6fc7ae1e93044a928681f03b07cef39da1c4955317fe6762065bd189b3809ba521b3349ec9f6dde9191c857d31
+EBUILD ocaml-webmachine-0.4.0.ebuild 702 BLAKE2B 0b7bd483871a24f691195c14d187a5fcc1d86a2377997ba5bb5c163fde5e92c952b21cf3823d92d388b473a2d701740544e1c92b2076729df379fa540143e8f1 SHA512 00208a9a1c7a0fc0fb26d456de2d072e3f577c5b228285faf532d74fae4a6ebbf56a356187f9210bfbe83f1b49a84640a43109ffdd1ca94e1af4440ee1bb3166
+MISC metadata.xml 342 BLAKE2B 14908f5ea94e1073bae326e92af106aedcb3d42835a0dcfe48042a15b50982b69ec1e52f5a282ab461ba10d237acbd2c9ecaf865897ea9b81e8eef116099c8c1 SHA512 804592c0559ff0ac827914218f41ed8865820660571b2cf4f6ac583e499b94ee694ef4cb7a7f627d3d4d6874f1cbf65ac98fa711df6c6213dd9a7430e1347453
diff --git a/dev-ml/ocaml-webmachine/metadata.xml b/dev-ml/ocaml-webmachine/metadata.xml
new file mode 100644
index 000000000000..16ee3a041382
--- /dev/null
+++ b/dev-ml/ocaml-webmachine/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">inhabitedtype/ocaml-webmachine</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/ocaml-webmachine/ocaml-webmachine-0.4.0.ebuild b/dev-ml/ocaml-webmachine/ocaml-webmachine-0.4.0.ebuild
new file mode 100644
index 000000000000..1f8b5e502946
--- /dev/null
+++ b/dev-ml/ocaml-webmachine/ocaml-webmachine-0.4.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+OASIS_BUILD_DOCS=1
+OASIS_BUILD_TESTS=1
+
+inherit oasis
+
+DESCRIPTION="A REST toolkit for OCaml"
+HOMEPAGE="https://github.com/inhabitedtype/ocaml-webmachine"
+SRC_URI="https://github.com/inhabitedtype/ocaml-webmachine/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+ dev-ml/calendar:=
+ dev-ml/ocaml-cohttp:=[ocamlopt?]
+ dev-ml/ocaml-dispatch:=[ocamlopt(+)?]
+ dev-ml/ocaml-re:=[ocamlopt?]
+ dev-ml/ocaml-uri:=[ocamlopt(+)?]
+"
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND}
+ test? ( dev-ml/ounit[ocamlopt?] )
+"
+
+DOCS=( README.md CONTRIBUTING.md )
diff --git a/dev-ml/ocaml-websocket-2.9 b/dev-ml/ocaml-websocket-2.9
deleted file mode 100644
index 25a1f42bcd88..000000000000
--- a/dev-ml/ocaml-websocket-2.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=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-ml/ocamlbuild >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=Websocket library for OCaml
-EAPI=6
-HOMEPAGE=https://github.com/vbmithr/ocaml-websocket
-IUSE=+ocamlopt async +ssl lwt
-KEYWORDS=~amd64
-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 24b4a2529c1fd12f1304856d6c5a690d
-_md5_=3c0545ce6516a9141e1e5b4092d035a2
diff --git a/dev-ml/ocaml-websocket/Manifest b/dev-ml/ocaml-websocket/Manifest
new file mode 100644
index 000000000000..845adc2fdd5a
--- /dev/null
+++ b/dev-ml/ocaml-websocket/Manifest
@@ -0,0 +1,3 @@
+DIST ocaml-websocket-2.9.tar.gz 23946 BLAKE2B adea61c5b163c995f3fcdc9789ef718bbfc5b22f3ef755795d54d0ba7357797fd5c358da88a7fbc5986c728b2705d5f34c7f3d4c8f2c2a9aa857a4b6add98b5f SHA512 eab5e4f971985c03ca70b46abb54ca8a09491e5ebc803b57ddf8447447b6926da2117fd882c7cb5a9a7282290e756f535e4584f09cbd21ce2554f20df1db7ae8
+EBUILD ocaml-websocket-2.9.ebuild 1212 BLAKE2B 51e836414bd01bdc5f2bb3494096527aa70c54e83138469dcaa90ebc16d66a85ca096711170fd2da5ea107f434779619d8e7cffc4c3884ff1c29c7ab9bbce359 SHA512 8c35ce20d678495f29c541f08de7295f60d3560a1e6be9a677f11758b1912204b68bc31273823c9a8f82efc24cb53562b06a9ae89e68d5ddb11474030e18d847
+MISC metadata.xml 571 BLAKE2B 7372439e952133ef21ad360bbcb759a0f2f8a5b708b47f816ac7f8074a4cd87f2a1939f4bb1246f7e61a4d092cc7cc1ea09099253cefdfd2ad762be71c46d1c5 SHA512 27c2ddfbebccf44ac986917632752ffa184d77ce4ca1ad73767d2d18f978d072c9ad965645d0e598136643241b70a134223a116ae401c14c1d0f56d4c1c8e57f
diff --git a/dev-ml/ocaml-websocket/metadata.xml b/dev-ml/ocaml-websocket/metadata.xml
new file mode 100644
index 000000000000..3e6d4b66b87e
--- /dev/null
+++ b/dev-ml/ocaml-websocket/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <use>
+ <flag name="async">Enables support for the <pkg>dev-ml/async</pkg> asynchronous execution library.</flag>
+ <flag name="lwt">Enables support for the <pkg>dev-ml/lwt</pkg> cooperative light-weight thread library.</flag>
+ </use>
+ <upstream>
+ <remote-id type="github">vbmithr/ocaml-websocket</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/ocaml-websocket/ocaml-websocket-2.9.ebuild b/dev-ml/ocaml-websocket/ocaml-websocket-2.9.ebuild
new file mode 100644
index 000000000000..359784d9c447
--- /dev/null
+++ b/dev-ml/ocaml-websocket/ocaml-websocket-2.9.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit opam
+
+DESCRIPTION="Websocket library for OCaml"
+HOMEPAGE="https://github.com/vbmithr/ocaml-websocket"
+SRC_URI="https://github.com/vbmithr/ocaml-websocket/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="+ocamlopt async +ssl lwt"
+
+DEPEND="
+ 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(+)?] )
+
+"
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND}
+ dev-ml/ocamlbuild"
+
+src_compile() {
+ ocaml pkg/build.ml \
+ native=$(usex ocamlopt true false) \
+ native-dynlink=$(usex ocamlopt true false) \
+ lwt=$(usex lwt true false) \
+ async=$(usex async true false) \
+ async_ssl=$(usex async "$(usex ssl true false)" false) \
+ nocrypto=false \
+ cryptokit=$(usex ssl true false) \
+ test=false \
+ || die
+}
+
+src_install() {
+ opam_src_install websocket
+ dodoc README CHANGES
+}
diff --git a/dev-ml/ocamlbuild-0.10.1 b/dev-ml/ocamlbuild-0.10.1
deleted file mode 100644
index 6982e545a0d4..000000000000
--- a/dev-ml/ocamlbuild-0.10.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=dev-lang/ocaml-4.02.3-r1:=[ocamlopt?]
-DESCRIPTION=Generic build tool with built-in rules for building OCaml library and programs
-EAPI=5
-HOMEPAGE=https://github.com/ocaml/ocamlbuild
-IUSE=+ocamlopt
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~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
-SLOT=0/0.10.1
-SRC_URI=https://github.com/ocaml/ocamlbuild/archive/0.10.1.tar.gz -> ocamlbuild-0.10.1.tar.gz
-_md5_=87f68e782c81f05bb5274c243fce7e9a
diff --git a/dev-ml/ocamlbuild-0.11.0 b/dev-ml/ocamlbuild-0.11.0
deleted file mode 100644
index 2ced3d2c8c9a..000000000000
--- a/dev-ml/ocamlbuild-0.11.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=dev-lang/ocaml-4.02.3-r1:=[ocamlopt?] test? ( dev-ml/findlib )
-DESCRIPTION=Generic build tool with built-in rules for building OCaml library and programs
-EAPI=5
-HOMEPAGE=https://github.com/ocaml/ocamlbuild
-IUSE=+ocamlopt test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~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
-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_=36fdbdd8ff98d672f856bb155dc337e4
diff --git a/dev-ml/ocamlbuild/Manifest b/dev-ml/ocamlbuild/Manifest
new file mode 100644
index 000000000000..941f53e09702
--- /dev/null
+++ b/dev-ml/ocamlbuild/Manifest
@@ -0,0 +1,5 @@
+DIST ocamlbuild-0.10.1.tar.gz 193263 BLAKE2B cee82997a6b691b3df9b92055b74f05af57d7663f5dbb84701e66dffefcfe6ec00c9721e1872d546f2aea9237068e37ba7d94463d0002a8356dd4d84bc1865c0 SHA512 6d74bdce7fe147bf1a5fd570b569925b36b5f443c7251d1c13a0525e3086417b393a768722bf7d4b23a7e3178b0b3c2511499725c5a755d69783b8d555663e3b
+DIST ocamlbuild-0.11.0.tar.gz 195297 BLAKE2B 2d653c402edf58035fa6efb65c99c956fe78efc4759f29c8ddab8263310a5d243d25d37d4c1a4f0699f151afb6d4c6df4c1550f95d6e915963b3d86923877225 SHA512 14bc44cc63b6c99e711658a1145247bad8263632fbb4550238cef15e226a76b83e51b83575a7a96f16b96ec321dedd0ef23f36166c354838aec1922f58179efd
+EBUILD ocamlbuild-0.10.1.ebuild 1003 BLAKE2B 9379a89d483f9d550ec31a5e7d12e829c9ae3f25f5e85041ca7c583b0ace471829391a836bf468607ccac2bcfc1b9615e8a819c5ed045d17e6fd6a6d4d917755 SHA512 7859dbae5f54bd7c0206d1c4a21bda1a6bbcb3fee7ed233dc4c9b80fba72bf3a1d5d25b141af49d2fc0110facb5ef2b803a607485cfbdff23677b5869a5f3a4f
+EBUILD ocamlbuild-0.11.0.ebuild 1069 BLAKE2B de8d456fc3492ad60a3376eac8e1969829a5d6e6bd71a9da4eca03e39c26cea7020c09b8d4eef0ea97c24d2419fefd945c5e7cb3d91a0f779b4724a6ec7bacf8 SHA512 58bb5fba0990ed26ae33713bd8b2f237cf1ff8915059e486223452809703882084748fde9086fe7674018f6bb2b99128c9f4cd46805591fe8485d8af9ced043a
+MISC metadata.xml 328 BLAKE2B 0915143535f6dbe4cbebdd06d1d650a59b377582bddbc04720aaccb8e2d72f1ceba4350908bb10516685a2ba960fbcbba5dd250866150489ba9aceb7efe9d542 SHA512 adc6a2be4148f558c80473e4d5d63e0275bae0fb43a29ad69ce420a52cc515e667e726707aaecf54371e5c795af141552934a48fdfd12e3fb777ce4aeb7b214f
diff --git a/dev-ml/ocamlbuild/metadata.xml b/dev-ml/ocamlbuild/metadata.xml
new file mode 100644
index 000000000000..02c0fb40425a
--- /dev/null
+++ b/dev-ml/ocamlbuild/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">ocaml/ocamlbuild</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/ocamlbuild/ocamlbuild-0.10.1.ebuild b/dev-ml/ocamlbuild/ocamlbuild-0.10.1.ebuild
new file mode 100644
index 000000000000..e0622a77a825
--- /dev/null
+++ b/dev-ml/ocamlbuild/ocamlbuild-0.10.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="Generic build tool with built-in rules for building OCaml library and programs"
+HOMEPAGE="https://github.com/ocaml/ocamlbuild"
+SRC_URI="https://github.com/ocaml/ocamlbuild/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="+ocamlopt"
+
+DEPEND=">=dev-lang/ocaml-4.02.3-r1:=[ocamlopt?]"
+RDEPEND="${DEPEND}
+ !<dev-ml/findlib-1.6.1-r1
+"
+
+src_configure() {
+ emake -f configure.make Makefile.config \
+ PREFIX="${EPREFIX}/usr" \
+ BINDIR="${EPREFIX}/usr/bin" \
+ LIBDIR="$(ocamlc -where)" \
+ OCAML_NATIVE=$(usex ocamlopt true false) \
+ OCAML_NATIVE_TOOLS=$(usex ocamlopt true false) \
+ NATDYNLINK=$(usex ocamlopt true false)
+}
+
+src_install() {
+ emake CHECK_IF_PREINSTALLED=false DESTDIR="${D}" install
+ dodoc Changes
+}
diff --git a/dev-ml/ocamlbuild/ocamlbuild-0.11.0.ebuild b/dev-ml/ocamlbuild/ocamlbuild-0.11.0.ebuild
new file mode 100644
index 000000000000..36621246391c
--- /dev/null
+++ b/dev-ml/ocamlbuild/ocamlbuild-0.11.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="Generic build tool with built-in rules for building OCaml library and programs"
+HOMEPAGE="https://github.com/ocaml/ocamlbuild"
+SRC_URI="https://github.com/ocaml/ocamlbuild/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="+ocamlopt test"
+
+DEPEND=">=dev-lang/ocaml-4.02.3-r1:=[ocamlopt?]"
+RDEPEND="${DEPEND}
+ !<dev-ml/findlib-1.6.1-r1
+"
+DEPEND="${DEPEND}
+ test? ( dev-ml/findlib )"
+
+src_configure() {
+ emake -f configure.make Makefile.config \
+ PREFIX="${EPREFIX}/usr" \
+ BINDIR="${EPREFIX}/usr/bin" \
+ LIBDIR="$(ocamlc -where)" \
+ OCAML_NATIVE=$(usex ocamlopt true false) \
+ OCAML_NATIVE_TOOLS=$(usex ocamlopt true false) \
+ NATDYNLINK=$(usex ocamlopt true false)
+}
+
+src_install() {
+ emake CHECK_IF_PREINSTALLED=false DESTDIR="${D}" install
+ dodoc Changes
+}
diff --git a/dev-ml/ocamldap-2.2 b/dev-ml/ocamldap-2.2
deleted file mode 100644
index d3ef13a257d8..000000000000
--- a/dev-ml/ocamldap-2.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ml/pcre-ocaml:= dev-ml/ocaml-ssl:= dev-ml/ocamlnet:= >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=an implementation of the Light Weight Directory Access Protocol
-EAPI=5
-HOMEPAGE=http://git-jpdeplaix.dyndns.org/libs/ocamldap.git/
-IUSE=doc +ocamlopt debug
-KEYWORDS=~amd64
-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 983774947da124fb7d542ce25a218bb1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e oasis 9256ed89af74c3365ec888c00bfdfe43 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9e57e1ebf77084a6dedbe6685412840c
diff --git a/dev-ml/ocamldap/Manifest b/dev-ml/ocamldap/Manifest
new file mode 100644
index 000000000000..aa0070b8e9fc
--- /dev/null
+++ b/dev-ml/ocamldap/Manifest
@@ -0,0 +1,4 @@
+AUX ocaml-4.02.patch 328 BLAKE2B 3eb39ce95c229ad764d4e58652da76776b5942d9973bb83b93f35e488f5abbffa85ed204e81d476d8695baa19882ecda48013eafa3a5d10c590a449ead2774a0 SHA512 375027a35bb592f215f5bdccdf4ff18ad29feb6e82236f8bd1fd4852cd2b50da3934d95ddcb73468ba9c039b2e09e24ae4b8f27ba23e399e1892bcac02e6c5b5
+DIST ocamldap-2.2.tar.gz 174204 BLAKE2B 38417bc5ee633db912cbaa299dea0def74a2b31ca54f70b798cb3380623764b27ceec04c708d3632b8d7a6ef42792668d1d9a9e6f910c6fe35b15569da2efda5 SHA512 e24e78497b7c9ed89b0ae73c5773cc9ec28c7c7d317b4b8b39f6b20536ff8f44e15c2657d6aba4bb4689afb5bb155fc7391bea6edab50d0855b22bc457982a2d
+EBUILD ocamldap-2.2.ebuild 669 BLAKE2B 3dfed4de6137a3e252bfc7d3f043c9b1a0baa2621eee5c8edc2ae060659f29beae2cf0f12d0fa51d1a8ce928915c068da590370401f38b8755643d7a0937632d SHA512 07d6fb0d225f17734ac521874917d1f89565ca977464ff7530d472aa33c3a5362fb9d3bd0ba1831f4ed11f5134400b4ee4e010da70fbc1d83a862100799b9212
+MISC metadata.xml 1449 BLAKE2B ddb710c7151a3c746e3656f26ebb3e23a0e2e626598559be19b75f33bb85cc17a4780b5ade62396c939a9d7ec9f5113720cc0fd6b65465ab42ee3bdb888deb41 SHA512 a545af4b155f65ff17cb92473ceeaedfadc359588defe93ba159d25052fb4c7d29ee5e0e8a9fc3074e211ff1dd22367f3acbfba373dfe0fbe1f9df3c3c35e4ea
diff --git a/dev-ml/ocamldap/files/ocaml-4.02.patch b/dev-ml/ocamldap/files/ocaml-4.02.patch
new file mode 100644
index 000000000000..959ddd0a5a4f
--- /dev/null
+++ b/dev-ml/ocamldap/files/ocaml-4.02.patch
@@ -0,0 +1,13 @@
+diff --git a/src/ldap_ooclient.ml b/src/ldap_ooclient.ml
+index 79fd51d..7ffa39e 100644
+--- a/src/ldap_ooclient.ml
++++ b/src/ldap_ooclient.ml
+@@ -23,7 +23,7 @@
+ open Ldap_types
+ open Ldap_funclient
+ open Ldap_schemaparser
+-open String
++let lowercase = String.lowercase
+
+ (* types used throughout the library *)
+ (* add types *)
diff --git a/dev-ml/ocamldap/metadata.xml b/dev-ml/ocamldap/metadata.xml
new file mode 100644
index 000000000000..8b85d92a466d
--- /dev/null
+++ b/dev-ml/ocamldap/metadata.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <longdescription lang="en">
+Ocamldap is an implementation of the Light Weight Directory Access Protocol,
+and a set of useful tools built around it. It includes high level libraries
+for creating ldap clients and ldap servers. It also includes many of the
+auxiliary tools needed for building intelligent solutions, and interoperating
+with other directories. These include, an rfc2252 schema parser, and an schema
+checker, an ldif parser and printer, a search filter parser (but no printer
+yet), and a rudimentary ldap url parser. While including things already done
+elsewhere is fun, ocamldap adds something as well. So it implements a concept
+which tries to provide a basic unit of abstraction for managing directory data,
+called a service. A service is a bit like a stored search filter that you give
+a name. So you can ask ocamldap if an object satisfies its conditions, but
+unlike a search filter you can also ask ocamldap to MAKE an object satisfy its
+conditions. This can be really useful in distributed managment applications.
+Needless to say, more on this in the Documentation section.
+ </longdescription>
+ <upstream>
+ <remote-id type="bitbucket">deplai_j/ocamldap</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/ocamldap/ocamldap-2.2.ebuild b/dev-ml/ocamldap/ocamldap-2.2.ebuild
new file mode 100644
index 000000000000..a53115fc7a11
--- /dev/null
+++ b/dev-ml/ocamldap/ocamldap-2.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit oasis
+
+DESCRIPTION="an implementation of the Light Weight Directory Access Protocol"
+HOMEPAGE="http://git-jpdeplaix.dyndns.org/libs/ocamldap.git/"
+SRC_URI="https://bitbucket.org/deplai_j/${PN}/downloads/${P}.tar.gz"
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="doc"
+
+DEPEND="dev-ml/pcre-ocaml:=
+ dev-ml/ocaml-ssl:=
+ dev-ml/ocamlnet:="
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS.txt Changelog INSTALL.txt README.txt )
+
+PATCHES=( "${FILESDIR}/ocaml-4.02.patch" )
+
+src_install() {
+ oasis_src_install
+ use doc && dohtml -r doc/ocamldap/html
+}
diff --git a/dev-ml/ocamldsort-0.16.0-r1 b/dev-ml/ocamldsort-0.16.0-r1
deleted file mode 100644
index b9321ff29a48..000000000000
--- a/dev-ml/ocamldsort-0.16.0-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=>=dev-lang/ocaml-3.12:= dev-ml/camlp4:=
-DESCRIPTION=A dependency sorter for OCaml source files
-EAPI=5
-HOMEPAGE=http://dimitri.mutu.net/ocaml.html
-KEYWORDS=~amd64 ppc x86
-LICENSE=LGPL-2
-RDEPEND=>=dev-lang/ocaml-3.12:= dev-ml/camlp4:=
-SLOT=0
-SRC_URI=ftp://quatramaran.ens.fr/pub/ara/ocamldsort/ocamldsort-0.16.0.tar.gz
-_md5_=a3c42f6dc17e743e9c87c21b1607ec3d
diff --git a/dev-ml/ocamldsort/Manifest b/dev-ml/ocamldsort/Manifest
new file mode 100644
index 000000000000..d860b3abe790
--- /dev/null
+++ b/dev-ml/ocamldsort/Manifest
@@ -0,0 +1,3 @@
+DIST ocamldsort-0.16.0.tar.gz 42388 BLAKE2B 84f9943237d126a105700b52879b358b202f196ce885b9d295baf3fcab8326520e4433839c375ab082460790d2855687a8cd11ca9a48e3b3dcfcaea27cea8e06 SHA512 3e43a4a7c4e7e91f141d93200ac7ba2d6de2321ea4af4cde63c2fbfff0042a556c55f1be9948ebf90a16778b2b6efc1757d6747cf01668155003e4a806d0773e
+EBUILD ocamldsort-0.16.0-r1.ebuild 562 BLAKE2B cf6fc4f553d91d516f6c9ee7a2252af626c7816668da2653ffecb4d3c2a7aa2099a6d78f5a0974cf6adde58f23a17d0d6fbb77fb9b9512659d9316b82945e199 SHA512 f52b3248bbc3ac09f37144e16e4424afac0c6fa4670f29d25a0a0ec4ed0dcf79d91ae71ac5cbad24668a3614987b000cdd2ce12bc7a04d10af9946481e404495
+MISC metadata.xml 247 BLAKE2B a49ba320a43edd431ae39eb274b77ddf0db171a7b06f4f0f0b8f75ee8e3b7f840dead108aa9c63fba75c609a44f7418268cd65c65877f3305d2a6d3ed3c678f6 SHA512 0f7ebd1264695f56fe6ab78e4e82c07866376f03ebfa12b22b60d0b2df819aa818832cb0d9eb2d77ab642a786b44cd127f579c348f0b2f57bc22e26b3b51c42b
diff --git a/dev-ml/ocamldsort/metadata.xml b/dev-ml/ocamldsort/metadata.xml
new file mode 100644
index 000000000000..75c9ea74812d
--- /dev/null
+++ b/dev-ml/ocamldsort/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/dev-ml/ocamldsort/ocamldsort-0.16.0-r1.ebuild b/dev-ml/ocamldsort/ocamldsort-0.16.0-r1.ebuild
new file mode 100644
index 000000000000..f7a9fbe05b45
--- /dev/null
+++ b/dev-ml/ocamldsort/ocamldsort-0.16.0-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="A dependency sorter for OCaml source files"
+HOMEPAGE="http://dimitri.mutu.net/ocaml.html"
+SRC_URI="ftp://quatramaran.ens.fr/pub/ara/ocamldsort/${P}.tar.gz"
+LICENSE="LGPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ppc x86"
+IUSE=""
+
+DEPEND=">=dev-lang/ocaml-3.12:=
+ dev-ml/camlp4:="
+RDEPEND="${DEPEND}"
+
+src_compile() {
+ emake -j1
+}
+
+src_install() {
+ emake BINDIR="${ED}/usr/bin" MANDIR="${ED}/usr/share/man" install
+ dodoc README THANKS Changes
+}
diff --git a/dev-ml/ocamlgraph-1.8.7 b/dev-ml/ocamlgraph-1.8.7
deleted file mode 100644
index 002e4e5a0738..000000000000
--- a/dev-ml/ocamlgraph-1.8.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=>=dev-lang/ocaml-3.10.2:=[ocamlopt?] gtk? ( dev-ml/lablgtk:=[gnomecanvas,ocamlopt?] ) doc? ( dev-tex/hevea dev-ml/ocamlweb ) >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=O'Caml Graph library
-EAPI=5
-HOMEPAGE=http://ocamlgraph.lri.fr/index.en.html
-IUSE=doc examples gtk +ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ppc x86
-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 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=05eb8005c34eb7d3d0c965998539f043
diff --git a/dev-ml/ocamlgraph-1.8.8 b/dev-ml/ocamlgraph-1.8.8
deleted file mode 100644
index 85b89a9b53ee..000000000000
--- a/dev-ml/ocamlgraph-1.8.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=>=dev-lang/ocaml-3.10.2:=[ocamlopt?] gtk? ( dev-ml/lablgtk:=[gnomecanvas,ocamlopt?] ) doc? ( dev-tex/hevea dev-ml/ocamlweb ) >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=O'Caml Graph library
-EAPI=5
-HOMEPAGE=http://ocamlgraph.lri.fr/index.en.html
-IUSE=doc examples gtk +ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
-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
-_md5_=58ee4a6aa44435796d14c131741ccd97
diff --git a/dev-ml/ocamlgraph/Manifest b/dev-ml/ocamlgraph/Manifest
new file mode 100644
index 000000000000..f7a0522505d0
--- /dev/null
+++ b/dev-ml/ocamlgraph/Manifest
@@ -0,0 +1,7 @@
+AUX ocamlgraph-1.8.6-installfindlib.patch 1383 BLAKE2B dcdfa9cfde71eb22e057950414d68a7873f8b9f7d88e84b4c11293379aa8276e8b4083a24cec192ee4f57ca460caa54e239c943b155331252dd0f2a25f53568c SHA512 a46ef5504a79dc33e25db45832411cb65dc1ca6b41fd572276595f29bc983a96f31b3efe969e82534c4cdbf98e37184d145e38cb9d43d5709c5b233af689ced4
+AUX ocamlgraph-1.8.7-test.patch 594 BLAKE2B 7a04f1357f82ab23820d7013ead56918b9548853dec086f5dabd45c81e035762d2d792797e83f9213a13ae37c5a27618577226373c31ae974cd4e3d506f788e5 SHA512 795a28d8b9702ed8e55d4b001285320c179de77de4edcc260212536cea4bb1bf36c58158ff7975e9a9befc075f03a1a64e069bc2a74a2b7770913a19c52d0652
+DIST ocamlgraph-1.8.7.tar.gz 272625 BLAKE2B 18df3f78cfe66e2259c770cfc3671096b06a185e3f407b22eb0a21ff6e7f7df4b0b705a830d740c64f66609b88e2fb76aa91e200ca4c0fadc7ae2a1910641f3d SHA512 27559293bf576ecc9cf49090e24905c50d00ebaeb444a3c917826f3cfe1e7ceab34b43e30f98634811b1688b675d8747b590b5bb103a720d099304f5031feb2e
+DIST ocamlgraph-1.8.8.tar.gz 282729 BLAKE2B 79fdbcdd86fc5b6f36ad3399c890c31831a20fec22f0b4faf6da1fb61a12d25a54587e4b3ed8f9266ad1ce37bfffe76d66cf7a7e765e8046429943ad3c555208 SHA512 ccb07d4a7fb0c3026ad2d4563e1ca0a88483ac3cf43c9378989ae5c031961853a11c9673c06b54a16733c5755d9c0a2783c5f475afdcc7692d2bf3d4778f5bc5
+EBUILD ocamlgraph-1.8.7.ebuild 1381 BLAKE2B 5569a3c7f8dd0cf67d9ee54ae4b40da58c51bafda1e94c3d60eedb72571a0fbe47967a84d24482b09458039b839f619eae9fdfd3ae4e8886d594ec1cbbaa2e6c SHA512 747ba63e80d2245f757597e0ac4163306413826111cf8567545613e702a934e52bed77f4ec78c89470fbc2847f51f0eff747c9e6fc17c1c62bf4a0642d467331
+EBUILD ocamlgraph-1.8.8.ebuild 1264 BLAKE2B 6c1c57398540b9471e64c34d333d77189713892b85eb788dd70865e5acd63415f91d64d2dff29461b4f6c710ca2648c93ad00deb20b862009f074c28668eeaca SHA512 ca2fa5b1541c0ca9c971dd30666babc58b5ee7a31f1f823a0f214450c275e28fee40eca41588f484bc8dffbec7c1ae5bd8e30f01a7eb66d7dd25afa4638d04cd
+MISC metadata.xml 335 BLAKE2B c1bd810f45e01670e81d2f9999528ebbef66f9702102e8878bec4a696c98e66e6c5b6e51188f45ac96a2f9a330b1ed27d5617a1c95bae226103ddb9b13d93d0c SHA512 02604359f918e79ec864ad020cf983841b33d5fed7a8438465bdf5146d085671edb03ef4b1aac41486c8e3a2bfecb767fbc11d2f667519a39057d6a97739f08b
diff --git a/dev-ml/ocamlgraph/files/ocamlgraph-1.8.6-installfindlib.patch b/dev-ml/ocamlgraph/files/ocamlgraph-1.8.6-installfindlib.patch
new file mode 100644
index 000000000000..cb980b6f19dc
--- /dev/null
+++ b/dev-ml/ocamlgraph/files/ocamlgraph-1.8.6-installfindlib.patch
@@ -0,0 +1,38 @@
+Index: ocamlgraph-1.8.6/Makefile.in
+===================================================================
+--- ocamlgraph-1.8.6.orig/Makefile.in
++++ ocamlgraph-1.8.6/Makefile.in
+@@ -421,21 +421,25 @@ ifdef DESTDIR
+ OCAMLFINDDEST := -destdir $(DESTDIR)
+ endif
+
++ifneq ($(WANT_OCAMLOPT),no)
++INSTALL_OPT=graph$(LIBEXT) graph.cmx $(CMXA)
++INSTALL_GTK_OPT=$(VIEWER_CMXLIB) $(VIEWER_CMXLIB:.cmx=.o) $(DGRAPH_CMXLIB) $(DGRAPH_CMXLIB:.cmx=.o) graph$(OBJEXT)
++endif
++
+ install-findlib: META
+ ifdef OCAMLFIND
+-ifeq (@LABLGNOMECANVAS@,yes)
++ifeq ($(WANT_GTK),yes)
+ $(OCAMLFIND) install $(OCAMLFINDDEST) ocamlgraph META \
+ $(SRCDIR)/*.mli $(VIEWER_DIR)/*.mli $(DGRAPH_DIR)/*.mli \
+- graph$(OBJEXT) graph$(LIBEXT) graph.cmx graph.cmo graph.cmi \
+- $(CMA) $(CMXA) \
+- $(VIEWER_CMXLIB) $(VIEWER_CMOLIB) $(VIEWER_CMILIB) \
+- $(VIEWER_CMXLIB:.cmx=.o) \
+- $(DGRAPH_CMXLIB) $(DGRAPH_CMOLIB) $(DGRAPH_CMILIB) \
+- $(DGRAPH_CMXLIB:.cmx=.o)
++ $(INSTALL_OPT) graph.cmo graph.cmi \
++ $(CMA) \
++ $(INSTALL_GTK_OPT) \
++ $(VIEWER_CMOLIB) $(VIEWER_CMILIB) \
++ $(DGRAPH_CMOLIB) $(DGRAPH_CMILIB)
+ else
+ $(OCAMLFIND) install $(OCAMLFINDDEST) ocamlgraph META \
+ $(SRCDIR)/*.mli $(VIEWER_DIR)/*.mli $(DGRAPH_DIR)/*.mli \
+- graph$(LIBEXT) graph.cmx graph.cmo graph.cmi $(CMA) $(CMXA)
++ $(INSTALL_OPT) graph.cmo graph.cmi $(CMA)
+ endif
+ endif
+
diff --git a/dev-ml/ocamlgraph/files/ocamlgraph-1.8.7-test.patch b/dev-ml/ocamlgraph/files/ocamlgraph-1.8.7-test.patch
new file mode 100644
index 000000000000..f0d370cfd94a
--- /dev/null
+++ b/dev-ml/ocamlgraph/files/ocamlgraph-1.8.7-test.patch
@@ -0,0 +1,19 @@
+commit 726e8d6e31224eb70f75655579da9a374e910b98
+Author: Jean-Christophe Filliatre <Jean-Christophe.Filliatre@lri.fr>
+Date: Mon Feb 13 08:41:58 2017 +0100
+
+ fixed 'make check'
+
+diff --git a/Makefile.in b/Makefile.in
+index 58b9e9c..9ce40df 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -360,7 +360,7 @@ bin/testunix.opt: $(CMXA) myTest/testunix.ml
+ $(OCAMLOPT) -unsafe -inline 100 -o $@ unix.cmxa $^
+
+ check: $(CMA) tests/check.ml bin/test-ts
+- ocaml $(CMA) tests/test_clique.ml tests/check.ml
++ ocaml -I . $(CMA) tests/test_clique.ml tests/check.ml
+ bin/test-ts 10
+
+ # Additional rules
diff --git a/dev-ml/ocamlgraph/metadata.xml b/dev-ml/ocamlgraph/metadata.xml
new file mode 100644
index 000000000000..7640c195a7fe
--- /dev/null
+++ b/dev-ml/ocamlgraph/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">backtracking/ocamlgraph</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/ocamlgraph/ocamlgraph-1.8.7.ebuild b/dev-ml/ocamlgraph/ocamlgraph-1.8.7.ebuild
new file mode 100644
index 000000000000..09d0810bef2b
--- /dev/null
+++ b/dev-ml/ocamlgraph/ocamlgraph-1.8.7.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit findlib eutils
+
+DESCRIPTION="O'Caml Graph library"
+HOMEPAGE="http://ocamlgraph.lri.fr/index.en.html"
+SRC_URI="http://ocamlgraph.lri.fr/download/${P}.tar.gz"
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ppc x86"
+RDEPEND=">=dev-lang/ocaml-3.10.2:=[ocamlopt?]
+ gtk? ( dev-ml/lablgtk:=[gnomecanvas,ocamlopt?] )"
+DEPEND="${RDEPEND}
+ doc? ( dev-tex/hevea dev-ml/ocamlweb )"
+IUSE="doc examples gtk +ocamlopt"
+
+src_prepare() {
+ epatch "${FILESDIR}/${PN}-1.8.6-installfindlib.patch"
+ epatch "${FILESDIR}/${P}-test.patch"
+}
+
+src_compile() {
+ emake byte
+ use ocamlopt && emake opt
+
+ if use doc; then
+ emake doc
+ fi
+
+ if use gtk; then
+ emake OCAMLBEST=$(usex ocamlopt opt byte) viewer dgraph editor
+ fi
+}
+
+src_install() {
+ findlib_src_preinst
+ use ocamlopt || export WANT_OCAMLOPT=no
+ use gtk && export WANT_GTK=yes
+ emake install-findlib
+
+ if use gtk ; then
+ local ext=byte
+ use ocamlopt && ext=opt
+ newbin dgraph/dgraph.${ext} ${PN}-dgraph
+ newbin editor/editor.${ext} ${PN}-editor
+ newbin view_graph/viewgraph.${ext} ${PN}-viewgraph
+ fi
+
+ dodoc README.adoc CREDITS FAQ CHANGES
+ if use doc; then
+ dohtml doc/*
+ fi
+
+ if use examples; then
+ insinto /usr/share/doc/${PF}
+ doins -r examples
+ docompress -x /usr/share/doc/${PF}/examples
+ fi
+}
diff --git a/dev-ml/ocamlgraph/ocamlgraph-1.8.8.ebuild b/dev-ml/ocamlgraph/ocamlgraph-1.8.8.ebuild
new file mode 100644
index 000000000000..71e564d353db
--- /dev/null
+++ b/dev-ml/ocamlgraph/ocamlgraph-1.8.8.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit findlib
+
+DESCRIPTION="O'Caml Graph library"
+HOMEPAGE="http://ocamlgraph.lri.fr/index.en.html"
+SRC_URI="http://ocamlgraph.lri.fr/download/${P}.tar.gz"
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+RDEPEND=">=dev-lang/ocaml-3.10.2:=[ocamlopt?]
+ gtk? ( dev-ml/lablgtk:=[gnomecanvas,ocamlopt?] )"
+DEPEND="${RDEPEND}
+ doc? ( dev-tex/hevea dev-ml/ocamlweb )"
+IUSE="doc examples gtk +ocamlopt"
+
+src_compile() {
+ emake byte
+ use ocamlopt && emake opt
+
+ if use doc; then
+ emake doc
+ fi
+
+ if use gtk; then
+ emake OCAMLBEST=$(usex ocamlopt opt byte) viewer dgraph editor
+ fi
+}
+
+src_install() {
+ findlib_src_preinst
+ use ocamlopt || export WANT_OCAMLOPT=no
+ use gtk && export WANT_GTK=yes
+ emake install-findlib
+
+ if use gtk ; then
+ local ext=byte
+ use ocamlopt && ext=opt
+ newbin dgraph/dgraph.${ext} ${PN}-dgraph
+ newbin editor/editor.${ext} ${PN}-editor
+ newbin view_graph/viewgraph.${ext} ${PN}-viewgraph
+ fi
+
+ dodoc README.adoc CREDITS FAQ CHANGES
+ if use doc; then
+ dohtml doc/*
+ fi
+
+ if use examples; then
+ insinto /usr/share/doc/${PF}
+ doins -r examples
+ docompress -x /usr/share/doc/${PF}/examples
+ fi
+}
diff --git a/dev-ml/ocamlify-0.0.2 b/dev-ml/ocamlify-0.0.2
deleted file mode 100644
index dc7940e08efa..000000000000
--- a/dev-ml/ocamlify-0.0.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=OCamlify creates OCaml code by including files into strings or string lists
-EAPI=5
-HOMEPAGE=http://forge.ocamlcore.org/projects/ocamlify
-IUSE=+ocamlopt debug
-KEYWORDS=~amd64 ~x86
-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 983774947da124fb7d542ce25a218bb1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e oasis 9256ed89af74c3365ec888c00bfdfe43 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1104e7686a98f98111717ffb264f98bc
diff --git a/dev-ml/ocamlify/Manifest b/dev-ml/ocamlify/Manifest
new file mode 100644
index 000000000000..af8b73c006e4
--- /dev/null
+++ b/dev-ml/ocamlify/Manifest
@@ -0,0 +1,3 @@
+DIST ocamlify-0.0.2.tar.gz 53184 BLAKE2B fff11edce964a0552f9a7f130872f393e764a9413ac526d643dd575969a47cbc6a0f9c5040c0fcd3e5beb11c42a8a3a35fe55898eab176b11c659bdd74729b90 SHA512 e36dd09de6163be1e4d1a54944bb66871a5d461b3ead9ee8393d91a624cf6f7d038be8d8b9db36b04786adff67eb830d9aa3e81475e774dc0dee73adb985079e
+EBUILD ocamlify-0.0.2.ebuild 500 BLAKE2B a4ff4a45975e46134a0854d53870b851d0603594e92a25af8cfbb9b5d3f3815f5a65e27fc36db856e7490be4e79332e871c00be7ec7949609c00dfd398e97d20 SHA512 e306f5dcb70b564b5f0925316c78aead556fcab45f93be395a88d5fbd5ee5f975c358814037f90d5dd2a5ad2f87356bedd1b16f7606ccb90433c9e178e21d92c
+MISC metadata.xml 243 BLAKE2B 010ca240ae06e9a9f6d7ba213eb06df36d9ba862ff2d2458d98a9fea1a1e7f3026d13832a73bce1b3ad9345029425e6abfae9e03bf126f2329b3f030ed3753fd SHA512 1c5b4b2163017e496999d1f87e5c9c5ac6c11b2e9187450ccfb3df258f34e54d278972f04ee0e8429476c6f87e091a869ac2a28c6e8c8e6d20678c3e74061449
diff --git a/dev-ml/ocamlify/metadata.xml b/dev-ml/ocamlify/metadata.xml
new file mode 100644
index 000000000000..ffac4d7ebc01
--- /dev/null
+++ b/dev-ml/ocamlify/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-ml/ocamlify/ocamlify-0.0.2.ebuild b/dev-ml/ocamlify/ocamlify-0.0.2.ebuild
new file mode 100644
index 000000000000..0f54e07a5cc1
--- /dev/null
+++ b/dev-ml/ocamlify/ocamlify-0.0.2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit oasis
+
+DESCRIPTION="OCamlify creates OCaml code by including files into strings or string lists"
+HOMEPAGE="http://forge.ocamlcore.org/projects/ocamlify"
+SRC_URI="http://forge.ocamlcore.org/frs/download.php/1209/${P}.tar.gz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+IUSE=""
+
+DOCS=( "README.txt" "AUTHORS.txt" )
diff --git a/dev-ml/ocamlmod-0.0.8 b/dev-ml/ocamlmod-0.0.8
deleted file mode 100644
index 32b1b599bcd1..000000000000
--- a/dev-ml/ocamlmod-0.0.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=Generate OCaml modules from source files
-EAPI=5
-HOMEPAGE=http://forge.ocamlcore.org/projects/ocamlmod/
-IUSE=+ocamlopt debug
-KEYWORDS=~amd64 ~x86
-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 983774947da124fb7d542ce25a218bb1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e oasis 9256ed89af74c3365ec888c00bfdfe43 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=20706d559ae5cb0a85aacb0b824c9bc8
diff --git a/dev-ml/ocamlmod-0.0.9 b/dev-ml/ocamlmod-0.0.9
deleted file mode 100644
index 760272d6fb2e..000000000000
--- a/dev-ml/ocamlmod-0.0.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=test? ( >=dev-ml/ounit-2.0.0 ) >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=Generate OCaml modules from source files
-EAPI=5
-HOMEPAGE=http://forge.ocamlcore.org/projects/ocamlmod/
-IUSE=+ocamlopt debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1-with-linking-exception
-RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?]
-SLOT=0/0.0.9
-SRC_URI=http://forge.ocamlcore.org/frs/download.php/1702/ocamlmod-0.0.9.tar.gz
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e oasis 9256ed89af74c3365ec888c00bfdfe43 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1e615c70dc38b42b07a2670a01fadde5
diff --git a/dev-ml/ocamlmod/Manifest b/dev-ml/ocamlmod/Manifest
new file mode 100644
index 000000000000..ad76304272a5
--- /dev/null
+++ b/dev-ml/ocamlmod/Manifest
@@ -0,0 +1,5 @@
+DIST ocamlmod-0.0.8.tar.gz 48985 BLAKE2B a153b172b14216b8e69a51c47a25cd796e6bb2adb5d0c45dac49a5bab8e99f0b8511e5e1818abe2bf86ea5280b9b1c19aa21db23ed686387c3414c0df6f2667c SHA512 beb64c109c241965f33a60b4868f5215e6c112742a3be214d3b7a0503b9d29494c0453fa5f2551bbc1975cd4b123d0b917116aeeba968d2a7d2c6fb9651a64f4
+DIST ocamlmod-0.0.9.tar.gz 55025 BLAKE2B 26be662e814543b65a2fb293732257a803c0cfc544550d0339617ff3c59ce1cf44f2330582e6eeca313cf8e25984d7cbfc4fc1c1a3b830fc490a16551961974e SHA512 cf0d3671cf8fa83bdbd0e4b47888a50f9eab24691c71685c0612a9a8efaf36ba9fa66cee604c928a71f2d8da40b35453d2f2d3619f73141aba0f46de3bd97537
+EBUILD ocamlmod-0.0.8.ebuild 539 BLAKE2B 75c0f2563fc1433cd0563b68ed8ea83969b96480df7e80502226bfbecc8f06d5a64a106608a59eb758b149e9a3127a718b96199cdaa47ccd126d867a0e498bfb SHA512 0b53eb50eb1ebc27612656ffea415cca3d990775220da54834bb1e31a978c515d1195b6b2b4c1d625e1bdb589bda328ddc61a6820191f8e572282f17d64a6a24
+EBUILD ocamlmod-0.0.9.ebuild 535 BLAKE2B d21c370acd942a3c4a96a59c7229daaf47ad6cdf301c6416708705b77001a87fe57899c8f1946a232e39ac9ee57a254301e86615b1f87b5dc99fa3e6b3f88762 SHA512 46b855c5625a4bf7ff465ba5e87986f49d89459884f16b43c24dbb3f7434792805d30a8685a621836caddd8cf2909e7bc880a36fd5f4a384164dd448042f608c
+MISC metadata.xml 243 BLAKE2B 010ca240ae06e9a9f6d7ba213eb06df36d9ba862ff2d2458d98a9fea1a1e7f3026d13832a73bce1b3ad9345029425e6abfae9e03bf126f2329b3f030ed3753fd SHA512 1c5b4b2163017e496999d1f87e5c9c5ac6c11b2e9187450ccfb3df258f34e54d278972f04ee0e8429476c6f87e091a869ac2a28c6e8c8e6d20678c3e74061449
diff --git a/dev-ml/ocamlmod/metadata.xml b/dev-ml/ocamlmod/metadata.xml
new file mode 100644
index 000000000000..ffac4d7ebc01
--- /dev/null
+++ b/dev-ml/ocamlmod/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-ml/ocamlmod/ocamlmod-0.0.8.ebuild b/dev-ml/ocamlmod/ocamlmod-0.0.8.ebuild
new file mode 100644
index 000000000000..6a49bd4c7cdb
--- /dev/null
+++ b/dev-ml/ocamlmod/ocamlmod-0.0.8.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+#OASIS_BUILD_TESTS=1
+
+inherit oasis
+
+DESCRIPTION="Generate OCaml modules from source files"
+HOMEPAGE="http://forge.ocamlcore.org/projects/ocamlmod/"
+SRC_URI="https://forge.ocamlcore.org/frs/download.php/1544/ocamlmod-0.0.8.tar.gz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+# test? ( >=dev-ml/ounit-2.0.0 )"
+
+DOCS=( "AUTHORS.txt" "README.txt" )
diff --git a/dev-ml/ocamlmod/ocamlmod-0.0.9.ebuild b/dev-ml/ocamlmod/ocamlmod-0.0.9.ebuild
new file mode 100644
index 000000000000..8133a7a466f3
--- /dev/null
+++ b/dev-ml/ocamlmod/ocamlmod-0.0.9.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+OASIS_BUILD_TESTS=1
+
+inherit oasis
+
+DESCRIPTION="Generate OCaml modules from source files"
+HOMEPAGE="http://forge.ocamlcore.org/projects/ocamlmod/"
+SRC_URI="http://forge.ocamlcore.org/frs/download.php/1702/ocamlmod-0.0.9.tar.gz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+ test? ( >=dev-ml/ounit-2.0.0 )"
+
+DOCS=( "AUTHORS.txt" "README.txt" )
diff --git a/dev-ml/ocamlnet-4.1.2 b/dev-ml/ocamlnet-4.1.2
deleted file mode 100644
index e63cd249793c..000000000000
--- a/dev-ml/ocamlnet-4.1.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=>=dev-ml/findlib-1.0 pcre? ( >=dev-ml/pcre-ocaml-5:= ) >=dev-lang/ocaml-3.10.2:=[ocamlopt?] tk? ( dev-ml/labltk:= ) ssl? ( net-libs/gnutls:= ) gtk? ( >=dev-ml/lablgtk-2:= ) kerberos? ( virtual/krb5 ) zip? ( dev-ml/camlzip:= ) virtual/pkgconfig >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Modules for OCaml application-level Internet protocols
-EAPI=5
-HOMEPAGE=http://projects.camlcity.org/projects/ocamlnet.html
-IUSE=gtk kerberos tk httpd +ocamlopt +pcre ssl zip
-KEYWORDS=amd64 ppc x86 x86-fbsd
-LICENSE=ZLIB GPL-2+
-RDEPEND=>=dev-ml/findlib-1.0 pcre? ( >=dev-ml/pcre-ocaml-5:= ) >=dev-lang/ocaml-3.10.2:=[ocamlopt?] tk? ( dev-ml/labltk:= ) ssl? ( net-libs/gnutls:= ) gtk? ( >=dev-ml/lablgtk-2:= ) kerberos? ( virtual/krb5 ) zip? ( dev-ml/camlzip:= )
-RESTRICT=installsources
-SLOT=0/4.1.2
-SRC_URI=http://download.camlcity.org/download/ocamlnet-4.1.2.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=93afe33042090afeaf8c13c61dfae4ea
diff --git a/dev-ml/ocamlnet-4.1.3 b/dev-ml/ocamlnet-4.1.3
deleted file mode 100644
index 2f7808109715..000000000000
--- a/dev-ml/ocamlnet-4.1.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=>=dev-ml/findlib-1.0 pcre? ( >=dev-ml/pcre-ocaml-5:= ) >=dev-lang/ocaml-3.10.2:=[ocamlopt?] tk? ( dev-ml/labltk:= ) ssl? ( net-libs/gnutls:= ) gtk? ( >=dev-ml/lablgtk-2:= ) kerberos? ( virtual/krb5 ) zip? ( dev-ml/camlzip:= ) virtual/pkgconfig >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Modules for OCaml application-level Internet protocols
-EAPI=5
-HOMEPAGE=http://projects.camlcity.org/projects/ocamlnet.html
-IUSE=gtk kerberos tk httpd +ocamlopt +pcre ssl zip
-KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
-LICENSE=ZLIB GPL-2+
-RDEPEND=>=dev-ml/findlib-1.0 pcre? ( >=dev-ml/pcre-ocaml-5:= ) >=dev-lang/ocaml-3.10.2:=[ocamlopt?] tk? ( dev-ml/labltk:= ) ssl? ( net-libs/gnutls:= ) gtk? ( >=dev-ml/lablgtk-2:= ) kerberos? ( virtual/krb5 ) zip? ( dev-ml/camlzip:= )
-RESTRICT=installsources
-SLOT=0/4.1.3
-SRC_URI=http://download.camlcity.org/download/ocamlnet-4.1.3.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=cd364bd068ae1d3268ab9cd0cd58d6df
diff --git a/dev-ml/ocamlnet-4.1.4 b/dev-ml/ocamlnet-4.1.4
deleted file mode 100644
index 0a3e854ea9b1..000000000000
--- a/dev-ml/ocamlnet-4.1.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=>=dev-ml/findlib-1.0 pcre? ( >=dev-ml/pcre-ocaml-5:= ) >=dev-lang/ocaml-3.10.2:=[ocamlopt?] tk? ( dev-ml/labltk:= ) ssl? ( net-libs/gnutls:= ) gtk? ( >=dev-ml/lablgtk-2:= ) kerberos? ( virtual/krb5 ) zip? ( dev-ml/camlzip:= ) virtual/pkgconfig >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Modules for OCaml application-level Internet protocols
-EAPI=5
-HOMEPAGE=http://projects.camlcity.org/projects/ocamlnet.html
-IUSE=gtk kerberos tk httpd +ocamlopt +pcre ssl zip
-KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
-LICENSE=ZLIB GPL-2+
-RDEPEND=>=dev-ml/findlib-1.0 pcre? ( >=dev-ml/pcre-ocaml-5:= ) >=dev-lang/ocaml-3.10.2:=[ocamlopt?] tk? ( dev-ml/labltk:= ) ssl? ( net-libs/gnutls:= ) gtk? ( >=dev-ml/lablgtk-2:= ) kerberos? ( virtual/krb5 ) zip? ( dev-ml/camlzip:= )
-RESTRICT=installsources
-SLOT=0/4.1.4
-SRC_URI=http://download.camlcity.org/download/ocamlnet-4.1.4.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=cd364bd068ae1d3268ab9cd0cd58d6df
diff --git a/dev-ml/ocamlnet/Manifest b/dev-ml/ocamlnet/Manifest
new file mode 100644
index 000000000000..b70f0747a7fc
--- /dev/null
+++ b/dev-ml/ocamlnet/Manifest
@@ -0,0 +1,8 @@
+AUX ocaml405.patch 4761 BLAKE2B eb6a2fabcbcda0676652e4010e28edc8fd82b0d2307fb5d847105aff775e405b3399854d13be13660255aaf0a55627ab0d307545fbb7d91076a50ff103b97d34 SHA512 79378c0cb59ca4abc2280932045ca80e5d7e3ff47919067c363f96d32e24899825f79a83bcf0abfc600513eecc8e046382a42937545b4b62f9b5f992d8d29480
+DIST ocamlnet-4.1.2.tar.gz 4623183 BLAKE2B 7e8d5cdc823b9e924258f75f00957ba185d49555377ba2a2d960c47e2ea958059e1ab62e27be63770bb4f547e1fa0cb788a54c3e698180b2b15f0097fe84455a SHA512 69f42042a54efd662db2217224da53513fc7e72c7b2313d4a4a1128f1b4624f4f6298434f5b19f354b832119ff151abc81e85eb0108d6eb24f30f82d176e0b4d
+DIST ocamlnet-4.1.3.tar.gz 4553037 BLAKE2B 177d2a3b947e6123bdef0ee180c612f832a22dfd90fe0c44b60ba2ebea3629103db9730eb1b926b7d7bf39b489934b8949b0fd08e5155c7f41e3c065c215558c SHA512 683ab6f529639c9da01478ba8ba7a1bf89a418ad3872331bb3e29067c0a75ddc0db996630ce5a5dd116967d6e3e756ade02d9a78b865bbc226f95d01af9e3956
+DIST ocamlnet-4.1.4.tar.gz 4552969 BLAKE2B 3dfedcd09eb91d1ca8e13b7a87dfe70cfb88d57d0b4fa970fe6179affa05ba3fdeaad0dfbb6ac267e7a6530c289408b1a8ad66a805226245f80fe66770addad5 SHA512 ca502444f81898ccda27d61760a357aad59624cf3c4c025d49dd1c2e7bc3ef497c199634247ba7731e016c234e5cd92d2599d1ef9ecd55c3b6e7a64fc4773ee0
+EBUILD ocamlnet-4.1.2.ebuild 1713 BLAKE2B 5a6e9a1cd7c5becf722f624ba2abfd443c2b9d94c7a9d74ed07c092b63aa9449cf44d267527fb1b520f662e85db4da7de236f98989296929277717a92da7c8fa SHA512 1f6038416a3bf9dd50659dff33c8ebaf200dd732497bd14cfdcaece78829e21073a1b3ec3f49f030f410748ffd6c77b14ec7b4aebef8276f977605cb2d28c63b
+EBUILD ocamlnet-4.1.3.ebuild 1661 BLAKE2B d31f9c05eebcb05038d63b9e736ee1e5a9f0ab794492cafc8d82f70d48ae469e53732f095e601517ec71e9fca11be88179d248cd6cbc68cffe8a3c703b06c8c1 SHA512 062da5d5273fbbe357a24e6273b7d6009b976aaf5112eda40fde4038b6d5fc199165b3325c5e10709610f3f639c5acdd430335f36615966e21be90497f5f02fa
+EBUILD ocamlnet-4.1.4.ebuild 1661 BLAKE2B d31f9c05eebcb05038d63b9e736ee1e5a9f0ab794492cafc8d82f70d48ae469e53732f095e601517ec71e9fca11be88179d248cd6cbc68cffe8a3c703b06c8c1 SHA512 062da5d5273fbbe357a24e6273b7d6009b976aaf5112eda40fde4038b6d5fc199165b3325c5e10709610f3f639c5acdd430335f36615966e21be90497f5f02fa
+MISC metadata.xml 418 BLAKE2B 2a25461a3b2b546cd0d3ffba308e482bf5e6db5c06c95c5b48d4d603a05eb79b31b29c2534db4d9bacdf63f85ca9f26e0d0bbc921fb7e50bbb06478779de9f6d SHA512 fc37f93cd3e0ff137825c24b36d564842bad46e4f34a080a6fcbcfdb307fa7a23f8fc82f0edb2a5a08a08e39be866e7f395d28119b8bc595d3af4a11ef1d7578
diff --git a/dev-ml/ocamlnet/files/ocaml405.patch b/dev-ml/ocamlnet/files/ocaml405.patch
new file mode 100644
index 000000000000..a112d1fb4473
--- /dev/null
+++ b/dev-ml/ocamlnet/files/ocaml405.patch
@@ -0,0 +1,145 @@
+commit f3d451b81c4caa8cce7f55af6463ec685e79e227
+Author: Gerd Stolpmann <gerd@gerd-stolpmann.de>
+Date: Sun Feb 26 21:04:49 2017 +0100
+
+ ocaml-4.05: support for O_KEEPEXEC
+
+diff --git a/code/src/netsys/Makefile b/code/src/netsys/Makefile
+index cbc1ce2..cb70a09 100644
+--- a/code/src/netsys/Makefile
++++ b/code/src/netsys/Makefile
+@@ -56,7 +56,7 @@ OCAMLC_OPTIONS_FOR_netsys_c_xdr.c = -ccopt -O
+ OCAMLC_OPTIONS += $(STRING_OPTS)
+ OCAMLOPT_OPTIONS += $(STRING_OPTS)
+
+-PP_OPTIONS = -pp "$(CPPO) $(DEF_O_SHARE_DELETE) $(DEF_O_CLOEXEC) $(PP_BYTES) $(PP_DEPRECATED)"
++PP_OPTIONS = -pp "$(CPPO) $(DEF_O_SHARE_DELETE) $(DEF_O_CLOEXEC) $(DEF_O_KEEPEXEC) $(PP_BYTES) $(PP_DEPRECATED)"
+
+ INSTALL_EXTRA += netsys_c_event.h $(OOH_OBJECT)
+
+diff --git a/code/src/netsys/configure b/code/src/netsys/configure
+index 1325843..f4dbc09 100755
+--- a/code/src/netsys/configure
++++ b/code/src/netsys/configure
+@@ -437,6 +437,21 @@ else
+ echo "no"
+ fi
+
++######################################################################
++
++printf "Checking for O_KEEPEXEC... "
++mkdir -p tmp
++cat <<_EOF_ >tmp/t.ml
++let x = Unix.O_KEEPEXEC;;
++_EOF_
++
++def_o_keepexec="-D NO_O_KEEPEXEC"
++if ocaml unix.cma tmp/t.ml >/dev/null 2>/dev/null; then
++ echo "yes"
++ def_o_keepexec="-D HAVE_O_KEEPEXEC"
++else
++ echo "no"
++fi
+
+ ######################################################################
+
+@@ -445,6 +460,7 @@ cat <<EOF >Makefile.conf
+ NETSYS_LINK_OPTIONS = $netsys_link_options
+ DEF_O_SHARE_DELETE = $def_o_share_delete
+ DEF_O_CLOEXEC = $def_o_cloexec
++DEF_O_KEEPEXEC = $def_o_keepexec
+ OOH_OBJECT = $def_ooh_object
+ EOF
+
+diff --git a/code/src/netsys/netsys_c.c b/code/src/netsys/netsys_c.c
+index a8b16be..4c30873 100644
+--- a/code/src/netsys/netsys_c.c
++++ b/code/src/netsys/netsys_c.c
+@@ -448,32 +448,43 @@ static int at_flags_table[] = {
+ #ifndef O_RSYNC
+ #define O_RSYNC 0
+ #endif
+-#ifndef O_CLOEXEC
+-#define NEED_CLOEXEC_EMULATION
+-#define O_CLOEXEC 0
+-#endif
+
+ static int open_flag_table[] = {
+ O_RDONLY, O_WRONLY, O_RDWR, O_NONBLOCK, O_APPEND, O_CREAT, O_TRUNC, O_EXCL,
+- O_NOCTTY, O_DSYNC, O_SYNC, O_RSYNC, 0 /* O_SHARE_DELETE */, O_CLOEXEC
++ O_NOCTTY, O_DSYNC, O_SYNC, O_RSYNC,
++ 0 /* O_SHARE_DELETE */, 0 /* O_CLOEXEC */, 0 /* O_KEEPEXEC */
+ };
+
+-#ifdef NEED_CLOEXEC_EMULATION
++enum { CLOEXEC = 1, KEEPEXEC = 2 };
++
+ static int open_cloexec_table[] = {
+- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1
++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, CLOEXEC, KEEPEXEC
+ };
++#ifndef HAVE_O_KEEPEXEC
++#define unix_cloexec_default 0
+ #endif
++
+ #endif
+
+ CAMLprim value netsys_openat(value dirfd, value path, value flags, value perm)
+ {
+ #ifdef HAVE_AT
+ CAMLparam4(dirfd, path, flags, perm);
+- int ret, cv_flags;
++ int ret, cv_flags, clo_flags, cloexec;
+ char * p;
+
+ /* shamelessly copied from ocaml distro */
+ cv_flags = convert_flag_list(flags, open_flag_table);
++ clo_flags = convert_flag_list(flags, open_cloexec_table);
++ if (clo_flags & CLOEXEC)
++ cloexec = 1;
++ else if (clo_flags & KEEPEXEC)
++ cloexec = 0;
++ else
++ cloexec = unix_cloexec_default;
++#if defined(O_CLOEXEC)
++ if (cloexec) cv_flags |= O_CLOEXEC;
++#endif
+ p = stat_alloc(string_length(path) + 1);
+ strcpy(p, String_val(path));
+ enter_blocking_section();
+@@ -481,8 +492,8 @@ CAMLprim value netsys_openat(value dirfd, value path, value flags, value perm)
+ leave_blocking_section();
+ stat_free(p);
+ if (ret == -1) uerror("openat", path);
+-#if defined(NEED_CLOEXEC_EMULATION) && defined(FD_CLOEXEC)
+- if (convert_flag_list(flags, open_cloexec_table) != 0) {
++#if !defined(O_CLOEXEC)
++ {
+ int flags = fcntl(Int_val(dirfd), F_GETFD, 0);
+ if (flags == -1 || fcntl(Int_val(dirfd), F_SETFD, flags | FD_CLOEXEC) == -1)
+ uerror("openat", path);
+diff --git a/code/src/netsys/netsys_posix.ml b/code/src/netsys/netsys_posix.ml
+index 602ceae..3bf3e7c 100644
+--- a/code/src/netsys/netsys_posix.ml
++++ b/code/src/netsys/netsys_posix.ml
+@@ -715,6 +715,12 @@ type at_flag = AT_EACCESS | AT_SYMLINK_NOFOLLOW | AT_SYMLINK_FOLLOW |
+ AT_REMOVEDIR
+
+ (* The stubs assume these type definitions: *)
++#ifdef HAVE_O_KEEPEXEC
++type open_flag1 = Unix.open_flag =
++ O_RDONLY | O_WRONLY | O_RDWR | O_NONBLOCK | O_APPEND | O_CREAT | O_TRUNC
++ | O_EXCL | O_NOCTTY | O_DSYNC | O_SYNC | O_RSYNC | O_SHARE_DELETE
++ | O_CLOEXEC | O_KEEPEXEC
++#else
+ #ifdef HAVE_O_CLOEXEC
+ type open_flag1 = Unix.open_flag =
+ O_RDONLY | O_WRONLY | O_RDWR | O_NONBLOCK | O_APPEND | O_CREAT | O_TRUNC
+@@ -731,6 +737,7 @@ type open_flag1 = Unix.open_flag =
+ | O_EXCL | O_NOCTTY | O_DSYNC | O_SYNC | O_RSYNC
+ #endif
+ #endif
++#endif
+
+ type access_permission1 = Unix.access_permission =
+ R_OK | W_OK | X_OK | F_OK
diff --git a/dev-ml/ocamlnet/metadata.xml b/dev-ml/ocamlnet/metadata.xml
new file mode 100644
index 000000000000..196389cbbc7c
--- /dev/null
+++ b/dev-ml/ocamlnet/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+<use>
+ <flag name="httpd">Enables net-httpd web server component</flag>
+ <flag name="zip">Enables netzip support to read/write gzip data using object channels</flag>
+</use>
+</pkgmetadata>
diff --git a/dev-ml/ocamlnet/ocamlnet-4.1.2.ebuild b/dev-ml/ocamlnet/ocamlnet-4.1.2.ebuild
new file mode 100644
index 000000000000..6d89e100f0ec
--- /dev/null
+++ b/dev-ml/ocamlnet/ocamlnet-4.1.2.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils findlib
+
+MY_P=${P/_beta/test}
+DESCRIPTION="Modules for OCaml application-level Internet protocols"
+HOMEPAGE="http://projects.camlcity.org/projects/ocamlnet.html"
+SRC_URI="http://download.camlcity.org/download/${MY_P}.tar.gz"
+
+LICENSE="ZLIB GPL-2+"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ppc x86 x86-fbsd"
+IUSE="gtk kerberos tk httpd +ocamlopt +pcre ssl zip"
+RESTRICT="installsources"
+
+# the auth-dh compile flag has been disabled as well, since it depends on
+# ocaml-cryptgps, which is not available.
+
+RDEPEND=">=dev-ml/findlib-1.0
+ pcre? ( >=dev-ml/pcre-ocaml-5:= )
+ >=dev-lang/ocaml-3.10.2:=[ocamlopt?]
+ tk? ( dev-ml/labltk:= )
+ ssl? ( net-libs/gnutls:= )
+ gtk? ( >=dev-ml/lablgtk-2:= )
+ kerberos? ( virtual/krb5 )
+ zip? ( dev-ml/camlzip:= )
+ "
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ epatch "${FILESDIR}/ocaml405.patch"
+}
+
+ocamlnet_use_with() {
+ if use $1; then
+ echo "-with-$2"
+ else
+ echo "-without-$2"
+ fi
+}
+
+ocamlnet_use_enable() {
+ if use $1; then
+ echo "-enable-$2"
+ else
+ echo "-disable-$2"
+ fi
+}
+
+src_configure() {
+ ./configure \
+ -bindir /usr/bin \
+ -datadir /usr/share/${PN} \
+ $(ocamlnet_use_enable ssl gnutls) \
+ $(ocamlnet_use_enable gtk gtk2) \
+ $(ocamlnet_use_enable kerberos gssapi) \
+ $(ocamlnet_use_enable pcre pcre) \
+ $(ocamlnet_use_enable tk tcl) \
+ $(ocamlnet_use_enable zip zip) \
+ $(ocamlnet_use_with httpd nethttpd) \
+ || die "Error : econf failed!"
+}
+
+src_compile() {
+ emake -j1 all
+ if use ocamlopt; then
+ emake -j1 opt
+ fi
+}
+
+src_install() {
+ export STRIP_MASK="*/bin/*"
+ findlib_src_install
+}
diff --git a/dev-ml/ocamlnet/ocamlnet-4.1.3.ebuild b/dev-ml/ocamlnet/ocamlnet-4.1.3.ebuild
new file mode 100644
index 000000000000..1460d03f5cc4
--- /dev/null
+++ b/dev-ml/ocamlnet/ocamlnet-4.1.3.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils findlib
+
+MY_P=${P/_beta/test}
+DESCRIPTION="Modules for OCaml application-level Internet protocols"
+HOMEPAGE="http://projects.camlcity.org/projects/ocamlnet.html"
+SRC_URI="http://download.camlcity.org/download/${MY_P}.tar.gz"
+
+LICENSE="ZLIB GPL-2+"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE="gtk kerberos tk httpd +ocamlopt +pcre ssl zip"
+RESTRICT="installsources"
+
+# the auth-dh compile flag has been disabled as well, since it depends on
+# ocaml-cryptgps, which is not available.
+
+RDEPEND=">=dev-ml/findlib-1.0
+ pcre? ( >=dev-ml/pcre-ocaml-5:= )
+ >=dev-lang/ocaml-3.10.2:=[ocamlopt?]
+ tk? ( dev-ml/labltk:= )
+ ssl? ( net-libs/gnutls:= )
+ gtk? ( >=dev-ml/lablgtk-2:= )
+ kerberos? ( virtual/krb5 )
+ zip? ( dev-ml/camlzip:= )
+ "
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+"
+
+S=${WORKDIR}/${MY_P}
+
+ocamlnet_use_with() {
+ if use $1; then
+ echo "-with-$2"
+ else
+ echo "-without-$2"
+ fi
+}
+
+ocamlnet_use_enable() {
+ if use $1; then
+ echo "-enable-$2"
+ else
+ echo "-disable-$2"
+ fi
+}
+
+src_configure() {
+ ./configure \
+ -bindir /usr/bin \
+ -datadir /usr/share/${PN} \
+ $(ocamlnet_use_enable ssl gnutls) \
+ $(ocamlnet_use_enable gtk gtk2) \
+ $(ocamlnet_use_enable kerberos gssapi) \
+ $(ocamlnet_use_enable pcre pcre) \
+ $(ocamlnet_use_enable tk tcl) \
+ $(ocamlnet_use_enable zip zip) \
+ $(ocamlnet_use_with httpd nethttpd) \
+ || die "Error : econf failed!"
+}
+
+src_compile() {
+ emake -j1 all
+ if use ocamlopt; then
+ emake -j1 opt
+ fi
+}
+
+src_install() {
+ export STRIP_MASK="*/bin/*"
+ findlib_src_install
+}
diff --git a/dev-ml/ocamlnet/ocamlnet-4.1.4.ebuild b/dev-ml/ocamlnet/ocamlnet-4.1.4.ebuild
new file mode 100644
index 000000000000..1460d03f5cc4
--- /dev/null
+++ b/dev-ml/ocamlnet/ocamlnet-4.1.4.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils findlib
+
+MY_P=${P/_beta/test}
+DESCRIPTION="Modules for OCaml application-level Internet protocols"
+HOMEPAGE="http://projects.camlcity.org/projects/ocamlnet.html"
+SRC_URI="http://download.camlcity.org/download/${MY_P}.tar.gz"
+
+LICENSE="ZLIB GPL-2+"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE="gtk kerberos tk httpd +ocamlopt +pcre ssl zip"
+RESTRICT="installsources"
+
+# the auth-dh compile flag has been disabled as well, since it depends on
+# ocaml-cryptgps, which is not available.
+
+RDEPEND=">=dev-ml/findlib-1.0
+ pcre? ( >=dev-ml/pcre-ocaml-5:= )
+ >=dev-lang/ocaml-3.10.2:=[ocamlopt?]
+ tk? ( dev-ml/labltk:= )
+ ssl? ( net-libs/gnutls:= )
+ gtk? ( >=dev-ml/lablgtk-2:= )
+ kerberos? ( virtual/krb5 )
+ zip? ( dev-ml/camlzip:= )
+ "
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+"
+
+S=${WORKDIR}/${MY_P}
+
+ocamlnet_use_with() {
+ if use $1; then
+ echo "-with-$2"
+ else
+ echo "-without-$2"
+ fi
+}
+
+ocamlnet_use_enable() {
+ if use $1; then
+ echo "-enable-$2"
+ else
+ echo "-disable-$2"
+ fi
+}
+
+src_configure() {
+ ./configure \
+ -bindir /usr/bin \
+ -datadir /usr/share/${PN} \
+ $(ocamlnet_use_enable ssl gnutls) \
+ $(ocamlnet_use_enable gtk gtk2) \
+ $(ocamlnet_use_enable kerberos gssapi) \
+ $(ocamlnet_use_enable pcre pcre) \
+ $(ocamlnet_use_enable tk tcl) \
+ $(ocamlnet_use_enable zip zip) \
+ $(ocamlnet_use_with httpd nethttpd) \
+ || die "Error : econf failed!"
+}
+
+src_compile() {
+ emake -j1 all
+ if use ocamlopt; then
+ emake -j1 opt
+ fi
+}
+
+src_install() {
+ export STRIP_MASK="*/bin/*"
+ findlib_src_install
+}
diff --git a/dev-ml/ocamlpam-1.1 b/dev-ml/ocamlpam-1.1
deleted file mode 100644
index d8775935b145..000000000000
--- a/dev-ml/ocamlpam-1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] sys-libs/pam >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=OCamlPAM - an OCaml library for PAM
-EAPI=5
-HOMEPAGE=http://sharvil.nanavati.net/projects/ocamlpam/
-IUSE=+ocamlopt
-KEYWORDS=~amd64
-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 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8ba4deff43590136e164a83a183a1188
diff --git a/dev-ml/ocamlpam/Manifest b/dev-ml/ocamlpam/Manifest
new file mode 100644
index 000000000000..7556a330fa59
--- /dev/null
+++ b/dev-ml/ocamlpam/Manifest
@@ -0,0 +1,5 @@
+AUX ocaml404.patch 359 BLAKE2B 9d1570339b83e397217946bb8663e867b54a402ce5de34457c25a5f5a1a2a99029c750f7acc48160d90eb47e2ae082c2b07bd137e949a67de3f1d8c91cbc4f12 SHA512 998dcc89987fb237d5b89de81b5cd9ddee6bd86c5710614c61357c2e79864dd9a6dc43f7495a176a778c74485b71a1566669c5df36808b21e87e6fbf6efe1814
+AUX ocamlpam-1.1-makefile.patch 512 BLAKE2B 03d328726f6c6070c5f8003c78a22f0755fcd5f8e182a02d44ea419b431dde9ce03d1ea1171c3a3eb80a38aadea70a273f2ecc3503967614287b18a51b864c4b SHA512 895b33ede124fec4098e17b6042381657850f488f88f1f84dac1f220798f7f7147a4566c059564838c083fbd3c97e8c0f372cb2a60e771c4fa4c945b110397d7
+DIST ocamlpam-1.1.tar.gz 7739 BLAKE2B fcd6e7de8e948293f88a5fd8f7bda666334c80d580328dbbee1056a9dd5a788006a269adaf6eef419ef1f12a8641811f8c601146425a8ecbbc50dd25ed732fc8 SHA512 84199a1e94db93952fd058c3bf03865c058abc0bb5fe09b489717e7aa77687496d40d80ed00be99e59e58c13b044356a05cae5f5aebf4faec470b66696042762
+EBUILD ocamlpam-1.1.ebuild 849 BLAKE2B 4a65527781ad611920f7ac39ae4855ee32b90dc836d3d11915a178bf0c5e8957e23457b64cd9a577319f16d9d169494e69ae0d55f43e0867a6d2ba798bdd6005 SHA512 8911937324ee4a9644bc83e47b4d23d4e1a90f3de8f4ae8affc5c84ead9e57fbf055807138348c1b5f79ba52c22ccf2730f8ad7f43a485137cab2ae47a250852
+MISC metadata.xml 243 BLAKE2B 010ca240ae06e9a9f6d7ba213eb06df36d9ba862ff2d2458d98a9fea1a1e7f3026d13832a73bce1b3ad9345029425e6abfae9e03bf126f2329b3f030ed3753fd SHA512 1c5b4b2163017e496999d1f87e5c9c5ac6c11b2e9187450ccfb3df258f34e54d278972f04ee0e8429476c6f87e091a869ac2a28c6e8c8e6d20678c3e74061449
diff --git a/dev-ml/ocamlpam/files/ocaml404.patch b/dev-ml/ocamlpam/files/ocaml404.patch
new file mode 100644
index 000000000000..4964edf951f4
--- /dev/null
+++ b/dev-ml/ocamlpam/files/ocaml404.patch
@@ -0,0 +1,12 @@
+Index: ocamlpam-1.1/pam_stubs.c
+===================================================================
+--- ocamlpam-1.1.orig/pam_stubs.c
++++ ocamlpam-1.1/pam_stubs.c
+@@ -57,6 +57,7 @@ static int converse(int nMsg, const stru
+ struct pam_response * local_responses;
+ caml_pam_handle * h;
+
++ CAMLparam0 ();
+ CAMLlocal1(ret);
+
+ h = (caml_pam_handle *)data;
diff --git a/dev-ml/ocamlpam/files/ocamlpam-1.1-makefile.patch b/dev-ml/ocamlpam/files/ocamlpam-1.1-makefile.patch
new file mode 100644
index 000000000000..c9450b7f30dc
--- /dev/null
+++ b/dev-ml/ocamlpam/files/ocamlpam-1.1-makefile.patch
@@ -0,0 +1,17 @@
+--- a/Makefile 2012-09-14 22:46:11.508415083 +0200
++++ b/Makefile 2012-09-14 22:46:34.526338371 +0200
+@@ -35,10 +35,13 @@
+
+ install:
+ install -d $(DESTDIR)/pam
+- install -m 644 -t $(DESTDIR)/pam META *.mli *.cmi *.cmx *.cma *.cmxa *.a
++ install -m 644 -t $(DESTDIR)/pam META *.mli *.cmi *.cma *.a
+ install -d $(DESTDIR)/stublibs
+ install -m 644 -t $(DESTDIR)/stublibs dll$(BASENAME).so
+
++install-opt:
++ install -m 644 -t $(DESTDIR)/pam *.cmx *.cmxa
++
+ dist: clean
+ mkdir -p $(DISTNAME)
+ -cp * $(DISTNAME)
diff --git a/dev-ml/ocamlpam/metadata.xml b/dev-ml/ocamlpam/metadata.xml
new file mode 100644
index 000000000000..ffac4d7ebc01
--- /dev/null
+++ b/dev-ml/ocamlpam/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-ml/ocamlpam/ocamlpam-1.1.ebuild b/dev-ml/ocamlpam/ocamlpam-1.1.ebuild
new file mode 100644
index 000000000000..47682ef120aa
--- /dev/null
+++ b/dev-ml/ocamlpam/ocamlpam-1.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit findlib eutils
+
+DESCRIPTION="OCamlPAM - an OCaml library for PAM"
+HOMEPAGE="http://sharvil.nanavati.net/projects/ocamlpam/"
+SRC_URI="http://sharvil.nanavati.net/projects/${PN}/files/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="+ocamlopt"
+
+DEPEND=">=dev-lang/ocaml-3.12:=[ocamlopt?]
+ sys-libs/pam"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ epatch "${FILESDIR}/${P}-makefile.patch"
+ has_version '>=dev-lang/ocaml-4.04_beta' && epatch "${FILESDIR}/ocaml404.patch"
+}
+
+src_compile() {
+ emake META
+ emake byte
+ use ocamlopt && emake opt
+}
+
+src_install() {
+ findlib_src_preinst
+ emake DESTDIR="${OCAMLFIND_DESTDIR}" install
+ use ocamlopt && emake DESTDIR="${OCAMLFIND_DESTDIR}" install-opt
+ dodoc CHANGES README
+}
diff --git a/dev-ml/ocamlsdl-0.9.1 b/dev-ml/ocamlsdl-0.9.1
deleted file mode 100644
index 7b8aff7e8a2e..000000000000
--- a/dev-ml/ocamlsdl-0.9.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=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 ) >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=OCaml SDL Bindings
-EAPI=5
-HOMEPAGE=http://ocamlsdl.sourceforge.net
-IUSE=doc +ocamlopt opengl truetype
-KEYWORDS=~amd64 ppc x86
-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 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6b4377f10d5dfa660199599acf1b3503
diff --git a/dev-ml/ocamlsdl/Manifest b/dev-ml/ocamlsdl/Manifest
new file mode 100644
index 000000000000..f2a9e7e069c5
--- /dev/null
+++ b/dev-ml/ocamlsdl/Manifest
@@ -0,0 +1,4 @@
+AUX ocamlopt.patch 818 BLAKE2B 8b4f66bc97b7aa6defda38324004ac68911708358fd1f8fa736701b19982e983480d804b13ed655dfe185333a5a21c2d6deefbb6c95eaac2226303c063c53dab SHA512 02e9b226073a537f5fc95059fb840c2f4be373470dea81934bea39ed9db5f7132c24d4da81bd64a04b51b9b8ea0d4e0bbc4b0f0f0f352dd61fe74c05d815de73
+DIST ocamlsdl-0.9.1.tar.gz 226085 BLAKE2B 30ee2f12cdc83344d3a8a9d1e187415b30d5ea83cfed4ac4709a0b4350e386961123e9504fc94a2b5643bb161c65d065298e3d6d8904cb55ab5436d243dfe588 SHA512 8be444a3a4d1b56919c7a28fb607cbd33446f8cf30de3768a9926f23f86690d98ebb8ce6f2fb28c167ea76ac138b670283c5c93d72ea2565aa49a0dc92de181a
+EBUILD ocamlsdl-0.9.1.ebuild 1332 BLAKE2B 06eb79c3119c93249edc96fcb76bb4a6327ee926d15bc41003df928e679f2baed93aa65f69090c38686d010d3cebe3949710ede1bbd5c676a38418f68d79bf63 SHA512 0c473febd39a956979d25310ea1e34383fe2a80f714a4c609d6c2a1c4dc96b798eed1489e24c240b263fd79f0b4c87c9e362d81e96ca060142156fad3e4d27f6
+MISC metadata.xml 325 BLAKE2B 7a0dae9d3509a6529307a2a6d2bc5eab966afd94a21426c3c4127bc437d7a33209b5f9776482d02e3be5a0fa0d43ebfcfbf37298694fb129875f2f0e5261e34d SHA512 1ea238166b42dd9fdc7d86ac2f9810695ea35c948c1caffa948978508ca6877fde422fbeca2343d06eaf2cb996efcf05fcb2a96c791b73520417662e0611ce7b
diff --git a/dev-ml/ocamlsdl/files/ocamlopt.patch b/dev-ml/ocamlsdl/files/ocamlopt.patch
new file mode 100644
index 000000000000..603654dceffa
--- /dev/null
+++ b/dev-ml/ocamlsdl/files/ocamlopt.patch
@@ -0,0 +1,22 @@
+Index: ocamlsdl-0.9.1/src/Makefile
+===================================================================
+--- ocamlsdl-0.9.1.orig/src/Makefile
++++ ocamlsdl-0.9.1/src/Makefile
+@@ -17,7 +17,7 @@ gfx_MODULES = sdlgfx
+
+ TARGETS = sdl.cma $(patsubst %,sdl%.cma,$(PARTS))
+ TARGETS += libsdlstub.$(A) $(patsubst %,libsdl%stub.$(A),$(PARTS))
+-ifdef OCAMLOPT
++ifneq ($(OCAMLOPT),no)
+ TARGETS += sdl.cmxa $(patsubst %,sdl%.cmxa,$(PARTS))
+ endif
+
+@@ -87,7 +87,7 @@ ifdef OCAMLFIND
+ install-findlib :
+ $(OCAMLFIND) install sdl ../META \
+ *.cma lib*.$(A) *.cmi *.mli \
+- $(if $(OCAMLOPT),*.cmxa sdl*.$(A) *.cmx) \
++ $(if $(filter-out $(OCAMLOPT),no),*.cmxa sdl*.$(A) *.cmx) \
+ $(if $(OCAMLMKLIB),dll*.so)
+ ifeq ($(PLATFORM),Apple)
+ $(RANLIB) $$($(OCAMLFIND) printconf destdir)/sdl/*.$(A)
diff --git a/dev-ml/ocamlsdl/metadata.xml b/dev-ml/ocamlsdl/metadata.xml
new file mode 100644
index 000000000000..1f516f3074c3
--- /dev/null
+++ b/dev-ml/ocamlsdl/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="sourceforge">ocamlsdl</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/ocamlsdl/ocamlsdl-0.9.1.ebuild b/dev-ml/ocamlsdl/ocamlsdl-0.9.1.ebuild
new file mode 100644
index 000000000000..a18399af37b0
--- /dev/null
+++ b/dev-ml/ocamlsdl/ocamlsdl-0.9.1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit findlib eutils
+
+DESCRIPTION="OCaml SDL Bindings"
+
+HOMEPAGE="http://ocamlsdl.sourceforge.net"
+SRC_URI="mirror://sourceforge/ocamlsdl/${P}.tar.gz"
+LICENSE="LGPL-2"
+
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ppc x86"
+IUSE="doc +ocamlopt opengl truetype" #noimage nomixer
+
+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 )
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ epatch "${FILESDIR}/ocamlopt.patch"
+}
+
+src_configure() {
+ myconf=""
+ if use opengl; then
+ destdir=`ocamlfind printconf destdir`
+ lablgldir=`find ${destdir} -name "lablgl" -or -name "lablGL"`
+ if [ -z "${lablgldir}" ]; then
+ destdir=`ocamlc -where`
+ lablgldir=`find ${destdir} -name "lablgl" -or -name "lablGL"`
+ fi
+
+ if [ ! -z "${lablgldir}" ]; then
+ myconf="--with-lablgldir=${lablgldir}"
+ fi
+ fi
+
+ #use noimage && myconf="${myconf} --without-sdl-image"
+ #use nomixer && myconf="${myconf} --without-sdl-mixer"
+
+ econf $myconf \
+ `use_enable truetype sdl-ttf`
+}
+
+src_install() {
+ findlib_src_install
+
+ dodoc AUTHORS NEWS README
+ doinfo doc/*.info*
+
+ if use doc; then
+ dohtml doc/html/*
+ fi
+}
diff --git a/dev-ml/ocamlweb-1.39 b/dev-ml/ocamlweb-1.39
deleted file mode 100644
index c86e6153bc2f..000000000000
--- a/dev-ml/ocamlweb-1.39
+++ /dev/null
@@ -1,12 +0,0 @@
-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
-DESCRIPTION=O'Caml literate programming tool
-EAPI=5
-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 983774947da124fb7d542ce25a218bb1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc latex-package 773c51c2ef26eaff025998531e7c6731 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7b5c1d7e8792cd436786b67b39fb55f8
diff --git a/dev-ml/ocamlweb/Manifest b/dev-ml/ocamlweb/Manifest
new file mode 100644
index 000000000000..c66bdd96fa48
--- /dev/null
+++ b/dev-ml/ocamlweb/Manifest
@@ -0,0 +1,4 @@
+AUX ocamlweb-1.37-strip.patch 718 BLAKE2B b393c62c0ae1e276f0feebb0b9fb6d339af5bf57c9fb73864df2a42d51cabe695474b90bd567686af80ecbddad2981508ce8fb98d65a239bde8e7ecc89934edc SHA512 b4741ac5c7c4b3bbb1c1dae7449bb4b57cbf2b8c269b8ae668e5d14bc98ae973a83502c6bb560e06b9bd0536b4ec914713e159e286b41806071bcd160145b712
+DIST ocamlweb-1.39.tar.gz 141866 BLAKE2B 14ab9c595133d34d9711da2232fdf6a89a7b134ec2537e70d6ee6ecbfdb19a8bfb6a1a7aed6207cbb1bbe1f5e7b651d33fed35d8f26129d69e29dc5995d5c342 SHA512 f4e2d330222378b632ace70efb7062c93002a85db6dc9a821706a76a1e1c00da4d4e82e618f162584003b821bc72d2d11508ae22474db61cc4367ed528d21d50
+EBUILD ocamlweb-1.39.ebuild 692 BLAKE2B e61610908a8ce79e055ad8f6d6242123e68a3f8a5da2a5108b1ee8c8eac39ad329424c5b320eb96387b68b7c2733e44dce0f97df630ef2bcb3cca616ff0b97c4 SHA512 9b6eb11deba402b4d5af2202ac91e43504a5a75de2571ddb5cad5ddb181393ed6e8feec9351b1626547ab8cea40370e53ab8bfc5de45dbb50ac0928f482553e1
+MISC metadata.xml 243 BLAKE2B 010ca240ae06e9a9f6d7ba213eb06df36d9ba862ff2d2458d98a9fea1a1e7f3026d13832a73bce1b3ad9345029425e6abfae9e03bf126f2329b3f030ed3753fd SHA512 1c5b4b2163017e496999d1f87e5c9c5ac6c11b2e9187450ccfb3df258f34e54d278972f04ee0e8429476c6f87e091a869ac2a28c6e8c8e6d20678c3e74061449
diff --git a/dev-ml/ocamlweb/files/ocamlweb-1.37-strip.patch b/dev-ml/ocamlweb/files/ocamlweb-1.37-strip.patch
new file mode 100644
index 000000000000..393391fe52ce
--- /dev/null
+++ b/dev-ml/ocamlweb/files/ocamlweb-1.37-strip.patch
@@ -0,0 +1,19 @@
+Index: ocamlweb-1.37/Makefile.in
+===================================================================
+--- ocamlweb-1.37.orig/Makefile.in
++++ ocamlweb-1.37/Makefile.in
+@@ -61,14 +61,12 @@ byte: ocamlweb.byte
+
+ ocamlweb: $(CAML_CMX) $(CAMLLEX_CMX) $(CMX)
+ $(CAMLCOPT) $(OPTFLAGS) -o $@ $(CAML_CMX) $(CAMLLEX_CMX) $(CMX)
+- strip ocamlweb
+
+ ocamlweb.byte: $(CAML_CMO) $(CAMLLEX_CMO) $(CMO)
+ $(CAMLC) $(BYTEFLAGS) -o $@ $(CAML_CMO) $(CAMLLEX_CMO) $(CMO)
+
+ ocamlweb.static: $(CAML_CMX) $(CAMLLEX_CMX) $(CMX)
+ $(CAMLCOPT) $(OPTFLAGS) -cclib -static -o $@ $(CAML_CMX) $(CAMLLEX_CMX) $(CMX)
+- strip $@
+
+ debug: $(CAML_CMO) $(CAMLLEX_CMO) $(CMO)
+ $(CAMLC) $(BYTEFLAGS) -o ocamlweb-debug $(CAML_CMO) $(CAMLLEX_CMO) $(CMO)
diff --git a/dev-ml/ocamlweb/metadata.xml b/dev-ml/ocamlweb/metadata.xml
new file mode 100644
index 000000000000..ffac4d7ebc01
--- /dev/null
+++ b/dev-ml/ocamlweb/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-ml/ocamlweb/ocamlweb-1.39.ebuild b/dev-ml/ocamlweb/ocamlweb-1.39.ebuild
new file mode 100644
index 000000000000..7862a02a4f09
--- /dev/null
+++ b/dev-ml/ocamlweb/ocamlweb-1.39.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit latex-package eutils base
+
+DESCRIPTION="O'Caml literate programming tool"
+HOMEPAGE="http://www.lri.fr/~filliatr/ocamlweb/"
+SRC_URI="http://www.lri.fr/~filliatr/ftp/ocamlweb/${P}.tar.gz"
+
+IUSE=""
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ppc x86"
+
+DEPEND=">=dev-lang/ocaml-3.09:=
+ virtual/latex-base
+ dev-texlive/texlive-latexextra
+ "
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.37-strip.patch"
+ )
+
+src_compile() {
+ emake
+}
+
+src_install() {
+ emake UPDATETEX="" prefix="${D}/usr" MANDIR="${D}/usr/share/man" BASETEXDIR="${D}/${TEXMF}" install
+ dodoc README CHANGES
+}
diff --git a/dev-ml/ocplib-endian-1.0 b/dev-ml/ocplib-endian-1.0
deleted file mode 100644
index 29e41afc6704..000000000000
--- a/dev-ml/ocplib-endian-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-lang/ocaml-4.01 >=dev-ml/cppo-1.1.0 >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=Functions to read and write int16/32/64 from strings, bytes, and bigarrays
-EAPI=5
-HOMEPAGE=https://github.com/OCamlPro/ocplib-endian
-IUSE=+ocamlopt debug test
-KEYWORDS=~amd64
-LICENSE=LGPL-2.1-with-linking-exception
-RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?]
-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 983774947da124fb7d542ce25a218bb1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e oasis 9256ed89af74c3365ec888c00bfdfe43 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=29ab8897b09cc1fc485c69d218585462
diff --git a/dev-ml/ocplib-endian/Manifest b/dev-ml/ocplib-endian/Manifest
new file mode 100644
index 000000000000..7f2b57c8abcb
--- /dev/null
+++ b/dev-ml/ocplib-endian/Manifest
@@ -0,0 +1,3 @@
+DIST ocplib-endian-1.0.tar.gz 62753 BLAKE2B d343343eb22b7ff591219ad0d45502e3450cd4200d8f3cc7f8a4783bdd93752d015b686b57aa574f58344dc44cec751ba89e68f93770ca5df73a98d95a604b8d SHA512 a08fd58ec5e72510c40e8b75e0ee8327ee658f479e45dd4632bc04e3907d04aaa3684df3b993ab63fc2a6c1f1a4fb32784e9b5258730d3b89a716300522d8d7f
+EBUILD ocplib-endian-1.0.ebuild 567 BLAKE2B ecafe568edef8828f8a5828f272006f43a783ede73fcbfe5912c6e2f32d86a3d81b5b4fa03d901d5c7819308f6485eafe402d9296a75dd72381c65dae1411364 SHA512 9d7e7db49577d98be5d4a6b861c04766d12e3368bdcef29ac61c6a91471adfea49c638cdb633225fa6e5dd06e4c6862dceaaf85a04365a62667d0ede0214773c
+MISC metadata.xml 362 BLAKE2B b8e05028fdf1f824aedcdbbfe8b22712cf6d62b0d1e316b162688831c2e705730dbbce58d6706757af78140feeaee9ee609c5c2a6358e2aa3f9c9bca2d5e8860 SHA512 bf10036bfc8a10c11f8abd1f2266ae209f8917703700874df4362fb2f17ba59ada72bd11f71926e3943f8fc6a9e85afd869296f5b525a93ebf2d0ed0532995bd
diff --git a/dev-ml/ocplib-endian/metadata.xml b/dev-ml/ocplib-endian/metadata.xml
new file mode 100644
index 000000000000..d9f3d24ca31c
--- /dev/null
+++ b/dev-ml/ocplib-endian/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">OCamlPro/ocplib-endian</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/ocplib-endian/ocplib-endian-1.0.ebuild b/dev-ml/ocplib-endian/ocplib-endian-1.0.ebuild
new file mode 100644
index 000000000000..c3947fbc9c87
--- /dev/null
+++ b/dev-ml/ocplib-endian/ocplib-endian-1.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+OASIS_BUILD_TESTS=1
+
+inherit oasis
+
+DESCRIPTION="Functions to read and write int16/32/64 from strings, bytes, and bigarrays"
+HOMEPAGE="https://github.com/OCamlPro/ocplib-endian"
+SRC_URI="https://github.com/OCamlPro/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+ >=dev-lang/ocaml-4.01
+ >=dev-ml/cppo-1.1.0
+"
+RDEPEND=""
+
+DOCS=( CHANGES.md COPYING.txt README.md )
diff --git a/dev-ml/ocplib-simplex-0.3 b/dev-ml/ocplib-simplex-0.3
deleted file mode 100644
index 2280775c1271..000000000000
--- a/dev-ml/ocplib-simplex-0.3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=A library implementing a simplex algorithm
-EAPI=6
-HOMEPAGE=https://github.com/OCamlPro-Iguernlala/ocplib-simplex
-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 d0e5375d47f4c809f406eb892e531513 findlib 45d6030075064a68da8d7143726a1150 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=717513810e5830ccc7566d81554cc73a
diff --git a/dev-ml/ocplib-simplex/Manifest b/dev-ml/ocplib-simplex/Manifest
new file mode 100644
index 000000000000..23c6e1dfcb2b
--- /dev/null
+++ b/dev-ml/ocplib-simplex/Manifest
@@ -0,0 +1,3 @@
+DIST ocplib-simplex-0.3.tar.gz 31013 BLAKE2B 30d1541f15bf9d2c55f51ed565f2feb63c2b0fbe0095c15849a22df0876ad992a3e6c15924dbbe5a798ab278c7e171e30cda815b1de2ec9bc19fc92bbe79ad95 SHA512 43373deb6e921a31526c27d33808c3520b4f375caf9e5237179db0e8d84b5be3bf43e061e2d991fc6de694958c64c7ede0b258400fb921c4139664e367958630
+EBUILD ocplib-simplex-0.3.ebuild 756 BLAKE2B aad367b92f081f0d4f505449d76d7a26c4415ac8aa96c674396b48153234b6df2485ca18b2375a91a93c738119b29fa48a99106f7345304b2177d99cf710604b SHA512 0e9ff9bda6b8efe7b9e61510170ee65b60fdcc531dabd2ef125c0ce7c3d845a14a82ae74438b61641af7258a4d7665cbc34d7b2f4e12fee3bdf6e3101e84e000
+MISC metadata.xml 410 BLAKE2B 517ce557434537aa6fcaf30b4d9ff7aab1c817bd3bdb9f4d2a7f7a8556e3911db55a79d6cadebe86ba018577ad9a1434b3073ed8811513a72c1522069f8bed41 SHA512 caf6a675ff8f7950d06b2ed55e0d8a1eed290fe4f14a68fc87e9c60b6b394cc029787692be7041b7d7e727d6187249ba61a324315742c1af50556496da23eb0f
diff --git a/dev-ml/ocplib-simplex/metadata.xml b/dev-ml/ocplib-simplex/metadata.xml
new file mode 100644
index 000000000000..01c5e44dd808
--- /dev/null
+++ b/dev-ml/ocplib-simplex/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>tupone@gentoo.org</email>
+ <name>Tupone Alfredo</name>
+ </maintainer>
+ <longdescription lang="en">
+ A library implementing a simplex algorithm, in a functional style,
+ for solving systems of linear inequalities
+ </longdescription>
+</pkgmetadata>
diff --git a/dev-ml/ocplib-simplex/ocplib-simplex-0.3.ebuild b/dev-ml/ocplib-simplex/ocplib-simplex-0.3.ebuild
new file mode 100644
index 000000000000..af7162c862f4
--- /dev/null
+++ b/dev-ml/ocplib-simplex/ocplib-simplex-0.3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools findlib multilib
+
+DESCRIPTION="A library implementing a simplex algorithm"
+HOMEPAGE="https://github.com/OCamlPro-Iguernlala/ocplib-simplex"
+SRC_URI="https://github.com/OCamlPro-Iguernlala/${PN}/archive/${PV}.tar.gz
+ -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+DOCS="CHANGES.md README.md extra/simplex_invariants.txt extra/TODO.txt"
+
+src_prepare() {
+ default
+ mv configure.{in,ac} || die
+ sed -i -e "s:configure.in:configure.ac:g" \
+ Makefile.in
+ eautoreconf
+}
+
+src_install() {
+ findlib_src_install LIBDIR="${D}"usr/"$(get_libdir)"/ocaml
+}
diff --git a/dev-ml/ocsigen-i18n-3.1.0 b/dev-ml/ocsigen-i18n-3.1.0
deleted file mode 100644
index 3a66162e63ca..000000000000
--- a/dev-ml/ocsigen-i18n-3.1.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-lang/ocaml:= dev-ml/findlib
-DESCRIPTION=I18n made easy for web sites written with eliom
-EAPI=6
-HOMEPAGE=https://github.com/besport/ocsigen-i18n
-KEYWORDS=~amd64
-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
diff --git a/dev-ml/ocsigen-i18n/Manifest b/dev-ml/ocsigen-i18n/Manifest
new file mode 100644
index 000000000000..c5a901a3e086
--- /dev/null
+++ b/dev-ml/ocsigen-i18n/Manifest
@@ -0,0 +1,3 @@
+DIST ocsigen-i18n-3.1.0.tar.gz 6066 BLAKE2B 80c905a8b332a0b83c6184581b97c4766dc1059770eb5832881eb00a0201b2d093bf15b48432c2ed17a26b719afe0ebb919ea971eb75a7b3f99b5e600c0e79d2 SHA512 a103c8da39ffadbe90ef183ee9ad3b68f3b5feb8dd5cf9d94f37880dcfedd495bbe799e218e739eb830e8dc7c8636edbd8c00ce9c0843ecf8047f9eb00b9f18f
+EBUILD ocsigen-i18n-3.1.0.ebuild 537 BLAKE2B f3524aa4d43cede4e6e1fbd10fe97209c058ec1eb15feb5d7e9b415371e3794e1bffacde574d8b2f0db6cbd7566bde1eb75f7b29a28722e7dfcb25d7ecef10c8 SHA512 bfd8aae4929b658130afcfec65f7efd80ce38cf8092e8347241c86e65ecc77c573732fad7085840869ec5f5df8aa1818c3fdd9682076dd8a590979a25a9de542
+MISC metadata.xml 332 BLAKE2B 65e9bddf927ebe8d5cebdc06de37b0b49f1c51b70f8b6e7941d2662a472fc1775bf551ae2734726d1f317a508d347e1e07402a1f4dfae23a30513581190f037f SHA512 48cdf62c68d08f7d5a3b8c8ac917481418232ab4f9b37ebccab8742f4516139044c9ce54efe771d2b9fd7fa8e4daffd6311c895d9352ac1a28931bfecf17c510
diff --git a/dev-ml/ocsigen-i18n/metadata.xml b/dev-ml/ocsigen-i18n/metadata.xml
new file mode 100644
index 000000000000..d19446036e3e
--- /dev/null
+++ b/dev-ml/ocsigen-i18n/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">besport/ocsigen-i18n</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/ocsigen-i18n/ocsigen-i18n-3.1.0.ebuild b/dev-ml/ocsigen-i18n/ocsigen-i18n-3.1.0.ebuild
new file mode 100644
index 000000000000..ab2fac7140f3
--- /dev/null
+++ b/dev-ml/ocsigen-i18n/ocsigen-i18n-3.1.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="I18n made easy for web sites written with eliom"
+HOMEPAGE="https://github.com/besport/ocsigen-i18n"
+SRC_URI="https://github.com/besport/ocsigen-i18n/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="dev-lang/ocaml:="
+DEPEND="${RDEPEND}
+ dev-ml/findlib"
+
+src_install() {
+ dodir /usr/bin
+ emake bindir="${ED}/usr/bin" install || die
+ dodoc README.MD
+}
diff --git a/dev-ml/ocsigen-start-1.0.0 b/dev-ml/ocsigen-start-1.0.0
deleted file mode 100644
index 582f26cc2181..000000000000
--- a/dev-ml/ocsigen-start-1.0.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=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:= >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Eliom Base Application with users, (pre)registration, notifications, etc.
-EAPI=5
-HOMEPAGE=https://github.com/ocsigen/ocsigen-start
-KEYWORDS=~amd64
-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
-_md5_=e1dd4ef3b85d3c53be1810f6687852a3
diff --git a/dev-ml/ocsigen-start-9999 b/dev-ml/ocsigen-start-9999
deleted file mode 100644
index d4ff0d1351da..000000000000
--- a/dev-ml/ocsigen-start-9999
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install unpack
-DEPEND=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:= >=dev-ml/findlib-1.0.4-r1 >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=Eliom Base Application with users, (pre)registration, notifications, etc.
-EAPI=5
-HOMEPAGE=https://github.com/ocsigen/ocsigen-start
-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/9999
-_eclasses_=findlib 45d6030075064a68da8d7143726a1150 git-r3 8f6de46b0aa318aea0e8cac62ece098b
-_md5_=e1dd4ef3b85d3c53be1810f6687852a3
diff --git a/dev-ml/ocsigen-start/Manifest b/dev-ml/ocsigen-start/Manifest
new file mode 100644
index 000000000000..c7800ad79244
--- /dev/null
+++ b/dev-ml/ocsigen-start/Manifest
@@ -0,0 +1,4 @@
+DIST ocsigen-start-1.0.0.tar.gz 1024594 BLAKE2B d654c123eaa06525334109d1b826d0e7cbd89e73bd979e36d9d6f141d81de80b3b153e5a7c1bc81e166b3055f03c9792e3e3bc0918c262fcdd549b107cd2e5e9 SHA512 983253d7732f4b81919aed1f499a8c54d8a82b5595f33f324ad7218a332cdd8eb2de4c0e21f9d54919cc1b35b5dc2b6789a03c7cec11b909340f009e9facb3cf
+EBUILD ocsigen-start-1.0.0.ebuild 914 BLAKE2B 3fc32570e346821e7fc969d2e253ef35af38a36aebf43e26632c49d3825710ddb91cbca0c44b0a62bf7eaf7572aaea4430dc51431e598261180f90b7a7b658b7 SHA512 f9b2dbaae84a1ec3705baa0b416a849ff6e0e6b7a2cd9239d6218ddcd51228fc71fb2efc8c20a5e358fe11fee384088092c3e3ff15d677f6573b5331064b67e6
+EBUILD ocsigen-start-9999.ebuild 914 BLAKE2B 3fc32570e346821e7fc969d2e253ef35af38a36aebf43e26632c49d3825710ddb91cbca0c44b0a62bf7eaf7572aaea4430dc51431e598261180f90b7a7b658b7 SHA512 f9b2dbaae84a1ec3705baa0b416a849ff6e0e6b7a2cd9239d6218ddcd51228fc71fb2efc8c20a5e358fe11fee384088092c3e3ff15d677f6573b5331064b67e6
+MISC metadata.xml 333 BLAKE2B b0e84aa90e924b4b34c8d700bf680ace028a7df1d3f269337023dad428091c1b96f0dc344b8659522517a2f6ded3ead737ae674a2ad2f5eeec7840af73336bf2 SHA512 7cd22f5eb5ea265886079ffca47e5fb8a8fe257e61baa814bed521fcce23a6db824b4a470498c882a88daca2f724631c024c66d96df29c7ddc5b804faed48ef6
diff --git a/dev-ml/ocsigen-start/metadata.xml b/dev-ml/ocsigen-start/metadata.xml
new file mode 100644
index 000000000000..8757698182df
--- /dev/null
+++ b/dev-ml/ocsigen-start/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">ocsigen/ocsigen-start</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/ocsigen-start/ocsigen-start-1.0.0.ebuild b/dev-ml/ocsigen-start/ocsigen-start-1.0.0.ebuild
new file mode 100644
index 000000000000..0bc813010ad6
--- /dev/null
+++ b/dev-ml/ocsigen-start/ocsigen-start-1.0.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit findlib
+
+DESCRIPTION="Eliom Base Application with users, (pre)registration, notifications, etc."
+HOMEPAGE="https://github.com/ocsigen/ocsigen-start"
+
+LICENSE="LGPL-3"
+SLOT="0/${PV}"
+IUSE=""
+
+if [ "${PV#9999}" != "${PV}" ] ; then
+ inherit git-r3
+ SRC_URI=""
+ EGIT_REPO_URI="https://github.com/ocsigen/ocsigen-start"
+ KEYWORDS=""
+else
+ SRC_URI="https://github.com/ocsigen/ocsigen-start/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64"
+fi
+
+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:=
+"
+DEPEND="${RDEPEND}"
+
+src_install() {
+ findlib_src_preinst
+ DESTDIR="${ED}" OCAMLPATH="${OCAMLFIND_DESTDIR}" emake install
+ dodoc README.md
+}
diff --git a/dev-ml/ocsigen-start/ocsigen-start-9999.ebuild b/dev-ml/ocsigen-start/ocsigen-start-9999.ebuild
new file mode 100644
index 000000000000..0bc813010ad6
--- /dev/null
+++ b/dev-ml/ocsigen-start/ocsigen-start-9999.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit findlib
+
+DESCRIPTION="Eliom Base Application with users, (pre)registration, notifications, etc."
+HOMEPAGE="https://github.com/ocsigen/ocsigen-start"
+
+LICENSE="LGPL-3"
+SLOT="0/${PV}"
+IUSE=""
+
+if [ "${PV#9999}" != "${PV}" ] ; then
+ inherit git-r3
+ SRC_URI=""
+ EGIT_REPO_URI="https://github.com/ocsigen/ocsigen-start"
+ KEYWORDS=""
+else
+ SRC_URI="https://github.com/ocsigen/ocsigen-start/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64"
+fi
+
+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:=
+"
+DEPEND="${RDEPEND}"
+
+src_install() {
+ findlib_src_preinst
+ DESTDIR="${ED}" OCAMLPATH="${OCAMLFIND_DESTDIR}" emake install
+ dodoc README.md
+}
diff --git a/dev-ml/ocsigen-toolkit-1.0.0 b/dev-ml/ocsigen-toolkit-1.0.0
deleted file mode 100644
index 455f7e650186..000000000000
--- a/dev-ml/ocsigen-toolkit-1.0.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=dev-lang/ocaml:=[ocamlopt?] >dev-ml/js_of_ocaml-2.7:= >=dev-ml/eliom-5.1:=[ppx] dev-ml/ppx_deriving:= dev-ml/calendar:= dev-ml/lwt:= >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=User interface widgets for Ocsigen applications
-EAPI=6
-HOMEPAGE=https://github.com/ocsigen/ocsigen-toolkit
-IUSE=+ocamlopt debug
-KEYWORDS=~amd64
-LICENSE=LGPL-2.1-with-linking-exception
-RDEPEND=dev-lang/ocaml:=[ocamlopt?] >dev-ml/js_of_ocaml-2.7:= >=dev-ml/eliom-5.1:=[ppx] dev-ml/ppx_deriving:= dev-ml/calendar:= dev-ml/lwt:= >=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 24b4a2529c1fd12f1304856d6c5a690d
-_md5_=3c71932883f9e7b977c7d9ea22525c89
diff --git a/dev-ml/ocsigen-toolkit-9999 b/dev-ml/ocsigen-toolkit-9999
deleted file mode 100644
index 95ec16c05ef0..000000000000
--- a/dev-ml/ocsigen-toolkit-9999
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=dev-lang/ocaml:=[ocamlopt?] >dev-ml/js_of_ocaml-2.7:= >=dev-ml/eliom-5.1:=[ppx] dev-ml/ppx_deriving:= dev-ml/calendar:= dev-ml/lwt:= >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-4:= dev-ml/opam >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=User interface widgets for Ocsigen applications
-EAPI=6
-HOMEPAGE=https://github.com/ocsigen/ocsigen-toolkit
-IUSE=+ocamlopt debug
-LICENSE=LGPL-2.1-with-linking-exception
-RDEPEND=dev-lang/ocaml:=[ocamlopt?] >dev-ml/js_of_ocaml-2.7:= >=dev-ml/eliom-5.1:=[ppx] dev-ml/ppx_deriving:= dev-ml/calendar:= dev-ml/lwt:= >=dev-lang/ocaml-4:=
-SLOT=0/9999
-_eclasses_=findlib 45d6030075064a68da8d7143726a1150 git-r3 8f6de46b0aa318aea0e8cac62ece098b opam 24b4a2529c1fd12f1304856d6c5a690d
-_md5_=3c71932883f9e7b977c7d9ea22525c89
diff --git a/dev-ml/ocsigen-toolkit/Manifest b/dev-ml/ocsigen-toolkit/Manifest
new file mode 100644
index 000000000000..3c1d525cdf9f
--- /dev/null
+++ b/dev-ml/ocsigen-toolkit/Manifest
@@ -0,0 +1,4 @@
+DIST ocsigen-toolkit-1.0.0.tar.gz 69175 BLAKE2B f23dd64a8f8a9c735db3bfd3d60cfe6306354a208fb4b1ee384271a0f8b2fc120afcaa522d1432553ebba90c80639a5980c09c820c6063cbb093998814520410 SHA512 4776dcceef822ac63fd6d57ce05e870f726c1e1d137bab239b8558acb4ef55f97b847825f621414334b01d30c066ea986d2b8180b80a09719b5b76cb3bb69a20
+EBUILD ocsigen-toolkit-1.0.0.ebuild 1006 BLAKE2B 07c32cb76fe6b0123854c77b712c373058b61d75dc8e0557fcfe1094487edeba70ce8cc87eab994ace4ed7113e77187b43401a91db96baa835113ecb072014d7 SHA512 841c534ab057cba641f0b84bf7884a31c147c054944bb668d71b64711466f1dcdd0057f94627e5ca58e9d066524c5f67e9f6e99be587e15df68fa0b751fd07de
+EBUILD ocsigen-toolkit-9999.ebuild 1006 BLAKE2B 07c32cb76fe6b0123854c77b712c373058b61d75dc8e0557fcfe1094487edeba70ce8cc87eab994ace4ed7113e77187b43401a91db96baa835113ecb072014d7 SHA512 841c534ab057cba641f0b84bf7884a31c147c054944bb668d71b64711466f1dcdd0057f94627e5ca58e9d066524c5f67e9f6e99be587e15df68fa0b751fd07de
+MISC metadata.xml 335 BLAKE2B 4f472730256d947ab906c7a69b083439a9d133588c787c5d1d72540d45da38a303d72bb49f24ac0934e2d687614346ba18d4c52ee89f7c144a9b1d066b5d5398 SHA512 1f58da3a51d2b563e3f9ce3b27370163c3604c6dc281824e62e2f6585b59cb93c74be809bc73498b80738df71dddd38d45ecd33fae3811f18fda96411e76af1c
diff --git a/dev-ml/ocsigen-toolkit/metadata.xml b/dev-ml/ocsigen-toolkit/metadata.xml
new file mode 100644
index 000000000000..5539bc3ee579
--- /dev/null
+++ b/dev-ml/ocsigen-toolkit/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">ocsigen/ocsigen-toolkit</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/ocsigen-toolkit/ocsigen-toolkit-1.0.0.ebuild b/dev-ml/ocsigen-toolkit/ocsigen-toolkit-1.0.0.ebuild
new file mode 100644
index 000000000000..9a99adeda85b
--- /dev/null
+++ b/dev-ml/ocsigen-toolkit/ocsigen-toolkit-1.0.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit findlib opam
+
+DESCRIPTION="User interface widgets for Ocsigen applications"
+HOMEPAGE="https://github.com/ocsigen/ocsigen-toolkit"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="+ocamlopt debug"
+
+if [ "${PV#9999}" != "${PV}" ] ; then
+ inherit git-r3
+ SRC_URI=""
+ EGIT_REPO_URI="https://github.com/ocsigen/ocsigen-toolkit"
+ KEYWORDS=""
+else
+ SRC_URI="https://github.com/ocsigen/ocsigen-toolkit/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64"
+fi
+
+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:="
+DEPEND="${RDEPEND}"
+
+src_compile() {
+ emake \
+ DEBUG="$(usex debug yes no)" \
+ NATIVE="$(usex ocamlopt yes no)" \
+ all
+}
+
+src_install() {
+ findlib_src_preinst
+ OCAMLPATH="${OCAMLFIND_DESTDIR}" emake install
+ opam_src_install
+ dodoc README.md
+}
diff --git a/dev-ml/ocsigen-toolkit/ocsigen-toolkit-9999.ebuild b/dev-ml/ocsigen-toolkit/ocsigen-toolkit-9999.ebuild
new file mode 100644
index 000000000000..9a99adeda85b
--- /dev/null
+++ b/dev-ml/ocsigen-toolkit/ocsigen-toolkit-9999.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit findlib opam
+
+DESCRIPTION="User interface widgets for Ocsigen applications"
+HOMEPAGE="https://github.com/ocsigen/ocsigen-toolkit"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="+ocamlopt debug"
+
+if [ "${PV#9999}" != "${PV}" ] ; then
+ inherit git-r3
+ SRC_URI=""
+ EGIT_REPO_URI="https://github.com/ocsigen/ocsigen-toolkit"
+ KEYWORDS=""
+else
+ SRC_URI="https://github.com/ocsigen/ocsigen-toolkit/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64"
+fi
+
+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:="
+DEPEND="${RDEPEND}"
+
+src_compile() {
+ emake \
+ DEBUG="$(usex debug yes no)" \
+ NATIVE="$(usex ocamlopt yes no)" \
+ all
+}
+
+src_install() {
+ findlib_src_preinst
+ OCAMLPATH="${OCAMLFIND_DESTDIR}" emake install
+ opam_src_install
+ dodoc README.md
+}
diff --git a/dev-ml/octavius-1.1.0 b/dev-ml/octavius-1.1.0
deleted file mode 100644
index f7efdf501bf8..000000000000
--- a/dev-ml/octavius-1.1.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-ml/jbuilder dev-ml/ocamlbuild >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=ocamldoc comment syntax parser
-EAPI=6
-HOMEPAGE=https://github.com/ocaml-doc/octavius
-KEYWORDS=~amd64 ~ppc ~x86
-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 24b4a2529c1fd12f1304856d6c5a690d
-_md5_=cbcb5b3732af72b5c28797739eaf0f15
diff --git a/dev-ml/octavius/Manifest b/dev-ml/octavius/Manifest
new file mode 100644
index 000000000000..a87860dde8e5
--- /dev/null
+++ b/dev-ml/octavius/Manifest
@@ -0,0 +1,3 @@
+DIST octavius-1.1.0.tar.gz 13767 BLAKE2B ad6f7a252ff853eb26348ce66cfa6ce9afdc4a4655d4f0c79e0f5e1ab354bfed62da396c312ca8b402ebf116a5be70afce7b26810723c2b27be37656bc63406f SHA512 db1f7da7af07d9ff1a4b1c51dbd2861e4dddab13958e7bccdd0c42494fa95f0b4277b222652ef73198f5aeb2ac44de4204459c7d1085810864958da251d5ec09
+EBUILD octavius-1.1.0.ebuild 450 BLAKE2B 890d492333ee9bbcb5122a170202d1aaccb58eb49c1b4c69e93d1f21da3d64066afc9550b1e3342b3662c8f2d8318b8b89a7d3a4b198f3e8b80c2264cc88d0b7 SHA512 05466c47a33878bf1d50f3c08a97d0282f55b32aee80bded4724e6f4360dd369a98dd5ce42efcc9c1429bd615b674181ae46b7ee95509bb59eb1d43f699dcbb2
+MISC metadata.xml 330 BLAKE2B 883fc2b191cb8c5e65796e4970bad116b1cf1f438e12b82c5cc0e6ee0f17506a12d075d25d72ffa38d3b4a6cf4d6e23b0e1b39598f972283bf49842883a7aca5 SHA512 e5254aa0b0bbc5c3c8446b92e7fc5cfd63df2a3ff875b1358f6d9e7f9081a49641e43f0273a50c80e4eb46c7a2a067ceab7b9eee4a5a43d7acd50060d8e5aa77
diff --git a/dev-ml/octavius/metadata.xml b/dev-ml/octavius/metadata.xml
new file mode 100644
index 000000000000..8f44d43f4434
--- /dev/null
+++ b/dev-ml/octavius/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">ocaml-doc/octavius</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/octavius/octavius-1.1.0.ebuild b/dev-ml/octavius/octavius-1.1.0.ebuild
new file mode 100644
index 000000000000..36135a6e9f15
--- /dev/null
+++ b/dev-ml/octavius/octavius-1.1.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit findlib opam
+
+DESCRIPTION="ocamldoc comment syntax parser"
+HOMEPAGE="https://github.com/ocaml-doc/octavius"
+SRC_URI="https://github.com/ocaml-doc/octavius/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${DEPEND}
+ dev-ml/jbuilder
+ dev-ml/ocamlbuild"
diff --git a/dev-ml/ocurl-0.6.1 b/dev-ml/ocurl-0.6.1
deleted file mode 100644
index ad0126908062..000000000000
--- a/dev-ml/ocurl-0.6.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=>=net-misc/curl-7.9.8 >=dev-lang/ocaml-3.12:=[ocamlopt] virtual/pkgconfig >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=OCaml interface to the libcurl library
-EAPI=5
-HOMEPAGE=http://forge.ocamlcore.org/projects/ocurl/
-IUSE=examples
-KEYWORDS=amd64 ppc ~x86
-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
-_md5_=28592b96d0c635adbf2afa54351e7dd1
diff --git a/dev-ml/ocurl-0.7.10 b/dev-ml/ocurl-0.7.10
deleted file mode 100644
index 8838146d1adb..000000000000
--- a/dev-ml/ocurl-0.7.10
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=>=net-misc/curl-7.9.8 dev-ml/lwt:= dev-ml/camlp4:= >=dev-lang/ocaml-3.12:=[ocamlopt] virtual/pkgconfig >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=OCaml interface to the libcurl library
-EAPI=5
-HOMEPAGE=http://forge.ocamlcore.org/projects/ocurl/ https://github.com/ygrek/ocurl
-IUSE=examples
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
-LICENSE=MIT
-RDEPEND=>=net-misc/curl-7.9.8 dev-ml/lwt:= dev-ml/camlp4:= >=dev-lang/ocaml-3.12:=[ocamlopt]
-SLOT=0/0.7.10
-SRC_URI=https://github.com/ygrek/ocurl/archive/0.7.10.tar.gz -> ocurl-0.7.10.tar.gz
-_eclasses_=findlib 45d6030075064a68da8d7143726a1150
-_md5_=0f784370de25524671b548c589b3ec9f
diff --git a/dev-ml/ocurl-0.7.9 b/dev-ml/ocurl-0.7.9
deleted file mode 100644
index 62339d219464..000000000000
--- a/dev-ml/ocurl-0.7.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=>=net-misc/curl-7.9.8 dev-ml/lwt:= dev-ml/camlp4:= >=dev-lang/ocaml-3.12:=[ocamlopt] virtual/pkgconfig >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=OCaml interface to the libcurl library
-EAPI=5
-HOMEPAGE=http://forge.ocamlcore.org/projects/ocurl/ https://github.com/ygrek/ocurl
-IUSE=examples
-KEYWORDS=~amd64 ~arm ~ppc ~x86
-LICENSE=MIT
-RDEPEND=>=net-misc/curl-7.9.8 dev-ml/lwt:= dev-ml/camlp4:= >=dev-lang/ocaml-3.12:=[ocamlopt]
-SLOT=0/0.7.9
-SRC_URI=https://github.com/ygrek/ocurl/archive/0.7.9.tar.gz -> ocurl-0.7.9.tar.gz
-_eclasses_=findlib 45d6030075064a68da8d7143726a1150
-_md5_=cef4fc8d040f9de44dce8425e438effa
diff --git a/dev-ml/ocurl/Manifest b/dev-ml/ocurl/Manifest
new file mode 100644
index 000000000000..0b406fd68f0f
--- /dev/null
+++ b/dev-ml/ocurl/Manifest
@@ -0,0 +1,7 @@
+DIST ocurl-0.6.1.tgz 101147 BLAKE2B db0ff240e58bc72fbbbbbb661ccc8222bf65db70e85632094c59b3edfeef63e6ff3f2b7df73e8b1662a159b4177c38714ff1a553193dd092e9aae336b90d9f9e SHA512 2c82c9b8e8d6ee26a85add7a2698ab1f61478777f9c7b0b217cacb6491067b619f508b41c22eaa54cf249147d287a77c62a00aef3b19ee6c135426c4559ab7f3
+DIST ocurl-0.7.10.tar.gz 108234 BLAKE2B 17b679e331fa266001744522457cc7f4a3656b97b4558fc9e4458c31abd8700fb0f55ce1f9049de7d95a1df41f6543aa36729bc10d9cb688e5e45c50960d5e3d SHA512 7e7adae7d32a39465d578c0e9a0b3b1d4baed76c41428337e9bdc86f7c948297db22c14bc61b58c28d02871a2f3359767e745891690663b63ee1334a839b49c8
+DIST ocurl-0.7.9.tar.gz 108242 BLAKE2B 0402757e9e08b115e322ad007d8b294127584ccd5470eeb3e1db667aba96dc269616e8a2782f1850ac4550533a51e49b58cdb82b077a8fd516f5c83e03fc616d SHA512 daa571279570fa1e4ecfa213b717149f6be3922c3c904a22912d04afcf01651702c8324b4b06cbff1fcc023a1f7663e8b1b1e7f14dc377e043ecf2ac09122877
+EBUILD ocurl-0.6.1.ebuild 682 BLAKE2B ee47f72af70f4bcc288aee5c3f656fa42868b19cb935190d87a6294c5c104f14d67d41413f2faf27b93a4da2a1c563abaf47f2cc2aa911e6cb0bf071c773088a SHA512 d9ce7e15ddbc0cdd8d4316deea67affb3f2d73dcf4b1864f609aadb52ba9d10b8b95737fd771c00e691de57e3d243570f0c352f016b51c6f7dea3f911cd51385
+EBUILD ocurl-0.7.10.ebuild 768 BLAKE2B 1f149546cd5a8f83a1d4d53cda2672d8f32c08d15c5f4e9dd521704175cc36c2852744b4f3058eb500447a49404608d9529a060833fefb32cd4d97c63dd4be75 SHA512 3f59e918a13afe9141041515ee93ee7cbb185918256db46293d8f51d90139226232c1e1f7ac72a4625da9ae18f2ebe8663ec060788953d8cf1bad732c7c400ad
+EBUILD ocurl-0.7.9.ebuild 761 BLAKE2B eac0a936f2bd14139c71209f5eae4a2f59af87e6559643a19befa4d45b5908c3b24859423a6da666534f83c6226c83be9263db136229898fc88724bc591929bd SHA512 984169a875b0225fa636afc1a552e77dcb8027e2172ad46468aad87d7769b76700602e81234d78816cd7d3e2d5a4fc6b5a42282a2b4d5b6ddaabe716460884bd
+MISC metadata.xml 333 BLAKE2B b04d5d9191d4548642b19478878773126f08a717375402442fde6d862c6d14f1cfa73a9e8bb5d0ec5c6e8786910038a120915e8f597c08f7492c0afcaa562bf1 SHA512 a9c21c73abfa060f261a2a1c234de7c887e2039879560e03e0a1e279116899c7e9237e3e2d3f75c99314c0e62b65139c51711c85ecac0939410c93c73cf0e1ed
diff --git a/dev-ml/ocurl/metadata.xml b/dev-ml/ocurl/metadata.xml
new file mode 100644
index 000000000000..5230237dc37b
--- /dev/null
+++ b/dev-ml/ocurl/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">ygrek/ocurl</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/ocurl/ocurl-0.6.1.ebuild b/dev-ml/ocurl/ocurl-0.6.1.ebuild
new file mode 100644
index 000000000000..39c4fd5cab5f
--- /dev/null
+++ b/dev-ml/ocurl/ocurl-0.6.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit findlib
+
+DESCRIPTION="OCaml interface to the libcurl library"
+HOMEPAGE="http://forge.ocamlcore.org/projects/ocurl/"
+LICENSE="MIT"
+SRC_URI="https://forge.ocamlcore.org/frs/download.php/1374/${P}.tgz"
+
+SLOT="0/${PV}"
+IUSE="examples"
+
+RDEPEND=">=net-misc/curl-7.9.8
+ >=dev-lang/ocaml-3.12:=[ocamlopt]"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+KEYWORDS="amd64 ppc ~x86"
+
+src_compile()
+{
+ emake -j1 all
+}
+
+src_install()
+{
+ findlib_src_install
+ dodoc CHANGES.txt README
+ if use examples; then
+ dodoc -r examples
+ docompress -x /usr/share/doc/${PF}/examples
+ fi
+}
diff --git a/dev-ml/ocurl/ocurl-0.7.10.ebuild b/dev-ml/ocurl/ocurl-0.7.10.ebuild
new file mode 100644
index 000000000000..a23d5e728f2d
--- /dev/null
+++ b/dev-ml/ocurl/ocurl-0.7.10.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit findlib
+
+DESCRIPTION="OCaml interface to the libcurl library"
+HOMEPAGE="http://forge.ocamlcore.org/projects/ocurl/ https://github.com/ygrek/ocurl"
+LICENSE="MIT"
+SRC_URI="https://github.com/ygrek/ocurl/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0/${PV}"
+IUSE="examples"
+
+RDEPEND=">=net-misc/curl-7.9.8
+ dev-ml/lwt:=
+ dev-ml/camlp4:=
+ >=dev-lang/ocaml-3.12:=[ocamlopt]"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+
+src_compile()
+{
+ emake -j1 all
+}
+
+src_install()
+{
+ findlib_src_install
+ dodoc CHANGES.txt README.md
+ if use examples; then
+ dodoc -r examples
+ docompress -x /usr/share/doc/${PF}/examples
+ fi
+}
diff --git a/dev-ml/ocurl/ocurl-0.7.9.ebuild b/dev-ml/ocurl/ocurl-0.7.9.ebuild
new file mode 100644
index 000000000000..978bdea229b6
--- /dev/null
+++ b/dev-ml/ocurl/ocurl-0.7.9.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit findlib
+
+DESCRIPTION="OCaml interface to the libcurl library"
+HOMEPAGE="http://forge.ocamlcore.org/projects/ocurl/ https://github.com/ygrek/ocurl"
+LICENSE="MIT"
+SRC_URI="https://github.com/ygrek/ocurl/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0/${PV}"
+IUSE="examples"
+
+RDEPEND=">=net-misc/curl-7.9.8
+ dev-ml/lwt:=
+ dev-ml/camlp4:=
+ >=dev-lang/ocaml-3.12:=[ocamlopt]"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+
+src_compile()
+{
+ emake -j1 all
+}
+
+src_install()
+{
+ findlib_src_install
+ dodoc CHANGES.txt README.md
+ if use examples; then
+ dodoc -r examples
+ docompress -x /usr/share/doc/${PF}/examples
+ fi
+}
diff --git a/dev-ml/odns-0.3-r1 b/dev-ml/odns-0.3-r1
deleted file mode 100644
index 1cb6fdb39251..000000000000
--- a/dev-ml/odns-0.3-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=>=dev-lang/ocaml-3.10.2:=[ocamlopt] !dev-ml/dns !dev-ml/ocaml-dns >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=OCaml library to query DNS servers
-EAPI=5
-HOMEPAGE=http://odns.tuxfamily.org/
-KEYWORDS=~amd64
-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 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=39a87a64b2ec93289b86f2abd4b2237b
diff --git a/dev-ml/odns/Manifest b/dev-ml/odns/Manifest
new file mode 100644
index 000000000000..a03de590b893
--- /dev/null
+++ b/dev-ml/odns/Manifest
@@ -0,0 +1,4 @@
+AUX odns-0.3-parmake.patch 631 BLAKE2B 957d9cab6d1506d1dbda767a62db94edd84421c578ffab5c7c43c4759a9832ae9ac0ba0af1af0a36cb0ed8ec8d535c99337d2ef4ab164cc353c1b1a2b30a4ef4 SHA512 e831d5fc0a310680ed75205b5d08fde65f679fa54791798eca528ccfa245b68f7b2afb320ee70716430fae0cd6d36340d480506cd8cf70b7c53bf067e63cb0b8
+DIST odns-0.3.tar.gz 57616 BLAKE2B de6ac0fee68d1ae21fe279971da252647d30f5914ec2030cb0ecb5efb245ade254673b54b884d1987e673b0117bc58a10b0b6344689134924334dedb919eb888 SHA512 6d40d7fc882185500aaa58582112abd57faf72ee0a57fabc211ad4bf39739b39cb956e6cb109808e05d767560a942c3300e9ec0e6b28c13cec2a2b4dd0c3bf5d
+EBUILD odns-0.3-r1.ebuild 811 BLAKE2B e91d8fa2d25e88d81c6aab720435c656a2d9b0979b6aaa6add8fbe02cfc1bb556190531a13764e972c17516e97b8bb2157cb686f2a895ad26400523935b3d6d9 SHA512 74ad911a4259badce852b24a5d0f806442e2cd3be1795db4bcaafaa8133e9c07f59a2c7ac81c2a124a738bdab9977566226d45e6f80590d972a28db1e670ad48
+MISC metadata.xml 243 BLAKE2B 010ca240ae06e9a9f6d7ba213eb06df36d9ba862ff2d2458d98a9fea1a1e7f3026d13832a73bce1b3ad9345029425e6abfae9e03bf126f2329b3f030ed3753fd SHA512 1c5b4b2163017e496999d1f87e5c9c5ac6c11b2e9187450ccfb3df258f34e54d278972f04ee0e8429476c6f87e091a869ac2a28c6e8c8e6d20678c3e74061449
diff --git a/dev-ml/odns/files/odns-0.3-parmake.patch b/dev-ml/odns/files/odns-0.3-parmake.patch
new file mode 100644
index 000000000000..7034abd25cf2
--- /dev/null
+++ b/dev-ml/odns/files/odns-0.3-parmake.patch
@@ -0,0 +1,16 @@
+fix parallel make
+https://bugs.gentoo.org/show_bug.cgi?id=422683
+
+Index: odns-0.3/OCamlMakefile
+===================================================================
+--- odns-0.3.orig/OCamlMakefile
++++ odns-0.3/OCamlMakefile
+@@ -1152,7 +1152,7 @@ $(BCDIDIR)/%.di $(NCDIDIR)/%.di: %.mli
+ $(DOC_DIR)/$(RESULT)/html:
+ mkdir -p $@
+
+-$(DOC_DIR)/$(RESULT)/html/index.html: $(DOC_DIR)/$(RESULT)/html $(DOC_FILES)
++$(DOC_DIR)/$(RESULT)/html/index.html: $(DOC_DIR)/$(RESULT)/html $(DOC_FILES) byte-code-library
+ rm -rf $</*
+ $(QUIET)pp=`sed -n -e '/^#/d' -e 's/(\*pp \([^*]*\) \*)/\1/p;q' $(FIRST_DOC_FILE)`; \
+ if [ -z "$$pp" ]; then \
diff --git a/dev-ml/odns/metadata.xml b/dev-ml/odns/metadata.xml
new file mode 100644
index 000000000000..ffac4d7ebc01
--- /dev/null
+++ b/dev-ml/odns/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-ml/odns/odns-0.3-r1.ebuild b/dev-ml/odns/odns-0.3-r1.ebuild
new file mode 100644
index 000000000000..d330c21321f0
--- /dev/null
+++ b/dev-ml/odns/odns-0.3-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit findlib eutils
+
+DESCRIPTION="OCaml library to query DNS servers"
+HOMEPAGE="http://odns.tuxfamily.org/"
+SRC_URI="http://download.tuxfamily.org/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+# It is ancient and upstream is dead. Consider using ocaml-dns instead.
+RDEPEND="
+ >=dev-lang/ocaml-3.10.2:=[ocamlopt]
+ !dev-ml/dns
+ !dev-ml/ocaml-dns
+"
+DEPEND="${RDEPEND}"
+
+CLIBS="" # Workaround for bug #422683
+
+src_prepare() {
+ sed -i -e "s/version=\"0.2\"/version=\"${PV}\"/" META || die
+ epatch "${FILESDIR}/${P}-parmake.patch"
+}
+
+src_compile() {
+ emake -j1 #453434
+}
+
+src_install() {
+ findlib_src_preinst
+ PREFIX="${D}/usr" emake install
+ dodoc AUTHORS README
+}
diff --git a/dev-ml/ojquery-0.1 b/dev-ml/ojquery-0.1
deleted file mode 100644
index c34bc5498477..000000000000
--- a/dev-ml/ojquery-0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ml/react:= dev-ml/js_of_ocaml:= dev-ml/lwt:= dev-ml/oasis >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=jQuery Binding for Eliom.
-EAPI=5
-HOMEPAGE=https://github.com/ocsigen/ojquery
-IUSE=+ocamlopt debug
-KEYWORDS=~amd64
-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 983774947da124fb7d542ce25a218bb1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e oasis 9256ed89af74c3365ec888c00bfdfe43 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2cb7c5f867468980231d1dea064ea16b
diff --git a/dev-ml/ojquery-9999 b/dev-ml/ojquery-9999
deleted file mode 100644
index 430e95ec8935..000000000000
--- a/dev-ml/ojquery-9999
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ml/react:= dev-ml/js_of_ocaml:= dev-ml/lwt:= dev-ml/oasis >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=jQuery Binding for Eliom.
-EAPI=5
-HOMEPAGE=https://github.com/ocsigen/ojquery
-IUSE=+ocamlopt debug
-LICENSE=LGPL-3
-RDEPEND=dev-ml/react:= dev-ml/js_of_ocaml:= dev-ml/lwt:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
-SLOT=0/9999
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 git-r3 8f6de46b0aa318aea0e8cac62ece098b ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e oasis 9256ed89af74c3365ec888c00bfdfe43 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2cb7c5f867468980231d1dea064ea16b
diff --git a/dev-ml/ojquery/Manifest b/dev-ml/ojquery/Manifest
new file mode 100644
index 000000000000..2a999aa86ba1
--- /dev/null
+++ b/dev-ml/ojquery/Manifest
@@ -0,0 +1,4 @@
+DIST ojquery-0.1.tar.gz 64335 BLAKE2B f6fc0377326a2eb4487f2e28ae8ed28be6518ea79b1a096cd90e1847d732878775105a3597ea13fde6b352611a39bd49f55792dd5b1f57a576eff80aa127c58e SHA512 57b0f7458fc44294df0993a1593f0f42d532834b7f6676e8093eb3c12d4c88a6084a99f831751fece69477d17ab84a0ebedd9873f5255aa8ee2a6d39996634d2
+EBUILD ojquery-0.1.ebuild 633 BLAKE2B 4f46e06760ace62543c24ddb5a5078ab6662b4ac14387f7fcc73715021fa6cfdcf70f5c74fe68f527415b116116b21a21a2be19adf79997778e8bfb56b1ba458 SHA512 7d8d6048fc50d8ea1efed0c946ee7aaace7e7a32086e07ee890c89c047ed50c8496f6c03101ccfaf21d0c6a52791541fbb3d42d906b10010612041c6a9116e51
+EBUILD ojquery-9999.ebuild 633 BLAKE2B 4f46e06760ace62543c24ddb5a5078ab6662b4ac14387f7fcc73715021fa6cfdcf70f5c74fe68f527415b116116b21a21a2be19adf79997778e8bfb56b1ba458 SHA512 7d8d6048fc50d8ea1efed0c946ee7aaace7e7a32086e07ee890c89c047ed50c8496f6c03101ccfaf21d0c6a52791541fbb3d42d906b10010612041c6a9116e51
+MISC metadata.xml 327 BLAKE2B 48844452f2846ad73155fd65930f3b1bfe5294587d20b4d8a1d02707897c0d0d1958a42c7d5937f74d3dee52bc3ca4004ea67737cd71fc7cde76cfda87d463b1 SHA512 b558a03fc62629ca3ad1516489aa16c659c90c91c6f908819a1368725e79a40e01b034a6eb77e9d3c4c25a2e654324bd8498612e9e0a981279ad74fc20373c56
diff --git a/dev-ml/ojquery/metadata.xml b/dev-ml/ojquery/metadata.xml
new file mode 100644
index 000000000000..5349bc49c096
--- /dev/null
+++ b/dev-ml/ojquery/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">ocsigen/ojquery</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/ojquery/ojquery-0.1.ebuild b/dev-ml/ojquery/ojquery-0.1.ebuild
new file mode 100644
index 000000000000..a14024cc5d57
--- /dev/null
+++ b/dev-ml/ojquery/ojquery-0.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit oasis
+
+DESCRIPTION="jQuery Binding for Eliom."
+HOMEPAGE="https://github.com/ocsigen/ojquery"
+
+if [ "${PV#9999}" != "${PV}" ] ; then
+ inherit git-r3
+ SRC_URI=""
+ EGIT_REPO_URI="https://github.com/ocsigen/ojquery"
+ KEYWORDS=""
+else
+ SRC_URI="https://github.com/ocsigen/ojquery/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64"
+fi
+
+LICENSE="LGPL-3"
+SLOT="0/${PV}"
+IUSE=""
+
+RDEPEND="dev-ml/react:=
+ dev-ml/js_of_ocaml:=
+ dev-ml/lwt:="
+DEPEND="${RDEPEND} dev-ml/oasis"
+
+src_prepare() {
+ oasis setup || die
+}
diff --git a/dev-ml/ojquery/ojquery-9999.ebuild b/dev-ml/ojquery/ojquery-9999.ebuild
new file mode 100644
index 000000000000..a14024cc5d57
--- /dev/null
+++ b/dev-ml/ojquery/ojquery-9999.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit oasis
+
+DESCRIPTION="jQuery Binding for Eliom."
+HOMEPAGE="https://github.com/ocsigen/ojquery"
+
+if [ "${PV#9999}" != "${PV}" ] ; then
+ inherit git-r3
+ SRC_URI=""
+ EGIT_REPO_URI="https://github.com/ocsigen/ojquery"
+ KEYWORDS=""
+else
+ SRC_URI="https://github.com/ocsigen/ojquery/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64"
+fi
+
+LICENSE="LGPL-3"
+SLOT="0/${PV}"
+IUSE=""
+
+RDEPEND="dev-ml/react:=
+ dev-ml/js_of_ocaml:=
+ dev-ml/lwt:="
+DEPEND="${RDEPEND} dev-ml/oasis"
+
+src_prepare() {
+ oasis setup || die
+}
diff --git a/dev-ml/onanomsg-1.0-r2 b/dev-ml/onanomsg-1.0-r2
deleted file mode 100644
index a813e7011f1b..000000000000
--- a/dev-ml/onanomsg-1.0-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=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(+)?] ) test? ( dev-ml/ounit ) >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=nanomsg bindings for OCaml
-EAPI=5
-HOMEPAGE=https://github.com/rgrinberg/onanomsg
-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:=
-SLOT=0/1.0-bigstring
-SRC_URI=https://github.com/rgrinberg/onanomsg/archive/1.0.tar.gz -> onanomsg-1.0.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e opam 24b4a2529c1fd12f1304856d6c5a690d preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=61b5eba20786e97537a3b8b7ef08be7b
diff --git a/dev-ml/onanomsg/Manifest b/dev-ml/onanomsg/Manifest
new file mode 100644
index 000000000000..b9ea2e9d338a
--- /dev/null
+++ b/dev-ml/onanomsg/Manifest
@@ -0,0 +1,6 @@
+AUX bigstring.patch 8867 BLAKE2B 5239b7052baa461f6d7dcf2a55bb97733485f5bd81724f003d859d236e483360a418b5c9dd071fd57bf8228c696839df58de83652cc4dbea4260c12dc843dadb SHA512 b64e1f718f966bb34d1e9251cf2046a9489399796f37a83e88c00a053691f153032d6339150e5bf11ee937f3cf59e460eec94498fad3bd0be938622b3fc93032
+AUX testrun.patch 538 BLAKE2B d715a9b15064ba17d3044e31807fa7f97434194177513f954de97d9caf19bfa6a55e7118f30ddf27418619c3802ee1249cfa7f3e00b9684118df078d52bc9a40 SHA512 e91b4f0ad106ac5c2d46898d62c58dcc9a333a47fd46c506a166947d9526c88661a9692c733df841f161a07af71e7e5cb5ba894019c8a17c9af486ce4e84bbab
+AUX tests.patch 382 BLAKE2B e540c2608874f9c7ca90f19851479ca4918704e8c75ac3819602f0b69d2917b372e746c8c5bfed14d9b89183099c31137d3ff065baede52b17f64b252aa1d28f SHA512 543d1e47febd980cab47b5e1901c845cbf6fc39591ddf1b70ae1f3482a9499b8cb08b400907fa7059578377273e5e9565143ce8ad9a512f5e2a7a2a2fa989186
+DIST onanomsg-1.0.tar.gz 13519 BLAKE2B c50fb053082e4adfa77f3c6809fb29e64ac8dce7bb9fe1c506f6b7bf0fcd67a6de97f756956f103828ae2f334633f2500a95859c955bd0b610be38163a8d77b5 SHA512 d940f842f795c9d681755795f83694aceab23eb87c7cb66f2b8f643147ca58f30b43049e8c035e3f08392d9c2f611a75254d4ba999b337cc84d7b52f8f36218f
+EBUILD onanomsg-1.0-r2.ebuild 1117 BLAKE2B f20ad70039c78cda65c9bc32ea74d0efaa76e28b3b6dfe73755236271ee637627073aa702805cf330ec83de69ca87361b51af3ee517e6c4bc1679e50325e5f4b SHA512 bf821727516d1517ec04404d6d50d643cee41d37787052ec728555369d6fa8a981befd456598b74f388284683499e129eaefb5e21e21bdb84e63f9a86ebf7ae5
+MISC metadata.xml 392 BLAKE2B 5e95140580b94d7004658b18ec8dbf909a9799a4baea3f2e99d7ec13c235712b118dc9dcea4f0c0ad2f66317e893c508b2ff0ce49177a6d73af144793705f768 SHA512 12a4fbed87e735836701a952a145fc75a10ab333c06e1d465739d91db6a429e071f89399bc17e0367d2780bce7c7580344912e2afce51541334e8d5157477034
diff --git a/dev-ml/onanomsg/files/bigstring.patch b/dev-ml/onanomsg/files/bigstring.patch
new file mode 100644
index 000000000000..311fa2ee7495
--- /dev/null
+++ b/dev-ml/onanomsg/files/bigstring.patch
@@ -0,0 +1,218 @@
+Index: onanomsg-1.0/lib/nanomsg.ml
+===================================================================
+--- onanomsg-1.0.orig/lib/nanomsg.ml
++++ onanomsg-1.0/lib/nanomsg.ml
+@@ -209,7 +209,7 @@ let recv_fd sock =
+ (Obj.magic fd : Unix.file_descr)
+
+ let send_bigstring_buf ?(block=true) sock buf pos len =
+- if pos < 0 || len < 0 || pos + len > CCBigstring.size buf
++ if pos < 0 || len < 0 || pos + len > Bigstring.size buf
+ then invalid_arg "bounds";
+ let nn_buf = nn_allocmsg (size_of_int len) 0 in
+ match nn_buf with
+@@ -218,12 +218,12 @@ let send_bigstring_buf ?(block=true) soc
+ let nn_buf_p = Ctypes.(allocate (ptr void) nn_buf) in
+ let ba = Ctypes.(bigarray_of_ptr array1 len
+ Bigarray.char @@ from_voidp char nn_buf) in
+- CCBigstring.blit buf pos ba 0 len;
++ Bigstring.blit buf pos ba 0 len;
+ ignore @@ raise_notequal len
+ (fun () -> nn_send sock nn_buf_p nn_msg (int_of_bool block))
+
+ let send_bigstring ?(block=true) sock buf =
+- send_bigstring_buf ~block sock buf 0 @@ CCBigstring.size buf
++ send_bigstring_buf ~block sock buf 0 @@ Bigstring.size buf
+
+ let send_bytes_buf ?(block=true) sock buf pos len =
+ if pos < 0 || len < 0 || pos + len > Bytes.length buf
+@@ -235,7 +235,7 @@ let send_bytes_buf ?(block=true) sock bu
+ let nn_buf_p = Ctypes.(allocate (ptr void) nn_buf) in
+ let ba = Ctypes.(bigarray_of_ptr array1 len
+ Bigarray.char @@ from_voidp char nn_buf) in
+- CCBigstring.blit_of_bytes buf pos ba 0 len;
++ Bigstring.blit_of_bytes buf pos ba 0 len;
+ ignore @@ raise_notequal len
+ (fun () -> nn_send sock nn_buf_p nn_msg (int_of_bool block))
+
+@@ -266,16 +266,16 @@ let recv ?(block=true) sock f =
+ let recv_bytes_buf ?(block=true) sock buf pos =
+ recv ~block sock
+ (fun ba ->
+- let len = CCBigstring.size ba in
+- CCBigstring.(blit_to_bytes ba 0 buf pos len);
++ let len = Bigstring.size ba in
++ Bigstring.(blit_to_bytes ba 0 buf pos len);
+ len
+ )
+
+ let recv_bytes ?(block=true) sock =
+ recv ~block sock (fun ba ->
+- let len = CCBigstring.size ba in
++ let len = Bigstring.size ba in
+ let buf = Bytes.create len in
+- CCBigstring.blit_to_bytes ba 0 buf 0 len;
++ Bigstring.blit_to_bytes ba 0 buf 0 len;
+ buf)
+
+ let recv_string ?(block=true) sock =
+Index: onanomsg-1.0/lib/nanomsg.mli
+===================================================================
+--- onanomsg-1.0.orig/lib/nanomsg.mli
++++ onanomsg-1.0/lib/nanomsg.mli
+@@ -45,8 +45,8 @@ val close : socket -> unit
+
+ (** {2 Zero-copy I/O} *)
+
+-val send_bigstring : ?block:bool -> socket -> CCBigstring.t -> unit
+-val send_bigstring_buf : ?block:bool -> socket -> CCBigstring.t -> int -> int -> unit
++val send_bigstring : ?block:bool -> socket -> Bigstring.t -> unit
++val send_bigstring_buf : ?block:bool -> socket -> Bigstring.t -> int -> int -> unit
+
+ val send_string : ?block:bool -> socket -> string -> unit
+ val send_string_buf : ?block:bool -> socket -> string -> int -> int -> unit
+@@ -54,7 +54,7 @@ val send_string_buf : ?block:bool -> soc
+ val send_bytes : ?block:bool -> socket -> Bytes.t -> unit
+ val send_bytes_buf : ?block:bool -> socket -> Bytes.t -> int -> int -> unit
+
+-val recv : ?block:bool -> socket -> (CCBigstring.t -> 'a) -> 'a
++val recv : ?block:bool -> socket -> (Bigstring.t -> 'a) -> 'a
+ (** [recv ?block sock f] applies [f] to the received message. The
+ argument of [f] gets unallocated after [f] returns, so make sure
+ [f] {b never} let a reference to its argument escape. *)
+Index: onanomsg-1.0/lib/nanomsg_lwt.ml
+===================================================================
+--- onanomsg-1.0.orig/lib/nanomsg_lwt.ml
++++ onanomsg-1.0/lib/nanomsg_lwt.ml
+@@ -25,7 +25,7 @@ let raise_negative sock io_event f = rai
+ let raise_notequal sock io_event v f = raise_if sock io_event (fun x -> x <> v) f
+
+ let send_bigstring_buf sock buf pos len =
+- if pos < 0 || len < 0 || pos + len > CCBigstring.size buf
++ if pos < 0 || len < 0 || pos + len > Bigstring.size buf
+ then invalid_arg "bounds";
+ let nn_buf = nn_allocmsg (size_of_int len) 0 in
+ match nn_buf with
+@@ -34,14 +34,14 @@ let send_bigstring_buf sock buf pos len
+ let nn_buf_p = Ctypes.(allocate (ptr void) nn_buf) in
+ let ba = Ctypes.(bigarray_of_ptr array1 len
+ Bigarray.char @@ from_voidp char nn_buf) in
+- CCBigstring.blit buf pos ba 0 len;
++ Bigstring.blit buf pos ba 0 len;
+ raise_notequal sock Lwt_unix.Write len
+ (fun () -> nn_send (Obj.magic sock : int) nn_buf_p nn_msg
+ Symbol.(value_of_name_exn "NN_DONTWAIT")) >|= fun nb_written ->
+ ignore nb_written
+
+ let send_bigstring sock buf =
+- send_bigstring_buf sock buf 0 @@ CCBigstring.size buf
++ send_bigstring_buf sock buf 0 @@ Bigstring.size buf
+
+ let send_bytes_buf sock buf pos len =
+ if pos < 0 || len < 0 || pos + len > Bytes.length buf
+@@ -53,7 +53,7 @@ let send_bytes_buf sock buf pos len =
+ let nn_buf_p = Ctypes.(allocate (ptr void) nn_buf) in
+ let ba = Ctypes.(bigarray_of_ptr array1 len
+ Bigarray.char @@ from_voidp char nn_buf) in
+- CCBigstring.blit_of_bytes buf pos ba 0 len;
++ Bigstring.blit_of_bytes buf pos ba 0 len;
+ raise_notequal sock Lwt_unix.Write len
+ (fun () -> nn_send (Obj.magic sock : int) nn_buf_p nn_msg
+ Symbol.(value_of_name_exn "NN_DONTWAIT")) >|= fun nb_written ->
+@@ -84,16 +84,16 @@ let recv sock f =
+
+ let recv_bytes_buf sock buf pos =
+ recv sock (fun ba ->
+- let len = CCBigstring.size ba in
+- CCBigstring.blit_to_bytes ba 0 buf pos len;
++ let len = Bigstring.size ba in
++ Bigstring.blit_to_bytes ba 0 buf pos len;
+ Lwt.return len
+ )
+
+ let recv_bytes sock =
+ recv sock (fun ba ->
+- let len = CCBigstring.size ba in
++ let len = Bigstring.size ba in
+ let buf = Bytes.create len in
+- CCBigstring.blit_to_bytes ba 0 buf 0 len;
++ Bigstring.blit_to_bytes ba 0 buf 0 len;
+ Lwt.return buf
+ )
+
+Index: onanomsg-1.0/lib/nanomsg_lwt.mli
+===================================================================
+--- onanomsg-1.0.orig/lib/nanomsg_lwt.mli
++++ onanomsg-1.0/lib/nanomsg_lwt.mli
+@@ -4,8 +4,8 @@ open Nanomsg
+
+ (** {2 Zero-copy I/O} *)
+
+-val send_bigstring : socket -> CCBigstring.t -> unit Lwt.t
+-val send_bigstring_buf : socket -> CCBigstring.t -> int -> int -> unit Lwt.t
++val send_bigstring : socket -> Bigstring.t -> unit Lwt.t
++val send_bigstring_buf : socket -> Bigstring.t -> int -> int -> unit Lwt.t
+
+ val send_string : socket -> string -> unit Lwt.t
+ val send_string_buf : socket -> string -> int -> int -> unit Lwt.t
+@@ -13,7 +13,7 @@ val send_string_buf : socket -> string -
+ val send_bytes : socket -> Bytes.t -> unit Lwt.t
+ val send_bytes_buf : socket -> Bytes.t -> int -> int -> unit Lwt.t
+
+-val recv : socket -> (CCBigstring.t -> 'a Lwt.t) -> 'a Lwt.t
++val recv : socket -> (Bigstring.t -> 'a Lwt.t) -> 'a Lwt.t
+ (** [recv sock f] applies [f] to the received message. The
+ argument of [f] gets unallocated after [f] returns, so make sure
+ [f] {b never} let a reference to its argument escape. *)
+Index: onanomsg-1.0/_tags
+===================================================================
+--- onanomsg-1.0.orig/_tags
++++ onanomsg-1.0/_tags
+@@ -4,7 +4,7 @@ true: debug, bin_annot, safe_string
+ <lwt>: include
+ <lib_test>: include
+
+-<lib/nanomsg*>: package(containers.bigarray), \
++<lib/nanomsg*>: package(bigstring), \
+ package(ctypes), \
+ package(ipaddr), \
+ package(ppx_deriving.std), \
+@@ -13,7 +13,7 @@ true: debug, bin_annot, safe_string
+
+ <lib/nanomsg_lwt.*>: package(lwt.unix), package(lwt.ppx)
+
+-<lib_test/*>: package(containers.bigarray), \
++<lib_test/*>: package(bigstring), \
+ package(ctypes.foreign), \
+ package(ipaddr), \
+ package(lwt.unix), \
+@@ -21,7 +21,7 @@ true: debug, bin_annot, safe_string
+ package(oUnit), \
+ package(containers)
+
+-<examples/*>: package(containers.bigarray), \
++<examples/*>: package(bigstring), \
+ package(ctypes.foreign), \
+ package(ipaddr), \
+- package(containers)
+\ No newline at end of file
++ package(containers)
+Index: onanomsg-1.0/pkg/META
+===================================================================
+--- onanomsg-1.0.orig/pkg/META
++++ onanomsg-1.0/pkg/META
+@@ -1,6 +1,6 @@
+ version = "1.0"
+ description = "Bindings to nanomsg"
+-requires = "ctypes.foreign ipaddr ppx_deriving.std containers containers.bigarray"
++requires = "ctypes.foreign ipaddr ppx_deriving.std containers bigstring"
+ archive(byte) = "nanomsg.cma"
+ archive(byte, plugin) = "nanomsg.cma"
+ archive(native) = "nanomsg.cmxa"
+@@ -15,4 +15,4 @@ package "lwt" (
+ archive(native) = "nanomsg_lwt.cmxa"
+ archive(native, plugin) = "nanomsg_lwt.cmxs"
+ exists_if = "nanomsg_lwt.cma"
+-)
+\ No newline at end of file
++)
diff --git a/dev-ml/onanomsg/files/testrun.patch b/dev-ml/onanomsg/files/testrun.patch
new file mode 100644
index 000000000000..e78dadaf3625
--- /dev/null
+++ b/dev-ml/onanomsg/files/testrun.patch
@@ -0,0 +1,15 @@
+Drop Surveyor / Respondant tests as they fail.
+
+Index: onanomsg-1.0/lib_test/suite.ml
+===================================================================
+--- onanomsg-1.0.orig/lib_test/suite.ml
++++ onanomsg-1.0/lib_test/suite.ml
+@@ -93,7 +93,7 @@ let connect_to_string_test ctx =
+
+ let socket_test ctx =
+ let domains = [AF_SP; AF_SP_RAW] in
+- let protos = [Pair; Pub; Sub; Req; Rep; Push; Pull; Surveyor; Respondant; Bus] in
++ let protos = [Pair; Pub; Sub; Req; Rep; Push; Pull; Bus] in
+ List.iter
+ (fun d ->
+ List.iter
diff --git a/dev-ml/onanomsg/files/tests.patch b/dev-ml/onanomsg/files/tests.patch
new file mode 100644
index 000000000000..f93d0ce51260
--- /dev/null
+++ b/dev-ml/onanomsg/files/tests.patch
@@ -0,0 +1,12 @@
+Index: onanomsg-1.0/_tags
+===================================================================
+--- onanomsg-1.0.orig/_tags
++++ onanomsg-1.0/_tags
+@@ -19,6 +19,7 @@ true: debug, bin_annot, safe_string
+ package(lwt.unix), \
+ package(lwt.ppx), \
+ package(oUnit), \
++ package(ppx_deriving), \
+ package(containers)
+
+ <examples/*>: package(bigstring), \
diff --git a/dev-ml/onanomsg/metadata.xml b/dev-ml/onanomsg/metadata.xml
new file mode 100644
index 000000000000..d59abf5ddf60
--- /dev/null
+++ b/dev-ml/onanomsg/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <use>
+ <flag name="lwt">Enables lwt support.</flag>
+ </use>
+ <upstream>
+ <remote-id type="github">rgrinberg/onanomsg</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/onanomsg/onanomsg-1.0-r2.ebuild b/dev-ml/onanomsg/onanomsg-1.0-r2.ebuild
new file mode 100644
index 000000000000..d67ffaa0a2ce
--- /dev/null
+++ b/dev-ml/onanomsg/onanomsg-1.0-r2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit opam eutils
+
+DESCRIPTION="nanomsg bindings for OCaml"
+HOMEPAGE="https://github.com/rgrinberg/onanomsg"
+SRC_URI="https://github.com/rgrinberg/onanomsg/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="WTFPL-2"
+SLOT="0/${PV}-bigstring"
+KEYWORDS="~amd64"
+IUSE="+lwt +ocamlopt test"
+
+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(+)?] )
+"
+DEPEND="${RDEPEND}
+ test? ( dev-ml/ounit )
+"
+
+src_prepare() {
+ epatch "${FILESDIR}/bigstring.patch" \
+ "${FILESDIR}/tests.patch" \
+ "${FILESDIR}/testrun.patch"
+ default
+}
+
+src_compile() {
+ ocaml pkg/build.ml \
+ native=$(usex ocamlopt true false) \
+ native-dynlink=$(usex ocamlopt true false) \
+ lwt=$(usex lwt true false) \
+ ounit=$(usex test true false) \
+ || die
+}
+
+src_install() {
+ opam_src_install nanomsg
+ dodoc CHANGES README.md
+}
diff --git a/dev-ml/opam-1.3.1-r1 b/dev-ml/opam-1.3.1-r1
deleted file mode 100644
index 48d71420261f..000000000000
--- a/dev-ml/opam-1.3.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=dev-lang/ocaml:= || ( net-misc/wget net-misc/curl ) dev-ml/extlib:= dev-ml/ocaml-re:= dev-ml/ocamlgraph:= dev-ml/cmdliner:= dev-ml/cudf:= >=dev-ml/dose3-5:= dev-ml/uutf:= dev-ml/jsonm:= dev-ml/findlib test? ( dev-vcs/git )
-DESCRIPTION=A source-based package manager for OCaml
-EAPI=5
-HOMEPAGE=http://opam.ocaml.org/
-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:=
-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 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=afd631461720bd37bba0c38aec3b8a3e
diff --git a/dev-ml/opam-file-format-2.0.0_beta3 b/dev-ml/opam-file-format-2.0.0_beta3
deleted file mode 100644
index d1b82405dbcf..000000000000
--- a/dev-ml/opam-file-format-2.0.0_beta3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=dev-lang/ocaml:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Parser and printer for the opam file syntax
-EAPI=6
-HOMEPAGE=https://github.com/ocaml/opam-file-format
-IUSE=+ocamlopt
-KEYWORDS=~amd64
-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
-_md5_=fc4abf8f9f2e3a355ecf998f8100ebb1
diff --git a/dev-ml/opam-file-format/Manifest b/dev-ml/opam-file-format/Manifest
new file mode 100644
index 000000000000..24cd8c329c39
--- /dev/null
+++ b/dev-ml/opam-file-format/Manifest
@@ -0,0 +1,3 @@
+DIST opam-file-format-2.0.0_beta3.tar.gz 7654 BLAKE2B fa9ea04af0973fd52e0147d751116484e65ffb64369a19701740f0e1c81504e4f10574c3aeb5052f2cba02355d0c14875cea0f55694b74e70afffc20fccd7e88 SHA512 7f4989711e4dc183086b6dccc512ecfe78bfbbd98af954560d5a2c945b8b32416f3a01902203ef78932451cd99a5c1b1571edf70581bd14a2a94e32f5d4dd818
+EBUILD opam-file-format-2.0.0_beta3.ebuild 671 BLAKE2B 974b186b8ff6d5b6a152b857fea05b78e96281823988b4d9dc52b117b1bbea6f7df648b2e99cd653493fce1eb4223d852f581c1237cc15dcc275497c14b44a65 SHA512 61ecff19fef0cbcaa2b52cecb2b0f573964c528f0eb8977fb433da89783897a98f8a0f396366282c3ec3e37b00264d4fff0389fc07f96c1834a2dd76a34d13a0
+MISC metadata.xml 344 BLAKE2B d5fc30f734478654159ce3473fabaf392431d6786a7dde58b612b223b72c09e5d527758804bc7b191a39fc351eafabc80358b7520fe5bf52fb9dcc4818b378e7 SHA512 2648f0433f04d250e652f6fd0dff4ced963d37641100071f64f1b0c4301d46dafae08bc44ae2ed82d9099b0abc44bb3165ed6f59160fea53f6b4233d26648f01
diff --git a/dev-ml/opam-file-format/metadata.xml b/dev-ml/opam-file-format/metadata.xml
new file mode 100644
index 000000000000..6c62d17c464e
--- /dev/null
+++ b/dev-ml/opam-file-format/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">ocaml/opam-file-format</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/opam-file-format/opam-file-format-2.0.0_beta3.ebuild b/dev-ml/opam-file-format/opam-file-format-2.0.0_beta3.ebuild
new file mode 100644
index 000000000000..e932f300db77
--- /dev/null
+++ b/dev-ml/opam-file-format/opam-file-format-2.0.0_beta3.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit findlib
+
+MY_PV="${PV/_beta/-beta}"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+DESCRIPTION="Parser and printer for the opam file syntax"
+HOMEPAGE="https://github.com/ocaml/opam-file-format"
+SRC_URI="https://github.com/ocaml/opam-file-format/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+ocamlopt"
+
+DEPEND="dev-lang/ocaml:=[ocamlopt?]"
+RDEPEND="${DEPEND}"
+
+src_compile() {
+ emake byte $(usex ocamlopt native "")
+}
+
+src_install() {
+ emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" LIBDIR="$(ocamlc -where)" install
+}
diff --git a/dev-ml/opam/Manifest b/dev-ml/opam/Manifest
new file mode 100644
index 000000000000..26eeab5cac8a
--- /dev/null
+++ b/dev-ml/opam/Manifest
@@ -0,0 +1,4 @@
+AUX stublibs.patch 591 BLAKE2B 6aca6475f230754bba8822d5181c9bb798004efad8a5656e7f5380d03544f6e67e875b0bc7ccce41ac0262af40961a823f6fd2906433a8c66f53d67d24cb0a5c SHA512 b10fd1ed192d6bba0c893538a6c936d37330f8fc89bfc30f334c5ef1086e4274b989c7ab8e059754d87cbb64897c0657a5ff49add456f83fb035185631bacce4
+DIST opam-1.3.1.tar.gz 669485 BLAKE2B e1aed54175d46f5dd9fd989e56c25657370356e26df6976c01dd089e381291fa04e25da295104f85d513010cd028276d80ebf7a4a77b38f3e089e52f4e64f43a SHA512 d075c9b2c9670d712f29bd2df34b8020da52041fa2bbef599cb54a81f63554507d78bebece45ecf668d3d1d4ed514e4ab88a1d86b64088d283bca7a8e75ae582
+EBUILD opam-1.3.1-r1.ebuild 1075 BLAKE2B 334576f3cb0e1f02c56bf82705c46a437ac7445ce83190165a08f811b57250fcfd21e9e343978d2a084346a4435ce410d9f2c0bb9361939a633b71bd16136822 SHA512 c1576cd46bd94d361eccca0872789b6b29ba066cc4d25f54ef70b3894f7115994c71b8039a9e619dc7ec10f1946446a355cf850f9b63eb06343d6f539f969ac1
+MISC metadata.xml 332 BLAKE2B 5e7949f7babb5f9252545c40f5105d71237189171412662ebe745aa2d93e023a7dad16e3bbae18086c7a0d7891ba349ddee4a5e00f9d8230e5ac1d84643d2489 SHA512 56e886c385af81781aa4ab1c9ead244b35352f521635236d211ef753c8d6eb85e68097fa599b6ff2191d3be91194704dacaff2d3882aceccec82cbfc3d9a8265
diff --git a/dev-ml/opam/files/stublibs.patch b/dev-ml/opam/files/stublibs.patch
new file mode 100644
index 000000000000..3cb61883233a
--- /dev/null
+++ b/dev-ml/opam/files/stublibs.patch
@@ -0,0 +1,13 @@
+Index: opam-1.3.1/src/tools/opam_installer.ml
+===================================================================
+--- opam-1.3.1.orig/src/tools/opam_installer.ml
++++ opam-1.3.1/src/tools/opam_installer.ml
+@@ -312,7 +312,7 @@ let options =
+ let mandir = mk_dir mandir in
+ let libdir = mk_dir libdir in
+ let stubsdir = match mk_dir stubsdir, libdir with
+- | None, Some d -> Some OpamFilename.Op.(d / "stubslibs")
++ | None, Some d -> Some OpamFilename.Op.(d / "stublibs")
+ | d, None | (Some _ as d), _ -> d
+ in
+ let topdir = match mk_dir topdir, libdir with
diff --git a/dev-ml/opam/metadata.xml b/dev-ml/opam/metadata.xml
new file mode 100644
index 000000000000..417bf2d4b393
--- /dev/null
+++ b/dev-ml/opam/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">ocaml/opam</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/opam/opam-1.3.1-r1.ebuild b/dev-ml/opam/opam-1.3.1-r1.ebuild
new file mode 100644
index 000000000000..57dd504dc707
--- /dev/null
+++ b/dev-ml/opam/opam-1.3.1-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="A source-based package manager for OCaml"
+HOMEPAGE="http://opam.ocaml.org/"
+LICENSE="LGPL-3-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE="test"
+
+if [[ ${PV} != 9999 ]]; then
+ SRC_URI="https://github.com/ocaml/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+else
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/ocaml/opam.git"
+fi
+
+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:=
+"
+DEPEND="${RDEPEND}
+ dev-ml/findlib
+ test? ( dev-vcs/git )
+"
+
+src_prepare() {
+ epatch "${FILESDIR}/stublibs.patch"
+}
+
+src_compile() {
+ emake -j1
+ cd doc
+ emake man
+}
+
+src_test() {
+ EMAIL=foo@bar.com emake -j1 tests
+}
+
+src_install() {
+ default
+ emake DESTDIR="${D}" OPAMINSTALLER_FLAGS="--prefix=\"${ED}/usr\" --libdir=\"${D}/$(ocamlc -where)\"" libinstall
+}
diff --git a/dev-ml/optcomp-1.6-r1 b/dev-ml/optcomp-1.6-r1
deleted file mode 100644
index bdbf0ce9023f..000000000000
--- a/dev-ml/optcomp-1.6-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ml/camlp4:= >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=Optional compilation for OCaml with cpp-like directives
-EAPI=5
-HOMEPAGE=https://github.com/diml/optcomp
-IUSE=+ocamlopt debug doc
-KEYWORDS=~amd64
-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 983774947da124fb7d542ce25a218bb1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e oasis 9256ed89af74c3365ec888c00bfdfe43 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=74bcdf05f0ffc6eb0d36c47d1b22ffe3
diff --git a/dev-ml/optcomp/Manifest b/dev-ml/optcomp/Manifest
new file mode 100644
index 000000000000..3c6fdfa2dca3
--- /dev/null
+++ b/dev-ml/optcomp/Manifest
@@ -0,0 +1,3 @@
+DIST optcomp-1.6.tar.gz 56370 BLAKE2B 15a349d7ce927d69b10424329abd59108803683cba85dcea66cea19d0465a18e43f990a8031e2b63dba5e8bfb97488b28c905dd09391de0a0ff919d62926381a SHA512 19fa04a42e5ed589979647469759017442598d170bf82d49c3b720d1b1b6bbe3066ae3ffee77a3f15dcbf51be5d7a8934300873391ebce423f3a0f3878250c18
+EBUILD optcomp-1.6-r1.ebuild 475 BLAKE2B 9cd0224cbbc5813247d13d516e84b815d0508d50eb6be243a90e7ee26b3493c7ba94899f56cf8a1d56480b6f25acc73d7e0244168f35a3d6fcec2ae27f9df9bc SHA512 70f0a86f7e0718809c900fd448381bd05032d2844e0b72c897217da3b660a038f2a3ba0f2c374f64da531503a9d74432e8d06961cdee2fa4cbb6c96ce9575e1a
+MISC metadata.xml 334 BLAKE2B 0a8085652c56ee7da33f47245364920b7b98c5451b4244b2326b04339a77646cbb6742f80ee71385a44af42d5fd913074c8b675ce93c053baf1b1f4ebd346a63 SHA512 3487aa3bfc906f509a14371d485d365b1fd2dc1a92f2c672deb836909d2e3b6e43e54134bc4788a043198bc1f657c4f82b403b10b29f7b6ea2615cafc5465f48
diff --git a/dev-ml/optcomp/metadata.xml b/dev-ml/optcomp/metadata.xml
new file mode 100644
index 000000000000..df0fbc459f20
--- /dev/null
+++ b/dev-ml/optcomp/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">diml/optcomp</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/optcomp/optcomp-1.6-r1.ebuild b/dev-ml/optcomp/optcomp-1.6-r1.ebuild
new file mode 100644
index 000000000000..e64a3633ee6b
--- /dev/null
+++ b/dev-ml/optcomp/optcomp-1.6-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+OASIS_BUILD_DOCS=1
+
+inherit oasis
+
+DESCRIPTION="Optional compilation for OCaml with cpp-like directives"
+HOMEPAGE="https://github.com/diml/optcomp"
+SRC_URI="https://github.com/diml/optcomp/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="dev-ml/camlp4:="
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGES.md README.md )
diff --git a/dev-ml/ounit-2.0.0 b/dev-ml/ounit-2.0.0
deleted file mode 100644
index dba68dca608b..000000000000
--- a/dev-ml/ounit-2.0.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=Unit testing framework for OCaml
-EAPI=5
-HOMEPAGE=http://ounit.forge.ocamlcore.org/
-IUSE=+ocamlopt debug doc
-KEYWORDS=amd64 arm ~arm64 ~ppc x86
-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 983774947da124fb7d542ce25a218bb1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e oasis 9256ed89af74c3365ec888c00bfdfe43 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=02fd56e902931293388118839423e27c
diff --git a/dev-ml/ounit-2.0.5 b/dev-ml/ounit-2.0.5
deleted file mode 100644
index 1119a32eade9..000000000000
--- a/dev-ml/ounit-2.0.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=Unit testing framework for OCaml
-EAPI=5
-HOMEPAGE=http://ounit.forge.ocamlcore.org/
-IUSE=+ocamlopt debug doc
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
-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 983774947da124fb7d542ce25a218bb1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e oasis 9256ed89af74c3365ec888c00bfdfe43 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3dc07a372d13c7436a1b299b785a8205
diff --git a/dev-ml/ounit-2.0.6 b/dev-ml/ounit-2.0.6
deleted file mode 100644
index bdcb18009e42..000000000000
--- a/dev-ml/ounit-2.0.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=Unit testing framework for OCaml
-EAPI=5
-HOMEPAGE=http://ounit.forge.ocamlcore.org/
-IUSE=+ocamlopt debug doc
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
-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 983774947da124fb7d542ce25a218bb1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e oasis 9256ed89af74c3365ec888c00bfdfe43 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5f3784bf6aca9b29e85393265db9d253
diff --git a/dev-ml/ounit/Manifest b/dev-ml/ounit/Manifest
new file mode 100644
index 000000000000..6940a200518a
--- /dev/null
+++ b/dev-ml/ounit/Manifest
@@ -0,0 +1,7 @@
+DIST ounit-2.0.0.tar.gz 103504 BLAKE2B e936d0a3df48eb46623eadfc39a4f64a6776972c713280c388ef5e9e1b6a20d9959a68b30ce21fae7e553e4e43a7ad1cd5652d49da7aa2699ca59fc03e1f1352 SHA512 e12c8fb534ef88de7a83a34e5a578060a90abfce601d8532408412a56e843f69b89cfd6ce69bd7c5519e9a04e306d46339e9b8f13975727a3458afe20cd776d0
+DIST ounit-2.0.5.tar.gz 114285 BLAKE2B d41faf95ec11f16accb70aaa1a9005f468727ebfe01082827669d7a7afbeb44d8cd740376ea9df26a811913b3a87b8d9fb85c0d4690e0d18e6b129949c2b145f SHA512 b2414b7581ec230a949de0d7a677786bb63ef3a3ee0c3dc666d176f83705b5bc8aeab4b6e2327c98714bb26c249d71766ed831ebf572aff2b8829a33cc0e4b75
+DIST ounit-2.0.6.tar.gz 114305 BLAKE2B 94ae4e2f7ace6fe5732253d724115cdc3e24af91db2066b36439501cb17df7f44fb9230242b8400ec59a72f9317c22361f068f7f2634d29ccfdcca63cb95c275 SHA512 466ec1f691a81e0abd93f698c7328e6db4fa2d617d8f5262d9f18b57ede3d389a3ee122ed7bccc8dff20600826fbbae1d17dd88d7c1329562798792fae54417d
+EBUILD ounit-2.0.0.ebuild 469 BLAKE2B 89032c445cb8db73518b2fc945996b6d080b70cb1b3bf3734870db57ab79297162424121ed0af7229c9545f8fe87977b3bb9a6be1976cb7a19e0b2522e0f711a SHA512 73b25b25c9b1f380bcca7e3ab625daef5d2b84d57c8da535f93d547e5e4d4da238bb370261f85358af7c5c04f66ffca4281a262a8aa3e33657c5d8f435f32d0d
+EBUILD ounit-2.0.5.ebuild 473 BLAKE2B 7971d57958b50f8a8eb74add4f51a57cba036636ce6a58b10a51dea1143077b5e74e225babd60a54a2d5a1dd35ee13b577c71a36004f55b2adb9a53e3f784984 SHA512 c517aa5f0d2521050624d0dcfe58089d3f59e013fa7db9809d9045db286d753b0703ab3317cb0e00a390a1fdef38df1d6a5c2c1779c5861ab04a443707fb37bf
+EBUILD ounit-2.0.6.ebuild 473 BLAKE2B d4989521c0a34a332807e2df655df3b24bbe8c4bb34c1ef4bcd5211b21caa8fed98eacfccec3ec59a159dda721651cab146d4ed4f7963ffe2fde873a788cfe73 SHA512 2b81f8e499b16b46c074aefa7278e75bc21eaee1fedff71475f01e7f98c6cdebce43af08cdb752705eca87e69b2008f5fe8bab25c2df064a6bb2306dab077f8a
+MISC metadata.xml 243 BLAKE2B 010ca240ae06e9a9f6d7ba213eb06df36d9ba862ff2d2458d98a9fea1a1e7f3026d13832a73bce1b3ad9345029425e6abfae9e03bf126f2329b3f030ed3753fd SHA512 1c5b4b2163017e496999d1f87e5c9c5ac6c11b2e9187450ccfb3df258f34e54d278972f04ee0e8429476c6f87e091a869ac2a28c6e8c8e6d20678c3e74061449
diff --git a/dev-ml/ounit/metadata.xml b/dev-ml/ounit/metadata.xml
new file mode 100644
index 000000000000..ffac4d7ebc01
--- /dev/null
+++ b/dev-ml/ounit/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-ml/ounit/ounit-2.0.0.ebuild b/dev-ml/ounit/ounit-2.0.0.ebuild
new file mode 100644
index 000000000000..8779d2f64cf7
--- /dev/null
+++ b/dev-ml/ounit/ounit-2.0.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+OASIS_BUILD_DOCS=1
+
+inherit oasis
+
+DESCRIPTION="Unit testing framework for OCaml"
+HOMEPAGE="http://ounit.forge.ocamlcore.org/"
+SRC_URI="http://forge.ocamlcore.org/frs/download.php/1258/${P}.tar.gz"
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 arm ~arm64 ~ppc x86"
+DEPEND=""
+RDEPEND="${DEPEND}"
+IUSE=""
+
+DOCS=( "README.txt" "AUTHORS.txt" "changelog" )
diff --git a/dev-ml/ounit/ounit-2.0.5.ebuild b/dev-ml/ounit/ounit-2.0.5.ebuild
new file mode 100644
index 000000000000..f597ba581192
--- /dev/null
+++ b/dev-ml/ounit/ounit-2.0.5.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+OASIS_BUILD_DOCS=1
+
+inherit oasis
+
+DESCRIPTION="Unit testing framework for OCaml"
+HOMEPAGE="http://ounit.forge.ocamlcore.org/"
+SRC_URI="https://forge.ocamlcore.org/frs/download.php/1719/${P}.tar.gz"
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+DEPEND=""
+RDEPEND="${DEPEND}"
+IUSE=""
+
+DOCS=( "README.txt" "AUTHORS.txt" "changelog" )
diff --git a/dev-ml/ounit/ounit-2.0.6.ebuild b/dev-ml/ounit/ounit-2.0.6.ebuild
new file mode 100644
index 000000000000..0ade5f19c1e2
--- /dev/null
+++ b/dev-ml/ounit/ounit-2.0.6.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+OASIS_BUILD_DOCS=1
+
+inherit oasis
+
+DESCRIPTION="Unit testing framework for OCaml"
+HOMEPAGE="http://ounit.forge.ocamlcore.org/"
+SRC_URI="https://forge.ocamlcore.org/frs/download.php/1722/${P}.tar.gz"
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+DEPEND=""
+RDEPEND="${DEPEND}"
+IUSE=""
+
+DOCS=( "README.txt" "AUTHORS.txt" "changelog" )
diff --git a/dev-ml/pa_bench-112.06.00 b/dev-ml/pa_bench-112.06.00
deleted file mode 100644
index 36d4556f0b46..000000000000
--- a/dev-ml/pa_bench-112.06.00
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-ml/type-conv-109:= dev-ml/pa_ounit:= dev-ml/camlp4:= >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=Syntax extension writing inline benchmarks
-EAPI=5
-HOMEPAGE=http://www.janestreet.com/ocaml
-IUSE=+ocamlopt debug
-KEYWORDS=~amd64
-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 983774947da124fb7d542ce25a218bb1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e oasis 9256ed89af74c3365ec888c00bfdfe43 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=61a4bf4222d870aa19cddde4a492d502
diff --git a/dev-ml/pa_bench/Manifest b/dev-ml/pa_bench/Manifest
new file mode 100644
index 000000000000..23f7ea9f46a9
--- /dev/null
+++ b/dev-ml/pa_bench/Manifest
@@ -0,0 +1,3 @@
+DIST pa_bench-112.06.00.tar.gz 54371 BLAKE2B e0cd20d378d185f6cd3a6e4a2991bb9bdce6c72b01860c1aedff4c0c3ff4949f7b0c1a2b3c0310cd375ecc01eb51022fd6c68281c0bbb74dc96879d3fcc7ed94 SHA512 1e75c5b765051357f17bfe1213af16174a07903da7c9ecff3ce937227385d815c25f6430f103be3b65b69ba0d7a3a22051ef7bf28d577cf26e87c3a628040fdc
+EBUILD pa_bench-112.06.00.ebuild 599 BLAKE2B 9f6529225ebe01416fb2fe1e0318b4d833bdb6696e84a5d704c688cc53a182171ea056a7a66bd408f673ccd7e1b9671375eeacb90ab101b3dc9aefdceeeac796 SHA512 bf1372898fbfe3613c392f3569cf41870a67ab9d3b4a7f772a9ac7730fedf12f58ca35be8fb38ce7dcb51ccbedc9a64e825408f3572359f1bee6c1e78c23c6e6
+MISC metadata.xml 243 BLAKE2B 010ca240ae06e9a9f6d7ba213eb06df36d9ba862ff2d2458d98a9fea1a1e7f3026d13832a73bce1b3ad9345029425e6abfae9e03bf126f2329b3f030ed3753fd SHA512 1c5b4b2163017e496999d1f87e5c9c5ac6c11b2e9187450ccfb3df258f34e54d278972f04ee0e8429476c6f87e091a869ac2a28c6e8c8e6d20678c3e74061449
diff --git a/dev-ml/pa_bench/metadata.xml b/dev-ml/pa_bench/metadata.xml
new file mode 100644
index 000000000000..ffac4d7ebc01
--- /dev/null
+++ b/dev-ml/pa_bench/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-ml/pa_bench/pa_bench-112.06.00.ebuild b/dev-ml/pa_bench/pa_bench-112.06.00.ebuild
new file mode 100644
index 000000000000..e8fc793b2808
--- /dev/null
+++ b/dev-ml/pa_bench/pa_bench-112.06.00.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit oasis
+
+MY_P=${PN/-/_}-${PV}
+DESCRIPTION="Syntax extension writing inline benchmarks"
+HOMEPAGE="http://www.janestreet.com/ocaml"
+SRC_URI="http://ocaml.janestreet.com/ocaml-core/${PV%.*}.00/individual/${MY_P}.tar.gz
+ https://dev.gentoo.org/~aballier/distfiles/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=">=dev-ml/type-conv-109:=
+ dev-ml/pa_ounit:=
+ dev-ml/camlp4:="
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-ml/pa_ounit-113.00.00 b/dev-ml/pa_ounit-113.00.00
deleted file mode 100644
index ad6af9b0bf76..000000000000
--- a/dev-ml/pa_ounit-113.00.00
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-ml/ounit-1.1.1:= dev-ml/camlp4:= >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=Syntax extension that helps writing in-line test in ocaml
-EAPI=5
-HOMEPAGE=https://bitbucket.org/yminsky/ocaml-core/wiki/Home
-IUSE=+ocamlopt debug
-KEYWORDS=~amd64
-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 983774947da124fb7d542ce25a218bb1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e oasis 9256ed89af74c3365ec888c00bfdfe43 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c7a134c8883d7909e2d994a9a77f283a
diff --git a/dev-ml/pa_ounit/Manifest b/dev-ml/pa_ounit/Manifest
new file mode 100644
index 000000000000..2a400b96d598
--- /dev/null
+++ b/dev-ml/pa_ounit/Manifest
@@ -0,0 +1,3 @@
+DIST pa_ounit-113.00.00.tar.gz 58486 BLAKE2B fff42a3f741741cc29819f7a18aaa4bf8a939125a5c3abcf4b567431da6584ba63a777434c285971bc1ec182363691ea2a34311852fa25159b35414babd8973e SHA512 8b1891ae666606b28a6d46b86ac82cb5680099d3ca8181ae6a422748b6b0a99c763f680741c724ca91f8ade7757f6831bc88211d8d94560168bc208b23337b0e
+EBUILD pa_ounit-113.00.00.ebuild 498 BLAKE2B 6b1d6de25558b2fd0921e9e0be91abab477f05586ffc5562d49fce6addadd2441505defbbccc80e4c479ed3802cf4ade59381c1961b76bf54188474366ef5bb2 SHA512 173c0ee6ba6f9079ce9e6bacb504b1afd25342ab6975b8362ba5d3a4ba48983ead9f814417b71705e1f179745e5023934067ea13a0476943e4c65b806b41f2bc
+MISC metadata.xml 661 BLAKE2B 61fa794eb4c1db195e05f50acfbf9f5e35151d3fa506b17ff22e85f9bf88f1a9d95f64a4bd39e26923317e81dff72831ee11e3b436d7bb47996880a4e460cfe7 SHA512 2f54352a93854a16ed4856b194c5d64cf7abdfbb4d24b1b3c928c5940a5167ca3243bffb10fb64fa11eb48641150c1a102472dac2743bd2da0b61b9ff781d617
diff --git a/dev-ml/pa_ounit/metadata.xml b/dev-ml/pa_ounit/metadata.xml
new file mode 100644
index 000000000000..2fcbb4359b3b
--- /dev/null
+++ b/dev-ml/pa_ounit/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <longdescription lang="en">
+Pa_ounit is a syntax extension that helps writing in-line test in ocaml
+code. It allows user to register tests with a new `TEST` top-level expressions
+and automatically collects all the tests in a module (in a function
+`ounit_tests` of type `unit -&gt; OUnit.test`).
+ </longdescription>
+ <upstream>
+ <remote-id type="bitbucket">yminsky/ocaml-core</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/pa_ounit/pa_ounit-113.00.00.ebuild b/dev-ml/pa_ounit/pa_ounit-113.00.00.ebuild
new file mode 100644
index 000000000000..e9545136eb4a
--- /dev/null
+++ b/dev-ml/pa_ounit/pa_ounit-113.00.00.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit oasis
+
+DESCRIPTION="Syntax extension that helps writing in-line test in ocaml"
+HOMEPAGE="https://bitbucket.org/yminsky/ocaml-core/wiki/Home"
+SRC_URI="http://ocaml.janestreet.com/ocaml-core/${PV%.*}/files/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=">=dev-ml/ounit-1.1.1:=
+ dev-ml/camlp4:="
+RDEPEND="${DEPEND}"
+
+DOCS=( "readme.md" )
diff --git a/dev-ml/pa_sexp_conv-113.00.01 b/dev-ml/pa_sexp_conv-113.00.01
deleted file mode 100644
index d0c86f7e2854..000000000000
--- a/dev-ml/pa_sexp_conv-113.00.01
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ml/type-conv:= dev-ml/sexplib:= dev-ml/camlp4:= >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=Deprecated camlp4 syntax extension for sexplib.
-EAPI=5
-HOMEPAGE=http://www.janestreet.com/ocaml
-IUSE=+ocamlopt debug
-KEYWORDS=~amd64
-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 983774947da124fb7d542ce25a218bb1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e oasis 9256ed89af74c3365ec888c00bfdfe43 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=896e8e1e2715f966f03ec79e6424ea85
diff --git a/dev-ml/pa_sexp_conv/Manifest b/dev-ml/pa_sexp_conv/Manifest
new file mode 100644
index 000000000000..b20883936764
--- /dev/null
+++ b/dev-ml/pa_sexp_conv/Manifest
@@ -0,0 +1,3 @@
+DIST pa_sexp_conv-113.00.01.tar.gz 73862 BLAKE2B 48bb7b0d39f5b6b7d380d6f4d30cc8b0a75ffd23b328da9813c3884b209f782a0592d69e5ef5a48bf89dfe78c5c131524d804eeb286f2ffb2767132c20be999e SHA512 91ad90290d48626a7e1fccb34a632e5ca02ea839f178b52da0ccbea8b27018c79ee8e83e808939e36ddbb78ad348892c53792dd41a2b007b6df947cde85873fd
+EBUILD pa_sexp_conv-113.00.01.ebuild 496 BLAKE2B 7dd421fef7dd6dd77a49b6d7065efe845f32d41778b938d3c1c97203c833783e60f2032ffe9eb35d79c3a36cd712a78c69988f101dfc52821f81dcef7374786e SHA512 0aa794981a6929deeb9c62cf132e962b16295c78a3034ba5ea79167541fcde0eff02d658468957608516f0419de63bb162453e7e2cc7850673b2825551a4baf4
+MISC metadata.xml 335 BLAKE2B a5a9c6460147f749ffb869ade15f5aa866f1f4c0ca7a7684c690c954e20dbb4052e3790886577038feee0eb3a2add0ba3227783a75d0a0140f2f136df6951fbd SHA512 170df4182ee5d52d8d91fc6190209781001cf4e877166afa62f4baf5c71dff56f137b17b616475eb9c42b65029b649267350e97d8aa314eaa08083e20a81042c
diff --git a/dev-ml/pa_sexp_conv/metadata.xml b/dev-ml/pa_sexp_conv/metadata.xml
new file mode 100644
index 000000000000..6c8d0ffb051e
--- /dev/null
+++ b/dev-ml/pa_sexp_conv/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">janestreet/pa_sexp_conv</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/pa_sexp_conv/pa_sexp_conv-113.00.01.ebuild b/dev-ml/pa_sexp_conv/pa_sexp_conv-113.00.01.ebuild
new file mode 100644
index 000000000000..40892485b01c
--- /dev/null
+++ b/dev-ml/pa_sexp_conv/pa_sexp_conv-113.00.01.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit oasis
+
+DESCRIPTION="Deprecated camlp4 syntax extension for sexplib."
+HOMEPAGE="http://www.janestreet.com/ocaml"
+SRC_URI="https://github.com/janestreet/pa_sexp_conv/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+ dev-ml/type-conv:=
+ dev-ml/sexplib:=
+ dev-ml/camlp4:=
+"
+RDEPEND="${DEPEND}"
+DOCS=( README.md )
diff --git a/dev-ml/pa_structural_sexp-113.00.00 b/dev-ml/pa_structural_sexp-113.00.00
deleted file mode 100644
index 3e90ec08e31c..000000000000
--- a/dev-ml/pa_structural_sexp-113.00.00
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ml/camlp4:= dev-ml/type-conv:= dev-ml/sexplib:= >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=Quotation expanders to simplify building s-expressions from ocaml values
-EAPI=5
-HOMEPAGE=https://bitbucket.org/yminsky/ocaml-core/wiki/Home
-IUSE=+ocamlopt debug
-KEYWORDS=~amd64
-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 983774947da124fb7d542ce25a218bb1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e oasis 9256ed89af74c3365ec888c00bfdfe43 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=79bac4ff23e87baf139848422b51d729
diff --git a/dev-ml/pa_structural_sexp/Manifest b/dev-ml/pa_structural_sexp/Manifest
new file mode 100644
index 000000000000..a014d6a669b7
--- /dev/null
+++ b/dev-ml/pa_structural_sexp/Manifest
@@ -0,0 +1,3 @@
+DIST pa_structural_sexp-113.00.00.tar.gz 51825 BLAKE2B 6cb06ad1fed826b91f3eed176bb8873bc43ceeb3c3c0590123fb21d1eac671009d8418430c3eea2b1dd932801f5b26d0b47df6d5d8c72fdc0f1075b43d9d5c8a SHA512 7d1cbb1122b735e7aece71c7b50328a33dc72e63b336d5801433b5017bb94e2baa9a056cf076a2e8747afdf33e5a736154e4b74d5f7b079a6a144f9273e87f9c
+EBUILD pa_structural_sexp-113.00.00.ebuild 527 BLAKE2B 864dfeee946255d6d564c2f1db69c1e63305dd3c8c2085cadddbd46a0092b2629c95c708d0a9f344dfd114d05b4f02365d8ab610b95ba2aa39d0ce367b988f6e SHA512 1d5c2896b29381980a48796ba9560b9eb9fef8ac93b722163f3dacdbb11a5e4fb8ba309a09ab4ab93c5cf5897e6abace01dc40d248bc208d6c52870b428cfd63
+MISC metadata.xml 343 BLAKE2B 8cac0f69e424894eab505005a0c9d8b5fe7efda96fd12e93c1137dbe8774ff61e5e68db4f1af435a331b93122dc1b85688111af07ae65f347ece9119fb8575a5 SHA512 38f2d8c464957254593e928423d0ff2ed84b033bc4933b7b2baa8a4623c995f6768554567cbaf704f96bc8fafa27467c1948cbc2a6a7b4403dfb58b0e4f3ab65
diff --git a/dev-ml/pa_structural_sexp/metadata.xml b/dev-ml/pa_structural_sexp/metadata.xml
new file mode 100644
index 000000000000..91d86fdbaf9e
--- /dev/null
+++ b/dev-ml/pa_structural_sexp/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="bitbucket">yminsky/ocaml-core</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/pa_structural_sexp/pa_structural_sexp-113.00.00.ebuild b/dev-ml/pa_structural_sexp/pa_structural_sexp-113.00.00.ebuild
new file mode 100644
index 000000000000..13a95c0e3804
--- /dev/null
+++ b/dev-ml/pa_structural_sexp/pa_structural_sexp-113.00.00.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit oasis
+
+DESCRIPTION="Quotation expanders to simplify building s-expressions from ocaml values"
+HOMEPAGE="https://bitbucket.org/yminsky/ocaml-core/wiki/Home"
+SRC_URI="http://ocaml.janestreet.com/ocaml-core/${PV%.*}/files/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="dev-ml/camlp4:=
+ dev-ml/type-conv:=
+ dev-ml/sexplib:="
+RDEPEND="${DEPEND}"
+
+DOCS=( "README.md" )
diff --git a/dev-ml/parmap-1.0_rc7-r1 b/dev-ml/parmap-1.0_rc7-r1
deleted file mode 100644
index 098fe94a94a7..000000000000
--- a/dev-ml/parmap-1.0_rc7-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install test
-DEPEND=>=dev-lang/ocaml-4.03:=[ocamlopt?] dev-ml/findlib dev-ml/ocamlbuild dev-ml/ocaml-autoconf
-DESCRIPTION=Library to exploit multicore architectures for OCaml programs
-EAPI=5
-HOMEPAGE=http://www.dicosmo.org/code/parmap/
-IUSE=+ocamlopt
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=LGPL-2-with-linking-exception
-RDEPEND=>=dev-lang/ocaml-4.03:=[ocamlopt?]
-SLOT=0/1.0_rc7
-SRC_URI=https://github.com/rdicosmo/parmap/archive/1.0-rc7-fix-for4.03+3.tar.gz -> parmap-1.0_rc7-ocaml-4.03.tar.gz
-_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=a68d927fca4397863f7270c216dfcdaa
diff --git a/dev-ml/parmap-1.0_rc8 b/dev-ml/parmap-1.0_rc8
deleted file mode 100644
index bccf3a49a9c6..000000000000
--- a/dev-ml/parmap-1.0_rc8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install test
-DEPEND=>=dev-lang/ocaml-4.03:=[ocamlopt?] dev-ml/findlib dev-ml/ocamlbuild dev-ml/ocaml-autoconf
-DESCRIPTION=Library to exploit multicore architectures for OCaml programs
-EAPI=5
-HOMEPAGE=http://www.dicosmo.org/code/parmap/
-IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
-LICENSE=LGPL-2-with-linking-exception
-RDEPEND=>=dev-lang/ocaml-4.03:=[ocamlopt?]
-SLOT=0/1.0_rc8
-SRC_URI=https://github.com/rdicosmo/parmap/archive/1.0-rc8.tar.gz -> parmap-1.0_rc8.tar.gz
-_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=ff3d34f0a9d8f5202123bc38c9d7810b
diff --git a/dev-ml/parmap/Manifest b/dev-ml/parmap/Manifest
new file mode 100644
index 000000000000..f81b0b1d990e
--- /dev/null
+++ b/dev-ml/parmap/Manifest
@@ -0,0 +1,5 @@
+DIST parmap-1.0_rc7-ocaml-4.03.tar.gz 98262 BLAKE2B 829553c5a8a16776588b7fc74304e189945367ddc4988e529b08857fe307b8e05db58fb73819554e88afa2405d8818d2c95fc4dc96e0a47ff782bfd78b912e90 SHA512 c8b7678fede76d35b299ef0548ef3819f9ec056cde4d5498e11f2400b96149b17ce58c35d197d10dba5fd4a702b94fe78090e1f330791b0f470891f0bbf7a544
+DIST parmap-1.0_rc8.tar.gz 98699 BLAKE2B 755208d0b380c200c5fb2a38334bcd422ea3e3c86bd8a52db37e256dd45c22c05e8577a5f13ae14d4ad553d16c212ae2a1b299e0870ac71a52e0bf11ddf2ecc4 SHA512 96bbe49f06dc3611577e87d9e6f5ca32e10271d6a14a0970bd4548fcaf268f833b3143258e14328237a60578e2355687e4bff031a021903f3e2280ef1713cc65
+EBUILD parmap-1.0_rc7-r1.ebuild 1097 BLAKE2B 3609529cf6a3544b64adc90816714b3fc4cd38475a639cd2e5521b245f52bd90db8c7098d993ae74d5aa0de4c49ad8dc902ed7f1c619c790f640ebeadb720ef3 SHA512 a547e35c3a9e0eb97925d273d86a30602eae8a6b2f5c60f76c297d0f7267aef450571c283be22f63b66745bfa16275f11224d1c304c4e791a3fa1226b3ca0e7f
+EBUILD parmap-1.0_rc8.ebuild 1084 BLAKE2B bb2565a84f98a80d95aea51c0caa30b7a4f8829ccf54a34c4a2e5a6334a1669a5ad0d977af22dddb4435719a1e7cd909f943a43e8a1ac5831ae40688f0101308 SHA512 8c51f63d2e1d666b108446d1489068f5926959532622483b3d9aaa504b2f31d2858d62ee1b869d66323c17518ded5b9f1c3b755f31a8bdca64248294658d411e
+MISC metadata.xml 337 BLAKE2B 5e2c90b92e8d36dc456c425ae92361efdd6875baad7e5a2b177ffa143ee28ab4445629dc81bb391ef9a7b3f19803cc7faa33ab0918e7c55af92b07c8833ea55d SHA512 128962f68b0487b0b280d3db994ca99995713fcc9eba9a8242ea648f5571aeace899c32f17b642cd9bbd75aa17d2513e3126afbd7a9f8c37ddcc091c441fc94b
diff --git a/dev-ml/parmap/metadata.xml b/dev-ml/parmap/metadata.xml
new file mode 100644
index 000000000000..8a36ff16ac07
--- /dev/null
+++ b/dev-ml/parmap/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">rdicosmo/parmap</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/parmap/parmap-1.0_rc7-r1.ebuild b/dev-ml/parmap/parmap-1.0_rc7-r1.ebuild
new file mode 100644
index 000000000000..9bc4423786eb
--- /dev/null
+++ b/dev-ml/parmap/parmap-1.0_rc7-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit multilib
+
+MY_PV="${PV/_/-}-fix-for4.03+3"
+DESCRIPTION="Library to exploit multicore architectures for OCaml programs"
+HOMEPAGE="http://www.dicosmo.org/code/parmap/"
+SRC_URI="https://github.com/rdicosmo/parmap/archive/${MY_PV}.tar.gz -> ${P}-ocaml-4.03.tar.gz"
+
+LICENSE="LGPL-2-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="+ocamlopt"
+
+RDEPEND=">=dev-lang/ocaml-4.03:=[ocamlopt?]"
+DEPEND="${RDEPEND}
+ dev-ml/findlib
+ dev-ml/ocamlbuild
+ dev-ml/ocaml-autoconf"
+S="${WORKDIR}/${PN}-${MY_PV/+/-}"
+
+src_test() {
+ mkdir "${WORKDIR}/tmpinstall" || die
+ emake \
+ OCAMLLIBDIR="ocaml" \
+ DESTDIR="${WORKDIR}/tmpinstall" \
+ install
+ export OCAMLPATH="${WORKDIR}/tmpinstall/ocaml"
+ emake tests
+ cd _build/tests || die
+ for i in $(find . -type f -executable) ; do
+ ${i} || die
+ done
+}
+
+src_install() {
+ emake \
+ OCAMLLIBDIR="$(get_libdir)/ocaml" \
+ MANDIR="${ED}/usr/share/man/man3o" \
+ DESTDIR="${ED}/usr" \
+ install
+ dodoc AUTHORS Changelog README
+}
diff --git a/dev-ml/parmap/parmap-1.0_rc8.ebuild b/dev-ml/parmap/parmap-1.0_rc8.ebuild
new file mode 100644
index 000000000000..c224550f0d6a
--- /dev/null
+++ b/dev-ml/parmap/parmap-1.0_rc8.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit multilib
+
+MY_PV="${PV/_/-}"
+DESCRIPTION="Library to exploit multicore architectures for OCaml programs"
+HOMEPAGE="http://www.dicosmo.org/code/parmap/"
+SRC_URI="https://github.com/rdicosmo/parmap/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE="+ocamlopt"
+
+RDEPEND=">=dev-lang/ocaml-4.03:=[ocamlopt?]"
+DEPEND="${RDEPEND}
+ dev-ml/findlib
+ dev-ml/ocamlbuild
+ dev-ml/ocaml-autoconf"
+S="${WORKDIR}/${PN}-${MY_PV/+/-}"
+
+src_test() {
+ mkdir "${WORKDIR}/tmpinstall" || die
+ emake \
+ OCAMLLIBDIR="ocaml" \
+ DESTDIR="${WORKDIR}/tmpinstall" \
+ install
+ export OCAMLPATH="${WORKDIR}/tmpinstall/ocaml"
+ emake tests
+ cd _build/tests || die
+ for i in $(find . -type f -executable) ; do
+ ${i} || die
+ done
+}
+
+src_install() {
+ emake \
+ OCAMLLIBDIR="$(get_libdir)/ocaml" \
+ MANDIR="${ED}/usr/share/man/man3o" \
+ DESTDIR="${ED}/usr" \
+ install
+ dodoc AUTHORS Changelog README
+}
diff --git a/dev-ml/patience_diff-0.9.0 b/dev-ml/patience_diff-0.9.0
deleted file mode 100644
index 05dad246f1b7..000000000000
--- a/dev-ml/patience_diff-0.9.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-ml/core_kernel:= dev-ml/ppx_driver:= dev-ml/ppx_jane:= dev-ml/ocaml-migrate-parsetree:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=Tool and library implementing patience diff
-EAPI=6
-HOMEPAGE=https://github.com/janestreet/patience_diff
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-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 24b4a2529c1fd12f1304856d6c5a690d
-_md5_=1f9504b537b5f20dc0cb4c5e1ecbc963
diff --git a/dev-ml/patience_diff/Manifest b/dev-ml/patience_diff/Manifest
new file mode 100644
index 000000000000..95ac6701752a
--- /dev/null
+++ b/dev-ml/patience_diff/Manifest
@@ -0,0 +1,3 @@
+DIST patience_diff-0.9.0.tar.gz 16520 BLAKE2B af7f93906c1f4ab70649bc41726aff21f9f099fe49b0d3a3e8bea01d85e9f01cac4bd103179e9877d79dbc997d37318382321dacd67be57a9e031fd95e0263e5 SHA512 62cc0950edd8d46d5a11cd612dbdb8dc531a9a2c71403f30e6022e20d9ee21cb2e7a531362fa8b350075003eec929f1f70481b8e160b253831966d80a8becd83
+EBUILD patience_diff-0.9.0.ebuild 526 BLAKE2B 45391487404730a2f788a48d978bc3aab43bef59305fc363eae6ed608cf3d032abdb7e07cdd4b35ff3c495a0808b6e1fe37569a783bffd08b59aa497a7b4e532 SHA512 407651f14c1ba623a4210a8550a957776f12c9612b434452587e075b29327978cfb349da7df71c4d79e42bd186ec5c846e0191a9a2dc13241839d0cdb116aa13
+MISC metadata.xml 336 BLAKE2B 619d34a20035c8918350e063bf3cfef6ad0a532bf2c09d374ba658e3cf85b56a5331e90341ad7dff215bf892d48732aed68f3659efb2fe61734a3bd72ede269a SHA512 c845ce7952411252254f736e36596bb8161e28aee01be474a6dd720ec15afdce86654308993177e6cb784fdced15084e66074f9be789789349f4395eb13156ae
diff --git a/dev-ml/patience_diff/metadata.xml b/dev-ml/patience_diff/metadata.xml
new file mode 100644
index 000000000000..41ba0f8e6fe0
--- /dev/null
+++ b/dev-ml/patience_diff/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">janestreet/patience_diff</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/patience_diff/patience_diff-0.9.0.ebuild b/dev-ml/patience_diff/patience_diff-0.9.0.ebuild
new file mode 100644
index 000000000000..cba06ddf9e13
--- /dev/null
+++ b/dev-ml/patience_diff/patience_diff-0.9.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit opam
+
+DESCRIPTION="Tool and library implementing patience diff"
+HOMEPAGE="https://github.com/janestreet/${PN}"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+ dev-ml/core_kernel:=
+ dev-ml/ppx_driver:=
+ dev-ml/ppx_jane:=
+ dev-ml/ocaml-migrate-parsetree:=
+"
+DEPEND="${RDEPEND} dev-ml/jbuilder"
diff --git a/dev-ml/pcre-ocaml-7.2.3 b/dev-ml/pcre-ocaml-7.2.3
deleted file mode 100644
index 98250914d01a..000000000000
--- a/dev-ml/pcre-ocaml-7.2.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-libs/libpcre-4.5 >=dev-lang/ocaml-4:= >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=Perl Compatibility Regular Expressions for O'Caml
-EAPI=5
-HOMEPAGE=http://mmottl.github.io/pcre-ocaml/ https://github.com/mmottl/pcre-ocaml
-IUSE=examples +ocamlopt debug doc
-KEYWORDS=amd64 ppc x86 ~x86-fbsd
-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 983774947da124fb7d542ce25a218bb1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e oasis 9256ed89af74c3365ec888c00bfdfe43 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=efbd75882cce13144bf6a4163d4d7b82
diff --git a/dev-ml/pcre-ocaml-7.3.0 b/dev-ml/pcre-ocaml-7.3.0
deleted file mode 100644
index b99776518924..000000000000
--- a/dev-ml/pcre-ocaml-7.3.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=>=dev-libs/libpcre-4.5 dev-ml/jbuilder dev-ml/base dev-ml/stdio dev-ml/configurator >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=Perl Compatibility Regular Expressions for O'Caml
-EAPI=5
-HOMEPAGE=http://mmottl.github.io/pcre-ocaml/ https://github.com/mmottl/pcre-ocaml
-IUSE=examples
-KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
-LICENSE=LGPL-2.1-with-linking-exception
-RDEPEND=>=dev-libs/libpcre-4.5 >=dev-lang/ocaml-4:=
-SLOT=0/7.3.0
-SRC_URI=https://github.com/mmottl/pcre-ocaml/releases/download/7.3.0/pcre-7.3.0.tbz -> pcre-ocaml-7.3.0.tbz
-_eclasses_=opam 24b4a2529c1fd12f1304856d6c5a690d
-_md5_=cdd1c35b287d7ea819942b36346cf6d8
diff --git a/dev-ml/pcre-ocaml-7.3.2 b/dev-ml/pcre-ocaml-7.3.2
deleted file mode 100644
index 88d1825abc98..000000000000
--- a/dev-ml/pcre-ocaml-7.3.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=>=dev-libs/libpcre-4.5 dev-ml/jbuilder dev-ml/base dev-ml/stdio dev-ml/configurator >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=Perl Compatibility Regular Expressions for O'Caml
-EAPI=5
-HOMEPAGE=http://mmottl.github.io/pcre-ocaml/ https://github.com/mmottl/pcre-ocaml
-IUSE=examples
-KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
-LICENSE=LGPL-2.1-with-linking-exception
-RDEPEND=>=dev-libs/libpcre-4.5 >=dev-lang/ocaml-4:=
-SLOT=0/7.3.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 24b4a2529c1fd12f1304856d6c5a690d
-_md5_=cdd1c35b287d7ea819942b36346cf6d8
diff --git a/dev-ml/pcre-ocaml-7.3.3 b/dev-ml/pcre-ocaml-7.3.3
deleted file mode 100644
index 730fe59d2bc2..000000000000
--- a/dev-ml/pcre-ocaml-7.3.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=>=dev-libs/libpcre-4.5 dev-ml/jbuilder dev-ml/base dev-ml/stdio dev-ml/configurator >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=Perl Compatibility Regular Expressions for O'Caml
-EAPI=5
-HOMEPAGE=http://mmottl.github.io/pcre-ocaml/ https://github.com/mmottl/pcre-ocaml
-IUSE=examples
-KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
-LICENSE=LGPL-2.1-with-linking-exception
-RDEPEND=>=dev-libs/libpcre-4.5 >=dev-lang/ocaml-4:=
-SLOT=0/7.3.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 24b4a2529c1fd12f1304856d6c5a690d
-_md5_=cdd1c35b287d7ea819942b36346cf6d8
diff --git a/dev-ml/pcre-ocaml/Manifest b/dev-ml/pcre-ocaml/Manifest
new file mode 100644
index 000000000000..9ce9dda4bf0b
--- /dev/null
+++ b/dev-ml/pcre-ocaml/Manifest
@@ -0,0 +1,9 @@
+DIST pcre-ocaml-7.2.3.tar.gz 88307 BLAKE2B 1024a0d7a490fb31927f67af4c9a5e90c8d3788b3998a8af1ecaba9d6d12d1a1be91dcb2bdc1c49e6e81f0909d1dd9b6bc200f908c68427650985491f35685c9 SHA512 3df4bdbbed5e1ecf4bdf15fc461f2ea65e1556af9c1683e194c8824e21da5274dd80c22c1f6676fca203305ec4244d47e09f0ef8c601bfa95f7237bb07c1ee65
+DIST pcre-ocaml-7.3.0.tbz 38126 BLAKE2B a129f263ab623827f491f573141a3c1da033ba853c115dbc853c942c64554028ac5e9c83a17123513522bebbd56cd5533fdb6ef17545761d1fde6063021def1b SHA512 bf2a5d188183a7f73d5a7eace98f225165e6b50828b061649e88922ca4d4705022551bce15b9b8319fc91734c77ee48182677cdb1abd754ae44c6f9412bd11e3
+DIST pcre-ocaml-7.3.2.tbz 38445 BLAKE2B 1858ce78abc760e99e34e88c590a23b79f20ed2f31abdb991f60a124b2beee140ec3e712990ced3529bf5efb5e38d231190cf9ac0f9ee2d39c1a33687b770266 SHA512 727b129172c8c119fcb0d4ae249a3842109e3b9ab412e674af156e7bcdf0fce0bcb9561cbfe52d99002a668f0e5f145fa54d052b67a5c2eb30a1881ad4217767
+DIST pcre-ocaml-7.3.3.tbz 38412 BLAKE2B 3c9538f5fc8bc6dea0c6ceda3a2b30a48302943d53a83a4876c31dbe600752ac68498a4db9546698424b34bbd55c6c3254d47148233a845376887c30dc6fd429 SHA512 569e323dea83f33212a2aa9482e55f7491c8f83382fad13dfaf9fe624307ca261baf255db7c5837e1c6b5c64445daf05b64b9929cbd6d311d06278826bb788e3
+EBUILD pcre-ocaml-7.2.3.ebuild 734 BLAKE2B f29989e981d1e956c8eaa60ea4e8114b2d67a0f6c7465d09c0ff7307e731ed640f7db963b9a5c6b29cc2e6e568224f34324818f237d97fa9b73cf77c554fe9d5 SHA512 e0bf744183b55432635e2183382e752f40cfbaa4b912f34890bb8367fb903872f6dcfc294431b0d5ce134104fef76e1f123c72ab42bf19cdde336e299e354526
+EBUILD pcre-ocaml-7.3.0.ebuild 848 BLAKE2B 484f8a42f6ca1b2cbdf6b96a4fb4d3b24f7d39641e899808b7ad5c126659358b999b9e8866cb5cc0719753ccc8dbed1b4f01a1595c881cccf6646a5312630119 SHA512 f4f0657a24f3ecaf1ee21baf02c5e9990441fa753564d9c08c2efd1d3ea59682242694b978ff20fbd3d68f5f3c8bd4be409c974883c638ec337e156b4feb6065
+EBUILD pcre-ocaml-7.3.2.ebuild 848 BLAKE2B 484f8a42f6ca1b2cbdf6b96a4fb4d3b24f7d39641e899808b7ad5c126659358b999b9e8866cb5cc0719753ccc8dbed1b4f01a1595c881cccf6646a5312630119 SHA512 f4f0657a24f3ecaf1ee21baf02c5e9990441fa753564d9c08c2efd1d3ea59682242694b978ff20fbd3d68f5f3c8bd4be409c974883c638ec337e156b4feb6065
+EBUILD pcre-ocaml-7.3.3.ebuild 848 BLAKE2B 484f8a42f6ca1b2cbdf6b96a4fb4d3b24f7d39641e899808b7ad5c126659358b999b9e8866cb5cc0719753ccc8dbed1b4f01a1595c881cccf6646a5312630119 SHA512 f4f0657a24f3ecaf1ee21baf02c5e9990441fa753564d9c08c2efd1d3ea59682242694b978ff20fbd3d68f5f3c8bd4be409c974883c638ec337e156b4feb6065
+MISC metadata.xml 401 BLAKE2B 553c398cedf3cfca51af5f3e36c34d6ec28fce6b853f7c94257e513871cdf52ef1c1166d2651fd9c91b6180f461e9d72956c3dbdf959338504da741e5fd6593f SHA512 969fce8d8d459aaa46fe1d498c8485b074af03ea2ff4d66cd2013c7f45733255ee37b674da5af0fb8f11c2d6350e2871463a3b3f7167488775ce6c2e17304be0
diff --git a/dev-ml/pcre-ocaml/metadata.xml b/dev-ml/pcre-ocaml/metadata.xml
new file mode 100644
index 000000000000..919c43785884
--- /dev/null
+++ b/dev-ml/pcre-ocaml/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">mmottl/pcre-ocaml</remote-id>
+ <remote-id type="bitbucket">mmottl/pcre-ocaml</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/pcre-ocaml/pcre-ocaml-7.2.3.ebuild b/dev-ml/pcre-ocaml/pcre-ocaml-7.2.3.ebuild
new file mode 100644
index 000000000000..c28e3d2dda5f
--- /dev/null
+++ b/dev-ml/pcre-ocaml/pcre-ocaml-7.2.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+OASIS_BUILD_DOCS=1
+
+inherit oasis
+
+DESCRIPTION="Perl Compatibility Regular Expressions for O'Caml"
+HOMEPAGE="http://mmottl.github.io/pcre-ocaml/ https://github.com/mmottl/pcre-ocaml"
+SRC_URI="https://github.com/mmottl/pcre-ocaml/releases/download/v${PV}/${P}.tar.gz"
+LICENSE="LGPL-2.1-with-linking-exception"
+IUSE="examples"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+
+RDEPEND=">=dev-libs/libpcre-4.5
+ >=dev-lang/ocaml-4:="
+DEPEND="${RDEPEND}"
+
+DOCS=( "AUTHORS.txt" "CHANGES.txt" "README.md" )
+
+src_install() {
+ oasis_src_install
+ if use examples ; then
+ insinto /usr/share/doc/${PF}
+ doins -r examples
+ fi
+}
diff --git a/dev-ml/pcre-ocaml/pcre-ocaml-7.3.0.ebuild b/dev-ml/pcre-ocaml/pcre-ocaml-7.3.0.ebuild
new file mode 100644
index 000000000000..7f1a5f8b9512
--- /dev/null
+++ b/dev-ml/pcre-ocaml/pcre-ocaml-7.3.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit opam
+
+DESCRIPTION="Perl Compatibility Regular Expressions for O'Caml"
+HOMEPAGE="http://mmottl.github.io/pcre-ocaml/ https://github.com/mmottl/pcre-ocaml"
+SRC_URI="https://github.com/mmottl/pcre-ocaml/releases/download/${PV}/pcre-${PV}.tbz -> ${P}.tbz"
+LICENSE="LGPL-2.1-with-linking-exception"
+IUSE="examples"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+
+RDEPEND=">=dev-libs/libpcre-4.5"
+DEPEND="${RDEPEND}
+ dev-ml/jbuilder
+ dev-ml/base
+ dev-ml/stdio
+ dev-ml/configurator
+"
+
+S="${WORKDIR}/pcre-${PV}"
+
+src_compile() {
+ jbuilder build @install || die
+}
+
+src_test() {
+ jbuilder runtest || die
+}
+
+src_install() {
+ opam_src_install pcre
+
+ if use examples ; then
+ insinto /usr/share/doc/${PF}
+ doins -r examples
+ fi
+}
diff --git a/dev-ml/pcre-ocaml/pcre-ocaml-7.3.2.ebuild b/dev-ml/pcre-ocaml/pcre-ocaml-7.3.2.ebuild
new file mode 100644
index 000000000000..7f1a5f8b9512
--- /dev/null
+++ b/dev-ml/pcre-ocaml/pcre-ocaml-7.3.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit opam
+
+DESCRIPTION="Perl Compatibility Regular Expressions for O'Caml"
+HOMEPAGE="http://mmottl.github.io/pcre-ocaml/ https://github.com/mmottl/pcre-ocaml"
+SRC_URI="https://github.com/mmottl/pcre-ocaml/releases/download/${PV}/pcre-${PV}.tbz -> ${P}.tbz"
+LICENSE="LGPL-2.1-with-linking-exception"
+IUSE="examples"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+
+RDEPEND=">=dev-libs/libpcre-4.5"
+DEPEND="${RDEPEND}
+ dev-ml/jbuilder
+ dev-ml/base
+ dev-ml/stdio
+ dev-ml/configurator
+"
+
+S="${WORKDIR}/pcre-${PV}"
+
+src_compile() {
+ jbuilder build @install || die
+}
+
+src_test() {
+ jbuilder runtest || die
+}
+
+src_install() {
+ opam_src_install pcre
+
+ if use examples ; then
+ insinto /usr/share/doc/${PF}
+ doins -r examples
+ fi
+}
diff --git a/dev-ml/pcre-ocaml/pcre-ocaml-7.3.3.ebuild b/dev-ml/pcre-ocaml/pcre-ocaml-7.3.3.ebuild
new file mode 100644
index 000000000000..7f1a5f8b9512
--- /dev/null
+++ b/dev-ml/pcre-ocaml/pcre-ocaml-7.3.3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit opam
+
+DESCRIPTION="Perl Compatibility Regular Expressions for O'Caml"
+HOMEPAGE="http://mmottl.github.io/pcre-ocaml/ https://github.com/mmottl/pcre-ocaml"
+SRC_URI="https://github.com/mmottl/pcre-ocaml/releases/download/${PV}/pcre-${PV}.tbz -> ${P}.tbz"
+LICENSE="LGPL-2.1-with-linking-exception"
+IUSE="examples"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+
+RDEPEND=">=dev-libs/libpcre-4.5"
+DEPEND="${RDEPEND}
+ dev-ml/jbuilder
+ dev-ml/base
+ dev-ml/stdio
+ dev-ml/configurator
+"
+
+S="${WORKDIR}/pcre-${PV}"
+
+src_compile() {
+ jbuilder build @install || die
+}
+
+src_test() {
+ jbuilder runtest || die
+}
+
+src_install() {
+ opam_src_install pcre
+
+ if use examples ; then
+ insinto /usr/share/doc/${PF}
+ doins -r examples
+ fi
+}
diff --git a/dev-ml/pgocaml-2.3 b/dev-ml/pgocaml-2.3
deleted file mode 100644
index db69f4fa98a6..000000000000
--- a/dev-ml/pgocaml-2.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ml/calendar:= dev-ml/csv:= dev-ml/ocaml-re:= camlp4? ( dev-ml/camlp4:= ) >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=PG'OCaml is a set of OCaml bindings for the PostgreSQL database
-EAPI=5
-HOMEPAGE=http://pgocaml.forge.ocamlcore.org/
-IUSE=+camlp4 doc +ocamlopt debug doc
-KEYWORDS=~amd64
-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 983774947da124fb7d542ce25a218bb1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e oasis 9256ed89af74c3365ec888c00bfdfe43 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=07c41cad72c9bbb555651e26923a4b1b
diff --git a/dev-ml/pgocaml/Manifest b/dev-ml/pgocaml/Manifest
new file mode 100644
index 000000000000..68f94fedacfb
--- /dev/null
+++ b/dev-ml/pgocaml/Manifest
@@ -0,0 +1,3 @@
+DIST pgocaml-2.3.tgz 90383 BLAKE2B 3e536b4a310846688a3fd55b7a807e1aeebd12ce5f551d66572f8f3014007058a6843da1bfaf6acf16d0c1ab8b8c61551b85c29b95a79d604e9314849c1b1e05 SHA512 f42ca8ccf31f9e03cfa9f81a9cd19c2a6010c33f5a578e76924683fd10ab4acf2727b09b71c5a8f200bc39765a5d876a289976fea367b49ae54335c007fd3ff7
+EBUILD pgocaml-2.3.ebuild 760 BLAKE2B e97d456271daa825b220bd3941465a3c246d8822a3e3db83a732baaf1c3355070fc6f4920e87cdae8898367cd62ffb691dfc2d57115735451d6f9b4d676be698 SHA512 077437b8d6c82b34c60dfa2ba5cf37f9f27dc7f01b0b2a995f39fb1cbc748867ad13696c8efca8a97c18fa1a8a3f1415aa6d8fbdc9e4f7c31725de8df1c52958
+MISC metadata.xml 325 BLAKE2B 9e20ffdb6978964401f1f7443d3618af20c872807d2830a61ffb68ddd30305e5f83e77b0a10ac4fe9abecd9dfb5c954fb68b932aaf16101de8335e3c9632fbe8 SHA512 83d60959aa467616d4d7d53fa5c29f7a8b2a49dae6a5d6d400ad6c44ad571c0a3375000662a99435570d257d871fd78e3f64c48edcfc6fcdfeb27be9fec8a338
diff --git a/dev-ml/pgocaml/metadata.xml b/dev-ml/pgocaml/metadata.xml
new file mode 100644
index 000000000000..a00e7949c4bb
--- /dev/null
+++ b/dev-ml/pgocaml/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <use>
+ <flag name="camlp4">Enable PG'Ocaml syntax extension.</flag>
+ </use>
+</pkgmetadata>
diff --git a/dev-ml/pgocaml/pgocaml-2.3.ebuild b/dev-ml/pgocaml/pgocaml-2.3.ebuild
new file mode 100644
index 000000000000..121edf6351c3
--- /dev/null
+++ b/dev-ml/pgocaml/pgocaml-2.3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+OASIS_BUILD_DOCS=1
+
+inherit oasis
+
+DESCRIPTION="PG'OCaml is a set of OCaml bindings for the PostgreSQL database"
+HOMEPAGE="http://pgocaml.forge.ocamlcore.org/"
+SRC_URI="http://forge.ocamlcore.org/frs/download.php/1597/${P}.tgz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="+camlp4 doc"
+
+DEPEND="dev-ml/calendar:=
+ dev-ml/csv:=
+ dev-ml/ocaml-re:=
+ camlp4? ( dev-ml/camlp4:= )"
+RDEPEND="${DEPEND}"
+
+DOCS=( "README.md" "CHANGELOG.txt"
+ "doc/BUGS.txt" "doc/CONTRIBUTORS.txt"
+ "doc/HOW_IT_WORKS.txt" "doc/PROFILING.txt"
+ )
+
+src_configure() {
+ oasis_configure_opts="$(use_enable camlp4 p4)" oasis_src_configure
+}
diff --git a/dev-ml/pipebang-113.00.00 b/dev-ml/pipebang-113.00.00
deleted file mode 100644
index b23a3ec15211..000000000000
--- a/dev-ml/pipebang-113.00.00
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-ml/type-conv-109.60:= dev-ml/camlp4:= >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=Syntax extension to transform x |! f into f x
-EAPI=5
-HOMEPAGE=https://bitbucket.org/yminsky/ocaml-core/wiki/Home
-IUSE=+ocamlopt debug
-KEYWORDS=~amd64
-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 983774947da124fb7d542ce25a218bb1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e oasis 9256ed89af74c3365ec888c00bfdfe43 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5bdd314cf82ece6053d6998890c249d9
diff --git a/dev-ml/pipebang/Manifest b/dev-ml/pipebang/Manifest
new file mode 100644
index 000000000000..58be5e0d014f
--- /dev/null
+++ b/dev-ml/pipebang/Manifest
@@ -0,0 +1,3 @@
+DIST pipebang-113.00.00.tar.gz 48786 BLAKE2B 4ec19aad4699dcf5b2b83dc8f7aa806cd5ae69a28f4ae4dc39c32ba9c853abd1ce18c546c6617bcde075b33151ae125c1c4590415b3a23f63a716a0c99f2e8ca SHA512 b0398086e76eed787e8c727440caf94b17e1b667e6ce6d2be8f1ef896b0987c9fde9e3a3fd82c3df4a215c1656210210284defc526fb296bedb2ad3d1526897e
+EBUILD pipebang-113.00.00.ebuild 469 BLAKE2B a0dcf45b1d0d0cecc10db08bc0ce111a0cda65c5ffa3f4d1d8ddb377842807b23f59d906143ba3d7f3a79ad85eaf757f9e1b2c3ebf92e2663187d55710eedbb6 SHA512 dc4ec36bb37a0eff1a26af68be125efaef30a754b64f161983580096e1a1946ca7c07ded010726a4f0d3f9b2d070e3de69462cd7ac732859b55102b6ca3c3285
+MISC metadata.xml 343 BLAKE2B 8cac0f69e424894eab505005a0c9d8b5fe7efda96fd12e93c1137dbe8774ff61e5e68db4f1af435a331b93122dc1b85688111af07ae65f347ece9119fb8575a5 SHA512 38f2d8c464957254593e928423d0ff2ed84b033bc4933b7b2baa8a4623c995f6768554567cbaf704f96bc8fafa27467c1948cbc2a6a7b4403dfb58b0e4f3ab65
diff --git a/dev-ml/pipebang/metadata.xml b/dev-ml/pipebang/metadata.xml
new file mode 100644
index 000000000000..91d86fdbaf9e
--- /dev/null
+++ b/dev-ml/pipebang/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="bitbucket">yminsky/ocaml-core</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/pipebang/pipebang-113.00.00.ebuild b/dev-ml/pipebang/pipebang-113.00.00.ebuild
new file mode 100644
index 000000000000..7762bd649a0a
--- /dev/null
+++ b/dev-ml/pipebang/pipebang-113.00.00.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit oasis
+
+DESCRIPTION="Syntax extension to transform x |! f into f x"
+HOMEPAGE="https://bitbucket.org/yminsky/ocaml-core/wiki/Home"
+SRC_URI="http://ocaml.janestreet.com/ocaml-core/${PV%.*}/files/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=">=dev-ml/type-conv-109.60:=
+ dev-ml/camlp4:="
+RDEPEND="${DEPEND}"
diff --git a/dev-ml/pomap-3.0.6 b/dev-ml/pomap-3.0.6
deleted file mode 100644
index 3ffcf7116aaa..000000000000
--- a/dev-ml/pomap-3.0.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ml/camlp4:= >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=Partially Ordered Map ADT for O'Caml
-EAPI=5
-HOMEPAGE=http://mmottl.github.io/pomap/
-IUSE=examples +ocamlopt debug doc
-KEYWORDS=amd64 ppc x86
-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 983774947da124fb7d542ce25a218bb1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e oasis 9256ed89af74c3365ec888c00bfdfe43 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=fd9fa661dd7288ae36a543c7e415b7c9
diff --git a/dev-ml/pomap-3.0.7 b/dev-ml/pomap-3.0.7
deleted file mode 100644
index f8ff666cf935..000000000000
--- a/dev-ml/pomap-3.0.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ml/camlp4:= >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=Partially Ordered Map ADT for O'Caml
-EAPI=5
-HOMEPAGE=http://mmottl.github.io/pomap/
-IUSE=examples +ocamlopt debug doc
-KEYWORDS=~amd64 ~ppc ~x86
-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 983774947da124fb7d542ce25a218bb1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e oasis 9256ed89af74c3365ec888c00bfdfe43 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=bf9a15b670e93205cc29a4e11422174b
diff --git a/dev-ml/pomap-4.0.0 b/dev-ml/pomap-4.0.0
deleted file mode 100644
index d6b8ea97069c..000000000000
--- a/dev-ml/pomap-4.0.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=Partially Ordered Map ADT for O'Caml
-EAPI=5
-HOMEPAGE=http://mmottl.github.io/pomap/
-KEYWORDS=~amd64 ~ppc ~x86
-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 24b4a2529c1fd12f1304856d6c5a690d
-_md5_=76b6e916d62bc93fd283eecf3aa8af19
diff --git a/dev-ml/pomap/Manifest b/dev-ml/pomap/Manifest
new file mode 100644
index 000000000000..2bc334e637b7
--- /dev/null
+++ b/dev-ml/pomap/Manifest
@@ -0,0 +1,7 @@
+DIST pomap-3.0.6.tar.gz 75345 BLAKE2B 09fcce87bddcca92ea7c51a1c491ad9d9a17f46b38ca50e6b8759c29b802e89a0a9dbd2a9c4ab5aac30386acbba006924275f8a0c09cb7f20a2aac36dc2584ae SHA512 c9b91b7eb3716f4ba735928bb7d33202fe4b05d3908afad36cffa01ffa5fa8f860b3a9d57a0b5bbf2577bb84f3a5b464ec85375e488a3fd5f8d99d7bbcf141a8
+DIST pomap-3.0.7.tar.gz 80880 BLAKE2B f0d110b229650c9eb17d15e2ca8a6e254fe710e39a57c428ac4712379a09d261a4f082d27859b344fb6b2caabe165db08df3588996a9164928df78e6331babd4 SHA512 f4f59708c1a638211332444310aae903eead9dfe9900034698a19ead275fe8d95a32f74bd8e062f7d5d671bbd92cdf18052f26a1e2fd07724c37f60b304f66ba
+DIST pomap-4.0.0.tbz 29684 BLAKE2B 3ec69da852294bad1894a1178d7bd9623cc4596a38b987885f25740d954f62cb5b1b45c63a6bbf157708ed1654123fd8cb6b20f706009091d0c47a4171ab6683 SHA512 bf249664c8a70629ca088ce6940e1db47e26c8ecbbdb28428d1a79a6d1ef4f93c48835d22d7219b57a6e60f1a64a96c23826af55720033a0ce669234b3d29d06
+EBUILD pomap-3.0.6.ebuild 680 BLAKE2B 9cebf82f54aa20b0526240c10d40d5d52b0af303d19a256b1f5d59ac66f2bd1fee0a7d997ca297401d1e06784c8b020b69d0b2fa519376f2b5795c453937d80e SHA512 b1348fc2b9ef1ebca4c08a0d551ec2e88df097782d63c77bfed873d4630c13bfa399e9f7109f288adf22b8d6eaed08b39f22d59ca332ab39bf82dee52ac71ba5
+EBUILD pomap-3.0.7.ebuild 683 BLAKE2B 0973968870b34b75601cf9ecd51885d21ebdfdcefcf8a4995f9a2a13822cd0a5adb55a7efbeebbdc8a7d3be58e08bfd9d828e7a5c725260521dbccae3cb5e22c SHA512 c4c8290ab83e495b77315881e247e076d3f91a6f84772433230ed45a73a0f4ac22e97603f07044e648fc49a7e117582f5fd259bbbe53e5d521e9a0a72ab55b13
+EBUILD pomap-4.0.0.ebuild 490 BLAKE2B 8d2973bb3249028bb0dcaf9609a2ddf8f5950aba955462763ab4cd66ae655cca5701d14bc12dab033db3c60592d4b2ce4ac9a11a5400b5bf48ad7ef865422c03 SHA512 6777f9b6e54e4fd8c6fae207284d5898d998700930f88579ba550748f3bfab43187291f2f3455f753ee9b001d1cafb3a170027d9bc9e3a64ba48db934189541e
+MISC metadata.xml 391 BLAKE2B 4825eb597809ac363b011afba2bf2b2e5991edfa0ae0e7127d7a45a5f42e6334a3ec22b30714f80a540e88a99efad05c006c10b53840158b7472ad11d9e50596 SHA512 2ed495c5d41786616fa0b233c56ad8020e814a4899ee0e526c43cf246d87cbc8b7ad7bbd07dda3e07fc38ab5d6c608727eca422c2b3638725acc97f7423b6248
diff --git a/dev-ml/pomap/metadata.xml b/dev-ml/pomap/metadata.xml
new file mode 100644
index 000000000000..036d8f8cc14f
--- /dev/null
+++ b/dev-ml/pomap/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">mmottl/pomap</remote-id>
+ <remote-id type="bitbucket">mmottl/pomap</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/pomap/pomap-3.0.6.ebuild b/dev-ml/pomap/pomap-3.0.6.ebuild
new file mode 100644
index 000000000000..f1910f1b010f
--- /dev/null
+++ b/dev-ml/pomap/pomap-3.0.6.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+OASIS_BUILD_DOCS=1
+
+inherit oasis
+
+DESCRIPTION="Partially Ordered Map ADT for O'Caml"
+HOMEPAGE="http://mmottl.github.io/pomap/"
+SRC_URI="https://github.com/mmottl/pomap/releases/download/v${PV}/${P}.tar.gz"
+LICENSE="LGPL-2.1-with-linking-exception"
+
+DEPEND="dev-ml/camlp4:="
+RDEPEND="${DEPEND}"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ppc x86"
+IUSE="examples"
+
+DOCS=( "AUTHORS.txt" "CHANGES.txt" "README.md" )
+
+src_install() {
+ oasis_src_install
+ if use examples ; then
+ insinto /usr/share/doc/${PF}
+ doins -r examples
+ docompress -x /usr/share/doc/${PF}/examples
+ fi
+}
diff --git a/dev-ml/pomap/pomap-3.0.7.ebuild b/dev-ml/pomap/pomap-3.0.7.ebuild
new file mode 100644
index 000000000000..843be10b3fb5
--- /dev/null
+++ b/dev-ml/pomap/pomap-3.0.7.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+OASIS_BUILD_DOCS=1
+
+inherit oasis
+
+DESCRIPTION="Partially Ordered Map ADT for O'Caml"
+HOMEPAGE="http://mmottl.github.io/pomap/"
+SRC_URI="https://github.com/mmottl/pomap/releases/download/v${PV}/${P}.tar.gz"
+LICENSE="LGPL-2.1-with-linking-exception"
+
+DEPEND="dev-ml/camlp4:="
+RDEPEND="${DEPEND}"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="examples"
+
+DOCS=( "AUTHORS.txt" "CHANGES.txt" "README.md" )
+
+src_install() {
+ oasis_src_install
+ if use examples ; then
+ insinto /usr/share/doc/${PF}
+ doins -r examples
+ docompress -x /usr/share/doc/${PF}/examples
+ fi
+}
diff --git a/dev-ml/pomap/pomap-4.0.0.ebuild b/dev-ml/pomap/pomap-4.0.0.ebuild
new file mode 100644
index 000000000000..47b9be24bf99
--- /dev/null
+++ b/dev-ml/pomap/pomap-4.0.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit opam
+
+DESCRIPTION="Partially Ordered Map ADT for O'Caml"
+HOMEPAGE="http://mmottl.github.io/pomap/"
+SRC_URI="https://github.com/mmottl/pomap/releases/download/${PV}/${P}.tbz"
+LICENSE="LGPL-2.1-with-linking-exception"
+
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+RDEPEND=""
+DEPEND="${RDEPEND} dev-ml/jbuilder"
+
+src_compile() {
+ jbuilder build @install || die
+}
diff --git a/dev-ml/postgresql-ocaml-4.0.1 b/dev-ml/postgresql-ocaml-4.0.1
deleted file mode 100644
index 8bfa7c78ba57..000000000000
--- a/dev-ml/postgresql-ocaml-4.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-db/postgresql:=[server] >=dev-ml/findlib-1.5 >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=A package for ocaml that provides access to PostgreSQL databases
-EAPI=5
-HOMEPAGE=http://mmottl.github.io/postgresql-ocaml/
-IUSE=examples +ocamlopt debug doc
-KEYWORDS=~amd64 ~ppc x86
-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 983774947da124fb7d542ce25a218bb1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e oasis 9256ed89af74c3365ec888c00bfdfe43 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=38162014ebbee75bf2301126b93cc9d6
diff --git a/dev-ml/postgresql-ocaml-4.1.0 b/dev-ml/postgresql-ocaml-4.1.0
deleted file mode 100644
index 3a55e8928689..000000000000
--- a/dev-ml/postgresql-ocaml-4.1.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=dev-db/postgresql:=[server] dev-ml/jbuilder >=dev-ml/findlib-1.5 >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=A package for ocaml that provides access to PostgreSQL databases
-EAPI=5
-HOMEPAGE=http://mmottl.github.io/postgresql-ocaml/
-KEYWORDS=~amd64 ~ppc ~x86
-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 24b4a2529c1fd12f1304856d6c5a690d
-_md5_=bd7a74b3869e52518fe7887b756f99e7
diff --git a/dev-ml/postgresql-ocaml-4.2.0 b/dev-ml/postgresql-ocaml-4.2.0
deleted file mode 100644
index b5bd4f415b0a..000000000000
--- a/dev-ml/postgresql-ocaml-4.2.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=dev-db/postgresql:=[server] dev-ml/jbuilder >=dev-ml/findlib-1.5 >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=A package for ocaml that provides access to PostgreSQL databases
-EAPI=5
-HOMEPAGE=http://mmottl.github.io/postgresql-ocaml/
-KEYWORDS=~amd64 ~ppc ~x86
-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 24b4a2529c1fd12f1304856d6c5a690d
-_md5_=bd7a74b3869e52518fe7887b756f99e7
diff --git a/dev-ml/postgresql-ocaml/Manifest b/dev-ml/postgresql-ocaml/Manifest
new file mode 100644
index 000000000000..c1cac436b316
--- /dev/null
+++ b/dev-ml/postgresql-ocaml/Manifest
@@ -0,0 +1,7 @@
+DIST postgresql-4.1.0.tbz 36689 BLAKE2B d27db79afce335394ec1225a8c64f278374caae6344da2901396b6086e409dc37d225c57e7da3de5b4342121b6f6b2268b06c16e4b4a07d13f2e75ca0dab0f08 SHA512 5749e426634f00fc8aab86e4c23f863ebdebc9bb77c121dea1c516c8bd5524096051975514daa47abe1556355bc4a1994d6634aae09736a508a9b6552b134d42
+DIST postgresql-4.2.0.tbz 37463 BLAKE2B f6f8f894458945f15eb7991813351f6cb9aaf78b88d241dd5736398d46deff825bf5084ada04fdcfc04deba6e0599df7df27640d27c45382ef2ad49b93cc88b1 SHA512 21a9d89c2fdaf5862b350aecffe1a675ecbeef42e138e09c03d14551b25622910014582c98877882746f9fc56ef5f1248c5b00a6a61d7bcd6d757c451a7844d8
+DIST postgresql-ocaml-4.0.1.tar.gz 85871 BLAKE2B 8c2e0ce4b8bcc17f0afff1fbcd867245213ddc8702b75359e7ee926d9db749fed732cf15a905c228ca114c09ea61755fff54a0c5895edd8104dbb20590be3a8d SHA512 baecd1b3b98f790131972dbd2eba563b43dec6e13e37ab904ee38b2b1168b03533272532887a42a2536806951c9e543306c6eccfb441de517ee860383ea5df36
+EBUILD postgresql-ocaml-4.0.1.ebuild 700 BLAKE2B 7c13cff7991fb464b268fb99131a4687ceb99749b85bd31d91b01969536022bfa7e2f59a5c6b7a152f6d8ae48123c58318d117e785df03fd7c6bf2ab58f5d42f SHA512 5d3ca6f70320ac7ed6c2f9d70a9ae37de36f088edf006aa08f0a87fd8037983dc5f9e756934064d93cbee35451e42a72e067c0eda8ac9e3b8e466bbd7c240063
+EBUILD postgresql-ocaml-4.1.0.ebuild 671 BLAKE2B ee5f0b448291319702055d313c13286feb4858f7f80922ccbfa86c767bf8c79d06974541986c969846ad5e9db239fb2fae37d37914460caad8fcf5e9049b9709 SHA512 0a490a788f33267577d0fce20cbfa52bc705be89b9e4bcbb1ac775ca32ff46d3b6f89d907436be97ddcfa24b105c2895d78c0a3201cff134aa822c590ae3ceb1
+EBUILD postgresql-ocaml-4.2.0.ebuild 671 BLAKE2B ee5f0b448291319702055d313c13286feb4858f7f80922ccbfa86c767bf8c79d06974541986c969846ad5e9db239fb2fae37d37914460caad8fcf5e9049b9709 SHA512 0a490a788f33267577d0fce20cbfa52bc705be89b9e4bcbb1ac775ca32ff46d3b6f89d907436be97ddcfa24b105c2895d78c0a3201cff134aa822c590ae3ceb1
+MISC metadata.xml 413 BLAKE2B 61f28f794875aa2627569e433ecf7b4a7c83dd05b989b54a5fe7fc6297f282f1edce2efe7ec8784e4822ac497619cdc843c858de9a41fdab224e3eeae826460a SHA512 8d6cc5c373d7b5bdc89f7c426d23ecca928b88400e5e7b1622861d5ad18b4ffc30ac11238c935615737a08be4fbdb337939b23635c76b56c8a999c8d6ce930a8
diff --git a/dev-ml/postgresql-ocaml/metadata.xml b/dev-ml/postgresql-ocaml/metadata.xml
new file mode 100644
index 000000000000..d5f8d2a4f814
--- /dev/null
+++ b/dev-ml/postgresql-ocaml/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">mmottl/postgresql-ocaml</remote-id>
+ <remote-id type="bitbucket">mmottl/postgresql-ocaml</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/postgresql-ocaml/postgresql-ocaml-4.0.1.ebuild b/dev-ml/postgresql-ocaml/postgresql-ocaml-4.0.1.ebuild
new file mode 100644
index 000000000000..abe5b03fa5cc
--- /dev/null
+++ b/dev-ml/postgresql-ocaml/postgresql-ocaml-4.0.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+OASIS_BUILD_DOCS=1
+
+inherit oasis
+
+DESCRIPTION="A package for ocaml that provides access to PostgreSQL databases"
+SRC_URI="https://github.com/mmottl/postgresql-ocaml/releases/download/v${PV}/${P}.tar.gz"
+HOMEPAGE="http://mmottl.github.io/postgresql-ocaml/"
+IUSE="examples"
+
+RDEPEND="
+ dev-db/postgresql:=[server]
+"
+DEPEND="${RDEPEND}
+ >=dev-ml/findlib-1.5"
+
+SLOT="0/${PV}"
+LICENSE="LGPL-2"
+KEYWORDS="~amd64 ~ppc x86"
+
+DOCS=( "AUTHORS.txt" "CHANGES.txt" "README.md" )
+
+src_install() {
+ oasis_src_install
+ if use examples ; then
+ insinto /usr/share/doc/${PF}
+ doins -r examples
+ fi
+}
diff --git a/dev-ml/postgresql-ocaml/postgresql-ocaml-4.1.0.ebuild b/dev-ml/postgresql-ocaml/postgresql-ocaml-4.1.0.ebuild
new file mode 100644
index 000000000000..0a85bb949138
--- /dev/null
+++ b/dev-ml/postgresql-ocaml/postgresql-ocaml-4.1.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit opam
+
+MY_P="postgresql-${PV}"
+
+DESCRIPTION="A package for ocaml that provides access to PostgreSQL databases"
+SRC_URI="https://github.com/mmottl/postgresql-ocaml/releases/download/${PV}/${MY_P}.tbz"
+HOMEPAGE="http://mmottl.github.io/postgresql-ocaml/"
+IUSE=""
+
+RDEPEND="
+ dev-db/postgresql:=[server]
+"
+DEPEND="${RDEPEND}
+ dev-ml/jbuilder
+ >=dev-ml/findlib-1.5"
+
+SLOT="0/${PV}"
+LICENSE="LGPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+S="${WORKDIR}/${MY_P}"
+
+src_compile() {
+ jbuilder build @install || die
+}
+
+src_install() {
+ opam_src_install "postgresql"
+}
diff --git a/dev-ml/postgresql-ocaml/postgresql-ocaml-4.2.0.ebuild b/dev-ml/postgresql-ocaml/postgresql-ocaml-4.2.0.ebuild
new file mode 100644
index 000000000000..0a85bb949138
--- /dev/null
+++ b/dev-ml/postgresql-ocaml/postgresql-ocaml-4.2.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit opam
+
+MY_P="postgresql-${PV}"
+
+DESCRIPTION="A package for ocaml that provides access to PostgreSQL databases"
+SRC_URI="https://github.com/mmottl/postgresql-ocaml/releases/download/${PV}/${MY_P}.tbz"
+HOMEPAGE="http://mmottl.github.io/postgresql-ocaml/"
+IUSE=""
+
+RDEPEND="
+ dev-db/postgresql:=[server]
+"
+DEPEND="${RDEPEND}
+ dev-ml/jbuilder
+ >=dev-ml/findlib-1.5"
+
+SLOT="0/${PV}"
+LICENSE="LGPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+S="${WORKDIR}/${MY_P}"
+
+src_compile() {
+ jbuilder build @install || die
+}
+
+src_install() {
+ opam_src_install "postgresql"
+}
diff --git a/dev-ml/ppx_assert-0.9.0 b/dev-ml/ppx_assert-0.9.0
deleted file mode 100644
index b326291f187e..000000000000
--- a/dev-ml/ppx_assert-0.9.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-ml/base:= dev-ml/ppx_compare:= dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_here:= dev-ml/ppx_metaquot:= dev-ml/ppx_sexp_conv:= dev-ml/ppx_type_conv dev-ml/sexplib:= dev-ml/ocaml-migrate-parsetree:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=Assert-like extension nodes that raise useful errors on failure
-EAPI=6
-HOMEPAGE=https://github.com/janestreet/ppx_assert
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-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 24b4a2529c1fd12f1304856d6c5a690d
-_md5_=0b7b46991c8396fb9131499d74e1d319
diff --git a/dev-ml/ppx_assert/Manifest b/dev-ml/ppx_assert/Manifest
new file mode 100644
index 000000000000..1d9837540b23
--- /dev/null
+++ b/dev-ml/ppx_assert/Manifest
@@ -0,0 +1,3 @@
+DIST ppx_assert-0.9.0.tar.gz 9419 BLAKE2B 7e6ea363182ce3f057e54ae54e2d7b3236d909a748c74ee79209d97de001bf1df1934bccc95bf93e674aedd5c5f5029748747242acb1246f1f08a02f8b9b6309 SHA512 4debf617f1b0244d306b65d72cbf04f4a820a8d9433180d462ff462d2bf6eb01643897cc35de75d435fedfa1bf8266263c0e73328f02b5c957a3423eb535925f
+EBUILD ppx_assert-0.9.0.ebuild 692 BLAKE2B 950e2c913ab4a6e45ebfbbfe813260f2839acf3cda2b307dd941d76105910ee811d092ec3396cbc881e43471134b53e2faf9b41811b32b6c59f00178340a5989 SHA512 b8c325aa51bdee1bfc9293d723136f7c674445557631aabe328a23bc84bbb3cf235af3ac684fcfd4abf771e258d4073cf220f03e94b1ae09fdfd1a8bed21fb0e
+MISC metadata.xml 333 BLAKE2B 7d97b51c61e870fb2c6db34342d7d322465c20bbdfd62a759a092af488f00057fb5eb14e5cfcc2bf796a45a1c7438218138918166173c44f244270fe3f5ce6a6 SHA512 e128fc15204bbf87223311934eb0f150ea2d57d1f4caa598aa844dfd161d45989cb2cbfec3ee9fbff9babf17844b039b00feda4519edcc994be2baa743a25237
diff --git a/dev-ml/ppx_assert/metadata.xml b/dev-ml/ppx_assert/metadata.xml
new file mode 100644
index 000000000000..0cab87a0ca44
--- /dev/null
+++ b/dev-ml/ppx_assert/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">janestreet/ppx_assert</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/ppx_assert/ppx_assert-0.9.0.ebuild b/dev-ml/ppx_assert/ppx_assert-0.9.0.ebuild
new file mode 100644
index 000000000000..342b0cf8e989
--- /dev/null
+++ b/dev-ml/ppx_assert/ppx_assert-0.9.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit opam
+
+DESCRIPTION="Assert-like extension nodes that raise useful errors on failure"
+HOMEPAGE="https://github.com/janestreet/ppx_assert"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+ dev-ml/base:=
+ dev-ml/ppx_compare:=
+ dev-ml/ppx_core:=
+ dev-ml/ppx_driver:=
+ dev-ml/ppx_here:=
+ dev-ml/ppx_metaquot:=
+ dev-ml/ppx_sexp_conv:=
+ dev-ml/ppx_type_conv
+ dev-ml/sexplib:=
+ dev-ml/ocaml-migrate-parsetree:=
+"
+
+RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND} dev-ml/jbuilder"
diff --git a/dev-ml/ppx_ast-0.9.1 b/dev-ml/ppx_ast-0.9.1
deleted file mode 100644
index c3bebe5ce2b7..000000000000
--- a/dev-ml/ppx_ast-0.9.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-ml/ocaml-compiler-libs:= dev-ml/ocaml-migrate-parsetree:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=AST used in Jane Street ppx rewriters
-EAPI=6
-HOMEPAGE=https://github.com/janestreet/ppx_ast
-KEYWORDS=~amd64 ~ppc ~x86
-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 24b4a2529c1fd12f1304856d6c5a690d
-_md5_=2f8970af9000908999d6184d066c41bb
diff --git a/dev-ml/ppx_ast/Manifest b/dev-ml/ppx_ast/Manifest
new file mode 100644
index 000000000000..f73988e54749
--- /dev/null
+++ b/dev-ml/ppx_ast/Manifest
@@ -0,0 +1,3 @@
+DIST ppx_ast-0.9.1.tar.gz 86802 BLAKE2B 5974cbea0b2566e83d8fb4192aa7e7f802aa7b6fa02b8f638ea12ac5c617fdca1f4426e0ee3fc761c46fe0ddf2e26d4ed402eb8c21fd84ce513a60996047ca28 SHA512 4a5a9fb47282877763ecf9638e67bcd1b57110c1acfcf446703ed335b9fa5aaa1521c55a75fce6025f91e715f9c4522b695444dde4d3ffa7feed79560e399ad7
+EBUILD ppx_ast-0.9.1.ebuild 522 BLAKE2B 6740a54881d877ff4854786735a5bbce28641dfb7908e90b9859ab85ee9598f76b5b3b3bfd4920ab18c604e3419ffcbf939675028459ade87f97d078d8f3c2bb SHA512 e3fa3c5a3bdeeb30a16453d53c0c23faaa470680462e2b14c7613600352846c613b998f7486a2b8bd23cce243083dd362aeeee082fd5571c84eeeb1129595789
+MISC metadata.xml 330 BLAKE2B 45bd8a24597b6cb2c9e2c3afc981fb807ee8c74dfb21b95d176e782e1634b69eee9865dd326ae9f1b42c0423a95331dc479635e2e81dbe8f7f2d1089449b01bb SHA512 178a89117b6a953b7d730c223c63d241c7d7b83ef28f7ec53cd6bd77bbb22eea8417e1d5b0ece7cbcb716b7ca329dd160e9078368138579068eaf1702a018738
diff --git a/dev-ml/ppx_ast/metadata.xml b/dev-ml/ppx_ast/metadata.xml
new file mode 100644
index 000000000000..b51bd5cf917a
--- /dev/null
+++ b/dev-ml/ppx_ast/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">janestreet/ppx_ast</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/ppx_ast/ppx_ast-0.9.1.ebuild b/dev-ml/ppx_ast/ppx_ast-0.9.1.ebuild
new file mode 100644
index 000000000000..acc14d99d440
--- /dev/null
+++ b/dev-ml/ppx_ast/ppx_ast-0.9.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit opam
+
+DESCRIPTION="AST used in Jane Street ppx rewriters"
+HOMEPAGE="https://github.com/janestreet/ppx_ast"
+SRC_URI="https://github.com/janestreet/ppx_ast/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="
+ dev-ml/ocaml-compiler-libs:=
+ dev-ml/ocaml-migrate-parsetree:=
+"
+RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+ dev-ml/jbuilder"
diff --git a/dev-ml/ppx_base-0.9.0 b/dev-ml/ppx_base-0.9.0
deleted file mode 100644
index dab2b9fa16b9..000000000000
--- a/dev-ml/ppx_base-0.9.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-ml/ppx_compare:= dev-ml/ppx_driver:= dev-ml/ppx_enumerate:= dev-ml/ppx_hash:= dev-ml/ppx_js_style:= dev-ml/ppx_sexp_conv:= dev-ml/ppx_type_conv:= dev-ml/ocaml-migrate-parsetree:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=Base set of ppx rewriters
-EAPI=6
-HOMEPAGE=https://github.com/janestreet/ppx_base
-KEYWORDS=~amd64 ~ppc ~x86
-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 24b4a2529c1fd12f1304856d6c5a690d
-_md5_=d2eda158fb743ca8beea2f0c327bd1ef
diff --git a/dev-ml/ppx_base/Manifest b/dev-ml/ppx_base/Manifest
new file mode 100644
index 000000000000..bb727e7cec12
--- /dev/null
+++ b/dev-ml/ppx_base/Manifest
@@ -0,0 +1,3 @@
+DIST ppx_base-0.9.0.tar.gz 5255 BLAKE2B ba5d1670ba0da8c13c30dab65885cb9d406d7259ca57841867f4b2c7720f8202fb34074b5bc8f03cb0858427c79e61d4a33098c846c61ebcc98d40799ced9274 SHA512 660f6b210eb6d7bd33c279ffa8bbf01c21b9db5d7827cf6fded8c52e8d4f2f5468a76c2eab86c2b868ac859bbc81db7189c71ccc1701bf57030f82d8eda4339e
+EBUILD ppx_base-0.9.0.ebuild 635 BLAKE2B 7c0da2099b0fb19f7eed2f360b81a86a037792692993df5bdbc9a4cae1d3c6904d5e7f63d737315bbd30e24934a271890a1b4e8f3f61ae07dfa344affe8fcfb7 SHA512 a7643e1e9196b7a1022b88be184897eed4958c5b418d214ab8f4d72b24f12577426e750e9ad411265c09d263d2ca3a8bd23989cad92812abc57bc5165dc25261
+MISC metadata.xml 331 BLAKE2B 029e624c079e865462849ea5700728cd16396d0552f43065bdd1fd3b77c2dba8fabe3c74669538872df54a78935b408ab8ba356bcf6d53a45a7d78c7294fc125 SHA512 82e7894984449057906d667340e5aca625be82c641e2924072e48a2f7335a4c400317e9cbad5d2397f984a0a942819cb9bea42a5101c76c32e5ba8b9fbc93d49
diff --git a/dev-ml/ppx_base/metadata.xml b/dev-ml/ppx_base/metadata.xml
new file mode 100644
index 000000000000..4b0a19890595
--- /dev/null
+++ b/dev-ml/ppx_base/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">janestreet/ppx_base</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/ppx_base/ppx_base-0.9.0.ebuild b/dev-ml/ppx_base/ppx_base-0.9.0.ebuild
new file mode 100644
index 000000000000..fba5ad20e4ae
--- /dev/null
+++ b/dev-ml/ppx_base/ppx_base-0.9.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit opam
+
+DESCRIPTION="Base set of ppx rewriters"
+HOMEPAGE="https://github.com/janestreet/ppx_base"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="
+ dev-ml/ppx_compare:=
+ dev-ml/ppx_driver:=
+ dev-ml/ppx_enumerate:=
+ dev-ml/ppx_hash:=
+ dev-ml/ppx_js_style:=
+ dev-ml/ppx_sexp_conv:=
+ dev-ml/ppx_type_conv:=
+ dev-ml/ocaml-migrate-parsetree:=
+ "
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND} dev-ml/jbuilder"
diff --git a/dev-ml/ppx_bench-0.9.1 b/dev-ml/ppx_bench-0.9.1
deleted file mode 100644
index b8106693e8f7..000000000000
--- a/dev-ml/ppx_bench-0.9.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_inline_test:= dev-ml/ppx_metaquot:= dev-ml/ocaml-migrate-parsetree:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=Syntax extension for writing in-line benchmarks in ocaml code
-EAPI=6
-HOMEPAGE=https://github.com/janestreet/ppx_bench
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-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 24b4a2529c1fd12f1304856d6c5a690d
-_md5_=d32aca086ea3a8eb8da9ba91a7502155
diff --git a/dev-ml/ppx_bench/Manifest b/dev-ml/ppx_bench/Manifest
new file mode 100644
index 000000000000..4890cc5640ea
--- /dev/null
+++ b/dev-ml/ppx_bench/Manifest
@@ -0,0 +1,3 @@
+DIST ppx_bench-0.9.1.tar.gz 11097 BLAKE2B cdf7cd97a1ce702c75aa87a717b5d7905931571c0b000cef5a4af29e18f15c22adbf4882ef5453ddd97def6b5ea7885835dc69237e70e13138670a5ced4c966b SHA512 1963525719178e34f50ee8dbe3cabe8582ffc08835e542d1ae593d6a250d4f841be53c96fbc203d620e11f9ad2a9f591e545656c3b254bd60db614ec1e06947d
+EBUILD ppx_bench-0.9.1.ebuild 594 BLAKE2B 5c312a3ad712b957218e4c2f1ec96fb1150a712097e97d3e4411e939784e7804af1078b6b4e2dc45c8c0d94d6483824cc34980251ed388e35368c86d03ee355f SHA512 81001420a848631304e656ec7b737e08e55ecd07442bb1bbce9da9fab58d288dc699fb4bded6d8ea31738259dedb7cf2e1376a62d8e078b6bd09adb736f24adc
+MISC metadata.xml 332 BLAKE2B c14f755d3492c5b30d4fd70313089cb9a31f33c3e0c87d32b48ba3e8702b37c99bb73cb93c474b0126602c0101efed3c623dd7a8dec84299a0e33672e254f342 SHA512 ade7b0f89007cd97504c83507f3f22ff6038b4276450a5babc44be535590adf7f96f732edf1d8edc0a7de8c74753402755117d7686002909af49331629e2da52
diff --git a/dev-ml/ppx_bench/metadata.xml b/dev-ml/ppx_bench/metadata.xml
new file mode 100644
index 000000000000..f0ad86c70e81
--- /dev/null
+++ b/dev-ml/ppx_bench/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">janestreet/ppx_bench</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/ppx_bench/ppx_bench-0.9.1.ebuild b/dev-ml/ppx_bench/ppx_bench-0.9.1.ebuild
new file mode 100644
index 000000000000..c17ddf31b27a
--- /dev/null
+++ b/dev-ml/ppx_bench/ppx_bench-0.9.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit opam
+
+DESCRIPTION="Syntax extension for writing in-line benchmarks in ocaml code"
+HOMEPAGE="https://github.com/janestreet/ppx_bench"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+ dev-ml/ppx_core:=
+ dev-ml/ppx_driver:=
+ dev-ml/ppx_inline_test:=
+ dev-ml/ppx_metaquot:=
+ dev-ml/ocaml-migrate-parsetree:=
+"
+
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND} dev-ml/jbuilder"
diff --git a/dev-ml/ppx_bin_prot-0.9.0 b/dev-ml/ppx_bin_prot-0.9.0
deleted file mode 100644
index 406edd8fa36c..000000000000
--- a/dev-ml/ppx_bin_prot-0.9.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-ml/bin-prot:= dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_here:= dev-ml/ppx_metaquot:= dev-ml/ppx_type_conv:= dev-ml/ocaml-migrate-parsetree:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=Generation of bin_prot readers and writers from types
-EAPI=6
-HOMEPAGE=https://github.com/janestreet/ppx_bin_prot
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-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 24b4a2529c1fd12f1304856d6c5a690d
-_md5_=ab5c3768ecdd8c3acd769013aa10380e
diff --git a/dev-ml/ppx_bin_prot/Manifest b/dev-ml/ppx_bin_prot/Manifest
new file mode 100644
index 000000000000..d3e96d3e57bd
--- /dev/null
+++ b/dev-ml/ppx_bin_prot/Manifest
@@ -0,0 +1,3 @@
+DIST ppx_bin_prot-0.9.0.tar.gz 35234 BLAKE2B 883e7d8b3919d640408fd1efa22df6656d1146d2771313ee29bda287f8ec412b4acdabebb8ea3548918370a6048543b93e17b22141ac672a4b8c628d0c678844 SHA512 f900741f4caeec86ec9d73a086ffeec21789bdd99ca7b09a808a3e281038d587c9c326cc1217957fcd828c4e1da5902f6dee3bf4ba7a22feca5424573215a00c
+EBUILD ppx_bin_prot-0.9.0.ebuild 626 BLAKE2B c99c9a9912fa82ac2c3ff2e2567edf83ee1f0f59350203805b477b09a3a095d50790f43d1bfa5aa56d169f973ad0916c2ce275db8a30b70641ccd0e5c2e65744 SHA512 669745108b8016690c058a4c64b5ed103b0e4f8a4256871fce5ba2d0d2a631be02e6c8a4bb2ad476e7538461b21188ebdaf467b11ee59df39f333e4d6c82fe6d
+MISC metadata.xml 335 BLAKE2B 8de26e514b9bc0676fb8f74c86a50f77d10c978543c811ba20ea797924be4d3a6372b8fde24752f71f3ae84515ce0cd17d461c67cc336bca6b8bb1fa7de25f00 SHA512 d926a5fd2a6a32a90fccbfe0be5b0374d2e9b4c9207bbcecbf90a2b731ff56503521c76e277c942dc0b80fcdf51b442c12dc5ced4d9ae03ada8a1bd42444e4ed
diff --git a/dev-ml/ppx_bin_prot/metadata.xml b/dev-ml/ppx_bin_prot/metadata.xml
new file mode 100644
index 000000000000..562cf866321f
--- /dev/null
+++ b/dev-ml/ppx_bin_prot/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">janestreet/ppx_bin_prot</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/ppx_bin_prot/ppx_bin_prot-0.9.0.ebuild b/dev-ml/ppx_bin_prot/ppx_bin_prot-0.9.0.ebuild
new file mode 100644
index 000000000000..00230450343a
--- /dev/null
+++ b/dev-ml/ppx_bin_prot/ppx_bin_prot-0.9.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit opam
+
+DESCRIPTION="Generation of bin_prot readers and writers from types"
+HOMEPAGE="https://github.com/janestreet/ppx_bin_prot"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+ dev-ml/bin-prot:=
+ dev-ml/ppx_core:=
+ dev-ml/ppx_driver:=
+ dev-ml/ppx_here:=
+ dev-ml/ppx_metaquot:=
+ dev-ml/ppx_type_conv:=
+ dev-ml/ocaml-migrate-parsetree:=
+ "
+
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND} dev-ml/jbuilder"
diff --git a/dev-ml/ppx_compare-0.9.0-r1 b/dev-ml/ppx_compare-0.9.0-r1
deleted file mode 100644
index 6fc0c66ceaca..000000000000
--- a/dev-ml/ppx_compare-0.9.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-ml/ppx_driver:= dev-ml/ppx_type_conv:= dev-ml/ppx_core:= dev-ml/base:= dev-ml/ocaml-migrate-parsetree:= dev-ml/ppx_metaquot:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=Generation of comparison functions from types
-EAPI=6
-HOMEPAGE=https://github.com/janestreet/ppx_compare
-KEYWORDS=~amd64 ~ppc ~x86
-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 24b4a2529c1fd12f1304856d6c5a690d
-_md5_=2dca3048f5f3c64b14e7150d0c45c0ea
diff --git a/dev-ml/ppx_compare/Manifest b/dev-ml/ppx_compare/Manifest
new file mode 100644
index 000000000000..1d434f906b87
--- /dev/null
+++ b/dev-ml/ppx_compare/Manifest
@@ -0,0 +1,3 @@
+DIST ppx_compare-0.9.0.tar.gz 11760 BLAKE2B 8db18a56185371e56addddeac4ec94e1260f06edc7dbc835efcf2f6788f42c36746858fd96e7fc94aaaf52b118a95581388276b90d8d489a9f4707af2c157811 SHA512 4f154bb67c2241712986247f8b3ed04b4ba874424171989f0421193a15cea45dedbf1c546408421bf33839ea45b85a45ec1cb43c034373fd80198ddb5d9045fe
+EBUILD ppx_compare-0.9.0-r1.ebuild 603 BLAKE2B 2a649d2d33fc23a391ef4ed979e5785dc1e1e6bade572d2946d170c3ede8441e2061f543c6f01e9d068c1c83ba76d46a9827e18d03045f7ca6fe1678b94cdc75 SHA512 4c042cf01de3d80cdb34ab804d0337d1f85b00fb64e4b7b0d9d45cfa4c181758b300c1c8a85a56b8d0393f530adff8c403a0398508957bd49a3b782d6f37fa5a
+MISC metadata.xml 334 BLAKE2B 32f4e66b9c595698fb862c6fb5ca680ebf14010feee47972823365f5984dda4c0474fec5e430c97fed26bf2fd167b0981f06f1476f47ade78e190ceae76c0e16 SHA512 655c5cf4ec2e1d8e14c3c7e72e964e6bb1ddd1a620675ec140cd63b2c4b70cda83234aeae10d4b8c6cd41386688f3bbe3bde4c83585437d74be4f0f629be3ea1
diff --git a/dev-ml/ppx_compare/metadata.xml b/dev-ml/ppx_compare/metadata.xml
new file mode 100644
index 000000000000..e063430cae74
--- /dev/null
+++ b/dev-ml/ppx_compare/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">janestreet/ppx_compare</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/ppx_compare/ppx_compare-0.9.0-r1.ebuild b/dev-ml/ppx_compare/ppx_compare-0.9.0-r1.ebuild
new file mode 100644
index 000000000000..078afb1a0109
--- /dev/null
+++ b/dev-ml/ppx_compare/ppx_compare-0.9.0-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit opam
+
+DESCRIPTION="Generation of comparison functions from types"
+HOMEPAGE="https://github.com/janestreet/ppx_compare"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="
+ dev-ml/ppx_driver:=
+ dev-ml/ppx_type_conv:=
+ dev-ml/ppx_core:=
+ dev-ml/base:=
+ dev-ml/ocaml-migrate-parsetree:=
+ dev-ml/ppx_metaquot:=
+"
+
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND} dev-ml/jbuilder"
diff --git a/dev-ml/ppx_core-0.9.0-r1 b/dev-ml/ppx_core-0.9.0-r1
deleted file mode 100644
index 86157aa00120..000000000000
--- a/dev-ml/ppx_core-0.9.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-ml/base:= dev-ml/ocaml-compiler-libs:= dev-ml/ppx_ast:= dev-ml/ppx_traverse_builtins:= dev-ml/stdio:= dev-ml/ocaml-migrate-parsetree:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=Standard library for ppx rewriters
-EAPI=6
-HOMEPAGE=https://github.com/janestreet/ppx_core
-KEYWORDS=~amd64 ~ppc ~x86
-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 24b4a2529c1fd12f1304856d6c5a690d
-_md5_=39357472dfc94cf45b643e5eb2246f52
diff --git a/dev-ml/ppx_core/Manifest b/dev-ml/ppx_core/Manifest
new file mode 100644
index 000000000000..7cab7faf9717
--- /dev/null
+++ b/dev-ml/ppx_core/Manifest
@@ -0,0 +1,3 @@
+DIST ppx_core-0.9.0.tar.gz 44525 BLAKE2B a2d67d6ba07217446af11f0e7030197f8894fd271b9eebefefa03a01ccb8692b1d866accf192926ea9193d639e1c551b085875baf877eb396d5a75c847378ec6 SHA512 04b0e096aa545c27f040feeea8745078e0fb9dbe4816ade6d3f39b6690da669c6c786334381dbccd74dfd46514ae88c6475b14db8c3216167a6acfea79601e06
+EBUILD ppx_core-0.9.0-r1.ebuild 600 BLAKE2B b6e77ccba23ad1f64c69813d9f23b05e9d3d64768e17d5eed725c62cad9a71b9a2a64706fd7c8ef0711cb3fd9809868af6d3df3a18d8dda5429a60d7efc0498a SHA512 9b17fa080088dc0249c1bc57018879fdbe185ea5179c574de57a0804a3e5e94a6cad9dde55da8e59110d89788c10de15e3b9bc768499e867e7213fd2b6b85d1a
+MISC metadata.xml 331 BLAKE2B e4aa2a3e3782eea408bc2b4b5a32f19e48e100b22dd79a955e59d38fe1a399940400a7eda2ea327f2c93830f645f090ddc81b50a54fc922262d92c88320dce88 SHA512 a8a8a4542c5ab077b314a3dbc586e013529424e5a39b03eee87aadb713ef9df2be408907a8d1482c08b96f9deb646e027b1815359ff4a4b3aa33ca6b9d68310f
diff --git a/dev-ml/ppx_core/metadata.xml b/dev-ml/ppx_core/metadata.xml
new file mode 100644
index 000000000000..2c9ccd93283c
--- /dev/null
+++ b/dev-ml/ppx_core/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">janestreet/ppx_core</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/ppx_core/ppx_core-0.9.0-r1.ebuild b/dev-ml/ppx_core/ppx_core-0.9.0-r1.ebuild
new file mode 100644
index 000000000000..b7479abd2f4f
--- /dev/null
+++ b/dev-ml/ppx_core/ppx_core-0.9.0-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit opam
+
+DESCRIPTION="Standard library for ppx rewriters"
+HOMEPAGE="https://github.com/janestreet/ppx_core"
+SRC_URI="https://github.com/janestreet/ppx_core/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="
+ dev-ml/base:=
+ dev-ml/ocaml-compiler-libs:=
+ dev-ml/ppx_ast:=
+ dev-ml/ppx_traverse_builtins:=
+ dev-ml/stdio:=
+ dev-ml/ocaml-migrate-parsetree:=
+"
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND} dev-ml/jbuilder"
diff --git a/dev-ml/ppx_custom_printf-0.9.0-r1 b/dev-ml/ppx_custom_printf-0.9.0-r1
deleted file mode 100644
index 623e8d29cb8b..000000000000
--- a/dev-ml/ppx_custom_printf-0.9.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_metaquot:= dev-ml/ppx_sexp_conv:= dev-ml/ppx_type_conv:= dev-ml/ppx_traverse dev-ml/ocaml-migrate-parsetree:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=Printf-style format-strings for user-defined string conversion
-EAPI=6
-HOMEPAGE=https://github.com/janestreet/ppx_custom_printf
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_metaquot:= dev-ml/ppx_sexp_conv:= dev-ml/ppx_type_conv:= dev-ml/ppx_traverse dev-ml/ocaml-migrate-parsetree:= >=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 24b4a2529c1fd12f1304856d6c5a690d
-_md5_=1e7b4d1bba9283bd7d0922c3ff71f77f
diff --git a/dev-ml/ppx_custom_printf/Manifest b/dev-ml/ppx_custom_printf/Manifest
new file mode 100644
index 000000000000..c8b3e7c3b5f1
--- /dev/null
+++ b/dev-ml/ppx_custom_printf/Manifest
@@ -0,0 +1,3 @@
+DIST ppx_custom_printf-0.9.0.tar.gz 11527 BLAKE2B ad1791f1bad3c8583e67ca6300e98e8a7a047f723bbaa7c80cf6224f7333e7893fce7289456c39f6959089f15cc0da20106b33689ab198b1f47f6dc0bd853c77 SHA512 7608e09aac26f4f51d124d30c25a510abb73bea606007524a5563f5bb2c0e71f1ff033edb32c48f0c69656e8c3924b57186639812b1a647ce31f7ae15dc466cb
+EBUILD ppx_custom_printf-0.9.0-r1.ebuild 645 BLAKE2B 24bdab2519315f8153e2e1a9034291bef09df3d03bb4ea9b463ea80d5b7dca4db4423875cf0c91315b19ef6a31c849ae2a320d65185b6baab7840ecda6940153 SHA512 258cdc49534126c7c5c26d03c927be5132d55b1b99fb76a3c62925df6c45a542e15dbcdaf6597349005a2b7d5a58ee157384f078aedf8367572db46d9af9bd11
+MISC metadata.xml 340 BLAKE2B 19c96d64110c7ebe09b1e4f31a105bab6e5b106c6cbc7143619b775ae15833a6f485f8e83894138c9246f80f748601635f30025b20ceca96e670226c0f5f4692 SHA512 7e8f6ba90d2e6c5ed5871cfc52ab362ac42fbffbb83c43318f63d988b959799e0a08f8ec07d5c4f58eb875d980c38bc9d5f9c806ee0cf4f7ac4823a78d3cf25f
diff --git a/dev-ml/ppx_custom_printf/metadata.xml b/dev-ml/ppx_custom_printf/metadata.xml
new file mode 100644
index 000000000000..5fc614cb73f4
--- /dev/null
+++ b/dev-ml/ppx_custom_printf/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">janestreet/ppx_custom_printf</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/ppx_custom_printf/ppx_custom_printf-0.9.0-r1.ebuild b/dev-ml/ppx_custom_printf/ppx_custom_printf-0.9.0-r1.ebuild
new file mode 100644
index 000000000000..0ed35963b467
--- /dev/null
+++ b/dev-ml/ppx_custom_printf/ppx_custom_printf-0.9.0-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit opam
+
+DESCRIPTION="Printf-style format-strings for user-defined string conversion"
+HOMEPAGE="https://github.com/janestreet/ppx_custom_printf"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+ dev-ml/ppx_core:=
+ dev-ml/ppx_driver:=
+ dev-ml/ppx_metaquot:=
+ dev-ml/ppx_sexp_conv:=
+ dev-ml/ppx_type_conv:=
+ dev-ml/ppx_traverse
+ dev-ml/ocaml-migrate-parsetree:=
+"
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND} dev-ml/jbuilder"
diff --git a/dev-ml/ppx_derivers-1.0 b/dev-ml/ppx_derivers-1.0
deleted file mode 100644
index 6bace8a504e3..000000000000
--- a/dev-ml/ppx_derivers-1.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=Shared [@@deriving] plugin registry
-EAPI=6
-HOMEPAGE=https://github.com/diml/ppx_derivers
-KEYWORDS=~amd64 ~ppc ~x86
-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 24b4a2529c1fd12f1304856d6c5a690d
-_md5_=db65d659fb2c39bbe68597337ed82d5d
diff --git a/dev-ml/ppx_derivers/Manifest b/dev-ml/ppx_derivers/Manifest
new file mode 100644
index 000000000000..3158d90a9ba2
--- /dev/null
+++ b/dev-ml/ppx_derivers/Manifest
@@ -0,0 +1,3 @@
+DIST ppx_derivers-1.0.tar.gz 1467 BLAKE2B 94946c5d04e314bfbe146534fb19e88a16670dc3f5d47c15496142dd9a256ebbe4387f24a9fe31b1aee804d064bea0a9136685372399a38ac82dedafe677934a SHA512 2e2437094362088f9a1601ca3c2f0b82ec079b9a34e502234aef36158ea7a3f2236f1d2526df1a75bcb851346ebaaf717eaf72253935f7ea4024d3dc20512e85
+EBUILD ppx_derivers-1.0.ebuild 426 BLAKE2B 91552788b46b1a766bbf3b4ab91f911329a9a02665f0ebc045e480bd6da9accb939672ad08a54d8ab2d494e852d5189208444c43e9f41b74d3dc51cf6e1ea7fe SHA512 9c8aaf21a446b609d4223390c3f3caa77425f96c177a2869e74615295ffee80e28d1efe75b0186b65c5c30162a9bdb28bae009ba9d38080ebc48fbcf30deeb63
+MISC metadata.xml 329 BLAKE2B ad849b6394c08527d905d42a74e19606ebf2454b26f4da643ce463e87f803fe09a60cedad0453374b046b0166ba5ca23abc65add6729f4bc382ba83d509e6e6a SHA512 534d8265ad0bf37d4ef37219869b5f98c23537140fe035b5a987b2e0c3e84414d7ce2c6c789c4108722cbcacb6168453a3da31308e62eef9ae2de56dc87708c0
diff --git a/dev-ml/ppx_derivers/metadata.xml b/dev-ml/ppx_derivers/metadata.xml
new file mode 100644
index 000000000000..4dc57e2bec09
--- /dev/null
+++ b/dev-ml/ppx_derivers/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">diml/ppx_derivers</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/ppx_derivers/ppx_derivers-1.0.ebuild b/dev-ml/ppx_derivers/ppx_derivers-1.0.ebuild
new file mode 100644
index 000000000000..b991aaed688e
--- /dev/null
+++ b/dev-ml/ppx_derivers/ppx_derivers-1.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit opam
+
+DESCRIPTION="Shared [@@deriving] plugin registry"
+HOMEPAGE="https://github.com/diml/ppx_derivers"
+SRC_URI="https://github.com/diml/ppx_derivers/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+ dev-ml/jbuilder"
diff --git a/dev-ml/ppx_deriving-4.2-r1 b/dev-ml/ppx_deriving-4.2-r1
deleted file mode 100644
index e3582d9d6c37..000000000000
--- a/dev-ml/ppx_deriving-4.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=dev-ml/ppx_tools:= dev-ml/ocaml-migrate-parsetree:= dev-ml/ppx_derivers:= dev-ml/result:= dev-ml/cppo test? ( dev-ml/ounit ) >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=Type-driven code generation for OCaml
-EAPI=5
-HOMEPAGE=https://github.com/ocaml-ppx/ppx_deriving
-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:=
-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 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e opam 24b4a2529c1fd12f1304856d6c5a690d preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=bbdb709ad564fae109ed33a00089b2a9
diff --git a/dev-ml/ppx_deriving/Manifest b/dev-ml/ppx_deriving/Manifest
new file mode 100644
index 000000000000..0db4a3fa5402
--- /dev/null
+++ b/dev-ml/ppx_deriving/Manifest
@@ -0,0 +1,3 @@
+DIST ppx_deriving-4.2.tar.gz 48327 BLAKE2B 8ce5ccbfb7992fbd5e9c777ad0b577f8846d92df21926a877fb8f7b6804acc4fa2fd78586fc209c3bd83b8496eb6f8e8ee37c39e0c7462fb55f39389356f3c8f SHA512 084526157d6f4b41f7ad73157c5edb54d5bb9130d706525031670d8495ede8af5545302f442c2d2c506772201b79ccc93bdc7fead9455d3a59977ddfa9c3284d
+EBUILD ppx_deriving-4.2-r1.ebuild 1198 BLAKE2B 95abf43c17bc7f804c0480fa11cb4203f70531d806781a1b585c7fee3f8f74a79da76427770b38f80973033f3176504961e6011354b90b7094e879ee48f1852d SHA512 6bdc1b8190f7d5b02e01db5123665bd7f8bb83ed38e72cc964a4590f686cb6533450aba2ad5a1873ed6629d193fa2ee56e89f16038a2180def522b4df5b4a4cc
+MISC metadata.xml 334 BLAKE2B b7a3e0e2b9b25814835b3e4b609e647b27feeb7cfbf2c508ea044a6be5a30bcf77a4c0bed155673788000dd60be25e9ad00a04ff2fb83b707290ad5d34c5c5be SHA512 4669e54f280de3e751ce8130d3df889fac540c201dfea25cbf116b8e47b682b8d3d48f13e238b684c13fcaed224d5271708dc441e924e05760fe427e6efc392c
diff --git a/dev-ml/ppx_deriving/metadata.xml b/dev-ml/ppx_deriving/metadata.xml
new file mode 100644
index 000000000000..fb70b500f326
--- /dev/null
+++ b/dev-ml/ppx_deriving/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">ocaml-ppx/ppx_deriving</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/ppx_deriving/ppx_deriving-4.2-r1.ebuild b/dev-ml/ppx_deriving/ppx_deriving-4.2-r1.ebuild
new file mode 100644
index 000000000000..0849fdefe983
--- /dev/null
+++ b/dev-ml/ppx_deriving/ppx_deriving-4.2-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit findlib eutils opam
+
+DESCRIPTION="Type-driven code generation for OCaml"
+HOMEPAGE="https://github.com/ocaml-ppx/ppx_deriving"
+SRC_URI="https://github.com/ocaml-ppx/ppx_deriving/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc +ocamlopt test"
+
+DEPEND="
+ dev-ml/ppx_tools:=
+ dev-ml/ocaml-migrate-parsetree:=
+ dev-ml/ppx_derivers:=
+ dev-ml/result:=
+"
+RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+ dev-ml/cppo
+ test? ( dev-ml/ounit )"
+
+src_compile() {
+ cp pkg/META.in pkg/META || die
+ ocaml pkg/build.ml \
+ native=$(usex ocamlopt true false) \
+ native-dynlink=$(usex ocamlopt true false) \
+ || die
+ use doc && emake doc
+}
+
+src_test() {
+ ocamlbuild -j 0 -use-ocamlfind -classic-display \
+ src_test/test_ppx_deriving.byte -- || die
+ if use ocamlopt; then
+ ocamlbuild -j 0 -use-ocamlfind -classic-display \
+ src_test/test_ppx_deriving.native -- || die
+ fi
+}
+
+src_install() {
+ opam_src_install
+ mv "${ED}/usr/lib/ppx_deriving/ppx_deriving" "${D}/$(ocamlc -where)/ppx_deriving/" || die
+
+ use doc && dohtml api.docdir/*
+}
diff --git a/dev-ml/ppx_deriving_yojson-3.0 b/dev-ml/ppx_deriving_yojson-3.0
deleted file mode 100644
index bf2b64e7e11c..000000000000
--- a/dev-ml/ppx_deriving_yojson-3.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=dev-lang/ocaml:=[ocamlopt?] dev-ml/yojson:= dev-ml/result:= >=dev-ml/ppx_deriving-4:= dev-ml/cppo:= dev-ml/findlib dev-ml/ocamlbuild test? ( dev-ml/ounit dev-ml/ppx_import ) >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=A Yojson codec generator for OCaml
-EAPI=5
-HOMEPAGE=https://github.com/whitequark/ppx_deriving_yojson/
-IUSE=+ocamlopt test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=dev-lang/ocaml:=[ocamlopt?] dev-ml/yojson:= dev-ml/result:= >=dev-ml/ppx_deriving-4:= dev-ml/cppo:= >=dev-lang/ocaml-4:=
-SLOT=0/3.0
-SRC_URI=https://github.com/whitequark/ppx_deriving_yojson/archive/v3.0.tar.gz -> ppx_deriving_yojson-3.0.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e opam 24b4a2529c1fd12f1304856d6c5a690d preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c5badd88606f9b236df7f0b20af8b626
diff --git a/dev-ml/ppx_deriving_yojson/Manifest b/dev-ml/ppx_deriving_yojson/Manifest
new file mode 100644
index 000000000000..4e356a0a6c9c
--- /dev/null
+++ b/dev-ml/ppx_deriving_yojson/Manifest
@@ -0,0 +1,4 @@
+AUX ocaml405.patch 4497 BLAKE2B f6967088e7a34ae06d50e22abf08fac3fa3899552de3a6bff642a9ffaf4cc53eb8db100a53d89d01a2d1ee01ee71e17ac30d850179378971f54cdedad00b84e9 SHA512 9bd0c7d462867b314b96d7971dc5d6b81730dee3918c5d2061c7881f7e4e172d27c9d3273c1fdfa25dce30abbc413c97eedb0e1c50cc84c82e177084220d0c8a
+DIST ppx_deriving_yojson-3.0.tar.gz 18111 BLAKE2B eaf8d380b8ff606bebff4050af9fb22624b404f106518a0f68b23866e66459f74c0984970ae0bbbdb67d2f71264a832850a8e03740c8fb207bc70abe89a61219 SHA512 70c690d880ff652f9f92e95af047e87726bab48100e9325406eef7a9ed80f439df7292324de56cd17a93c6ad6bc9c1e7ce6edcd7c3b336352f0df4bfa7c7b81c
+EBUILD ppx_deriving_yojson-3.0.ebuild 1012 BLAKE2B bd4af32968c4c032ec70ba76bf1814717430292adb12bd5d7185043eaadea827a94a4270855eee874fbdbbbc5d02f4746e67a6cc2f1d3506a403b84b0d9fd646 SHA512 bb1b4a997bc0e804de5d659fc26a1140c485cd1d749f0f7565cb41c92460b745842fe71c409226b24df7c82d8ab8f4f759f715442aaf447f836520a21d3bc644
+MISC metadata.xml 342 BLAKE2B 1b3bc6020fa4b6448165b9ff18d228c0dba8f7b5340abd1573ecd5d3db8296648e3a43b835fde12ff40e3603dc4138927d69055da8ca51ea4146d91fd6ae165d SHA512 ee968464fdc162f4caa4e063c43829f8ffaa89d46e49191ed6a661eeab021d5765d4bdbcd31fefbc0806ebb072aa5988a13cea45ad0d548ccdfdad5e7a500b93
diff --git a/dev-ml/ppx_deriving_yojson/files/ocaml405.patch b/dev-ml/ppx_deriving_yojson/files/ocaml405.patch
new file mode 100644
index 000000000000..33440fabdd19
--- /dev/null
+++ b/dev-ml/ppx_deriving_yojson/files/ocaml405.patch
@@ -0,0 +1,76 @@
+Index: ppx_deriving_yojson-3.0/src/ppx_deriving_yojson.cppo.ml
+===================================================================
+--- ppx_deriving_yojson-3.0.orig/src/ppx_deriving_yojson.cppo.ml
++++ ppx_deriving_yojson-3.0/src/ppx_deriving_yojson.cppo.ml
+@@ -260,7 +260,7 @@ let ser_str_of_type ~options ~path ({ pt
+ let polymorphize_ser = Ppx_deriving.poly_arrow_of_type_decl
+ (fun var -> [%type: [%t var] -> Yojson.Safe.json]) type_decl
+ in
+- let ty = Typ.poly poly_vars (polymorphize_ser [%type: [%t typ] -> Yojson.Safe.json]) in
++ let ty = Typ.poly (List.map Location.mknoloc poly_vars) (polymorphize_ser [%type: [%t typ] -> Yojson.Safe.json]) in
+ let default_fun =
+ let type_path = String.concat "." (path @ [type_decl.ptype_name.txt]) in
+ let e_type_path = Exp.constant (Pconst_string (type_path, None)) in
+@@ -270,7 +270,7 @@ let ser_str_of_type ~options ~path ({ pt
+ in
+ let poly_fun = polymorphize default_fun in
+ let poly_fun =
+- (Ppx_deriving.fold_left_type_decl (fun exp name -> Exp.newtype name exp) poly_fun type_decl)
++ (Ppx_deriving.fold_left_type_decl (fun exp name -> Exp.newtype (Location.mknoloc name) exp) poly_fun type_decl)
+ in
+ let mod_name = "M_"^to_yojson_name in
+ let typ = Type.mk ~kind:(Ptype_record [Type.field ~mut:Mutable (mknoloc "f") ty])
+@@ -337,7 +337,7 @@ let ser_str_of_type ~options ~path ({ pt
+ raise_errorf ~loc "%s cannot be derived for fully abstract types" deriver
+ in
+ let ty = ser_type_of_decl ~options ~path type_decl in
+- let fv = Ppx_deriving.free_vars_in_core_type ty in
++ let fv = List.map Location.mknoloc (Ppx_deriving.free_vars_in_core_type ty) in
+ let poly_type = Typ.force_poly @@ Typ.poly fv @@ ty in
+ let var = pvar (Ppx_deriving.mangle_type_decl (`Suffix "to_yojson") type_decl) in
+ ([],
+@@ -431,7 +431,7 @@ let desu_str_of_type ~options ~path ({ p
+ raise_errorf ~loc "%s: extensible type manifest should be a type name" deriver
+ | None ->
+ let poly_vars = List.rev
+- (Ppx_deriving.fold_left_type_decl (fun acc name -> name :: acc) [] type_decl)
++ (List.map Location.mknoloc (Ppx_deriving.fold_left_type_decl (fun acc name -> name :: acc) [] type_decl))
+ in
+ let polymorphize_desu = Ppx_deriving.poly_arrow_of_type_decl
+ (fun var -> [%type: Yojson.Safe.json -> [%t error_or var]]) type_decl in
+@@ -441,7 +441,7 @@ let desu_str_of_type ~options ~path ({ p
+ let default_fun = Exp.function_ [Exp.case [%pat? _] top_error] in
+ let poly_fun = polymorphize default_fun in
+ let poly_fun =
+- (Ppx_deriving.fold_left_type_decl (fun exp name -> Exp.newtype name exp) poly_fun type_decl)
++ (Ppx_deriving.fold_left_type_decl (fun exp name -> Exp.newtype (Location.mknoloc name) exp) poly_fun type_decl)
+ in
+ let mod_name = "M_"^of_yojson_name in
+ let typ = Type.mk ~kind:(Ptype_record [Type.field ~mut:Mutable (mknoloc "f") ty])
+@@ -514,7 +514,7 @@ let desu_str_of_type ~options ~path ({ p
+ raise_errorf ~loc "%s cannot be derived for fully abstract types" deriver
+ in
+ let ty = desu_type_of_decl ~options ~path type_decl in
+- let fv = Ppx_deriving.free_vars_in_core_type ty in
++ let fv = List.map Location.mknoloc (Ppx_deriving.free_vars_in_core_type ty) in
+ let poly_type = Typ.force_poly @@ Typ.poly fv @@ ty in
+ let var = pvar (Ppx_deriving.mangle_type_decl (`Suffix "of_yojson") type_decl) in
+ ([],
+@@ -579,7 +579,7 @@ let ser_sig_of_type ~options ~path type_
+ (`PrefixSuffix ("M", "to_yojson")) type_decl
+ in
+ let poly_vars = List.rev
+- (Ppx_deriving.fold_left_type_decl (fun acc name -> name :: acc) [] type_decl)
++ (List.map Location.mknoloc (Ppx_deriving.fold_left_type_decl (fun acc name -> name :: acc) [] type_decl))
+ in
+ let typ = Ppx_deriving.core_type_of_type_decl type_decl in
+ let polymorphize_ser = Ppx_deriving.poly_arrow_of_type_decl
+@@ -614,7 +614,7 @@ let desu_sig_of_type ~options ~path type
+ (`PrefixSuffix ("M", "of_yojson")) type_decl
+ in
+ let poly_vars = List.rev
+- (Ppx_deriving.fold_left_type_decl (fun acc name -> name :: acc) [] type_decl)
++ (List.map Location.mknoloc (Ppx_deriving.fold_left_type_decl (fun acc name -> name :: acc) [] type_decl))
+ in
+ let typ = Ppx_deriving.core_type_of_type_decl type_decl in
+ let polymorphize_desu = Ppx_deriving.poly_arrow_of_type_decl
diff --git a/dev-ml/ppx_deriving_yojson/metadata.xml b/dev-ml/ppx_deriving_yojson/metadata.xml
new file mode 100644
index 000000000000..0c78feb0828a
--- /dev/null
+++ b/dev-ml/ppx_deriving_yojson/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">whitequark/ppx_deriving_yojson</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/ppx_deriving_yojson/ppx_deriving_yojson-3.0.ebuild b/dev-ml/ppx_deriving_yojson/ppx_deriving_yojson-3.0.ebuild
new file mode 100644
index 000000000000..07d29ef08c77
--- /dev/null
+++ b/dev-ml/ppx_deriving_yojson/ppx_deriving_yojson-3.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils opam
+
+DESCRIPTION="A Yojson codec generator for OCaml"
+HOMEPAGE="https://github.com/whitequark/ppx_deriving_yojson/"
+SRC_URI="https://github.com/whitequark/ppx_deriving_yojson/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="+ocamlopt test"
+
+DEPEND="
+ dev-lang/ocaml:=[ocamlopt?]
+ dev-ml/yojson:=
+ dev-ml/result:=
+ >=dev-ml/ppx_deriving-4:=
+ dev-ml/cppo:=
+"
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND}
+ dev-ml/findlib
+ dev-ml/ocamlbuild
+ test? ( dev-ml/ounit dev-ml/ppx_import )"
+
+src_prepare() {
+ has_version '>=dev-lang/ocaml-4.05_rc' && epatch "${FILESDIR}/ocaml405.patch"
+}
+
+src_compile() {
+ cp pkg/META.in pkg/META
+ ocaml pkg/build.ml \
+ native=$(usex ocamlopt true false) \
+ native-dynlink=$(usex ocamlopt true false) \
+ || die
+}
+
+src_test() {
+ ocamlbuild -j 0 -use-ocamlfind -classic-display src_test/test_ppx_yojson.byte -- || die
+}
diff --git a/dev-ml/ppx_driver-0.9.1-r1 b/dev-ml/ppx_driver-0.9.1-r1
deleted file mode 100644
index 82b97adada2d..000000000000
--- a/dev-ml/ppx_driver-0.9.1-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-ml/ppx_core:= dev-ml/stdio:= dev-ml/ppx_optcomp:= dev-ml/ocaml-migrate-parsetree:= dev-ml/ocamlbuild:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=Feature-full driver for OCaml AST transformers
-EAPI=6
-HOMEPAGE=https://github.com/janestreet/ppx_driver
-KEYWORDS=~amd64 ~ppc ~x86
-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 24b4a2529c1fd12f1304856d6c5a690d
-_md5_=5eebc7208b78283faaf55e931f0c6ec1
diff --git a/dev-ml/ppx_driver/Manifest b/dev-ml/ppx_driver/Manifest
new file mode 100644
index 000000000000..cd7b443c0dfe
--- /dev/null
+++ b/dev-ml/ppx_driver/Manifest
@@ -0,0 +1,3 @@
+DIST ppx_driver-0.9.1.tar.gz 28637 BLAKE2B d787ac91713bd750d2d2bde5830df3abb1a07be6672000d7a6de6c125a7627e7a5b94aa9f8f87e2c6c57a7a92073c44e18c7285575aad02f5db9c7b4419647d8 SHA512 1e3647e34fb9e6d44b783fae1fce21413e5591f8934c3d2ddac3d1b37019b0d95117c8d64abf14cbfe4f67147612371ec1eb76b477763b062206ffc9b46688d7
+EBUILD ppx_driver-0.9.1-r1.ebuild 584 BLAKE2B fb729e4ae41008ce616f784cee3a81048c46df5e27050b4118937b7fe71b738cb75813c06db95e161dcd43c587b8659d43e8927c59b9b9057e51ae826925824a SHA512 13c48ae64e7d2c8f2c5e39125873eb573d2aace46ad87989e11bde24d16b3bc4ca47a340322adec8a22834f74495e2f4dd7e6e1436932bdaa45e469f7f46ef91
+MISC metadata.xml 333 BLAKE2B 968ad46caa7f80948178a2f41ddb2a6ded0315f9865c953b99a523d3ff44a75017cac2064aaa1276767509c38bb0e0fd577cfe2a60b1467651f45c1909027995 SHA512 1cfb21c42adf5c94fb02f4621ed9e77acc832ba7c0d7bebee338ff5f617431e5a0a682945a22cd58143fa5cf61758c70694a6f2697a6b1a49107029e31fe738f
diff --git a/dev-ml/ppx_driver/metadata.xml b/dev-ml/ppx_driver/metadata.xml
new file mode 100644
index 000000000000..39e4d98cd1d4
--- /dev/null
+++ b/dev-ml/ppx_driver/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">janestreet/ppx_driver</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/ppx_driver/ppx_driver-0.9.1-r1.ebuild b/dev-ml/ppx_driver/ppx_driver-0.9.1-r1.ebuild
new file mode 100644
index 000000000000..c950b017789c
--- /dev/null
+++ b/dev-ml/ppx_driver/ppx_driver-0.9.1-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit opam
+
+DESCRIPTION="Feature-full driver for OCaml AST transformers"
+HOMEPAGE="https://github.com/janestreet/ppx_driver"
+SRC_URI="https://github.com/janestreet/ppx_driver/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="
+ dev-ml/ppx_core:=
+ dev-ml/stdio:=
+ dev-ml/ppx_optcomp:=
+ dev-ml/ocaml-migrate-parsetree:=
+ dev-ml/ocamlbuild:="
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND} dev-ml/jbuilder"
diff --git a/dev-ml/ppx_enumerate-0.9.0 b/dev-ml/ppx_enumerate-0.9.0
deleted file mode 100644
index da5a61d0b6ec..000000000000
--- a/dev-ml/ppx_enumerate-0.9.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_metaquot:= dev-ml/ppx_type_conv:= dev-ml/ocaml-migrate-parsetree:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=Generate a list containing all values of a finite type
-EAPI=6
-HOMEPAGE=https://github.com/janestreet/ppx_enumerate
-KEYWORDS=~amd64 ~ppc ~x86
-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 24b4a2529c1fd12f1304856d6c5a690d
-_md5_=5d2b37c4d7c7350ca9bfee645c938f02
diff --git a/dev-ml/ppx_enumerate/Manifest b/dev-ml/ppx_enumerate/Manifest
new file mode 100644
index 000000000000..34251ac706dd
--- /dev/null
+++ b/dev-ml/ppx_enumerate/Manifest
@@ -0,0 +1,3 @@
+DIST ppx_enumerate-0.9.0.tar.gz 10967 BLAKE2B a5e742c5009c16d07cb23d7fba8cd4d41cd3f2ec543f47fce65c3731bb81b140a601ec492c0f5f8a5a62c2ac64f41a8093a7e5c96b251ad3b85944aab19c167c SHA512 46e979528af75313fcbfee4d1437156ded90d46f7608271a77ad41bb7e087e2ea4f61f534624b23679c4edf812d2fcfe26b9b634c3fcb691e2da2388ae04950c
+EBUILD ppx_enumerate-0.9.0.ebuild 598 BLAKE2B 2bdb21355e0fbf93fc52a837a304a67ea2588aa1737d8ca5f26623f7cf4c6a425975bc74a4deae78b6e61e9628b52f5cdc73dfb39c5089ba97470fb85993ad63 SHA512 f9127b765f4fc1b644dbedd46167330af272ab1d4647e9b5043de00e9eebbd235ad1f2d97f36267ae6905f7863ad2cefc01a3d7a80e809686f0f756a140d189d
+MISC metadata.xml 336 BLAKE2B 64c8bbddf558b85b7b5ff52b397bad940b6b4ec15e715eee80f439c7b76345de667e678591a1b3eaf71aef7e06345d505a4c58a31e28e3bd9bd20f6a3325e934 SHA512 8796eaa23dc9980baa55b64388baee0faf19dc4d7b596ad355a3cd126f57b7e93f0ad2d4acdee4e186f0952872151e77fc402abf4388b94b6f1cee8e2c51e056
diff --git a/dev-ml/ppx_enumerate/metadata.xml b/dev-ml/ppx_enumerate/metadata.xml
new file mode 100644
index 000000000000..6b52e5d143e6
--- /dev/null
+++ b/dev-ml/ppx_enumerate/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">janestreet/ppx_enumerate</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/ppx_enumerate/ppx_enumerate-0.9.0.ebuild b/dev-ml/ppx_enumerate/ppx_enumerate-0.9.0.ebuild
new file mode 100644
index 000000000000..45aac67b0624
--- /dev/null
+++ b/dev-ml/ppx_enumerate/ppx_enumerate-0.9.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit opam
+
+DESCRIPTION="Generate a list containing all values of a finite type"
+HOMEPAGE="https://github.com/janestreet/ppx_enumerate"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="
+ dev-ml/ppx_core:=
+ dev-ml/ppx_driver:=
+ dev-ml/ppx_metaquot:=
+ dev-ml/ppx_type_conv:=
+ dev-ml/ocaml-migrate-parsetree:=
+"
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND} dev-ml/jbuilder"
diff --git a/dev-ml/ppx_expect-0.9.0 b/dev-ml/ppx_expect-0.9.0
deleted file mode 100644
index 58523b16e4a0..000000000000
--- a/dev-ml/ppx_expect-0.9.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-ml/base:= dev-ml/ppx_assert:= dev-ml/ppx_compare:= dev-ml/ppx_core:= dev-ml/ppx_custom_printf:= dev-ml/ppx_driver:= dev-ml/ppx_fields_conv:= dev-ml/ppx_here:= dev-ml/ppx_inline_test:= dev-ml/ppx_metaquot:= dev-ml/ppx_sexp_conv:= dev-ml/ppx_traverse:= dev-ml/ppx_variants_conv:= dev-ml/stdio:= dev-ml/ocaml-migrate-parsetree:= dev-ml/ocaml-re:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=Cram like framework for OCaml
-EAPI=6
-HOMEPAGE=https://github.com/janestreet/ppx_expect
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-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 24b4a2529c1fd12f1304856d6c5a690d
-_md5_=de04ea3737696aa4d6ce8eacba8c8d99
diff --git a/dev-ml/ppx_expect/Manifest b/dev-ml/ppx_expect/Manifest
new file mode 100644
index 000000000000..e861e2a78ea0
--- /dev/null
+++ b/dev-ml/ppx_expect/Manifest
@@ -0,0 +1,3 @@
+DIST ppx_expect-0.9.0.tar.gz 33700 BLAKE2B f03d1183b12efe84016a15b6a6b45b7bef93b23bc4d470c2796361aca2be229fc9447103c0a31d95a94f6c05bbabf1cbe9d138dc3518df9f505b6b009eefb104 SHA512 b8a6941f3ac0dea2167d7fe5c61e7adf605f5399e11049b5c9f22c613182983a014d05c2fb16e7a2dc94dbccf445e1801c39a89e6d995b5599cb40ee4322148e
+EBUILD ppx_expect-0.9.0.ebuild 803 BLAKE2B db16cfe2c0f98e9608036e6ed55f82ce0c000e4719ad610ed2a63a00f30dbd4d726be74c15648b1d158751eba3dafcde8af0c22341e3539f6d29aaa0272c430e SHA512 75d553529f0b249139a1d81f5990c10711e0580046f089be442ea328fe9f96045677e7149018bf75aec5cc9ab0fe20e74d411fa782b9371fb7a4dcfd80f2f992
+MISC metadata.xml 333 BLAKE2B e7782ff38a4b997faef85ca8eb9681f1099c4e4fada5e42636b1bd5bb4f3f54dda857ee510d7cc37e198bb8a144662445266826eb64ddb40f9e92242b39ac43d SHA512 dcd6ccfffa22702f27e4806617c3c5f1a38f2bb84592df6b1f8acd60ee34c518e7b836e574561b2c393d5edef15611fc3c9187cd0615846a72134eaf8445511f
diff --git a/dev-ml/ppx_expect/metadata.xml b/dev-ml/ppx_expect/metadata.xml
new file mode 100644
index 000000000000..cc6dd4d744bd
--- /dev/null
+++ b/dev-ml/ppx_expect/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">janestreet/ppx_expect</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/ppx_expect/ppx_expect-0.9.0.ebuild b/dev-ml/ppx_expect/ppx_expect-0.9.0.ebuild
new file mode 100644
index 000000000000..3ab20bb348ff
--- /dev/null
+++ b/dev-ml/ppx_expect/ppx_expect-0.9.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit opam
+
+DESCRIPTION="Cram like framework for OCaml"
+HOMEPAGE="https://github.com/janestreet/ppx_expect"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+ dev-ml/base:=
+ dev-ml/ppx_assert:=
+ dev-ml/ppx_compare:=
+ dev-ml/ppx_core:=
+ dev-ml/ppx_custom_printf:=
+ dev-ml/ppx_driver:=
+ dev-ml/ppx_fields_conv:=
+ dev-ml/ppx_here:=
+ dev-ml/ppx_inline_test:=
+ dev-ml/ppx_metaquot:=
+ dev-ml/ppx_sexp_conv:=
+ dev-ml/ppx_traverse:=
+ dev-ml/ppx_variants_conv:=
+ dev-ml/stdio:=
+ dev-ml/ocaml-migrate-parsetree:=
+ dev-ml/ocaml-re:=
+"
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND} dev-ml/jbuilder"
diff --git a/dev-ml/ppx_fail-0.9.0 b/dev-ml/ppx_fail-0.9.0
deleted file mode 100644
index e38adcf93f48..000000000000
--- a/dev-ml/ppx_fail-0.9.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_here:= dev-ml/ppx_metaquot:= dev-ml/ocaml-migrate-parsetree:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=Add location to calls to failwiths
-EAPI=6
-HOMEPAGE=https://github.com/janestreet/ppx_fail
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-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 24b4a2529c1fd12f1304856d6c5a690d
-_md5_=a68b871d171c9d63f11e06827910681e
diff --git a/dev-ml/ppx_fail/Manifest b/dev-ml/ppx_fail/Manifest
new file mode 100644
index 000000000000..0cca30b5866b
--- /dev/null
+++ b/dev-ml/ppx_fail/Manifest
@@ -0,0 +1,3 @@
+DIST ppx_fail-0.9.0.tar.gz 5908 BLAKE2B 671d6c565ffef4582600346642d64884706c9f5bbff114868b0069f82abea3241c44bd92472e40b11365a560335efac59f2a93ab993d19cf98c2a3da09c5968d SHA512 43bd13d5e41f7a297da2c67b032b9d88b94ab2ef152f756738e2bab41aa22829ec3a17d2824243e5194c4d2ee9ea567f06a638172f8c77ca7c466a641da8017a
+EBUILD ppx_fail-0.9.0.ebuild 558 BLAKE2B 82c0eaf5b8399c798fffd80a74846d331ed7e125c7f75cd8feffe641433fe476da6142194c8ecdc04e7f26bb029fefa316893245fe4063c185914ac0379d5679 SHA512 1779731707eed4ccea346845234b2818a18c4bc7cb3e2d0509177a74bf4ceb2af6a577474e8b0eca9e29abc91d572e05cbdb30c0fa0257336e1a92a7a6b1718e
+MISC metadata.xml 331 BLAKE2B fe3dece450d658b827d104599fd0ea557a2dca8dd09241cf82df925956dff0b2383a850f4b1af480d3278625c038e6ccda9b47705446be88bc484757d3503030 SHA512 fb164a7ca38c13caa3b097d39bf0e2408abd9b603f75325e7059c1fda078afcb2c6000d8d5a21f7db58d8f95cf68667ae8bec12455f6d02a163f2d58f3befc6d
diff --git a/dev-ml/ppx_fail/metadata.xml b/dev-ml/ppx_fail/metadata.xml
new file mode 100644
index 000000000000..3ed1070e00f0
--- /dev/null
+++ b/dev-ml/ppx_fail/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">janestreet/ppx_fail</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/ppx_fail/ppx_fail-0.9.0.ebuild b/dev-ml/ppx_fail/ppx_fail-0.9.0.ebuild
new file mode 100644
index 000000000000..f394a9dcb62c
--- /dev/null
+++ b/dev-ml/ppx_fail/ppx_fail-0.9.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit opam
+
+DESCRIPTION="Add location to calls to failwiths"
+HOMEPAGE="https://github.com/janestreet/ppx_fail"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+ dev-ml/ppx_core:=
+ dev-ml/ppx_driver:=
+ dev-ml/ppx_here:=
+ dev-ml/ppx_metaquot:=
+ dev-ml/ocaml-migrate-parsetree:=
+"
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND} dev-ml/jbuilder"
diff --git a/dev-ml/ppx_fields_conv-0.9.0-r1 b/dev-ml/ppx_fields_conv-0.9.0-r1
deleted file mode 100644
index 8e61e6b3e714..000000000000
--- a/dev-ml/ppx_fields_conv-0.9.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_metaquot:= dev-ml/ppx_type_conv:= dev-ml/fieldslib:= dev-ml/ocaml-migrate-parsetree:= dev-ml/ppx_traverse_builtins:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=Generation of accessor and iteration functions for ocaml records
-EAPI=6
-HOMEPAGE=https://github.com/janestreet/ppx_fields_conv
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-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 24b4a2529c1fd12f1304856d6c5a690d
-_md5_=553274bc3d71f529cb5de9b8bcd16d7b
diff --git a/dev-ml/ppx_fields_conv/Manifest b/dev-ml/ppx_fields_conv/Manifest
new file mode 100644
index 000000000000..e3ee2b642d49
--- /dev/null
+++ b/dev-ml/ppx_fields_conv/Manifest
@@ -0,0 +1,3 @@
+DIST ppx_fields_conv-0.9.0.tar.gz 15171 BLAKE2B 5a0051a1b362dcf15ddd4ec4f3f6f4df6d709a8c2709222a2d2502eb12b8728fb28ce9213a1789270d30505c6084ab8203dc7b49d7043d9820aabb0cc74c51c2 SHA512 1edcd7076c1dbba84b86f05624b3792404b24ae4414ee0c3b32dcfc998da77a2a9d52d063fefc24be21d98472d6f58880c37ac29c610fb5b8a401224fc654ec1
+EBUILD ppx_fields_conv-0.9.0-r1.ebuild 652 BLAKE2B 2ea1eed022ac76e42c56a2c364f703c9f68ca9266836c2465291bbbbe3a14b8fa8001393f7f32ad554196e201279dbb20708fb05ecd564d21fb5f10f56dee71a SHA512 efe73ceafc884d13db789224d506745d614b2351ddc6f365d2a3c9adeaa5d671659f9bcd21ec8204bb3bcedc9eaafd113c81d8d6df4da3f796abb5cd6c967714
+MISC metadata.xml 338 BLAKE2B b133f1749cbf270c969fe0281e44f4784649bc836d97967e5d4231832444457f8a2e704c01505b3ac4a8d8ee7c3f3899a1f3a8d0539d64051e317958c306e358 SHA512 7eb01d66745970c29d744c61025992d5390c95c88ad696c98b2636a683f5a6040dcbe8913a43a297329b668cf4b85d8d4a7e47e2846197d1ca70158768d5b0ef
diff --git a/dev-ml/ppx_fields_conv/metadata.xml b/dev-ml/ppx_fields_conv/metadata.xml
new file mode 100644
index 000000000000..365fc5349ba2
--- /dev/null
+++ b/dev-ml/ppx_fields_conv/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">janestreet/ppx_fields_conv</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/ppx_fields_conv/ppx_fields_conv-0.9.0-r1.ebuild b/dev-ml/ppx_fields_conv/ppx_fields_conv-0.9.0-r1.ebuild
new file mode 100644
index 000000000000..b0352e3866ec
--- /dev/null
+++ b/dev-ml/ppx_fields_conv/ppx_fields_conv-0.9.0-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit opam
+
+DESCRIPTION="Generation of accessor and iteration functions for ocaml records"
+HOMEPAGE="https://github.com/janestreet/ppx_fields_conv"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+ dev-ml/ppx_core:=
+ dev-ml/ppx_driver:=
+ dev-ml/ppx_metaquot:=
+ dev-ml/ppx_type_conv:=
+ dev-ml/fieldslib:=
+ dev-ml/ocaml-migrate-parsetree:=
+ dev-ml/ppx_traverse_builtins:=
+"
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND} dev-ml/jbuilder"
diff --git a/dev-ml/ppx_hash-0.9.0 b/dev-ml/ppx_hash-0.9.0
deleted file mode 100644
index 869f585fe826..000000000000
--- a/dev-ml/ppx_hash-0.9.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=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-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=PPX rewriter that generates hash functions from type expressions and definitions
-EAPI=6
-HOMEPAGE=https://github.com/janestreet/ppx_hash
-KEYWORDS=~amd64 ~ppc ~x86
-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 24b4a2529c1fd12f1304856d6c5a690d
-_md5_=6f24bade222da199f0aac381d0540358
diff --git a/dev-ml/ppx_hash/Manifest b/dev-ml/ppx_hash/Manifest
new file mode 100644
index 000000000000..7af70e784aa6
--- /dev/null
+++ b/dev-ml/ppx_hash/Manifest
@@ -0,0 +1,3 @@
+DIST ppx_hash-0.9.0.tar.gz 26942 BLAKE2B 589b9fe1ced89c0dbbc9d3472e21c278a9d1d29c1ceaa3a19ae853727cb4fc446e67deb8b63274ccfbd95fbfa49a5e8cba764bf2a3ae26bb994c9fb16f2b9f32 SHA512 401a87f5cc357ad50fc23f2450b84d6113cd79c1d2506f6e95476795fde0f3240ca252fc3bfe083f9ee1d0511ea3909481387ecf597edef6f90f9756a5a97096
+EBUILD ppx_hash-0.9.0.ebuild 681 BLAKE2B d14ce12eeca5d14a1c6bb9bfaa06b5337af64bccd943e7eb7572c9b91011b7d49ad2977c16e81272e151e5575a5d163099ac1159af22d5e7c76b5ff3d34a2f68 SHA512 33f1de12502e0d160d7c1ac5939c943c8402edf41afd3243e96649d8d4ea37310f1c0153b9ff2137c27ccbf077e3dfdd9b89466e75b1b73ba2826b8efc28de26
+MISC metadata.xml 331 BLAKE2B 37282f7cb8d7e5e713a0676ca770c81f60e2abb040028e428a348732c2a87506994ce57504725c12ab1bdd18edb67581d761c1bc4e83e742f976df6d6505b967 SHA512 d4452d613af60b217afaeae854ddfe6445db514079ae519f7cfe90ee3cd2d584ce1b42fc6716433b288e642f31c80fb7f9da63965cd7d0f2d835842dae1c9775
diff --git a/dev-ml/ppx_hash/metadata.xml b/dev-ml/ppx_hash/metadata.xml
new file mode 100644
index 000000000000..903da84b8a79
--- /dev/null
+++ b/dev-ml/ppx_hash/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">janestreet/ppx_hash</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/ppx_hash/ppx_hash-0.9.0.ebuild b/dev-ml/ppx_hash/ppx_hash-0.9.0.ebuild
new file mode 100644
index 000000000000..cf6dba57d056
--- /dev/null
+++ b/dev-ml/ppx_hash/ppx_hash-0.9.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit opam
+
+DESCRIPTION="PPX rewriter that generates hash functions from type expressions and definitions"
+HOMEPAGE="https://github.com/janestreet/ppx_hash"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="
+ 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:=
+ "
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND} dev-ml/jbuilder"
diff --git a/dev-ml/ppx_here-0.9.1 b/dev-ml/ppx_here-0.9.1
deleted file mode 100644
index 5c4c846f0a45..000000000000
--- a/dev-ml/ppx_here-0.9.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_optcomp:= dev-ml/ocaml-migrate-parsetree:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=Expands [%here] into its location
-EAPI=6
-HOMEPAGE=https://github.com/janestreet/ppx_here
-KEYWORDS=~amd64
-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 24b4a2529c1fd12f1304856d6c5a690d
-_md5_=ec049e275302db6b5e6652389ae76e96
diff --git a/dev-ml/ppx_here/Manifest b/dev-ml/ppx_here/Manifest
new file mode 100644
index 000000000000..216a7b263439
--- /dev/null
+++ b/dev-ml/ppx_here/Manifest
@@ -0,0 +1,3 @@
+DIST ppx_here-0.9.1.tar.gz 7225 BLAKE2B 7115c77477b2bab47febfafe55d422bef03c32502d9d0064c5633d6925faf1b3a8b580f2a0974edcf86613f9b2582b0067f3e08a4ca474333f7e15c2c7adb87d SHA512 ca21fb490a4d980616349850b781e4ee02c0eb8a27e8ef9d4092d15ee235ffc504dab1b2a3db44fc6a84fa6b2cdbd67c0c4adbc41fb094b7bb9d4f710193aaf2
+EBUILD ppx_here-0.9.1.ebuild 538 BLAKE2B 64924fd0c832b54f95ec5293842b4cda4f0d315ad79861c87aa4487270e6e2e4e3658a9eee8300cf2e9c21336beb7007ff4e537e6a6ca01dc70746ba83ab216f SHA512 2ad8d7d1bdc781bce326f8c535bff2d814e6536194945a7ec27b1ee021bea4a409e5f5a7d5b4de1b3c3e169d9780ce54d195441363d8d68239a584111d00401f
+MISC metadata.xml 331 BLAKE2B 5668e32d072c521054e88996756f0fa4b85dbf7ad6e94c96142def91f285354a483ab06e650b447a9bd32f166c022ab3c2f36a202ec645e3a0353781beb558ea SHA512 376ec833654689189c53a872e68ebb9d29a080ce979f7e5c1761a8c86fc2461db9b9292aecb032eaac0d5dbc163b9f0cbbbf8643bdacb0f229d896f185d9be3b
diff --git a/dev-ml/ppx_here/metadata.xml b/dev-ml/ppx_here/metadata.xml
new file mode 100644
index 000000000000..69775f938396
--- /dev/null
+++ b/dev-ml/ppx_here/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">janestreet/ppx_here</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/ppx_here/ppx_here-0.9.1.ebuild b/dev-ml/ppx_here/ppx_here-0.9.1.ebuild
new file mode 100644
index 000000000000..972fc65d0d4b
--- /dev/null
+++ b/dev-ml/ppx_here/ppx_here-0.9.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit opam
+
+DESCRIPTION="Expands [%here] into its location"
+HOMEPAGE="https://github.com/janestreet/ppx_here"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+ dev-ml/ppx_core:=
+ dev-ml/ppx_driver:=
+ dev-ml/ppx_optcomp:=
+ dev-ml/ocaml-migrate-parsetree:=
+"
+RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND} dev-ml/jbuilder"
diff --git a/dev-ml/ppx_import-1.2 b/dev-ml/ppx_import-1.2
deleted file mode 100644
index 6888a37ad972..000000000000
--- a/dev-ml/ppx_import-1.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=dev-lang/ocaml:=[ocamlopt?] dev-ml/ppx_tools:= dev-ml/cppo:= test? ( dev-ml/ounit dev-ml/ppx_deriving ) dev-ml/ocamlbuild dev-ml/findlib >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=A syntax extension for importing declarations from interface files
-EAPI=5
-HOMEPAGE=https://github.com/whitequark/ppx_import
-IUSE=+ocamlopt test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=dev-lang/ocaml:=[ocamlopt?] dev-ml/ppx_tools:= dev-ml/cppo:= >=dev-lang/ocaml-4:=
-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 24b4a2529c1fd12f1304856d6c5a690d
-_md5_=5296f8d53290ced6c54db8d1ac3f04cd
diff --git a/dev-ml/ppx_import/Manifest b/dev-ml/ppx_import/Manifest
new file mode 100644
index 000000000000..7769f40166e1
--- /dev/null
+++ b/dev-ml/ppx_import/Manifest
@@ -0,0 +1,3 @@
+DIST ppx_import-1.2.tar.gz 13244 BLAKE2B 538fd11e151d740c601ca88ff682bf4ea84ddaea3fbbc5b54d43310e59baf00ae47ef397763861da8ff1b2af017bb318ec1cd48f8708b9dc2a2c68bf812e1aea SHA512 384a8f955573c66962383f0e3609e4764cb0056e7d5b7e5811fd9fd17e17ac58baea330131b8eb688cd4202d6e6bd5829fba024524f027201244ff10c86e0f01
+EBUILD ppx_import-1.2.ebuild 877 BLAKE2B 8461593cafa856c1ee4710d4a3e0d838169f5597852124069a27781f11e6a1a22f9c6c742990b805a9e2b8c65be18ac75b96cc262ace8e141704d0c644bc3712 SHA512 d870567695e3c7c985c8ddde4f1d2def0385a5520ff2d7cafa85d8c243faeb5ccef63aca2cb83d5952c8c3cee82ffa1098900cc8edf623662c35123f25909021
+MISC metadata.xml 333 BLAKE2B 80948000319ca0b20d03d6105879c81b543c0b009e23d16cc3cb677e670be50cfd6454d44bf02de44744c2b9d3d44e683272f5635d44c37e4171baebb5cd0cbe SHA512 d05450e13d2cfa74a954322f90489d4e990b44fc7756fbad01c74a7baf450593dc012b919c9781ba9d79b831835f41f9783eeb1c6049e668a1122a14bb2aefc5
diff --git a/dev-ml/ppx_import/metadata.xml b/dev-ml/ppx_import/metadata.xml
new file mode 100644
index 000000000000..d0bba00f86b8
--- /dev/null
+++ b/dev-ml/ppx_import/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">whitequark/ppx_import</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/ppx_import/ppx_import-1.2.ebuild b/dev-ml/ppx_import/ppx_import-1.2.ebuild
new file mode 100644
index 000000000000..efecbd3f7200
--- /dev/null
+++ b/dev-ml/ppx_import/ppx_import-1.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit opam
+
+DESCRIPTION="A syntax extension for importing declarations from interface files"
+HOMEPAGE="https://github.com/whitequark/ppx_import"
+SRC_URI="https://github.com/whitequark/ppx_import/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="+ocamlopt test"
+
+DEPEND="
+ dev-lang/ocaml:=[ocamlopt?]
+ dev-ml/ppx_tools:=
+ dev-ml/cppo:=
+"
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND}
+ test? ( dev-ml/ounit dev-ml/ppx_deriving )
+ dev-ml/ocamlbuild
+ dev-ml/findlib
+"
+
+src_compile() {
+ cp pkg/META.in pkg/META
+ ocaml pkg/build.ml \
+ native=$(usex ocamlopt true false) \
+ native-dynlink=$(usex ocamlopt true false) \
+ || die
+}
+
+src_test() {
+ ocamlbuild -classic-display -use-ocamlfind src_test/test_ppx_import.byte -- || die
+}
diff --git a/dev-ml/ppx_inline_test-0.9.2 b/dev-ml/ppx_inline_test-0.9.2
deleted file mode 100644
index ca385cbbf6b0..000000000000
--- a/dev-ml/ppx_inline_test-0.9.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=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-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=Syntax extension for writing in-line tests in ocaml code
-EAPI=6
-HOMEPAGE=https://github.com/janestreet/ppx_inline_test
-KEYWORDS=~amd64
-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 24b4a2529c1fd12f1304856d6c5a690d
-_md5_=23e500527a4d90eb7bd226d64561078a
diff --git a/dev-ml/ppx_inline_test/Manifest b/dev-ml/ppx_inline_test/Manifest
new file mode 100644
index 000000000000..a5e38642f6e5
--- /dev/null
+++ b/dev-ml/ppx_inline_test/Manifest
@@ -0,0 +1,3 @@
+DIST ppx_inline_test-0.9.2.tar.gz 19280 BLAKE2B 3cd354f27c69bc4fdd29b6a8b0637a08f247774127512886341ec04b8957bd2a66ed6bbfad95d1a529e4c670c815bdbfbfb80ecb9c6e02949a8d34d938d515c3 SHA512 39261a51201b2b7fbd6f4f53c72b2921da9f5a47f726479f65f976ed3979630f0a8587328f4536e42d24315d341afbe2770084ffd951569564a3145cd154be5f
+EBUILD ppx_inline_test-0.9.2.ebuild 616 BLAKE2B 0342fcbaade3e899a698527ff2f25b45ab52efa5b338e39dd3bedc7753ef282ef7dfbc292d60b309b5f0235086ec6cf080da8ca915c3b5ce3c8b787ffb3f2c07 SHA512 b89457983098553cfa2064f0300915aa65ed3291226ae8014b023ca3268f66a783629d899984bbc643fafcfa6ea96812b7be177e8978e1482a849e57245aaf75
+MISC metadata.xml 338 BLAKE2B e65e0221925afc5a20620a9fdc8450b9267310a7191d6342f7297f15db939e91ab867af9dc1bd2d524d3ed9a7ce611466eb2b92d85e3761434961a70f9e10768 SHA512 282495b1970f305ac6ca3451996d44834cdc69ff43cd573cafa5644f62fd65e78774e5bb480c1943be44f249d852051e590b71e55607ea34784ece6b3b3c0c71
diff --git a/dev-ml/ppx_inline_test/metadata.xml b/dev-ml/ppx_inline_test/metadata.xml
new file mode 100644
index 000000000000..94f757c17e58
--- /dev/null
+++ b/dev-ml/ppx_inline_test/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">janestreet/ppx_inline_test</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/ppx_inline_test/ppx_inline_test-0.9.2.ebuild b/dev-ml/ppx_inline_test/ppx_inline_test-0.9.2.ebuild
new file mode 100644
index 000000000000..16f96131b7a0
--- /dev/null
+++ b/dev-ml/ppx_inline_test/ppx_inline_test-0.9.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit opam
+
+DESCRIPTION="Syntax extension for writing in-line tests in ocaml code"
+HOMEPAGE="https://github.com/janestreet/ppx_inline_test"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+ 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:=
+"
+
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND} dev-ml/jbuilder"
diff --git a/dev-ml/ppx_jane-0.9.0 b/dev-ml/ppx_jane-0.9.0
deleted file mode 100644
index 5f80766b78a5..000000000000
--- a/dev-ml/ppx_jane-0.9.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=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-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=Standard Jane Street ppx rewriters
-EAPI=6
-HOMEPAGE=https://github.com/janestreet/ppx_jane
-KEYWORDS=~amd64
-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 24b4a2529c1fd12f1304856d6c5a690d
-_md5_=0d947eb68cb8c2fe3a9358b43cf40433
diff --git a/dev-ml/ppx_jane/Manifest b/dev-ml/ppx_jane/Manifest
new file mode 100644
index 000000000000..efbc40f7c6ff
--- /dev/null
+++ b/dev-ml/ppx_jane/Manifest
@@ -0,0 +1,3 @@
+DIST ppx_jane-0.9.0.tar.gz 5831 BLAKE2B 0eda7b2a71c7e80d7febea6f204aaf7ccebff321f14a423bfe289fd3144251aeba0c3a15db360cd0732196900cdf3eeb5860db14fd001215bdc29e6471c94c52 SHA512 18b09c060519b94013c78ef4673ec7c26f465453391c6ad2ea3235b6f8e23208879c5d4e69dc01915cfb694b23171397af5e4b7208556a369d191c081c86fc2a
+EBUILD ppx_jane-0.9.0.ebuild 914 BLAKE2B 90861ed5244a66337830c60af25416d604ade64d346fa9cc7d2c6b7b47969318fdaa4895e762672e42e88e2c78fc8fce2ca4fcc6c9cee6ab38da919581bbcfc5 SHA512 9196f84ca6064327fe9037cdabe62ccda2a36a930a6a00d149e98eae297adad026a60e2e3cabd7f24900b303d9f48e048eaca6fb07040ba7a88c5be15f3de211
+MISC metadata.xml 331 BLAKE2B bd68a1724d7753671c2598d833df28ed747a506b9e356980fd5445d3aa5ee6521fa0469032bf0be9e41a2ea6561f7dd8e2fdd5d0771d335d0ce6eccc752e71a3 SHA512 bfe96d651d1fc0ec1b7fd6bdf66485f82c03b4a49df689e9de1d4832938dd3f0b91573bd665811077e0b4d54c9f76b4c63b93897076564be31eab4c98776e4b6
diff --git a/dev-ml/ppx_jane/metadata.xml b/dev-ml/ppx_jane/metadata.xml
new file mode 100644
index 000000000000..3444626a0ff7
--- /dev/null
+++ b/dev-ml/ppx_jane/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">janestreet/ppx_jane</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/ppx_jane/ppx_jane-0.9.0.ebuild b/dev-ml/ppx_jane/ppx_jane-0.9.0.ebuild
new file mode 100644
index 000000000000..4daefb2677a4
--- /dev/null
+++ b/dev-ml/ppx_jane/ppx_jane-0.9.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit opam
+
+DESCRIPTION="Standard Jane Street ppx rewriters"
+HOMEPAGE="https://github.com/janestreet/ppx_jane"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+ 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:=
+"
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND} dev-ml/jbuilder"
diff --git a/dev-ml/ppx_js_style-0.9.0 b/dev-ml/ppx_js_style-0.9.0
deleted file mode 100644
index 43ec3c622d8e..000000000000
--- a/dev-ml/ppx_js_style-0.9.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_metaquot:= dev-ml/ocaml-migrate-parsetree:= dev-ml/octavius:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=Code style checker for Jane Street Packages
-EAPI=6
-HOMEPAGE=https://github.com/janestreet/ppx_js_style
-KEYWORDS=~amd64 ~ppc ~x86
-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 24b4a2529c1fd12f1304856d6c5a690d
-_md5_=2c76d118f31c13292ce2ccc5461e0f61
diff --git a/dev-ml/ppx_js_style/Manifest b/dev-ml/ppx_js_style/Manifest
new file mode 100644
index 000000000000..99442da70b22
--- /dev/null
+++ b/dev-ml/ppx_js_style/Manifest
@@ -0,0 +1,3 @@
+DIST ppx_js_style-0.9.0.tar.gz 8182 BLAKE2B e2c4bffb07882d49f3839b2a402e2617b9e19147a0d4ff4c7aa4fb4a350d2208eccd76ec64828c4d56edce8f811c462396aa805ca3440b93ba22790d59c8dd23 SHA512 9790223a2d8f6db090cfa4d7ff3d3d1c8a22b07863dd3c5674216836b23cfdb3b014ebc092e173ddfe725ccf73fc7830a8a88effab1df9d80875f918b9558051
+EBUILD ppx_js_style-0.9.0.ebuild 582 BLAKE2B 53c693c0bfdf52c14b48e4e60bc5ea791ff7c416b4bb60e45aed57ef15624e07fb2a60a2caaeaca0461d3093fdbdb3678540587654b5669bce40e92f90213d09 SHA512 c6a9d80217ae323e284be7244f38955495a852168de81c5e9137d1a470f2e8ab5b2e670c37bf88fcc8f7953a56b4fba17d7854bfcad101bd5964055d3f2f528d
+MISC metadata.xml 335 BLAKE2B 0d29994d7d7ca3c159264f75ba89f9774d8c59be7aa27f44bc18d1a0d21d6ed909e2f66f9c22931f463ba5ddf2d4144f986cfbc9d3a357eb8a0135eb339c268a SHA512 a8b814146208b31af8c1b4ba22b9eeb9461ab218b192910eafb0cd3ff6b2c734e9c14d7b4d52845e5338e7def081674d3c9fabbf7bd085648f9e9800a933bc5c
diff --git a/dev-ml/ppx_js_style/metadata.xml b/dev-ml/ppx_js_style/metadata.xml
new file mode 100644
index 000000000000..36b1bbb4dbed
--- /dev/null
+++ b/dev-ml/ppx_js_style/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">janestreet/ppx_js_style</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/ppx_js_style/ppx_js_style-0.9.0.ebuild b/dev-ml/ppx_js_style/ppx_js_style-0.9.0.ebuild
new file mode 100644
index 000000000000..4e4459887d20
--- /dev/null
+++ b/dev-ml/ppx_js_style/ppx_js_style-0.9.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit opam
+
+DESCRIPTION="Code style checker for Jane Street Packages"
+HOMEPAGE="https://github.com/janestreet/ppx_js_style"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="
+ dev-ml/ppx_core:=
+ dev-ml/ppx_driver:=
+ dev-ml/ppx_metaquot:=
+ dev-ml/ocaml-migrate-parsetree:=
+ dev-ml/octavius:=
+ "
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND} dev-ml/jbuilder"
diff --git a/dev-ml/ppx_let-0.9.0 b/dev-ml/ppx_let-0.9.0
deleted file mode 100644
index c943c560c83e..000000000000
--- a/dev-ml/ppx_let-0.9.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ocaml-migrate-parsetree:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=Monadic let-bindings
-EAPI=6
-HOMEPAGE=https://github.com/janestreet/ppx_let
-KEYWORDS=~amd64
-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 24b4a2529c1fd12f1304856d6c5a690d
-_md5_=bfa40a81a5c7944f7e5c9ec28e6b46cb
diff --git a/dev-ml/ppx_let/Manifest b/dev-ml/ppx_let/Manifest
new file mode 100644
index 000000000000..d88d565f0f98
--- /dev/null
+++ b/dev-ml/ppx_let/Manifest
@@ -0,0 +1,3 @@
+DIST ppx_let-0.9.0.tar.gz 9245 BLAKE2B 827efa86db6981416c07205bf520d750dea6b6a2f1789faaeb59fcc7ddff78470e9670c471c5c3e5b6929181149404b86e3bbe6e67ffa2946895a7d464079316 SHA512 545cdf341dafaab958e1dfec476f3a714ae5899dea3775ace443e36fe4d55136489ae376f2394dbecdcbcb4dbc66e41a1de147b2774c9a0c7508b827acba4250
+EBUILD ppx_let-0.9.0.ebuild 501 BLAKE2B a5327ddf65cce332852580b7285cb60dca6ae3a63c76be094eb0481416beb45ab3084432c3e2b19ee5aa6010280e4d7e88625498f99733c6244b9f63ea186210 SHA512 35320c9a364d3113ab5dd7b9b3ccd204c61f6960bf0bbdfe6c76173a2ff81109d47f4852e13b3ca8560e7bc6d22b8518f8308d315e205f438f69a996bad95ddb
+MISC metadata.xml 330 BLAKE2B b105840f218d73859fec1c5ab13d6c9e3b71b9302212bffcd3b4c78c1c3e4783435dd908fd00c865c124c3876a7d9b8626a268b9d2ab8cb6dbb44ecda48e514a SHA512 d296f6c0dfd7e26da009cbd9da4f13c4604e14abac426f992ee01d1ab3f251d4a73f3d72ce9f7342bbfa191ced21eac3ee7edcfff39cf2f96fe4f194228a402a
diff --git a/dev-ml/ppx_let/metadata.xml b/dev-ml/ppx_let/metadata.xml
new file mode 100644
index 000000000000..8f6a83e43446
--- /dev/null
+++ b/dev-ml/ppx_let/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">janestreet/ppx_let</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/ppx_let/ppx_let-0.9.0.ebuild b/dev-ml/ppx_let/ppx_let-0.9.0.ebuild
new file mode 100644
index 000000000000..9dc54d315fe3
--- /dev/null
+++ b/dev-ml/ppx_let/ppx_let-0.9.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit opam
+
+DESCRIPTION="Monadic let-bindings"
+HOMEPAGE="https://github.com/janestreet/ppx_let"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+ dev-ml/ppx_core:=
+ dev-ml/ppx_driver:=
+ dev-ml/ocaml-migrate-parsetree:=
+"
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND} dev-ml/jbuilder"
diff --git a/dev-ml/ppx_metaquot-0.9.0 b/dev-ml/ppx_metaquot-0.9.0
deleted file mode 100644
index 29939c8d148e..000000000000
--- a/dev-ml/ppx_metaquot-0.9.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_traverse_builtins:= dev-ml/ocaml-migrate-parsetree:= <dev-ml/ppx_core-100 dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=Write OCaml AST fragment using OCaml syntax
-EAPI=6
-HOMEPAGE=https://github.com/janestreet/ppx_metaquot
-KEYWORDS=~amd64 ~ppc ~x86
-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 24b4a2529c1fd12f1304856d6c5a690d
-_md5_=b48d9680cabd3835456dd060028f00fc
diff --git a/dev-ml/ppx_metaquot/Manifest b/dev-ml/ppx_metaquot/Manifest
new file mode 100644
index 000000000000..729a63b9275b
--- /dev/null
+++ b/dev-ml/ppx_metaquot/Manifest
@@ -0,0 +1,3 @@
+DIST ppx_metaquot-0.9.0.tar.gz 6801 BLAKE2B b5629da4c2460ed064e614e0051bd104fd731526498ffd085a75039672c186f314918c4c355a9dacfee7982c06b338950de0a670b27bd061e19b688a21693c08 SHA512 7645f02f964f2a33836f947a725384f95c7724dcd88c031aa3dd2d255127a21d473e19ff77cb917f845930ab44541a4698becf56721cc1a0a0eee5912947cd22
+EBUILD ppx_metaquot-0.9.0.ebuild 594 BLAKE2B f71b7eb1e1bb1603f15582c62e35ea6da4f9d9bcddb4f875e324f3e4fd080bfc1415a86bc8e1baa3e10917d8333cc16d5bfbd12e27cff776801d15cef2dc2a69 SHA512 78cc5d4fd248e0a277e61b34e0c85fbb700f5cedf4eabe331995a185a13747fe9fe66457edac74c97367d6d519359a939f547fa9dd0b08b0d1b5c5afbc1c2d1d
+MISC metadata.xml 335 BLAKE2B ff4e6872b981bae944a92b8741855871ac32fa926c976a012d48c8984c54bcfb9984fde268aea58c3efede44bdfd4476efb50b8b9972d06b563180ca1b7ebfb8 SHA512 a4d14e881ec67436fa519f5a937bd9a496d88647a0ef4ce1748c8d04092b30aa08b8b670f07a1ef0e2df27200a56442b6fd03d252c4e83997dc261d1cb526dc7
diff --git a/dev-ml/ppx_metaquot/metadata.xml b/dev-ml/ppx_metaquot/metadata.xml
new file mode 100644
index 000000000000..a5d8e36c3aa4
--- /dev/null
+++ b/dev-ml/ppx_metaquot/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">janestreet/ppx_metaquot</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/ppx_metaquot/ppx_metaquot-0.9.0.ebuild b/dev-ml/ppx_metaquot/ppx_metaquot-0.9.0.ebuild
new file mode 100644
index 000000000000..2cf71db77f80
--- /dev/null
+++ b/dev-ml/ppx_metaquot/ppx_metaquot-0.9.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit opam
+
+DESCRIPTION="Write OCaml AST fragment using OCaml syntax"
+HOMEPAGE="https://github.com/janestreet/ppx_metaquot"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="
+ dev-ml/ppx_core:=
+ dev-ml/ppx_driver:=
+ dev-ml/ppx_traverse_builtins:=
+ dev-ml/ocaml-migrate-parsetree:=
+ <dev-ml/ppx_core-100
+ "
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND} dev-ml/jbuilder"
diff --git a/dev-ml/ppx_optcomp-0.9.0-r3 b/dev-ml/ppx_optcomp-0.9.0-r3
deleted file mode 100644
index 354809ea9bad..000000000000
--- a/dev-ml/ppx_optcomp-0.9.0-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-ml/ppx_core:= dev-ml/stdio:= dev-ml/ocaml-migrate-parsetree:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=Optional compilation for OCaml
-EAPI=6
-HOMEPAGE=https://github.com/janestreet/ppx_optcomp
-KEYWORDS=~amd64 ~ppc ~x86
-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 24b4a2529c1fd12f1304856d6c5a690d
-_md5_=a9c5ecff4f30e97f0ce2a20248452e78
diff --git a/dev-ml/ppx_optcomp/Manifest b/dev-ml/ppx_optcomp/Manifest
new file mode 100644
index 000000000000..3ff880aab1ae
--- /dev/null
+++ b/dev-ml/ppx_optcomp/Manifest
@@ -0,0 +1,3 @@
+DIST ppx_optcomp-0.9.0.tar.gz 14611 BLAKE2B 6fc431fd3ed173835a48814718a05b3ae619f182f4c008415dba77c88bfeab780e6fc49c4faed2ee4e362b6a151544b1a707651dcbfdbfcdce979a2a3d6d6c02 SHA512 ce4a5049045458533b783b99b7569e72e074bd425a81315d43fcab26dbc2a4b141cfda2b2365c69b3d0251f2bf0b8c8f0d14fc8883f1a0f4edae824776565a9c
+EBUILD ppx_optcomp-0.9.0-r3.ebuild 526 BLAKE2B 78ff4bbfdf7781a0ba8a6b6a5fd0b6f2b432c3f247d056a34a3ad4a2fd11fcb139b3d6ad46e166896f492fda9367fcbc0cc8180d5bbbac243cfa75e7ba5c4b99 SHA512 e61daab3a1868d7348ff05977bef647f6be54c4883789265f38dccfb3b8d9311b3c3599c59fa374ee8945454baf91634fa859ed060e04cb98457543aabdde967
+MISC metadata.xml 334 BLAKE2B 40536899fd47128486c8f676fe1963c6e2de64f1e6017de8945f46325c62118db6642abd6488068fca163006fe31fd5bf684768feb62ddbae7ef75cea119342b SHA512 65cf194ca0b988ab6f13026930011318c27efdeae8dde0bf54e0262334d290b540a9f19cf4476cc7f2a6920c89bb501d20ad9cba8acb1cc10a01f9a124b43236
diff --git a/dev-ml/ppx_optcomp/metadata.xml b/dev-ml/ppx_optcomp/metadata.xml
new file mode 100644
index 000000000000..0567d88d5830
--- /dev/null
+++ b/dev-ml/ppx_optcomp/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">janestreet/ppx_optcomp</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/ppx_optcomp/ppx_optcomp-0.9.0-r3.ebuild b/dev-ml/ppx_optcomp/ppx_optcomp-0.9.0-r3.ebuild
new file mode 100644
index 000000000000..698b92bbb14c
--- /dev/null
+++ b/dev-ml/ppx_optcomp/ppx_optcomp-0.9.0-r3.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit opam
+
+DESCRIPTION="Optional compilation for OCaml"
+HOMEPAGE="https://github.com/janestreet/ppx_optcomp"
+SRC_URI="https://github.com/janestreet/ppx_optcomp/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="
+ dev-ml/ppx_core:=
+ dev-ml/stdio:=
+ dev-ml/ocaml-migrate-parsetree:=
+"
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND} dev-ml/jbuilder"
diff --git a/dev-ml/ppx_optional-0.9.0 b/dev-ml/ppx_optional-0.9.0
deleted file mode 100644
index 94d2e02d3fbd..000000000000
--- a/dev-ml/ppx_optional-0.9.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_metaquot:= dev-ml/ocaml-migrate-parsetree:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=Pattern matching on flat options
-EAPI=6
-HOMEPAGE=https://github.com/janestreet/ppx_optional
-KEYWORDS=~amd64
-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 24b4a2529c1fd12f1304856d6c5a690d
-_md5_=5dd1adaf06b098bdf0a2da2f1f53866a
diff --git a/dev-ml/ppx_optional/Manifest b/dev-ml/ppx_optional/Manifest
new file mode 100644
index 000000000000..f78f19e971cf
--- /dev/null
+++ b/dev-ml/ppx_optional/Manifest
@@ -0,0 +1,3 @@
+DIST ppx_optional-0.9.0.tar.gz 6940 BLAKE2B 28b9ab2b8cc20f295e927533ff9eed694289987914105758d3c014d06064bd21016d44bc7ad72b331a4c887848ed9c2dd75a0a48b6d5f330de898087596d1cc3 SHA512 c341bc8e64b7caf7af5c878747697330db84b14959f22930dd6919cc861dce847983771cbad2ed7800ab8c64704e88fa0d8db3ca7c8f2924bf785a4dccd17fa0
+EBUILD ppx_optional-0.9.0.ebuild 541 BLAKE2B eaead536ee9b791dcf1ea8c4b43a37f9bda86598dc02a5c76c213af082eedcb7ec99033783fb5c1345b8ad5c38edbaa8da148bedbaa3b11c550f8fed6f73304e SHA512 3f085f451459dfa4f66fe38d85f5288adf02d16d939a080686d83d7bbed4b839aa2f9ec73b37c09718c9158b3f86259ae893e7d6a98469bcd21b6eba0d158dc9
+MISC metadata.xml 335 BLAKE2B ece3bb57bcbb7d55f3a0007deb2bb6443533b1ac72a2ae6cc4e81aa61fd199a5e6c749aff9abfcdca6af4b3f713999299d4f6db1d654abbc870c63547f22b5ed SHA512 f744f3a7baf77bec288c64156d624c46e1d93e40f0dcff8d2a11e3f2981717f4043c49a5af2acb4118b46557e41f35f940923196b03d3ddc5021e0d65c3f849f
diff --git a/dev-ml/ppx_optional/metadata.xml b/dev-ml/ppx_optional/metadata.xml
new file mode 100644
index 000000000000..548e15439c5d
--- /dev/null
+++ b/dev-ml/ppx_optional/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">janestreet/ppx_optional</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/ppx_optional/ppx_optional-0.9.0.ebuild b/dev-ml/ppx_optional/ppx_optional-0.9.0.ebuild
new file mode 100644
index 000000000000..55a77ef14936
--- /dev/null
+++ b/dev-ml/ppx_optional/ppx_optional-0.9.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit opam
+
+DESCRIPTION="Pattern matching on flat options"
+HOMEPAGE="https://github.com/janestreet/ppx_optional"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+ dev-ml/ppx_core:=
+ dev-ml/ppx_driver:=
+ dev-ml/ppx_metaquot:=
+ dev-ml/ocaml-migrate-parsetree:=
+"
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND} dev-ml/jbuilder"
diff --git a/dev-ml/ppx_pipebang-0.9.0 b/dev-ml/ppx_pipebang-0.9.0
deleted file mode 100644
index 49a79f8b0421..000000000000
--- a/dev-ml/ppx_pipebang-0.9.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_metaquot:= dev-ml/ocaml-migrate-parsetree:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=A ppx rewriter that inlines reverse application operators |> and |!
-EAPI=6
-HOMEPAGE=https://github.com/janestreet/ppx_pipebang
-KEYWORDS=~amd64
-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 24b4a2529c1fd12f1304856d6c5a690d
-_md5_=7da0c4090a518ede339e19e9aafb644f
diff --git a/dev-ml/ppx_pipebang/Manifest b/dev-ml/ppx_pipebang/Manifest
new file mode 100644
index 000000000000..dc5bc3253cfc
--- /dev/null
+++ b/dev-ml/ppx_pipebang/Manifest
@@ -0,0 +1,3 @@
+DIST ppx_pipebang-0.9.0.tar.gz 5964 BLAKE2B ce001d207a59b1e99f7a023c2823d1b90233762147ad377aa54f7c771041e77081f7f9b05a0f36cb9a2f6379622a9686fa5bad8974d7707dc0b22b3c704edac6 SHA512 d0e82152d257f7214e577e37046877a9c4129c6a9fd79f83912c6335455add4302d927e70117a1e9386c448686d271a7596b3fd2ef0b5f2bda8010cbb9157751
+EBUILD ppx_pipebang-0.9.0.ebuild 576 BLAKE2B b3cdc15a04f75c3179a4d6acbb7438cc3ca5eab44521170228f13979c502630f81e1daa366e26611d7fe1971b1941bec8c357b538e00b2bc695e7a6c06e41afe SHA512 d0b26da06387b21925fdc0bd9c878fd04d9182c564633af13413d6739a6150113ada6da608b587bb95e90bb9d3e2b0c72011b96e0cbab725efba6e555938f7c7
+MISC metadata.xml 335 BLAKE2B 5c92b1b6d66e29120106b7d93b4ccd88ff914e78ea14d893a56b9066ebd21c17ffd96a4f49434b52090f9376f39001a9e00eb9453eb49ac2af86d719b8d946f9 SHA512 fd7bee7ef933dbfff2beed9fe57cd563672c653853819fb282366f650357a9efaca9e7059d63f5e9c556756aa2971e2d1f9076d193f0cb956f479e285bb2d590
diff --git a/dev-ml/ppx_pipebang/metadata.xml b/dev-ml/ppx_pipebang/metadata.xml
new file mode 100644
index 000000000000..79ec5fb425af
--- /dev/null
+++ b/dev-ml/ppx_pipebang/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">janestreet/ppx_pipebang</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/ppx_pipebang/ppx_pipebang-0.9.0.ebuild b/dev-ml/ppx_pipebang/ppx_pipebang-0.9.0.ebuild
new file mode 100644
index 000000000000..bb9d37ac7a3a
--- /dev/null
+++ b/dev-ml/ppx_pipebang/ppx_pipebang-0.9.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit opam
+
+DESCRIPTION="A ppx rewriter that inlines reverse application operators |> and |!"
+HOMEPAGE="https://github.com/janestreet/ppx_pipebang"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+ dev-ml/ppx_core:=
+ dev-ml/ppx_driver:=
+ dev-ml/ppx_metaquot:=
+ dev-ml/ocaml-migrate-parsetree:=
+"
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND} dev-ml/jbuilder"
diff --git a/dev-ml/ppx_sexp_conv-0.9.0-r1 b/dev-ml/ppx_sexp_conv-0.9.0-r1
deleted file mode 100644
index 7159016e897d..000000000000
--- a/dev-ml/ppx_sexp_conv-0.9.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=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-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=Support Library for type-driven code generators
-EAPI=6
-HOMEPAGE=https://github.com/janestreet/ppx_sexp_conv
-KEYWORDS=~amd64 ~ppc ~x86
-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 24b4a2529c1fd12f1304856d6c5a690d
-_md5_=e35c4add784e5c4d871a691fc4cd8ead
diff --git a/dev-ml/ppx_sexp_conv/Manifest b/dev-ml/ppx_sexp_conv/Manifest
new file mode 100644
index 000000000000..8a622b6f08aa
--- /dev/null
+++ b/dev-ml/ppx_sexp_conv/Manifest
@@ -0,0 +1,3 @@
+DIST ppx_sexp_conv-0.9.0.tar.gz 28000 BLAKE2B 2536d3ddbd4ee83baf9eade208983ce9856318079e29da9858838c985b904a7e2e1c6e3ea06bd1360cc17e619f1e952634554e89b294dd00981934679b384c3f SHA512 af3d28a3cdb7c796549a2598c218f69a69d58da715ef2d16077c3adeb22823fa7bec6bc0d8cb6caaf2a0adb56dfcb39d667975959251fb310b69d6abe8302845
+EBUILD ppx_sexp_conv-0.9.0-r1.ebuild 672 BLAKE2B b69d608e4a8ed118085afff45f91d08621b302d08a87b06f2dd6fffb75f799f58352906c3e65519aa3f3f66348f151c1fbb0c289877e24b018f35809b932da1c SHA512 e5eb7f825efaecb7d4dc53e854e3d97eab0b89cd08c2cb9640b19082cb7d2e7aadf8a27a7a3de610ad4216a642fbb908c9249dd4aa7e8f2f57f19b30bdadca83
+MISC metadata.xml 336 BLAKE2B 44d3e80050093eb93baf425568ea0f4bc55c86931b0ed6422945c60cfdd10ebd6fe37998c94ed60e844ddccb876353f51e63385f783512fb8950e67b66c88d34 SHA512 88ef4d5c81b2b79d53153e588c8ddf456cfc53bfe22c8532669e2c9ace9bd43c322a0d28df32c6f293c455027f4386f554bc50a27d55b605f8785e67a7a7e1e0
diff --git a/dev-ml/ppx_sexp_conv/metadata.xml b/dev-ml/ppx_sexp_conv/metadata.xml
new file mode 100644
index 000000000000..6f04a3b61755
--- /dev/null
+++ b/dev-ml/ppx_sexp_conv/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">janestreet/ppx_sexp_conv</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.9.0-r1.ebuild b/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.9.0-r1.ebuild
new file mode 100644
index 000000000000..9dedc0888a68
--- /dev/null
+++ b/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.9.0-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit opam
+
+DESCRIPTION="Support Library for type-driven code generators"
+HOMEPAGE="https://github.com/janestreet/ppx_sexp_conv"
+SRC_URI="https://github.com/janestreet/ppx_sexp_conv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="
+ 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:=
+ "
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND} dev-ml/jbuilder"
diff --git a/dev-ml/ppx_sexp_message-0.9.0 b/dev-ml/ppx_sexp_message-0.9.0
deleted file mode 100644
index 151b74580ce5..000000000000
--- a/dev-ml/ppx_sexp_message-0.9.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=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-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=A ppx rewriter for easy construction of s-expressions
-EAPI=6
-HOMEPAGE=https://github.com/janestreet/ppx_sexp_message
-KEYWORDS=~amd64
-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 24b4a2529c1fd12f1304856d6c5a690d
-_md5_=f381bdbc035f18f7fdab24cb4a9e13c8
diff --git a/dev-ml/ppx_sexp_message/Manifest b/dev-ml/ppx_sexp_message/Manifest
new file mode 100644
index 000000000000..5c381bf2fa5c
--- /dev/null
+++ b/dev-ml/ppx_sexp_message/Manifest
@@ -0,0 +1,3 @@
+DIST ppx_sexp_message-0.9.0.tar.gz 8965 BLAKE2B df59ff7f598a7ff19a16829addbc5b49f2e7dfb2b30aab43f5d220f6d45f625750ca1d63eba3187b09d494a2c06af642c2a2e4d581c6a247440ba06d6f46dae0 SHA512 38a376b23372b8699fef76085ad2ead7b5fb34b823b0c7e3e52ac90654133a44429d7a3383197b78c8f01a7b64753ce424d5138b8aef596d236ce9c798ec1887
+EBUILD ppx_sexp_message-0.9.0.ebuild 627 BLAKE2B 85780c5fd9fca2ea855128218368f7440e3c1f82495521df568bc9e5f2585362eeeb3f9623468f67b15f701b72d36ccf445464cd65d2dec8d55a6dba95041e88 SHA512 4f8d7cff0f326aab6e58498a151bc8404861a8e00de01d821e1654b8aefd6f2a9cc4d9b059a9c5954815aadf12d202dd6c9eb7bd052d53fbc71efa8454ac7157
+MISC metadata.xml 339 BLAKE2B ed529400d826684243d2d04ff13648a81d7292629d15b65a6a3ed1f70d5b4af15226282eb3d9a5c01905f20de13352abc0c8597fd971bb7678bbebede8f0878a SHA512 fc77dc60d3b39dd2751de70975b975d3d25a55fc9dcde6baf1f64a7162c1c604241822cb9d24583880b3f17a835a34ac1317099a5c82496766b57829e68f550a
diff --git a/dev-ml/ppx_sexp_message/metadata.xml b/dev-ml/ppx_sexp_message/metadata.xml
new file mode 100644
index 000000000000..182439ccf79e
--- /dev/null
+++ b/dev-ml/ppx_sexp_message/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">janestreet/ppx_sexp_message</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/ppx_sexp_message/ppx_sexp_message-0.9.0.ebuild b/dev-ml/ppx_sexp_message/ppx_sexp_message-0.9.0.ebuild
new file mode 100644
index 000000000000..d240e9c58a7c
--- /dev/null
+++ b/dev-ml/ppx_sexp_message/ppx_sexp_message-0.9.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit opam
+
+DESCRIPTION="A ppx rewriter for easy construction of s-expressions"
+HOMEPAGE="https://github.com/janestreet/ppx_sexp_message"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+ 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:=
+"
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND} dev-ml/jbuilder"
diff --git a/dev-ml/ppx_sexp_value-0.9.0 b/dev-ml/ppx_sexp_value-0.9.0
deleted file mode 100644
index 0d16679a2ec7..000000000000
--- a/dev-ml/ppx_sexp_value-0.9.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=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-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=Standard library for ppx rewriters
-EAPI=6
-HOMEPAGE=https://github.com/janestreet/ppx_sexp_value
-KEYWORDS=~amd64
-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 24b4a2529c1fd12f1304856d6c5a690d
-_md5_=31666963ef78f649771038191855c3f6
diff --git a/dev-ml/ppx_sexp_value/Manifest b/dev-ml/ppx_sexp_value/Manifest
new file mode 100644
index 000000000000..91fd72fd06c9
--- /dev/null
+++ b/dev-ml/ppx_sexp_value/Manifest
@@ -0,0 +1,3 @@
+DIST ppx_sexp_value-0.9.0.tar.gz 10666 BLAKE2B db3f3bc626b00dd6bf6c1ab1afedfd581ec48689307c1ad52767b0aa64d5c36a10556b37ac3e2e2fecf1eb5230ab1e049f458ff3c8c039cf789146f1458dbf2a SHA512 7dcb8f70a7938d26fc5a1afea2bf5e77c4996d8e82720206ab9e5a462a59182dcedfbfede49ed83ed50f2683776b75fb5bae00c53fc451b03f6a33e126566e84
+EBUILD ppx_sexp_value-0.9.0.ebuild 606 BLAKE2B 90de0d943c0e9d0c8301d3ceb36d3cdd7d57c7b1bbb1bd79b167b3a69923b3737eb2a954ff3b4e64136595feed121f789ae7fe9611c78f4ea41d638717da6806 SHA512 5a2ff310c079ae90f881e79978d907f001e7b5c0a025a20c0740d696c6c949e6fed1b67a9419279a51c97ba440ad87ae9ad50df107ba472cba81fa34e5530ee1
+MISC metadata.xml 337 BLAKE2B a574db99f8e96ac8782f95caec6ce7ab73aa2cfd9613a662d170ab5b3910afaac214776a07939fdbb161671240b53ac0de1034b5376006d40bbfc6d7ce58107d SHA512 b7e6c3c4307dc7902036b20a228bde3a48ee9f02a6acc63ac2ff79547897f2526d71955bb8d1f35cd4cde78023aa19effbe8158d4a8177c806cecf3eb514636b
diff --git a/dev-ml/ppx_sexp_value/metadata.xml b/dev-ml/ppx_sexp_value/metadata.xml
new file mode 100644
index 000000000000..9291357d010b
--- /dev/null
+++ b/dev-ml/ppx_sexp_value/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">janestreet/ppx_sexp_value</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/ppx_sexp_value/ppx_sexp_value-0.9.0.ebuild b/dev-ml/ppx_sexp_value/ppx_sexp_value-0.9.0.ebuild
new file mode 100644
index 000000000000..5418fe3f3637
--- /dev/null
+++ b/dev-ml/ppx_sexp_value/ppx_sexp_value-0.9.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit opam
+
+DESCRIPTION="Standard library for ppx rewriters"
+HOMEPAGE="https://github.com/janestreet/ppx_sexp_value"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+ 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:=
+"
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND} dev-ml/jbuilder"
diff --git a/dev-ml/ppx_tools-5.0.4.03.0 b/dev-ml/ppx_tools-5.0.4.03.0
deleted file mode 100644
index 05812c64292a..000000000000
--- a/dev-ml/ppx_tools-5.0.4.03.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=>=dev-lang/ocaml-4.03.0:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Tools for authors of ppx rewriters
-EAPI=5
-HOMEPAGE=https://github.com/alainfrisch/ppx_tools
-IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
-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 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=19bc294b0f7923cfef422d2c35425091
diff --git a/dev-ml/ppx_tools-5.0.4.05.0 b/dev-ml/ppx_tools-5.0.4.05.0
deleted file mode 100644
index 5dd2f132dc07..000000000000
--- a/dev-ml/ppx_tools-5.0.4.05.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=>=dev-lang/ocaml-4.05_beta:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Tools for authors of ppx rewriters
-EAPI=5
-HOMEPAGE=https://github.com/alainfrisch/ppx_tools
-IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
-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 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=c193ba9c6fdd8bf0a266528231a15eb2
diff --git a/dev-ml/ppx_tools/Manifest b/dev-ml/ppx_tools/Manifest
new file mode 100644
index 000000000000..e7a8d37c97e2
--- /dev/null
+++ b/dev-ml/ppx_tools/Manifest
@@ -0,0 +1,6 @@
+AUX ocaml404.patch 2031 BLAKE2B 02341fa3b292d713995f95d76f1b47970b9ff34d8b177212074c0a3c027aff1d0f27a0e3e7f03b8131904a28d285f9cc4b7b795e62327ad2da7c29f1b74240da SHA512 507bda106d25a92718aae1b0e95103d481cbe18624f80a59af6b3e884594c1d18b0c15b51f014b1af39b09a5264272f92ee8d18dcca37e7595964f85241c141a
+DIST ppx_tools-5.0.4.03.0.tar.gz 17209 BLAKE2B bd51e5b2482a9eab09bf9a02ac0231fa7bbc721d54a932e6cfdc1d719c106eca0fe90563b636601110e796fab439f6c6d7fccd5d2920f5bcb3c115f622d90381 SHA512 d1867b084885704757f390b6f6ca8b5d7702f0476149d99ea227f98230ab35d57f5c4aa779881231a0a77cfd1861255118fa2551a49ab85553f63e9aab9baae4
+DIST ppx_tools-5.0.4.05.0.tar.gz 17893 BLAKE2B 0902f53ef19338396cf2a2319a4c2d4b7bbbfb66bbfd0fb2290c29ecebcda02ff90d2f0d0221b08d027c41c863c2bc0a02c50363d83474864c08e619641b7ad6 SHA512 33b4420500a2b5880e770f8fdf2b37ef08e52ff84f96f955c6321492de906568979feccb1b2b477b1117619ba28edd8d3e0f178c5684f0dc43c6ed56266c4d64
+EBUILD ppx_tools-5.0.4.03.0.ebuild 813 BLAKE2B 1f5897d4905c89e741e5fca93d922e81113a5ce26e376c9eb95fc298ae77c15308af7133645e895d473ba75259760f1f509ec205a2e074fa17c710b336de703d SHA512 8cce9af5162c38603b538a91c35b82163ea96c4fa49f01eb6d71d970f80d62cee549d7abc38a367f2e7ac40b7c961f3e58d5759c318f4157580f781f49fc30b0
+EBUILD ppx_tools-5.0.4.05.0.ebuild 716 BLAKE2B dcd835e06c7349df3bb49c16c14378e5b90de9ece37c478b66b5bd35f116c66d65981aa12322505e48c60dc07ef393c5181e3609db26302850bfa5fb53cb33fa SHA512 991090e274d2897d872bb706e2295d9964a1f8182947617683d7d054ac80501586dc4e2239add6c18effce80c6f78f0022ab28f46d942b51ec975cf5188ad1df
+MISC metadata.xml 343 BLAKE2B 74fea15b992b811ea11c6b9e536dbf79bbd72329f5d62b200e7d320816f6470969b92f06a0d0243a24e4063d3190e3c1a2c656b8a8209fbe86332741d7a0da7b SHA512 af6d8ea7cea8aee25e51afdd9b2f6a8353467a67089121d3dfddef55ae48b31f8f3e539cea90455d0044dba784ca21b6af4be8eb55a455c97827b7277ac37aff
diff --git a/dev-ml/ppx_tools/files/ocaml404.patch b/dev-ml/ppx_tools/files/ocaml404.patch
new file mode 100644
index 000000000000..8a2ccee071e4
--- /dev/null
+++ b/dev-ml/ppx_tools/files/ocaml404.patch
@@ -0,0 +1,47 @@
+Index: ppx_tools-5.0-4.03.0/ast_mapper_class.ml
+===================================================================
+--- ppx_tools-5.0-4.03.0.orig/ast_mapper_class.ml
++++ ppx_tools-5.0-4.03.0/ast_mapper_class.ml
+@@ -335,6 +335,7 @@ module P = struct
+ | Ppat_unpack s -> unpack ~loc ~attrs (map_loc sub s)
+ | Ppat_exception p -> exception_ ~loc ~attrs (sub # pat p)
+ | Ppat_extension x -> extension ~loc ~attrs (sub # extension x)
++ | Ppat_open (l, p) -> open_ ~loc ~attrs (map_loc sub l) (sub # pat p)
+ end
+
+ module CE = struct
+Index: ppx_tools-5.0-4.03.0/genlifter.ml
+===================================================================
+--- ppx_tools-5.0-4.03.0.orig/genlifter.ml
++++ ppx_tools-5.0-4.03.0/genlifter.ml
+@@ -49,8 +49,8 @@ module Main : sig end = struct
+ let rec gen ty =
+ if Hashtbl.mem printed ty then ()
+ else let tylid = Longident.parse ty in
+- let (_, td) =
+- try Env.lookup_type tylid env
++ let td =
++ try Env.find_type (Env.lookup_type tylid env) env
+ with Not_found ->
+ Format.eprintf "** Cannot resolve type %s@." ty;
+ exit 2
+Index: ppx_tools-5.0-4.03.0/rewriter.ml
+===================================================================
+--- ppx_tools-5.0-4.03.0.orig/rewriter.ml
++++ ppx_tools-5.0-4.03.0/rewriter.ml
+@@ -92,13 +92,13 @@ let () =
+ | `Struct ->
+ let pstr = Parse.implementation lexer in
+ let pstr = Pparse.apply_rewriters (* ~restore:true *) ~tool_name:!tool_name
+- Config.ast_impl_magic_number pstr in
++ Pparse.Structure pstr in
+ Pprintast.structure fmt pstr;
+ Format.pp_print_newline fmt ()
+ | `Sig ->
+ let psig = Parse.interface lexer in
+ let psig = Pparse.apply_rewriters (* ~restore:true *) ~tool_name:!tool_name
+- Config.ast_intf_magic_number psig in
++ Pparse.Signature psig in
+ Pprintast.signature fmt psig;
+ Format.pp_print_newline fmt ())
+ with exn ->
diff --git a/dev-ml/ppx_tools/metadata.xml b/dev-ml/ppx_tools/metadata.xml
new file mode 100644
index 000000000000..56d1f00f232a
--- /dev/null
+++ b/dev-ml/ppx_tools/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">alainfrisch/ppx_tools</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/ppx_tools/ppx_tools-5.0.4.03.0.ebuild b/dev-ml/ppx_tools/ppx_tools-5.0.4.03.0.ebuild
new file mode 100644
index 000000000000..3b440d54aeb0
--- /dev/null
+++ b/dev-ml/ppx_tools/ppx_tools-5.0.4.03.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit findlib versionator eutils
+
+MY_PV=$(replace_version_separator 2 '+')
+DESCRIPTION="Tools for authors of ppx rewriters"
+HOMEPAGE="https://github.com/alainfrisch/ppx_tools"
+SRC_URI="https://github.com/alainfrisch/ppx_tools/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE="+ocamlopt"
+
+DEPEND=">=dev-lang/ocaml-4.03.0:=[ocamlopt?]"
+RDEPEND="${DEPEND}"
+S="${WORKDIR}/${PN}-$(replace_version_separator 2 '-')"
+
+src_prepare() {
+ has_version '>=dev-lang/ocaml-4.04_beta' && epatch "${FILESDIR}/ocaml404.patch"
+}
+
+src_compile() {
+ emake -j1 $(usex ocamlopt "" "ARCH=none")
+}
+
+src_install() {
+ findlib_src_install
+ dodoc README.md
+}
diff --git a/dev-ml/ppx_tools/ppx_tools-5.0.4.05.0.ebuild b/dev-ml/ppx_tools/ppx_tools-5.0.4.05.0.ebuild
new file mode 100644
index 000000000000..28e7b0d5bb50
--- /dev/null
+++ b/dev-ml/ppx_tools/ppx_tools-5.0.4.05.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit findlib versionator eutils
+
+MY_PV=$(replace_version_separator 2 '+')
+DESCRIPTION="Tools for authors of ppx rewriters"
+HOMEPAGE="https://github.com/alainfrisch/ppx_tools"
+SRC_URI="https://github.com/alainfrisch/ppx_tools/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE="+ocamlopt"
+
+DEPEND=">=dev-lang/ocaml-4.05_beta:=[ocamlopt?]"
+RDEPEND="${DEPEND}"
+S="${WORKDIR}/${PN}-$(replace_version_separator 2 '-')"
+
+src_compile() {
+ emake -j1 $(usex ocamlopt "" "ARCH=none")
+}
+
+src_install() {
+ findlib_src_install
+ dodoc README.md
+}
diff --git a/dev-ml/ppx_tools_versioned-5.0.1 b/dev-ml/ppx_tools_versioned-5.0.1
deleted file mode 100644
index 2966e333d90f..000000000000
--- a/dev-ml/ppx_tools_versioned-5.0.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-lang/ocaml:= dev-ml/ocaml-migrate-parsetree:= >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Tools for authors of ppx rewriters
-EAPI=6
-HOMEPAGE=https://github.com/let-def/ppx_tools_versioned
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
-LICENSE=MIT
-RDEPEND=dev-lang/ocaml:= dev-ml/ocaml-migrate-parsetree:=
-SLOT=0/5.0.1
-SRC_URI=https://github.com/let-def/ppx_tools_versioned/archive/5.0.1.tar.gz -> ppx_tools_versioned-5.0.1.tar.gz
-_eclasses_=findlib 45d6030075064a68da8d7143726a1150
-_md5_=7218f7b16c3a7e057efef3f7066a165b
diff --git a/dev-ml/ppx_tools_versioned/Manifest b/dev-ml/ppx_tools_versioned/Manifest
new file mode 100644
index 000000000000..a86fff2c7591
--- /dev/null
+++ b/dev-ml/ppx_tools_versioned/Manifest
@@ -0,0 +1,3 @@
+DIST ppx_tools_versioned-5.0.1.tar.gz 43741 BLAKE2B 0ff7dc5a03265a7e9fea6bebe372cee993f35d2d2ec451d5f77a1c7de51f91526bf15817882ff93033b3fcd51014efa12841a92cedf243870a22790f00807e9e SHA512 4d47f82c5a05f880dbb3d10caac6de705b9609c488d62be84eb1ebe22fa8c4e3716fad7c546035e955bd0e304d7940f23df090470f86c8d862b549b9db387acb
+EBUILD ppx_tools_versioned-5.0.1.ebuild 617 BLAKE2B b3d4adc9fbf220290a43518c1e8b4e492da1b0f436c36a65178cf0d8dc49f74a6827626945c41f4ef60d9276f8b3b690557934ccfa16a7d9f13bb757f241defb SHA512 3b3f4533b733db9df97cdc4e8eadeebd5310d770824f2adf133d1c4306c32b856cb88534a4a6dc08cf6c5e41085a45d693fdf443e3790161087ec4b15f3b560d
+MISC metadata.xml 339 BLAKE2B 90f1a9df9417db2c755a81c902dec8bcc91f41e79f6afdcbd6dabfbbce14527973b9c34219a8299f7f14121c31f2183233b05b80e3e638ed931b06ff12ec4e93 SHA512 8ddeab35a9550e21e2a48ffd8b959d12f702386303d7adac11eacf3f2861f2c69fa392f610391161dd3bb6e6d1c167ce5a61068041f4b0593e9f1f36f843c84f
diff --git a/dev-ml/ppx_tools_versioned/metadata.xml b/dev-ml/ppx_tools_versioned/metadata.xml
new file mode 100644
index 000000000000..efb21d181ae1
--- /dev/null
+++ b/dev-ml/ppx_tools_versioned/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">let-def/ppx_tools_versioned</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/ppx_tools_versioned/ppx_tools_versioned-5.0.1.ebuild b/dev-ml/ppx_tools_versioned/ppx_tools_versioned-5.0.1.ebuild
new file mode 100644
index 000000000000..ec7f405d4dfe
--- /dev/null
+++ b/dev-ml/ppx_tools_versioned/ppx_tools_versioned-5.0.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit findlib
+
+MY_PV=${PV/_/}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="Tools for authors of ppx rewriters"
+HOMEPAGE="https://github.com/let-def/ppx_tools_versioned"
+SRC_URI="https://github.com/let-def/ppx_tools_versioned/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="
+ dev-lang/ocaml:=
+ dev-ml/ocaml-migrate-parsetree:=
+"
+RDEPEND="${DEPEND}"
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+ findlib_src_install
+ dodoc README.md
+}
diff --git a/dev-ml/ppx_traverse-0.9.0 b/dev-ml/ppx_traverse-0.9.0
deleted file mode 100644
index becd92dc529b..000000000000
--- a/dev-ml/ppx_traverse-0.9.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_metaquot:= dev-ml/ppx_type_conv:= dev-ml/ocaml-migrate-parsetree:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=Automatic generation of open recursion classes
-EAPI=6
-HOMEPAGE=https://github.com/janestreet/ppx_traverse
-KEYWORDS=~amd64
-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 24b4a2529c1fd12f1304856d6c5a690d
-_md5_=ea43b4900c7d52031ecc6dddcca7c011
diff --git a/dev-ml/ppx_traverse/Manifest b/dev-ml/ppx_traverse/Manifest
new file mode 100644
index 000000000000..3f5a70cc0b9c
--- /dev/null
+++ b/dev-ml/ppx_traverse/Manifest
@@ -0,0 +1,3 @@
+DIST ppx_traverse-0.9.0.tar.gz 10837 BLAKE2B b0d3e9a10c5af698105fae5dec13afe8b545bb3ee2b48ec72b3d7e76466d3e2ce7ece1ecdfeeabde63855bf8d24c89a05666f8e2fa8c286621ca1c9bd35274d8 SHA512 914f79405f09ccfecd444416499b63f68f700d4b7485031c45b7ab9500a82c4bc65dad8315a6cc7b7669b2c40f51e98a6fa453869b20501a22eff5b1ffb0e441
+EBUILD ppx_traverse-0.9.0.ebuild 579 BLAKE2B 3fa290d536cafb8f3ede603dba3204b620f7a82d1fb0f24f9f6a65f20cee554af6184272dd3a0180d142186d7d1060588ca73b4aa740ce213685ce23be248808 SHA512 bc8cfd99b43efd3d93ea23d6ad79581335d3b585b55fed0664f9964c4ada5e9362553313884bb4027df45cd691f99de46463bd79354ebaef604c3a7c0560b99a
+MISC metadata.xml 335 BLAKE2B f2b41d3e9ce34ff971c0d645de9b0512b0eb67ac3e6c2815d9a67deb8afee75265eefff06dd6c842db7e078eee94f3878397e001ad7352d54254abe1d2a2e890 SHA512 5b6ab9e74a4f3f0afbe14a88921e23dfa35dedad123ee692a35d81176790fc78141328e7b6615a4c2fd755ffffa62819dcef57abc7a8372281edc4f5d8b8ac91
diff --git a/dev-ml/ppx_traverse/metadata.xml b/dev-ml/ppx_traverse/metadata.xml
new file mode 100644
index 000000000000..fd020db20aae
--- /dev/null
+++ b/dev-ml/ppx_traverse/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">janestreet/ppx_traverse</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/ppx_traverse/ppx_traverse-0.9.0.ebuild b/dev-ml/ppx_traverse/ppx_traverse-0.9.0.ebuild
new file mode 100644
index 000000000000..1ea84ac585ee
--- /dev/null
+++ b/dev-ml/ppx_traverse/ppx_traverse-0.9.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit opam
+
+DESCRIPTION="Automatic generation of open recursion classes"
+HOMEPAGE="https://github.com/janestreet/ppx_traverse"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+ dev-ml/ppx_core:=
+ dev-ml/ppx_driver:=
+ dev-ml/ppx_metaquot:=
+ dev-ml/ppx_type_conv:=
+ dev-ml/ocaml-migrate-parsetree:=
+"
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND} dev-ml/jbuilder"
diff --git a/dev-ml/ppx_traverse_builtins-0.9.0 b/dev-ml/ppx_traverse_builtins-0.9.0
deleted file mode 100644
index 84dc36895a38..000000000000
--- a/dev-ml/ppx_traverse_builtins-0.9.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=Builtins for ppx_traverse
-EAPI=6
-HOMEPAGE=https://github.com/janestreet/ppx_traverse_builtins
-KEYWORDS=~amd64 ~ppc ~x86
-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 24b4a2529c1fd12f1304856d6c5a690d
-_md5_=53f213a132b85b86d9c2c24544a9f989
diff --git a/dev-ml/ppx_traverse_builtins/Manifest b/dev-ml/ppx_traverse_builtins/Manifest
new file mode 100644
index 000000000000..1470699f6066
--- /dev/null
+++ b/dev-ml/ppx_traverse_builtins/Manifest
@@ -0,0 +1,3 @@
+DIST ppx_traverse_builtins-0.9.0.tar.gz 6328 BLAKE2B 1e111d97876fb97826a04dfddbd1289e4b64ca93cb09e2f8692fcd5c1b87eb09259938b31662ed712d3e3926cd3b8edecf967d85ce9846805c74b28a4359e02a SHA512 c8d77138f8fcd4d440870eb9126f5aca2d9fa917fac6bd9aa7f6dd4fb3e75f5860efbdc312ffc23b375808c33e1527726318918bf7bee61f470ef3a2cb40f6ba
+EBUILD ppx_traverse_builtins-0.9.0.ebuild 473 BLAKE2B db026b980369efc4ca5549653a0ee251fc5ca06441cc0eecd717e5bf5eb7eb932ff94b3bd56f6c0fad03b99024d43543a4db0b983e10d20c0e62b02b35da3ee4 SHA512 70918525a322d61ee9f0f58532f311fb7cfbf60375d2b9b1a5e0daa430983378aaef13d2c1b6ae85e70b69bbb0c5133ddf9762dcc92d9aacdf811c60918b0651
+MISC metadata.xml 344 BLAKE2B b264bdddf539519b33824f51a4db6478fe054d7b1d9d2c0590f3f93bd1230cb54392bcafc3da5164ec14e8aaf3ad9fcfb43cd547bb0e363d4d8014f57f588a85 SHA512 3ea69d826091c43f6b73d688cac7c96aec0bcab05f3281bbe31bb3342247d1a8dc19fa081edbb84ca62114081d46dedbd7042ef3ae3b9520f1d5b70a2ec9cd6d
diff --git a/dev-ml/ppx_traverse_builtins/metadata.xml b/dev-ml/ppx_traverse_builtins/metadata.xml
new file mode 100644
index 000000000000..fb3dfe0dac1c
--- /dev/null
+++ b/dev-ml/ppx_traverse_builtins/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">janestreet/ppx_traverse_builtins</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/ppx_traverse_builtins/ppx_traverse_builtins-0.9.0.ebuild b/dev-ml/ppx_traverse_builtins/ppx_traverse_builtins-0.9.0.ebuild
new file mode 100644
index 000000000000..07f2a2aa57fd
--- /dev/null
+++ b/dev-ml/ppx_traverse_builtins/ppx_traverse_builtins-0.9.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit opam
+
+DESCRIPTION="Builtins for ppx_traverse"
+HOMEPAGE="https://github.com/janestreet/ppx_traverse_builtins"
+SRC_URI="https://github.com/janestreet/ppx_traverse_builtins/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+ dev-ml/jbuilder"
diff --git a/dev-ml/ppx_type_conv-0.9.0 b/dev-ml/ppx_type_conv-0.9.0
deleted file mode 100644
index 2e2d9816631b..000000000000
--- a/dev-ml/ppx_type_conv-0.9.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-ml/ppx_driver:= dev-ml/ppx_metaquot:= dev-ml/ppx_core:= dev-ml/ocaml-migrate-parsetree:= dev-ml/ppx_deriving:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=Support Library for type-driven code generators
-EAPI=6
-HOMEPAGE=https://github.com/janestreet/ppx_type_conv
-KEYWORDS=~amd64 ~ppc ~x86
-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 24b4a2529c1fd12f1304856d6c5a690d
-_md5_=afeb46c8e96915695f5d12fe37b59a9f
diff --git a/dev-ml/ppx_type_conv/Manifest b/dev-ml/ppx_type_conv/Manifest
new file mode 100644
index 000000000000..18a727eba4d8
--- /dev/null
+++ b/dev-ml/ppx_type_conv/Manifest
@@ -0,0 +1,3 @@
+DIST ppx_type_conv-0.9.0.tar.gz 14651 BLAKE2B 50b4ffb85062eb306bbadb3b641f9ca0318e95c614482302c4b3e001eeeb14137c4d0050abb8cf5c6e57a5fd8afe70b16a3455b4080e6f85981c88765c8ba945 SHA512 71af29d7e882652a5e101e1fc3610adb4faaba30068161b4b391e3ce7419af7feffd289070c1707cc961c593eda7b7f325609e8c98543c1168400cfafea31472
+EBUILD ppx_type_conv-0.9.0.ebuild 591 BLAKE2B b73ad16e007701fb5c9cf80f34ab0fd3fcdb65026a88a7f87cb57564c1c4a978e9fa090fdee3ed7da7416d45d52dec2f5d9641d1a3a1e5d3d7c7c64683474958 SHA512 d96ac4e0fb282c57a8a7aaada5da41b1d877fdc27383fd77e883b3852a893c0a803872a19e65c36f79ca73eed3e1bbde124144b3990af397cac79c80479cd553
+MISC metadata.xml 336 BLAKE2B dfe795b5d1d6d958e36285ef798f50ee962fa9ad8d090bd072b03a5c7cc09d08178f817948760348e8b4ff0eba0ba36067adf6926624febd2e58e18d277ce792 SHA512 63a68b119fabc900de432fb9e5a5ec06ecb8b89a980fc3fd6eb8303ac2278f8af08b4995a04d9de487cca41c6e8f6ba95786b976d70ad3108c121d61cc5ca7e0
diff --git a/dev-ml/ppx_type_conv/metadata.xml b/dev-ml/ppx_type_conv/metadata.xml
new file mode 100644
index 000000000000..3d6e4f7701cc
--- /dev/null
+++ b/dev-ml/ppx_type_conv/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">janestreet/ppx_type_conv</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/ppx_type_conv/ppx_type_conv-0.9.0.ebuild b/dev-ml/ppx_type_conv/ppx_type_conv-0.9.0.ebuild
new file mode 100644
index 000000000000..879332244f97
--- /dev/null
+++ b/dev-ml/ppx_type_conv/ppx_type_conv-0.9.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit opam
+
+DESCRIPTION="Support Library for type-driven code generators"
+HOMEPAGE="https://github.com/janestreet/ppx_type_conv"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="
+ dev-ml/ppx_driver:=
+ dev-ml/ppx_metaquot:=
+ dev-ml/ppx_core:=
+ dev-ml/ocaml-migrate-parsetree:=
+ dev-ml/ppx_deriving:=
+"
+
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND} dev-ml/jbuilder"
diff --git a/dev-ml/ppx_typerep_conv-0.9.0 b/dev-ml/ppx_typerep_conv-0.9.0
deleted file mode 100644
index 1ac72d3d1f76..000000000000
--- a/dev-ml/ppx_typerep_conv-0.9.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=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-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=Generation of runtime types from type declarations
-EAPI=6
-HOMEPAGE=https://github.com/janestreet/ppx_typerep_conv
-KEYWORDS=~amd64
-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 24b4a2529c1fd12f1304856d6c5a690d
-_md5_=3d7c796e73f530b4ffc6369de466ce94
diff --git a/dev-ml/ppx_typerep_conv/Manifest b/dev-ml/ppx_typerep_conv/Manifest
new file mode 100644
index 000000000000..b5acc13679e9
--- /dev/null
+++ b/dev-ml/ppx_typerep_conv/Manifest
@@ -0,0 +1,3 @@
+DIST ppx_typerep_conv-0.9.0.tar.gz 10844 BLAKE2B 4c21e9529c587507eef26fc53ae2c1153cbecd754d6b36b73ee6e639a13d872932a421207224c392394a52767f5fde66441cf19318499c8604c2e20b9583841a SHA512 155838bf6dce45a043624845ce882eee374df344f76a9433a1170d89cc27856a634f4ca31ad28e46b28c5103d00c3d8d7d79692872c5dfc35d0b4a7eebdb3d1d
+EBUILD ppx_typerep_conv-0.9.0.ebuild 606 BLAKE2B da77568f0ff5a883337f385f96079930e0e5bf40e60d3987779af3f047f188f18b80ecc4b9529424fe72e9952def0b558998cc81c497998672ea96eb6cd2509c SHA512 784430fd32a3c7f8fecbd9a8dbd277a81402c7a890a507fa5f59d70515fef30c32b3ec7e3f78ebb979617305ebd5e5274fd191d4fb5e92379ae2d4ba635c1188
+MISC metadata.xml 339 BLAKE2B 0881bf17efa100bbd593e81be3a264874bd1f00151bfc0631a0c0dabf3801470fb701c6225b3cf47723e91b5772edd274577d1549475c21757aa488cad28eeb5 SHA512 8c26a914454d9a9ab3fdc0d3d7f0b3781964d6487fe267248a7a317dbeb3d72c86795cd53fc8e15ac29ac16e5070ea996dd3bdf65903a568f159fd64767f958e
diff --git a/dev-ml/ppx_typerep_conv/metadata.xml b/dev-ml/ppx_typerep_conv/metadata.xml
new file mode 100644
index 000000000000..f6ee225d2d25
--- /dev/null
+++ b/dev-ml/ppx_typerep_conv/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">janestreet/ppx_typerep_conv</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/ppx_typerep_conv/ppx_typerep_conv-0.9.0.ebuild b/dev-ml/ppx_typerep_conv/ppx_typerep_conv-0.9.0.ebuild
new file mode 100644
index 000000000000..30147fc55d68
--- /dev/null
+++ b/dev-ml/ppx_typerep_conv/ppx_typerep_conv-0.9.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit opam
+
+DESCRIPTION="Generation of runtime types from type declarations"
+HOMEPAGE="https://github.com/janestreet/ppx_typerep_conv"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+ 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:=
+ "
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND} dev-ml/jbuilder"
diff --git a/dev-ml/ppx_variants_conv-0.9.0 b/dev-ml/ppx_variants_conv-0.9.0
deleted file mode 100644
index a1d6e905407d..000000000000
--- a/dev-ml/ppx_variants_conv-0.9.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=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-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=Generation of accessor and iteration functions for ocaml variant types
-EAPI=6
-HOMEPAGE=https://github.com/janestreet/ppx_variants_conv
-KEYWORDS=~amd64
-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 24b4a2529c1fd12f1304856d6c5a690d
-_md5_=85b8cf52cb554cc85eb56bd818a193ea
diff --git a/dev-ml/ppx_variants_conv/Manifest b/dev-ml/ppx_variants_conv/Manifest
new file mode 100644
index 000000000000..bac7c02c00d3
--- /dev/null
+++ b/dev-ml/ppx_variants_conv/Manifest
@@ -0,0 +1,3 @@
+DIST ppx_variants_conv-0.9.0.tar.gz 10649 BLAKE2B 824405cce55213ab055fb576becba6b7c2111501ad9e2784fd4eb62c32edf1288eb66f1e8d4c0e78e6aeb8ecf4ad62819b767c4d0a7eedc5ddbd3803d60e028a SHA512 4bb7c087c835fe0c8debc25b66dab9da2da3a5ad4eef856845075a146a2fe3a2598a5b77851bd922b532b57cb821ee934336f8638d44cc0fd81faefcc56e1d89
+EBUILD ppx_variants_conv-0.9.0.ebuild 630 BLAKE2B cc9749b8da218416be67eba83f186f9d49c9b11e31e221774b7b6b46d06f964950534b2b2d7b2e7f3c84ad165cb0b324e35b1782d29c1a0d9f3a7edb2b6a22da SHA512 85764a2d7fd531292563763ed40953aff421bef807852309f405d2c685f074dbdfb611ad74acb9c3f1a8ca1b023a63a87fe760100a127ea8a2984addce2bec05
+MISC metadata.xml 340 BLAKE2B dcb21c8375715a153c18f168032c3d56cb856b322c3659815370b19b8caae1f9187942737af28d93cd5d45116376ae4b4310f7cc0f784f171dbb3d0ab4aa76b2 SHA512 161ce34be9aafd26a53ba2b7a3e8d01409de2d5a25e551abcf8c284749daa09d901f37afc60353e8c762b5475d6b239311973b5cf6f1955727edce6bcd5766c9
diff --git a/dev-ml/ppx_variants_conv/metadata.xml b/dev-ml/ppx_variants_conv/metadata.xml
new file mode 100644
index 000000000000..d13fa2252af4
--- /dev/null
+++ b/dev-ml/ppx_variants_conv/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">janestreet/ppx_variants_conv</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/ppx_variants_conv/ppx_variants_conv-0.9.0.ebuild b/dev-ml/ppx_variants_conv/ppx_variants_conv-0.9.0.ebuild
new file mode 100644
index 000000000000..bf5e566ce2b0
--- /dev/null
+++ b/dev-ml/ppx_variants_conv/ppx_variants_conv-0.9.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit opam
+
+DESCRIPTION="Generation of accessor and iteration functions for ocaml variant types"
+HOMEPAGE="https://github.com/janestreet/ppx_variants_conv"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+ 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:=
+"
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND} dev-ml/jbuilder"
diff --git a/dev-ml/pxp-1.2.8-r1 b/dev-ml/pxp-1.2.8-r1
deleted file mode 100644
index 94cc2a777fe0..000000000000
--- a/dev-ml/pxp-1.2.8-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=>=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:= >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=validating XML parser library for O'Caml
-EAPI=5
-HOMEPAGE=http://projects.camlcity.org/projects/pxp.html
-IUSE=examples +ocamlopt
-KEYWORDS=amd64 ppc x86
-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 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a4388603cf3778786c77a57afdbba2fc
diff --git a/dev-ml/pxp-1.2.9 b/dev-ml/pxp-1.2.9
deleted file mode 100644
index c6d22873b5b9..000000000000
--- a/dev-ml/pxp-1.2.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=>=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:= >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=validating XML parser library for O'Caml
-EAPI=5
-HOMEPAGE=http://projects.camlcity.org/projects/pxp.html
-IUSE=examples +ocamlopt
-KEYWORDS=~amd64 ~ppc ~x86
-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 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ed7c866624923e15d94c0bd694fb4a5c
diff --git a/dev-ml/pxp/Manifest b/dev-ml/pxp/Manifest
new file mode 100644
index 000000000000..31b9da86613d
--- /dev/null
+++ b/dev-ml/pxp/Manifest
@@ -0,0 +1,6 @@
+AUX oc43.patch 395 BLAKE2B fff93ecf1bd9f1b04c142f73923e2b8fdcee520dc8ed71d3e1a1fe024114170a5b678c6489e3052800fd0ab986286086e1996088f56ed4bc619282fcc6d15164 SHA512 e9d7909b05bfec7a9712aad511ad7dec699711e68ffb68e3643c077cfcc83c76f2252b1de6a74ed244825cc9fbd8ff61122f9b32777f67114b8165fd0266180a
+DIST pxp-1.2.8.tar.gz 619689 BLAKE2B ac63bdee598e368bbe96bbdab38e2fe96902346f80769d51ac2ea47d54a5066d8de35e96d13c0fc7af3ac822e2b121d8f7c033fe00b2f052fc734ccc0f8cca3f SHA512 3292bfbda494066e454331a9cfc56b03f55afe8548bdf24fea09d9bc0a03c333c027f7b527983bd9b4d659458c95acf7e3fc251c72d26ab3502f52067c9f2549
+DIST pxp-1.2.9.tar.gz 626001 BLAKE2B aa3ab609751745b51d8dfb2a0aa2543f46002de4d116cf7e184dfa6153dd4d0657f718af5c98eb2c2f9d5805da5fa7087918afc949e43d6e1dea8d4d812c6256 SHA512 d3a8ab9eab0f5219b889dc7a0b4936e4ae81f2dd3eb06c45b25ff70b8e2c6151c917bf43cf84a90061c6efe0ec344c2703566d2d513e45e1fceab5740bdf9808
+EBUILD pxp-1.2.8-r1.ebuild 1060 BLAKE2B 732dd52a8567ae8a672033511e4fb183128a32f874561b3698b99e8c04c8757bdb18807793b4af5f5eab11a756cda1a6ab546428c1c5c84e5e316a8493025325 SHA512 f2ff74e1889cef44c7d7b5645fbca6d4d0433131d9bbd305fd1915514d3a8d312f2d8b8db27ede04dbf0d218d8dd57aaa9bdddeb9940005d68c0395ec2551e00
+EBUILD pxp-1.2.9.ebuild 1011 BLAKE2B 918f8e3d0f31dce91118df4aeed20827d3f8038c57c32d6c3885abcae32e9a52fbe27006b5022efe8bca5c680e7a539fe90ba58c5a2e52de84295f8b3971752b SHA512 dbe344799beffe9bf22fee67084d70e6e2964c4de465878a244a9e7d7a30b7740a0614b8b121674c17e67127e16e1934dfe45ba19962fe0b99c7870c8f188137
+MISC metadata.xml 243 BLAKE2B 010ca240ae06e9a9f6d7ba213eb06df36d9ba862ff2d2458d98a9fea1a1e7f3026d13832a73bce1b3ad9345029425e6abfae9e03bf126f2329b3f030ed3753fd SHA512 1c5b4b2163017e496999d1f87e5c9c5ac6c11b2e9187450ccfb3df258f34e54d278972f04ee0e8429476c6f87e091a869ac2a28c6e8c8e6d20678c3e74061449
diff --git a/dev-ml/pxp/files/oc43.patch b/dev-ml/pxp/files/oc43.patch
new file mode 100644
index 000000000000..0168c703d06d
--- /dev/null
+++ b/dev-ml/pxp/files/oc43.patch
@@ -0,0 +1,13 @@
+Index: pxp-1.2.8/src/pxp-engine/pxp_document.ml
+===================================================================
+--- pxp-1.2.8.orig/src/pxp-engine/pxp_document.ml
++++ pxp-1.2.8/src/pxp-engine/pxp_document.ml
+@@ -3398,8 +3398,6 @@ let find_all_elements ?deeply eltype bas
+ ;;
+
+
+-exception Skip;;
+-
+ let map_tree ~pre ?(post=(fun x -> x)) base =
+ let rec map_rec n =
+ let n' = pre n in
diff --git a/dev-ml/pxp/metadata.xml b/dev-ml/pxp/metadata.xml
new file mode 100644
index 000000000000..ffac4d7ebc01
--- /dev/null
+++ b/dev-ml/pxp/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-ml/pxp/pxp-1.2.8-r1.ebuild b/dev-ml/pxp/pxp-1.2.8-r1.ebuild
new file mode 100644
index 000000000000..46f405db67a1
--- /dev/null
+++ b/dev-ml/pxp/pxp-1.2.8-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit findlib eutils
+
+MY_P=${P/_beta/test}
+
+DESCRIPTION="validating XML parser library for O'Caml"
+HOMEPAGE="http://projects.camlcity.org/projects/pxp.html"
+SRC_URI="http://download.camlcity.org/download/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="amd64 ppc x86"
+
+SLOT="0/${PV}"
+DEPEND=">=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:="
+RDEPEND="${DEPEND}"
+
+IUSE="examples +ocamlopt"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ epatch "${FILESDIR}/oc43.patch"
+}
+
+src_configure() {
+ #the included configure does not support many standard switches and is quite picky
+ ./configure || die "configure failed"
+}
+
+src_compile() {
+ emake -j1 all
+ if use ocamlopt; then
+ emake -j1 opt
+ fi
+}
+
+src_install() {
+ findlib_src_install
+ if use examples; then
+ dodoc -r examples
+ docompress -x /usr/share/doc/${PF}/examples
+ fi
+
+ cd doc
+ dodoc ABOUT-FINDLIB README SPEC design.txt
+}
diff --git a/dev-ml/pxp/pxp-1.2.9.ebuild b/dev-ml/pxp/pxp-1.2.9.ebuild
new file mode 100644
index 000000000000..58fa81ed2194
--- /dev/null
+++ b/dev-ml/pxp/pxp-1.2.9.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit findlib eutils
+
+MY_P=${P/_beta/test}
+
+DESCRIPTION="validating XML parser library for O'Caml"
+HOMEPAGE="http://projects.camlcity.org/projects/pxp.html"
+SRC_URI="http://download.camlcity.org/download/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+SLOT="0/${PV}"
+DEPEND=">=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:="
+RDEPEND="${DEPEND}"
+
+IUSE="examples +ocamlopt"
+
+S=${WORKDIR}/${MY_P}
+
+src_configure() {
+ #the included configure does not support many standard switches and is quite picky
+ ./configure || die "configure failed"
+}
+
+src_compile() {
+ emake -j1 all
+ if use ocamlopt; then
+ emake -j1 opt
+ fi
+}
+
+src_install() {
+ findlib_src_install
+ if use examples; then
+ dodoc -r examples
+ docompress -x /usr/share/doc/${PF}/examples
+ fi
+
+ cd doc
+ dodoc ABOUT-FINDLIB README SPEC design.txt
+}
diff --git a/dev-ml/qcheck-0.6 b/dev-ml/qcheck-0.6
deleted file mode 100644
index e7b6744c79fa..000000000000
--- a/dev-ml/qcheck-0.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ml/ounit:= !<dev-ml/iTeML-2.5 dev-ml/ocamlbuild >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=QuickCheck inspired property-based testing for OCaml
-EAPI=5
-HOMEPAGE=https://github.com/c-cube/qcheck/
-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?]
-SLOT=0/0.6
-SRC_URI=https://github.com/c-cube/qcheck/archive/0.6.tar.gz -> qcheck-0.6.tar.gz
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e oasis 9256ed89af74c3365ec888c00bfdfe43 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=972dcb87593ab4bf6d333df0e473be11
diff --git a/dev-ml/qcheck-0.7 b/dev-ml/qcheck-0.7
deleted file mode 100644
index f47cec0cc7f0..000000000000
--- a/dev-ml/qcheck-0.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ml/ounit:= !<dev-ml/iTeML-2.5 dev-ml/ocamlbuild >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=QuickCheck inspired property-based testing for OCaml
-EAPI=5
-HOMEPAGE=https://github.com/c-cube/qcheck/
-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?]
-SLOT=0/0.7
-SRC_URI=https://github.com/c-cube/qcheck/archive/0.7.tar.gz -> qcheck-0.7.tar.gz
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e oasis 9256ed89af74c3365ec888c00bfdfe43 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1fe4c96a2688c948d5e98588dc192cc4
diff --git a/dev-ml/qcheck/Manifest b/dev-ml/qcheck/Manifest
new file mode 100644
index 000000000000..938b5bb2ebc2
--- /dev/null
+++ b/dev-ml/qcheck/Manifest
@@ -0,0 +1,5 @@
+DIST qcheck-0.6.tar.gz 255625 BLAKE2B 9b0e2f6c134a6c4eca37763f1ca41dcacdd8755f5ffe1b7afba2a5384edac4c9881c6849d6f6da005afe2aaaa46f956e50a5a3d00f6fc57fa1866ca486121c12 SHA512 e4298f00c49febe36ae64f287e032081bb2d7713d9412db95441d6b84fb3030f45d07519369ba00be81615a737dc45a246d609772b318084a2b2a28e77e05e1c
+DIST qcheck-0.7.tar.gz 257935 BLAKE2B a885635e555a7442f0ad7687320e3d9f45897b9167ba4ac12baf632bc60e1eca207ae5ccf4b57ff36897e418f5ef4e781f9f2bf674ec16cdab140049debcb6c6 SHA512 3082029a09d5efe3af0cb8fcd0bd08f11dd1066d5bffc6beaac16c7244b07286b3ae93931e699f22c977ad4d6ba050dff69b133ce3492455d6932a9e0cc304f7
+EBUILD qcheck-0.6.ebuild 513 BLAKE2B bc38ae96008c9439a04883c1b18ebcef1e140ab8870733ec77d1217d674e823cab19176dbb047b3f6c9737eca71dfedcf2fa89ecf54199219aeb2c429df62781 SHA512 552045e6b2f6aa1bf80ae2d212aecb37bccb7424244451d8e1fa40c95c2f92e6de493be2bfab6999dd421c210f1d48ca1358928e89e607411b6911f0d008d87d
+EBUILD qcheck-0.7.ebuild 508 BLAKE2B d34f2f30a4322595035caf15db5a5a2e77f7816f833323e7207ac7f6eb9cea7587e2a4781c90d116161b4213c57b0c93ebafd67cedbbbce91d06188824db2b9b SHA512 0cffa1892c54378a9a2e1d74cde0ce167eeada2f0995bd409daef8bfc411e45723803b567c1e0a1036a15a338033cd46d7a178e1485ba6bb269ad90caccf4435
+MISC metadata.xml 335 BLAKE2B d8c9dba4d328bba81ad402778a96a7a90daf00edde8e9ef7d284e8ca06ee31cb15012514cdd0556f96d2b01ff035c52f8fa3438ad80508738a98dd9bcf9d67e6 SHA512 1f7b713479a52b78c31a02326007ab3e045af551f2e4f18394975a19a6bdbf05dbfdcf5f6431036429d25f2e537a478d973988157fb5c5d8f1d1cc9c79f8fbec
diff --git a/dev-ml/qcheck/metadata.xml b/dev-ml/qcheck/metadata.xml
new file mode 100644
index 000000000000..a0d97a8e7947
--- /dev/null
+++ b/dev-ml/qcheck/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">c-cube/qcheck</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/qcheck/qcheck-0.6.ebuild b/dev-ml/qcheck/qcheck-0.6.ebuild
new file mode 100644
index 000000000000..e74600712cf7
--- /dev/null
+++ b/dev-ml/qcheck/qcheck-0.6.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+OASIS_BUILD_TESTS=1
+OASIS_BUILD_DOCS=1
+
+inherit oasis
+
+DESCRIPTION="QuickCheck inspired property-based testing for OCaml"
+HOMEPAGE="https://github.com/c-cube/qcheck/"
+SRC_URI="https://github.com/c-cube/qcheck/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-ml/ounit:=
+ !<dev-ml/iTeML-2.5"
+DEPEND="${RDEPEND}
+ dev-ml/ocamlbuild"
diff --git a/dev-ml/qcheck/qcheck-0.7.ebuild b/dev-ml/qcheck/qcheck-0.7.ebuild
new file mode 100644
index 000000000000..63578ec22400
--- /dev/null
+++ b/dev-ml/qcheck/qcheck-0.7.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+OASIS_BUILD_TESTS=1
+OASIS_BUILD_DOCS=1
+
+inherit oasis
+
+DESCRIPTION="QuickCheck inspired property-based testing for OCaml"
+HOMEPAGE="https://github.com/c-cube/qcheck/"
+SRC_URI="https://github.com/c-cube/qcheck/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-ml/ounit:=
+ !<dev-ml/iTeML-2.5"
+DEPEND="${RDEPEND}
+ dev-ml/ocamlbuild"
diff --git a/dev-ml/re2-0.9.0 b/dev-ml/re2-0.9.0
deleted file mode 100644
index 1706546cd158..000000000000
--- a/dev-ml/re2-0.9.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-ml/core_kernel:= dev-ml/ppx_driver:= dev-ml/ppx_jane:= dev-ml/ocaml-migrate-parsetree:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=OCaml bindings for RE2
-EAPI=6
-HOMEPAGE=https://github.com/janestreet/re2
-KEYWORDS=~amd64
-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 24b4a2529c1fd12f1304856d6c5a690d
-_md5_=335c4c39c1a9d5394e07bbee3c2d66de
diff --git a/dev-ml/re2-0.9.1 b/dev-ml/re2-0.9.1
deleted file mode 100644
index c2a1cef71e70..000000000000
--- a/dev-ml/re2-0.9.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-ml/core_kernel:= dev-ml/ppx_driver:= dev-ml/ppx_jane:= dev-ml/ocaml-migrate-parsetree:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=OCaml bindings for RE2
-EAPI=6
-HOMEPAGE=https://github.com/janestreet/re2
-KEYWORDS=~amd64
-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 24b4a2529c1fd12f1304856d6c5a690d
-_md5_=335c4c39c1a9d5394e07bbee3c2d66de
diff --git a/dev-ml/re2/Manifest b/dev-ml/re2/Manifest
new file mode 100644
index 000000000000..0d5891d96bb2
--- /dev/null
+++ b/dev-ml/re2/Manifest
@@ -0,0 +1,5 @@
+DIST re2-0.9.0.tar.gz 388868 BLAKE2B e4a16d9c417099c0aae331adbb09a5b1da597df576232f40d991aaafb751a936f92771df4dc17b869e1b90d86800d0f4313fd51924b0fbb04c1ac8c06961704d SHA512 d11cde52c151486025e05318930253f37312eb6498698ffd3b271f4ba0c83cae0ff8c0c1a11e01b6ab333770400108f3de33fd68f73ab6df1c832e7edffb5e77
+DIST re2-0.9.1.tar.gz 388911 BLAKE2B d6d0673142e2523c0d5fed2c19439bbf7c2ace401558f4c40f0302445492ae17bf67076c4faeb0e25eeb8cc01f463f4804317d4f6a5113586be77df18ec93874 SHA512 a92dc39a1d263dd2bbfad88f0ea0936fcadd1d03cd735d9db151412919713cfb4d8329f1e0fa454917d8faa49480e8dd60af9331b0863548ab267b647bd1e192
+EBUILD re2-0.9.0.ebuild 521 BLAKE2B 4a50fb64a536b6d94fa2ae9e92fa0d797eedc37999ba2bffa9da0767504abd68b53b7273aa251db6f2fe6a82b03306cc8684e68af9810a31e1bf987e85b300ed SHA512 94caa7fb09a0ad87bd3406e5237c9d80e2855ad3bd2e36cad7a9c5103e64f00ea2c5b58509333da0e8afaf12f6aeceeb9a338e0ef022763885a10f736f81285d
+EBUILD re2-0.9.1.ebuild 521 BLAKE2B 4a50fb64a536b6d94fa2ae9e92fa0d797eedc37999ba2bffa9da0767504abd68b53b7273aa251db6f2fe6a82b03306cc8684e68af9810a31e1bf987e85b300ed SHA512 94caa7fb09a0ad87bd3406e5237c9d80e2855ad3bd2e36cad7a9c5103e64f00ea2c5b58509333da0e8afaf12f6aeceeb9a338e0ef022763885a10f736f81285d
+MISC metadata.xml 326 BLAKE2B 4aeea9f11e791be768a69c386d58c125c327909dd83c8328b74b7d11d0b00c62970d535773e72bff454fa638f2c996dfffbead184a84c83b47a3b130264f676d SHA512 b989cfdcf5229dbd90b61c5b9bd07996d40fa8c0912eb570aa032c357d4ceaa77bea1897a44780120092909d100b6276643a036f3d59b337c0d31bbb7fb2184c
diff --git a/dev-ml/re2/metadata.xml b/dev-ml/re2/metadata.xml
new file mode 100644
index 000000000000..aea17486273c
--- /dev/null
+++ b/dev-ml/re2/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">janestreet/re2</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/re2/re2-0.9.0.ebuild b/dev-ml/re2/re2-0.9.0.ebuild
new file mode 100644
index 000000000000..e77c46fb6030
--- /dev/null
+++ b/dev-ml/re2/re2-0.9.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit opam
+
+DESCRIPTION="OCaml bindings for RE2"
+HOMEPAGE="https://github.com/janestreet/re2"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+ dev-ml/core_kernel:=
+ dev-ml/ppx_driver:=
+ dev-ml/ppx_jane:=
+ dev-ml/ocaml-migrate-parsetree:=
+"
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND} dev-ml/jbuilder"
diff --git a/dev-ml/re2/re2-0.9.1.ebuild b/dev-ml/re2/re2-0.9.1.ebuild
new file mode 100644
index 000000000000..e77c46fb6030
--- /dev/null
+++ b/dev-ml/re2/re2-0.9.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit opam
+
+DESCRIPTION="OCaml bindings for RE2"
+HOMEPAGE="https://github.com/janestreet/re2"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+ dev-ml/core_kernel:=
+ dev-ml/ppx_driver:=
+ dev-ml/ppx_jane:=
+ dev-ml/ocaml-migrate-parsetree:=
+"
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND} dev-ml/jbuilder"
diff --git a/dev-ml/react-1.2.1 b/dev-ml/react-1.2.1
deleted file mode 100644
index 8f17b623fec7..000000000000
--- a/dev-ml/react-1.2.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=dev-ml/findlib >=dev-ml/topkg-0.9 >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=OCaml module for functional reactive programming
-EAPI=5
-HOMEPAGE=http://erratique.ch/software/react https://github.com/dbuenzli/react
-IUSE=test
-KEYWORDS=~amd64 ~arm ~ppc ~x86 ~x86-fbsd
-LICENSE=BSD
-RDEPEND=>=dev-lang/ocaml-4:=
-SLOT=0/1.2.1
-SRC_URI=http://erratique.ch/software/react/releases/react-1.2.1.tbz
-_eclasses_=opam 24b4a2529c1fd12f1304856d6c5a690d
-_md5_=31bb085f887c91b46b1be4c98ba423d1
diff --git a/dev-ml/react/Manifest b/dev-ml/react/Manifest
new file mode 100644
index 000000000000..d9a075336a0b
--- /dev/null
+++ b/dev-ml/react/Manifest
@@ -0,0 +1,3 @@
+DIST react-1.2.1.tbz 39184 BLAKE2B 0ad5fd576c08292011e6543462295a11b77048f59aaaf34726c078c654fba4a9b7dd0bb6a6579fad04a6cd217b29f4efc15de9b7d9b208c593b481610534d9c8 SHA512 60f8788cc820e2be5303caedc80a377c8e5deab170d0eb9df71ff99d6fc57f31357824522f973c6e0d6b3979b58272e7f90b829474a494b94565279c53e8fbb1
+EBUILD react-1.2.1.ebuild 632 BLAKE2B a2fd1cc299a0c0cfd344961c8ec063768f350eb07af54b0148d8cb0bbedff3512de35fccd67d214df91c28870de7b8bd256fb56b3afd99cccc58b557e944d293 SHA512 e910a526186fe074beb698f603778f5f9049001d327e2e38881fe0699cc0d9ba35de5e4fbd29a70618ef910576b413f913c6884a51fe00d1d89d277482231379
+MISC metadata.xml 883 BLAKE2B dff68bd76b599be2a33087bd8061c20c7ca2124f39afb57ca2fc8c8c8121f5be45e27b1c08286fd09757717dbd9cae15de5c47bb92212239dfeac05c475a06da SHA512 6fdb70f73b3d6f47b3d71d2fd93798cb5c796480f5ee1bbb0674ce68fc5e132fa7fd5effab5c205d9448b1b5480267601e84b4bc36aadf924a4861477d2d96e3
diff --git a/dev-ml/react/metadata.xml b/dev-ml/react/metadata.xml
new file mode 100644
index 000000000000..230ed537ef5c
--- /dev/null
+++ b/dev-ml/react/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <longdescription lang="en">
+ React is an OCaml module for functional reactive programming (FRP). It
+ provides support to program with time varying values : applicative
+ events and signals. React doesn't define any primitive event or
+ signal, this lets the client chooses the concrete timeline.
+
+ React is made of a single, independent, module and distributed under
+ the new BSD license.
+
+ Given an absolute notion of time Rtime helps you to manage a timeline
+ and provides time stamp events, delayed events and delayed signals.
+ </longdescription>
+ <upstream>
+ <remote-id type="github">dbuenzli/react</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/react/react-1.2.1.ebuild b/dev-ml/react/react-1.2.1.ebuild
new file mode 100644
index 000000000000..de34f259d5a8
--- /dev/null
+++ b/dev-ml/react/react-1.2.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit opam
+
+DESCRIPTION="OCaml module for functional reactive programming"
+HOMEPAGE="http://erratique.ch/software/react https://github.com/dbuenzli/react"
+SRC_URI="http://erratique.ch/software/react/releases/${P}.tbz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+ dev-ml/findlib
+ >=dev-ml/topkg-0.9
+"
+
+src_compile() {
+ ocaml pkg/pkg.ml build \
+ --tests $(usex test 'true' 'false') \
+ || die
+}
+
+src_test() {
+ ocaml pkg/pkg.ml test || die
+}
diff --git a/dev-ml/reactiveData-0.2.1 b/dev-ml/reactiveData-0.2.1
deleted file mode 100644
index f3c56e52fd02..000000000000
--- a/dev-ml/reactiveData-0.2.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=dev-ml/react:= dev-ml/findlib dev-ml/ocamlbuild >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=Functional reactive programming with incremental changes in data structures
-EAPI=5
-HOMEPAGE=https://github.com/ocsigen/reactiveData
-IUSE=+ocamlopt
-KEYWORDS=~amd64
-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 24b4a2529c1fd12f1304856d6c5a690d
-_md5_=98d9f05c2bc8dc841646d2e6d240b8e3
diff --git a/dev-ml/reactiveData-9999 b/dev-ml/reactiveData-9999
deleted file mode 100644
index 700fe04ce050..000000000000
--- a/dev-ml/reactiveData-9999
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=dev-ml/react:= dev-ml/findlib dev-ml/ocamlbuild >=dev-lang/ocaml-4:= dev-ml/opam >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=Functional reactive programming with incremental changes in data structures
-EAPI=5
-HOMEPAGE=https://github.com/ocsigen/reactiveData
-IUSE=+ocamlopt
-LICENSE=LGPL-3-with-linking-exception
-RDEPEND=dev-ml/react:= >=dev-lang/ocaml-4:=
-SLOT=0/9999
-_eclasses_=git-r3 8f6de46b0aa318aea0e8cac62ece098b opam 24b4a2529c1fd12f1304856d6c5a690d
-_md5_=98d9f05c2bc8dc841646d2e6d240b8e3
diff --git a/dev-ml/reactiveData/Manifest b/dev-ml/reactiveData/Manifest
new file mode 100644
index 000000000000..5b9a2f3661bb
--- /dev/null
+++ b/dev-ml/reactiveData/Manifest
@@ -0,0 +1,4 @@
+DIST reactiveData-0.2.1.tar.gz 21219 BLAKE2B f3b1c4a4007fc3aefbc34d64ba5ffba5216aee675796719fde11c3c970a431cffbd6dccb35c8cc0192fcc68c7f80f06da91b1000d50ee9f3116efd6febc7e242 SHA512 e4dad870fd1f669566394d9c2ab52665a3d27f6b2dd3807dba245d89ca90eda08b98b266fb0795bcfa5cb4ffed7a86aa719f8db5c316b0d920ee3c342493d029
+EBUILD reactiveData-0.2.1.ebuild 815 BLAKE2B 25667840e8c953db8677a9a57d244b568cee148d24cb873142f28515f24c7c6160b2751733d6b723dc0c2ae3d0a97d87798a4f547755d7b02816c937796c03ad SHA512 d634e3f1c4beeed29a6664c546e6e44746fb6225a2855a753374484e57c1d3e031dd49e306b6f5400999abef45bf4346123f4aa5adfada3b43e1c73103908323
+EBUILD reactiveData-9999.ebuild 815 BLAKE2B 25667840e8c953db8677a9a57d244b568cee148d24cb873142f28515f24c7c6160b2751733d6b723dc0c2ae3d0a97d87798a4f547755d7b02816c937796c03ad SHA512 d634e3f1c4beeed29a6664c546e6e44746fb6225a2855a753374484e57c1d3e031dd49e306b6f5400999abef45bf4346123f4aa5adfada3b43e1c73103908323
+MISC metadata.xml 332 BLAKE2B 923287ded25c6a31f1e0daa4e2802ebbda3f2c2032eb10068e2c35774c1fc832b70625de1249df4a54ebe3a4f16c49d40c8f8a777cdc1d3b12b51ee4ffc15428 SHA512 860178f9dd8a157f3b9ac3e5ae70cf703913ad7644051d688928e2c9466b89256c4f145942ea6f4f8faf411547c49cecca7a2e624f2b578d68b6330197c87831
diff --git a/dev-ml/reactiveData/metadata.xml b/dev-ml/reactiveData/metadata.xml
new file mode 100644
index 000000000000..ab53110f16be
--- /dev/null
+++ b/dev-ml/reactiveData/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">ocsigen/reactiveData</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/reactiveData/reactiveData-0.2.1.ebuild b/dev-ml/reactiveData/reactiveData-0.2.1.ebuild
new file mode 100644
index 000000000000..a74fc715fcf0
--- /dev/null
+++ b/dev-ml/reactiveData/reactiveData-0.2.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit opam
+
+DESCRIPTION="Functional reactive programming with incremental changes in data structures"
+HOMEPAGE="https://github.com/ocsigen/reactiveData"
+
+if [ "${PV#9999}" != "${PV}" ] ; then
+ inherit git-r3
+ SRC_URI=""
+ EGIT_REPO_URI="https://github.com/ocsigen/reactiveData"
+ KEYWORDS=""
+else
+ SRC_URI="https://github.com/ocsigen/reactiveData/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64"
+fi
+
+LICENSE="LGPL-3-with-linking-exception"
+SLOT="0/${PV}"
+IUSE="+ocamlopt"
+
+RDEPEND="dev-ml/react:="
+DEPEND="${RDEPEND}
+ dev-ml/findlib
+ dev-ml/ocamlbuild
+"
+
+src_compile() {
+ ocaml pkg/build.ml \
+ native=$(usex ocamlopt true false) \
+ native-dynlink=$(usex ocamlopt true false) \
+ || die
+}
diff --git a/dev-ml/reactiveData/reactiveData-9999.ebuild b/dev-ml/reactiveData/reactiveData-9999.ebuild
new file mode 100644
index 000000000000..a74fc715fcf0
--- /dev/null
+++ b/dev-ml/reactiveData/reactiveData-9999.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit opam
+
+DESCRIPTION="Functional reactive programming with incremental changes in data structures"
+HOMEPAGE="https://github.com/ocsigen/reactiveData"
+
+if [ "${PV#9999}" != "${PV}" ] ; then
+ inherit git-r3
+ SRC_URI=""
+ EGIT_REPO_URI="https://github.com/ocsigen/reactiveData"
+ KEYWORDS=""
+else
+ SRC_URI="https://github.com/ocsigen/reactiveData/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64"
+fi
+
+LICENSE="LGPL-3-with-linking-exception"
+SLOT="0/${PV}"
+IUSE="+ocamlopt"
+
+RDEPEND="dev-ml/react:="
+DEPEND="${RDEPEND}
+ dev-ml/findlib
+ dev-ml/ocamlbuild
+"
+
+src_compile() {
+ ocaml pkg/build.ml \
+ native=$(usex ocamlopt true false) \
+ native-dynlink=$(usex ocamlopt true false) \
+ || die
+}
diff --git a/dev-ml/reason-2.0.0 b/dev-ml/reason-2.0.0
deleted file mode 100644
index bc97154554bb..000000000000
--- a/dev-ml/reason-2.0.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=dev-ml/reason-parser:= dev-ml/merlin-extend:= dev-ml/result:= dev-ml/topkg:= dev-ml/ocaml-migrate-parsetree:= dev-ml/utop:= dev-ml/findlib dev-ml/ocamlbuild >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=Meta Language Toolchain
-EAPI=6
-HOMEPAGE=https://github.com/facebook/reason
-IUSE=+ocamlopt
-KEYWORDS=~amd64
-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 24b4a2529c1fd12f1304856d6c5a690d
-_md5_=ce39802c8bac2fc266bf4380e1bd7394
diff --git a/dev-ml/reason-parser-2.0.0 b/dev-ml/reason-parser-2.0.0
deleted file mode 100644
index 29e5af8f3119..000000000000
--- a/dev-ml/reason-parser-2.0.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=>=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-ml/ocamlbuild >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=Meta Language Toolchain
-EAPI=6
-HOMEPAGE=https://github.com/facebook/reason
-IUSE=+ocamlopt
-KEYWORDS=~amd64
-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 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e opam 24b4a2529c1fd12f1304856d6c5a690d preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=610c58f785b745664d11d2f876ae2d1c
diff --git a/dev-ml/reason-parser/Manifest b/dev-ml/reason-parser/Manifest
new file mode 100644
index 000000000000..37a10725bf97
--- /dev/null
+++ b/dev-ml/reason-parser/Manifest
@@ -0,0 +1,3 @@
+DIST reason-parser-2.0.0.tar.gz 183562 BLAKE2B 4954b98f21946722dd97660bbc8bfed19d22cd7d30927aecbe1f12981517442bc4c4ee7c9e58538ccb3b09b4e4fed8e58f87f8e583f0f49ad36b97bede1093ab SHA512 43d05367978a273625d43fbee33c554777a24003b3a843b610da2a73187f2c5ad7dc110fd2b50ba4671ca05e7fcff6ed63fdf52f79769752b31d0aec48fab84c
+EBUILD reason-parser-2.0.0.ebuild 835 BLAKE2B 2047d3a28a1e07b72c6b821a76c1aa3de0b8782203b97faab31be73e02b191c9225b040221e875637dcbe98285845e59c2ea4a35d8e08aab0b3676a4c86b4e5b SHA512 6249b3bda1828a3f621e0c4f14b1a29b5fd3241e16bc2194319cd8745e790f65015d39e6f4450c73c6a387a23bbf4fbaea71a6f10bfa84272601591a4a014e52
+MISC metadata.xml 327 BLAKE2B 20761baadf58eed46854c6f1a748700a95c54e421450491a073c1f693b236616aab5ec15f95326271ea49242b09e163e704ca2d8081522dbc8577f6c75367a5c SHA512 e31d023f933d9df780e34a4fad75e789c6f94e09eb597f2e8ddbf8b1cbd39ea996c878b2f0ce4b9d03392ab59c0362379774256caa54f6e6e9515270abc9797e
diff --git a/dev-ml/reason-parser/metadata.xml b/dev-ml/reason-parser/metadata.xml
new file mode 100644
index 000000000000..ffe46435e1e5
--- /dev/null
+++ b/dev-ml/reason-parser/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">facebook/reason</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/reason-parser/reason-parser-2.0.0.ebuild b/dev-ml/reason-parser/reason-parser-2.0.0.ebuild
new file mode 100644
index 000000000000..2ec81a735441
--- /dev/null
+++ b/dev-ml/reason-parser/reason-parser-2.0.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit findlib eutils opam
+
+DESCRIPTION="Meta Language Toolchain"
+HOMEPAGE="https://github.com/facebook/reason"
+SRC_URI="https://github.com/facebook/reason/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="+ocamlopt"
+
+DEPEND="
+ >=dev-ml/menhir-20170418:=
+ dev-ml/merlin-extend:=
+ dev-ml/result:=
+ dev-ml/topkg:=
+ dev-ml/ocaml-migrate-parsetree:=
+ dev-ml/ppx_tools_versioned:=
+"
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND}
+ dev-ml/ocamlbuild
+"
+
+S="${WORKDIR}/${PN}"
+
+src_compile() {
+ emake compile_error
+ ocamlbuild -package topkg pkg/build.native || die
+ ./build.native build \
+ --native "$(usex ocamlopt true false)" \
+ --native-dynlink "$(usex ocamlopt true false)" \
+ || die
+}
diff --git a/dev-ml/reason/Manifest b/dev-ml/reason/Manifest
new file mode 100644
index 000000000000..5b16cb8e85bb
--- /dev/null
+++ b/dev-ml/reason/Manifest
@@ -0,0 +1,3 @@
+DIST reason-2.0.0.tar.gz 6639139 BLAKE2B c2f65c967e86ab9d57d25194aa5f113b7d11fce1d3c47d7b93b31ae0728b8e3528c736e694c462e4debcce228c227e612901cc576604c69afd966a40058ac429 SHA512 5e8fb81193de90fcf95ae39e66dab6b7638f1b6f37f7f438c3692e67de8f33667eca92e76df4968ad794e4bd02674583203e1058f1e990f3f6e87d8ce1fbbb43
+EBUILD reason-2.0.0.ebuild 627 BLAKE2B e504467b4b23bca9b915ccbf23e4a2924ea047dd96f14907296c138c514c5db5cba4ec4ec5e973aeb3555899b5c7507db4537cf2efa5efec36311d7a8c7ac6fe SHA512 b21460ebf47b988e32daa46695ddaebe4fe8f4a6c3c6d83ca57bb97974478e76e25a132b467dd6914c293080b2801cc364aa0a6677a666321c3eeb87aa7388af
+MISC metadata.xml 327 BLAKE2B 20761baadf58eed46854c6f1a748700a95c54e421450491a073c1f693b236616aab5ec15f95326271ea49242b09e163e704ca2d8081522dbc8577f6c75367a5c SHA512 e31d023f933d9df780e34a4fad75e789c6f94e09eb597f2e8ddbf8b1cbd39ea996c878b2f0ce4b9d03392ab59c0362379774256caa54f6e6e9515270abc9797e
diff --git a/dev-ml/reason/metadata.xml b/dev-ml/reason/metadata.xml
new file mode 100644
index 000000000000..ffe46435e1e5
--- /dev/null
+++ b/dev-ml/reason/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">facebook/reason</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/reason/reason-2.0.0.ebuild b/dev-ml/reason/reason-2.0.0.ebuild
new file mode 100644
index 000000000000..0fc83b36497d
--- /dev/null
+++ b/dev-ml/reason/reason-2.0.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit opam
+
+DESCRIPTION="Meta Language Toolchain"
+HOMEPAGE="https://github.com/facebook/reason"
+SRC_URI="https://github.com/facebook/reason/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="+ocamlopt"
+
+DEPEND="
+ dev-ml/reason-parser:=
+ dev-ml/merlin-extend:=
+ dev-ml/result:=
+ dev-ml/topkg:=
+ dev-ml/ocaml-migrate-parsetree:=
+ dev-ml/utop:=
+"
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND}
+ dev-ml/findlib
+ dev-ml/ocamlbuild
+"
+
+src_compile() {
+ emake precompile
+ emake build
+}
diff --git a/dev-ml/res-4.0.7 b/dev-ml/res-4.0.7
deleted file mode 100644
index f86807ef906b..000000000000
--- a/dev-ml/res-4.0.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-ml/findlib-1.5 >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=Resizable Array and Buffer modules for O'Caml
-EAPI=5
-HOMEPAGE=http://mmottl.github.io/res/
-IUSE=examples +ocamlopt debug doc
-KEYWORDS=amd64 ppc x86
-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 983774947da124fb7d542ce25a218bb1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e oasis 9256ed89af74c3365ec888c00bfdfe43 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3c4158afdb258c06220e4c8ac4ea9130
diff --git a/dev-ml/res-5.0.0 b/dev-ml/res-5.0.0
deleted file mode 100644
index 45e5f8709167..000000000000
--- a/dev-ml/res-5.0.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=dev-ml/jbuilder >=dev-ml/findlib-1.5 >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=Resizable Array and Buffer modules for O'Caml
-EAPI=5
-HOMEPAGE=http://mmottl.github.io/res/
-KEYWORDS=~amd64 ~ppc ~x86
-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 24b4a2529c1fd12f1304856d6c5a690d
-_md5_=06ecbc99998705f172721886a8d04509
diff --git a/dev-ml/res/Manifest b/dev-ml/res/Manifest
new file mode 100644
index 000000000000..ff78bd730b86
--- /dev/null
+++ b/dev-ml/res/Manifest
@@ -0,0 +1,5 @@
+DIST res-4.0.7.tar.gz 74752 BLAKE2B 490e72f85618c03c4731051f043b1fc79f2e06684444e0f2a56f62fba74f790ce3339b2b1a9ad526b8e4df7e859b9a2342393d7a9970efffa2517d22f7393cad SHA512 4a1f00d76847eaaf0756fd20f7e1062e30ba7fd432621269f7d18b293abe0bc4a461ff077b5c4e0fe83710f113d6fe8846826b70faed8cb7fc6a5653814d297e
+DIST res-5.0.0.tbz 26967 BLAKE2B fc91ef0ccee3ca1577e394b7e162c68699a9e73901d24a041dca2f82077ad018f6bbe06a3ca1c634388e8fc2ae3335922636e339b598819864008a7f33937ffa SHA512 e2e8e8d3090efdcb4d0e99b6f71ac3d43dadc663e2a5028434e36a97cef0d624dfdfe93b88b959e798d348ff6080c3abd7143ccdbac81d500d953ad1ed6dcf92
+EBUILD res-4.0.7.ebuild 647 BLAKE2B f194ec02edfed2187ec507ff0b6eb2a60af006cd9c290fbb8eb07297e72c7bd9c96ee2b6d069dad3e7f6e7b8c4f4dec6d60cf9ef1046781e3d8b3ed305b508af SHA512 10d063932fbc99565e73d12e0c81023ff64e20ebc57114658f89344355f3076b44609fe7dfd9c7202ecc2590a039b5132abd15fec58543a8c0fcc338a425cbca
+EBUILD res-5.0.0.ebuild 518 BLAKE2B 3ec462eef034fe67668321e500989061b3bd68d7bfef5f1ac29b224e48650ee879cbeb7929bab3157d38428066d5736995b305aa10caa4ec235294aae966c163 SHA512 2650d66edb25fee682cec0cad3b80bf7509e05296800f1ea309d06e849da27e46963dd441e714857404f9d929a2b3948b3adc52d700a3a4ab1b10a908a2e2ce2
+MISC metadata.xml 387 BLAKE2B 095d6c24a37aeb91413a3ee6a8aa652c9cddf7e72ad7c521a7cdb4a21eabcea796ee3e56affc126285ffb89d8a57979cf743b9b03d34658d2864c2d485cb91da SHA512 31ac19d1fafee767d63a69db9e41974ea095adf5a431977d8f4bb7746b01e8710a0ab77e1787615756d6c669566192530a8ed3253bee436970d800e611e0569d
diff --git a/dev-ml/res/metadata.xml b/dev-ml/res/metadata.xml
new file mode 100644
index 000000000000..68042fc03bff
--- /dev/null
+++ b/dev-ml/res/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">mmottl/res</remote-id>
+ <remote-id type="bitbucket">mmottl/res</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/res/res-4.0.7.ebuild b/dev-ml/res/res-4.0.7.ebuild
new file mode 100644
index 000000000000..60ad01e84ab7
--- /dev/null
+++ b/dev-ml/res/res-4.0.7.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+OASIS_BUILD_DOCS=1
+
+inherit oasis
+
+DESCRIPTION="Resizable Array and Buffer modules for O'Caml"
+HOMEPAGE="http://mmottl.github.io/res/"
+SRC_URI="https://github.com/mmottl/res/releases/download/v${PV}/${P}.tar.gz"
+LICENSE="LGPL-2.1-with-linking-exception"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+ >=dev-ml/findlib-1.5"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ppc x86"
+IUSE="examples"
+
+DOCS=( "AUTHORS.txt" "CHANGES.txt" "README.md" )
+
+src_install() {
+ oasis_src_install
+ if use examples ; then
+ insinto /usr/share/doc/${PF}
+ doins -r examples
+ fi
+}
diff --git a/dev-ml/res/res-5.0.0.ebuild b/dev-ml/res/res-5.0.0.ebuild
new file mode 100644
index 000000000000..b503e1c2eed3
--- /dev/null
+++ b/dev-ml/res/res-5.0.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit opam
+
+DESCRIPTION="Resizable Array and Buffer modules for O'Caml"
+HOMEPAGE="http://mmottl.github.io/res/"
+SRC_URI="https://github.com/mmottl/res/releases/download/${PV}/${P}.tbz"
+LICENSE="LGPL-2.1-with-linking-exception"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+ dev-ml/jbuilder
+ >=dev-ml/findlib-1.5"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+src_compile() {
+ jbuilder build @install || die
+}
diff --git a/dev-ml/result-1.2 b/dev-ml/result-1.2
deleted file mode 100644
index f3b21e9876a8..000000000000
--- a/dev-ml/result-1.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=dev-lang/ocaml:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Compat result type
-EAPI=5
-HOMEPAGE=https://github.com/janestreet/result
-IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
-LICENSE=BSD
-RDEPEND=dev-lang/ocaml:=[ocamlopt?]
-SLOT=0/1.2
-SRC_URI=https://github.com/janestreet/result/archive/1.2.tar.gz -> result-1.2.tar.gz
-_eclasses_=findlib 45d6030075064a68da8d7143726a1150
-_md5_=799973ba6cd4e0a8cd6fcb53c039eab8
diff --git a/dev-ml/result/Manifest b/dev-ml/result/Manifest
new file mode 100644
index 000000000000..85e8a20db006
--- /dev/null
+++ b/dev-ml/result/Manifest
@@ -0,0 +1,3 @@
+DIST result-1.2.tar.gz 2100 BLAKE2B 9c746c85200ad6af1014dbc4959347b19f48f24448fb36a33b0b50f8d3d8cf4536f7ea3e994953d29122c8dafe87289707eeab67f7a0dc44d0bc509715169e79 SHA512 b47fe24302182642c7dfb3329a9a475518fca01ed7080fb625379abbb7ada0bec4a27e666886c101ba4b0083eeb6312740d99ef764690d38ee6e6d8960fc9b87
+EBUILD result-1.2.ebuild 563 BLAKE2B a8b4d1bee26726d7b7a32c572309971d9be669bf84c82fecd42721579208c1034585e02bd9ecc510601ad1303655eb015269a627a014c374dac703a869f20b01 SHA512 f413b92901bdf028cdfea175326f331a2664a560ccd4bb0ee7dff922ec8c85fbc1d122abe06b090b29daab0bb2bd876b8f0fc327ee733317a89a0c6d6b706d69
+MISC metadata.xml 329 BLAKE2B 2796d8340c435b0f89706c8e15d8594c5b5083a815e6f51c1bfec854ee7865e965cb73b82f57b2055107f13069f026563b7632754a94c16492ffa5e5e9e67a04 SHA512 4ea5b500ba6410169ab994f54a207ba964ca2dbbfb61462ecf087760f54833fb35b8c1f73237c2ec918b08d46550103fea0f33b3348dee4c8a88dca52f751649
diff --git a/dev-ml/result/metadata.xml b/dev-ml/result/metadata.xml
new file mode 100644
index 000000000000..2246b0f460c5
--- /dev/null
+++ b/dev-ml/result/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">janestreet/result</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/result/result-1.2.ebuild b/dev-ml/result/result-1.2.ebuild
new file mode 100644
index 000000000000..8c8cb8d1cd21
--- /dev/null
+++ b/dev-ml/result/result-1.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit findlib
+
+DESCRIPTION="Compat result type"
+HOMEPAGE="https://github.com/janestreet/result"
+SRC_URI="https://github.com/janestreet/result/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE="+ocamlopt"
+
+RDEPEND="dev-lang/ocaml:=[ocamlopt?]"
+DEPEND="${RDEPEND}"
+
+src_compile() {
+ emake byte
+ use ocamlopt && emake native
+}
+
+src_install() {
+ findlib_src_install
+ dodoc README.md
+}
diff --git a/dev-ml/rresult-0.5.0 b/dev-ml/rresult-0.5.0
deleted file mode 100644
index ba7f1fa9b13b..000000000000
--- a/dev-ml/rresult-0.5.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=dev-ml/result:= dev-ml/topkg dev-ml/ocamlbuild >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=Result value combinators for OCaml
-EAPI=6
-HOMEPAGE=http://erratique.ch/software/rresult https://github.com/dbuenzli/rresult
-KEYWORDS=~amd64
-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 24b4a2529c1fd12f1304856d6c5a690d
-_md5_=9ebd0f5b91bf437a8aedc844fa976268
diff --git a/dev-ml/rresult/Manifest b/dev-ml/rresult/Manifest
new file mode 100644
index 000000000000..b789dac366f6
--- /dev/null
+++ b/dev-ml/rresult/Manifest
@@ -0,0 +1,3 @@
+DIST rresult-0.5.0.tbz 9185 BLAKE2B efe8d248aa3d68b13b011dccb98cb04127dfec9d659dfe8619f658b254cfcdca833e125310553dee54ef4be239c308e762d2290386f4fd08a5f2c1835faa9ef1 SHA512 45787b61adb7daedf72e4ff632cf3d4917bccb3e83613dabf93437982887d9a0ed3b6cbefb2b17cb341a825346cb0609286df581c6ff379583dc83672ee25efc
+EBUILD rresult-0.5.0.ebuild 514 BLAKE2B 661f63b5ba38f9095564e358dfb223e4671f6e8a12983ee021ff332fdf66d1574938f3d5ab0d8a1a920af3d476fc64c65432f90378f7d68b2648707e55a86caf SHA512 d1c5eb9887f41d0f326845050be3042a236770ef68ef67bd6aded9ec8e9e5002794744d7690ee861081e8f4bb6dc96780e3d697850641fe8b0d56070311bd080
+MISC metadata.xml 328 BLAKE2B 156882fa53b56f7046ca389646dfeb61e06872aa15bc858c5a2b69c5bd8f2b9bcc59f68bfcf46f616c1c741fbc71619337000568eebc8425bc865470c1393edf SHA512 0a42db862c2cdb4164f7c93c8457d33ddaaede7c97e17d199ab7b24482f600ebb5d712bd7d92245f62c5614b35520070b5595fd010aa72b7cff80109b3e1ee8f
diff --git a/dev-ml/rresult/metadata.xml b/dev-ml/rresult/metadata.xml
new file mode 100644
index 000000000000..9f837b5c8652
--- /dev/null
+++ b/dev-ml/rresult/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">dbuenzli/rresult</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/rresult/rresult-0.5.0.ebuild b/dev-ml/rresult/rresult-0.5.0.ebuild
new file mode 100644
index 000000000000..85613f2d372e
--- /dev/null
+++ b/dev-ml/rresult/rresult-0.5.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit opam
+
+DESCRIPTION="Result value combinators for OCaml"
+HOMEPAGE="http://erratique.ch/software/rresult https://github.com/dbuenzli/rresult"
+SRC_URI="http://erratique.ch/software/rresult/releases/${P}.tbz"
+
+LICENSE="ISC"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="dev-ml/result:="
+DEPEND="${RDEPEND}
+ dev-ml/topkg
+ dev-ml/ocamlbuild"
+
+src_compile() {
+ ocaml pkg/pkg.ml build || die
+}
diff --git a/dev-ml/sedlex-1.99.3 b/dev-ml/sedlex-1.99.3
deleted file mode 100644
index e14199e73ef4..000000000000
--- a/dev-ml/sedlex-1.99.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=dev-lang/ocaml:=[ocamlopt?] dev-ml/gen:=[ocamlopt(+)?] dev-ml/ppx_tools:=[ocamlopt(+)?] >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=An OCaml lexer generator for Unicode
-EAPI=6
-HOMEPAGE=https://github.com/alainfrisch/sedlex
-IUSE=+ocamlopt
-KEYWORDS=~amd64
-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
-_md5_=2ed7559a90be1316e9b2f08b47dec633
diff --git a/dev-ml/sedlex-1.99.4 b/dev-ml/sedlex-1.99.4
deleted file mode 100644
index 4bbafbf59886..000000000000
--- a/dev-ml/sedlex-1.99.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=dev-lang/ocaml:=[ocamlopt?] dev-ml/gen:=[ocamlopt(+)?] dev-ml/ppx_tools_versioned:=[ocamlopt(+)?] dev-ml/ocaml-migrate-parsetree:=[ocamlopt(+)?] >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=An OCaml lexer generator for Unicode
-EAPI=6
-HOMEPAGE=https://github.com/alainfrisch/sedlex
-IUSE=+ocamlopt
-KEYWORDS=~amd64
-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
-_md5_=c0cb9db11ce36c1d5636e6e5fa3b95b2
diff --git a/dev-ml/sedlex/Manifest b/dev-ml/sedlex/Manifest
new file mode 100644
index 000000000000..5ad1d4e5f3b3
--- /dev/null
+++ b/dev-ml/sedlex/Manifest
@@ -0,0 +1,5 @@
+DIST sedlex-1.99.3.tar.gz 58236 BLAKE2B 48ebc0f7bc090fa5d80404cc9135f4f52ac7b5c651b6df1e8f02506b235dba78d4bab9736cdb1c3865acf940c9af8eb00eebc3f6d399d3d7c4a897fd9e2eeaa4 SHA512 d0359a4c3f4d9efe51fa79405ae79f20ab64949838acbac475a9bcb7f42e0b972e66429eca2063fda6ae6af04475dbf29a331cf005f3338e7fc130afab477392
+DIST sedlex-1.99.4.tar.gz 59359 BLAKE2B d1b76304289111fe020a50dddf6fcf29d958f69d7d4841d62633a291e0ffb08a2ddc1bc5754ccb0dbc4ac0852cd0fe2bb3a0b53b579755e0d210bf18c520f796 SHA512 83bddb03e25b015bc71fb59e3b0e0e097e899c681c8033663c17936f28fde8599a82eaab9c26eafd645c401c106e65fcf173d9fb889eb8999eb1b064ff8b6149
+EBUILD sedlex-1.99.3.ebuild 702 BLAKE2B e4d89b613a2618a5eb08aeeec2648414b6851efce4cdb5e6cf46c0c4c6aae2e63f15764873eee522055d067d4ef0e490164e1379ea5fe175ba6a1683541ef499 SHA512 7dea01dc66a519f40b57919f1b6fa9639795468d44dc6255f5fd9b70a998ca4344a861d2d1a913396f102cb21bb469d22036eef7dea428b62d35ff7d66512fe8
+EBUILD sedlex-1.99.4.ebuild 792 BLAKE2B 1f180d602d1455d929452f7df4aa3a78fe5edebfe1a6300e7e4932b1a6d418e60ad63e9d9c8cd1c2da0544c8401257ec360b299eda4f4a51491e70806cc647df SHA512 2241b056be7060a490abc3c00510b8598166f20eae79dc86858220588d8c5f2f622375bbb12356cd9ca6998275a704bedfaa51d2367b96e2e5f3088c07f3bc7e
+MISC metadata.xml 330 BLAKE2B 45b669f29c66efebf38c4d42a294f9aba8343b3727510a6f8b8e4e33786171347408f97c1975a44cad74da16cdda932e4e888cff1032cbcafd40be327585f1b5 SHA512 15b5e3deb7d8cef4258f2f689497926af6a4e1ec0cc202942b6525f6154da52ef6df6e674dd1e3041bdaa3f1263b5ccc4de554c4ccfc863909a5ef72876673fe
diff --git a/dev-ml/sedlex/metadata.xml b/dev-ml/sedlex/metadata.xml
new file mode 100644
index 000000000000..ae029bd9c53f
--- /dev/null
+++ b/dev-ml/sedlex/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">alainfrisch/sedlex</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/sedlex/sedlex-1.99.3.ebuild b/dev-ml/sedlex/sedlex-1.99.3.ebuild
new file mode 100644
index 000000000000..467b1c870d45
--- /dev/null
+++ b/dev-ml/sedlex/sedlex-1.99.3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit findlib
+
+DESCRIPTION="An OCaml lexer generator for Unicode"
+HOMEPAGE="https://github.com/alainfrisch/sedlex"
+SRC_URI="https://github.com/alainfrisch/sedlex/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="+ocamlopt"
+
+DEPEND="
+ dev-lang/ocaml:=[ocamlopt?]
+ dev-ml/gen:=[ocamlopt(+)?]
+ dev-ml/ppx_tools:=[ocamlopt(+)?]
+"
+RDEPEND="${DEPEND}"
+
+src_compile() {
+ emake all
+ use ocamlopt && emake opt
+}
+
+src_install() {
+ findlib_src_preinst
+ if use ocamlopt; then
+ emake install
+ else
+ emake install_byteonly
+ fi
+ dodoc CHANGES README.md
+}
diff --git a/dev-ml/sedlex/sedlex-1.99.4.ebuild b/dev-ml/sedlex/sedlex-1.99.4.ebuild
new file mode 100644
index 000000000000..b2a4d281ef05
--- /dev/null
+++ b/dev-ml/sedlex/sedlex-1.99.4.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit findlib
+
+DESCRIPTION="An OCaml lexer generator for Unicode"
+HOMEPAGE="https://github.com/alainfrisch/sedlex"
+SRC_URI="https://github.com/alainfrisch/sedlex/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="+ocamlopt"
+
+DEPEND="
+ dev-lang/ocaml:=[ocamlopt?]
+ dev-ml/gen:=[ocamlopt(+)?]
+ dev-ml/ppx_tools_versioned:=[ocamlopt(+)?]
+ dev-ml/ocaml-migrate-parsetree:=[ocamlopt(+)?]
+"
+RDEPEND="${DEPEND}"
+
+src_compile() {
+ emake all
+ use ocamlopt && emake opt
+}
+
+src_test() {
+ emake -j1 test
+}
+
+src_install() {
+ findlib_src_preinst
+ if use ocamlopt; then
+ emake install
+ else
+ emake install_byteonly
+ fi
+ dodoc CHANGES README.md
+}
diff --git a/dev-ml/sequence-0.10 b/dev-ml/sequence-0.10
deleted file mode 100644
index 7f2ee3e4687b..000000000000
--- a/dev-ml/sequence-0.10
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-lang/ocaml-4.03:= test? ( dev-ml/iTeML ) >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=Simple sequence (iterator) datatype and combinators
-EAPI=5
-HOMEPAGE=https://github.com/c-cube/sequence
-IUSE=+ocamlopt debug doc test
-KEYWORDS=~amd64
-LICENSE=BSD-2
-RDEPEND=>=dev-lang/ocaml-4.03:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
-SLOT=0/0.10
-SRC_URI=https://github.com/c-cube/sequence/archive/0.10.tar.gz -> sequence-0.10.tar.gz
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e oasis 9256ed89af74c3365ec888c00bfdfe43 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a84a8aa0a043e74973f0beebb58deced
diff --git a/dev-ml/sequence/Manifest b/dev-ml/sequence/Manifest
new file mode 100644
index 000000000000..014d1857a466
--- /dev/null
+++ b/dev-ml/sequence/Manifest
@@ -0,0 +1,3 @@
+DIST sequence-0.10.tar.gz 88020 BLAKE2B 407b6df189c33c9dc8c47fc6c47edf1ff500935f371014756c88e6929cf038ce358abf7039636f42164286cd705047be530ff0f8899fb0ba63bed37ff503fb19 SHA512 52ca4a2f83d774e6cee7f35c4ef6942968d7ca3b902f645a3d36620a2a4ebe78532383ad4e7de4fac23f1a04e5005cd0b23c0cd0b7b4e329ad05d8341c5ddc3e
+EBUILD sequence-0.10.ebuild 539 BLAKE2B ddb77ca0f38c83002e56b91aa8d0baecc71d94b49295d80d9f944edf0ea920e40a757346b56e6e3297331eaf8a0f11c817b1d5816b986094833b19c950c861b7 SHA512 c5652e0d04657708b2cde6eeab375d21f1c962abf2f454215a9395617e4c7498d57fbf9c47a1dd8f6fffedb048d3c6f8adc9155fedc1915dbf056ebbe208e212
+MISC metadata.xml 327 BLAKE2B 0aa6ac537a791e6ff82677b6e9a1180336092b4f6a5cac4191938c1eca6d695044b8b0be4c6b1e9d640e2bbdf82b2dfb047240025d4b910052c283ad7646f4e3 SHA512 0ed63b402952537100083251bae2b69af73b54a7e9fd779e3381527ed0d2f6986e3641040137807b608aabdfc3661b86bb6b19fcfdf078a86a677bd811f06960
diff --git a/dev-ml/sequence/metadata.xml b/dev-ml/sequence/metadata.xml
new file mode 100644
index 000000000000..d1abc039fe95
--- /dev/null
+++ b/dev-ml/sequence/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">c-cube/sequence</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/sequence/sequence-0.10.ebuild b/dev-ml/sequence/sequence-0.10.ebuild
new file mode 100644
index 000000000000..1d89efbc87af
--- /dev/null
+++ b/dev-ml/sequence/sequence-0.10.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+OASIS_BUILD_DOCS=1
+OASIS_BUILD_TESTS=1
+
+inherit oasis
+
+DESCRIPTION="Simple sequence (iterator) datatype and combinators"
+HOMEPAGE="https://github.com/c-cube/sequence"
+SRC_URI="https://github.com/c-cube/sequence/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND=">=dev-lang/ocaml-4.03:="
+DEPEND="${RDEPEND}
+ test? ( dev-ml/iTeML )"
+DOCS=( "README.adoc" "CHANGELOG.md" )
diff --git a/dev-ml/sexplib-0.9.2 b/dev-ml/sexplib-0.9.2
deleted file mode 100644
index d60aedc2a8ac..000000000000
--- a/dev-ml/sexplib-0.9.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install test
-DEPEND=dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=Library for automated conversion of OCaml-values to and from S-expressions
-EAPI=6
-HOMEPAGE=https://github.com/janestreet/sexplib
-KEYWORDS=~amd64 ~ppc ~x86
-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 24b4a2529c1fd12f1304856d6c5a690d
-_md5_=282a1dc214e669d93cbd747d5e9433bf
diff --git a/dev-ml/sexplib-0.9.3 b/dev-ml/sexplib-0.9.3
deleted file mode 100644
index a65e284aa06b..000000000000
--- a/dev-ml/sexplib-0.9.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install test
-DEPEND=dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=Library for automated conversion of OCaml-values to and from S-expressions
-EAPI=6
-HOMEPAGE=https://github.com/janestreet/sexplib
-KEYWORDS=~amd64 ~ppc ~x86
-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 24b4a2529c1fd12f1304856d6c5a690d
-_md5_=282a1dc214e669d93cbd747d5e9433bf
diff --git a/dev-ml/sexplib/Manifest b/dev-ml/sexplib/Manifest
new file mode 100644
index 000000000000..05a48506e181
--- /dev/null
+++ b/dev-ml/sexplib/Manifest
@@ -0,0 +1,5 @@
+DIST sexplib-0.9.2.tar.gz 75035 BLAKE2B c08e4285cc36fe259d5145d43c847bc466e0b4d9897c58708ce39e6b04d52c84cc5c7603f296edaf6c0752c846d9cb9b03c9610eb5d3fd9bc1b1ad67b4a046cd SHA512 d9e02ae9e7e8be4387c5d4e5c4a23222e2ebbd3355d52c26e0d6ac0ccc4f4e09653ac2852e6698d6128ff954888e65d97dd7a494b9404bad2e8349cd592bab1d
+DIST sexplib-0.9.3.tar.gz 75074 BLAKE2B 60ddb336f8ff334f995399e63a12d9ab5403ed27bf62259d13159eed0a5c6b246673406ca9ed9f542cdc4e53460a5136f56fe75127ea199448e85dd55cf53ff3 SHA512 32c471b3ef2b2595fed7fa748b7bc7059491651442dec0bca5a60b93458d78b0950e4386a973c9c856ba25f3f839d6747ab9e2e88b1927f9907e8107b63b706d
+EBUILD sexplib-0.9.2.ebuild 515 BLAKE2B a4ef4e8164a6aefffdcdbce59d6fd43887c94e9ca08fe4f3c88ad218aa804b62d0c7f5a49cec86ae92db1aef69bb6f64692a2dfce8f5abcd18fae92fea1ad6e1 SHA512 067410c18c17bec06a6091b8d8dfdf84f05bc3b853cab8283833311a4cc4ba16aec12dd168d4eab2c4f38ffc657f2f575d015ad21f0de2d802f35aa38c3a78f9
+EBUILD sexplib-0.9.3.ebuild 515 BLAKE2B a4ef4e8164a6aefffdcdbce59d6fd43887c94e9ca08fe4f3c88ad218aa804b62d0c7f5a49cec86ae92db1aef69bb6f64692a2dfce8f5abcd18fae92fea1ad6e1 SHA512 067410c18c17bec06a6091b8d8dfdf84f05bc3b853cab8283833311a4cc4ba16aec12dd168d4eab2c4f38ffc657f2f575d015ad21f0de2d802f35aa38c3a78f9
+MISC metadata.xml 403 BLAKE2B be9cb43de9b7b996cb66a91749407505e7cbb169d510564949155c4d13bd60397d1b46b13e6cc0dbe47b43b6dad5dca73027a4d41100fb759bde076a69b5c1ff SHA512 eca3cf17735fd16c06a64d309bf510f0ef43c3ac7ef2dd5af29a8c12142830bb266600bcff5ed174232028139239a9d6cb3c85e07c6cc63471eed026a3536a12
diff --git a/dev-ml/sexplib/metadata.xml b/dev-ml/sexplib/metadata.xml
new file mode 100644
index 000000000000..c696f7c81c16
--- /dev/null
+++ b/dev-ml/sexplib/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="bitbucket">yminsky/ocaml-core</remote-id>
+ <remote-id type="github">janestreet/sexplib</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/sexplib/sexplib-0.9.2.ebuild b/dev-ml/sexplib/sexplib-0.9.2.ebuild
new file mode 100644
index 000000000000..a5ed48014b30
--- /dev/null
+++ b/dev-ml/sexplib/sexplib-0.9.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit opam
+
+DESCRIPTION="Library for automated conversion of OCaml-values to and from S-expressions"
+HOMEPAGE="https://github.com/janestreet/sexplib"
+SRC_URI="https://github.com/janestreet/sexplib/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND} dev-ml/jbuilder"
+
+src_test() {
+ jbuilder runtest || die
+}
diff --git a/dev-ml/sexplib/sexplib-0.9.3.ebuild b/dev-ml/sexplib/sexplib-0.9.3.ebuild
new file mode 100644
index 000000000000..a5ed48014b30
--- /dev/null
+++ b/dev-ml/sexplib/sexplib-0.9.3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit opam
+
+DESCRIPTION="Library for automated conversion of OCaml-values to and from S-expressions"
+HOMEPAGE="https://github.com/janestreet/sexplib"
+SRC_URI="https://github.com/janestreet/sexplib/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND} dev-ml/jbuilder"
+
+src_test() {
+ jbuilder runtest || die
+}
diff --git a/dev-ml/spawn-0.9.0 b/dev-ml/spawn-0.9.0
deleted file mode 100644
index e1cc02c1c597..000000000000
--- a/dev-ml/spawn-0.9.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=Spawning sub-processes
-EAPI=6
-HOMEPAGE=https://github.com/janestreet/spawn
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=>=dev-lang/ocaml-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 24b4a2529c1fd12f1304856d6c5a690d
-_md5_=efa61e05acee15c9104a3e2f5b0dae70
diff --git a/dev-ml/spawn/Manifest b/dev-ml/spawn/Manifest
new file mode 100644
index 000000000000..cc4aebba6338
--- /dev/null
+++ b/dev-ml/spawn/Manifest
@@ -0,0 +1,3 @@
+DIST spawn-0.9.0.tar.gz 12689 BLAKE2B cc07c3be778b32465e78789638c5d46169d17882058a6c441b37b95c6a291cd5291af8ef1e9d48aa996cd35acddc343159d7da959136df5f84ffea4e1fb7d028 SHA512 29d8e3477d5f90bfa4d2ad874b870a9ea7e140507050e0d1d7e851af75fbd61e5ab64218a0ce00cae8a38ee8675e8ebca1faee009dfe57b8ca8f130a1b46e8c9
+EBUILD spawn-0.9.0.ebuild 426 BLAKE2B d436be6ebf00506d554f1022300bfcd1e56017097a5a3f4b27339247f266540bd7fda8e1fb9d02d2efb97f49a22c5725d80526332ddd28c4e6dc808ce7389e63 SHA512 42480483d3ed89b818ebbd7477bd28b8841a38fab4431078583ab370fd44517fe96bab76e7e8262d77b186413df58c670cb67aea2952236dcb6901ee20a5ffba
+MISC metadata.xml 328 BLAKE2B b3545d22b1e0e9f6ed29dd88bd4bdd599480505ca786c39c3089a30e0089637ac6ce35873f262ac0219860c8531e5e40c9152feb1817e2370a4b7f98e6f22707 SHA512 7d335e9b89fc44f81dd87d4e4402fe0c478e45cd8e39e642a89bcf16fd4136ead51c7c3822a85898615f94c8b053a325c22abf17b0e5ce1b24c78ed35ee0cddf
diff --git a/dev-ml/spawn/metadata.xml b/dev-ml/spawn/metadata.xml
new file mode 100644
index 000000000000..d154edf55543
--- /dev/null
+++ b/dev-ml/spawn/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">janestreet/spawn</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/spawn/spawn-0.9.0.ebuild b/dev-ml/spawn/spawn-0.9.0.ebuild
new file mode 100644
index 000000000000..20fe4468b71d
--- /dev/null
+++ b/dev-ml/spawn/spawn-0.9.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit opam
+
+DESCRIPTION="Spawning sub-processes"
+HOMEPAGE="https://github.com/janestreet/spawn"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND} dev-ml/jbuilder"
diff --git a/dev-ml/stdio-0.9.0-r1 b/dev-ml/stdio-0.9.0-r1
deleted file mode 100644
index bdb92abeab3f..000000000000
--- a/dev-ml/stdio-0.9.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install test
-DEPEND=dev-ml/base:= dev-ml/sexplib:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=Standard IO Library for OCaml
-EAPI=6
-HOMEPAGE=https://github.com/janestreet/stdio
-KEYWORDS=~amd64 ~ppc ~x86
-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 24b4a2529c1fd12f1304856d6c5a690d
-_md5_=e2dfb45e87ff0a6207348a54312c9e2f
diff --git a/dev-ml/stdio-0.9.1 b/dev-ml/stdio-0.9.1
deleted file mode 100644
index 4dd3e724367d..000000000000
--- a/dev-ml/stdio-0.9.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install test
-DEPEND=dev-ml/base:= dev-ml/sexplib:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=Standard IO Library for OCaml
-EAPI=6
-HOMEPAGE=https://github.com/janestreet/stdio
-KEYWORDS=~amd64 ~ppc ~x86
-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 24b4a2529c1fd12f1304856d6c5a690d
-_md5_=e2dfb45e87ff0a6207348a54312c9e2f
diff --git a/dev-ml/stdio/Manifest b/dev-ml/stdio/Manifest
new file mode 100644
index 000000000000..48c2b7632ab4
--- /dev/null
+++ b/dev-ml/stdio/Manifest
@@ -0,0 +1,5 @@
+DIST stdio-0.9.0.tar.gz 9264 BLAKE2B 1f3d7748ed07672eaad7c747c8925fb9e5204d59c05e8ee8674d689dcc44b9ae9d2da8420cfa05e8e0a58bded343cba979ff42f5f8fdae5392a1868591269f32 SHA512 a3809272c00653872d02b07b6c133215e06a70a7cbebed8c6c22ba5790ee8cbba17821da7875290c8869dfac22bf3cf248028e2aed2570195ca9b5f63b6ab75d
+DIST stdio-0.9.1.tar.gz 9281 BLAKE2B fa3a5a3877aa2ab19155d865eea03458b742224de11857f9f2c1219eef3f0fbd6562cf0eafc90c59dab03053db0dcae27c19a73da4f3a73e3b6d6a9407868f3d SHA512 bfef782562af7fae790b8baf02bf5d5edae2ccff29531080a608fd9224710c7d0a1a346c3480b6eaf4d7be1a280e19d9380a4dd9072de6d68e48ac419d275716
+EBUILD stdio-0.9.0-r1.ebuild 496 BLAKE2B efe13301c96808e53d7aee567d4f1b0877d0f0998d5619085a8bbd12b3626313cd9fce6bcde4655256b0a1749eacab9596cabeb8782a4667ef3d4076b6bc69b6 SHA512 662d185d044a7c93cb4ac1abef097ea7cb72d387667d07ece5a612ec0aa12df52a2d884c14e5b17a03060276a3d3fc4a4dd03b33ea54a841ab14183df4729c37
+EBUILD stdio-0.9.1.ebuild 496 BLAKE2B efe13301c96808e53d7aee567d4f1b0877d0f0998d5619085a8bbd12b3626313cd9fce6bcde4655256b0a1749eacab9596cabeb8782a4667ef3d4076b6bc69b6 SHA512 662d185d044a7c93cb4ac1abef097ea7cb72d387667d07ece5a612ec0aa12df52a2d884c14e5b17a03060276a3d3fc4a4dd03b33ea54a841ab14183df4729c37
+MISC metadata.xml 328 BLAKE2B 59ba640c2bd42d030e6ee4a92407877fab5dbd4b61706e6174902c17f9f580969aff31363e9bbcf9c627d54770afb0bffa3f66bd438ed9c1a58ba431948c829f SHA512 fdcaa73b9349a28b81f0bc9d4872edcfea9ae2b1194c0d1102a462aa5e2591d8d7af56b6946731ddadce713ddf8d8f7a0083d955922213eec4da42ee68e5e137
diff --git a/dev-ml/stdio/metadata.xml b/dev-ml/stdio/metadata.xml
new file mode 100644
index 000000000000..0d2812b35089
--- /dev/null
+++ b/dev-ml/stdio/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">janestreet/stdio</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/stdio/stdio-0.9.0-r1.ebuild b/dev-ml/stdio/stdio-0.9.0-r1.ebuild
new file mode 100644
index 000000000000..ea3350ffe129
--- /dev/null
+++ b/dev-ml/stdio/stdio-0.9.0-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit opam
+
+DESCRIPTION="Standard IO Library for OCaml"
+HOMEPAGE="https://github.com/janestreet/stdio"
+SRC_URI="https://github.com/janestreet/stdio/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="dev-ml/base:= dev-ml/sexplib:="
+DEPEND="${RDEPEND} dev-ml/jbuilder"
+
+src_test() {
+ jbuilder runtest || die
+}
diff --git a/dev-ml/stdio/stdio-0.9.1.ebuild b/dev-ml/stdio/stdio-0.9.1.ebuild
new file mode 100644
index 000000000000..ea3350ffe129
--- /dev/null
+++ b/dev-ml/stdio/stdio-0.9.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit opam
+
+DESCRIPTION="Standard IO Library for OCaml"
+HOMEPAGE="https://github.com/janestreet/stdio"
+SRC_URI="https://github.com/janestreet/stdio/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="dev-ml/base:= dev-ml/sexplib:="
+DEPEND="${RDEPEND} dev-ml/jbuilder"
+
+src_test() {
+ jbuilder runtest || die
+}
diff --git a/dev-ml/stringext-1.4.3 b/dev-ml/stringext-1.4.3
deleted file mode 100644
index 734a79e51dc3..000000000000
--- a/dev-ml/stringext-1.4.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-lang/ocaml-4:= test? ( dev-ml/iTeML ) >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=Extra string functions for OCaml
-EAPI=5
-HOMEPAGE=https://github.com/rgrinberg/stringext
-IUSE=+ocamlopt debug test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=>=dev-lang/ocaml-4:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
-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 983774947da124fb7d542ce25a218bb1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e oasis 9256ed89af74c3365ec888c00bfdfe43 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f434d6b54ae69e829a986614210af2f9
diff --git a/dev-ml/stringext-1.5.0 b/dev-ml/stringext-1.5.0
deleted file mode 100644
index f863a259ee92..000000000000
--- a/dev-ml/stringext-1.5.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-ml/jbuilder test? ( dev-ml/iTeML ) >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=Extra string functions for OCaml
-EAPI=6
-HOMEPAGE=https://github.com/rgrinberg/stringext
-IUSE=test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=>=dev-lang/ocaml-4:=
-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 24b4a2529c1fd12f1304856d6c5a690d
-_md5_=29825d7226f2562fb9d03aa1521a49d1
diff --git a/dev-ml/stringext/Manifest b/dev-ml/stringext/Manifest
new file mode 100644
index 000000000000..22754566191c
--- /dev/null
+++ b/dev-ml/stringext/Manifest
@@ -0,0 +1,5 @@
+DIST stringext-1.4.3.tar.gz 49255 BLAKE2B a1594144be431ead57e92339fef60a4823b8d1bf77e60bdfc7f89e5bc8700c4c55afcae90980b6486284d0de62b8cb3090a1cffe2f26a276f8063329e34c8068 SHA512 f6d6ad9e6cd89fb499f2ef449eede448fe9d67912644f44ffadf4e869326bc20fd839d7e725a133e4a81ca8ba98497fd02307efb9f9f62cbad4308e18123ffb5
+DIST stringext-1.5.0.tar.gz 8007 BLAKE2B 73854adb0b44f921f6364925dbd37e2f03d795561ec36044031318a584be53e13b3963a66aedfef3517b7760541c279e75b3645c99dd9b1d1a02fa22eba8a9fa SHA512 69c744ecf86f890fb8eeba245d3b5bbf1e2cadcf4274f3525faef6be242940dae77639639e202101b19e0772214af405edd67b7d33a3e9224798ec3e53167fc9
+EBUILD stringext-1.4.3.ebuild 488 BLAKE2B 7ec2ac93a61902147b0846cfc5a10711ccb52d8f8e480ebff21b1618aca80c4328a078f3da882adc87f7112d00f9274da9029170f3975a083e30f57947959193 SHA512 256b32952df653a6ba499afec40ad8e3c7f846341cb16908bfce86a0a16a2840d12c218dea9404536139cdaabb2b9b2e3b82ec6bf869ee28f2224e1af6a751e8
+EBUILD stringext-1.5.0.ebuild 444 BLAKE2B 239d68d417b7583ea3fb2e23877c7931cb2d481062c48399983552f8b389018f2cad4cb04481d41b02aa69270876f974ac536231d4513fd4e45b1db03a15d9d3 SHA512 5094ed32c574d8865a609a63ad1a56ed7b398bb1211f201cc0a07ab5c6c8096829631d646cbdea7d86780484c653267f8efca5362bba393f5bf8430cbfa8618d
+MISC metadata.xml 359 BLAKE2B c477b70933eefcc1bf207a3d1c80bea8312e2fe6f6dc559c00c646fc741b9985a94cf8df78c0c70ba5460499edff9f75f884593313287a1d648545ce7de32845 SHA512 2c59a02f3aa67d638e2f8b7f4f1556810f53550a8332030ff449fcdab324600c9114608e211f2c89b2b5a107d17dbe0bc5b76f08f1e67064aa16be03e883f40d
diff --git a/dev-ml/stringext/metadata.xml b/dev-ml/stringext/metadata.xml
new file mode 100644
index 000000000000..a3f7ab664d86
--- /dev/null
+++ b/dev-ml/stringext/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">rgrinberg/stringext</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/stringext/stringext-1.4.3.ebuild b/dev-ml/stringext/stringext-1.4.3.ebuild
new file mode 100644
index 000000000000..2d743c11f5e3
--- /dev/null
+++ b/dev-ml/stringext/stringext-1.4.3.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+OASIS_BUILD_TESTS=1
+
+inherit oasis
+
+DESCRIPTION="Extra string functions for OCaml"
+HOMEPAGE="https://github.com/rgrinberg/stringext"
+SRC_URI="https://github.com/rgrinberg/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+ >=dev-lang/ocaml-4:=
+"
+DEPEND="
+ ${RDEPEND}
+ test? ( dev-ml/iTeML )
+"
+
+DOCS=( README.md )
diff --git a/dev-ml/stringext/stringext-1.5.0.ebuild b/dev-ml/stringext/stringext-1.5.0.ebuild
new file mode 100644
index 000000000000..698b8f42876c
--- /dev/null
+++ b/dev-ml/stringext/stringext-1.5.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit opam
+
+DESCRIPTION="Extra string functions for OCaml"
+HOMEPAGE="https://github.com/rgrinberg/stringext"
+SRC_URI="https://github.com/rgrinberg/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="
+ ${RDEPEND}
+ dev-ml/jbuilder
+ test? ( dev-ml/iTeML )
+"
diff --git a/dev-ml/textutils-0.9.0 b/dev-ml/textutils-0.9.0
deleted file mode 100644
index f61ee61808c1..000000000000
--- a/dev-ml/textutils-0.9.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-ml/core:= dev-ml/ppx_driver:= dev-ml/ppx_jane:= dev-ml/ocaml-migrate-parsetree:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=Text output utilities
-EAPI=6
-HOMEPAGE=https://github.com/janestreet/textutils
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-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 24b4a2529c1fd12f1304856d6c5a690d
-_md5_=704a092f6d2caecf664702c91fec2df6
diff --git a/dev-ml/textutils/Manifest b/dev-ml/textutils/Manifest
new file mode 100644
index 000000000000..fcce5d404af1
--- /dev/null
+++ b/dev-ml/textutils/Manifest
@@ -0,0 +1,3 @@
+DIST textutils-0.9.0.tar.gz 19603 BLAKE2B 20e515b62fad7b17a0bb05c3a3ad45af81dcf3bf5c98617803186df0badecf369a684cb481786fc0074b177807049848b27272b6a4872e26d7b47a036ca7c98f SHA512 2a60b0add940f3584752f1add546716ad1e9e002d8fae460d9e62acda39e4b486c06a3fa27ceab754d2339dc46422a5a9534345c743950d6ed08683060cab759
+EBUILD textutils-0.9.0.ebuild 501 BLAKE2B 3968387f1d0792ed8ac23793103e2a846d201bc7d2311ef80c2e14448c02721b478995f01dd11bccc271873522fd7a928b660026c7288eae41729523ddf92ffa SHA512 bad67bb06b54e7a4710b7453906098b202146f3fbb66d0be335773657c2fade282c25d9cb61954f43342d8e2107ca5a0fb5df47c0c3bb7604655cdd58738d14b
+MISC metadata.xml 342 BLAKE2B 063a45b94776d06b8caee2a877fecbf18a8cde863e9a6bf7d98442daeb1976ce835cfc4f796d99205933a8c56da301a01981c924f3f8009054ba8c7961de564a SHA512 3b000d986710bedd3422e26643f20b06d1868065d139e887c2402955a3031f600ebf8512f932c073a5c3a4cd86dcde6388563a6df101b71111b86ff5e9734500
diff --git a/dev-ml/textutils/metadata.xml b/dev-ml/textutils/metadata.xml
new file mode 100644
index 000000000000..b6c90b996015
--- /dev/null
+++ b/dev-ml/textutils/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">janestreet/textutils</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/textutils/textutils-0.9.0.ebuild b/dev-ml/textutils/textutils-0.9.0.ebuild
new file mode 100644
index 000000000000..2ebb56bcc79c
--- /dev/null
+++ b/dev-ml/textutils/textutils-0.9.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit opam
+
+DESCRIPTION="Text output utilities"
+HOMEPAGE="https://github.com/janestreet/textutils"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+ dev-ml/core:=
+ dev-ml/ppx_driver:=
+ dev-ml/ppx_jane:=
+ dev-ml/ocaml-migrate-parsetree:=
+"
+DEPEND="${RDEPEND} dev-ml/jbuilder"
diff --git a/dev-ml/topkg-0.9.0 b/dev-ml/topkg-0.9.0
deleted file mode 100644
index 1758e8760333..000000000000
--- a/dev-ml/topkg-0.9.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=dev-ml/result:= dev-ml/ocamlbuild:= dev-ml/findlib:= dev-lang/ocaml:= >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=The transitory OCaml software packager
-EAPI=6
-HOMEPAGE=http://erratique.ch/software/topkg https://github.com/dbuenzli/topkg
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
-LICENSE=ISC
-RDEPEND=dev-ml/result:= dev-ml/ocamlbuild:= dev-ml/findlib:= dev-lang/ocaml:=
-SLOT=0/0.9.0
-SRC_URI=https://github.com/dbuenzli/topkg/archive/v0.9.0.tar.gz -> topkg-0.9.0.tar.gz
-_eclasses_=findlib 45d6030075064a68da8d7143726a1150
-_md5_=fa2c9d36389e05a00dbd15965399cc39
diff --git a/dev-ml/topkg-0.9.1 b/dev-ml/topkg-0.9.1
deleted file mode 100644
index 7cbf6017491a..000000000000
--- a/dev-ml/topkg-0.9.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=dev-ml/result:= dev-ml/ocamlbuild:= dev-ml/findlib:= dev-lang/ocaml:= >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=The transitory OCaml software packager
-EAPI=6
-HOMEPAGE=http://erratique.ch/software/topkg https://github.com/dbuenzli/topkg
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
-LICENSE=ISC
-RDEPEND=dev-ml/result:= dev-ml/ocamlbuild:= dev-ml/findlib:= dev-lang/ocaml:=
-SLOT=0/0.9.1
-SRC_URI=https://github.com/dbuenzli/topkg/archive/v0.9.1.tar.gz -> topkg-0.9.1.tar.gz
-_eclasses_=findlib 45d6030075064a68da8d7143726a1150
-_md5_=fa2c9d36389e05a00dbd15965399cc39
diff --git a/dev-ml/topkg/Manifest b/dev-ml/topkg/Manifest
new file mode 100644
index 000000000000..1d86b803b7ea
--- /dev/null
+++ b/dev-ml/topkg/Manifest
@@ -0,0 +1,5 @@
+DIST topkg-0.9.0.tar.gz 120352 BLAKE2B 1122fe8b60e3d104136810a2cec8460c24a26061eff55e80347d2ecf197afee949e8afaca94a6615da31a8c3acaf113b44b16dbf2430fda6724e440597775bb5 SHA512 823fe1abb344d7800e09411c952bd276ecea97b5d9c124d986e26b9128d03b3ad023a38560198e476ef8f949ecb456078e332bda94075e9b746e43d3059a8fdb
+DIST topkg-0.9.1.tar.gz 120943 BLAKE2B 39ac0d1d247183cf9f007c65b09d413ad6a89982d84269e99585ed5f15df4d7683de61548dba6ca5a1299f96206bfd2dc1042486410caa202938dc15e936446b SHA512 19773eb764b53a6e5110c44d7942d2557d6c8502a3037b57f7737efc08f4cc374845b431fdb1465207693d15a4b072aea3db97f8e60e069e3d24ae150e8c5c8f
+EBUILD topkg-0.9.0.ebuild 918 BLAKE2B 7609f6477f8526ac94c4a1993904d2c6ffcd76c8f3af7c13b8c92565c5150819ebf193f8c21ccc49bbc68864743b4675d99115ab25639bec37e7669d65f8eaba SHA512 9f2f36e01b23b079866b641e5c5109fee45fb89f40bdbd05c6a4aeb18cc028972416a1ee3d054494b084700a0233968717a6e1abb81f2fd84223833521feb489
+EBUILD topkg-0.9.1.ebuild 918 BLAKE2B 7609f6477f8526ac94c4a1993904d2c6ffcd76c8f3af7c13b8c92565c5150819ebf193f8c21ccc49bbc68864743b4675d99115ab25639bec37e7669d65f8eaba SHA512 9f2f36e01b23b079866b641e5c5109fee45fb89f40bdbd05c6a4aeb18cc028972416a1ee3d054494b084700a0233968717a6e1abb81f2fd84223833521feb489
+MISC metadata.xml 326 BLAKE2B b294ade664c113ffc2846e041ceaa6913a39dc402d671f01be9cf78b8304e6874d42c5067bb9fce104575d0cdbaa8b89d5ff6cfc3df0d164070a139d8ad59d4b SHA512 73f1d4965ba7b15a7ea5ad4382aeb1a6173c021d7f955080a69e5a77834b4dea4472b763ab598f234cc69a7d4c0b9beee0d5cbf9976cd258517eb316a9a6e92c
diff --git a/dev-ml/topkg/metadata.xml b/dev-ml/topkg/metadata.xml
new file mode 100644
index 000000000000..583ef1b56425
--- /dev/null
+++ b/dev-ml/topkg/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">dbuenzli/topkg</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/topkg/topkg-0.9.0.ebuild b/dev-ml/topkg/topkg-0.9.0.ebuild
new file mode 100644
index 000000000000..2cfed454c256
--- /dev/null
+++ b/dev-ml/topkg/topkg-0.9.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit findlib
+
+DESCRIPTION="The transitory OCaml software packager"
+HOMEPAGE="http://erratique.ch/software/topkg https://github.com/dbuenzli/topkg"
+SRC_URI="https://github.com/dbuenzli/topkg/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="dev-ml/result:=
+ dev-ml/ocamlbuild:=
+ dev-ml/findlib:=
+ dev-lang/ocaml:="
+DEPEND="${RDEPEND}"
+
+src_compile() {
+ ocaml pkg/pkg.ml build --pkg-name ${PN} || die
+}
+
+src_install() {
+ # Can't use opam-installer here as it is an opam dep...
+ findlib_src_preinst
+ local nativelibs="$(echo _build/src/${PN}*.cm{x,xa,xs,ti} _build/src/${PN}.a)"
+ ocamlfind install ${PN} _build/pkg/META _build/src/${PN}.mli _build/src/${PN}.cm{a,i} ${nativelibs} || die
+ dodoc CHANGES.md DEVEL.md README.md
+}
diff --git a/dev-ml/topkg/topkg-0.9.1.ebuild b/dev-ml/topkg/topkg-0.9.1.ebuild
new file mode 100644
index 000000000000..2cfed454c256
--- /dev/null
+++ b/dev-ml/topkg/topkg-0.9.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit findlib
+
+DESCRIPTION="The transitory OCaml software packager"
+HOMEPAGE="http://erratique.ch/software/topkg https://github.com/dbuenzli/topkg"
+SRC_URI="https://github.com/dbuenzli/topkg/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="dev-ml/result:=
+ dev-ml/ocamlbuild:=
+ dev-ml/findlib:=
+ dev-lang/ocaml:="
+DEPEND="${RDEPEND}"
+
+src_compile() {
+ ocaml pkg/pkg.ml build --pkg-name ${PN} || die
+}
+
+src_install() {
+ # Can't use opam-installer here as it is an opam dep...
+ findlib_src_preinst
+ local nativelibs="$(echo _build/src/${PN}*.cm{x,xa,xs,ti} _build/src/${PN}.a)"
+ ocamlfind install ${PN} _build/pkg/META _build/src/${PN}.mli _build/src/${PN}.cm{a,i} ${nativelibs} || die
+ dodoc CHANGES.md DEVEL.md README.md
+}
diff --git a/dev-ml/type-conv-113.00.02 b/dev-ml/type-conv-113.00.02
deleted file mode 100644
index c190e2841d8b..000000000000
--- a/dev-ml/type-conv-113.00.02
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-lang/ocaml-4.02[ocamlopt?] dev-ml/camlp4:= >=dev-ml/findlib-1.3.2 >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=Mini library required for some other preprocessing libraries
-EAPI=5
-HOMEPAGE=http://janestreet.github.io/
-IUSE=+ocamlopt debug doc
-KEYWORDS=~amd64 ~ppc ~x86
-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 983774947da124fb7d542ce25a218bb1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e oasis 9256ed89af74c3365ec888c00bfdfe43 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=790ff2b2c3413f325b952c1f2733312b
diff --git a/dev-ml/type-conv/Manifest b/dev-ml/type-conv/Manifest
new file mode 100644
index 000000000000..9f15e5d11a3a
--- /dev/null
+++ b/dev-ml/type-conv/Manifest
@@ -0,0 +1,3 @@
+DIST type_conv-113.00.02.tar.gz 64174 BLAKE2B 23189d3b9f676657d59d0801ec0c7bde7b926e2e75c6a2316ae5fc8b5dedb3a2cda944b029e61a10d997b555ed0678dd0cb0593693c395a5bcd4df4de4a15de9 SHA512 6bc6db0e5a36fa4150941155290d137552d9e19aac7cf3aff107f0a7eaa47749c7044c4a4e475827d739784b99ef2103e9c9c03191c6aaa55c51585e71553559
+EBUILD type-conv-113.00.02.ebuild 626 BLAKE2B 29810ffcf429dad5c0476e8fe6be47ef392ad55dd6db40a13224a3a8a0172cc21128208859d9900dc712e8c6a81942618ee4de35c2cc95d6063aea95b3d72b6b SHA512 b29d1e2d5d723ef31d0cd800b9edfeb31cd0998b6522404bc5b3cf5bc24387de63c62e007fe8fd5126ee46dad447a717719b101951017e72ab5eb580d4ae48a1
+MISC metadata.xml 253 BLAKE2B c787c1044c3f674eb5d2d7a0e830965ad53c7a2c8cdfcd95bece6b0557e35237f62afe28464ebe4c88468cd1fd543627349fd41a0aa760fceed1a7d52386eda2 SHA512 9285e04d22e8e41631e6de00e0ba02842cf0e772cd17a1d7ba3864e50eeea50abb06077ea4f9ac920eab3d520bfe28d389b3d04d5c3529af23a68ca68b6857d4
diff --git a/dev-ml/type-conv/metadata.xml b/dev-ml/type-conv/metadata.xml
new file mode 100644
index 000000000000..ffa6c6b4395b
--- /dev/null
+++ b/dev-ml/type-conv/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/dev-ml/type-conv/type-conv-113.00.02.ebuild b/dev-ml/type-conv/type-conv-113.00.02.ebuild
new file mode 100644
index 000000000000..088550945270
--- /dev/null
+++ b/dev-ml/type-conv/type-conv-113.00.02.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+OASIS_BUILD_DOCS=1
+
+inherit oasis
+
+MY_P=${PN/-/_}-${PV}
+DESCRIPTION="Mini library required for some other preprocessing libraries"
+HOMEPAGE="http://janestreet.github.io/"
+SRC_URI="http://ocaml.janestreet.com/ocaml-core/${PV%.*}/files/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ocaml-4.02[ocamlopt?]
+ dev-ml/camlp4:="
+DEPEND="${RDEPEND}
+ >=dev-ml/findlib-1.3.2"
+
+DOCS=( "README.md" "CHANGES.md" )
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-ml/typerep-0.9.0 b/dev-ml/typerep-0.9.0
deleted file mode 100644
index db2a745448bf..000000000000
--- a/dev-ml/typerep-0.9.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-ml/base:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=Library for creating runtime representation of OCaml types
-EAPI=6
-HOMEPAGE=https://github.com/janestreet/typerep
-KEYWORDS=~amd64
-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 24b4a2529c1fd12f1304856d6c5a690d
-_md5_=9715ff2e47717286dc2a7c1dc71b7e5f
diff --git a/dev-ml/typerep/Manifest b/dev-ml/typerep/Manifest
new file mode 100644
index 000000000000..6d71f08c03a5
--- /dev/null
+++ b/dev-ml/typerep/Manifest
@@ -0,0 +1,3 @@
+DIST typerep-0.9.0.tar.gz 24934 BLAKE2B 83e0cd9419c11a1b8dbce6730404dbe4b00597e441943d8315ad5a583ff50376c95413695e327996b07557b1b481df8ab15db5b37c3ac4c8396b7ed51aa822ea SHA512 f71fa3968ff5e93c384a97e2d39af0de33f4889643a7e43d70a777214dc4c7f35b3fac0864ffee99334cf03866a695f7afd1a907d5c7f3cec0d472b729adf9cc
+EBUILD typerep-0.9.0.ebuild 477 BLAKE2B b49346885d12aae201b75ebe9060b02778c61e52779c452fb378011284a349f8bbf53f34b75f081ebc302894f2d91fb9b9ac1d1acb663a8c7ffdfde87fb9ca52 SHA512 5e7bf0fe698123824f02cd7e5bf0e733bdc1e2dabad4c448644ee91ecc62951e03ee5585308038a7050275da05929455d77227470c76d2df294267867e58ecc2
+MISC metadata.xml 330 BLAKE2B 81a6b6161b43773bd04b41a2e1a12e0671e8fddf48fce2ef1d9c7942ce70d9f7580a972c9141a3c105f10b45c9e2a52773d46c43124b5aae43e86c1673e0c455 SHA512 6f366b28abefeb0dcca245c49ff91d3846c3880f7bfe8a45c53409933f5884007b5f37ec03e51f47145f99a5c5d55121e9ee11b68ccdbcfd8a572c8ed8e3907e
diff --git a/dev-ml/typerep/metadata.xml b/dev-ml/typerep/metadata.xml
new file mode 100644
index 000000000000..8127fe6a1314
--- /dev/null
+++ b/dev-ml/typerep/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">janestreet/typerep</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/typerep/typerep-0.9.0.ebuild b/dev-ml/typerep/typerep-0.9.0.ebuild
new file mode 100644
index 000000000000..2940a4604344
--- /dev/null
+++ b/dev-ml/typerep/typerep-0.9.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit opam
+
+DESCRIPTION="Library for creating runtime representation of OCaml types"
+HOMEPAGE="https://github.com/janestreet/typerep"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="dev-ml/base:="
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND} dev-ml/jbuilder"
diff --git a/dev-ml/typerep_extended-0.9.0 b/dev-ml/typerep_extended-0.9.0
deleted file mode 100644
index 68cdd23bb8ad..000000000000
--- a/dev-ml/typerep_extended-0.9.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=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-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=Runtime types for OCaml (Extended)
-EAPI=6
-HOMEPAGE=https://github.com/janestreet/typerep_extended
-KEYWORDS=~amd64
-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 24b4a2529c1fd12f1304856d6c5a690d
-_md5_=9e4d8c11b58317bd92eccfdc93555e1e
diff --git a/dev-ml/typerep_extended/Manifest b/dev-ml/typerep_extended/Manifest
new file mode 100644
index 000000000000..24ea9e113f28
--- /dev/null
+++ b/dev-ml/typerep_extended/Manifest
@@ -0,0 +1,3 @@
+DIST typerep_extended-0.9.0.tar.gz 73042 BLAKE2B 66328ab92c9d686f3b2c49f5bfac0373f5866301c20727db1ca1d469f653419539aad26c74d093ebc6817bc723c98d6185e04548d22b3672ead9c0a82844144c SHA512 e3df7799d4a503f24c5058904422c1567369b47a1511f406630b9143209f273d3ccf1eea22f4f6d5c050f50dbfa40307248f1f7d83663366bacd97c78a8481f0
+EBUILD typerep_extended-0.9.0.ebuild 705 BLAKE2B 7ad5933f879c32c116c0e1cfd3225636669b1dcdb48a46411d83ff32975b53677ec8898e857d76edb794c4afce1faadfdacfcd7cb4d0782b033c5d4cf64ebadd SHA512 9f2dcd69dd900b86a6548f72e1de309d63a97141f681cb770e2de10d4dccbb322ad534a1c0726c336d11eb385f22ecd4b7f098fe6f3a5f16d4bf9d0e5051f70d
+MISC metadata.xml 339 BLAKE2B 76fd0db710be457a920a8a7fc5f8f5ffa2d95110e4d85f6bb2ddb8ac056e36050bc17fe082f632a52409df457a58efccc52fbeb4c3a23922a577b1c2bba09f00 SHA512 74666d9b6ffd154e942358282161315625e070a10df32b65c4198e87e5f0c5bcb1e66d4cc27b8cee5b2ac699b4eb671f281e5e0e6d22f70797759d94c249312f
diff --git a/dev-ml/typerep_extended/metadata.xml b/dev-ml/typerep_extended/metadata.xml
new file mode 100644
index 000000000000..a8ae6225ab0a
--- /dev/null
+++ b/dev-ml/typerep_extended/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">janestreet/typerep_extended</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/typerep_extended/typerep_extended-0.9.0.ebuild b/dev-ml/typerep_extended/typerep_extended-0.9.0.ebuild
new file mode 100644
index 000000000000..a41c045533c4
--- /dev/null
+++ b/dev-ml/typerep_extended/typerep_extended-0.9.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit opam
+
+DESCRIPTION="Runtime types for OCaml (Extended)"
+HOMEPAGE="https://github.com/janestreet/typerep_extended"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+ 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:=
+"
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND} dev-ml/jbuilder"
diff --git a/dev-ml/tyxml-4.1.0 b/dev-ml/tyxml-4.1.0
deleted file mode 100644
index 399759a7a7f8..000000000000
--- a/dev-ml/tyxml-4.1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=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-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=A libary to build xml trees typechecked by OCaml
-EAPI=5
-HOMEPAGE=http://ocsigen.org/tyxml/
-IUSE=+ppx +camlp4 +ocamlopt debug doc
-KEYWORDS=~amd64
-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 983774947da124fb7d542ce25a218bb1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e oasis 9256ed89af74c3365ec888c00bfdfe43 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=021798829210256a5f2edc699b152ee7
diff --git a/dev-ml/tyxml/Manifest b/dev-ml/tyxml/Manifest
new file mode 100644
index 000000000000..5535d02ff252
--- /dev/null
+++ b/dev-ml/tyxml/Manifest
@@ -0,0 +1,3 @@
+DIST tyxml-4.1.0.tar.gz 179852 BLAKE2B d143c1291cedfb345f0773284891e17bbeb8d46eb5fa5c74df3e9ffd24adca35a8afddd60958ff3c7580bb3984c1ae2a4b077073346326c5d20a975dd42cba66 SHA512 add2b82939ea069ee74ee26ff3ee1f3ad2e361e593134da807e1acfbebff4ed546cbc23aca7ee2936a1eb8a736916d673aa2c96aeae8779706cd726bc2d07ead
+EBUILD tyxml-4.1.0.ebuild 798 BLAKE2B b600a9152571db73d9357e97231c89a979db7ccf45c4cf4ccf9954d9c95696127a98e79e2526e7d94b3a10830085a08eac4ffc7ceab890ea211c7d6eb9f51ed7 SHA512 592801e82f826ef880cc5b294fe7323e2a3760629bcb892e34d3045e88620fa1380fbadebd81428f98d7d8a9bebf4245bd1d3a85ce28ede2bac4ed4c87b4ed61
+MISC metadata.xml 489 BLAKE2B 915fc9ca249cc9395a88ef51538004a3a25b2cd8faafd12be0c5cd089a54acae209f21fa1d9c6894f14ca50fa86a0578e08b28cb9fc03a82b6a4506bb9c30a27 SHA512 7a5c35ff13e22b934e0656197d0517070ba04004cdce2089bbc987ddec904a0bfaa88d70299c74b021095ff7689ca5068040e23990a0a946c34914cefaf8d99a
diff --git a/dev-ml/tyxml/metadata.xml b/dev-ml/tyxml/metadata.xml
new file mode 100644
index 000000000000..d1a8e687d88b
--- /dev/null
+++ b/dev-ml/tyxml/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">ocsigen/tyxml</remote-id>
+ </upstream>
+ <use>
+ <flag name="camlp4">Enables the camlp4 syntax extension (deprecated)</flag>
+ <flag name="ppx">Enables the ppx syntax extension (preferred)</flag>
+ </use>
+</pkgmetadata>
diff --git a/dev-ml/tyxml/tyxml-4.1.0.ebuild b/dev-ml/tyxml/tyxml-4.1.0.ebuild
new file mode 100644
index 000000000000..4ddf289c7b6e
--- /dev/null
+++ b/dev-ml/tyxml/tyxml-4.1.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+OASIS_BUILD_DOCS=1
+# Cannot find findlib package alcotest
+# OASIS_BUILD_TESTS=1
+
+inherit oasis
+
+DESCRIPTION="A libary to build xml trees typechecked by OCaml"
+HOMEPAGE="http://ocsigen.org/tyxml/"
+SRC_URI="https://github.com/ocsigen/tyxml/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="+ppx +camlp4"
+
+DEPEND="
+ >=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:= )"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGES README.md )
+
+src_configure() {
+ oasis_configure_opts="
+ $(use_enable camlp4 syntax)
+ $(use_enable ppx)
+ " oasis_src_configure
+}
diff --git a/dev-ml/uchar-0.0.2 b/dev-ml/uchar-0.0.2
deleted file mode 100644
index 43c0bce5b0c1..000000000000
--- a/dev-ml/uchar-0.0.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=>=dev-lang/ocaml-4.03:= dev-ml/ocamlbuild >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Uchar compatibility library
-EAPI=6
-HOMEPAGE=https://github.com/ocaml/uchar
-IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
-LICENSE=LGPL-2-with-linking-exception
-RDEPEND=>=dev-lang/ocaml-4.03:=
-RESTRICT=test
-SLOT=0/0.0.2
-SRC_URI=https://github.com/ocaml/uchar/archive/v0.0.2.tar.gz -> uchar-0.0.2.tar.gz
-_eclasses_=findlib 45d6030075064a68da8d7143726a1150
-_md5_=061a9464d94aa03f3a45b4f44d184eee
diff --git a/dev-ml/uchar/Manifest b/dev-ml/uchar/Manifest
new file mode 100644
index 000000000000..248edfdc5808
--- /dev/null
+++ b/dev-ml/uchar/Manifest
@@ -0,0 +1,3 @@
+DIST uchar-0.0.2.tar.gz 21815 BLAKE2B aede9d42ac2d9ccaa7af2f40799916f30cef0d6e292b7909b5131b5d28c979362b7624a88cec8ba2e7bed1dcada60d8e512ed70d2a02dafcf4ad701c60f6faa6 SHA512 487a9706cf9dfc9b9c94442a51766cc211687d6ebcb4dd3c94d09cb1ed6d7fd61e966e91a4121fe2d1681b2fd6bfee9079d3bccccdb6d65ba2111524ab5dd1bc
+EBUILD uchar-0.0.2.ebuild 1129 BLAKE2B 712b837d322eabff7855bf7aa4a900db5cc5d5d49ba21ea36498562ab9a17ceb55038a58bfa647ecfb4c23e89516f180f84bee245a6877c800901052e4ad6711 SHA512 ba7c13bc9c2262b11802165b827e6e7b7f01f269101b56c1325ab776fdc2c58e7731664ce7395add3809530cf751e0989c6354a2b7c90a919053160b60a0a344
+MISC metadata.xml 323 BLAKE2B 6e76684e3b7cb869df836ef5abbe8de6db1c278e1638d5f0c8e6915d78c904ea112efffaeb80a68440bc9f4444064ebc83c1cf748ae765521e9518e8b7ccc616 SHA512 44830fe5dae4de1d5fcc0e9f5ca8373aa7fcda8a2a1d12161128d1ae0f5012d70e362f2b586c6b6e73492ec943deb36e591f4cc1fd9a56f43d6f35435b16857c
diff --git a/dev-ml/uchar/metadata.xml b/dev-ml/uchar/metadata.xml
new file mode 100644
index 000000000000..0318635800e1
--- /dev/null
+++ b/dev-ml/uchar/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">ocaml/uchar</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/uchar/uchar-0.0.2.ebuild b/dev-ml/uchar/uchar-0.0.2.ebuild
new file mode 100644
index 000000000000..41c83cb4f77b
--- /dev/null
+++ b/dev-ml/uchar/uchar-0.0.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit findlib
+
+DESCRIPTION="Uchar compatibility library"
+HOMEPAGE="https://github.com/ocaml/uchar"
+SRC_URI="https://github.com/ocaml/uchar/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE="+ocamlopt"
+
+RDEPEND=">=dev-lang/ocaml-4.03:="
+DEPEND="${RDEPEND} dev-ml/ocamlbuild"
+
+# This is mostly a compat wrapper for older ocaml versions we don't support. No
+# need to test it, plus it fails when installing for the first time:
+# https://bugs.gentoo.org/show_bug.cgi?id=624144
+RESTRICT="test"
+
+src_compile() {
+ ocaml pkg/build.ml \
+ "native=$(usex ocamlopt true false)" \
+ "native-dynlink=$(usex ocamlopt true false)" || die
+}
+
+src_test() {
+ ocamlbuild -X src -use-ocamlfind -pkg uchar test/testpkg.native || die
+}
+
+src_install() {
+ # Can't use opam-installer here as it is an opam dep...
+ findlib_src_preinst
+ mv _build/pkg/META{.empty,} || die
+ ocamlfind install ${PN} _build/pkg/META || die
+ dodoc README.md CHANGES.md
+}
diff --git a/dev-ml/ulex-1.1 b/dev-ml/ulex-1.1
deleted file mode 100644
index 22374ab0fd68..000000000000
--- a/dev-ml/ulex-1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=>=dev-lang/ocaml-3.10.2:=[ocamlopt?] dev-ml/camlp4:= dev-ml/ocamlbuild >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=A lexer generator for unicode
-EAPI=5
-HOMEPAGE=http://www.cduce.org
-IUSE=+ocamlopt
-KEYWORDS=amd64 ppc x86
-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 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=afb5e8d0f56592449dc08407ff712151
diff --git a/dev-ml/ulex/Manifest b/dev-ml/ulex/Manifest
new file mode 100644
index 000000000000..e059714e069b
--- /dev/null
+++ b/dev-ml/ulex/Manifest
@@ -0,0 +1,3 @@
+DIST ulex-1.1.tar.gz 20347 BLAKE2B c3c502f0375b964081b908a156c146d171d8c9ed0da491d2a421e9e132538bfb24908bc4d73211ad6a2cb502af5e51141f9ae59505f81fe8bfd4fa257427aeb0 SHA512 7840707705e8403cef6586b072d722043adf9a867a1f4209e1f3ad1a97797c2b292e5151b7714b37fa9aacb190eb0a0a35be1b7675bfaca46f1f68bda58cec70
+EBUILD ulex-1.1.ebuild 586 BLAKE2B 6433a17a959f7ed7dfcbc26bfc46e1f9f93d0df2539202d2f71d10e30a379967c60ced15e4f749e15a3ed313a533c7978997fbab05a4baf6bd44bdc5f005979c SHA512 467b44c8e60eb5e59300136ebca4afdec8cb5d64eb3cfbb20066106bbaf6e26767e0b6514c791191f8487ba9efd86ef7ef102b414fe94704fe98872ae7c17747
+MISC metadata.xml 243 BLAKE2B 010ca240ae06e9a9f6d7ba213eb06df36d9ba862ff2d2458d98a9fea1a1e7f3026d13832a73bce1b3ad9345029425e6abfae9e03bf126f2329b3f030ed3753fd SHA512 1c5b4b2163017e496999d1f87e5c9c5ac6c11b2e9187450ccfb3df258f34e54d278972f04ee0e8429476c6f87e091a869ac2a28c6e8c8e6d20678c3e74061449
diff --git a/dev-ml/ulex/metadata.xml b/dev-ml/ulex/metadata.xml
new file mode 100644
index 000000000000..ffac4d7ebc01
--- /dev/null
+++ b/dev-ml/ulex/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-ml/ulex/ulex-1.1.ebuild b/dev-ml/ulex/ulex-1.1.ebuild
new file mode 100644
index 000000000000..6b98ec8bd787
--- /dev/null
+++ b/dev-ml/ulex/ulex-1.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils findlib
+
+DESCRIPTION="A lexer generator for unicode"
+HOMEPAGE="http://www.cduce.org"
+SRC_URI="http://www.cduce.org/download/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ppc x86"
+IUSE="+ocamlopt"
+
+RDEPEND=">=dev-lang/ocaml-3.10.2:=[ocamlopt?]
+ dev-ml/camlp4:="
+DEPEND="${RDEPEND}
+ dev-ml/ocamlbuild"
+
+src_compile() {
+ emake all
+ if use ocamlopt; then
+ emake all.opt
+ fi
+}
+
+src_install() {
+ findlib_src_install
+ dodoc README CHANGES
+}
diff --git a/dev-ml/utop-2.0.1 b/dev-ml/utop-2.0.1
deleted file mode 100644
index 125f23077856..000000000000
--- a/dev-ml/utop-2.0.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=>=dev-ml/lwt-2.4.0:= dev-ml/lwt_react:= >=dev-ml/lambda-term-1.2:= >=dev-ml/zed-1.2:= >=dev-ml/cppo-1.0.1:= >=dev-ml/findlib-1.7.2:= dev-ml/jbuilder >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=A new toplevel for OCaml with completion and colorization
-EAPI=5
-HOMEPAGE=https://github.com/diml/utop
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=>=dev-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 24b4a2529c1fd12f1304856d6c5a690d
-_md5_=68f1091b989f9d853c792d9bf2c37890
diff --git a/dev-ml/utop/Manifest b/dev-ml/utop/Manifest
new file mode 100644
index 000000000000..5413d74aa77b
--- /dev/null
+++ b/dev-ml/utop/Manifest
@@ -0,0 +1,3 @@
+DIST utop-2.0.1.tar.gz 57523 BLAKE2B 67dad49fa00899a5b0eb1af0a1129a0bc8d8b872112f65b97ccfbd9915194f7b56fdd9d1cb2bfba7e5bf0d01ce73b6370c7ba1ed0f56dc6595f51e3eec904962 SHA512 66e7858a44ddd038f08073f9530c790f3ad44134899793c9f5e689d0e1786d2e2751bf38c6be33979292942b00dd6ff2db421025e12f49e05c4a694df36d23e3
+EBUILD utop-2.0.1.ebuild 588 BLAKE2B f65c4449bd399de3b16ed05bb747209ceaa4546f1e74f088ee989bca6712da64431b2cca122ffaef09eafc41cf151e315f3c8781955b5103198ced3265d016a2 SHA512 ba49f9b62385eae14d00d0924bc475ce578e6aa97d90343aee7cf99cbb3cd3e3ca5ed011cd46287d560458d75e2ea5d175d24b6567a70f2c89dabc69999e2fa9
+MISC metadata.xml 331 BLAKE2B d275486e549330bdbfa9743b2cb747ccb4c7eedf443ff08a267fe82c30ed6305f97a7ac8a1af905eaae71647a8ad5d91134ccd55ea003de092ed9bc1208b4234 SHA512 bab98a112599f61029b06f241f3c14315b88924ce88fe0caf7efe4061338628800f72a6844b3d9a2314f29ca07754775f5a512f84dd39629766b95169829ac89
diff --git a/dev-ml/utop/metadata.xml b/dev-ml/utop/metadata.xml
new file mode 100644
index 000000000000..7c8000acfe72
--- /dev/null
+++ b/dev-ml/utop/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">diml/utop</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/utop/utop-2.0.1.ebuild b/dev-ml/utop/utop-2.0.1.ebuild
new file mode 100644
index 000000000000..f2f8f4b5d056
--- /dev/null
+++ b/dev-ml/utop/utop-2.0.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit findlib opam
+
+DESCRIPTION="A new toplevel for OCaml with completion and colorization"
+HOMEPAGE="https://github.com/diml/utop"
+SRC_URI="https://github.com/diml/utop/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+ >=dev-ml/lwt-2.4.0:=
+ dev-ml/lwt_react:=
+ >=dev-ml/lambda-term-1.2:=
+ >=dev-ml/zed-1.2:=
+ >=dev-ml/cppo-1.0.1:=
+ >=dev-ml/findlib-1.7.2:=
+"
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND}
+ dev-ml/jbuilder"
diff --git a/dev-ml/uuidm-0.9.6 b/dev-ml/uuidm-0.9.6
deleted file mode 100644
index 1975a39f8ab9..000000000000
--- a/dev-ml/uuidm-0.9.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=dev-ml/cmdliner:= >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=OCaml module implementing 128 bits universally unique identifiers
-EAPI=5
-HOMEPAGE=http://erratique.ch/software/uuidm
-KEYWORDS=~amd64
-LICENSE=ISC
-RDEPEND=dev-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 24b4a2529c1fd12f1304856d6c5a690d
-_md5_=62ef72e9291251a968fd334e50701e3a
diff --git a/dev-ml/uuidm/Manifest b/dev-ml/uuidm/Manifest
new file mode 100644
index 000000000000..f4c5dbb06f3f
--- /dev/null
+++ b/dev-ml/uuidm/Manifest
@@ -0,0 +1,3 @@
+DIST uuidm-0.9.6.tbz 9707 BLAKE2B b17a464dc7b72a75ac02be0a02b6048afc54161a4f676c9c5ad52d765eb8737d233d055fa1dbe1e1f94675ef3f8e5802cb890d5aba4ad49ec15cfa5f34b8ba80 SHA512 13b900e98c27f201636b6f074416dc85ed6725b5bcdf911532c4ff31ca980c0a8e31583db9e336d2533559e4f9c3c1badf2a4548dffd21c009671a8dfc80a7f7
+EBUILD uuidm-0.9.6.ebuild 482 BLAKE2B ce0b11438483a91390547c2f44ecac38994bc064e35d56b63b35e561aeeca1b74e36d4d422bdb88d469128a38a2fc0e5bf854a90ff2674cfdf3e9d8cd214de30 SHA512 5bb329022122598e3819a34925f5a35c1c7d419e812a88c5901bacb765ff1b31fe9589cc5c1f89e88e8ea321c25e55e14c4f68cff936fc9f153ba69676cddcc5
+MISC metadata.xml 243 BLAKE2B 010ca240ae06e9a9f6d7ba213eb06df36d9ba862ff2d2458d98a9fea1a1e7f3026d13832a73bce1b3ad9345029425e6abfae9e03bf126f2329b3f030ed3753fd SHA512 1c5b4b2163017e496999d1f87e5c9c5ac6c11b2e9187450ccfb3df258f34e54d278972f04ee0e8429476c6f87e091a869ac2a28c6e8c8e6d20678c3e74061449
diff --git a/dev-ml/uuidm/metadata.xml b/dev-ml/uuidm/metadata.xml
new file mode 100644
index 000000000000..ffac4d7ebc01
--- /dev/null
+++ b/dev-ml/uuidm/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-ml/uuidm/uuidm-0.9.6.ebuild b/dev-ml/uuidm/uuidm-0.9.6.ebuild
new file mode 100644
index 000000000000..f3c7004e85f0
--- /dev/null
+++ b/dev-ml/uuidm/uuidm-0.9.6.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit findlib opam
+
+DESCRIPTION="OCaml module implementing 128 bits universally unique identifiers"
+HOMEPAGE="http://erratique.ch/software/uuidm"
+SRC_URI="http://erratique.ch/software/uuidm/releases/${P}.tbz"
+
+LICENSE="ISC"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="dev-ml/cmdliner:="
+DEPEND="${RDEPEND}"
+
+src_compile() {
+ ocaml pkg/pkg.ml build || die
+}
diff --git a/dev-ml/uutf-1.0.1 b/dev-ml/uutf-1.0.1
deleted file mode 100644
index cd508cf71bc7..000000000000
--- a/dev-ml/uutf-1.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/uchar:= utftrip? ( dev-ml/cmdliner:= ) dev-ml/ocamlbuild dev-ml/topkg test? ( dev-ml/cmdliner ) >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Non-blocking streaming Unicode codec for OCaml
-EAPI=5
-HOMEPAGE=http://erratique.ch/software/uutf
-IUSE=doc utftrip +ocamlopt test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
-LICENSE=ISC
-RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/uchar:= utftrip? ( dev-ml/cmdliner:= )
-SLOT=0/1.0.1
-SRC_URI=http://erratique.ch/software/uutf/releases/uutf-1.0.1.tbz
-_eclasses_=findlib 45d6030075064a68da8d7143726a1150
-_md5_=7adb19fb33d0ebe8e713c4bf7fbfaedb
diff --git a/dev-ml/uutf/Manifest b/dev-ml/uutf/Manifest
new file mode 100644
index 000000000000..f7afc840a89d
--- /dev/null
+++ b/dev-ml/uutf/Manifest
@@ -0,0 +1,3 @@
+DIST uutf-1.0.1.tbz 22215 BLAKE2B 58cbb8db94024ddaa02c213df4e5321ad33513370c6d1d54ac09f57821df8ac3b330c2659f9aeb0e78dfd15d2f50be714a5a5d6e6d3dcc3f81539c1a6c8c3771 SHA512 35cbee8c82a566f2fe4fcd549936d4c4dc67f5b71bfd3ea97ff25d7cf21cfb77cb5ee313c95ad26a2a61bb84aa48c300bbb79a1a7128c6161e9abe9c390a7d18
+EBUILD uutf-1.0.1.ebuild 1496 BLAKE2B 230477a472389176868c422537a393112f128c6ae19d8af64aa410999778f45dd0fc814932c82905655dea4779d285e0dbd533f569b48cee54065c23490f0242 SHA512 21a2c5fdb0178f9864030a889cb4cbd74f263597f886649de2df49a2aad73ae370cdfc12a22803f0183d8f8a339ebda41dc6e2c21dca5c4fbb4b2450dedeb4a2
+MISC metadata.xml 395 BLAKE2B 48ea75ce67ec045366c9257b636a8d2a90743533cb68cf53e036ded8f090b303ff098b4281fb63f66050ff62f070616732be85340e614ff5fac11a22c3cb9cdc SHA512 51bfb51edc7bf10f014be15fc986acf94b2443d93db4883fb3319b2e56b923cbcc360e6b8980eafaa8f628428fdb52d643d62c992fa7444fba1c9b32e876385a
diff --git a/dev-ml/uutf/metadata.xml b/dev-ml/uutf/metadata.xml
new file mode 100644
index 000000000000..0d64748ace0c
--- /dev/null
+++ b/dev-ml/uutf/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+<email>ml@gentoo.org</email>
+<name>Gentoo ML Project</name>
+</maintainer>
+<use>
+<flag name="utftrip">Builds and install the utftrip executable: Among other things, reads unicode on stdin and rewrites it on stdout.</flag>
+</use>
+</pkgmetadata>
diff --git a/dev-ml/uutf/uutf-1.0.1.ebuild b/dev-ml/uutf/uutf-1.0.1.ebuild
new file mode 100644
index 000000000000..3e6636aa1def
--- /dev/null
+++ b/dev-ml/uutf/uutf-1.0.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit findlib
+
+DESCRIPTION="Non-blocking streaming Unicode codec for OCaml"
+HOMEPAGE="http://erratique.ch/software/uutf"
+SRC_URI="http://erratique.ch/software/uutf/releases/${P}.tbz"
+
+LICENSE="ISC"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE="doc utftrip +ocamlopt test"
+
+RDEPEND=">=dev-lang/ocaml-3.12:=[ocamlopt?]
+ dev-ml/uchar:=
+ utftrip? ( dev-ml/cmdliner:= )"
+DEPEND="${RDEPEND}
+ dev-ml/ocamlbuild
+ dev-ml/topkg
+ test? ( dev-ml/cmdliner )"
+
+src_compile() {
+ ocaml pkg/pkg.ml build \
+ --with-cmdliner "$(usex utftrip true false)" \
+ || die
+}
+
+src_test() {
+ if use ocamlopt ; then
+ ocamlbuild -use-ocamlfind tests.otarget || die
+ pushd _build/test || die
+ ./test.native || die
+ #Rebuild to avoid mismatches between installed files, bug #604674
+ popd || die
+ ocaml pkg/pkg.ml build \
+ --with-cmdliner "$(usex utftrip true false)" \
+ || die
+ else
+ ewarn "Sorry, ${PN} tests require native support (ocamlopt)"
+ fi
+}
+
+src_install() {
+ # Can't use opam-installer here as it is an opam dep...
+ findlib_src_preinst
+ local nativelibs=""
+ use ocamlopt && nativelibs="$(echo _build/src/uutf.cm{x,xa,xs} _build/src/uutf.a)"
+ ocamlfind install uutf _build/pkg/META _build/src/uutf.mli _build/src/uutf.cm{a,i} ${nativelibs} || die
+ use utftrip && newbin utftrip.$(usex ocamlopt native byte) utftrip
+ dodoc CHANGES.md README.md
+ use doc && dohtml -r doc/*
+}
diff --git a/dev-ml/variantslib-0.9.0 b/dev-ml/variantslib-0.9.0
deleted file mode 100644
index bfc564a34055..000000000000
--- a/dev-ml/variantslib-0.9.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-ml/base:= dev-ml/ppx_driver:= dev-ml/ocaml-migrate-parsetree:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=OCaml variants as first class values
-EAPI=6
-HOMEPAGE=https://github.com/janestreet/variantslib
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-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 24b4a2529c1fd12f1304856d6c5a690d
-_md5_=d886530b2ff32238ab5fec6fc318d0e1
diff --git a/dev-ml/variantslib/Manifest b/dev-ml/variantslib/Manifest
new file mode 100644
index 000000000000..0b66690a38e3
--- /dev/null
+++ b/dev-ml/variantslib/Manifest
@@ -0,0 +1,3 @@
+DIST variantslib-0.9.0.tar.gz 5590 BLAKE2B 8b6b4c1e1d21e7f6c9bdc1813ea811dc4680506a2a8b2f8c869d8ba2583f07e99d717c0f6a984f6ca3c2e809c9eb2e7c497dcde1f0085e054de383b032f3e94e SHA512 2fd28063d307396da866be70480ba7f953d90ec32a55d31dad649eadb6141572e428f055cad02787654477c4a308313ecb7be4b9b80828af9d9870ad325b9f4d
+EBUILD variantslib-0.9.0.ebuild 499 BLAKE2B f2373d07ff68c513932e1bf2796376539310d2cdd667cd96ec72ecf1f6b569f47fc44569638345dec3de774942e1de0c49bdc931f96aada95e72f5bd43ad8841 SHA512 528e313d67489af325215a9a49d4bf134ad434d97e527102e4adefb2a2ecadfaf7483a54e6ffdf608b9afd68e2297285bd10bc67aa5865157e0d6300a21d144d
+MISC metadata.xml 407 BLAKE2B b64f37a2aee6e7784113f6b2c5c0a0f1a7946811bf74893b26a32ba45a4016964b43c5e6525853c16b5ab535a779752c8144fcd5a974a390a2b24202485376a3 SHA512 fbeb65d913c63c622cfc69b29c4c679571f523ebd00dd1f46e3ae36c39b9b385440a9cc972a640b65fa6689eab4ca47fd928eb67b0d95bd95bd0d072efd057d0
diff --git a/dev-ml/variantslib/metadata.xml b/dev-ml/variantslib/metadata.xml
new file mode 100644
index 000000000000..8077a6de981c
--- /dev/null
+++ b/dev-ml/variantslib/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="bitbucket">yminsky/ocaml-core</remote-id>
+ <remote-id type="github">janestreet/variantslib</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/variantslib/variantslib-0.9.0.ebuild b/dev-ml/variantslib/variantslib-0.9.0.ebuild
new file mode 100644
index 000000000000..a50b4f2ef0e0
--- /dev/null
+++ b/dev-ml/variantslib/variantslib-0.9.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit opam
+
+DESCRIPTION="OCaml variants as first class values"
+HOMEPAGE="https://github.com/janestreet/variantslib"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+ dev-ml/base:=
+ dev-ml/ppx_driver:=
+ dev-ml/ocaml-migrate-parsetree:=
+"
+DEPEND="${RDEPEND} dev-ml/jbuilder"
diff --git a/dev-ml/xml-light-2.2-r3 b/dev-ml/xml-light-2.2-r3
deleted file mode 100644
index a5d57dea8e30..000000000000
--- a/dev-ml/xml-light-2.2-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=app-arch/unzip dev-lang/ocaml:=[ocamlopt?]
-DESCRIPTION=Minimal Xml parser and printer for OCaml
-EAPI=5
-HOMEPAGE=http://tech.motion-twin.com/xmllight.html
-IUSE=doc +ocamlopt
-KEYWORDS=amd64 ~arm ~arm64 ~ppc x86
-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 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f67a5830d65be3e1ca63fa045e5b83aa
diff --git a/dev-ml/xml-light/Manifest b/dev-ml/xml-light/Manifest
new file mode 100644
index 000000000000..479a750efa52
--- /dev/null
+++ b/dev-ml/xml-light/Manifest
@@ -0,0 +1,7 @@
+AUX 01_installopt.dpatch 861 BLAKE2B 0adf06c9c8bac79bb3653dba5b6f882ab80ad40dba56ac9242061e177407e33f1f466be55d0ffbac4c4bd832193940cf6b757e8386aefaeaa0bda92901c95a29 SHA512 1413f51f182affc2628799d0f4224033cb305755c31174450873cada394f9ca83fa7afc6452414b1c305f0b39b8f9936b28ca96c4aeef4acc1b0f9957a20865e
+AUX 02_cmi_depends.dpatch 492 BLAKE2B 1b6094d0b024c9381ae15e73ca593835bf1f4d3d2b30f9cf25edc2b42726313505d9a5d070615db54caec2279519836667157cf4c24d036b68109e1ad74730b4 SHA512 47f9e71b14d1df29325d5b9077c93353114566f579fb8d26b9dd5a24ce8dd66a2c56e0508924eb8c3491373bc8870e81039be990290417b559345400e03cab09
+AUX 03_cflags.dpatch 1681 BLAKE2B 7d1195efbce6ffa26bcf6e7bc33faa2e27f20991d08ded7a0a6eebc615e99f42d8c58a1092d9db90ecf047398fcc701419f1ca6959876a462922d8956e2d9f98 SHA512 314d30a73cd6a430a367a38b50c10afaf1d307b8ce63795315b093be8500dfb5ddac98eaf5a60f32b047a62f203fa59d9e6dd5c342e7ec7132b78fcd734de51e
+AUX 04_dtd_trace.dpatch 780 BLAKE2B 358cf04728f0d8e7bbe7e29568ebe55b4e07b51217e7a308437ba2dfc202d76ac7cdd8d3fcf40e201124d625249c1a93d5c496a9834f34f7ffa35f872c0424d1 SHA512 14cb78558afeed100e6f085233b001ea5501ccb3020c2437362870031b1a14ad7227794bc81c3de9567cf0d797c0966c515ce56245e429a149f097895c06f771
+DIST xml-light-2.2.zip 22130 BLAKE2B 95b4bc23be63ef5c6faf529877aaf753e3c9fee99948dff82bab5e3206ea718a71ce1e03a2bdba17ff21c040dc8774312ce752c97450f0420681926524864f58 SHA512 b3be968db1ea8b9f8cc439fc8a685083227a7b07469af17c31993229a506f2ff6b1b0cf2097f4198a71e1d858d166f36c99bb26720136633c233a790764087ed
+EBUILD xml-light-2.2-r3.ebuild 1261 BLAKE2B 37e858fc04935b7fa20415032bd93be88329d36a123e02c5ca1ad6d34c5ad190c66b8a4ef4304f0ac15d10a65ad577992d08f4356fc09f77a0634a9a88bdf6db SHA512 d72b8c4930ae826bf2b84bf608e104589fddb3e8944bd83050c3c1efd27011f05ff4fd98f9d83d516b096b087bad76a1b50b626c1ac0ca4c511f88635fbc08f4
+MISC metadata.xml 245 BLAKE2B 5599732e8923ea2b90a26adcb5708b6cf95cd3db28e810b9f881ac7d0e2c63745609f4c6e21708bdda7792f769df77bfa4b9d4d135eda71831efcaaab122c384 SHA512 1c6cdb75d4cbbd8d3a5f2cc24950924c030db330e135cf2cacecdaaa99ee65117efd7abd9f8652bf5dfa8169d427f51ff84123aab11fa8ef82498a6834b0805a
diff --git a/dev-ml/xml-light/files/01_installopt.dpatch b/dev-ml/xml-light/files/01_installopt.dpatch
new file mode 100644
index 000000000000..1dfb50c9e271
--- /dev/null
+++ b/dev-ml/xml-light/files/01_installopt.dpatch
@@ -0,0 +1,24 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_installopt.dpatch by Sylvain Le Gall <gildor@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad xml-light-2.2~/Makefile xml-light-2.2/Makefile
+--- xml-light-2.2~/Makefile 2005-10-11 23:26:41.000000000 +0200
++++ xml-light-2.2/Makefile 2005-10-11 23:28:00.000000000 +0200
+@@ -11,8 +11,11 @@
+
+ opt: xml-light.cmxa test_opt.exe
+
+-install: all opt
+- cp xml-light.cmxa xml-light.a xml-light.cma xml.mli xmlParser.mli dtd.mli xml.cmi xmlParser.cmi dtd.cmi xml.cmx dtd.cmx xmlParser.cmx $(INSTALLDIR)
++install: all
++ cp xml-light.cma xml.mli xmlParser.mli dtd.mli xml.cmi xmlParser.cmi dtd.cmi $(INSTALLDIR)
++
++installopt: opt all
++ cp xml-light.a xml-light.cmxa xml.cmx dtd.cmx xmlParser.cmx $(INSTALLDIR)
+
+ doc:
+ mkdir doc
diff --git a/dev-ml/xml-light/files/02_cmi_depends.dpatch b/dev-ml/xml-light/files/02_cmi_depends.dpatch
new file mode 100644
index 000000000000..1fcf17048407
--- /dev/null
+++ b/dev-ml/xml-light/files/02_cmi_depends.dpatch
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_cmi_depends.dpatch by Sylvain Le Gall <gildor@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad xml-light-2.2~/Makefile xml-light-2.2/Makefile
+--- xml-light-2.2~/Makefile 2006-01-03 17:34:23.000000000 +0100
++++ xml-light-2.2/Makefile 2006-01-03 17:35:04.000000000 +0100
+@@ -82,6 +82,6 @@
+ .mll.ml:
+ ocamllex $<
+
+-.mly.ml:
++%.mli %.ml: %.mly
+ ocamlyacc $<
+
diff --git a/dev-ml/xml-light/files/03_cflags.dpatch b/dev-ml/xml-light/files/03_cflags.dpatch
new file mode 100644
index 000000000000..5dfbffe5da1f
--- /dev/null
+++ b/dev-ml/xml-light/files/03_cflags.dpatch
@@ -0,0 +1,51 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03_cflags.dpatch by Sylvain Le Gall <gildor@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad xml-light-2.2~/Makefile xml-light-2.2/Makefile
+--- xml-light-2.2~/Makefile 2006-10-26 00:22:41.000000000 +0200
++++ xml-light-2.2/Makefile 2006-10-26 00:24:45.000000000 +0200
+@@ -3,8 +3,8 @@
+ .SUFFIXES : .ml .mli .cmo .cmx .cmi .mll .mly
+
+ INSTALLDIR=`ocamlc -where`
+-CFLAGS=
+-LFLAGS= -a
++XML_LIGHT_OCAML_CFLAGS= $(OCAML_CFLAGS)
++XML_LIGHT_OCAML_LFLAGS= $(OCAML_LFLAGS) -a
+ LIBS=
+
+ all: xml-light.cma test.exe doc
+@@ -28,10 +28,10 @@
+ ocamlopt xml-light.cmxa test.ml -o test_opt.exe
+
+ xml-light.cma: xml_parser.cmo xml_lexer.cmo dtd.cmo xmlParser.cmo xml.cmo
+- ocamlc -o xml-light.cma $(LFLAGS) $(LIBS) xml_parser.cmo xml_lexer.cmo dtd.cmo xmlParser.cmo xml.cmo
++ ocamlc -o xml-light.cma $(XML_LIGHT_OCAML_LFLAGS) $(LIBS) xml_parser.cmo xml_lexer.cmo dtd.cmo xmlParser.cmo xml.cmo
+
+ xml-light.cmxa: xml_parser.cmx xml_lexer.cmx dtd.cmx xmlParser.cmx xml.cmx
+- ocamlopt -o xml-light.cmxa $(LFLAGS) $(LIBS) xml_parser.cmx xml_lexer.cmx dtd.cmx xmlParser.cmx xml.cmx
++ ocamlopt -o xml-light.cmxa $(XML_LIGHT_OCAML_LFLAGS) $(LIBS) xml_parser.cmx xml_lexer.cmx dtd.cmx xmlParser.cmx xml.cmx
+
+ dtd.cmo: xml.cmi xml_lexer.cmi dtd.cmi
+
+@@ -71,13 +71,13 @@
+
+ # SUFFIXES
+ .ml.cmo:
+- ocamlc $(CFLAGS) -c $<
++ ocamlc $(XML_LIGHT_OCAML_CFLAGS) -c $<
+
+ .ml.cmx:
+- ocamlopt $(CFLAGS) -c $<
++ ocamlopt $(XML_LIGHT_OCAML_CFLAGS) -c $<
+
+ .mli.cmi:
+- ocamlc $(CFLAGS) $<
++ ocamlc $(XML_LIGHT_OCAML_CFLAGS) $<
+
+ .mll.ml:
+ ocamllex $<
diff --git a/dev-ml/xml-light/files/04_dtd_trace.dpatch b/dev-ml/xml-light/files/04_dtd_trace.dpatch
new file mode 100644
index 000000000000..9dbea4bdf0c8
--- /dev/null
+++ b/dev-ml/xml-light/files/04_dtd_trace.dpatch
@@ -0,0 +1,26 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 04_dtd_trace.dpatch by Sylvain Le Gall <gildor@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad xml-light-2.2~/dtd.ml xml-light-2.2/dtd.ml
+--- xml-light-2.2~/dtd.ml 2005-02-18 10:01:54.000000000 +0100
++++ xml-light-2.2/dtd.ml 2006-10-26 23:22:25.000000000 +0200
+@@ -267,7 +267,7 @@
+ exception TmpResult of dtd_result
+
+ let prove_child dtd tag =
+- trace dtd tag;
++ (*trace dtd tag;*)
+ match dtd.current with
+ | DTDEmpty -> raise (Prove_error EmptyExpected)
+ | DTDAny -> ()
+@@ -505,4 +505,4 @@
+ sprintf "<!ELEMENT %s %s>" tag (etype_to_string etype)
+
+ ;;
+-to_string_ref := to_string
+\ No newline at end of file
++to_string_ref := to_string
diff --git a/dev-ml/xml-light/metadata.xml b/dev-ml/xml-light/metadata.xml
new file mode 100644
index 000000000000..c5adddd4b3e6
--- /dev/null
+++ b/dev-ml/xml-light/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+ <email>maksbotan@gentoo.org</email>
+ <name>Maxim Koltsov</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-ml/xml-light/xml-light-2.2-r3.ebuild b/dev-ml/xml-light/xml-light-2.2-r3.ebuild
new file mode 100644
index 000000000000..f7244b272a18
--- /dev/null
+++ b/dev-ml/xml-light/xml-light-2.2-r3.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils multilib
+
+DESCRIPTION="Minimal Xml parser and printer for OCaml"
+HOMEPAGE="http://tech.motion-twin.com/xmllight.html"
+SRC_URI="http://tech.motion-twin.com/zip/${P}.zip"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
+IUSE="doc +ocamlopt"
+
+RDEPEND="dev-lang/ocaml:=[ocamlopt?]"
+DEPEND="app-arch/unzip
+ ${RDEPEND}"
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+ EPATCH_FORCE=yes EPATCH_SUFFIX=dpatch EPATCH_SOURCE="${FILESDIR}" \
+ epatch
+}
+
+src_compile() {
+ emake -j1
+ if use ocamlopt; then
+ emake -j1 opt
+ fi
+ if use doc;then
+ emake doc
+ fi
+}
+
+src_test() {
+ # There are no tests...
+ :
+}
+
+src_install() {
+ dodir /usr/$(get_libdir)/ocaml/${PN}
+ emake INSTALLDIR="${D}"/usr/$(get_libdir)/ocaml/${PN} install
+ cat > "${D}"/usr/$(get_libdir)/ocaml/${PN}/META << EOF
+name="${PN}"
+version="${PV}"
+description="${DESCRIPTION}"
+requires=""
+archive(byte)="xml-light.cma"
+EOF
+ if use ocamlopt; then
+ emake INSTALLDIR="${D}"/usr/$(get_libdir)/ocaml/${PN} installopt
+ echo 'archive(native)="xml-light.cmxa"' >> "${D}"/usr/$(get_libdir)/ocaml/${PN}/META
+ fi
+ dodoc README
+ if use doc; then
+ emake doc
+ dohtml doc/*
+ fi
+}
diff --git a/dev-ml/xmlm-1.3.0 b/dev-ml/xmlm-1.3.0
deleted file mode 100644
index b381133aad24..000000000000
--- a/dev-ml/xmlm-1.3.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=dev-ml/findlib >=dev-ml/topkg-0.9 >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=Ocaml XML manipulation module
-EAPI=5
-HOMEPAGE=http://erratique.ch/software/xmlm https://github.com/dbuenzli/xmlm
-IUSE=test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=>=dev-lang/ocaml-4:=
-SLOT=0/1.3.0
-SRC_URI=http://erratique.ch/software/xmlm/releases/xmlm-1.3.0.tbz
-_eclasses_=opam 24b4a2529c1fd12f1304856d6c5a690d
-_md5_=cc99bd1b9a9bfefa7d74b4d59f8be67b
diff --git a/dev-ml/xmlm/Manifest b/dev-ml/xmlm/Manifest
new file mode 100644
index 000000000000..c1bc512392fb
--- /dev/null
+++ b/dev-ml/xmlm/Manifest
@@ -0,0 +1,3 @@
+DIST xmlm-1.3.0.tbz 25176 BLAKE2B 546f433386101c2460b0a8cadf94e383269e81792d068fa4c85d78117a5e65a64bd5e2fac0a5857d6bdefc7c511ae98cc77410b276ecb0300baf73d70ccb2251 SHA512 fd3b9ba8cd12321fd8d56e9ce829a7c8b121bff11cbf7ede58fa0280302fe0ba64f510360ff5b5182591faef660792db66db36e45f6355e3d22bb521f8e308fe
+EBUILD xmlm-1.3.0.ebuild 584 BLAKE2B be3dc98c892db1cc0650e4de291194430791eb0e1263b6bd2c610291a2435af1a6096af45b3628d97faedeec50c481c99870297f137553471ee2c1354977fcc9 SHA512 698d67b7baab633b1d013728d01ea77357bf3b0340ff10c183464705abe886ea3aef90ea863a47bfeaedba373b8e336e9f7001a475e93c212b6829833022c1d1
+MISC metadata.xml 325 BLAKE2B e750bdae2835484cf8c04b2e071e3118db8c59ca51ab5a2d3c100f153c738b3ea42a15349564b312c054d340c48760ede22b2e59baf4b88fda22753d5f7d4121 SHA512 5b130b6410fff7282184f48fee01fc6cc1f2d9bc74a904cd2de0011a81af82f4d335edc40d50289e7dff478ef352690466af8b8344948ab8891b548943a8980c
diff --git a/dev-ml/xmlm/metadata.xml b/dev-ml/xmlm/metadata.xml
new file mode 100644
index 000000000000..a798d7062372
--- /dev/null
+++ b/dev-ml/xmlm/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">dbuenzli/xmlm</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/xmlm/xmlm-1.3.0.ebuild b/dev-ml/xmlm/xmlm-1.3.0.ebuild
new file mode 100644
index 000000000000..f01035cc90c4
--- /dev/null
+++ b/dev-ml/xmlm/xmlm-1.3.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit opam
+
+DESCRIPTION="Ocaml XML manipulation module"
+HOMEPAGE="http://erratique.ch/software/xmlm https://github.com/dbuenzli/xmlm"
+SRC_URI="http://erratique.ch/software/${PN}/releases/${P}.tbz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+ dev-ml/findlib
+ >=dev-ml/topkg-0.9
+"
+
+src_compile() {
+ ocaml pkg/pkg.ml build \
+ --tests $(usex test 'true' 'false') \
+ || die
+}
+
+src_test() {
+ ocaml pkg/pkg.ml test || die
+}
diff --git a/dev-ml/xstr-0.2.1 b/dev-ml/xstr-0.2.1
deleted file mode 100644
index 17b0f917f894..000000000000
--- a/dev-ml/xstr-0.2.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=>=dev-lang/ocaml-3.10:=[ocamlopt] >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Thread-safe implementation of string searching/matching/splitting
-EAPI=5
-HOMEPAGE=http://www.ocaml-programming.de/packages/
-KEYWORDS=~amd64 ppc x86
-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
-_md5_=7110de2b94ae0a793175b86266f6c953
diff --git a/dev-ml/xstr/Manifest b/dev-ml/xstr/Manifest
new file mode 100644
index 000000000000..524d9f422bdf
--- /dev/null
+++ b/dev-ml/xstr/Manifest
@@ -0,0 +1,3 @@
+DIST xstr-0.2.1.tar.gz 14703 BLAKE2B 5fc64bba6359d8ea9d1517c291d65aeb5493222829c6b6ac6f350918aae0b2b2a6b997dc9a5b65ab2ac57fbb9f84afdfb738cbc79b2cfc0153fef78544e817be SHA512 aeb518353191d48c446641937bbf78660911dd9cbb34689790777fdf47c8ab57640fd0ee04b077a74cbbe46a07bc0ef71062a1b4b7f8a627a9524ef04a03b28e
+EBUILD xstr-0.2.1.ebuild 594 BLAKE2B 02af8461c708d312f1bcc211cc1ee6f67da036ca1c0dbd1c9f5b7dcc1923e31ddc3414768e03701cd4504f6f2088e7e9c76d03e425b94185e79e5318dd1059f0 SHA512 5bf3c8cffff8551b8a105da6491511602ae6b540678c80f60fab4c8b855c62fbc963cd20a44a2534e70c18cca34ce769456a5ec9c5ccf36071e9d4ac7644cf58
+MISC metadata.xml 243 BLAKE2B 010ca240ae06e9a9f6d7ba213eb06df36d9ba862ff2d2458d98a9fea1a1e7f3026d13832a73bce1b3ad9345029425e6abfae9e03bf126f2329b3f030ed3753fd SHA512 1c5b4b2163017e496999d1f87e5c9c5ac6c11b2e9187450ccfb3df258f34e54d278972f04ee0e8429476c6f87e091a869ac2a28c6e8c8e6d20678c3e74061449
diff --git a/dev-ml/xstr/metadata.xml b/dev-ml/xstr/metadata.xml
new file mode 100644
index 000000000000..ffac4d7ebc01
--- /dev/null
+++ b/dev-ml/xstr/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-ml/xstr/xstr-0.2.1.ebuild b/dev-ml/xstr/xstr-0.2.1.ebuild
new file mode 100644
index 000000000000..3d53842f7509
--- /dev/null
+++ b/dev-ml/xstr/xstr-0.2.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit findlib
+
+DESCRIPTION="Thread-safe implementation of string searching/matching/splitting"
+HOMEPAGE="http://www.ocaml-programming.de/packages/"
+SRC_URI="http://www.ocaml-programming.de/packages/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ppc x86"
+IUSE=""
+
+DEPEND=">=dev-lang/ocaml-3.10:=[ocamlopt]"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}"
+
+src_compile()
+{
+ make all || die
+ make opt || die
+}
+
+src_install()
+{
+ findlib_src_install
+ dodoc README RELEASE
+}
diff --git a/dev-ml/yojson-1.4.0 b/dev-ml/yojson-1.4.0
deleted file mode 100644
index 63d69721f3a9..000000000000
--- a/dev-ml/yojson-1.4.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=>=dev-lang/ocaml-3.11:=[ocamlopt] dev-ml/easy-format:=[ocamlopt] >=dev-ml/biniou-1.2:=[ocamlopt] dev-ml/cppo dev-ml/jbuilder >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=JSON parsing and pretty-printing library for OCaml
-EAPI=5
-HOMEPAGE=http://mjambon.com/yojson.html https://github.com/mjambon/yojson
-IUSE=examples
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=>=dev-lang/ocaml-3.11:=[ocamlopt] dev-ml/easy-format:=[ocamlopt] >=dev-ml/biniou-1.2:=[ocamlopt] >=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 24b4a2529c1fd12f1304856d6c5a690d
-_md5_=790517d7ae78040c627038e589b18e59
diff --git a/dev-ml/yojson/Manifest b/dev-ml/yojson/Manifest
new file mode 100644
index 000000000000..21e8d14c0702
--- /dev/null
+++ b/dev-ml/yojson/Manifest
@@ -0,0 +1,3 @@
+DIST yojson-1.4.0.tar.gz 26197 BLAKE2B c7d1a9d47f448995b31cd7631f64dec29e65b1f141854092bfe186a58c28b96c5c7f246f7e4ab4563dfcd84776904d4af77bbcbdc4e149229fbde339bd92df9f SHA512 dc019ecf0387299282c3df9a548456d2529993241911a83acb14f2361ed14886e5ebebe415773b6bc718cb0b12a25529184f3b5b62c71b42960fbd62e1c63bf6
+EBUILD yojson-1.4.0.ebuild 717 BLAKE2B 032af1cea5c51896945231bef8f53f5be2b79401ea62916615774be324f1069fb35c6c2290f40e616a32a994de12e90573a3e43b3f2e2510ad3a481bf4571825 SHA512 fab7a044839cd7cd13b7537ff3000c4a027ff69c1bb29e96f43e361a06941a8792df3018be945792cafc38b66bd2d955ff2e9b3214858f20c3e9e6d0d1518df7
+MISC metadata.xml 336 BLAKE2B cfb2743ed9621a08d35363acb760a838a06fe02cdcfface33fc399994ab0eb5569a30cc65e9dadc48fe3ac78c9ef01a07777174ee4ea631236650bc5a06be937 SHA512 414975df19a8bb9f75ace586c62505afe6d560d7303c88eb8823d61292b0ae87ab7f6fd2548dee1d08f682dfd31894b7cc8e328d5d68865d643b16d94a05c782
diff --git a/dev-ml/yojson/metadata.xml b/dev-ml/yojson/metadata.xml
new file mode 100644
index 000000000000..81b2fc96c145
--- /dev/null
+++ b/dev-ml/yojson/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">mjambon/yojson</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/yojson/yojson-1.4.0.ebuild b/dev-ml/yojson/yojson-1.4.0.ebuild
new file mode 100644
index 000000000000..e3b9f39c5175
--- /dev/null
+++ b/dev-ml/yojson/yojson-1.4.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit findlib opam
+
+DESCRIPTION="JSON parsing and pretty-printing library for OCaml"
+HOMEPAGE="http://mjambon.com/yojson.html https://github.com/mjambon/yojson"
+SRC_URI="https://github.com/mjambon/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0/${PV}"
+LICENSE="BSD"
+KEYWORDS="~amd64"
+IUSE="examples"
+
+RDEPEND=">=dev-lang/ocaml-3.11:=[ocamlopt]
+ dev-ml/easy-format:=[ocamlopt]
+ >=dev-ml/biniou-1.2:=[ocamlopt]
+"
+DEPEND="${RDEPEND}
+ dev-ml/cppo
+ dev-ml/jbuilder
+"
+
+src_install() {
+ opam_src_install
+
+ if use examples ; then
+ dodoc -r examples
+ docompress -x /usr/share/doc/${PF}/examples
+ fi
+}
diff --git a/dev-ml/zarith-1.4.1 b/dev-ml/zarith-1.4.1
deleted file mode 100644
index 2248927ea77d..000000000000
--- a/dev-ml/zarith-1.4.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] !mpir? ( dev-libs/gmp:0= ) mpir? ( sci-libs/mpir ) dev-lang/perl >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Arithmetic and logic operations over arbitrary-precision integers
-EAPI=5
-HOMEPAGE=https://forge.ocamlcore.org/projects/zarith/
-IUSE=doc mpir +ocamlopt
-KEYWORDS=~amd64 ~ppc ~x86
-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 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=64ad80ce8dcb5f5293a985a95f48a688
diff --git a/dev-ml/zarith-1.5 b/dev-ml/zarith-1.5
deleted file mode 100644
index 8b46bb17dcf1..000000000000
--- a/dev-ml/zarith-1.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] !mpir? ( dev-libs/gmp:0= ) mpir? ( sci-libs/mpir ) dev-lang/perl >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Arithmetic and logic operations over arbitrary-precision integers
-EAPI=5
-HOMEPAGE=https://github.com/ocaml/Zarith
-IUSE=doc mpir +ocamlopt
-KEYWORDS=~amd64 ~ppc ~x86
-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 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6c2c01e938d76da252430b6cc5269e16
diff --git a/dev-ml/zarith-1.6 b/dev-ml/zarith-1.6
deleted file mode 100644
index 45a87ba328e6..000000000000
--- a/dev-ml/zarith-1.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] !mpir? ( dev-libs/gmp:0= ) mpir? ( sci-libs/mpir ) dev-lang/perl >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Arithmetic and logic operations over arbitrary-precision integers
-EAPI=5
-HOMEPAGE=https://github.com/ocaml/Zarith
-IUSE=doc mpir +ocamlopt
-KEYWORDS=~amd64 ~ppc ~x86
-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 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6c2c01e938d76da252430b6cc5269e16
diff --git a/dev-ml/zarith-1.7 b/dev-ml/zarith-1.7
deleted file mode 100644
index 379c3f65c9c7..000000000000
--- a/dev-ml/zarith-1.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] !mpir? ( dev-libs/gmp:0= ) mpir? ( sci-libs/mpir ) dev-lang/perl >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Arithmetic and logic operations over arbitrary-precision integers
-EAPI=5
-HOMEPAGE=https://github.com/ocaml/Zarith
-IUSE=doc mpir +ocamlopt
-KEYWORDS=~amd64 ~ppc ~x86
-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 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc findlib 45d6030075064a68da8d7143726a1150 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6c2c01e938d76da252430b6cc5269e16
diff --git a/dev-ml/zarith/Manifest b/dev-ml/zarith/Manifest
new file mode 100644
index 000000000000..4af2879ff525
--- /dev/null
+++ b/dev-ml/zarith/Manifest
@@ -0,0 +1,9 @@
+DIST zarith-1.4.1.tgz 88831 BLAKE2B f1a434f61dfa23cdb1e41d3e84c53444832978d119aa3f169d1b0302268ba13bc9e1f4cdec8c76b14d53ad49a695f04c1077beb1619a16a89a98ac6a1ebd8361 SHA512 ef6717e3b6c19ef94fb0e02eb33b1d9f2b2103a9fe0334cb89b01b344ee953fbeeaed8a75b17daa32760faaf93d582e6778ae50e59e9cf878663f2ecba1d5659
+DIST zarith-1.5.tar.gz 89211 BLAKE2B f84127baeaf7efb61957e3657e7f2e3771df974ff6f92e3e0a04c93550ee48d5fa9adf473e423d409a2f40dba568ced30ef903c790f32b6e8bccd1032a475b84 SHA512 4e616b8cc81cd83f51696926e598be3bcda0bb5999db3cf42dd627cf537320a0216c74eb14c57e57fc21c909df8ef3fb3fa602a7ad633c115d2ee61af5a9fdcd
+DIST zarith-1.6.tar.gz 89353 BLAKE2B 4dc7dbe17426a57929632d38fae91bdfec4f54371ebb0ae55b6d88c7fffb47c229d0800125eaa2f5fca4e096bb50dceb4e0851ef88a16d3e89bc1db7b9cb32b9 SHA512 a12eacfaa809885f2b0f09ed0fc56d90ebaf9a3d8685db8a41dcaaaa2a9d2410ec96529d8bee653343ea8d51304861dbcf12daba06206a6cf07753ad3b09780d
+DIST zarith-1.7.tar.gz 89617 BLAKE2B ee8a272a7421d9e723af8aa6207da8fe046585804e669058b6dec8fb47cab80e438d0520c1b61ed6c79bc279d162a7a1043fa40e74c50342b7e4d553ca8e8f5b SHA512 812b5f9b24ce7a24d3370b8728ff6eeb56e3280fa1573e694fe54e781668c29bf8ff95e94aeff59df948adc85b8acd6b4efe117fb50a124f19b4227bee78e753
+EBUILD zarith-1.4.1.ebuild 1193 BLAKE2B 84a323166b9230e8a2a7924b31f87bdea990306161d2fb0eb8e8f3055b48e19302e1d27d4ea72ee7ae4759e710595cb740bb0076b15cf5ad601a969fbb753f94 SHA512 60bfc326aaea319952c69a3ae2b05339d743009d7c0e783355ed07b410c8b94ec5c5e4cb7b4c423929efaf41b82c21b630fb12b2ef9a2f024560054818e68f99
+EBUILD zarith-1.5.ebuild 1325 BLAKE2B 2957002ba292cd66a0493c9fcf71407d3996193430d4741ceb9bfa0efccaab91b3a0644f1458bd2fc8a573ee74d44cdee0f55c73306649346376117b9803ec5a SHA512 b83b61d3e2caf9fda5cb4abe42882d817af171ccbbdb526e161b0a62997aa37d5876626fbcba3e5df17fc1a0f07a5c0fb48943b8549b6a0351e195ac1b604385
+EBUILD zarith-1.6.ebuild 1325 BLAKE2B 2957002ba292cd66a0493c9fcf71407d3996193430d4741ceb9bfa0efccaab91b3a0644f1458bd2fc8a573ee74d44cdee0f55c73306649346376117b9803ec5a SHA512 b83b61d3e2caf9fda5cb4abe42882d817af171ccbbdb526e161b0a62997aa37d5876626fbcba3e5df17fc1a0f07a5c0fb48943b8549b6a0351e195ac1b604385
+EBUILD zarith-1.7.ebuild 1325 BLAKE2B 2957002ba292cd66a0493c9fcf71407d3996193430d4741ceb9bfa0efccaab91b3a0644f1458bd2fc8a573ee74d44cdee0f55c73306649346376117b9803ec5a SHA512 b83b61d3e2caf9fda5cb4abe42882d817af171ccbbdb526e161b0a62997aa37d5876626fbcba3e5df17fc1a0f07a5c0fb48943b8549b6a0351e195ac1b604385
+MISC metadata.xml 399 BLAKE2B 957cd71e4c150332db94c2761a118ebe1b4dbe05d66aa831848a0d5f290cedae382eae634ade1731aa4e9f658bdc4d7d2d89a763fc77cb03df882994503724ae SHA512 518416350f272156705d5bb2a2824724d0897b55ee4fe1a9e5e45a46b53f00bf103200009e42bd4bbed84e0903236dc0fdcce6da70b9e6cfdbd27d33cd714df6
diff --git a/dev-ml/zarith/metadata.xml b/dev-ml/zarith/metadata.xml
new file mode 100644
index 000000000000..c95afc027dca
--- /dev/null
+++ b/dev-ml/zarith/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <use>
+ <flag name="mpir">Use MPIR library instead of GMP.</flag>
+ </use>
+ <upstream>
+ <remote-id type="github">ocaml/Zarith</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/zarith/zarith-1.4.1.ebuild b/dev-ml/zarith/zarith-1.4.1.ebuild
new file mode 100644
index 000000000000..8825fc311e45
--- /dev/null
+++ b/dev-ml/zarith/zarith-1.4.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit findlib eutils toolchain-funcs
+
+DESCRIPTION="Arithmetic and logic operations over arbitrary-precision integers"
+HOMEPAGE="https://forge.ocamlcore.org/projects/zarith/"
+SRC_URI="https://forge.ocamlcore.org/frs/download.php/1574/${P}.tgz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc mpir +ocamlopt"
+
+RDEPEND="
+ >=dev-lang/ocaml-4:=[ocamlopt?]
+ !mpir? ( dev-libs/gmp:0= )
+ mpir? ( sci-libs/mpir )"
+
+DEPEND="${RDEPEND} dev-lang/perl"
+
+src_configure() {
+ tc-export CC
+ ./configure -host "${CHOST}" \
+ -ocamllibdir "/usr/$(get_libdir)" \
+ -installdir "${ED}/usr/$(get_libdir)/ocaml" \
+ $(usex mpir "-mpir" "-gmp") || die
+}
+
+src_compile() {
+ emake HASOCAMLOPT=$(usex ocamlopt yes no) HASDYNLINK=$(usex ocamlopt yes no) all
+ use doc && emake doc
+}
+
+src_test() {
+ emake HASOCAMLOPT=$(usex ocamlopt yes no) HASDYNLINK=$(usex ocamlopt yes no) tests
+}
+
+src_install() {
+ findlib_src_preinst
+ emake HASOCAMLOPT=$(usex ocamlopt yes no) HASDYNLINK=$(usex ocamlopt yes no) install
+ dodoc Changes README
+ use doc && dohtml html/*
+}
diff --git a/dev-ml/zarith/zarith-1.5.ebuild b/dev-ml/zarith/zarith-1.5.ebuild
new file mode 100644
index 000000000000..857c5026e9d6
--- /dev/null
+++ b/dev-ml/zarith/zarith-1.5.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit findlib eutils toolchain-funcs
+
+DESCRIPTION="Arithmetic and logic operations over arbitrary-precision integers"
+HOMEPAGE="https://github.com/ocaml/Zarith"
+SRC_URI="https://github.com/ocaml/Zarith/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc mpir +ocamlopt"
+
+RDEPEND="
+ >=dev-lang/ocaml-4:=[ocamlopt?]
+ !mpir? ( dev-libs/gmp:0= )
+ mpir? ( sci-libs/mpir )"
+
+DEPEND="${RDEPEND} dev-lang/perl"
+
+S="${WORKDIR}/Zarith-release-${PV}"
+
+src_configure() {
+ tc-export CC
+ ./configure -host "${CHOST}" \
+ -ocamllibdir "/usr/$(get_libdir)" \
+ -installdir "${ED}/usr/$(get_libdir)/ocaml" \
+ $(usex mpir "-mpir" "-gmp") || die
+}
+
+src_compile() {
+ emake HASOCAMLOPT=$(usex ocamlopt yes no) HASDYNLINK=$(usex ocamlopt yes no) all
+ use doc && emake doc
+}
+
+src_test() {
+ if use ocamlopt ; then
+ emake HASOCAMLOPT=$(usex ocamlopt yes no) HASDYNLINK=$(usex ocamlopt yes no) tests
+ else
+ ewarn "Tests require USE=ocamlopt. Skipping them."
+ fi
+}
+
+src_install() {
+ findlib_src_preinst
+ emake HASOCAMLOPT=$(usex ocamlopt yes no) HASDYNLINK=$(usex ocamlopt yes no) install
+ dodoc Changes README.md
+ use doc && dohtml html/*
+}
diff --git a/dev-ml/zarith/zarith-1.6.ebuild b/dev-ml/zarith/zarith-1.6.ebuild
new file mode 100644
index 000000000000..857c5026e9d6
--- /dev/null
+++ b/dev-ml/zarith/zarith-1.6.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit findlib eutils toolchain-funcs
+
+DESCRIPTION="Arithmetic and logic operations over arbitrary-precision integers"
+HOMEPAGE="https://github.com/ocaml/Zarith"
+SRC_URI="https://github.com/ocaml/Zarith/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc mpir +ocamlopt"
+
+RDEPEND="
+ >=dev-lang/ocaml-4:=[ocamlopt?]
+ !mpir? ( dev-libs/gmp:0= )
+ mpir? ( sci-libs/mpir )"
+
+DEPEND="${RDEPEND} dev-lang/perl"
+
+S="${WORKDIR}/Zarith-release-${PV}"
+
+src_configure() {
+ tc-export CC
+ ./configure -host "${CHOST}" \
+ -ocamllibdir "/usr/$(get_libdir)" \
+ -installdir "${ED}/usr/$(get_libdir)/ocaml" \
+ $(usex mpir "-mpir" "-gmp") || die
+}
+
+src_compile() {
+ emake HASOCAMLOPT=$(usex ocamlopt yes no) HASDYNLINK=$(usex ocamlopt yes no) all
+ use doc && emake doc
+}
+
+src_test() {
+ if use ocamlopt ; then
+ emake HASOCAMLOPT=$(usex ocamlopt yes no) HASDYNLINK=$(usex ocamlopt yes no) tests
+ else
+ ewarn "Tests require USE=ocamlopt. Skipping them."
+ fi
+}
+
+src_install() {
+ findlib_src_preinst
+ emake HASOCAMLOPT=$(usex ocamlopt yes no) HASDYNLINK=$(usex ocamlopt yes no) install
+ dodoc Changes README.md
+ use doc && dohtml html/*
+}
diff --git a/dev-ml/zarith/zarith-1.7.ebuild b/dev-ml/zarith/zarith-1.7.ebuild
new file mode 100644
index 000000000000..857c5026e9d6
--- /dev/null
+++ b/dev-ml/zarith/zarith-1.7.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit findlib eutils toolchain-funcs
+
+DESCRIPTION="Arithmetic and logic operations over arbitrary-precision integers"
+HOMEPAGE="https://github.com/ocaml/Zarith"
+SRC_URI="https://github.com/ocaml/Zarith/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc mpir +ocamlopt"
+
+RDEPEND="
+ >=dev-lang/ocaml-4:=[ocamlopt?]
+ !mpir? ( dev-libs/gmp:0= )
+ mpir? ( sci-libs/mpir )"
+
+DEPEND="${RDEPEND} dev-lang/perl"
+
+S="${WORKDIR}/Zarith-release-${PV}"
+
+src_configure() {
+ tc-export CC
+ ./configure -host "${CHOST}" \
+ -ocamllibdir "/usr/$(get_libdir)" \
+ -installdir "${ED}/usr/$(get_libdir)/ocaml" \
+ $(usex mpir "-mpir" "-gmp") || die
+}
+
+src_compile() {
+ emake HASOCAMLOPT=$(usex ocamlopt yes no) HASDYNLINK=$(usex ocamlopt yes no) all
+ use doc && emake doc
+}
+
+src_test() {
+ if use ocamlopt ; then
+ emake HASOCAMLOPT=$(usex ocamlopt yes no) HASDYNLINK=$(usex ocamlopt yes no) tests
+ else
+ ewarn "Tests require USE=ocamlopt. Skipping them."
+ fi
+}
+
+src_install() {
+ findlib_src_preinst
+ emake HASOCAMLOPT=$(usex ocamlopt yes no) HASDYNLINK=$(usex ocamlopt yes no) install
+ dodoc Changes README.md
+ use doc && dohtml html/*
+}
diff --git a/dev-ml/zed-1.5 b/dev-ml/zed-1.5
deleted file mode 100644
index ea3b003b6a70..000000000000
--- a/dev-ml/zed-1.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=dev-lang/ocaml:= dev-ml/camomile:= dev-ml/react:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=Zed is an abstract engine for text edition
-EAPI=5
-HOMEPAGE=https://github.com/diml/zed
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-lang/ocaml:= dev-ml/camomile:= dev-ml/react:= >=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 24b4a2529c1fd12f1304856d6c5a690d
-_md5_=fdb294a15bf407125f16eac9a24d2f6d
diff --git a/dev-ml/zed/Manifest b/dev-ml/zed/Manifest
new file mode 100644
index 000000000000..c9b86ca367ac
--- /dev/null
+++ b/dev-ml/zed/Manifest
@@ -0,0 +1,3 @@
+DIST zed-1.5.tar.gz 29999 BLAKE2B 0b06eeae718cbbe7f179f50baa8d203466265732a6964f3a899afb2ddabec08def9a9b1764d20d0777c21190b452a6e95b2dd3f8d96934624b0efe4b1a5b060b SHA512 7bd66ef77ffa64df59ddd6760e2304bb38daa168d98dc051482d162a2427c639646a489e6fbc2ad53c871b194ce59e20dd19aba29935959a9986128d46b8df34
+EBUILD zed-1.5.ebuild 547 BLAKE2B acd2551456fe2829d7ba8ea12d43a55e4299f5f7d9764448c09eb51ef7689df07ee34050a34337b9a0ceb9463332e4d74c8dc5dc897b3f5d97eb01cb02b009fc SHA512 d013266e86b5adf10b95a1d140b7fabe028a50c1d78cc8eee91e117f24c1d905818486dc4da80eb16f4e709449cf8792ac80543dff1a29b84c656d70cde44c20
+MISC metadata.xml 330 BLAKE2B ad3ca908cc43e1dd70c015e05ac102aa66b9912659eff7a7fd8a802a6e3a454091a94680f6399275ddec04f9bf2b4b7a53c4842ff8976c545f2ab045a103c04f SHA512 238a3f3f6ff81f0cf1ba23971462c2f2c99ee7ca58d0db53c08c41d0e089f92e428e19df56352152f89adf70a8162e9a882423ef421a9d1f0e108b6518a3d143
diff --git a/dev-ml/zed/metadata.xml b/dev-ml/zed/metadata.xml
new file mode 100644
index 000000000000..0c36be87a2d5
--- /dev/null
+++ b/dev-ml/zed/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">diml/zed</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/zed/zed-1.5.ebuild b/dev-ml/zed/zed-1.5.ebuild
new file mode 100644
index 000000000000..c8a407083927
--- /dev/null
+++ b/dev-ml/zed/zed-1.5.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit opam
+
+DESCRIPTION="Zed is an abstract engine for text edition"
+HOMEPAGE="https://github.com/diml/zed"
+SRC_URI="https://github.com/diml/zed/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+ dev-lang/ocaml:=
+ dev-ml/camomile:=
+ dev-ml/react:="
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND}
+ dev-ml/jbuilder"
+
+src_compile() {
+ jbuilder build --only-packages zed @install || die
+}