summaryrefslogtreecommitdiff
path: root/dev-ml
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2020-11-25 22:39:15 +0000
committerV3n3RiX <venerix@redcorelinux.org>2020-11-25 22:39:15 +0000
commitd934827bf44b7cfcf6711964418148fa60877668 (patch)
tree0625f358789b5e015e49db139cc1dbc9be00428f /dev-ml
parent2e34d110f164bf74d55fced27fe0000201b3eec5 (diff)
gentoo resync : 25.11.2020
Diffstat (limited to 'dev-ml')
-rw-r--r--dev-ml/Manifest.gzbin27683 -> 32926 bytes
-rw-r--r--dev-ml/astring/Manifest4
-rw-r--r--dev-ml/astring/astring-0.8.5.ebuild27
-rw-r--r--dev-ml/astring/metadata.xml1
-rw-r--r--dev-ml/base/Manifest4
-rw-r--r--dev-ml/base/base-0.14.0.ebuild21
-rw-r--r--dev-ml/base/metadata.xml5
-rw-r--r--dev-ml/base_quickcheck/Manifest3
-rw-r--r--dev-ml/base_quickcheck/base_quickcheck-0.14.0.ebuild29
-rw-r--r--dev-ml/base_quickcheck/metadata.xml11
-rw-r--r--dev-ml/bin_prot/Manifest3
-rw-r--r--dev-ml/bin_prot/bin_prot-0.14.0.ebuild27
-rw-r--r--dev-ml/bin_prot/metadata.xml11
-rw-r--r--dev-ml/cairo-ocaml/Manifest2
-rw-r--r--dev-ml/cairo-ocaml/cairo-ocaml-1.2.0-r1.ebuild85
-rw-r--r--dev-ml/cairo-ocaml/files/ocaml406.patch20
-rw-r--r--dev-ml/cairo2/Manifest6
-rw-r--r--dev-ml/cairo2/cairo2-0.6.1.ebuild39
-rw-r--r--dev-ml/cairo2/files/cairo2-0.6.1-Fix-multiple-definitions-of-variables.patch102
-rw-r--r--dev-ml/cairo2/files/cairo2-0.6.1-handle-safe-string.patch50
-rw-r--r--dev-ml/cairo2/files/cairo2-0.6.1-ignore-gtk-and-pango.patch82
-rw-r--r--dev-ml/cairo2/metadata.xml11
-rw-r--r--dev-ml/camlbz2/Manifest3
-rw-r--r--dev-ml/camlbz2/camlbz2-0.6.0-r1.ebuild32
-rw-r--r--dev-ml/camlbz2/metadata.xml5
-rw-r--r--dev-ml/camldbm/Manifest4
-rw-r--r--dev-ml/camldbm/camldbm-1.0.ebuild12
-rw-r--r--dev-ml/camldbm/camldbm-1.2.ebuild22
-rw-r--r--dev-ml/camlp4/Manifest12
-rw-r--r--dev-ml/camlp4/camlp4-4.04_p1.ebuild6
-rw-r--r--dev-ml/camlp4/camlp4-4.05_p1.ebuild6
-rw-r--r--dev-ml/camlp4/camlp4-4.08_p1.ebuild6
-rw-r--r--dev-ml/camlp4/camlp4-4.10_p1.ebuild44
-rw-r--r--dev-ml/camlp4/camlp4-4.11_p1.ebuild44
-rw-r--r--dev-ml/camlp4/metadata.xml11
-rw-r--r--dev-ml/camlp5/Manifest9
-rw-r--r--dev-ml/camlp5/camlp5-7.11-r1.ebuild (renamed from dev-ml/camlp5/camlp5-7.11.ebuild)2
-rw-r--r--dev-ml/camlp5/camlp5-7.12.ebuild61
-rw-r--r--dev-ml/camlp5/camlp5-7.13.ebuild55
-rw-r--r--dev-ml/camlp5/files/camlp5-7.12-destdir.patch13
-rw-r--r--dev-ml/camlp5/metadata.xml4
-rw-r--r--dev-ml/camlpdf/Manifest2
-rw-r--r--dev-ml/camlpdf/camlpdf-2.3.ebuild36
-rw-r--r--dev-ml/camlzip/Manifest2
-rw-r--r--dev-ml/camlzip/camlzip-1.10.ebuild2
-rw-r--r--dev-ml/camomile/Manifest3
-rw-r--r--dev-ml/camomile/camomile-0.8.5-r1.ebuild41
-rw-r--r--dev-ml/camomile/camomile-1.0.2.ebuild26
-rw-r--r--dev-ml/cinaps/Manifest3
-rw-r--r--dev-ml/cinaps/cinaps-0.14.0.ebuild28
-rw-r--r--dev-ml/cinaps/metadata.xml11
-rw-r--r--dev-ml/cmdliner/Manifest4
-rw-r--r--dev-ml/cmdliner/cmdliner-1.0.4.ebuild45
-rw-r--r--dev-ml/cmdliner/metadata.xml5
-rw-r--r--dev-ml/cppo/Manifest4
-rw-r--r--dev-ml/cppo/cppo-1.6.6.ebuild20
-rw-r--r--dev-ml/cppo/metadata.xml7
-rw-r--r--dev-ml/cryptokit/Manifest6
-rw-r--r--dev-ml/cryptokit/cryptokit-1.11.ebuild2
-rw-r--r--dev-ml/cryptokit/cryptokit-1.16.1-r1.ebuild (renamed from dev-ml/cryptokit/cryptokit-1.12.ebuild)45
-rw-r--r--dev-ml/csexp/Manifest3
-rw-r--r--dev-ml/csexp/csexp-1.3.2.ebuild25
-rw-r--r--dev-ml/csexp/metadata.xml11
-rw-r--r--dev-ml/cudf/Manifest7
-rw-r--r--dev-ml/cudf/cudf-0.8-r1.ebuild6
-rw-r--r--dev-ml/cudf/cudf-0.9.ebuild68
-rw-r--r--dev-ml/cudf/files/ounit2.patch12
-rw-r--r--dev-ml/cudf/metadata.xml5
-rw-r--r--dev-ml/dose3/Manifest5
-rw-r--r--dev-ml/dose3/dose3-5.0.1-r1.ebuild65
-rw-r--r--dev-ml/dose3/files/ocaml406.patch39
-rw-r--r--dev-ml/dose3/files/unix.patch13
-rw-r--r--dev-ml/dose3/metadata.xml5
-rw-r--r--dev-ml/dune-configurator/Manifest3
-rw-r--r--dev-ml/dune-configurator/dune-configurator-2.7.1.ebuild31
-rw-r--r--dev-ml/dune-configurator/metadata.xml11
-rw-r--r--dev-ml/dune-private-libs/Manifest3
-rw-r--r--dev-ml/dune-private-libs/dune-private-libs-2.7.1.ebuild44
-rw-r--r--dev-ml/dune-private-libs/metadata.xml11
-rw-r--r--dev-ml/dune/Manifest4
-rw-r--r--dev-ml/dune/dune-2.7.1.ebuild37
-rw-r--r--dev-ml/dune/metadata.xml5
-rw-r--r--dev-ml/extlib/Manifest5
-rw-r--r--dev-ml/extlib/extlib-1.7.7.ebuild58
-rw-r--r--dev-ml/extlib/files/extlib-1.7.7-no-git.patch9
-rw-r--r--dev-ml/extlib/metadata.xml5
-rw-r--r--dev-ml/facile/Manifest2
-rw-r--r--dev-ml/facile/facile-1.1.3.ebuild2
-rw-r--r--dev-ml/fieldslib/Manifest4
-rw-r--r--dev-ml/fieldslib/fieldslib-0.14.0.ebuild21
-rw-r--r--dev-ml/fieldslib/metadata.xml5
-rw-r--r--dev-ml/findlib/Manifest12
-rw-r--r--dev-ml/findlib/files/externalmeta7.patch13
-rw-r--r--dev-ml/findlib/findlib-1.7.1.ebuild2
-rw-r--r--dev-ml/findlib/findlib-1.7.2.ebuild2
-rw-r--r--dev-ml/findlib/findlib-1.7.3.ebuild2
-rw-r--r--dev-ml/findlib/findlib-1.8.1-r1.ebuild78
-rw-r--r--dev-ml/findlib/findlib-1.8.1.ebuild2
-rw-r--r--dev-ml/findlib/metadata.xml5
-rw-r--r--dev-ml/integers/Manifest4
-rw-r--r--dev-ml/integers/integers-0.4.0.ebuild19
-rw-r--r--dev-ml/integers/metadata.xml5
-rw-r--r--dev-ml/jane-street-headers/Manifest4
-rw-r--r--dev-ml/jane-street-headers/jane-street-headers-0.14.0.ebuild18
-rw-r--r--dev-ml/jane-street-headers/metadata.xml5
-rw-r--r--dev-ml/jst-config/Manifest3
-rw-r--r--dev-ml/jst-config/jst-config-0.14.0.ebuild23
-rw-r--r--dev-ml/jst-config/metadata.xml11
-rw-r--r--dev-ml/lablgl/Manifest5
-rw-r--r--dev-ml/lablgl/files/lablgl-1.06-makefile.patch12
-rw-r--r--dev-ml/lablgl/lablgl-1.05-r1.ebuild37
-rw-r--r--dev-ml/lablgl/lablgl-1.06-r1.ebuild94
-rw-r--r--dev-ml/lablgtk-sourceview/Manifest3
-rw-r--r--dev-ml/lablgtk-sourceview/lablgtk-sourceview-3.1.1.ebuild28
-rw-r--r--dev-ml/lablgtk-sourceview/metadata.xml11
-rw-r--r--dev-ml/lablgtk/Manifest10
-rw-r--r--dev-ml/lablgtk/lablgtk-2.18.10.ebuild2
-rw-r--r--dev-ml/lablgtk/lablgtk-2.18.5.ebuild2
-rw-r--r--dev-ml/lablgtk/lablgtk-2.18.8-r1.ebuild2
-rw-r--r--dev-ml/lablgtk/lablgtk-3.1.1.ebuild27
-rw-r--r--dev-ml/lablgtk/metadata.xml4
-rw-r--r--dev-ml/labltk/Manifest6
-rw-r--r--dev-ml/labltk/labltk-8.06.2.ebuild2
-rw-r--r--dev-ml/labltk/labltk-8.06.7.ebuild2
-rw-r--r--dev-ml/labltk/labltk-8.06.9.ebuild44
-rw-r--r--dev-ml/llvm-ocaml/Manifest10
-rw-r--r--dev-ml/llvm-ocaml/llvm-ocaml-11.0.0.9999.ebuild3
-rw-r--r--dev-ml/llvm-ocaml/llvm-ocaml-11.0.0.ebuild (renamed from dev-ml/llvm-ocaml/llvm-ocaml-11.0.0_rc3.ebuild)5
-rw-r--r--dev-ml/llvm-ocaml/llvm-ocaml-11.0.0_rc4.ebuild115
-rw-r--r--dev-ml/llvm-ocaml/llvm-ocaml-12.0.0.9999.ebuild5
-rw-r--r--dev-ml/lwt/Manifest5
-rw-r--r--dev-ml/lwt/files/lwt-5.3.0-ppxlib-0.18.0.patch401
-rw-r--r--dev-ml/lwt/lwt-5.3.0-r1.ebuild35
-rw-r--r--dev-ml/lwt/metadata.xml5
-rw-r--r--dev-ml/mccs/Manifest3
-rw-r--r--dev-ml/mccs/mccs-1.1.11.ebuild30
-rw-r--r--dev-ml/mccs/metadata.xml11
-rw-r--r--dev-ml/mmap/Manifest5
-rw-r--r--dev-ml/mmap/metadata.xml11
-rw-r--r--dev-ml/mmap/mmap-1.0.2.ebuild20
-rw-r--r--dev-ml/mmap/mmap-1.1.0.ebuild20
-rw-r--r--dev-ml/num/Manifest3
-rw-r--r--dev-ml/num/metadata.xml4
-rw-r--r--dev-ml/num/num-1.3-r1.ebuild33
-rw-r--r--dev-ml/ocaml-autoconf/Manifest2
-rw-r--r--dev-ml/ocaml-autoconf/ocaml-autoconf-1.1-r1.ebuild4
-rw-r--r--dev-ml/ocaml-compiler-libs/Manifest4
-rw-r--r--dev-ml/ocaml-compiler-libs/metadata.xml5
-rw-r--r--dev-ml/ocaml-compiler-libs/ocaml-compiler-libs-0.12.3.ebuild18
-rw-r--r--dev-ml/ocaml-ctypes/Manifest12
-rw-r--r--dev-ml/ocaml-ctypes/metadata.xml11
-rw-r--r--dev-ml/ocaml-ctypes/ocaml-ctypes-0.11.2.ebuild4
-rw-r--r--dev-ml/ocaml-ctypes/ocaml-ctypes-0.11.3.ebuild4
-rw-r--r--dev-ml/ocaml-ctypes/ocaml-ctypes-0.12.1.ebuild4
-rw-r--r--dev-ml/ocaml-ctypes/ocaml-ctypes-0.13.0.ebuild4
-rw-r--r--dev-ml/ocaml-ctypes/ocaml-ctypes-0.17.1.ebuild42
-rw-r--r--dev-ml/ocaml-expat/Manifest4
-rw-r--r--dev-ml/ocaml-expat/files/ounit2.patch17
-rw-r--r--dev-ml/ocaml-expat/metadata.xml11
-rw-r--r--dev-ml/ocaml-expat/ocaml-expat-1.1.0-r1.ebuild52
-rw-r--r--dev-ml/ocaml-gettext/Manifest8
-rw-r--r--dev-ml/ocaml-gettext/files/oc43.patch12
-rw-r--r--dev-ml/ocaml-gettext/ocaml-gettext-0.3.5-r1.ebuild52
-rw-r--r--dev-ml/ocaml-gettext/ocaml-gettext-0.3.7-r2.ebuild (renamed from dev-ml/ocaml-gettext/ocaml-gettext-0.3.7-r1.ebuild)6
-rw-r--r--dev-ml/ocaml-gettext/ocaml-gettext-0.3.7.ebuild52
-rw-r--r--dev-ml/ocaml-gettext/ocaml-gettext-0.4.2.ebuild36
-rw-r--r--dev-ml/ocaml-migrate-parsetree/Manifest4
-rw-r--r--dev-ml/ocaml-migrate-parsetree/metadata.xml9
-rw-r--r--dev-ml/ocaml-migrate-parsetree/ocaml-migrate-parsetree-2.0.0.ebuild19
-rw-r--r--dev-ml/ocaml-ssl/Manifest8
-rw-r--r--dev-ml/ocaml-ssl/ocaml-ssl-0.5.3-r1.ebuild (renamed from dev-ml/ocaml-ssl/ocaml-ssl-0.5.3.ebuild)14
-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-ssl/ocaml-ssl-0.5.9.ebuild28
-rw-r--r--dev-ml/ocamlbuild/Manifest10
-rw-r--r--dev-ml/ocamlbuild/files/ocamlbuild-0.14.0-Disable-tests-failing-with-OCaml-4.08.0.patch39
-rw-r--r--dev-ml/ocamlbuild/metadata.xml5
-rw-r--r--dev-ml/ocamlbuild/ocamlbuild-0.10.1.ebuild2
-rw-r--r--dev-ml/ocamlbuild/ocamlbuild-0.11.0.ebuild2
-rw-r--r--dev-ml/ocamlbuild/ocamlbuild-0.14.0-r1.ebuild40
-rw-r--r--dev-ml/ocamlbuild/ocamlbuild-0.14.0.ebuild8
-rw-r--r--dev-ml/ocamlgraph/Manifest4
-rw-r--r--dev-ml/ocamlgraph/ocamlgraph-1.8.7-r1.ebuild (renamed from dev-ml/ocamlgraph/ocamlgraph-1.8.7.ebuild)17
-rw-r--r--dev-ml/ocamlgraph/ocamlgraph-1.8.8-r1.ebuild (renamed from dev-ml/ocamlgraph/ocamlgraph-1.8.8.ebuild)17
-rw-r--r--dev-ml/ocamlnet/Manifest4
-rw-r--r--dev-ml/ocamlnet/ocamlnet-4.1.8.ebuild (renamed from dev-ml/ocamlnet/ocamlnet-4.1.4.ebuild)40
-rw-r--r--dev-ml/ocamlsdl/Manifest5
-rw-r--r--dev-ml/ocamlsdl/files/ocamlsdl-0.9.1-fix-ocaml-4.09.0-compilation.patch28
-rw-r--r--dev-ml/ocamlsdl/files/ocamlsdl-0.9.1-ocamlopt.patch (renamed from dev-ml/ocamlsdl/files/ocamlopt.patch)0
-rw-r--r--dev-ml/ocamlsdl/ocamlsdl-0.9.1.ebuild30
-rw-r--r--dev-ml/ocamlweb/Manifest6
-rw-r--r--dev-ml/ocamlweb/files/ocamlweb-1.41-ocaml-4.08.0.patch53
-rw-r--r--dev-ml/ocamlweb/files/ocamlweb-1.41-strip.patch17
-rw-r--r--dev-ml/ocamlweb/metadata.xml5
-rw-r--r--dev-ml/ocamlweb/ocamlweb-1.41.ebuild33
-rw-r--r--dev-ml/ocplib-endian/Manifest4
-rw-r--r--dev-ml/ocplib-endian/metadata.xml11
-rw-r--r--dev-ml/ocplib-endian/ocplib-endian-1.1-r1.ebuild20
-rw-r--r--dev-ml/octavius/Manifest4
-rw-r--r--dev-ml/octavius/metadata.xml5
-rw-r--r--dev-ml/octavius/octavius-1.2.2.ebuild18
-rw-r--r--dev-ml/ocurl/Manifest6
-rw-r--r--dev-ml/ocurl/ocurl-0.6.1.ebuild35
-rw-r--r--dev-ml/ocurl/ocurl-0.9.1.ebuild (renamed from dev-ml/ocurl/ocurl-0.7.9.ebuild)20
-rw-r--r--dev-ml/opam-client/Manifest3
-rw-r--r--dev-ml/opam-client/metadata.xml11
-rw-r--r--dev-ml/opam-client/opam-client-2.0.7.ebuild37
-rw-r--r--dev-ml/opam-core/Manifest3
-rw-r--r--dev-ml/opam-core/metadata.xml11
-rw-r--r--dev-ml/opam-core/opam-core-2.0.7.ebuild45
-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.1.0.ebuild30
-rw-r--r--dev-ml/opam-format/Manifest3
-rw-r--r--dev-ml/opam-format/metadata.xml11
-rw-r--r--dev-ml/opam-format/opam-format-2.0.7.ebuild44
-rw-r--r--dev-ml/opam-installer/Manifest3
-rw-r--r--dev-ml/opam-installer/metadata.xml11
-rw-r--r--dev-ml/opam-installer/opam-installer-2.0.7.ebuild41
-rw-r--r--dev-ml/opam-repository/Manifest3
-rw-r--r--dev-ml/opam-repository/metadata.xml11
-rw-r--r--dev-ml/opam-repository/opam-repository-2.0.7.ebuild37
-rw-r--r--dev-ml/opam-solver/Manifest3
-rw-r--r--dev-ml/opam-solver/metadata.xml11
-rw-r--r--dev-ml/opam-solver/opam-solver-2.0.7.ebuild40
-rw-r--r--dev-ml/opam-state/Manifest3
-rw-r--r--dev-ml/opam-state/metadata.xml11
-rw-r--r--dev-ml/opam-state/opam-state-2.0.7.ebuild36
-rw-r--r--dev-ml/opam/Manifest4
-rw-r--r--dev-ml/opam/metadata.xml11
-rw-r--r--dev-ml/opam/opam-2.0.7.ebuild38
-rw-r--r--dev-ml/ounit/Manifest2
-rw-r--r--dev-ml/ounit/ounit-2.0.6.ebuild2
-rw-r--r--dev-ml/ounit2/Manifest3
-rw-r--r--dev-ml/ounit2/metadata.xml11
-rw-r--r--dev-ml/ounit2/ounit2-2.2.3.ebuild22
-rw-r--r--dev-ml/parmap/Manifest6
-rw-r--r--dev-ml/parmap/parmap-1.0_rc7-r1.ebuild46
-rw-r--r--dev-ml/parmap/parmap-1.0_rc8.ebuild2
-rw-r--r--dev-ml/parmap/parmap-1.1.1.ebuild21
-rw-r--r--dev-ml/parsexp/Manifest3
-rw-r--r--dev-ml/parsexp/metadata.xml11
-rw-r--r--dev-ml/parsexp/parsexp-0.14.0.ebuild21
-rw-r--r--dev-ml/pcre-ocaml/Manifest10
-rw-r--r--dev-ml/pcre-ocaml/pcre-ocaml-7.2.3.ebuild6
-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.4.6-r1.ebuild (renamed from dev-ml/pcre-ocaml/pcre-ocaml-7.3.3.ebuild)34
-rw-r--r--dev-ml/ppx_assert/Manifest4
-rw-r--r--dev-ml/ppx_assert/metadata.xml5
-rw-r--r--dev-ml/ppx_assert/ppx_assert-0.14.0.ebuild29
-rw-r--r--dev-ml/ppx_base/Manifest4
-rw-r--r--dev-ml/ppx_base/metadata.xml5
-rw-r--r--dev-ml/ppx_base/ppx_base-0.14.0.ebuild28
-rw-r--r--dev-ml/ppx_bench/Manifest4
-rw-r--r--dev-ml/ppx_bench/metadata.xml5
-rw-r--r--dev-ml/ppx_bench/ppx_bench-0.14.1.ebuild24
-rw-r--r--dev-ml/ppx_bin_prot/Manifest4
-rw-r--r--dev-ml/ppx_bin_prot/metadata.xml5
-rw-r--r--dev-ml/ppx_bin_prot/ppx_bin_prot-0.14.0.ebuild31
-rw-r--r--dev-ml/ppx_cold/Manifest3
-rw-r--r--dev-ml/ppx_cold/metadata.xml11
-rw-r--r--dev-ml/ppx_cold/ppx_cold-0.14.0.ebuild24
-rw-r--r--dev-ml/ppx_compare/Manifest4
-rw-r--r--dev-ml/ppx_compare/metadata.xml5
-rw-r--r--dev-ml/ppx_compare/ppx_compare-0.14.0.ebuild28
-rw-r--r--dev-ml/ppx_custom_printf/Manifest5
-rw-r--r--dev-ml/ppx_custom_printf/files/ppx_custom_printf-0.14.0-ppxlib-0.18.0.patch41
-rw-r--r--dev-ml/ppx_custom_printf/metadata.xml5
-rw-r--r--dev-ml/ppx_custom_printf/ppx_custom_printf-0.14.0.ebuild27
-rw-r--r--dev-ml/ppx_derivers/Manifest4
-rw-r--r--dev-ml/ppx_derivers/metadata.xml5
-rw-r--r--dev-ml/ppx_derivers/ppx_derivers-1.2.1.ebuild18
-rw-r--r--dev-ml/ppx_deriving/Manifest4
-rw-r--r--dev-ml/ppx_deriving/metadata.xml5
-rw-r--r--dev-ml/ppx_deriving/ppx_deriving-4.5.ebuild29
-rw-r--r--dev-ml/ppx_driver/Manifest4
-rw-r--r--dev-ml/ppx_driver/metadata.xml5
-rw-r--r--dev-ml/ppx_driver/ppx_driver-0.11.0.ebuild21
-rw-r--r--dev-ml/ppx_enumerate/Manifest4
-rw-r--r--dev-ml/ppx_enumerate/metadata.xml5
-rw-r--r--dev-ml/ppx_enumerate/ppx_enumerate-0.14.0.ebuild24
-rw-r--r--dev-ml/ppx_expect/Manifest5
-rw-r--r--dev-ml/ppx_expect/files/ppx_expect-0.14.0-ppxlib-0.18.0.patch42
-rw-r--r--dev-ml/ppx_expect/metadata.xml5
-rw-r--r--dev-ml/ppx_expect/ppx_expect-0.14.0.ebuild37
-rw-r--r--dev-ml/ppx_fail/Manifest4
-rw-r--r--dev-ml/ppx_fail/metadata.xml5
-rw-r--r--dev-ml/ppx_fail/ppx_fail-0.14.0.ebuild24
-rw-r--r--dev-ml/ppx_fields_conv/Manifest5
-rw-r--r--dev-ml/ppx_fields_conv/files/ppx_fields_conv-0.14.1-ppxlib-0.18.0.patch60
-rw-r--r--dev-ml/ppx_fields_conv/metadata.xml5
-rw-r--r--dev-ml/ppx_fields_conv/ppx_fields_conv-0.14.1.ebuild26
-rw-r--r--dev-ml/ppx_fixed_literal/Manifest3
-rw-r--r--dev-ml/ppx_fixed_literal/metadata.xml11
-rw-r--r--dev-ml/ppx_fixed_literal/ppx_fixed_literal-0.14.0.ebuild25
-rw-r--r--dev-ml/ppx_hash/Manifest4
-rw-r--r--dev-ml/ppx_hash/metadata.xml5
-rw-r--r--dev-ml/ppx_hash/ppx_hash-0.14.0.ebuild26
-rw-r--r--dev-ml/ppx_here/Manifest4
-rw-r--r--dev-ml/ppx_here/metadata.xml5
-rw-r--r--dev-ml/ppx_here/ppx_here-0.14.0.ebuild28
-rw-r--r--dev-ml/ppx_inline_test/Manifest4
-rw-r--r--dev-ml/ppx_inline_test/metadata.xml5
-rw-r--r--dev-ml/ppx_inline_test/ppx_inline_test-0.14.1.ebuild27
-rw-r--r--dev-ml/ppx_jane/Manifest4
-rw-r--r--dev-ml/ppx_jane/metadata.xml5
-rw-r--r--dev-ml/ppx_jane/ppx_jane-0.14.0.ebuild43
-rw-r--r--dev-ml/ppx_js_style/Manifest4
-rw-r--r--dev-ml/ppx_js_style/metadata.xml5
-rw-r--r--dev-ml/ppx_js_style/ppx_js_style-0.14.0.ebuild26
-rw-r--r--dev-ml/ppx_let/Manifest4
-rw-r--r--dev-ml/ppx_let/metadata.xml5
-rw-r--r--dev-ml/ppx_let/ppx_let-0.14.0.ebuild25
-rw-r--r--dev-ml/ppx_metaquot/Manifest4
-rw-r--r--dev-ml/ppx_metaquot/metadata.xml5
-rw-r--r--dev-ml/ppx_metaquot/ppx_metaquot-0.11.0.ebuild18
-rw-r--r--dev-ml/ppx_module_timer/Manifest3
-rw-r--r--dev-ml/ppx_module_timer/metadata.xml11
-rw-r--r--dev-ml/ppx_module_timer/ppx_module_timer-0.14.0.ebuild27
-rw-r--r--dev-ml/ppx_optcomp/Manifest5
-rw-r--r--dev-ml/ppx_optcomp/files/ppx_optcomp-0.14.0-ppxlib-0.18.0.patch63
-rw-r--r--dev-ml/ppx_optcomp/metadata.xml5
-rw-r--r--dev-ml/ppx_optcomp/ppx_optcomp-0.14.0.ebuild28
-rw-r--r--dev-ml/ppx_optional/Manifest4
-rw-r--r--dev-ml/ppx_optional/metadata.xml5
-rw-r--r--dev-ml/ppx_optional/ppx_optional-0.14.0.ebuild23
-rw-r--r--dev-ml/ppx_pipebang/Manifest4
-rw-r--r--dev-ml/ppx_pipebang/metadata.xml5
-rw-r--r--dev-ml/ppx_pipebang/ppx_pipebang-0.14.0.ebuild23
-rw-r--r--dev-ml/ppx_sexp_conv/Manifest5
-rw-r--r--dev-ml/ppx_sexp_conv/files/ppx_sexp_conv-0.14.1-ppxlib-0.18.0.patch41
-rw-r--r--dev-ml/ppx_sexp_conv/metadata.xml5
-rw-r--r--dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.14.1.ebuild28
-rw-r--r--dev-ml/ppx_sexp_message/Manifest5
-rw-r--r--dev-ml/ppx_sexp_message/files/ppx_sexp_message-0.14.0-ppxlib-0.18.0.patch41
-rw-r--r--dev-ml/ppx_sexp_message/metadata.xml5
-rw-r--r--dev-ml/ppx_sexp_message/ppx_sexp_message-0.14.0.ebuild29
-rw-r--r--dev-ml/ppx_sexp_value/Manifest4
-rw-r--r--dev-ml/ppx_sexp_value/metadata.xml5
-rw-r--r--dev-ml/ppx_sexp_value/ppx_sexp_value-0.14.0.ebuild26
-rw-r--r--dev-ml/ppx_stable/Manifest3
-rw-r--r--dev-ml/ppx_stable/metadata.xml11
-rw-r--r--dev-ml/ppx_stable/ppx_stable-0.14.1.ebuild24
-rw-r--r--dev-ml/ppx_string/Manifest3
-rw-r--r--dev-ml/ppx_string/metadata.xml11
-rw-r--r--dev-ml/ppx_string/ppx_string-0.14.1.ebuild26
-rw-r--r--dev-ml/ppx_tools/Manifest4
-rw-r--r--dev-ml/ppx_tools/metadata.xml11
-rw-r--r--dev-ml/ppx_tools/ppx_tools-6.2.ebuild20
-rw-r--r--dev-ml/ppx_typerep_conv/Manifest4
-rw-r--r--dev-ml/ppx_typerep_conv/metadata.xml5
-rw-r--r--dev-ml/ppx_typerep_conv/ppx_typerep_conv-0.14.1.ebuild25
-rw-r--r--dev-ml/ppx_variants_conv/Manifest4
-rw-r--r--dev-ml/ppx_variants_conv/metadata.xml5
-rw-r--r--dev-ml/ppx_variants_conv/ppx_variants_conv-0.14.1.ebuild25
-rw-r--r--dev-ml/ppxfind/Manifest3
-rw-r--r--dev-ml/ppxfind/metadata.xml11
-rw-r--r--dev-ml/ppxfind/ppxfind-1.4.ebuild21
-rw-r--r--dev-ml/ppxlib/Manifest3
-rw-r--r--dev-ml/ppxlib/metadata.xml11
-rw-r--r--dev-ml/ppxlib/ppxlib-0.18.0.ebuild33
-rw-r--r--dev-ml/re/Manifest4
-rw-r--r--dev-ml/re/files/ounit2.patch11
-rw-r--r--dev-ml/re/metadata.xml11
-rw-r--r--dev-ml/re/re-1.9.0.ebuild25
-rw-r--r--dev-ml/react/Manifest1
-rw-r--r--dev-ml/react/react-1.2.1-r1.ebuild32
-rw-r--r--dev-ml/result/Manifest4
-rw-r--r--dev-ml/result/metadata.xml5
-rw-r--r--dev-ml/result/result-1.5.ebuild18
-rw-r--r--dev-ml/seq/Manifest5
-rw-r--r--dev-ml/seq/files/META.seq4
-rw-r--r--dev-ml/seq/files/seq.install3
-rw-r--r--dev-ml/seq/metadata.xml4
-rw-r--r--dev-ml/seq/seq-1.ebuild26
-rw-r--r--dev-ml/sexplib/Manifest4
-rw-r--r--dev-ml/sexplib/metadata.xml13
-rw-r--r--dev-ml/sexplib/sexplib-0.14.0.ebuild23
-rw-r--r--dev-ml/sexplib0/Manifest3
-rw-r--r--dev-ml/sexplib0/metadata.xml11
-rw-r--r--dev-ml/sexplib0/sexplib0-0.14.0.ebuild18
-rw-r--r--dev-ml/splittable_random/Manifest3
-rw-r--r--dev-ml/splittable_random/metadata.xml11
-rw-r--r--dev-ml/splittable_random/splittable_random-0.14.0.ebuild24
-rw-r--r--dev-ml/stdio/Manifest4
-rw-r--r--dev-ml/stdio/metadata.xml5
-rw-r--r--dev-ml/stdio/stdio-0.14.0.ebuild20
-rw-r--r--dev-ml/stdlib-shims/Manifest2
-rw-r--r--dev-ml/stdlib-shims/stdlib-shims-0.2.0.ebuild2
-rw-r--r--dev-ml/time_now/Manifest3
-rw-r--r--dev-ml/time_now/metadata.xml11
-rw-r--r--dev-ml/time_now/time_now-0.14.0.ebuild24
-rw-r--r--dev-ml/topkg/Manifest4
-rw-r--r--dev-ml/topkg/metadata.xml5
-rw-r--r--dev-ml/topkg/topkg-1.0.3.ebuild33
-rw-r--r--dev-ml/typerep/Manifest4
-rw-r--r--dev-ml/typerep/metadata.xml5
-rw-r--r--dev-ml/typerep/typerep-0.14.0.ebuild18
-rw-r--r--dev-ml/variantslib/Manifest4
-rw-r--r--dev-ml/variantslib/metadata.xml13
-rw-r--r--dev-ml/variantslib/variantslib-0.14.0.ebuild20
-rw-r--r--dev-ml/xml-light/Manifest2
-rw-r--r--dev-ml/xml-light/xml-light-2.2-r3.ebuild4
-rw-r--r--dev-ml/zarith/Manifest4
-rw-r--r--dev-ml/zarith/zarith-1.10.ebuild58
-rw-r--r--dev-ml/zarith/zarith-1.9.1.ebuild2
407 files changed, 5863 insertions, 944 deletions
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index c1faffa927ea..00e253ee4d40 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
Binary files differ
diff --git a/dev-ml/astring/Manifest b/dev-ml/astring/Manifest
index db5b679e0e34..12c4347b30b0 100644
--- a/dev-ml/astring/Manifest
+++ b/dev-ml/astring/Manifest
@@ -1,3 +1,5 @@
DIST astring-0.8.3.tbz 38710 BLAKE2B 253fe07b51996eb7b5f84e18d171b0f65cbb5abba9b241a02aa679765f3190edc636c1ba989910fde374a20c7615db1887eb73d8607f3bb8311e20ab6e67f670 SHA512 c7230e47b7ef14e6040fb18284a3d5aa8da1428b721cf91a7f17104cfb853be24b9c2aaa0b118bf3e050158aa8748311435417c6cf9014d260fb4379e4ead3e1
+DIST astring-0.8.5.tbz 37499 BLAKE2B bff0b9a295da9e33e0cc4bf1a5a0c3cec4010f477d67a39650bbb8e61f12e517cd5734f1e869d35448e4e555a04d0223b76181f29ee299ef9f19359c7d59e69a SHA512 b40634cc2053d651bce5c1974996b352ffa48ecac429919113840b2a807efb34387d950f12accb346afd5e40514cb90219d70b00109c30e1450c4e99f65c9856
EBUILD astring-0.8.3.ebuild 543 BLAKE2B aae2012f0f7c9aa12a694e7e7eca117bc61e876e3df5496555182b4168dd36e1507f07361ebc841151402cfa89f398cb799cd64acdede315c0bbcb88ec338991 SHA512 19df26876c674ac092c9ab753ed60a9a15e046729a236e9063899062a0a98fe29fac67a950a28ce7bd7548f25bcdabbfdca91c966671be01773aa57ed2b3e5e4
-MISC metadata.xml 248 BLAKE2B bfc1137bcf2f30d9f53dd227e756d67b626c7f236a7dff277238957f8bec98d7a84f2a291d41cd275ccf27b0a7ac438f19ea3cf75192a889071f77792d754692 SHA512 b526a37ad31e63dd080a1cace2c1e3edc0e4eeffb59a13457ff448372d5842003e188d1dfd99162eff78cb51fa2d6f0830d136cdc8200911cc010c66afe621ed
+EBUILD astring-0.8.5.ebuild 563 BLAKE2B 9fe7f5a3652d4d549fc3a622b376829dd61cca38e3247a5a28cc5fef9e9eab3a9696bdaeb124d92f9e4d3c812cbf2c2f7055f4f684fe014379fd3df9b04d4158 SHA512 7c013b09aa4aff2f14c2c3d59ea61fd215f5b37c70b84fd0e37dff18792c9c8456487898d43d44b63c95e6ae62c1346b8753fb452d76a219d8c6a5ae2b33e84d
+MISC metadata.xml 332 BLAKE2B bb0dcf9efae54d3c1f2708df73254af5e5f0a87a1c6651809e78e975a1d05f42c83db5a1f0c7bd4ec345695bfefd81de2ff201d917f8a8c15cb70855b890fe65 SHA512 b45554a47abc646388c8daa8b7e79f4bcbcddb9f4699b5c91b93eaf2acaddfe2838c179256473dab11d2dfce9ee626f68494629d1801e8ed199b4c391a8fe34c
diff --git a/dev-ml/astring/astring-0.8.5.ebuild b/dev-ml/astring/astring-0.8.5.ebuild
new file mode 100644
index 000000000000..a922e9b805db
--- /dev/null
+++ b/dev-ml/astring/astring-0.8.5.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit opam
+
+DESCRIPTION="Alternative String module for OCaml"
+HOMEPAGE="https://erratique.ch/software/astring https://github.com/dbuenzli/astring"
+SRC_URI="https://erratique.ch/software/astring/releases/${P}.tbz"
+
+LICENSE="ISC"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+
+OCAML_DEP=">=dev-lang/ocaml-4.05.0:="
+BDEPEND="
+ dev-ml/ocamlbuild
+ dev-ml/findlib
+ dev-ml/topkg
+ ${OCAML_DEP}
+"
+RDEPEND="${OCAML_DEP}"
+
+src_compile() {
+ ocaml pkg/pkg.ml build || die
+}
diff --git a/dev-ml/astring/metadata.xml b/dev-ml/astring/metadata.xml
index e7bb9b7a77bb..f6b0d38f281a 100644
--- a/dev-ml/astring/metadata.xml
+++ b/dev-ml/astring/metadata.xml
@@ -4,5 +4,6 @@
<!-- maintainer-needed -->
<upstream>
<remote-id type="github">dbuenzli/astring</remote-id>
+ <changelog>https://github.com/dbuenzli/astring/blob/master/CHANGES.md</changelog>
</upstream>
</pkgmetadata>
diff --git a/dev-ml/base/Manifest b/dev-ml/base/Manifest
index 4a82727446c5..96e393a1818a 100644
--- a/dev-ml/base/Manifest
+++ b/dev-ml/base/Manifest
@@ -1,9 +1,11 @@
+DIST base-0.14.0.tar.gz 385265 BLAKE2B f3a49b22bb63919bcdc522fbce14a24fd6eaddf39b921ba956cb82eb664ccc6919c9a9feb799dea318f1d8bdf1bd1983180b7ce38d9a43e118794057a9fec6a3 SHA512 c713c9aaf369bc042afb1ead53dc5a34a6eb3c97abc7fef99868e3be8e976adc6297f34d13cfc314adf2182fc64b0cde9c9a05aeeb0f51380255aa1f8e0edf16
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.14.0.ebuild 486 BLAKE2B 9507d4d6643e2140c3a28a0fdd6c344714b268868cdff0277a88c01e4ea2b51fb172ee1fb0601cfa4e3c7173d7656e84323b76184040b809350c4d7de7a8e35a SHA512 ed3cad0fcc5ce0f6eee73c41da6a93caeca5be427193f9d8f015312f1f505fb80e6587d3a1e7cef72ed6027ce42e90151ff7ef0155b8aae78c4c998075b9ef30
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 247 BLAKE2B a1ec7bbf75487143e23a45480d73c2d7bb608ca65e22eb99edaeb0ab6ea1caa34fd81820b96ddedd3bf587e0ccfaaaace13b87ad04a1b67ea9cf2a9f7b83a0d0 SHA512 d0b27b806ab63f8582f19843878bf89c15a18ebdeca920396cb47eb52ead848f2c8c8285a86518837e39b460beb3e1b3e9a40c598277facfd25ee34d0fb3945a
+MISC metadata.xml 324 BLAKE2B 46767022bfb469c7d638f87103b9db54b54ce4f47b0a1c6c7cb46afa81d0c2fec5204efa773910a48215a4a89f9b9abb510b0104641d7ae542785345e822587e SHA512 eddba1e998ddbd328645d17aa95877c7d01b1ae435605005179ed29afa97d0f26841c0e1a56423a53445d08d86ee886c4761c8aa63cd90f70cf4239601c6995b
diff --git a/dev-ml/base/base-0.14.0.ebuild b/dev-ml/base/base-0.14.0.ebuild
new file mode 100644
index 000000000000..b7d23baad927
--- /dev/null
+++ b/dev-ml/base/base-0.14.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+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 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+RDEPEND="
+ >=dev-ml/sexplib0-0.14.0:=
+ dev-ml/dune-configurator:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ml/base/metadata.xml b/dev-ml/base/metadata.xml
index 539c455dc3f8..2d3d3fe848fd 100644
--- a/dev-ml/base/metadata.xml
+++ b/dev-ml/base/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>gienah@gentoo.org</email>
+ <name>Mark Wright</name>
+ </maintainer>
<upstream>
<remote-id type="github">janestreet/base</remote-id>
</upstream>
diff --git a/dev-ml/base_quickcheck/Manifest b/dev-ml/base_quickcheck/Manifest
new file mode 100644
index 000000000000..67b82b50731b
--- /dev/null
+++ b/dev-ml/base_quickcheck/Manifest
@@ -0,0 +1,3 @@
+DIST base_quickcheck-0.14.0.tar.gz 66736 BLAKE2B eeaa92ec0eec4736be911128f46b8e4698034b2cb8afa131b31ee96a6edb5db0f28cfd611c101e4417305ee5a1babc2f869f4690b266218562a8fc50f5830acf SHA512 52333bee2591531665b8f8ad0fac1cdaa607b448d0a33b9b905cf98e00df5a700bf0a4ee3cdf3c06d7fcb2b5190363dd5908cc743b2854af9ce5c8d743e3fd58
+EBUILD base_quickcheck-0.14.0.ebuild 775 BLAKE2B 73d5001999c984087e15f28cc0fbd92d48b33bba7534f9c66307520ce7a6b32e1f594f83c5fd4b0ce5069be215a5e85bba5f365cc2adf32d534dbf68040f1ed7 SHA512 70d1c695ef42f43fafe4ee58771f02f43a5a3973d02dfa05c5344f8449d1ac72918dbbbef00a2501eb0308162863c9927e5956904849dd605cb4752b91f1b34f
+MISC metadata.xml 335 BLAKE2B 0203200737ac39ac757d5aad36d71e65e7767bc6d71a48a7df20d516c52de22b0608a2e3771086888dd9cb901cc46085612fc3eb52838668d6faaa1d498cc7a9 SHA512 2fe83a19b40c5547547023bbf8a2852ac5588d9374c7210d0b867196e2384ae6c938f44f613a2a70c5b03ec6cc09c3eb35fa4d671a2ea5fe3bcd96c141a1a8ec
diff --git a/dev-ml/base_quickcheck/base_quickcheck-0.14.0.ebuild b/dev-ml/base_quickcheck/base_quickcheck-0.14.0.ebuild
new file mode 100644
index 000000000000..f65f7cb4d546
--- /dev/null
+++ b/dev-ml/base_quickcheck/base_quickcheck-0.14.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Randomized testing framework, designed for compatibility with Base "
+HOMEPAGE="https://github.com/janestreet/base_quickcheck"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+DEPEND="
+ >=dev-ml/base-0.14.0:=
+ >=dev-ml/ppx_base-0.14.0:=
+ >=dev-ml/ppx_fields_conv-0.14.1:=
+ >=dev-ml/ppx_let-0.14.0:=
+ >=dev-ml/ppx_sexp_message-0.14.0:=
+ >=dev-ml/ppx_sexp_value-0.14.0:=
+ dev-ml/splittable_random:=
+ >=dev-ml/ppxlib-0.18.0:=
+ >=dev-ml/ocaml-migrate-parsetree-2.0.0:=
+ dev-ml/cinaps:=
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-ml/base_quickcheck/metadata.xml b/dev-ml/base_quickcheck/metadata.xml
new file mode 100644
index 000000000000..9859b7303328
--- /dev/null
+++ b/dev-ml/base_quickcheck/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>gienah@gentoo.org</email>
+ <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">janestreet/base_quickcheck</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/bin_prot/Manifest b/dev-ml/bin_prot/Manifest
new file mode 100644
index 000000000000..196e6051cb45
--- /dev/null
+++ b/dev-ml/bin_prot/Manifest
@@ -0,0 +1,3 @@
+DIST bin_prot-0.14.0.tar.gz 342884 BLAKE2B 9210ca230d9f42ce3dd6ad18e66b62e41eafccf83ac632a988cdc36c16f273076ccdd67ece333acb70e2604180084811319ae41decbd7ef6bba0ee16538c0cae SHA512 7e7bec7dc5ec49b7bc099687a90840620529c36d552e8985b45f2f9a2437396c8b41583081b8c6a75bf3b14bb3ab4db9134cebd12f70f2345c8fa74e1b8fa252
+EBUILD bin_prot-0.14.0.ebuild 683 BLAKE2B 47e25cb0358b16ac8ccee7f380b6e46218ccd96a44964a6fbe5106eabf585bc200288439c30e0b9768903368e5ff866aecc223d46ece9388ccecd69c633c54cc SHA512 a103308b51908d9526b2ba9eb518c570a85632927957f081b83358ece2bfc551249e88187987e555df2bb0df645eb30bf571ef6e37793828374a5023a1fe237d
+MISC metadata.xml 328 BLAKE2B 151852523506f04b20c5b1f6a63b34e7955951a0c98b6af2cc75271b4e374116f78ad405665e6b7cb0b05761d5ab9f48d7777e4600eefdb09c4a172a2ab90ef2 SHA512 b87df430bf4c300f7975e3df7ff2cb459ba81512d46e4860a6ec364526088fcdba7c5282f3fb08e8b4c592a2ab7957d780056c472ce1511715ad2694d3047e34
diff --git a/dev-ml/bin_prot/bin_prot-0.14.0.ebuild b/dev-ml/bin_prot/bin_prot-0.14.0.ebuild
new file mode 100644
index 000000000000..ac43cf826f14
--- /dev/null
+++ b/dev-ml/bin_prot/bin_prot-0.14.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+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 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+RDEPEND="
+ >=dev-ml/base-0.14.0:=
+ dev-ml/findlib:=
+ >=dev-ml/ppx_compare-0.14.0:=
+ >=dev-ml/ppx_custom_printf-0.14.0:=
+ >=dev-ml/ppx_fields_conv-0.14.0:=
+ >=dev-ml/ppx_optcomp-0.14.0:=
+ >=dev-ml/ppx_sexp_conv-0.14.0:=
+ >=dev-ml/ppx_variants_conv-0.14.0:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ml/bin_prot/metadata.xml b/dev-ml/bin_prot/metadata.xml
new file mode 100644
index 000000000000..352205a61728
--- /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="person">
+ <email>gienah@gentoo.org</email>
+ <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">janestreet/bin_prot</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/cairo-ocaml/Manifest b/dev-ml/cairo-ocaml/Manifest
index fa4b0ecd1443..252bd9f18b36 100644
--- a/dev-ml/cairo-ocaml/Manifest
+++ b/dev-ml/cairo-ocaml/Manifest
@@ -2,6 +2,8 @@ AUX 0001-Add-missing-libraries-used-by-the-stubs-to-CAIRO_LIB.patch 769 BLAKE2B
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
+AUX ocaml406.patch 830 BLAKE2B 662bc72ae0f51e6b6b11a475930847fb18a34c1a812c758b0d00fe156a0b1872dd0eb3d590a3be744ef7c4231aa637571631f0d3d61e9401a1b2164a8434e6ac SHA512 d2fc42aaaac76311cc78ee5c53df6e4c029534f424430465f18acb57988169ea240af2c1d08d84fefd5c8e64e5342e8e721e72eab2e1cf240507fcf0324aff72
DIST cairo-ocaml-1.2.0.tar.bz2 44483 BLAKE2B 49a8c811100e3167a8c32ca87a0a6c256862d276c3703082b944aa55f8def7b56d478c0ed44b9d7f5de9194603b688daa5e42949db00417b71daa7376e17410b SHA512 5cac319cf27b94d31e955885ae89b40342c2ae4ffd1aca7c52366f7c3679185f74e513e0c73bd01260f89da29d43bb420dadd059fa1cf5509997db8f935704b4
+EBUILD cairo-ocaml-1.2.0-r1.ebuild 1952 BLAKE2B bfcd8312395d9f90f096d9caae515a772bcc9919ae0b8445ec4200d6dd3fe61cf435a5d28170f5f72135d0b6c2dad8bf66203f0a50c68425e733e5a0b3c8d8a3 SHA512 b0d0c3a46db06aee8b1ddfe94643fa22888bee2a1a5c85cef24c4536c81880d38f82fdcd7194ca482e9f4aafe9f2a351573f976264b08a46de75c3e84b2dae82
EBUILD cairo-ocaml-1.2.0.ebuild 1896 BLAKE2B 50549894df7f733d386d7611fa9adde2325e20acb0731adc5b1eb760c385f6292acb0ffefabcd2a0bece62c7de481997fb1dd937f68fdc216d90b92319f5dfe3 SHA512 b1ce1ed398e94271e9a608b1abd3d3be2543065111c1d6826e19db71022f3b898de1c97d524884a460de9ba841b4c7074f68561d353c5142cb2bb7b83d569707
MISC metadata.xml 572 BLAKE2B 55d9ae52f939a260daa0e05c073fb0e574a44383414e04274d58ded73bc68ae6713039ed1f51998a307c166313d93755066a9d06f7fea3525a154de856854ad0 SHA512 7ca7f4c88e7343d1ac5acbacef33cde7a437c5e70df3bede08ee893c7bea317b444585f4d4e9e010509b2ebae9586bbe5d94a5229f656b6ce996cabb895a60d2
diff --git a/dev-ml/cairo-ocaml/cairo-ocaml-1.2.0-r1.ebuild b/dev-ml/cairo-ocaml/cairo-ocaml-1.2.0-r1.ebuild
new file mode 100644
index 000000000000..1a9969c60bee
--- /dev/null
+++ b/dev-ml/cairo-ocaml/cairo-ocaml-1.2.0-r1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit 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"
+
+RDEPEND="dev-lang/ocaml:=
+ x11-libs/cairo
+ gtk? ( dev-ml/lablgtk:2= )
+ pango? ( x11-libs/pango )"
+DEPEND="${RDEPEND}"
+
+# 3 patches from debian and one for automagic on libsvg-cairo
+PATCHES=(
+ "${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
+)
+
+src_prepare() {
+ default
+ has_version '>=dev-lang/ocaml-4.06.0' && eapply "${FILESDIR}"/ocaml406.patch
+ AT_M4DIR=support eautoreconf
+}
+
+src_configure() {
+ econf \
+ $(use_with gtk) \
+ $(use_with pango pango-cairo) \
+ --without-svg-cairo
+}
+
+src_compile() {
+ emake -j1
+ use doc && emake doc
+}
+
+src_install() {
+ findlib_src_install
+ dodoc README ChangeLog
+ if use examples; then
+ docinto examples
+ dodoc 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
+ insinto /usr/$(get_libdir)/ocaml/cairo
+ doins META
+}
diff --git a/dev-ml/cairo-ocaml/files/ocaml406.patch b/dev-ml/cairo-ocaml/files/ocaml406.patch
new file mode 100644
index 000000000000..2ef9931463b0
--- /dev/null
+++ b/dev-ml/cairo-ocaml/files/ocaml406.patch
@@ -0,0 +1,20 @@
+Index: cairo-ocaml-1.2.0/src/cairo_png.ml
+===================================================================
+--- cairo-ocaml-1.2.0.orig/src/cairo_png.ml
++++ cairo-ocaml-1.2.0/src/cairo_png.ml
+@@ -7,13 +7,13 @@
+ (**************************************************************************)
+
+ external image_surface_create_from_stream_unsafe :
+- (string -> int -> unit) -> Cairo.image_surface = "ml_cairo_image_surface_create_from_png_stream_unsafe"
++ (bytes -> int -> unit) -> Cairo.image_surface = "ml_cairo_image_surface_create_from_png_stream_unsafe"
+
+ let image_surface_create_from_channel ic =
+ image_surface_create_from_stream_unsafe
+ (fun s n ->
+ for i = 0 to n - 1 do
+- String.unsafe_set s i (input_char ic)
++ Bytes.unsafe_set s i (input_char ic)
+ done)
+
+ let image_surface_create_from_file fname =
diff --git a/dev-ml/cairo2/Manifest b/dev-ml/cairo2/Manifest
new file mode 100644
index 000000000000..060d1efd8a1b
--- /dev/null
+++ b/dev-ml/cairo2/Manifest
@@ -0,0 +1,6 @@
+AUX cairo2-0.6.1-Fix-multiple-definitions-of-variables.patch 3920 BLAKE2B bb15a067dda446dffa1d43c7728216a4e2085d5f91553f133a096f497fec8c4474b2e26e06cd45a0217c7113caec4f82d2a55900d8e5f5889610e2b78a3294d3 SHA512 8f6695853529bbc8b442c6a825d9b7c2476b219ac4e5ac1c9af250ba385102c6258eff12475116d12be6de60ae6916b0e8044180ded28c9a3462be0fceee7148
+AUX cairo2-0.6.1-handle-safe-string.patch 1743 BLAKE2B 75c805c3db2b0ea7eb9a5fe8b6cb2732b89b800f17a84818d576a4f0c9dad32502f76b24ef51d7cf5fdfbc0b02bc4673fbae4e652c6e93e6c10aa5e831b6347f SHA512 75554a9405d9f9c66b9091e3f7f351af63f059eb7db37526d54c348116c5093fd391cda7e8320e314f8035645ccbd1b4160c5e74c847192bb393942cb02dcf70
+AUX cairo2-0.6.1-ignore-gtk-and-pango.patch 2168 BLAKE2B f444c6056af8708bd4dd838fab54390b12ae6f00002ea885111eca37d3f0469acb8fac38bffe235436f2b20020178a6310cf5baa9bc27cbca6d4f29e1ac463d9 SHA512 6443a64189113add46c5a1ec9eebd13c513d314b512db31ee4d025e3653711e4295a0819d31d5ed7f793921f8a6d53a3576982bb422e331745877265dce828bb
+DIST cairo2-0.6.1.tbz 90006 BLAKE2B 78f1a998f821aad9b2a1d2deacffd9290920e6d351e0c66b6cc2a6f4f6140fef67c0dde9c1c317e743b5930e09d68d6c1830beb554d23ac9bcc95738a4091850 SHA512 d09274624854a45cf914ffbe984f1bcdd30db6283e7a0fd73aeec2a19226ff8f68d3f7139bbab72ca5698b58b840d6fd8a35570efc228391a7c5d031421f5c1f
+EBUILD cairo2-0.6.1.ebuild 1142 BLAKE2B df968dbc173504e455cff04f29846e9fa108a3348dee3661d4e650dbb90d38c76f4b9b67272f70bd5d2feb29f416b614bd9594033678a754fed06ccaa2ba7ed0 SHA512 288e613137cf60be1da2851ac355479d1157d87e57b13e1ae3301411c8faee3acc7b42191708f77ccfd97934a1522a5601281c6c88fb3c36658353c692ced799
+MISC metadata.xml 328 BLAKE2B b0bd0dcd9ee412736d22a1d0390433ff61b851cbd7a9fa6e62dd59b3c6d70fcd5d85f13202c1308ce46d2e610edc9a4bc3e86518f0f1e2490ee4e70bf732da84 SHA512 49a293f3cd7d644237aef8cd9efd7b4d37fdbaf8fc9191e275426e25c1ced5b7eb87167deaad09c675b3797706747af5f32f6cb153891e2d27bd4ace85effcc3
diff --git a/dev-ml/cairo2/cairo2-0.6.1.ebuild b/dev-ml/cairo2/cairo2-0.6.1.ebuild
new file mode 100644
index 000000000000..3ad21d694225
--- /dev/null
+++ b/dev-ml/cairo2/cairo2-0.6.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Binding to Cairo, a 2D Vector Graphics Library"
+HOMEPAGE="https://github.com/Chris00/ocaml-cairo"
+SRC_URI="https://github.com/Chris00/ocaml-cairo/releases/download/${PV}/cairo2-${PV}.tbz"
+
+LICENSE="LGPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+DEPEND="
+ x11-libs/cairo:=
+ dev-ml/dune-configurator:=
+"
+RDEPEND="${DEPEND}
+ !dev-ml/ocaml-cairo
+"
+BDEPEND=""
+
+# >>> Test phase: dev-ml/cairo2-0.6.1
+# image_create alias tests/runtest (got signal SEGV)
+# (cd _build/default/tests && ./image_create.exe)
+# DESTROY bigarray 'data'
+# Done: 70/72 (jobs: 1) * ERROR: dev-ml/cairo2-0.6.1::x-portage failed (test phase):
+RESTRICT=test
+
+# Remove lablgtk2 dep https://github.com/Chris00/ocaml-cairo/issues/21
+# Fix compiler warnings, from: https://github.com/Chris00/ocaml-cairo/pull/22
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.6.1-ignore-gtk-and-pango.patch
+ "${FILESDIR}"/${PN}-0.6.1-handle-safe-string.patch
+ "${FILESDIR}"/${PN}-0.6.1-Fix-multiple-definitions-of-variables.patch
+)
diff --git a/dev-ml/cairo2/files/cairo2-0.6.1-Fix-multiple-definitions-of-variables.patch b/dev-ml/cairo2/files/cairo2-0.6.1-Fix-multiple-definitions-of-variables.patch
new file mode 100644
index 000000000000..4f0eed297363
--- /dev/null
+++ b/dev-ml/cairo2/files/cairo2-0.6.1-Fix-multiple-definitions-of-variables.patch
@@ -0,0 +1,102 @@
+From: Stephane Glondu <steph@glondu.net>
+Date: Sat, 15 Aug 2020 09:08:30 +0200
+Subject: Fix multiple definitions of variables
+
+Bug-Debian: https://bugs.debian.org/968427
+Bug: https://github.com/Chris00/ocaml-cairo/issues/23
+Forwarded: https://github.com/Chris00/ocaml-cairo/issues/23
+---
+ src/cairo_ocaml.h.p | 18 +++++++++---------
+ src/cairo_ocaml_types.h | 4 +++-
+ 2 files changed, 12 insertions(+), 10 deletions(-)
+
+diff --git a/src/cairo_ocaml.h.p b/src/cairo_ocaml.h.p
+index 4192aed..1f05664 100644
+--- a/src/cairo_ocaml.h.p
++++ b/src/cairo_ocaml.h.p
+@@ -25,7 +25,7 @@
+ /* cairo_t
+ ***********************************************************************/
+ #define CAIRO_VAL(v) (* (cairo_t **) Data_custom_val(v))
+-struct custom_operations caml_cairo_ops;
++extern struct custom_operations caml_cairo_ops;
+
+ void caml_cairo_raise_Error(cairo_status_t status);
+ /* raise [Cairo.Error] if the status indicates a failure. */
+@@ -33,7 +33,7 @@ void caml_cairo_raise_Error(cairo_status_t status);
+ /* cairo_pattern_t
+ ***********************************************************************/
+ #define PATTERN_VAL(v) (* (cairo_pattern_t **) Data_custom_val(v))
+-struct custom_operations caml_pattern_ops;
++extern struct custom_operations caml_pattern_ops;
+
+ #define EXTEND_VAL(v) ((cairo_extend_t) Int_val(v))
+ #define VAL_EXTEND(v) Val_int(v)
+@@ -45,12 +45,12 @@ struct custom_operations caml_pattern_ops;
+ ***********************************************************************/
+
+ #define FONT_OPTIONS_VAL(v) (* (cairo_font_options_t**) Data_custom_val(v))
+-struct custom_operations caml_font_options_ops;
++extern struct custom_operations caml_font_options_ops;
+
+ /* cairo_font_type_t
+ ***********************************************************************/
+
+-value caml_cairo_font_type[5];
++extern value caml_cairo_font_type[5];
+
+ cairo_font_type_t caml_cairo_font_type_val(value vft);
+
+@@ -61,13 +61,13 @@ cairo_font_type_t caml_cairo_font_type_val(value vft);
+ ***********************************************************************/
+
+ #define SCALED_FONT_VAL(v) (* (cairo_scaled_font_t**) Data_custom_val(v))
+-struct custom_operations caml_scaled_font_ops;
++extern struct custom_operations caml_scaled_font_ops;
+
+ /* cairo_surface_t
+ ***********************************************************************/
+
+ #define SURFACE_VAL(v) (* (cairo_surface_t **) Data_custom_val(v))
+-struct custom_operations caml_surface_ops;
++extern struct custom_operations caml_surface_ops;
+
+ /* Type cairo_content_t */
+
+@@ -93,7 +93,7 @@ struct custom_operations caml_surface_ops;
+ ***********************************************************************/
+
+ #define PATH_VAL(v) (* (cairo_path_t **) Data_custom_val(v))
+-struct custom_operations caml_path_ops;
++extern struct custom_operations caml_path_ops;
+
+ #define PATH_DATA_ASSIGN(vdata, data) \
+ switch (data->header.type) { \
+@@ -151,10 +151,10 @@ struct custom_operations caml_path_ops;
+ #include <cairo-ft.h>
+
+ #define FT_LIBRARY_VAL(v) (* (FT_Library*) Data_custom_val(v))
+-struct custom_operations caml_cairo_ft_library_ops;
++extern struct custom_operations caml_cairo_ft_library_ops;
+
+ #define FT_FACE_VAL(v) (* (FT_Face*) Data_custom_val(v))
+-struct custom_operations caml_cairo_ft_face_ops;
++extern struct custom_operations caml_cairo_ft_face_ops;
+
+ #endif /* OCAML_CAIRO_HAS_FT */
+
+diff --git a/src/cairo_ocaml_types.h b/src/cairo_ocaml_types.h
+index b850ae2..84dde3d 100644
+--- a/src/cairo_ocaml_types.h
++++ b/src/cairo_ocaml_types.h
+@@ -276,7 +276,9 @@ struct custom_operations caml_font_options_ops = {
+ custom_deserialize_default };
+
+
+-/* caml_cairo_font_type is defined in "cairo_ocaml.h". */
++/* caml_cairo_font_type is exported in "cairo_ocaml.h". */
++value caml_cairo_font_type[5];
++
+ CAMLexport value caml_cairo_font_type_init(value unit)
+ {
+ /* noalloc */
diff --git a/dev-ml/cairo2/files/cairo2-0.6.1-handle-safe-string.patch b/dev-ml/cairo2/files/cairo2-0.6.1-handle-safe-string.patch
new file mode 100644
index 000000000000..8571da4ea9fe
--- /dev/null
+++ b/dev-ml/cairo2/files/cairo2-0.6.1-handle-safe-string.patch
@@ -0,0 +1,50 @@
+commit 9881f6c861ccf1150fffd6ccdb8b93181ad14263 (HEAD -> const, origin/const)
+Author: Olaf Hering <olaf@aepfle.de>
+Date: Fri Jul 17 15:47:59 2020 +0200
+
+ handle safe-string
+
+ String_val() returns 'const char *'.
+ caml_named_value returns 'const value *'.
+
+ Signed-off-by: Olaf Hering <olaf@aepfle.de>
+
+diff --git a/src/cairo_macros.h b/src/cairo_macros.h
+index d952c10..1348b27 100644
+--- a/src/cairo_macros.h
++++ b/src/cairo_macros.h
+@@ -173,7 +173,7 @@
+
+ /* holds the pointer to the Unavailable exception; shared several
+ functions. */
+-value * caml_cairo_Unavailable = NULL;
++const value * caml_cairo_Unavailable = NULL;
+
+ #define RAISE_UNAVAILABLE(name, args ...) \
+ CAMLexport value caml_##name(args) \
+diff --git a/src/cairo_ocaml_types.h b/src/cairo_ocaml_types.h
+index b850ae2..267f657 100644
+--- a/src/cairo_ocaml_types.h
++++ b/src/cairo_ocaml_types.h
+@@ -45,7 +45,7 @@ DEFINE_CUSTOM_OPERATIONS(cairo, cairo_destroy, CAIRO_VAL)
+ /* raise [Error] if the status indicates a failure. */
+ void caml_cairo_raise_Error(cairo_status_t status)
+ {
+- static value * exn = NULL;
++ static const value * exn = NULL;
+
+ if (status != CAIRO_STATUS_SUCCESS) {
+ if (exn == NULL) {
+diff --git a/src/cairo_stubs.c b/src/cairo_stubs.c
+index de35aca..597c0bf 100644
+--- a/src/cairo_stubs.c
++++ b/src/cairo_stubs.c
+@@ -1681,7 +1681,7 @@ static cairo_status_t caml_cairo_output_string
+ CAMLlocal2(s, r);
+
+ s = caml_alloc_string(length);
+- memmove(String_val(s), data, length);
++ memmove(&Byte(String_val(s), 0), data, length);
+ r = caml_callback_exn(* ((value *) fn), s);
+ if (Is_exception_result(r))
+ CAMLreturn(CAIRO_STATUS_WRITE_ERROR);
diff --git a/dev-ml/cairo2/files/cairo2-0.6.1-ignore-gtk-and-pango.patch b/dev-ml/cairo2/files/cairo2-0.6.1-ignore-gtk-and-pango.patch
new file mode 100644
index 000000000000..90fc00f1ddcf
--- /dev/null
+++ b/dev-ml/cairo2/files/cairo2-0.6.1-ignore-gtk-and-pango.patch
@@ -0,0 +1,82 @@
+From: Debian OCaml Maintainers <debian-ocaml-maint@lists.debian.org>
+Date: Sat, 15 Aug 2020 08:56:03 +0200
+Subject: ignore-gtk-and-pango
+
+===================================================================
+---
+ examples-gtk/dune | 8 --------
+ examples-pango/dune | 8 --------
+ gtk/dune | 13 -------------
+ pango/dune | 13 -------------
+ 4 files changed, 42 deletions(-)
+ delete mode 100644 examples-gtk/dune
+ delete mode 100644 examples-pango/dune
+ delete mode 100644 gtk/dune
+ delete mode 100644 pango/dune
+
+diff --git a/examples-gtk/dune b/examples-gtk/dune
+deleted file mode 100644
+index 10d8fcb..0000000
+--- a/examples-gtk/dune
++++ /dev/null
+@@ -1,8 +0,0 @@
+-
+-(executables
+- (names gtk_demo)
+-(libraries cairo2-gtk))
+-
+-(alias
+- (name examples)
+- (deps gtk_demo.exe))
+diff --git a/examples-pango/dune b/examples-pango/dune
+deleted file mode 100644
+index c8ae49e..0000000
+--- a/examples-pango/dune
++++ /dev/null
+@@ -1,8 +0,0 @@
+-
+-(executables
+- (names pango_demo rendering)
+- (libraries cairo2-pango))
+-
+-(alias
+- (name examples)
+- (deps pango_demo.exe rendering.exe))
+diff --git a/gtk/dune b/gtk/dune
+deleted file mode 100644
+index 6ef367e..0000000
+--- a/gtk/dune
++++ /dev/null
+@@ -1,13 +0,0 @@
+-
+-(library
+- (name cairo_gtk)
+- (public_name cairo2-gtk)
+- (c_names cairo_gtk_stubs)
+- (c_flags :standard (:include c_flags.sexp))
+- (c_library_flags :standard (:include c_library_flags.sexp))
+- (libraries threads lablgtk2 cairo2)
+- (synopsis "Rendering Cairo on Gtk canvas"))
+-
+-(rule
+- (targets c_flags.sexp c_library_flags.sexp)
+- (action (run ../config/discover.exe --gtk)))
+diff --git a/pango/dune b/pango/dune
+deleted file mode 100644
+index 816cc49..0000000
+--- a/pango/dune
++++ /dev/null
+@@ -1,13 +0,0 @@
+-
+-(library
+- (name cairo_pango)
+- (public_name cairo2-pango)
+- (c_names cairo_pango_stubs)
+- (c_flags :standard (:include c_flags.sexp))
+- (c_library_flags :standard (:include c_library_flags.sexp))
+- (libraries threads lablgtk2 cairo2)
+- (synopsis "Interface between Cairo and Pango"))
+-
+-(rule
+- (targets c_flags.sexp c_library_flags.sexp)
+- (action (run ../config/discover.exe --gtk)))
diff --git a/dev-ml/cairo2/metadata.xml b/dev-ml/cairo2/metadata.xml
new file mode 100644
index 000000000000..f3c04171cc2c
--- /dev/null
+++ b/dev-ml/cairo2/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>gienah@gentoo.org</email>
+ <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">Chris00/ocaml-cairo</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/camlbz2/Manifest b/dev-ml/camlbz2/Manifest
index 937ffaee54cc..4565b00d7c2c 100644
--- a/dev-ml/camlbz2/Manifest
+++ b/dev-ml/camlbz2/Manifest
@@ -1,3 +1,4 @@
DIST camlbz2-0.6.0.tar.gz 57771 BLAKE2B 5b4337ca547c37f6982c29c9b70f00ca3100983541a80bf16e8d549c2eabf64ef917ea3ba445c8bb5bbcdb1a652cc5cd586c95299d194a7abe8e68ea9f1a0599 SHA512 1052536bb08c9d9f9bdf4a063a5a01389445b55117ce423dd1732de00cd79db5e4befb4ce5c81c5db8a6d40b28a2ac4b897bb00598fdccf76ea92a2966592680
+EBUILD camlbz2-0.6.0-r1.ebuild 672 BLAKE2B f6e9ada40d80104798f1fb8cfa32341924472adaf3d5d0c4f122c43241f217fda1ff2e7bf295dca476454c204f8b4c01af8b0909132b8d29ab65c549d6f1f00b SHA512 d6616b2fb9af683e1942d028c636ecac5bc26ab96f4553527c8a6fec0442b2b562e3a6c2ed9b386a34f315fc3643d3fe6b2c6009e79cd106f9a1c0e9a017ddba
EBUILD camlbz2-0.6.0.ebuild 645 BLAKE2B f40fb6ee805b2e07807a199db36d9f7148738e14942734039aec433fa347aeb79e1842b66343998b3c8665d7783d2b6d80d425d9fd24f506393791ed67b38aa1 SHA512 ad7b303c71c3c94f91b71849dc74c3ceb3294052d017dd87fc485ad69531774df34565ef37dadf43e57f7eacdc70fd977e2b27e5a98f91223d54dd52c617d2ed
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+MISC metadata.xml 244 BLAKE2B c82f45966666e095a27d4d8b14f01f93e202177ea8222c5fc806f4e243b8ca653a61232533a6dd10ed36a35f765dc94cfc651f9fade565b8eedfe1129b5c2d23 SHA512 756b8d091c29b6c4c621ba30588da62cf99e777243fbdd88cc668f3ec071353beea675c853f8c58752fbc6c01c795760cb10428d3a7fd087967a88b885d91149
diff --git a/dev-ml/camlbz2/camlbz2-0.6.0-r1.ebuild b/dev-ml/camlbz2/camlbz2-0.6.0-r1.ebuild
new file mode 100644
index 000000000000..98ccbc37320e
--- /dev/null
+++ b/dev-ml/camlbz2/camlbz2-0.6.0-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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 ~ppc64 ~x86"
+IUSE="doc"
+
+DEPEND="app-arch/bzip2
+ >=dev-lang/ocaml-3.12:=[ocamlopt]"
+RDEPEND="${DEPEND}"
+
+src_compile() {
+ emake -j1
+}
+
+DOCS=( ChangeLog README ROADMAP BUGS )
+HTML_DOCS=( doc/. )
+
+src_install() {
+ findlib_src_preinst
+ emake DESTDIR="${OCAMLFIND_DESTDIR}" install
+ use doc && einstalldocs
+}
diff --git a/dev-ml/camlbz2/metadata.xml b/dev-ml/camlbz2/metadata.xml
index 6f49eba8f496..a4f6be63adba 100644
--- a/dev-ml/camlbz2/metadata.xml
+++ b/dev-ml/camlbz2/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>gienah@gentoo.org</email>
+ <name>Mark Wright</name>
+ </maintainer>
</pkgmetadata>
diff --git a/dev-ml/camldbm/Manifest b/dev-ml/camldbm/Manifest
index 197b4816ce62..b814f6d1c99f 100644
--- a/dev-ml/camldbm/Manifest
+++ b/dev-ml/camldbm/Manifest
@@ -1,5 +1,7 @@
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 746 BLAKE2B d2152308d84b6e00168f1cac7d48a2882130cbe5878cf389ec2ab14c93d7ccbd1ba8adc2c75e56e148842a5ee2a256fc4aecd1d91a6817528b02dc438f6bb246 SHA512 4d6ad5c2c744ff310051c61c3cf122750a6510797f94af8124ea61e6088cc0bc9af39f851740463edd0b89c16a97d2cbf743d1ef6d4be1101ae85c5cb89d295b
+DIST camldbm-1.2.tar.gz 14823 BLAKE2B b9eda65c56440b1d13562e0d184474e585b13826038e77901961df475cbd73df39c9923e4f73c891252f17416e78acb3c3b42accf01dc5d6f51a72bafa930084 SHA512 56d317db420179f96a0f6a453f8a34ea16942f3ca5ed09dd6955517348dad281ad105b861378f1ebd01ec5c8a1c07d5e5db1ab4d255f9572ece64a86559705f0
+EBUILD camldbm-1.0.ebuild 723 BLAKE2B bdf2c174ea1dd59f20976b4e5efe6050d7bd28aac4b0324c4e79b02e6c1ef31f4437ce19b5f1cb3409b371ea197effc92ad7d6400e70682dae98715e736c2a0f SHA512 daeda32929c10a8b39d84a46d1d64bbd9fad534b065710a34cae0a19d06d8388dde5bf67d577507938ef65a5f73dcf0e64e4eaacd8d1ddd150b34521ea848d5f
+EBUILD camldbm-1.2.ebuild 626 BLAKE2B e2856633e8be67abb1e8b6e4e193d55039944ae0b5f2355e7977a194562a800015185286bf6fdc00f599f7faa2c08da276d3ea87406bc2b6e45d25cc3cc3749c SHA512 99052fba71d6c59948764409d80169458ea748bc43acc00cc68927590f22e76cec1584435251de9101a3aad8f3e8c464dfbfdcf7f295c7d20e943bba34d0f0ab
MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-ml/camldbm/camldbm-1.0.ebuild b/dev-ml/camldbm/camldbm-1.0.ebuild
index 5286f0873c34..8f8d8b94854c 100644
--- a/dev-ml/camldbm/camldbm-1.0.ebuild
+++ b/dev-ml/camldbm/camldbm-1.0.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
-
-inherit base
+EAPI=7
DESCRIPTION="OCaml binding to the NDBM/GDBM Unix databases"
HOMEPAGE="http://forge.ocamlcore.org/projects/camldbm/"
@@ -12,13 +10,15 @@ 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"
-IUSE=""
DEPEND=">=sys-libs/gdbm-1.9.1-r2[berkdb]
>=dev-lang/ocaml-3.12:=[ocamlopt]"
RDEPEND="${DEPEND}"
-PATCHES=( "${FILESDIR}/hasgotfix.patch" "${FILESDIR}/include_fix.patch" )
+PATCHES=(
+ "${FILESDIR}/hasgotfix.patch"
+ "${FILESDIR}/include_fix.patch"
+)
src_install() {
dodir "$(ocamlc -where)/stublibs" # required and makefile does not create it
diff --git a/dev-ml/camldbm/camldbm-1.2.ebuild b/dev-ml/camldbm/camldbm-1.2.ebuild
new file mode 100644
index 000000000000..4bae2351d3f3
--- /dev/null
+++ b/dev-ml/camldbm/camldbm-1.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="OCaml binding to the NDBM/GDBM Unix databases"
+HOMEPAGE="https://github.com/ocaml/dbm"
+SRC_URI="https://github.com/ocaml/dbm/archive/${P}.tar.gz"
+S="${WORKDIR}/dbm-${P}"
+
+LICENSE="LGPL-2-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+
+DEPEND=">=sys-libs/gdbm-1.9.1-r2[berkdb]
+ >=dev-lang/ocaml-3.12:=[ocamlopt]"
+RDEPEND="${DEPEND}"
+
+src_install() {
+ dodir "$(ocamlc -where)/stublibs" # required and makefile does not create it
+ emake LIBDIR="${D}/$(ocamlc -where)" install
+}
diff --git a/dev-ml/camlp4/Manifest b/dev-ml/camlp4/Manifest
index 29c78836b890..8226b584a816 100644
--- a/dev-ml/camlp4/Manifest
+++ b/dev-ml/camlp4/Manifest
@@ -3,7 +3,11 @@ AUX reload.patch 595 BLAKE2B 61d89b27f1e192d160160f14a3a58a57ea77e9ac6dd214a8fed
DIST camlp4-4.04_p1.tar.gz 648320 BLAKE2B d383a366facaaa440b24184bb54a8e1c3bb22ae02387a0bc4f9ee4331ecdc60e5bf22715c1022c987041fb081eb448794a74026736df9f70e05c7213e08bfa44 SHA512 7db8eebcf3d230f60650ba62d9cb630c069394237e97b678a40b61d3dcaded752a2b7e089a50ff528f1ea0740d0291b722df123a072f2cee489cadc5201c6776
DIST camlp4-4.05_p1.tar.gz 647566 BLAKE2B 068c1016a75616811787eb480b61349a32960997f03e0bc99d63e15357a8932a6019d9e7195541fd942ef99fc1d71c067fb5fcb0fd0c2c3efb77aac494589854 SHA512 0ee9720286d0d832fb7d2d21a8877856e0e47c94c86b1b58d28f8e757a18472eecb56a16e3a04ce815f240dd5048f5d597515461d084fd1cf4da1b121f97a3fe
DIST camlp4-4.08_p1.tar.gz 649830 BLAKE2B 8dff6f82618d0f61a56acfa71ae679d4ba5ed4aea272019da7b19ea64960c80e50c55482ff9782748dad5042aa1bcd8728ff0825f8f900ff27239db0e0db3515 SHA512 1f8d6df42935ecdbed96a7b02d05564665b4bf0cbe4f5fd1800a1f292d8b3864d973df1e9e8c566c0fd00b5a55ba47ecd9bd07f134a9be83601e010b0246e075
-EBUILD camlp4-4.04_p1.ebuild 1080 BLAKE2B a82e0f1ef9b7ad40793b6d084e1bade7a161d5cadc60b2813cacff2e85b4334691297bf4583bdbe9de66a3bf5f9704041b32429e7856eb4ce7374fb835a98472 SHA512 d0bb1de5714a47bce471366a3237d07a292a10a7609e6503a154e71c4a58a900ee023e0089241a5f156ee74525eee434f5d6489677ebd58a59a0ec0d769ac306
-EBUILD camlp4-4.05_p1.ebuild 1086 BLAKE2B f35abade6648a491050fdf6167c24d6e95db7236ecf95cce33ece643fd27c8022b132b290d56d41eb4e6a836f9b92c8974bcee6e4db139f8381574ecbbdf8d7b SHA512 87c5d9df79146013a030411b0adbd0524c7ae6984d42ef5f30e007d8c979f82f1870f18659993ae598064ace7f0b1ea27b87e7b7c60426836a8871349e2a6e4a
-EBUILD camlp4-4.08_p1.ebuild 1150 BLAKE2B 81fd6efe4bdd0fa9ba5a96d166a90f3bf2552c22e7e6a1ecae1bdc1d37c2339d52af5a11c9b6d6494cf30e70a36541c95408750bf9f733cbe51dd063cdd737ac SHA512 fa27787074d84b42f2a16f6468e27414e675a14427223caf39a85bfc473480488aedbba4bb0116642d3f6d3caa9569967d882e3331c0283f40bc10b747bc1ec8
-MISC metadata.xml 250 BLAKE2B 6e80f75f919556451e33d44238de1d3f78f80356deeee40c8ba8ffeae46cd00cf1ffcc9cd5bcc2795f91cd7e2bcdab31dc7cb815a28a48a7b1746cef356395fb SHA512 e4a2f011f87a8a3442fd64fd97e19a6b74f9fc4a5f0da4ad49ac023258461633e6b12fcc8fd68900b57c1ec7db48b29733e264642c6bbe3a8dcc62e51c86a458
+DIST camlp4-4.10_p1.tar.gz 650092 BLAKE2B d7a6221dba5f6ec6963fe35236c29f39b8ae8f928618b5a58f72e7b1cc1f50d716b110f9684150716b56784cf703c0d8fcbc1aad32aeab638faca9c1bf2d5b9e SHA512 7ae0e20053a43399daa4ee9b93b6f4dbebc3e17c5ee79d069c4903cdfb2bf1cfc7d6badecf92fcf62e97a5f85f3be6ed82a62eb2a311bf6398b2792eacf763d8
+DIST camlp4-4.11_p1.tar.gz 650280 BLAKE2B 6fe46b49c1f2b2e5fc87fbbbdba3ccae795c555737495c298456b84f0dca79c750aa6e4ab2c23bbc7ba4724defdfb739e370f468a78658035474d2f3ad255995 SHA512 8e572602c1c465017a234565efa2249c935ba1ad3d399a6b264bfbec345958130a96311c79e437ac995e3ead9ff7b4f2d3fe6aa4a3a82431ae0cc6257a300f4c
+EBUILD camlp4-4.04_p1.ebuild 1024 BLAKE2B 20c33c06a5a541454f0b750fc7c23f32bac0e4af3272432c65cbc3967f1d3aefa4b43be226dd0018f6f338cd18d02266a506ac7ddb4cc0fd07bba48091c555aa SHA512 9d927b94f63edd9a12a51abe35d781c8d1260bef08a8dd91d588875d44eaf3202f8971f69036d530393f089dbc8b7b17c5eae6b176aa7a713c8116af9dec2fb2
+EBUILD camlp4-4.05_p1.ebuild 1029 BLAKE2B 2b3e8b2259584cf0a0e3bce97066e088375cad981ba4e4c352748949d26a4c3dcbb4c04cb6435fde8b3c3c25a5a5d882175676e2feb1fd3e29665ac1335326ca SHA512 d09be322a43d576bedd94133903d3841b2d847eabb5bd32e3680a8988bf9c9da82ad60ddada8589ec1effa7da8ed315251217bd9b47c1214e4344fb05029f0f0
+EBUILD camlp4-4.08_p1.ebuild 1091 BLAKE2B 4c0e75a3906c6778050b313cdfd97e87054ef38564a5ccfb0ef7d1993461cd82bf46b692cd6e7bf75530b38b1475a54026bc73d9ea93cff592d31df28206a3e9 SHA512 5061c2c1498b94ee14c78512ddbc8671d50f19031931dfbae61501c88fc6fb43302806a5da815e4a14249525d277586713093cf23257d8f1260eca237f9fb795
+EBUILD camlp4-4.10_p1.ebuild 1070 BLAKE2B 657cb82026e41f73108b3e17b037c5db39940327bab6a0b3c1ce2e21c995d77ceb6679bdb6fc05ee15a18f1daf6a9f0f4f1f15c46a6b718163628ff14a855ecf SHA512 c559a97688601ad409049f0a1a069a8aec654d37ae065f7f4adeb5e997ac4289bd6170c3209c35ec29451f75110c17c9b57751f13d19459145989b55bfbfcb72
+EBUILD camlp4-4.11_p1.ebuild 1070 BLAKE2B ccd8d0e94a8e4cac98cc1065531d92540e5ac51899cc5a27dabb46e84e40618a083c9b56ee3c2c056bed2a6a679a63fa91d253f8b2a1ed51d18857a05e750bc9 SHA512 9a953260137eaa8d1da68b3b9d9a6ab56536d2fce751cf644c39bf362e94f306adbafcc2afadba0262835e6e08774aca707db31431c3a47b96e9566033da3ad0
+MISC metadata.xml 322 BLAKE2B 1b38d06aa74d4aaeebb436d63bfafe60c010fc6b7154cee62854b1d16803da20d0c1396f1be3ea65c72af8314e27b63abf5d7921b923734c9f515786c7674b2f SHA512 e021e98e1c18b7c36d4c890f012ab4b9425cd784acd4ea87e998dcf89d4efa3505413d07f6bf5df6c065e608ee5c1f8a5f7daa45326ae80d0085ecfc04abb2ab
diff --git a/dev-ml/camlp4/camlp4-4.04_p1.ebuild b/dev-ml/camlp4/camlp4-4.04_p1.ebuild
index bb89a08912a8..dd82d7f3b238 100644
--- a/dev-ml/camlp4/camlp4-4.04_p1.ebuild
+++ b/dev-ml/camlp4/camlp4-4.04_p1.ebuild
@@ -12,13 +12,11 @@ SRC_URI="https://github.com/camlp4/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-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="+ocamlopt"
DEPEND="=dev-lang/ocaml-4.04*:=[ocamlopt?]"
-RDEPEND="${DEPEND}
- !<dev-lang/ocaml-4.02
- !<dev-ml/findlib-1.5.5-r1"
+RDEPEND="${DEPEND}"
DEPEND="${DEPEND}
dev-ml/ocamlbuild"
diff --git a/dev-ml/camlp4/camlp4-4.05_p1.ebuild b/dev-ml/camlp4/camlp4-4.05_p1.ebuild
index 232dd749ff9a..d59f89100ed6 100644
--- a/dev-ml/camlp4/camlp4-4.05_p1.ebuild
+++ b/dev-ml/camlp4/camlp4-4.05_p1.ebuild
@@ -12,13 +12,11 @@ SRC_URI="https://github.com/camlp4/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-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
IUSE="+ocamlopt"
DEPEND="=dev-lang/ocaml-4.05*:=[ocamlopt?]"
-RDEPEND="${DEPEND}
- !<dev-lang/ocaml-4.02
- !<dev-ml/findlib-1.5.5-r1"
+RDEPEND="${DEPEND}"
DEPEND="${DEPEND}
dev-ml/ocamlbuild"
diff --git a/dev-ml/camlp4/camlp4-4.08_p1.ebuild b/dev-ml/camlp4/camlp4-4.08_p1.ebuild
index aee3b5ec2ecb..001a6776ec7a 100644
--- a/dev-ml/camlp4/camlp4-4.08_p1.ebuild
+++ b/dev-ml/camlp4/camlp4-4.08_p1.ebuild
@@ -12,13 +12,11 @@ SRC_URI="https://github.com/camlp4/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-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="+ocamlopt"
DEPEND=">=dev-lang/ocaml-4.09.0:=[ocamlopt?]"
-RDEPEND="${DEPEND}
- !<dev-lang/ocaml-4.02
- !<dev-ml/findlib-1.5.5-r1"
+RDEPEND="${DEPEND}"
DEPEND="${DEPEND}
dev-ml/ocamlbuild"
diff --git a/dev-ml/camlp4/camlp4-4.10_p1.ebuild b/dev-ml/camlp4/camlp4-4.10_p1.ebuild
new file mode 100644
index 000000000000..b80025c98baa
--- /dev/null
+++ b/dev-ml/camlp4/camlp4-4.10_p1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PV=${PV/_p/+}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="System for writing extensible parsers for programming languages"
+HOMEPAGE="https://github.com/camlp4/camlp4"
+SRC_URI="https://github.com/camlp4/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 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+ocamlopt"
+
+DEPEND=">=dev-lang/ocaml-4.10.0:=[ocamlopt?]"
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND}
+ dev-ml/ocamlbuild"
+
+S=${WORKDIR}/${P/_p/-}
+PATCHES=( "${FILESDIR}/reload.patch" )
+
+src_configure() {
+ ./configure \
+ --bindir="${EPREFIX}/usr/bin" \
+ --libdir="$(ocamlc -where)" \
+ --pkgdir="$(ocamlc -where)" \
+ || die
+}
+
+src_compile() {
+ # Increase stack limit to 11GiB to avoid stack overflow error.
+ ulimit -s 11530000
+ 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.11_p1.ebuild b/dev-ml/camlp4/camlp4-4.11_p1.ebuild
new file mode 100644
index 000000000000..dea97b226afc
--- /dev/null
+++ b/dev-ml/camlp4/camlp4-4.11_p1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PV=${PV/_p/+}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="System for writing extensible parsers for programming languages"
+HOMEPAGE="https://github.com/camlp4/camlp4"
+SRC_URI="https://github.com/camlp4/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 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+ocamlopt"
+
+DEPEND=">=dev-lang/ocaml-4.11.0:=[ocamlopt?]"
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND}
+ dev-ml/ocamlbuild"
+
+S=${WORKDIR}/${P/_p/-}
+PATCHES=( "${FILESDIR}/reload.patch" )
+
+src_configure() {
+ ./configure \
+ --bindir="${EPREFIX}/usr/bin" \
+ --libdir="$(ocamlc -where)" \
+ --pkgdir="$(ocamlc -where)" \
+ || die
+}
+
+src_compile() {
+ # Increase stack limit to 11GiB to avoid stack overflow error.
+ ulimit -s 11530000
+ 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
index 33d51779cb3d..2578754c2469 100644
--- a/dev-ml/camlp4/metadata.xml
+++ b/dev-ml/camlp4/metadata.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
- <upstream>
- <remote-id type="github">camlp4/camlp4</remote-id>
- </upstream>
+ <maintainer type="person">
+ <email>gienah@gentoo.org</email>
+ <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">camlp4/camlp4</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ml/camlp5/Manifest b/dev-ml/camlp5/Manifest
index b758291bb663..5c9baa8e5c54 100644
--- a/dev-ml/camlp5/Manifest
+++ b/dev-ml/camlp5/Manifest
@@ -1,3 +1,8 @@
+AUX camlp5-7.12-destdir.patch 443 BLAKE2B 6a1dc0403c2ca37ce1197936e36abedc3979fda209130c92c31c4080d3026cf85d1989b2a0cd7c23fc989d45cad5464a79f12ccc9236463b615115f538887050 SHA512 f4071f731e32a071fa4850c5ac54691603b2b3a414c4618978bd2822652b8d9f60d86d8495a0f5001e53cfe27d8dfabe83d3717d5ad2d9050e6eb1b68dc35078
DIST camlp5-7.11.tar.gz 878224 BLAKE2B f384764da43653a2f75664681a4f202ec84497720470a0a33f99fc61a1ce7b4a9d494ffe6b523c74906c122ee04ae25a08bf1fcd356145e85a11e3e3095bbf7d SHA512 109a43f0a3aaa7a3ba9bd51b1fc1273b054d32787e189b138d69b39c42642b480c13abb9e91f15e6b6e889eaf4dc422ad3ff51e4dee298fb9d8cd9a2db99c159
-EBUILD camlp5-7.11.ebuild 1007 BLAKE2B a8f26da86128f38f61b0d30255ae11dfabbfd7553c02dc78fea9e6c7afcc9836ba0165649064613085065cc302c95f7980af02f9ce151c94836308b5b6261072 SHA512 33405d07149ef4041789ba5c780b93cbc611be4eeec37f4d8d0efec293eac22e65ae87265d6eed341fd5abe721b97804fafcb5124acd936088b49d86aaf892db
-MISC metadata.xml 325 BLAKE2B e1e22f9260b70f58e523e16ba3f5a9fd8b58050ed7ba2107af06db261129f190620aee89c824557af3f5724b4f78ee5b4899addeee6fc9572315a2640f9d666d SHA512 52021194baa57054aaaad66864a51fd2bdf9c161e32fe78dcb1541480cfa03780645e3c1bb64271ce21015af26f2362fcb620c44c80253db82e06e1d38ed95b9
+DIST camlp5-7.12.tar.gz 1008350 BLAKE2B 8f390f6d617a6ef029462aa74ca4d80c0e2eb267bb6957aac43fdecc425aae34dfc7f3e572c8a1f4ee6b032dd90b3b8262094f80a19ea0bb19b80a88d22d3f28 SHA512 233d973b0a968a7812b977e8a37da8e8daa0f3ef81ca7c473d83c1602380dae6c14f94daffb6bb799f8d90fab121238a46e89a233202cd6f622b0da2f728c0c0
+DIST camlp5-7.13.tar.gz 1031832 BLAKE2B 2afd7e269092d9c40f263e9ce92b3b9f66b0b3f0ae01da43e2094c6a919aa9f26790030f835b630547d51e7bb4a08e74ac8522e7f308864896fa0414370f8f2f SHA512 8ab94b951e6791be895c70e32b930e498229c9ba7bccc505a3e7c2a91ca12fe038b979b9d5822b43e9c74ee2bf552efa1af7a61f1d287100803efb540d5db8b2
+EBUILD camlp5-7.11-r1.ebuild 1028 BLAKE2B 1fe3e0ddcc521d416bc5f5b917178775a5f14ec45a46645dfa3ab9ddb02d3b034f75a815c9046a24dab1322a4cb878cde93cde4d9523834c4708bc245e8ec10d SHA512 54e1608ad6f238c65699c172ac78dd558b3e2038224fd11cb68a7df60b97ee06d149a598f15b6439a729aa1f30a10025849d04862af08a8f07febe3b4867a401
+EBUILD camlp5-7.12.ebuild 1278 BLAKE2B 7bc87a12ff2dcfc4ec043d78479d03745c98d01ec8540d6fba3128bd58caf1b7eed137535b86f8f5a0dffde50c90a58b5d398fa2ab0d1a1361fadb805976b5b6 SHA512 cb2c7464bd37fe71efd94e7b604e68454480384cfb68f1b409a8f57e98504aecf0b03120dd8569f08b964995f94cd5bda4ad5a322605a92b8ad3393a4aac0d87
+EBUILD camlp5-7.13.ebuild 1091 BLAKE2B e96813ca2ec1c8e2d1f49b1ff541467aa3801fd2bb0ee036588a9440916562a7a8bd184d8cd1f730e5c9aab70ebbf85ceb9be37ce551959985f71a57ce7f5004 SHA512 05477b46f85711d1a8bff84f44a75dc8346a87e84fb357a349297666f73cbf8d54b36d91c9111cc5991c7cad15bbd10fd1a478eb9ef2920b1e5a1fab90260ef4
+MISC metadata.xml 430 BLAKE2B b86085580138b59733fbfb751c9a1132428f6c21c9633274cad4cf2e579ef9779317e3c935e117356ca59d741978c2e68c89435952982e8eb0b4c12f3f9f3c97 SHA512 48d26da358e022e6d3eb273046176496387b9bc0f7469cf534130070fa13a45b47728977c96a2ef8dc4b7568ad6ac82bfb7a669b16b1d021e8e7fc06a0be2f71
diff --git a/dev-ml/camlp5/camlp5-7.11.ebuild b/dev-ml/camlp5/camlp5-7.11-r1.ebuild
index 12f10b2cd865..5f91a735d0e7 100644
--- a/dev-ml/camlp5/camlp5-7.11.ebuild
+++ b/dev-ml/camlp5/camlp5-7.11-r1.ebuild
@@ -15,7 +15,7 @@ SLOT="0/${PV}"
KEYWORDS="~alpha amd64 ppc x86"
IUSE="doc +ocamlopt"
-DEPEND="dev-lang/ocaml"
+DEPEND="<dev-lang/ocaml-4.11.0:=[ocamlopt?]"
RDEPEND="${DEPEND}"
QA_FLAGS_IGNORED=(
diff --git a/dev-ml/camlp5/camlp5-7.12.ebuild b/dev-ml/camlp5/camlp5-7.12.ebuild
new file mode 100644
index 000000000000..5b42e456fdf2
--- /dev/null
+++ b/dev-ml/camlp5/camlp5-7.12.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit findlib vcs-clean
+
+DESCRIPTION="A preprocessor-pretty-printer of ocaml"
+HOMEPAGE="https://camlp5.github.io/"
+SRC_URI="https://github.com/camlp5/camlp5/archive/rel$(ver_rs 1- '').tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-rel$(ver_rs 1- '')"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="doc +ocamlopt"
+
+DEPEND="
+ >=dev-lang/ocaml-3.10:=[ocamlopt?]
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-7.12-destdir.patch" )
+
+camlp5_hack_ocaml_support() {
+ ln -s "${1}" "ocaml_stuff/${2}" || die
+ ln -s "${1}.ml" "ocaml_src/lib/versdep/${2}.ml" || die
+}
+
+src_prepare() {
+ egit_clean
+ default
+ camlp5_hack_ocaml_support 4.11.0 4.11.1
+}
+
+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
+
+ dodoc -r doc/*
+ dodoc CHANGES DEVEL ICHANGES README.md UPGRADING MODE
+}
diff --git a/dev-ml/camlp5/camlp5-7.13.ebuild b/dev-ml/camlp5/camlp5-7.13.ebuild
new file mode 100644
index 000000000000..470b0612971b
--- /dev/null
+++ b/dev-ml/camlp5/camlp5-7.13.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit findlib vcs-clean
+
+DESCRIPTION="A preprocessor-pretty-printer of ocaml"
+HOMEPAGE="https://camlp5.github.io/"
+SRC_URI="https://github.com/camlp5/camlp5/archive/rel$(ver_rs 1- '').tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-rel$(ver_rs 1- '')"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="doc +ocamlopt"
+
+DEPEND="
+ >=dev-lang/ocaml-3.10:=[ocamlopt?]
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-7.12-destdir.patch" )
+
+src_prepare() {
+ egit_clean
+ default
+}
+
+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="${ED}" install
+ # findlib support
+ insinto "$(ocamlfind printconf destdir)/${PN}"
+ doins etc/META
+
+ dodoc -r doc/*
+ dodoc CHANGES DEVEL ICHANGES README.md UPGRADING MODE
+}
diff --git a/dev-ml/camlp5/files/camlp5-7.12-destdir.patch b/dev-ml/camlp5/files/camlp5-7.12-destdir.patch
new file mode 100644
index 000000000000..d43a29c97d3f
--- /dev/null
+++ b/dev-ml/camlp5/files/camlp5-7.12-destdir.patch
@@ -0,0 +1,13 @@
+Index: camlp5-rel712/Makefile
+===================================================================
+--- camlp5-rel712.orig/Makefile
++++ camlp5-rel712/Makefile
+@@ -57,7 +57,7 @@ install:
+ for i in $(DIRS) compile; do \
+ (cd $$i; $(MAKE) install DESTDIR=$(DESTDIR); cd ..); \
+ done
+- cp etc/topfind.camlp5 `ocamlc -where`/. || true
++ cp etc/topfind.camlp5 "$(DESTDIR)`ocamlc -where`/." || true
+
+ uninstall:
+ @if test -z "$(LIBDIR)"; then \
diff --git a/dev-ml/camlp5/metadata.xml b/dev-ml/camlp5/metadata.xml
index 7994efd51d47..cafe415ffc77 100644
--- a/dev-ml/camlp5/metadata.xml
+++ b/dev-ml/camlp5/metadata.xml
@@ -5,6 +5,10 @@
<email>tupone@gentoo.org</email>
<name>Tupone Alfredo</name>
</maintainer>
+ <maintainer type="person">
+ <email>gienah@gentoo.org</email>
+ <name>Mark Wright</name>
+ </maintainer>
<upstream>
<remote-id type="github">camlp5/camlp5</remote-id>
</upstream>
diff --git a/dev-ml/camlpdf/Manifest b/dev-ml/camlpdf/Manifest
index 49c4b6ab00a3..2dbefb7e6f5d 100644
--- a/dev-ml/camlpdf/Manifest
+++ b/dev-ml/camlpdf/Manifest
@@ -1,5 +1,3 @@
DIST camlpdf-2.3.1.tar.gz 601531 BLAKE2B 9534baf9165e7dc48ae37a3fcaabb236e437845ef4e0a60a1c08874a2b240c9b1e96de5bbd6028a3ca87992221773dea34c31b0fa24e9c143632756954baf132 SHA512 0b8d91b6090221f996aee52f22f153a4b74cb85a127bbd5f84492ede8a0a581971a2349281b3879d6c37f4d5d267da583e7e8871372d97a3d636abc3231cb007
-DIST camlpdf-2.3.tar.gz 601250 BLAKE2B 9b2a7f6a90d33a69d3a6c15c4c299e7fde4633a78cbd43e1b779f713d371ee16dc588449e024e35a83cef8c24d7059844c92f3354391381437bea37595b604a7 SHA512 dfb81692f894f071bb32634e371cdb202af17f671fb1b9c379ff3d360453a0909c3b6d9960aae45cac49e20f06aeb49ad6db276324542e7be306831ef586d255
EBUILD camlpdf-2.3.1.ebuild 792 BLAKE2B ed804c71e8eed524e0b119f39865bc57b28f736854066f47daa5b773a793a302b692e65d6273e2e77f9908aa0f0be0f97c2eec7987a49b824d24cf87c493fbb4 SHA512 e59b4c2de92c39d6f115b4d4487a90aadebf3fea79f8921c59ed40594c2c5151fe3f3928df8a0a4006cb01e2d76271df58a55a6779529ffb2cef91bececa32d5
-EBUILD camlpdf-2.3.ebuild 792 BLAKE2B ed804c71e8eed524e0b119f39865bc57b28f736854066f47daa5b773a793a302b692e65d6273e2e77f9908aa0f0be0f97c2eec7987a49b824d24cf87c493fbb4 SHA512 e59b4c2de92c39d6f115b4d4487a90aadebf3fea79f8921c59ed40594c2c5151fe3f3928df8a0a4006cb01e2d76271df58a55a6779529ffb2cef91bececa32d5
MISC metadata.xml 259 BLAKE2B fe31735dbcfbcf15b67d7085e3fed88028fc88aa887e4fe70d0be4b9f08de55c77ce99256334addb84f5dd03617d93df664cc10a02c1ff44a1d056c0c1302de1 SHA512 34db28ebcb8cc68ffd1fc9cf026723b895666cffd58814c2a58117ed6e5a4269e7c7c66ae77f305c66f63fcf1e9c3cfb09aac5a3681cf00364dc5865e697fcd6
diff --git a/dev-ml/camlpdf/camlpdf-2.3.ebuild b/dev-ml/camlpdf/camlpdf-2.3.ebuild
deleted file mode 100644
index 965e0ef70c14..000000000000
--- a/dev-ml/camlpdf/camlpdf-2.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit findlib
-
-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:=[ocamlopt]"
-DEPEND="${RDEPEND}"
-
-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
- dodoc -r doc/camlpdf/html
- fi
-
- use examples && dodoc -r examples
-}
diff --git a/dev-ml/camlzip/Manifest b/dev-ml/camlzip/Manifest
index 689567ae4662..c881e219f914 100644
--- a/dev-ml/camlzip/Manifest
+++ b/dev-ml/camlzip/Manifest
@@ -3,5 +3,5 @@ DIST camlzip-1.07.tar.gz 26652 BLAKE2B f373ac0427faa9b6a846e9db8f3e48c00ec6885b8
DIST camlzip-1.10.tar.gz 27335 BLAKE2B bbf24953634278589395dd9fcedf1e3becce8dad1f380393dc3ac59589143e1685dc14085ef566e12fb751c6f1a333dd368795a5083b94a43b71e058e86489f3 SHA512 5c42e0d808230e3820b2e7ef34b544ca51a7bf0a484ce4e1c8b1e4966133196bb3ff7c3ca85b9c50050aca389316eb52f0335f6e2ad60c000594a33171b9a9a9
EBUILD camlzip-1.06.ebuild 675 BLAKE2B 62844ec59c1659ac216dcca4c53de6dc8a7ae8f9e94e6fca181d4ff5da535548cfb829d86825cc7b6fb55da278eb4e93d1335ff937ef8eb024b3030b14a236db SHA512 936a8828d5ccec18df84be21f2e95cbb8061001d94389fc557b27ce697436b5dbf961b73032b9a416230201b341f48ae5e6b3fe04f172f013a4c60dd449e1375
EBUILD camlzip-1.07.ebuild 809 BLAKE2B 1862fa6b059b2f557127137998cd7c5c4932240e08c3b7dc961fd7f47520d5fe03a7c65ff9275f8f004aa323828f4539cac35229cafb89f62a6330e9f7f7c266 SHA512 c5ede699cbc018186b9747bc6e24915ce0984a489b38f3fc3e58b001078e5d00ea85689fb231b79b2781de54fd64b8e72692db582651411efb6df989bdace7c3
-EBUILD camlzip-1.10.ebuild 903 BLAKE2B 53d88b29eaa17e5b562b98368378533acfe6b3b84a172a18a1f4b2aacee58794666824f8acfbba6c82ce345671f29689bca47eacd8b52906bf8c4eb5f3daaf94 SHA512 02734b666ca5add32c67981dce7ade1f1caa48f9fe93b71d8dd19dcf026a3aa4848294a8cbad10c90a3c9008f3ae131cbdf47461ed7816ae942510275988e6c5
+EBUILD camlzip-1.10.ebuild 907 BLAKE2B 012df253e5f38bb840c76950f76de430493ae1d2ba91d013ecc7deccda1396844ef453cbd2c013e7718b1e096880f8ac28203bc1d42128f3eaacd94f8b3547dc SHA512 4d349781e882ff21d795f3d676c36b83c5d3667dc4b945f66c5fbcf027b8902c39b9c4c058704ff111076ba170be04eb8af043c43227c37619c465ec9e500748
MISC metadata.xml 331 BLAKE2B 0d8f433e2cede398f8cfcf629db7a0f6440766bf9d822e65529135ff915632c578ee0fda0ced5fcec0259aa568b391bda7f2ae070f4c351051b7e68113e17363 SHA512 93244e380436e9779580d7e6a9d8175f00bdac042935ffb0312d6a794af01c88fb4c4f6da42650c121bd7912adb1da0ea6fdf9fa02c367f82c9a8b8ad221f35e
diff --git a/dev-ml/camlzip/camlzip-1.10.ebuild b/dev-ml/camlzip/camlzip-1.10.ebuild
index 3596e887407e..181f9c64d19a 100644
--- a/dev-ml/camlzip/camlzip-1.10.ebuild
+++ b/dev-ml/camlzip/camlzip-1.10.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/xavierleroy/camlzip/archive/rel$(ver_rs 1- '').tar.g
SLOT="1/${PV}"
LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
RDEPEND=">=dev-lang/ocaml-4.05:=[ocamlopt?]
>=sys-libs/zlib-1.1.3"
diff --git a/dev-ml/camomile/Manifest b/dev-ml/camomile/Manifest
index 007b8a45be01..48dac99c5e2d 100644
--- a/dev-ml/camomile/Manifest
+++ b/dev-ml/camomile/Manifest
@@ -1,6 +1,7 @@
AUX ocaml-unsafe-string.patch 374 BLAKE2B ad6bb3eb9e34b567809b153e1c20f4fb9f6fd87d72f7d42ef423193a213740fe4805cf4e27ab4e8eebda17d6d768ab4768fc5cfde50c0356ac5c2ed07553d7d0 SHA512 8e8efeccc3568cf28ca5caf4a8f77ec34875202efdf536ed8f9ed6dcd1eb6aeb7f88ab20f3c37afcd9b564cac961b8c5b68753eba127222ad2aab5a08495b574
AUX ocaml405.patch 1397 BLAKE2B 027d67a10f57c205c46fb443f2e6a8e1fa6790d9452b70bc09f74d26826aa4acbe99b91841db69900146041450ffc5d2aa3850e10ccedce6e8203b3ceed96f2d SHA512 e4b2bbd651c151d4822a72d8cf9d272493df450fbace1c693accec575ac810402fe15a39d7e579b421b4b42723840236e54d5e092e91108a6da8c7a8e5ebfc0e
DIST camomile-0.8.5.tar.bz2 2607084 BLAKE2B 5e0ff51cdd6d7ce41ee024189a793f3d3e4bec1bd9849e7c01d2722ff22ca2cb5f0d5bd5f95820e741469ebda2996edf3611827535df5fe095d3f6617ecfdd42 SHA512 ef4da32f955e69e0b2958b4b2bf12ae94e210d8aa7cee5a9030607b79ac43a884758549f3164c223fb07d987a4a50b15f0bc5083ff67120270409f7fb9928014
-EBUILD camomile-0.8.5-r1.ebuild 888 BLAKE2B 3b08a60d1798ce21950e2ded5212d28f39792710024e8cb3a2fd882639ae1cff6f1eee635cabe5cafeea018f59ee5e65468597303075a0a0e7f7966a4784ea56 SHA512 8adaa7baea01f24cec23a0ef28efd92a33d910a2b9eb3b3920fe2f180ef397198b9055f4f8880c5dab793295a59238fa13488e8c5f50b0fabfbabda97166f2c6
+DIST camomile-1.0.2.tar.gz 7032339 BLAKE2B 8cd60c74821c2c8e7084e752d1e4d67428c935859e02a8630f3f5563b53b3ce444071fa26153950f6a410b2743073692c7061e4f1f902c23e5fa54c50a89383c SHA512 d62ecaa297058b52674f98e513a6d776148fe62651b2b4a2dac4bb3e05abb8b7684960e889f68c6dab60aee669fbab715a2d6a9206645e24d10d8aaaf7cedf0e
EBUILD camomile-0.8.5-r2.ebuild 960 BLAKE2B 8200c4a38975432cc86a3f0d968b9ca6a7514793952bb07b14553373ec52c742d6ef2c0e2dfa681337b9c1d8d001752ac9a42561cd60a8d40041727fc6a0612f SHA512 c3b1b0ee8e815f315ca5021fee8193647fca36e649557f307c2d33d56ff0adbf09ad786ffd12567265331a247c79326247d65f71dd49848d4aee10e2040e4960
+EBUILD camomile-1.0.2.ebuild 756 BLAKE2B 6f41b23d1a1da5c87c7bf33845147b05f37d6f5b8df38397ed1041ba5735608d819dd6f7c09099b77b11fc36f48e7389e188b2043d37896fd9f97512e3086638 SHA512 4c04ad6e91e98fe3513ebf2980f8104c4ddf081b32ff3266ad094a910c85c916600514196775615b3510927562b1ad3f6ad5ccb4a9e8b6cd295c6bba2b120529
MISC metadata.xml 254 BLAKE2B 659f90317098f9ca6081145d61e53c8f7848dd0ef86b61b73f1c4c9362495a0704e02dacaaf53533dd92ace5ad0974c39abf0fb9d45dca258f4f58476931d43e SHA512 287ad112c67330f5f9f3c6e534b1d4f46d446c5b0469bddd58f9da886d02a243b8dd215ab36af9e2b1a100186d6f7ac61e988dbe62defc5cd31450ae38c24d40
diff --git a/dev-ml/camomile/camomile-0.8.5-r1.ebuild b/dev-ml/camomile/camomile-0.8.5-r1.ebuild
deleted file mode 100644
index 68d9d15dcc3e..000000000000
--- a/dev-ml/camomile/camomile-0.8.5-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# 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/camomile-1.0.2.ebuild b/dev-ml/camomile/camomile-1.0.2.ebuild
new file mode 100644
index 000000000000..ca76723d7189
--- /dev/null
+++ b/dev-ml/camomile/camomile-1.0.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Camomile is a comprehensive Unicode library for ocaml"
+HOMEPAGE="https://github.com/yoriyuki/Camomile/wiki"
+SRC_URI="https://github.com/yoriyuki/Camomile/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P^}"
+
+LICENSE="LGPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+# Unbound module errors
+RESTRICT="test"
+
+src_compile() {
+ # Amend standard dune_src_compile with -p camomile
+ # Needed to workaround: https://github.com/yoriyuki/Camomile/issues/83
+ # (https://dune.readthedocs.io/en/stable/faq.html#how-to-make-warnings-non-fatal)
+ dune build -p camomile @install || die
+}
diff --git a/dev-ml/cinaps/Manifest b/dev-ml/cinaps/Manifest
new file mode 100644
index 000000000000..844897748d71
--- /dev/null
+++ b/dev-ml/cinaps/Manifest
@@ -0,0 +1,3 @@
+DIST cinaps-0.14.0.tar.gz 9602 BLAKE2B 01d71b199dc966ac7653aca31d8a2e238102a5a29c4b6a1cf2ddd3f4624b41a4fd3e433025217951e7bd49b5eba21b6e4462217ef65a8755e6a4075683a55c5e SHA512 03f94ce7ab16d034edfc1976dd8fb83d533a1e5bc7f89dde3ea661553e05d6d8098c62c7e154013ef7814a283bb8cf535df0256891bcc6e0fdc847f6bf62aaf9
+EBUILD cinaps-0.14.0.ebuild 546 BLAKE2B 812924d3337d52509f9b618686d312c0baf513f481faaa0e40a75c68f7bc0bed6b017ddd74dca139c6b203e619e63b0375bd1cf9d3691c36c37a37fdbaf2dfb5 SHA512 435dd1825877bdfec0e7561e4255de9035d079b36ac52b7b65393e7478337da3a23164d2de6debaf2fcccb6aa2bab0a20fa888f4e052fd2a13278cde483e97a6
+MISC metadata.xml 325 BLAKE2B 34f357275544fa702af2111e6323d5320d8fc9ab0b95e83775f2d0c84fdb544c3d7b685dd83e7965ec2787543eadbad25d2e1fb75110dcb89f904e079f378e83 SHA512 095aee5cf4203e63dc3f08587d9f4e2a5365e7251f644acdf6bb495a558794fc11359ff95a2393cf0109e9e106fa3dcc6c31acabe92ab6e88f2d4bd971476973
diff --git a/dev-ml/cinaps/cinaps-0.14.0.ebuild b/dev-ml/cinaps/cinaps-0.14.0.ebuild
new file mode 100644
index 000000000000..f343badc16a9
--- /dev/null
+++ b/dev-ml/cinaps/cinaps-0.14.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Trivial metaprogramming tool"
+HOMEPAGE="https://github.com/ocaml-ppx/cinaps"
+SRC_URI="https://github.com/ocaml-ppx/cinaps/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+ dev-ml/findlib:=
+ dev-ml/re:=
+"
+RDEPEND="${DEPEND}"
+BDEPEND=""
+DEPEND="${DEPEND}
+ test? (
+ dev-ml/ppx_jane
+ )
+"
diff --git a/dev-ml/cinaps/metadata.xml b/dev-ml/cinaps/metadata.xml
new file mode 100644
index 000000000000..c68adc6e3a7f
--- /dev/null
+++ b/dev-ml/cinaps/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>gienah@gentoo.org</email>
+ <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">ocaml-ppx/cinaps</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/cmdliner/Manifest b/dev-ml/cmdliner/Manifest
index a26d187a7936..9f24378062e0 100644
--- a/dev-ml/cmdliner/Manifest
+++ b/dev-ml/cmdliner/Manifest
@@ -1,7 +1,9 @@
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
+DIST cmdliner-1.0.4.tbz 49558 BLAKE2B 8ea922a22d08fc4cce6c0aff1adff9a2fcdaee8e13b7bdfad4a08b459e8a6557761fa70c9e34100bc8baaa4113e5729f2daf297fc1f618bd8c30b9323bb87ba2 SHA512 4cd1cc0932b8bbd607160cc9816b35c12a68a358a35ffcb6827f547052dc517e871a91ddbaed0447cb1fa5fdf510cdf5d760e8e5c1e4548f82e1d523e2b3ecb3
EBUILD cmdliner-1.0.0.ebuild 1048 BLAKE2B b3d4508df4714a80f61e3ecabaccce5c7d471a5113afd12e889339b5e4cdd2a3333b893fd8711d11f50c8f576452b826777da005f23e571f7a4172f9eb8ff7c8 SHA512 6561f3513d6d7bcabdd947ad898ebf5aab474ac31617c4a98a3027bda677eac8269fe7aa974249745930cce1a1dc3e669818a3a493cf26cccb91c3e80394efd3
EBUILD cmdliner-1.0.1.ebuild 1048 BLAKE2B b3d4508df4714a80f61e3ecabaccce5c7d471a5113afd12e889339b5e4cdd2a3333b893fd8711d11f50c8f576452b826777da005f23e571f7a4172f9eb8ff7c8 SHA512 6561f3513d6d7bcabdd947ad898ebf5aab474ac31617c4a98a3027bda677eac8269fe7aa974249745930cce1a1dc3e669818a3a493cf26cccb91c3e80394efd3
EBUILD cmdliner-1.0.2.ebuild 1048 BLAKE2B b3d4508df4714a80f61e3ecabaccce5c7d471a5113afd12e889339b5e4cdd2a3333b893fd8711d11f50c8f576452b826777da005f23e571f7a4172f9eb8ff7c8 SHA512 6561f3513d6d7bcabdd947ad898ebf5aab474ac31617c4a98a3027bda677eac8269fe7aa974249745930cce1a1dc3e669818a3a493cf26cccb91c3e80394efd3
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+EBUILD cmdliner-1.0.4.ebuild 1071 BLAKE2B c01b7fca5f865e517439b5f14df8614a55b46002b47f6d8b89dd47029ca807bbfea57aa5e02559ee76e168447a50edd65d52110730a57d45af46e544f5e1888d SHA512 9ca92c90e2686d3d3f5fcc1df014f14b40ceedc1107f7e8f1a4f0ab35d8973e52c409fa9f03a6d084c9b03a8f579873eec69bc75a3c64a23aff2a54f0a05da72
+MISC metadata.xml 244 BLAKE2B c82f45966666e095a27d4d8b14f01f93e202177ea8222c5fc806f4e243b8ca653a61232533a6dd10ed36a35f765dc94cfc651f9fade565b8eedfe1129b5c2d23 SHA512 756b8d091c29b6c4c621ba30588da62cf99e777243fbdd88cc668f3ec071353beea675c853f8c58752fbc6c01c795760cb10428d3a7fd087967a88b885d91149
diff --git a/dev-ml/cmdliner/cmdliner-1.0.4.ebuild b/dev-ml/cmdliner/cmdliner-1.0.4.ebuild
new file mode 100644
index 000000000000..eaae576d4f2f
--- /dev/null
+++ b/dev-ml/cmdliner/cmdliner-1.0.4.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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 ~ppc64 ~x86"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=dev-lang/ocaml-4:=[ocamlopt?]
+ dev-ml/result:=
+ dev-ml/findlib:=
+"
+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
index 6f49eba8f496..a4f6be63adba 100644
--- a/dev-ml/cmdliner/metadata.xml
+++ b/dev-ml/cmdliner/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>gienah@gentoo.org</email>
+ <name>Mark Wright</name>
+ </maintainer>
</pkgmetadata>
diff --git a/dev-ml/cppo/Manifest b/dev-ml/cppo/Manifest
index a689ee82982f..79663b93b1fe 100644
--- a/dev-ml/cppo/Manifest
+++ b/dev-ml/cppo/Manifest
@@ -1,5 +1,7 @@
DIST cppo-1.4.1.tar.gz 26547 BLAKE2B a93802fb36cfb622de32a00f6ad6d0fbc7c1022a65ab70558273654b817ca16a988fb8ce8c5dd0751e80eef066f3fcb82f25fc572edb312f346cd20830c08f5a SHA512 efbc82d2eb31b9e16c43ffbd7a2a56a5356934c32bee62205f55295a9342e4747ce13b9ad6572f3180e656b215a9255d402712ff7bae1ef9e8eccdabb2d00c16
DIST cppo-1.5.0.tar.gz 26963 BLAKE2B 4118637bd8bcfc2edae4c7bf0d839b82ba3402c2f4df9de81bcb28685e4112ff364cb607dc9dcdc3512cc4fdf8dfb4cb85ceca945230bd7cd5d04e525d4e6587 SHA512 2cc144815b818242b6bb1dee213aa65345620eaf1afe59b25d118399d9a02d577aa9dc61dd5756661e44411acccdb2fc0320a8984e5f0d2a7390fcc816bac7e0
+DIST cppo-1.6.6.tar.gz 28667 BLAKE2B 57510ff824265065d4c4ba7d3da4b9aea389e005de4f2e73c1b43b230082872be0118e0b40d6c2951d4017210522a06eb089ab5cbb18fb48d29b87736fa59055 SHA512 80b0d7a5f0f5b7d9d62ddfb204ebf5e3216c2926ba7f667b9ef10981de6a51cd6d670b7062769bf6fbdd163c1c8fb5426a74c31234ddc03ec94a75645bf469da
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 244 BLAKE2B aa5b4ff44cf35b470a036f804d94412403c94f4795a36129bb428be3e061ae16e59df45b8bfca6c2dcaebd3f3ff1913f283403a885266a8983f02e7804ece13d SHA512 3c3c16494a898d48f2fda35feb9e27fc0abaf11df5165195281f663231ffb3a9dfa7fc740762650b261513222be2cc90124238a1cf8699f26d5d1e32ae9c24fd
+EBUILD cppo-1.6.6.ebuild 497 BLAKE2B 579e2d339de1786e0defba300c0d30dece96d21d44fe813f9e121f480c2186bf4aee4d845ad3fc0a17178b071cff217fb58023beae8418f6f0a0b62a6c84c545 SHA512 e6ad33b04604b17c1684568ef1d8676ab1ac813b0b5db8bf4bfc620d6c2d18b6b6bf653c80a7363b560b6b3cbeedf93d42dc35e84dd5d1f1ecf60f6a888f1573
+MISC metadata.xml 329 BLAKE2B db38b8af799a1c79d09897a4b45d36bd7924ceb8d9d1875e2ebc91b293d9cb03bef31992be9eef9cdef96d543b78fd3410da4cea94e32767888120a8da4e6bcf SHA512 5ac7d5d1a4e3c856de0b3ffe653fab70e88fbacdf3925ce1a357d77e84d30d627632b5266093dc79b548cc4aa507b58ef22311c36403fa6f4a11bb83b8a3935a
diff --git a/dev-ml/cppo/cppo-1.6.6.ebuild b/dev-ml/cppo/cppo-1.6.6.ebuild
new file mode 100644
index 000000000000..9abdedf45cf1
--- /dev/null
+++ b/dev-ml/cppo/cppo-1.6.6.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="An equivalent of the C preprocessor for OCaml programs"
+HOMEPAGE="https://github.com/ocaml-community/cppo/"
+SRC_URI="https://github.com/ocaml-community/cppo/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0/${PV}"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+IUSE="+ocamlopt"
+
+RDEPEND="dev-ml/ocamlbuild
+ dev-ml/findlib:="
+DEPEND="${RDEPEND}"
diff --git a/dev-ml/cppo/metadata.xml b/dev-ml/cppo/metadata.xml
index 01532e5edac5..7ef499b5a200 100644
--- a/dev-ml/cppo/metadata.xml
+++ b/dev-ml/cppo/metadata.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>gienah@gentoo.org</email>
+ <name>Mark Wright</name>
+ </maintainer>
<upstream>
- <remote-id type="github">mjambon/cppo</remote-id>
+ <remote-id type="github">ocaml-community/cppo</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-ml/cryptokit/Manifest b/dev-ml/cryptokit/Manifest
index 34c1e08cfdc4..2bb7b68b721d 100644
--- a/dev-ml/cryptokit/Manifest
+++ b/dev-ml/cryptokit/Manifest
@@ -1,7 +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
+DIST cryptokit-1.16.1.tar.gz 120607 BLAKE2B fbb89c4dabef8f09614003acc2b8173fdfdacb36793fd20f4415ebec04f3759537739eccd7b9d143df0163816b9db65c221c2b83408c9ac3aa7f9bf7b63876c6 SHA512 28913a7c35ae951a4c464287acc511ee1bdc9d03b5928e2243c5ae5cbb8b10afe8e84d7a73ba6478ed62657d01fdb6f02472739255c33de3671c4130b659da52
EBUILD cryptokit-1.10.ebuild 1256 BLAKE2B 1d3100602f1552065099df7b67338c27e9e85f7d06529ff0d18c7d6d2169fea9aae3c025aee34c0353226e8395535c86e592aff7764a9223ee2d40ac176c1096 SHA512 d6696043f757bd9da8966e671c2778fa217274db41c8c9730998ce372f6325ebb3f76cb3df5ea08a354adcf40076b134362f1f88023e14099b98ecaa06a8787f
-EBUILD cryptokit-1.11.ebuild 1306 BLAKE2B 50af70a01746d91da2ba4217b88c14b28bb143518e91226d22e6494ce5ebbb08686ee1795ee55c28031d1fbffc7e78bb6f4392ccd1f4a0ec498f39190ee42490 SHA512 76f47cdb34f01710bc4f7023bfcffd74eb8fcf1c72196d754cc2ddaba7672eba4bcdfb8b0edb201be6616a0c9df0f837568dc746f0a79dabcd91598756cbc56d
-EBUILD cryptokit-1.12.ebuild 1433 BLAKE2B e394baad67784ca2611104cbdbfd7037eaa6c5b18721966378a748e89d8b32f56a2cfadf9cad7e4356d2da377c7d1a643baf08f05bfa63bdb4b58d3a04364e29 SHA512 e0c8187cc0de738c7fefa553c5a33ebdabbee6e2cffa83568d11d674070bae3a9d451b75a0f47211887483113e1cf48211fc070655a63d1d3a1463a0c7190dc7
+EBUILD cryptokit-1.11.ebuild 1304 BLAKE2B eb25ecabfc257aa1f10e0b90ab2a94e3390fb416659c89745156a818ce6c16319a99de9fa7c40ea21a9fb1b6b52fe09a10cecea7d2a7965e645809a17e9be97c SHA512 4c184b9591945af1da9ce08b68b7387dff100453ce5876c0ca0c1625efaa69d84eed776f0115edce8516e02b681e21c674f0685116de86fa4a3bea01283b2127
+EBUILD cryptokit-1.16.1-r1.ebuild 1742 BLAKE2B f41f5f4564c155a524a765cfd84bf40c047fe822d37ddc93dff656ae171de770154d693e6a7c0362ddd8699cd6c38caeb9a2584e161f83c1033febe1fd2e4b69 SHA512 00c6f9254e181eef7195fd6b0c124af3beeeef7989ba51c8d1ea87d5b7e90b76c1c69a0eb96a10f07b76476da09c3e24f68f7ec8671ed39039ad9819578fddfd
MISC metadata.xml 253 BLAKE2B 7f94398024f3ee85392671327ef194e7b5ed3336f25734f286e2bab74d4c7001dae92ed8e1b826de9be0c1176260e08b444ac44c826e52e27e940de57ead2eda SHA512 edd60a11f202c6d04c3b4879adadc8abc252eb61abfbb22043e12298f2f6f3aea53177c2b254cd113bc222dfce32687ebf8cfefd97a35fdf00504c54207ea390
diff --git a/dev-ml/cryptokit/cryptokit-1.11.ebuild b/dev-ml/cryptokit/cryptokit-1.11.ebuild
index 6e5371e5df0f..152ab71573fc 100644
--- a/dev-ml/cryptokit/cryptokit-1.11.ebuild
+++ b/dev-ml/cryptokit/cryptokit-1.11.ebuild
@@ -13,7 +13,7 @@ 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"
+KEYWORDS="amd64 ppc x86"
IUSE="zlib"
DEPEND="zlib? ( >=sys-libs/zlib-1.1 )
diff --git a/dev-ml/cryptokit/cryptokit-1.12.ebuild b/dev-ml/cryptokit/cryptokit-1.16.1-r1.ebuild
index edc0e8846542..3a589111cb51 100644
--- a/dev-ml/cryptokit/cryptokit-1.12.ebuild
+++ b/dev-ml/cryptokit/cryptokit-1.16.1-r1.ebuild
@@ -1,33 +1,44 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="5"
+EAPI=7
-OASIS_BUILD_DOCS=1
-OASIS_BUILD_TESTS=1
-
-inherit oasis versionator
+inherit dune
+MY_PV="$(ver_rs 1- '')"
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"
+SRC_URI="https://github.com/xavierleroy/cryptokit/archive/release${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-release${MY_PV}"
+
LICENSE="LGPL-2"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="zlib"
-
-DEPEND="zlib? ( >=sys-libs/zlib-1.1 )
- dev-ml/zarith:="
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE="cpu_flags_x86_aes +ocamlopt test zlib"
+REQUIRED_USE="test? ( ocamlopt )"
+RESTRICT="!test? ( test )"
+
+# We can't use mpir on zarith
+# (until it gains mpz_powm_sec?)
+# bug #750740
+DEPEND="
+ dev-ml/dune-configurator
+ dev-ml/zarith:=[-mpir]
+ zlib? ( >=sys-libs/zlib-1.1 )
+"
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
+ # Don't build in src_configure
+ sed -i -e 's:exit (Sys.command "dune build @configure --release")::' configure || die
+
+ # It's not autotools (or even close), it's a Dune wrapper.
+ ./configure \
+ $(use_enable cpu_flags_x86_aes hardwaresupport) \
+ $(use_enable zlib) \
+ || die
}
pkg_postinst() {
@@ -48,5 +59,5 @@ src_test() {
einfo "Daemon (EGD) for this test to succeed!"
echo ""
- oasis_src_test
+ dune_src_test
}
diff --git a/dev-ml/csexp/Manifest b/dev-ml/csexp/Manifest
new file mode 100644
index 000000000000..d4c652c9b9fd
--- /dev/null
+++ b/dev-ml/csexp/Manifest
@@ -0,0 +1,3 @@
+DIST csexp-1.3.2.tbz 9775 BLAKE2B b1afea15558a5520abab214874653e9768ebbb22e064b51dab2f5bd5543460e357f9e1cba964341bcb24c5d53d8477de5458186e4d83db21d99a8ca45009d818 SHA512 ff1bd6a7c6bb3a73ca9ab0506c9ec1f357657deaa9ecc7eb32955817d9b0f266d976af3e2b8fc34c621cb0caf1fde55f9a609dd184e2054f500bf09afeb83026
+EBUILD csexp-1.3.2.ebuild 553 BLAKE2B ed1f0b0cb433e9d834452114a856aec71b5a0c22ee73adbf75b7b42d7e08b0cdd78d6ddef43caaeb89bb0bb882b0524b4c91bcd6a93f6eb34a5ae831a9795d8e SHA512 810d21e8a3cb5d8c053d8e52ee55f30a807b07fd3cfafa564e7db3b0728b29e50a9b0b6219a90f636f6cb71b9cc8df6cb6afca7a056f94ab1e5fc47ccba86ca8
+MISC metadata.xml 325 BLAKE2B 84a7e8c2b5f618037eb78e8775da0e29de6e713e90e9c3b4db850db9b018107491ad972eacc433657e6498af4c30854844a6a6eaa0ec09e5689cd13ef1620157 SHA512 9de595bf191ff77f5b33213a8cfe4e2225666f88fa69fbb6c19703261ed12c546ed237b62a615edaefdd05fcc62b2e55b0822dcedf9dd78ced8f547188c2b9a7
diff --git a/dev-ml/csexp/csexp-1.3.2.ebuild b/dev-ml/csexp/csexp-1.3.2.ebuild
new file mode 100644
index 000000000000..ce2e15d3f7e2
--- /dev/null
+++ b/dev-ml/csexp/csexp-1.3.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Parsing and printing of S-expressions in Canonical form"
+HOMEPAGE="https://github.com/ocaml-dune/csexp"
+SRC_URI="https://github.com/ocaml-dune/csexp/releases/download/${PV}/${P}.tbz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+ dev-ml/result:=
+"
+RDEPEND="${DEPEND}"
+BDEPEND=""
+DEPEND="${DEPEND}
+ test? ( dev-ml/ppx_expect )
+"
diff --git a/dev-ml/csexp/metadata.xml b/dev-ml/csexp/metadata.xml
new file mode 100644
index 000000000000..f197dd418645
--- /dev/null
+++ b/dev-ml/csexp/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>gienah@gentoo.org</email>
+ <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">ocaml-dune/csexp</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/cudf/Manifest b/dev-ml/cudf/Manifest
index 0c5d5c7213e5..bdbb39b45504 100644
--- a/dev-ml/cudf/Manifest
+++ b/dev-ml/cudf/Manifest
@@ -1,3 +1,6 @@
+AUX ounit2.patch 380 BLAKE2B 20d0c2f0b719715fc5f111bfbd81e814a4ae8229a7365ed2073d0ecc3ad1eafa4377bc3c0e497d4bf0ab73af986255ac48e179d34dfb2ded3fd7b55c22f339ba SHA512 d53ac28ba8b8eeda612d7f323bb658f272dcc785596eb47b4148ed7954a6ca0204e42b5e3cb6a55211fc1117432f3088fdc215930c26238dc2d34f063f21b062
DIST cudf-0.8.tar.gz 55147 BLAKE2B c091a55e438979f73bfd5fd16f1e793ec984b24becc902e6eed856afea0f39586001174847b8626bbf162c2b51cbb98cdb60d9539c9aac0a1d651b693e686704 SHA512 cea9e51094076089b1beb657f6b2ccc6ac5f49660e06743f8ec646b277beb4c830f90156ae240a6903de55d09caee78fb0dc75efd76ca65fd2b40ab8756301e3
-EBUILD cudf-0.8-r1.ebuild 1349 BLAKE2B d1f97b4011bfdf30ecce5faff66d3564681e4860801c14d238f894f18e1675d639a81748fa58232528a93b92a8b9e6cee9caefd2d1faa988c91cbc633e4150d1 SHA512 bc0da524efb0a49b041a0d694820f5a0b708a15da1d64de296298ad29e660587d27a3b225c32013625a4154041ae358a49934b88dcca72256fab4e4bfc090b80
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+DIST cudf-0.9.tar.gz 55124 BLAKE2B 013f97d13b732674a7d0f9188590bbb8150ae9dc32ce26b56fb04848629fb27a3c850aa327e687d6aa80eb62ba6f67af2fcf86a647520e73d7f76748871a79cc SHA512 4abdd1a5a3d616273abe9dda87450a922ecd69b64d32f34d8fa3086bbd07fd23ffb01c24b128bf4d1c0c817cfa1da8029e743d33b3ad6a04e7a8f706b098c427
+EBUILD cudf-0.8-r1.ebuild 1369 BLAKE2B 7745e2dcd6ded40d3bc34847f651086156d4425c4c88bea34fde1a10c9e224655625c10bcc4acdd74a67f1e1ecc67c11e9d78cb9cd9d79ca1c88ca808dcd7d87 SHA512 45c6b14fb173794aae906e2b103cdec0c546b7e07954c0bbfa6180f056ceaf58e0915748aed957e2206dff59b040f38e9461873dc1112202fc314aaf3370d577
+EBUILD cudf-0.9.ebuild 1642 BLAKE2B 0bac926cdaba47d0a1204245191cb84c243ebe001bf4d272905832896739e3228939e2eaa9735b0a5fea049b946c5ab6b1dae77ff51c6ef249fa545de3da2e98 SHA512 8f9c6ddac87ed93c18ad19c08057424e0c004d1283debbdbd67ad57af1c5cce6da62dcba62cfae04fc4fe10bb9de392c9ad096c0108ac7a15094ac454d8dbd87
+MISC metadata.xml 244 BLAKE2B c82f45966666e095a27d4d8b14f01f93e202177ea8222c5fc806f4e243b8ca653a61232533a6dd10ed36a35f765dc94cfc651f9fade565b8eedfe1129b5c2d23 SHA512 756b8d091c29b6c4c621ba30588da62cf99e777243fbdd88cc668f3ec071353beea675c853f8c58752fbc6c01c795760cb10428d3a7fd087967a88b885d91149
diff --git a/dev-ml/cudf/cudf-0.8-r1.ebuild b/dev-ml/cudf/cudf-0.8-r1.ebuild
index 3d7e202217bc..682642554816 100644
--- a/dev-ml/cudf/cudf-0.8-r1.ebuild
+++ b/dev-ml/cudf/cudf-0.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -34,10 +34,10 @@ src_prepare() {
-e 's|make|$(MAKE)|g' \
Makefile || die
sed -i \
- -e 's|-lncurses|$(shell ${PKG_CONFIG} --libs ncurses glib-2.0)|g' \
+ -e 's|-lncurses|$(shell ${PKG_CONFIG} --libs ncurses glib-2.0 libunwind)|g' \
c-lib/Makefile || die
sed -i \
- -e 's|-lcurses|$(shell ${PKG_CONFIG} --libs ncurses glib-2.0)|g' \
+ -e 's|-lcurses|$(shell ${PKG_CONFIG} --libs ncurses glib-2.0 libunwind)|g' \
c-lib/Makefile.variants || die
tc-export CC PKG_CONFIG
diff --git a/dev-ml/cudf/cudf-0.9.ebuild b/dev-ml/cudf/cudf-0.9.ebuild
new file mode 100644
index 000000000000..9877b5c886cd
--- /dev/null
+++ b/dev-ml/cudf/cudf-0.9.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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/36602/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=dev-lang/ocaml-3.12:=[ocamlopt?]
+ dev-ml/extlib:=
+ dev-ml/findlib:=
+ dev-libs/glib:2
+"
+DEPEND="${RDEPEND}
+ test? ( dev-ml/ounit2 )
+ dev-ml/ocamlbuild
+ dev-lang/perl
+"
+PATCHES=( "${FILESDIR}/ounit2.patch" )
+
+src_prepare() {
+ default
+
+ sed -i \
+ -e 's|make|$(MAKE)|g' \
+ Makefile || die
+ sed -i \
+ -e 's|-lncurses|$(shell ${PKG_CONFIG} --libs ncurses glib-2.0 libunwind)|g' \
+ c-lib/Makefile || die
+ sed -i \
+ -e 's|-lcurses|$(shell ${PKG_CONFIG} --libs ncurses glib-2.0 libunwind)|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 OCAMLBUILD="ocamlbuild -classic-display" -j1 all
+ emake OCAMLBUILD="ocamlbuild -classic-display" c-lib
+ if use ocamlopt ; then
+ emake OCAMLBUILD="ocamlbuild -classic-display" -j1 opt
+ emake OCAMLBUILD="ocamlbuild -classic-display" c-lib-opt
+ fi
+}
+
+src_test() {
+ emake OCAMLBUILD="ocamlbuild -classic-display" test
+ emake OCAMLBUILD="ocamlbuild -classic-display" c-lib-test
+}
+
+src_install() {
+ emake DESTDIR="${ED}" LIBDIR="/usr/$(get_libdir)" install
+ dodoc BUGS ChangeLog README TODO
+}
diff --git a/dev-ml/cudf/files/ounit2.patch b/dev-ml/cudf/files/ounit2.patch
new file mode 100644
index 000000000000..5fbedbf26edf
--- /dev/null
+++ b/dev-ml/cudf/files/ounit2.patch
@@ -0,0 +1,12 @@
+Index: cudf-0.9/_tags
+===================================================================
+--- cudf-0.9.orig/_tags
++++ cudf-0.9/_tags
+@@ -1,5 +1,5 @@
+-<test.ml> or <tests.ml> : pkg_oUnit
+-<test.byte> or <test.native> : pkg_oUnit
++<test.ml> or <tests.ml> : pkg_ounit2
++<test.byte> or <test.native> : pkg_ounit2
+
+ <*.ml> or <*.mli> : pkg_extlib
+ <*.byte> or <*.native> : pkg_extlib
diff --git a/dev-ml/cudf/metadata.xml b/dev-ml/cudf/metadata.xml
index 6f49eba8f496..a4f6be63adba 100644
--- a/dev-ml/cudf/metadata.xml
+++ b/dev-ml/cudf/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>gienah@gentoo.org</email>
+ <name>Mark Wright</name>
+ </maintainer>
</pkgmetadata>
diff --git a/dev-ml/dose3/Manifest b/dev-ml/dose3/Manifest
index f4d496dc8f8f..08e7827b7b85 100644
--- a/dev-ml/dose3/Manifest
+++ b/dev-ml/dose3/Manifest
@@ -1,3 +1,6 @@
+AUX ocaml406.patch 1623 BLAKE2B 741d94b936ed59aa3b158cca587ee2aaddb72e06703cbeee13c7aadb1c062d38bdb7a8e06805a7dc4cc6a19cab829702e55797f7434b3aea402c8d8023e36783 SHA512 1ccc378bb32a7ced3b643590a5ebd3b4b5b31f256ba4067f64a1611abb74cba48f0e0da42fb498aa66ee17e3d2446b9683ff5eca64749360af7a147fbf36385b
+AUX unix.patch 406 BLAKE2B 270b1e747ab9f270c49ea2ccfee0734600160f1db2f6ee912467989e1c59b31a0840d3a83fa857000b50a5a61d29422629bc9eb2334c7b08db93ef43d12229f7 SHA512 f6d7a3d100c425767ce304c620376cf815b8de59b04aea7ee439e79159cb7aa96cf1903498173d341fcf8d61391edf0b183ab4cda17ce91f41db9aa25ae8aff5
DIST dose3-5.0.1.tar.gz 297433 BLAKE2B 74ae954604f26398f091b4f14d2a633132ae62102f52af13284af27e41cd7c47afb1b533b0821a8921ba33fa6658e94b3bb6bf5f104f48881a50e14517cd65e2 SHA512 e66526319446054041f138ee2633043d0832089f6a554cf566a28de899d10383acfb1aa6bf1a368811602939676510933a7d2404fd34dbeba15045b458f5af84
+EBUILD dose3-5.0.1-r1.ebuild 1678 BLAKE2B 4d9ee4f7be0f91bdbbd92d256202e0a7f4f93ada147e95d4b8df002d0583636d87a81e9d59b060b13b51560786099c42451f6c5a1f31f2766c994878fcd39308 SHA512 ab0fceac967da108330269bb6b8a845e9a6406ffd3aaf83fb2ca16fa5d1bdedf31c05ab1986823e2c9b39ed1ec83409b1c2e369ad556dadb03e85d518e059ba2
EBUILD dose3-5.0.1.ebuild 1541 BLAKE2B d1bb17c74e7f0882ff94993c4aa1cefaed79445cc413d827e4ba9283df807798f9f11510dcd8078beb7b382c0c18127b269e80ea187e72c12b5c9cc32e885e44 SHA512 01cf87d3a0e2f817801ecdfadefb8e34f18b2676b34488559c324020edf76ceccd5268941f20edaccfd75a4275c1a724f2a7f7d9352a165c438fa0b977878ab5
-MISC metadata.xml 397 BLAKE2B a1b2f753f172edfb0ac6883028f382b3c43a60df7850bd587a178e0f80a9f825fe7ca701670f30f2746816a02abf6f32a66e425257dba614006648a360a5ead7 SHA512 faf958e0196a8f044a39071b0d55b8d87417d4b5edc5086828c1d1cd86c38c272b844d2e5e4d9bb36dcda8c24b362b70f5707496ff490f02296ab0f2d4532524
+MISC metadata.xml 474 BLAKE2B 51884c8074342dbbe0e961495b12b69460ba0429134c50a75c68008fe54a8ea89dce28e114553b433f7c8dca503daee89b858c92995fd0aa4651bd1335e87a62 SHA512 245deea20a81b03063b19e4146982bd6a6d64b363153cdcdde811800c64f8d72861f749eac232f6530889ceb2fa84828db83376039868d3a097b488ba6331ee2
diff --git a/dev-ml/dose3/dose3-5.0.1-r1.ebuild b/dev-ml/dose3/dose3-5.0.1-r1.ebuild
new file mode 100644
index 000000000000..c08cc798c4d6
--- /dev/null
+++ b/dev-ml/dose3/dose3-5.0.1-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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 ~ppc64 ~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/re:=
+ 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
+ dev-ml/cppo
+ test? ( dev-python/pyyaml[libyaml] )
+"
+# missing test data
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+ default
+ sed -e 's/INSTALLOPTS=-s/INSTALLOPTS=/' -i Makefile.config.in || die
+ has_version '>=dev-lang/ocaml-4.06_beta' && eapply "${FILESDIR}/ocaml406.patch"
+ eapply "${FILESDIR}/unix.patch"
+}
+
+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 VERBOSE="-classic-display"
+}
+
+src_install() {
+ emake DESTDIR="${D}" BINDIR="${ED}/usr/bin" install || die
+ dodoc CHANGES CREDITS README.architecture TODO
+}
diff --git a/dev-ml/dose3/files/ocaml406.patch b/dev-ml/dose3/files/ocaml406.patch
new file mode 100644
index 000000000000..867c2ca4848c
--- /dev/null
+++ b/dev-ml/dose3/files/ocaml406.patch
@@ -0,0 +1,39 @@
+Index: dose3-5.0.1/common/criteria_lexer.mll
+===================================================================
+--- dose3-5.0.1.orig/common/criteria_lexer.mll
++++ dose3-5.0.1/common/criteria_lexer.mll
+@@ -18,7 +18,7 @@
+ let c = Lexing.lexeme_char lexbuf 2 in (* the delimiter can be any character *)
+ (* find the terminating delimiter *)
+ let endpos =
+- try String.index_from lexbuf.lex_buffer (lexbuf.lex_start_pos + 3) c with
++ try Bytes.index_from lexbuf.lex_buffer (lexbuf.lex_start_pos + 3) c with
+ |Invalid_argument _ ->
+ raise (Format822.Syntax_error (
+ Format822.error lexbuf "String too short"))
+@@ -27,9 +27,9 @@
+ Format822.error lexbuf (Printf.sprintf "cannot find: %c" c)))
+ in
+ let len = endpos - (lexbuf.lex_start_pos + 3) in
+- let s = String.sub lexbuf.lex_buffer (lexbuf.lex_start_pos + 3) len in
+- lexbuf.Lexing.lex_curr_pos <- lexbuf.Lexing.lex_start_pos + ((String.length s)+4);
+- s
++ let s = Bytes.sub lexbuf.lex_buffer (lexbuf.lex_start_pos + 3) len in
++ lexbuf.Lexing.lex_curr_pos <- lexbuf.Lexing.lex_start_pos + ((Bytes.length s)+4);
++ Bytes.to_string s
+
+ }
+
+Index: dose3-5.0.1/common/input.ml
+===================================================================
+--- dose3-5.0.1.orig/common/input.ml
++++ dose3-5.0.1/common/input.ml
+@@ -47,7 +47,7 @@ let bzip_open_file file =
+ in
+ IO.create_in
+ ~read:(fun () -> input_char ch)
+- ~input:(read ch)
++ ~input:(fun x -> read ch (Bytes.to_string x))
+ ~close:(fun () -> Bz2.close_in ch)
+ #else
+ fatal "bzip not supported. re-configure with --with-bz2"
diff --git a/dev-ml/dose3/files/unix.patch b/dev-ml/dose3/files/unix.patch
new file mode 100644
index 000000000000..c3dbfabcfbce
--- /dev/null
+++ b/dev-ml/dose3/files/unix.patch
@@ -0,0 +1,13 @@
+Index: dose3-5.0.1/META.in
+===================================================================
+--- dose3-5.0.1.orig/META.in
++++ dose3-5.0.1/META.in
+@@ -8,7 +8,7 @@ package "common" (
+ version = "@PACKAGE_VERSION@"
+ archive(byte) = "common.cma"
+ archive(native) = "common.cmxa"
+-requires = "extlib, re.pcre, cudf, @ZIP@, @BZ2@"
++requires = "extlib, re.pcre, cudf, unix, @ZIP@, @BZ2@"
+ )
+
+ package "algo" (
diff --git a/dev-ml/dose3/metadata.xml b/dev-ml/dose3/metadata.xml
index 35cab394ef66..99daf30cfd99 100644
--- a/dev-ml/dose3/metadata.xml
+++ b/dev-ml/dose3/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>gienah@gentoo.org</email>
+ <name>Mark Wright</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>
diff --git a/dev-ml/dune-configurator/Manifest b/dev-ml/dune-configurator/Manifest
new file mode 100644
index 000000000000..8b69cbe8dbd9
--- /dev/null
+++ b/dev-ml/dune-configurator/Manifest
@@ -0,0 +1,3 @@
+DIST dune-2.7.1.tar.gz 1290915 BLAKE2B 85a2dee92d1ead03b43b80742c291f4470dd9e1d843fdb257754c567e2329c101d11b42573da19de537f0d8591ebdacfcaab1099e0f46bdeebcd8421eb1bbcb2 SHA512 b77d0e207263107365e5a6e94423e8ab4ddbab1f920872d915e4014b7cc69915274b53fe946bb4b29dfe3de2bf5573ab3b2bffb4db8eb50b472e7dfb6cab88b7
+EBUILD dune-configurator-2.7.1.ebuild 608 BLAKE2B aab48888c87b6a842174432cae439cad8e9ae83585b644d7c4235e4b18cd1c828c48aa352036cd3f520911042ffb48cc8cf152c8ebba2dbcc3bd79803fa834b7 SHA512 f6fc52ddac772985feb0313e87bc147ed7c2d3b457bf515312343b2c8903025ce379525e82bb92d2c1ef9058cb67e303e4293f2f4243bc22a962f8a33a7c83f7
+MISC metadata.xml 319 BLAKE2B 65741bb0181ac6f6fb28019dc60386a5d47a2071131d8496adb14af1eff40000b59b2410acdf8ffa14fd4ad1d0bd6efacc1c67f68c162ed10e847a00db457aaf SHA512 8178e2c48fdd360ab7860dde1666bd2d0d0223f51275c58005aaab2d14946d4bb1e1e6be55a74d98afd6ef0acac515e2ebd0f7f44adbc9d2d7efbfcde641bd65
diff --git a/dev-ml/dune-configurator/dune-configurator-2.7.1.ebuild b/dev-ml/dune-configurator/dune-configurator-2.7.1.ebuild
new file mode 100644
index 000000000000..3da9571b6f3e
--- /dev/null
+++ b/dev-ml/dune-configurator/dune-configurator-2.7.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="A composable build system for OCaml"
+HOMEPAGE="https://github.com/ocaml/dune"
+SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz -> dune-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+ dev-ml/dune-private-libs:=
+ dev-ml/csexp:=
+"
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND}
+ test? (
+ dev-ml/ppx_expect
+ )"
+S=${WORKDIR}/dune-${PV}
+
+src_configure(){
+ :
+}
diff --git a/dev-ml/dune-configurator/metadata.xml b/dev-ml/dune-configurator/metadata.xml
new file mode 100644
index 000000000000..6b935772818b
--- /dev/null
+++ b/dev-ml/dune-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="person">
+ <email>gienah@gentoo.org</email>
+ <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">ocaml/dune</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/dune-private-libs/Manifest b/dev-ml/dune-private-libs/Manifest
new file mode 100644
index 000000000000..9af4d889ab85
--- /dev/null
+++ b/dev-ml/dune-private-libs/Manifest
@@ -0,0 +1,3 @@
+DIST dune-2.7.1.tar.gz 1290915 BLAKE2B 85a2dee92d1ead03b43b80742c291f4470dd9e1d843fdb257754c567e2329c101d11b42573da19de537f0d8591ebdacfcaab1099e0f46bdeebcd8421eb1bbcb2 SHA512 b77d0e207263107365e5a6e94423e8ab4ddbab1f920872d915e4014b7cc69915274b53fe946bb4b29dfe3de2bf5573ab3b2bffb4db8eb50b472e7dfb6cab88b7
+EBUILD dune-private-libs-2.7.1.ebuild 900 BLAKE2B 175aefff20978b07dbf58d82f724a2dc5b3751de43994f433161e1148ef8dad307519ccb6136ee255623fdd501ff31f3cc62f4d1165af7c160cb0162b2a38385 SHA512 16b9ec86e3310e985517ce53813787f5d7c2a4a2c4273c5697e6703fec3be4057df6bb894526dc680c520efa83d33f9daf7b55793eadb03139301a3a4ae87216
+MISC metadata.xml 319 BLAKE2B 65741bb0181ac6f6fb28019dc60386a5d47a2071131d8496adb14af1eff40000b59b2410acdf8ffa14fd4ad1d0bd6efacc1c67f68c162ed10e847a00db457aaf SHA512 8178e2c48fdd360ab7860dde1666bd2d0d0223f51275c58005aaab2d14946d4bb1e1e6be55a74d98afd6ef0acac515e2ebd0f7f44adbc9d2d7efbfcde641bd65
diff --git a/dev-ml/dune-private-libs/dune-private-libs-2.7.1.ebuild b/dev-ml/dune-private-libs/dune-private-libs-2.7.1.ebuild
new file mode 100644
index 000000000000..605aee40ddff
--- /dev/null
+++ b/dev-ml/dune-private-libs/dune-private-libs-2.7.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="A composable build system for OCaml"
+HOMEPAGE="https://github.com/ocaml/dune"
+SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz -> dune-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+ ~dev-ml/dune-2.7.1
+ test? (
+ dev-ml/ppx_expect
+ )"
+DEPEND="
+ dev-ml/csexp:=
+ dev-ml/findlib:=
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/dune-${PV}"
+
+src_prepare() {
+ default
+ # remove tests that run git
+ rm -f \
+ test/blackbox-tests/test-cases/dune-project-meta/main.t/run.t \
+ test/blackbox-tests/test-cases/meta-template-version-bug.t \
+ test/blackbox-tests/test-cases/subst.t/run.t \
+ test/expect-tests/vcs_tests.ml \
+ || die
+}
+
+src_configure(){
+ :
+}
diff --git a/dev-ml/dune-private-libs/metadata.xml b/dev-ml/dune-private-libs/metadata.xml
new file mode 100644
index 000000000000..6b935772818b
--- /dev/null
+++ b/dev-ml/dune-private-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="person">
+ <email>gienah@gentoo.org</email>
+ <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">ocaml/dune</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/dune/Manifest b/dev-ml/dune/Manifest
index 8c44c20be93e..0d6468e54bb2 100644
--- a/dev-ml/dune/Manifest
+++ b/dev-ml/dune/Manifest
@@ -1,3 +1,5 @@
DIST dune-2.1.0.tar.gz 1170295 BLAKE2B 16ee2c34e0183bd255d23410f70001ca008b8e82815f93ad727079da00b8592d219e7664c93bed7b97b3a1e997306d60672b7d6c45fe6dae7371b4025df06722 SHA512 24afb44e458f819dfde3775b76c3ccf43f3fa5d8ce9a14ee9bf6658c1c116f95659c21a9ea208e5711c844fabc661cc434070bce6c9307154d506b6599ffb57f
+DIST dune-2.7.1.tar.gz 1290915 BLAKE2B 85a2dee92d1ead03b43b80742c291f4470dd9e1d843fdb257754c567e2329c101d11b42573da19de537f0d8591ebdacfcaab1099e0f46bdeebcd8421eb1bbcb2 SHA512 b77d0e207263107365e5a6e94423e8ab4ddbab1f920872d915e4014b7cc69915274b53fe946bb4b29dfe3de2bf5573ab3b2bffb4db8eb50b472e7dfb6cab88b7
EBUILD dune-2.1.0.ebuild 684 BLAKE2B 4b50322912687fb84f6636dddde7a61b89c4147a9a92c8bb03619adab13a23098473380076e84c2e1e5ed5c8f7c8250ee21c4ffc749433847216c272270a5756 SHA512 e9543ae6e8e26cea642dd709242076b6860ac584df7fdd005bc73fa441b551f566f64611008bad1d9875b2c09c5e941c71eb08df158d8e0a0359d8e7cb889b4c
-MISC metadata.xml 242 BLAKE2B cf769ef02b6c4a44259c41bd7d8a6ff26667ab728d194a15597388e9d7c651c0564b04e464dee09aea2a15e0086375444d2227171b6f7a0c5e62d85e7a27282c SHA512 8293ffa247118ebab6925fec47f3d66bfebde1d25b101c57458d11ffaead3a70cf1fe9f1ed6e028b6ff2c769047966fdd673aee0296fa8ccf91c02e005dfb41e
+EBUILD dune-2.7.1.ebuild 757 BLAKE2B 8ed26b2b82bbca95ec0410ffe888e83edcb8efe7e12d04939ee231293c11703cd7178e6016c1a5593b2036d842765752e1df8574474132facc7129531b80a414 SHA512 5c1ca1ef3971b5efbb5c58dc96427ec8cb6e08ab953342b36c31d15f1d599d0400b42fc3cc1b670758da6a9b10dd1dc6687b1068cd005e3b711c6f00357c05ec
+MISC metadata.xml 319 BLAKE2B 65741bb0181ac6f6fb28019dc60386a5d47a2071131d8496adb14af1eff40000b59b2410acdf8ffa14fd4ad1d0bd6efacc1c67f68c162ed10e847a00db457aaf SHA512 8178e2c48fdd360ab7860dde1666bd2d0d0223f51275c58005aaab2d14946d4bb1e1e6be55a74d98afd6ef0acac515e2ebd0f7f44adbc9d2d7efbfcde641bd65
diff --git a/dev-ml/dune/dune-2.7.1.ebuild b/dev-ml/dune/dune-2.7.1.ebuild
new file mode 100644
index 000000000000..c66681198140
--- /dev/null
+++ b/dev-ml/dune/dune-2.7.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multiprocessing
+
+DESCRIPTION="A composable build system for OCaml"
+HOMEPAGE="https://github.com/ocaml/dune"
+SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+DEPEND="dev-lang/ocaml"
+RDEPEND="${DEPEND}
+ !dev-ml/jbuilder"
+BDEPEND=""
+
+RESTRICT="test"
+
+src_configure() {
+ :
+}
+
+src_compile() {
+ ocaml bootstrap.ml || die
+ ./dune.exe build -p "${PN}" --profile dune-bootstrap -j $(makeopts_jobs) || die
+}
+
+src_install() {
+ default
+ mv "${D}"/usr/doc "${D}"/usr/share/doc/${PF}
+ mv "${D}"/usr/man "${D}"/usr/share/man
+}
diff --git a/dev-ml/dune/metadata.xml b/dev-ml/dune/metadata.xml
index 4e0f053007ed..6b935772818b 100644
--- a/dev-ml/dune/metadata.xml
+++ b/dev-ml/dune/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>gienah@gentoo.org</email>
+ <name>Mark Wright</name>
+ </maintainer>
<upstream>
<remote-id type="github">ocaml/dune</remote-id>
</upstream>
diff --git a/dev-ml/extlib/Manifest b/dev-ml/extlib/Manifest
index 566a57e76b9e..7591a676d56d 100644
--- a/dev-ml/extlib/Manifest
+++ b/dev-ml/extlib/Manifest
@@ -1,8 +1,11 @@
+AUX extlib-1.7.7-no-git.patch 283 BLAKE2B 2cfc23016472905c9dfb28615bce04d607a70b99da69f1ed198c8cfdd677c1dd3d8b8a6756328bf35dbd59f81c7be143a5f5864110adca56cbc2dce8384d597d SHA512 b0b04d0fb6af94d7f54751fd00ab48101fb45d47e2230358edc956fd4d6fe04ce59b8aa6857fc1b07bb544fdade01eca6213de064c7d54b59f02e8265aebfb05
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
DIST extlib-1.7.6.tar.gz 88068 BLAKE2B 32376c09728ec7e7d762888ad706641b94bcc976f2e1f42f246ba79fe862b60df7ff924e1e22e89333d8f2e1d999deb71eee481c3c5919aa5d1e02731f64f323 SHA512 3065e2474fb0e480ed076aa1156584a4a6c839cd5d9e59f341e41113abb1736241354aa7ee7cb492967698bc392969522fd5bf30d1ad7f94754c4e10f376afa8
+DIST extlib-1.7.7.tar.gz 88870 BLAKE2B fff84524ef227718d3908c5b65f4b781360cebc0dca3a8862aa11ea671499b45192c5106769e104d396118e3cdcd904ddce06df784f8fd0eadb7a2372ca3df94 SHA512 088a6c5bbe6530cd60e2276dc02592b69ad7ad685b752f0544c54b6246b8131238c6423ce7bfc81fe3ad1766f605ecf52fd3888d55cca63e22c947afedf610c5
EBUILD extlib-1.7.1.ebuild 887 BLAKE2B b557faaae9bcde92b59e99bc5a38d864131c23ab11f76b4351d12efb6a4c6c982047205ed093dc4dc764279318acfe2c85af89dda7000c93b61bb34eef21f879 SHA512 fcdc98d7e67b566ccf1c37c87eb8f155bf07295ef2c446012919765b8838bc933e5aae030b7f8d820fb7422dddf1c61901ff1cb71655a4fc81d2c76761580e45
EBUILD extlib-1.7.2.ebuild 836 BLAKE2B c28451604b7317f492deebaf48a52198eb80f1d2602fcbe3803371b419fa6e593710dafaf7a863ff642117941ea6c853d2a98a552eefbb0b9260ad0d91876753 SHA512 2886cdd93555e6bf52bc2bca917d420da8cf0e04dfbe52aacdd87080d3d1e72d16f0d822bcfeb36d89f7a2405fc5006962d1a67085b09d30b4a0012ddab4b4c3
EBUILD extlib-1.7.6.ebuild 844 BLAKE2B 1aac975321754c837889f58a9899ad546ed04790bfe697aad4e65058a85d6c47ed997f5f72fc4e13064635bc4acf4e4a6ad07fce00e32080b4e6176b7080fe31 SHA512 57c1ac05e1456012a35518ad52709e806052e4cd06b22c150852cd8fb7113b1a1504c9fd18add5f1cd366966b040bf298d7ae75ffa74eb3ea2494342cb3f5887
-MISC metadata.xml 307 BLAKE2B dff1518edb8ae0815b4d3e72f1d577777025cd137106f5306162ef360e6eca62e264c96ce45a33839e3d44c7a560dd28c6b0b0e48ff22599ce1820a6d4dffd70 SHA512 55cc867ee131089f2f781119f1f9cccd0999f3e86ffb84b694db20a885a26ec1ee85861768ac616c4b7668d74fe667aa1bad855004bbe5951a1fc8c9cb3943ab
+EBUILD extlib-1.7.7.ebuild 977 BLAKE2B 76b981e3a62136a75ba6766dd451eb9d0455f1c4d2b589d19ff390581ef631112f65b3b100b06e8cdc5197091a1f785ea4da75f79f7635c8b2dc709f336d4700 SHA512 49481d39ddb6392173c13a21e32a8b28b0c5ae8e38419cd661d51930e98f1bc4834ce3d6bae29bf33f4fbc3f13bf102d1e15f9d90cf37b92b2bac32ff7103776
+MISC metadata.xml 384 BLAKE2B 5cf5e456304e88b37a2a9635fecaa5536bb2bd58eda884676f93545969a3361eee4a0c94750352eef6fc7c63117391f58fb4a8bb9eec18ea8eb3dfb3c2f017de SHA512 88ad9b420b173c120be33305275c08becbce8c8490421cafffc1ba64131b27ebd88cfb8b1951d2e780c9eb93b45c38f9de83f2a134812edc38103e28f05f5f05
diff --git a/dev-ml/extlib/extlib-1.7.7.ebuild b/dev-ml/extlib/extlib-1.7.7.ebuild
new file mode 100644
index 000000000000..d7b78f03ebe2
--- /dev/null
+++ b/dev-ml/extlib/extlib-1.7.7.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit findlib vcs-clean
+
+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"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="doc +ocamlopt"
+
+# See bug #704146
+BDEPEND=">=dev-ml/cppo-1.6.6"
+RDEPEND="dev-lang/ocaml:=[ocamlopt?]"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.7.7-no-git.patch
+)
+
+S="${WORKDIR}/ocaml-${P}"
+
+src_prepare() {
+ default
+ egit_clean
+}
+
+src_compile() {
+ cd src || die
+ 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
+ dodoc -r src/doc/
+ fi
+}
diff --git a/dev-ml/extlib/files/extlib-1.7.7-no-git.patch b/dev-ml/extlib/files/extlib-1.7.7-no-git.patch
new file mode 100644
index 000000000000..058543455bce
--- /dev/null
+++ b/dev-ml/extlib/files/extlib-1.7.7-no-git.patch
@@ -0,0 +1,9 @@
+--- ocaml-extlib-1.7.7-orig/Makefile 2020-04-25 07:55:13.000000000 +1000
++++ ocaml-extlib-1.7.7/Makefile 2020-09-26 07:17:42.141178856 +1000
+@@ -1,5 +1,5 @@
+
+-VERSION:=$(shell git --git-dir=.git describe --always --long)
++VERSION:=1.7.7-0-gbd9f453
+ RELEASE:=1.7.7
+
+ ifndef VERSION
diff --git a/dev-ml/extlib/metadata.xml b/dev-ml/extlib/metadata.xml
index 1b2e3a5aafb0..f36445f85327 100644
--- a/dev-ml/extlib/metadata.xml
+++ b/dev-ml/extlib/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>gienah@gentoo.org</email>
+ <name>Mark Wright</name>
+ </maintainer>
<upstream>
<remote-id type="google-code">ocaml-extlib</remote-id>
<remote-id type="github">ygrek/ocaml-extlib</remote-id>
diff --git a/dev-ml/facile/Manifest b/dev-ml/facile/Manifest
index a600f68ebbf6..207c3fbc4b59 100644
--- a/dev-ml/facile/Manifest
+++ b/dev-ml/facile/Manifest
@@ -1,4 +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 1380 BLAKE2B 33e99c9b8f21810db2e0fa034d27fef3dbcf55a6bb23d6c9bc6e77e48ffad04aba4f28e902b96ba41cc39c0cb12d4b6e6873f2b6326461b5753d9d1fceccec94 SHA512 dc79d2ed0e115512dff6d31724438f86c44d47278655314f79821c2a6c9b910f87857242344239403b713950a67d2b6b1ea69d8338d2be67dcd893deabb74fd6
+EBUILD facile-1.1.3.ebuild 1373 BLAKE2B 8cdbe01b4b27c07845e09bbeca4c54c10a5a68114ad4374794660493f27ed4d720860057e39e9552c4f868c2826ab80e1f6d1fddaf9d709d7167e1dadbb2c0ab SHA512 8b237e727640c263d61682428aefca1b65199ea5b9fc1257dae263948a8d38fc67d71fac2c04bc81fe04855ae87c50dabccc8b63813c643db6fda813dea2e18f
MISC metadata.xml 250 BLAKE2B e32e25cd925d2f9f725dd425ca1730abb222f72111492ce8236afbb1175b96598c6d7c4bb50b85c881f194dcc90c53e2d728aef8f469b3b2de9d50bd40fa2413 SHA512 5bac93ad70caeae856a1f45913ee9817f8c50a0714711c62d34d471128b0598da1117be37d63d8a7b11bd5be2b244e4a48dec9cbd4b8c792a94834c40247ff29
diff --git a/dev-ml/facile/facile-1.1.3.ebuild b/dev-ml/facile/facile-1.1.3.ebuild
index 9752526dbde3..06cb817ed4bc 100644
--- a/dev-ml/facile/facile-1.1.3.ebuild
+++ b/dev-ml/facile/facile-1.1.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://opti.recherche.enac.fr/facile/distrib/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm64 ~hppa ~ia64 ppc ppc64 x86"
IUSE="+ocamlopt"
RDEPEND=">=dev-lang/ocaml-4:=[ocamlopt?]"
diff --git a/dev-ml/fieldslib/Manifest b/dev-ml/fieldslib/Manifest
index 9f4fe831b13c..14c6eee46170 100644
--- a/dev-ml/fieldslib/Manifest
+++ b/dev-ml/fieldslib/Manifest
@@ -1,3 +1,5 @@
+DIST fieldslib-0.14.0.tar.gz 3677 BLAKE2B 076fe0c83547a5276e6ab304409c1a636132738f8a95c4d9a4260e95f6a3c247341c3901e2cde4f63f1f4db417e3749d1e8cb128cf8c1711004e77f1d42472ef SHA512 245987817585222060c389a632fa229fa3c928090548a0b759e3b1eb06c868d06c0593b01bc41f453c209854a15115fa7650cc36888036f9e305cf2b79a5004c
DIST fieldslib-0.9.0.tar.gz 5981 BLAKE2B 471e468bf731dfe2f8a237ba35df22dc3cfb5ee2e02c881dc0a82be577844a40607adbf807b9aadf3a120708687048e6219635b81216c92edc41c874118c8b63 SHA512 ac0ecbbb43f1d815462264ef5dd33b568aa8b479847789f0ac7eb5da5986849da6ca1c27db1c0643e64e83c625e98eb7abebb5e3045a95c4b7bf7384ea953720
+EBUILD fieldslib-0.14.0.ebuild 478 BLAKE2B fbd93962d7b955dc78408a4bdae976d27f585a039c78cf292c5d3e130d0176e4136c0b26eb3c15230b50a6d694aac6ce08ad5905c2e6cc6eb43a29737624be02 SHA512 4438804dec746364ee745a4f12800bdf6cd23e3ae216489065f4ad9faf97b412a5fbb802b458876e5cf0748d54555f0cd3bea2404c52b1f607fd3904e99a9637
EBUILD fieldslib-0.9.0.ebuild 669 BLAKE2B 7a90dc54279ebd1065bb98b777104bdf2e3b870401ed7e8e9c711f7a1b6ee397f9ffc07f3fafe2544a0d01ea45f5bef64473a6004168387e27741c98a796f707 SHA512 d5a185bd4ca81a455e6926b8cdce4566e36b4b1ba17229e5672e9b135ce491b854cfa15dc22a8cfa7410e019d986ffa4d7821fe691c8f4a2194071093101fac3
-MISC metadata.xml 576 BLAKE2B 66cfab447735c9d8db440435c34b965887abe01b91a154bce35f96b6ed2eb1e2346f01388d4ddd91f1baf5ebca32f6f3efce86423be1bcd554dee39de4a04f54 SHA512 92e9718c3149dc2d9edc1b55b2c9fb20a66b61e5a35e79eec2e10d78d7b21d3bba023bd31f22413e4dc33db2fec08687bab37ea32012aedda848061c6994aab9
+MISC metadata.xml 653 BLAKE2B b3702122c92b23968c528ef67bb667868e5ab691a9e143e3f8581dd636cddd2827c09c134d8533a29c6ad1b53ac56edfc154f90889ca0e68480a462954beb50c SHA512 d9c24b44732fabd5b59e2eb522cd3bcc50c60b798680b8fefafe8b942c64aacf0f3ff9cc629f2ed3033f7e3be9a4edb9627d387e8f1d4888abbd6b6f5b03f181
diff --git a/dev-ml/fieldslib/fieldslib-0.14.0.ebuild b/dev-ml/fieldslib/fieldslib-0.14.0.ebuild
new file mode 100644
index 000000000000..b78120764569
--- /dev/null
+++ b/dev-ml/fieldslib/fieldslib-0.14.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+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 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+RDEPEND="
+ >=dev-ml/base-0.14.0:=
+ dev-ml/findlib:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ml/fieldslib/metadata.xml b/dev-ml/fieldslib/metadata.xml
index 8406957e2af5..03041d90ca0d 100644
--- a/dev-ml/fieldslib/metadata.xml
+++ b/dev-ml/fieldslib/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>gienah@gentoo.org</email>
+ <name>Mark Wright</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,
diff --git a/dev-ml/findlib/Manifest b/dev-ml/findlib/Manifest
index be95e86aa9d6..0df8ca5f7f7f 100644
--- a/dev-ml/findlib/Manifest
+++ b/dev-ml/findlib/Manifest
@@ -1,12 +1,14 @@
AUX externalmeta4.patch 675 BLAKE2B 14c3b5c3a2cd0b0224849cce401752c32658a5d0426c36adb65cbf324ff10a96ce007975e2cba777e70e42b3d1c4bebdf3d2874f25bb8a7b1e67bf18c814bc4d SHA512 3aee50761934b6d6a418e6ed33f4ab3fba21df12379b41d86c3f8702fe467cbfe90b5bf25dafeee6c660eb7b4228c9a0dfb7296125a96cae2acfbf8786e4fb80
AUX externalmeta5.patch 562 BLAKE2B 0618a1691472c3248f63f157f2ba36d886a7b34b1813d2e2fca76c1546bd883d4992c0fd14938b8be1c6c72a5597d52b92e1b324a6e59db58667493685fb3b9c SHA512 2a1e14a3eca3f95ee29e1902324469ab11f117012db60d2f34e0ab7818a44abaebd023562a6f521db7451691219461c453ba5f3fcf424e2fe65e407a11741863
AUX externalmeta6.patch 546 BLAKE2B d0d5f75c46704b280ae4480ffe2ebca097adbc457c845615721888b45612da1a8e71b41bd6d8d9dadb16cdffa35108fc87a3dfd32313fa96d92f0021817e0112 SHA512 c112b7d44101e483d408c56dcd0d2524208b6e95b65a09dfe01f8ad6d09a20617020f9174cb4631473bab2550fec151329fb5e8d0e2e3378991f1ab88cce0301
+AUX externalmeta7.patch 527 BLAKE2B bf4a4aec02096766f9741705fbf99201c742abc992ddb05c143378d7bb6d0b79f3c3541199eb5a81142fa1b317980646c3fe12528f792cbfaa7762f024bd88d1 SHA512 61c1e03e5b0d021f2cd7d013bed54edd610edb48cf9f6c063d3542abea2d2fc811c1cf7284b54a584491064dee8dd4e72656ba90a63c144586f40705b8443a1d
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
DIST findlib-1.8.1.tar.gz 261544 BLAKE2B acfa9d4e0d118ebbc0dd7b03da1fe5eaa994e5fec13dc54e60ba42f643d93968469a1a43fe4f832433dca6c3902e8846616fcf460c748bf037fe16cb2f93a847 SHA512 0d8e1ff21217fcc6823aab3ac71282789691e4ae8c3607703d0393468247f93e2d084bd4e2a8795b523f2c7f193521d3aae4b8122c934ebf8b58c3185a5bc9c1
-EBUILD findlib-1.7.1.ebuild 1670 BLAKE2B d30d66c27d7b02378054d97678821a97c5db08548e7cf69772e2ef4a0a0db6a7a44f02277c25ca567bb8c3ffcea01e30bff845c6b5c8f6c189f53b0de7880748 SHA512 f15620a54877c0482d8a4737f4d4cf9ee04c0c04372781a45b13225b4e2ce585758439bb5e320a6ccb47258101f76878dceb556cd360789046e8a0560c7c0223
-EBUILD findlib-1.7.2.ebuild 1676 BLAKE2B 1f26f700fa8f120eb504d441f6abe0a3e42d70c09df8325f78b68721e2115140d834b1fbc51d105f39d372dc4d23a6164b735f6fb504e7ad438e4cbe57db1d64 SHA512 188b4b931a3ba8e6eb456bcf97ea5f521466f9650ae2567ad4e9104e1270ec62ec4e8b727d4dba5eb0cf19572cf04aba4740aabcbedd81d5afa29f80caa78692
-EBUILD findlib-1.7.3.ebuild 1689 BLAKE2B a78e7e68a97122107362c376017c106462c30dd6c8754702c0b24f22478dcb7ad75cc9da78b2832922402182d1037c085d37b1d401b8126735438faa5e3cdcd3 SHA512 0d107354f562ef62313afdda4f8eda424dcaaff565ae17b9e2b0b1dcee2a8a44761830c021160deb6f688fbb2d28aa8adeb287744eb89f34f3639d0a2d8ab548
-EBUILD findlib-1.8.1.ebuild 1688 BLAKE2B 42324ddabfcf8ddba5edcbdc5561a9094e71b792b995b2bdc371a6d3d9b647b4390fd973b83f3e331e9d3546cb8c05a8b2bbd65adaa732920c5b8687d61f6460 SHA512 cce3570787eb02d29190c2b900391c4166b9123838bddc4e054f13cf26fe604b68287b58a569984ce4aba184d221b2b8660e498d91c51fa66d4d8bd644e9a3a9
-MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
+EBUILD findlib-1.7.1.ebuild 1664 BLAKE2B 1af93d91835630f39c86177dfad22f82ec8f9e64ef259a27b325fb5867aecdb1ba413970d004d2e110be24ab26cccdea83e188a68d3826e721bbc69f5d49cf31 SHA512 539b7b1ec074f1c74be90a02c9f98af06129c2703249ef295dbb1210c24c10bf8b2928f7658aefd60d625e9beb68a6003e545444a826acb26f7e685605453e19
+EBUILD findlib-1.7.2.ebuild 1669 BLAKE2B f81ce1f06e38ea45989f44411a33bc5fbaed3cc0c7874750b9609d8843af38e1ab59c00a9a51903e71d09ad8ce1fb575a11d959292eede547dc7edb392ef8429 SHA512 40ad1ccd4d6073356d2bd7b98420db133e0d762679d6250774eed21eed46a37b058ff6d47224fe7a7aa60d919ae2eabc6a177a56c7a6311f1d7f1c9ed55b6358
+EBUILD findlib-1.7.3.ebuild 1682 BLAKE2B ee700751e5f7c66cd8b4e72e430d9b12dea14925cc7d5b2037cc676f8e1375e99ba27e63f5927477c3e57654227aeb5bcc75ea2308f4da4521cf8df5493d1e0b SHA512 ab52c2255948d5864d2eb27c6274b1816bc8b31a98a13c68fdf9e804d029e0a309e57d542e68ccc7dba63de7a9f070a1736d87544f4a8d534e2e9f0a344a7c38
+EBUILD findlib-1.8.1-r1.ebuild 1672 BLAKE2B 13c847cab7bbb9b4d3fb748e4d1150ed6c4e28337e4234a155b411fa10665c1ff741663089a6bb9369797e8b96bb554fbc82ceb55a57d5497eba5bf96c059351 SHA512 6a71a4b101c6787060cb9413e8a02f40fa62b0a0780fa91e64eb59badd03b3b3f1e043dd52482150e88409046a5d8da421f306d91f3d7fa64fa2e4087e994865
+EBUILD findlib-1.8.1.ebuild 1681 BLAKE2B 3e4cca14ddb76b0dc5dcc5f2d94ca4bf4b7e8cdd26696a5b104434195a2b73fb43bcf27338ac7444a4d80ce58cf868d3d309bf1fca59b54d4b30aa398e27a9d4 SHA512 f2de64a87a1f859c2840a849246934052baad12cce4708eb592d63df20915569a6f69c87b9936c3951b2c856d42e50ab3ade8f2182197deb9631be14150e0862
+MISC metadata.xml 244 BLAKE2B c82f45966666e095a27d4d8b14f01f93e202177ea8222c5fc806f4e243b8ca653a61232533a6dd10ed36a35f765dc94cfc651f9fade565b8eedfe1129b5c2d23 SHA512 756b8d091c29b6c4c621ba30588da62cf99e777243fbdd88cc668f3ec071353beea675c853f8c58752fbc6c01c795760cb10428d3a7fd087967a88b885d91149
diff --git a/dev-ml/findlib/files/externalmeta7.patch b/dev-ml/findlib/files/externalmeta7.patch
new file mode 100644
index 000000000000..8aa9fa566e59
--- /dev/null
+++ b/dev-ml/findlib/files/externalmeta7.patch
@@ -0,0 +1,13 @@
+Index: findlib-1.8.0/configure
+===================================================================
+--- findlib-1.8.0.orig/configure
++++ findlib-1.8.0/configure
+@@ -581,7 +581,7 @@ fi
+
+ # Generate the META files now.
+
+-l="$ldbm dynlink $lgraphics $lnum str threads unix stdlib bigarray ocamldoc $llabltk $lcamlp4 $lobuild $lcomplibs $lbytes $lspacetime"
++l="dynlink 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
index c12ada7153a3..3dc2daf05896 100644
--- a/dev-ml/findlib/findlib-1.7.1.ebuild
+++ b/dev-ml/findlib/findlib-1.7.1.ebuild
@@ -13,7 +13,7 @@ IUSE="doc +ocamlopt tk"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
# it does not compile with ocaml-4.09 (bug #708696)
DEPEND="<dev-lang/ocaml-4.09:=[ocamlopt?]
diff --git a/dev-ml/findlib/findlib-1.7.2.ebuild b/dev-ml/findlib/findlib-1.7.2.ebuild
index 895452b724a4..de59d46e91ac 100644
--- a/dev-ml/findlib/findlib-1.7.2.ebuild
+++ b/dev-ml/findlib/findlib-1.7.2.ebuild
@@ -13,7 +13,7 @@ IUSE="doc +ocamlopt tk"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
# it does not compile with ocaml-4.09 (bug #708696)
DEPEND="<dev-lang/ocaml-4.09:=[ocamlopt?]
diff --git a/dev-ml/findlib/findlib-1.7.3.ebuild b/dev-ml/findlib/findlib-1.7.3.ebuild
index 691a2c9519aa..d77ea4b9afe4 100644
--- a/dev-ml/findlib/findlib-1.7.3.ebuild
+++ b/dev-ml/findlib/findlib-1.7.3.ebuild
@@ -13,7 +13,7 @@ IUSE="doc +ocamlopt tk"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
# it does not compile with ocaml-4.09 (bug #708696)
DEPEND="<dev-lang/ocaml-4.09:=[ocamlopt?]
diff --git a/dev-ml/findlib/findlib-1.8.1-r1.ebuild b/dev-ml/findlib/findlib-1.8.1-r1.ebuild
new file mode 100644
index 000000000000..1799cc090907
--- /dev/null
+++ b/dev-ml/findlib/findlib-1.8.1-r1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib
+
+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 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+DEPEND=">=dev-lang/ocaml-4.08.1-r1:=[ocamlopt?]
+ tk? ( dev-ml/labltk:= )"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/externalmeta7.patch )
+
+src_prepare() {
+ default
+ 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}}"
+
+ if use doc; then
+ cd "${S}/doc" || die
+ dodoc QUICKSTART README DOCINFO
+ docinto html
+ dodoc -r ref-html guide-html
+ fi
+}
+
+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.8.1.ebuild b/dev-ml/findlib/findlib-1.8.1.ebuild
index 50ebe38db17e..b2c69240deb4 100644
--- a/dev-ml/findlib/findlib-1.8.1.ebuild
+++ b/dev-ml/findlib/findlib-1.8.1.ebuild
@@ -13,7 +13,7 @@ IUSE="doc +ocamlopt tk"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
DEPEND=">=dev-lang/ocaml-4.02.3-r1:=[ocamlopt?]
tk? ( dev-ml/labltk:= )"
diff --git a/dev-ml/findlib/metadata.xml b/dev-ml/findlib/metadata.xml
index 7a38bb900964..a4f6be63adba 100644
--- a/dev-ml/findlib/metadata.xml
+++ b/dev-ml/findlib/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>gienah@gentoo.org</email>
+ <name>Mark Wright</name>
+ </maintainer>
</pkgmetadata>
diff --git a/dev-ml/integers/Manifest b/dev-ml/integers/Manifest
index 161d6f9e100c..3c984e0f5f33 100644
--- a/dev-ml/integers/Manifest
+++ b/dev-ml/integers/Manifest
@@ -1,3 +1,5 @@
DIST integers-0.2.2.tbz 9155 BLAKE2B 7dcbf0a10cdd2f65683c590dcc18ab7a67540eb39b78500506b303afaf881d6322ac8014dff9a772d7b43cb9b4765dbf85cdb2d31a3a5a78cf5a8e674f18dfea SHA512 957ec87f385916a847eeccef1142d706cf2bf9024a4f0b97120f73a2eda4c049261078bc27227db14bfed53bf014da14a93ef75b515a851af72088bd8b04081a
+DIST integers-0.4.0.tar.gz 9980 BLAKE2B ee67c39024d77f4ce20e9ba7e1564b3418397f1e98b9a5f30e238f5c161d7572701e3d824871b46d15b90887d5f3983a9ab440f46e22c4de8cbc68912daea5eb SHA512 73af64654579b27db18c612229044dba094064dc7d36a73f42ffd4ba7040ed326f859f588e7a764bce3b2fd6e9365f9e9f99330ef29bafbe77ca6dcb53d5ed79
EBUILD integers-0.2.2.ebuild 724 BLAKE2B b8a46e4a19a2ba854cbdfad4844e44d18da832d3ebfffa61599f37168125643c7f9973026f70317106ce58f0032b696f8509f5420cf0cd8fcccb689a269156a1 SHA512 e70e8cb10db7e476ed2590025f8b7ae23657199dce1c2bdf4ed2e8a2a8a0dd876ea10c3aa3882d59f9a426bc24db02268c1f58f53d7d4c1cc6c1f2622bceca59
-MISC metadata.xml 256 BLAKE2B 5ea6767fb9bb104b8ef8f0d40f43e5d1d396e3643cd5b84fa116e1c8cf4dea71b5da0d80b91f26d9422b90c35c185a58110ab8953fc18c36d5404b8147b524fd SHA512 a3a5cb7ed0c92e090c03ad51eae178901aa9ac50ce3987cb23b3629fe88f5505ad283d0ab41015cd1c460824a44bf5ed30be6a2721e8e65d7293e8c44ce2b9cd
+EBUILD integers-0.4.0.ebuild 478 BLAKE2B 06dba7fd1fee624f292c63b3d119119a3acc89337cd6d87a99187a2e6bd23622d41c5d7ad0e29b89acc7fdedb8b9913c2dc94f126c1f604c93c1423510a834f7 SHA512 da113b2be8dbf9feffae925599675cc933339197b91eb4106bfddc5ef7893f9692d3b21d7020a447abde5ad4519230e62dc6e6d07c84b6c272812bc91c7e1e75
+MISC metadata.xml 333 BLAKE2B 47fde1e3ad5ef5a0645e960c712e37f7bc4c5083b26932697e02c29cd1797c2fa986b98a51571a98e4f66d8559a252e5f03f43a2ecc95caf02df24d1fc74e80f SHA512 47a5112e4bbd899580c7e40fc0af2fa20fdf836f211452d15c2c5a70b3fb126689d0e1c51093ca3a472621c38e32cb15c02da9bbdc25aae48c78317a0ccf11f5
diff --git a/dev-ml/integers/integers-0.4.0.ebuild b/dev-ml/integers/integers-0.4.0.ebuild
new file mode 100644
index 000000000000..08af4e0f7e86
--- /dev/null
+++ b/dev-ml/integers/integers-0.4.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Various signed and unsigned integer types for OCaml"
+HOMEPAGE="https://github.com/ocamllabs/ocaml-integers"
+SRC_URI="https://github.com/ocamllabs/ocaml-integers/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+ocamlopt"
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+S="${WORKDIR}/ocaml-${P}"
diff --git a/dev-ml/integers/metadata.xml b/dev-ml/integers/metadata.xml
index db1b1361de5b..7c1e38b98cec 100644
--- a/dev-ml/integers/metadata.xml
+++ b/dev-ml/integers/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>gienah@gentoo.org</email>
+ <name>Mark Wright</name>
+ </maintainer>
<upstream>
<remote-id type="github">ocamllabs/ocaml-integers</remote-id>
</upstream>
diff --git a/dev-ml/jane-street-headers/Manifest b/dev-ml/jane-street-headers/Manifest
index 71610a8049a8..db0b9ae9523f 100644
--- a/dev-ml/jane-street-headers/Manifest
+++ b/dev-ml/jane-street-headers/Manifest
@@ -1,3 +1,5 @@
+DIST jane-street-headers-0.14.0.tar.gz 4662 BLAKE2B 22a48e9c254005d28c03399dd9d9347b45b7e3def9c0efdd768162f80ff611be6249d629cd78fd8768c7e6ec5610684e9459b149f3de85da307b2f1e8525296d SHA512 9c80acc57016f98cd88455866523f2463a13d2b7e10cf0d63f5198747615321799a8b3442432b321fa4f33a051f404464e27972317d197ac9513651600673879
DIST jane-street-headers-0.9.0.tar.gz 6713 BLAKE2B fa8461922ad5e9c28fecb29bfb630d6b1578c8440ad82ab841da17c32ebdfef8ecac90ca66721aef06321a085e2b927904ced4c5a1c8ee6b3cc969dfcbf761bd SHA512 dbd1198b7eb45f06f7df6e9c5b66589b6004e9424f2ecdd50d20c3dc2f35048c42f9220f1d03b4b6564e7a79d00dbe3b3c9c767600e78d066266093b8d93ad46
+EBUILD jane-street-headers-0.14.0.ebuild 442 BLAKE2B 98e3150e01ed269a0a313ff1425149d0a214e35aab32415d36ce68abca3c7fa956b0a2528933e205b133f02192edcd578dd0b0d0a2e6caa805c47e68a5a8791f SHA512 0992867dab0b0b7dea25a9125fd4fc8a55684276c8bc132d0b10dd7a67156fbc2a0e05d9079d040e3903228a7a4416989b8b4772e1f3a9a38cb763165b697430
EBUILD jane-street-headers-0.9.0.ebuild 626 BLAKE2B 53aa369402df9d8377cdc0aa23f7b02e35f6f8abce6d603d2188d12ced722549c50b2fa41fae3173275154dfabbcb9ffe87eb3ef883fdaeffc46dedbe4cd22b5 SHA512 3194fe61bb91c720740fa9562dfde9d08bdd821df9aa8880de8ebe339febd69aa45b08c9d11b34bafc22b47360fbb4f89d0f6a36ee063162dcd3629d3f031b17
-MISC metadata.xml 262 BLAKE2B 3290a0ab8cc05ecdabbf9f36a6065b47469eb957c6c8210c54e297bec54e8272a2eddf0e651379d3aa16d6bb18286dc548b76666a9069a84fb019d85dd19d06a SHA512 7cb59336be614fe27ebd10436fd25012c9437bf3dcbe6f09ecc73ba08c740bcdec0d940b786407bfe05899166ce2d3d3729d2c59662c508c371d5771c92cee57
+MISC metadata.xml 339 BLAKE2B 85c148f7fb2c8d7e08845f11faf317cd19f45d63b88d9093d6d1d51f5c876466bd425f275ccb43ab75674d9808f3b2704833697047aa15eec15006b7187010b6 SHA512 2f111efb4204b28b0b80db6d34788fbdaec96fad172488c4aabfde7bb6b29e4920fd13b1d50a04dbc8c15e440b4979f594e3b4715cb54ea76cb0c17cbaee7b5e
diff --git a/dev-ml/jane-street-headers/jane-street-headers-0.14.0.ebuild b/dev-ml/jane-street-headers/jane-street-headers-0.14.0.ebuild
new file mode 100644
index 000000000000..6259e00f7a78
--- /dev/null
+++ b/dev-ml/jane-street-headers/jane-street-headers-0.14.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+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 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
diff --git a/dev-ml/jane-street-headers/metadata.xml b/dev-ml/jane-street-headers/metadata.xml
index f2e7a5ae0bc8..c938bbaf6059 100644
--- a/dev-ml/jane-street-headers/metadata.xml
+++ b/dev-ml/jane-street-headers/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>gienah@gentoo.org</email>
+ <name>Mark Wright</name>
+ </maintainer>
<upstream>
<remote-id type="github">janestreet/jane-street-headers</remote-id>
</upstream>
diff --git a/dev-ml/jst-config/Manifest b/dev-ml/jst-config/Manifest
new file mode 100644
index 000000000000..c7d0e928f485
--- /dev/null
+++ b/dev-ml/jst-config/Manifest
@@ -0,0 +1,3 @@
+DIST jst-config-0.14.0.tar.gz 4916 BLAKE2B e052cf9aad6e7bef737cd39643663b4577cffe9b9a8e116a8f23ce8d92ebb172d8c66eb20976c319593c217d95de253b4b7f86c05616bf665061896989f0908c SHA512 9d76f3394490762aaef36a3fd3ced4769da05e5a62176bb215379f18a29eab5089e65f599a3a3621937a5a79fcbda22cecf189e8e290acffef5b565e1b4d3b58
+EBUILD jst-config-0.14.0.ebuild 535 BLAKE2B 4a515739fb2a5a626b8a80df1605c12907ddd39251d05a40e607e17fe8c7e273c815bcc0f96c75ea7b0fee673be6f0f64db9baf2eff3be63fc7465bc050e00de SHA512 cbec877a794af1d7630fe6e2303d7228e79d128ad3d5ee040bfadce0791e11c8ac7fea952ef8104ca2c2a49aea18592b1c4a029ff0dcc93e527b83e984556d99
+MISC metadata.xml 330 BLAKE2B 15602b7cb5a56cfcedef0915d59ccacb98ede36037a7ce187ffacec4f3f5255643bfc9c5965ea40179a33df097b7db22219c33117c8ac34c408847e1ce00060e SHA512 01dc5993650b041bbf4ce5214b3033af924d7b0404a96b96a7b51599738092cba12bb9064eb4508236d525692a3bce1e5a1d51942fa52f2521200c8ab3567d27
diff --git a/dev-ml/jst-config/jst-config-0.14.0.ebuild b/dev-ml/jst-config/jst-config-0.14.0.ebuild
new file mode 100644
index 000000000000..ce63c01bf263
--- /dev/null
+++ b/dev-ml/jst-config/jst-config-0.14.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Compile-time configuration for Jane Street libraries"
+HOMEPAGE="https://github.com/janestreet/jst-config"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+DEPEND="
+ dev-ml/base:=
+ dev-ml/ppx_assert:=
+ dev-ml/stdio:=
+ dev-ml/dune-configurator:=
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-ml/jst-config/metadata.xml b/dev-ml/jst-config/metadata.xml
new file mode 100644
index 000000000000..dfb62d54d092
--- /dev/null
+++ b/dev-ml/jst-config/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>gienah@gentoo.org</email>
+ <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">janestreet/jst-config</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/lablgl/Manifest b/dev-ml/lablgl/Manifest
index 9539cb91007d..2af8a821e0d4 100644
--- a/dev-ml/lablgl/Manifest
+++ b/dev-ml/lablgl/Manifest
@@ -1,3 +1,6 @@
+AUX lablgl-1.06-makefile.patch 374 BLAKE2B 0aa21f1f7da48db3ec8819511e7c11be6af72522305c1b4ca23992488250ecb566efc726a7bceb8d2c7efbceda05beb11dab316d9704f6fd9cf6b23b3d816dd5 SHA512 2c0a2681efd830e8ad2edbf9880a9740b12af5680b82316cb297928ab4ad97c50f5c51a7e641729fd5b2b8481282d351016011fe5f7518c1aa892844972ad16e
DIST lablgl-1.05.tar.gz 296597 BLAKE2B 01fff39607f0b4e965737c6fec53cbd3b154bb2df3528fd37626ac87c6cb46a29f97881a242206310b1bd576fb9dfc72ede1eb24cf287ddfc55194b8d55eb83d SHA512 e8bf7d993610912d50ec3a6c18a24d2ff7d0727a41fe102e745050bb83ee02a9995e8b1b8c7dbd94f6b2a8363145f22e9772e36253dced762a63ec3c6c54379d
-EBUILD lablgl-1.05-r1.ebuild 2055 BLAKE2B 5b4b614a17bfb48151e284543d4ac3ef9161a6f8a02de20e9ee39fc9b3641e3192d4f273f69e9f474db391d74ad47018970eec1c64d495e26ecafd2ecde2c602 SHA512 3e3d6770eaf4f6de39439ea5395d2f8920c35e5c32bd37505ba753466a80f1645d6c51be8dde9a4c650ed37e609259259eaeebacacf27c5214064de153882b65
+DIST lablgl-1.06.tar.gz 567281 BLAKE2B 90e42d3f131b2a416b5a1fb9933fbf1178911aabfd571274e987c8e7da12a3c57673268b5e0300950f3b03ddb363626ad93fe3e647e5e7058ee48c0b130fcbfc SHA512 169ac4ed8eaf3635c107c57cd03a76a64fc16a8d3ba1ad261b7e4dcda985c0a83059421e72233f645aec21a1ec27b980530b4ffb7013fba31d446b16521b3f4c
+EBUILD lablgl-1.05-r1.ebuild 2076 BLAKE2B 278a2ebeca0bd44208c56db32455996a1e7dca46b14ab5e63f61cefe84446524de6bbbe9cc24964db95f2937d7039a8866a6fa19d69dcbe6807f60002bbea100 SHA512 1698c97247f6b90709c0fa4fcf0a62a4f0b455a4a68a60e73414aef3b1284d2ea5a3c61f3ff3b3a20f908769b11b425622a82d92a52f983b8c50b2bd7b2addcb
+EBUILD lablgl-1.06-r1.ebuild 2114 BLAKE2B 385efc79cfc5f019893cce1d722a3e6a5f5a4d4e94ce8435ac3578f32e9160426026be1698ef05008f985c85d67c35b1267bd31d5a49b824efa5968edd9ff684 SHA512 f3dd25a494a4c5690a02fcfeb0c52c7c202b69bed6df33888a6908cd27b8e04b2a8b15062acc0ec41786b9b315062eb68d6b815b4d488f2e40ccfbea11981ec1
MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
diff --git a/dev-ml/lablgl/files/lablgl-1.06-makefile.patch b/dev-ml/lablgl/files/lablgl-1.06-makefile.patch
new file mode 100644
index 000000000000..36a1051a27bb
--- /dev/null
+++ b/dev-ml/lablgl/files/lablgl-1.06-makefile.patch
@@ -0,0 +1,12 @@
+Make sure install dir exists before copying file to it.
+
+--- lablgl-1.06/LablGlut/src/Makefile
++++ lablgl-1.06/LablGlut/src/Makefile
+@@ -68,6 +68,7 @@
+ cd "$(INSTALLDIR)" && $(RANLIB) liblablglut$(XA)
+ @if test -f dlllablglut$(XS); then $(MAKE) installdll; \
+ else $(MAKE) installtop; fi
++ mkdir -p "$(BINDIR)"
+ cp lablglut$(XB) "$(BINDIR)"
+
+ real-install: preinstall
diff --git a/dev-ml/lablgl/lablgl-1.05-r1.ebuild b/dev-ml/lablgl/lablgl-1.05-r1.ebuild
index f2de956777af..d99d7d1f7933 100644
--- a/dev-ml/lablgl/lablgl-1.05-r1.ebuild
+++ b/dev-ml/lablgl/lablgl-1.05-r1.ebuild
@@ -5,12 +5,15 @@ 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"
+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 x86 ~amd64-linux ~x86-linux"
+IUSE="doc glut +ocamlopt tk"
+
RDEPEND="
>=dev-lang/ocaml-3.10.2:=[ocamlopt?]
x11-libs/libXext
@@ -26,26 +29,21 @@ RDEPEND="
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 ~amd64-linux ~x86-linux"
-
src_configure() {
# make configuration file
- echo "BINDIR=/usr/bin" > Makefile.config
- echo "GLLIBS = -lGL -lGLU" >> Makefile.config
+ echo "BINDIR=/usr/bin" > Makefile.config || die
+ echo "GLLIBS = -lGL -lGLU" >> Makefile.config || die
if use glut; then
- echo "GLUTLIBS = -lglut" >> Makefile.config
+ echo "GLUTLIBS = -lglut" >> Makefile.config || die
else
- echo "GLUTLIBS = " >> Makefile.config
+ echo "GLUTLIBS = " >> Makefile.config || die
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
+ echo "XLIBS = -lXext -lXmu -lX11" >> Makefile.config || die
+ echo "RANLIB = $(tc-getRANLIB)" >> Makefile.config || die
+ echo 'COPTS = -c -O $(CFLAGS)' >> Makefile.config || die
+ echo 'INCLUDES = $(TKINCLUDES) $(GLINCLUDES) $(XINCLUDES)' >> Makefile.config || die
}
src_compile() {
@@ -77,18 +75,17 @@ src_install() {
# Same for lablglut's toplevel
dodir /usr/bin
- BINDIR=${ED}/usr/bin
- BASE=${ED}/usr/$(get_libdir)/ocaml
+ 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
+ dodoc -r Togl/examples.togl
mv LablGlut/examples{,.glut}
- doins -r LablGlut/examples.glut
+ dodoc -r LablGlut/examples.glut
fi
}
diff --git a/dev-ml/lablgl/lablgl-1.06-r1.ebuild b/dev-ml/lablgl/lablgl-1.06-r1.ebuild
new file mode 100644
index 000000000000..427234ccf7b8
--- /dev/null
+++ b/dev-ml/lablgl/lablgl-1.06-r1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Objective CAML interface for OpenGL"
+HOMEPAGE="https://github.com/garrigue/lablgl"
+SRC_URI="https://github.com/garrigue/lablgl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc glut +ocamlopt tk"
+
+RDEPEND="
+ >=dev-lang/ocaml-3.10.2:=[ocamlopt?]
+ x11-libs/libXext
+ x11-libs/libXmu
+ x11-libs/libX11
+ virtual/opengl
+ virtual/glu
+ glut? ( media-libs/freeglut )
+ tk? (
+ >=dev-lang/tcl-8.3:0=
+ >=dev-lang/tk-8.3:0=
+ dev-ml/labltk:=
+ )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
+
+src_configure() {
+ # make configuration file
+ echo "BINDIR=/usr/bin" > Makefile.config || die
+ echo "GLLIBS = -lGL -lGLU" >> Makefile.config || die
+ if use glut; then
+ echo "GLUTLIBS = -lglut" >> Makefile.config || die
+ else
+ echo "GLUTLIBS = " >> Makefile.config || die
+ fi
+ echo "XLIBS = -lXext -lXmu -lX11" >> Makefile.config || die
+ echo "RANLIB = $(tc-getRANLIB)" >> Makefile.config || die
+ echo 'COPTS = -c -O $(CFLAGS)' >> Makefile.config || die
+ echo 'INCLUDES = $(TKINCLUDES) $(GLINCLUDES) $(XINCLUDES)' >> Makefile.config || die
+}
+
+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
+ if use tk ; then
+ dodir /usr/bin
+ fi
+
+ 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
+ mv Togl/examples{,.togl} || die
+ dodoc -r Togl/examples.togl
+
+ mv LablGlut/examples{,.glut} || die
+ dodoc -r LablGlut/examples.glut
+ fi
+}
diff --git a/dev-ml/lablgtk-sourceview/Manifest b/dev-ml/lablgtk-sourceview/Manifest
new file mode 100644
index 000000000000..e13c4b390ac4
--- /dev/null
+++ b/dev-ml/lablgtk-sourceview/Manifest
@@ -0,0 +1,3 @@
+DIST lablgtk3-3.1.1.tbz 854720 BLAKE2B e6a916151fe1ca0746c14c2a66cd178f3b0c051976815a1d13daf801002f16bc76d9f4cb15625353f0cfbdc16b0a218857d72c4e57125050bbcffe67f7096ad0 SHA512 193c340d9941680869eb90bc89f5b27cc5bdf294f4635081a9ba56a99fa2982266c4ee2eb5fd04d3a3f6150082800de5df786def8c72a276a779d843d914e9e3
+EBUILD lablgtk-sourceview-3.1.1.ebuild 629 BLAKE2B d657d231acd61d13bba43ebdb668822af064bda7a703c21d8b0126f61842e9a6a0841b3a3868deb2d164b31e9768c73c1566ee8a1bf958ef627ac7efe33eae1c SHA512 0bedc3af016bec204d3740bdccb0301489582e006695bb6c2a95fc22de59ceb964d1c9af246b85bb6b22f939c29e44d597c533d30391d26c5949e3276e47c1c5
+MISC metadata.xml 319 BLAKE2B f3a6de363afedd8ecf6d5cd898b0ecc0c7da67070f8929f39f6e5395303505e9b2679cd32ba4445f155aa522bc09f5c6bdb09a3941f679c5eb1ff757040f0d40 SHA512 c251d0c83e251b9f20f83be5d67381c562400dc1567a4d3a32b396c309dc669b03f1d7e25e4d953c155d41aeaad07d47a67a2c602855cd45d5c9bb749dfa3b3f
diff --git a/dev-ml/lablgtk-sourceview/lablgtk-sourceview-3.1.1.ebuild b/dev-ml/lablgtk-sourceview/lablgtk-sourceview-3.1.1.ebuild
new file mode 100644
index 000000000000..38b9f1f9cd28
--- /dev/null
+++ b/dev-ml/lablgtk-sourceview/lablgtk-sourceview-3.1.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN=lablgtk3
+MY_P="${MY_PN}-${PV}"
+DUNE_PKG_NAME=${MY_PN}-sourceview3
+inherit dune
+
+DESCRIPTION="OCaml bindings to GTK-3"
+HOMEPAGE="https://github.com/garrigue/lablgtk"
+SRC_URI="https://github.com/garrigue/lablgtk/releases/download/${PV}/${MY_P}.tbz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="3/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+DEPEND="
+ x11-libs/gtksourceview:3.0=
+ >=dev-ml/lablgtk-${PV}:3=
+ dev-ml/cairo2:=
+"
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-ml/lablgtk-sourceview/metadata.xml b/dev-ml/lablgtk-sourceview/metadata.xml
new file mode 100644
index 000000000000..970e090f0dfd
--- /dev/null
+++ b/dev-ml/lablgtk-sourceview/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>gienah@gentoo.org</email>
+ <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">ocaml/opam</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/lablgtk/Manifest b/dev-ml/lablgtk/Manifest
index 5a624b7ede9d..9b55f0ad2c51 100644
--- a/dev-ml/lablgtk/Manifest
+++ b/dev-ml/lablgtk/Manifest
@@ -2,7 +2,9 @@ AUX lablgtk-2.18.10-cflags.patch 2852 BLAKE2B 9460dc7e50572f006eca3858b485d99b39
DIST lablgtk-2.18.10.tar.gz 1068504 BLAKE2B 8f82cd8b31c136420bfbbeaf78ec2d7913b7c5fc16abd485c508f8de3ab587173b0b5c798cdbe851254b48754929c1f0063cfc9e3c5e0663b7cdebc380ec0e8a SHA512 73705aaa80db433d11a28df5f6f5d10bd282e477e90916152a87e71865ccfcd7dfbdbe77350ecadf61ba2ccc7a188de1c68f1e6385e20c75f167969001e8418d
DIST lablgtk-2.18.5.tar.gz 808005 BLAKE2B 279fd9f018948438b616a12ab60fca3019330504a79d8b76c58fa0a99a7b36df9bf78f57f0e60c4eea6f0bad60f94c06b26490518ec25a5a72c342e4b7c42501 SHA512 7b6ba1a4dfa82cc3bbc502082ff4fccc23cc06ee4f30d01a2e423f3f99e945a4befe450d230b5aa19c5b810e9f46f2838655099d49da2db7c8a2e52eac213024
DIST lablgtk-2.18.8.tar.gz 855263 BLAKE2B 92aeadcfac666756e50ea573c7a2119cc13eab5c2f2e033fcdf92d5c33d597d64bf2e860ff181d958b4d8e9a3d4002b3eaabbd1da7580444fee91dafaba26289 SHA512 1510b8886dd55b82fbc96f333d84779f51a4794d13b0934569d13b1975ded9ec684855b9856f636fb302fd8ff2f118d0d5f3ffb2b8086d22cdad442e963868ae
-EBUILD lablgtk-2.18.10.ebuild 1987 BLAKE2B e633f4bc90e016f738916be9aa5350b34c79818f35b2e7c48a074aa5c5e8a624327b9e3a60d5c9d16f92c12e2c75766355de8fe47ca78574fbf9180c9755edc1 SHA512 ab12f273936da796d73f4c0349ea1c7b0eac8483f9ad384c24456840533d9d1e4adf08b70ba7edbfe2570f49c3cf91ac80a738d2eca1007ca6ede872ccb2c59a
-EBUILD lablgtk-2.18.5.ebuild 2327 BLAKE2B debd856df94beb8f43f803b38f3a07c9b30e2636152be3af9e39defb3a78551c08e748e2096c4014ee22046a7cb121650271caee10ed6db7119bb140b5db7300 SHA512 e2b0225484f28971d02c02dde960095a60a0ef2db2b25263ad678a3f7a33473bdeafd96e100d671a11da5fe331d0c69f092fc23d64ffcf07e0d1d2ddfe60b268
-EBUILD lablgtk-2.18.8-r1.ebuild 1717 BLAKE2B 0f951f152a005cbe10ba78e829215087f3d32f27fcddba88af0ab943f23e30d053f3fbd364900f689aacce7896800a31731c87489109b6612b1eacb8fe802036 SHA512 db05d897d25054b497a16a531e7d13fb19de2e5f74aa3faf162cfc2d960e61b106511bec89a332586cc96633a1a92820bf9c03da91edbe0b7073424335177c32
-MISC metadata.xml 463 BLAKE2B 79b09024eeae81c18bf584e6341773512c569e348cea23294fd1354bbc6f5ac4da24ffa2a00cf89c44fe7b3af4b8214d6c53f2b36e7c2aca0fedbe2a7d944c97 SHA512 c4dc8d0ea137fa1d8694702fec3dc42eec83967f061c72097b77032ccfe8e6f47450d7a7486647acdf0387ac3d2cf8c028b772d71943d402bec5a7bd976a0ce1
+DIST lablgtk3-3.1.1.tbz 854720 BLAKE2B e6a916151fe1ca0746c14c2a66cd178f3b0c051976815a1d13daf801002f16bc76d9f4cb15625353f0cfbdc16b0a218857d72c4e57125050bbcffe67f7096ad0 SHA512 193c340d9941680869eb90bc89f5b27cc5bdf294f4635081a9ba56a99fa2982266c4ee2eb5fd04d3a3f6150082800de5df786def8c72a276a779d843d914e9e3
+EBUILD lablgtk-2.18.10.ebuild 1979 BLAKE2B fc3f2212c9629121a9c219783e525fa5a3ddc2aa61acc52ed03f5a4568d89e962b17151681e45d67f7a6438de86d82e28993631164ae68fecc5fda88f538a8b4 SHA512 89ec5fc71bfe6e07060c0830f07664cb2746471f6af527a1e517353fa2c467c8aae5fdc4699c7c459ec02a65b89b90bbcbd654fb0c2961e298e122391cdc280f
+EBUILD lablgtk-2.18.5.ebuild 2321 BLAKE2B 70d8ce75121c45fa78897e7217612e2cf135f70bda1950bc040c75e92db86ea704c383c65e98922824f372496f060bcc665c6b22b3e7f61518841be19c09a098 SHA512 ac8e9e5e6041d5c31563ad21d69c57c59ae70a19e8958d9f633e964dcf482e4f471d8695101fbbefcb2c3b709f7cbc651bf1bef2903d137fc77ddabb8011435a
+EBUILD lablgtk-2.18.8-r1.ebuild 1710 BLAKE2B e404ccdcd1b0329abbe678f23533243ecd31b2f6192ff3ce379c23e794a6eb25a70ec55c1a9783850f89961a4de18a2ac092ef7f2c828eb82078ca1ef7625315 SHA512 986b606bc6eeb8803852754790c5775f9666c6a9b14cea8a6f10382c789f22427c2c04c97586a6026273e9ef0d2de61703a58607786cbcf74fc130aa97eaa5ba
+EBUILD lablgtk-3.1.1.ebuild 677 BLAKE2B 76e30cc1a4488369c0ff545b615c609cd707ac60c8d5197e2817b3d064a69ccd64e60bee3cdb63bc2857bb0ed77509a849fe4bb63acfdc1a991ae1768e06eff5 SHA512 9e16aba68d8ce1b74508ee153f5eef04d7150080df95b6ac8effef9a17fbf5230a3e3f5a92f10419317c1ca9bcfa05949cf639232dd77b85a86e669b58d0ad54
+MISC metadata.xml 568 BLAKE2B 888aca75a617b3f24240e7d951b3ea4168150f3bb48a3ddbe74b97caca5170737e4ee3d89a9785eca89300e524b1484d20438443ae4971957203ec5fa12b638f SHA512 ea25d50c9b57627ebb05390183b5698caddf142457001bfa60f1cc1bade58c01cd2c46cd7025b24cb2dd10503e2bda2dbcaaec380a54d9192379b6d44f75ce64
diff --git a/dev-ml/lablgtk/lablgtk-2.18.10.ebuild b/dev-ml/lablgtk/lablgtk-2.18.10.ebuild
index 6c5b1512bc1f..24e25850f2ad 100644
--- a/dev-ml/lablgtk/lablgtk-2.18.10.ebuild
+++ b/dev-ml/lablgtk/lablgtk-2.18.10.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/garrigue/lablgtk/archive/${PV}.tar.gz -> ${P}.tar.gz
LICENSE="LGPL-2.1-with-linking-exception examples? ( lablgtk-examples )"
SLOT="2/${PV}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="debug examples glade gnomecanvas +ocamlopt sourceview spell svg"
DEPEND=">=dev-lang/ocaml-4.05:=[ocamlopt?]
diff --git a/dev-ml/lablgtk/lablgtk-2.18.5.ebuild b/dev-ml/lablgtk/lablgtk-2.18.5.ebuild
index 3c185b571431..32faef7880a6 100644
--- a/dev-ml/lablgtk/lablgtk-2.18.5.ebuild
+++ b/dev-ml/lablgtk/lablgtk-2.18.5.ebuild
@@ -25,7 +25,7 @@ DEPEND="${RDEPEND}
virtual/pkgconfig"
SLOT="2/${PV}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
src_configure() {
econf $(use_enable debug) \
diff --git a/dev-ml/lablgtk/lablgtk-2.18.8-r1.ebuild b/dev-ml/lablgtk/lablgtk-2.18.8-r1.ebuild
index 92dd9af9dc69..6bbe47119f84 100644
--- a/dev-ml/lablgtk/lablgtk-2.18.8-r1.ebuild
+++ b/dev-ml/lablgtk/lablgtk-2.18.8-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/garrigue/lablgtk/releases/download/lablgtk2188/${P}.
LICENSE="LGPL-2.1-with-linking-exception examples? ( lablgtk-examples )"
SLOT="2/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
IUSE="debug examples glade gnomecanvas +ocamlopt sourceview spell svg"
DEPEND="dev-lang/ocaml:=[ocamlopt?]
diff --git a/dev-ml/lablgtk/lablgtk-3.1.1.ebuild b/dev-ml/lablgtk/lablgtk-3.1.1.ebuild
new file mode 100644
index 000000000000..0f0e6f4670a1
--- /dev/null
+++ b/dev-ml/lablgtk/lablgtk-3.1.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DUNE_PKG_NAME=lablgtk3
+inherit dune
+
+DESCRIPTION="OCaml bindings to GTK-3"
+HOMEPAGE="https://github.com/garrigue/lablgtk"
+SRC_URI="https://github.com/garrigue/lablgtk/releases/download/${PV}/${DUNE_PKG_NAME}-${PV}.tbz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="3/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt sourceview"
+
+BDEPEND="dev-ml/camlp5"
+DEPEND="
+ app-text/gtkspell:3=
+ x11-libs/gtk+:3=
+ dev-ml/cairo2:=
+"
+RDEPEND="${DEPEND}"
+PDEPEND="sourceview? ( dev-ml/lablgtk-sourceview:${SLOT} )"
+
+S="${WORKDIR}/${DUNE_PKG_NAME}-${PV}"
diff --git a/dev-ml/lablgtk/metadata.xml b/dev-ml/lablgtk/metadata.xml
index 1fec605bab95..c0c9cf6b2c2b 100644
--- a/dev-ml/lablgtk/metadata.xml
+++ b/dev-ml/lablgtk/metadata.xml
@@ -5,6 +5,10 @@
<email>tupone@gentoo.org</email>
<name>Tupone Alfredo</name>
</maintainer>
+ <maintainer type="person">
+ <email>gienah@gentoo.org</email>
+ <name>Mark Wright</name>
+ </maintainer>
<use>
<flag name="glade">Enable libglade bindings compilation.</flag>
<flag name="gnomecanvas">Enable libgnomecanvas bindings compilation.</flag>
diff --git a/dev-ml/labltk/Manifest b/dev-ml/labltk/Manifest
index 50e594353d59..a5f299e03ba9 100644
--- a/dev-ml/labltk/Manifest
+++ b/dev-ml/labltk/Manifest
@@ -2,6 +2,8 @@ AUX findlib.patch 645 BLAKE2B 63c8dc3a2b332129bf90af98b908e1ade5a15381a903ec9591
AUX ocaml405.patch 13731 BLAKE2B 36ce4825b8e004720d966d7a7c1a769c84e4e3b044c07ce8112ee456acd819315a21625acb33a8423ad317d026bb03ddffa2b3dcba63dec1549254815c14d7e7 SHA512 a246af35b932e773e0c58b745d3885f98162892945f359dc4781489d76715c0564efa2ea985a43808e431fb8fd4225d4ad7b6a753abd54a8f12dc65ae43cfa9d
DIST labltk-8.06.2.tar.gz 369508 BLAKE2B df0a5fb1cf352c52bf3177e83be2cadde961c2a7ba0496f45dc515141931d13715b4c253f74e5f280f9a6c310488236e6bc598c0ceffc408028ef5f524f2bcf2 SHA512 d9342d49ba8769edd7a4ed051844f6ae5d3e62a7c2c76e895bfd1162d0433c4ea54f2314b29b708551fba63daec1123553b56f0abb6412807ab00d7bb40b73d6
DIST labltk-8.06.7.tar.gz 370870 BLAKE2B 2d836c824d9adbd4f03d0e7e81faa51669837eecb4f94f6c89c657966774fe7d6ed928459be3ccca7fd3e7cf67a54ee63f7d2d08dcc8b7e853f5ad64769b33a2 SHA512 3c7352d14bc337adfb1939e72bd2658bb5e60b463f10f3748779084d1b7a6e6225028c775b548e355d69984a8944b91580fa978ff904b20b8b762ba9046f5e7d
-EBUILD labltk-8.06.2.ebuild 1099 BLAKE2B 2c8f8fb53fd60709324049406c58741f698472e1f303fb85bfc82bcdd852a44f9042ef8000fe011a88c7d5d7cca288206486824f0ca6f6220dce86fc1ade7a98 SHA512 067e7ccab8ecc52e8c3bbb7fb999366fdbbb244436043c3684ca5c79da29e1bc704ccd3c644ce790001673a56896203913c83c86d8456e7ef2d95878aa33dc73
-EBUILD labltk-8.06.7.ebuild 1005 BLAKE2B 3770eb22a9ee7863a341a9211b5ea0058b93764160add551e2f116f98bd0e94dc2a5820570895402e95f7e87dc5cf3e43335bdfab2737a6e27832421535b1337 SHA512 2828b262d9d234aed0f7840f261ba4fa17c542228c94dadc49dd98c09c9e207a9f5f7b0644029228dba7c7316e45d068e44b2b55c97eae6347dea3fb78e678ba
+DIST labltk-8.06.9.tar.gz 371504 BLAKE2B 587ff01da120501f85f6d9921e46275858f1e1ce730eef205f9e7d7c64f6d3c0ea701cf832fdb8eb0746e1f0cff1151bccb077641740fb18811473b1553e2940 SHA512 fd6defa302d919f229394c486dcefab110b144534525a87082a27d2cab29c0af4ece3da821098fea25416850ad857f7af979d48790330d62dfb8d8db8f2bf6ca
+EBUILD labltk-8.06.2.ebuild 1093 BLAKE2B 529cef5576a7ba07ab56ef4c29a5cdebd03f058ddefc26e2d3d484585d1b0d8dc1a6930d1cda915cb012e5c6351e87443993282aa8ed64daef46e4e0f4eed0c1 SHA512 dcfe8dc6542034ca114fe5267b1eed116e48a3018e88938e13c8cc3c4da458a345a47b9c2f536ac2bb74f9b0c57b0a39f0726bf55b0042a7233fb9f333a07e9e
+EBUILD labltk-8.06.7.ebuild 998 BLAKE2B c31a2f9eb29f5d63a22a998c8dd9e143798f74d17e0d04bfef4c6995e9a003cbe897a5b157d6044f450fd3177c024cc768db785ab90577101651cbfa3f5d8cce SHA512 c4fc20f8b97e23cb0caf8e3b478d34c60c13a00617fb41dad005c811f9746f1c42c508796af24ca306b7d29bc065bdf6ebbb8b4ca377ba785ae24106620d7758
+EBUILD labltk-8.06.9.ebuild 986 BLAKE2B acfde3021a3cae9b4ced6ba8e79c04034b5eaca4d3b54b45c4c2823c838ebf7887192a5396c91b8a748bfc5c2c154ae6839a35936445d607d5bffdaec0dfe244 SHA512 12877671736a842ee5a21caee37015a963163d66efcc95d2c05de8fbb58868c21258513f26bb26920e93abfadd4b74c02b9695132558a45c9131ac9e1e4040c8
MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-ml/labltk/labltk-8.06.2.ebuild b/dev-ml/labltk/labltk-8.06.2.ebuild
index b406007112d4..c598fa167907 100644
--- a/dev-ml/labltk/labltk-8.06.2.ebuild
+++ b/dev-ml/labltk/labltk-8.06.2.ebuild
@@ -11,7 +11,7 @@ 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-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="+ocamlopt X"
RDEPEND=">=dev-lang/tk-8.0.3:=
diff --git a/dev-ml/labltk/labltk-8.06.7.ebuild b/dev-ml/labltk/labltk-8.06.7.ebuild
index a97dc130cb6e..17212676196f 100644
--- a/dev-ml/labltk/labltk-8.06.7.ebuild
+++ b/dev-ml/labltk/labltk-8.06.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/garrigue/${PN}/archive/${PV}.tar.gz -> ${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-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="+ocamlopt X"
RDEPEND=">=dev-lang/tk-8.0.3:=
diff --git a/dev-ml/labltk/labltk-8.06.9.ebuild b/dev-ml/labltk/labltk-8.06.9.ebuild
new file mode 100644
index 000000000000..ce876c58810a
--- /dev/null
+++ b/dev-ml/labltk/labltk-8.06.9.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit findlib eutils
+
+DESCRIPTION="OCaml interface to the Tcl/Tk GUI framework"
+HOMEPAGE="https://garrigue.github.io/labltk/"
+SRC_URI="https://github.com/garrigue/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="QPL-1.0 LGPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+ocamlopt X"
+
+RDEPEND="dev-lang/tk:=
+ >=dev-lang/ocaml-4.11:=[ocamlopt?,X(+)?]"
+DEPEND="${RDEPEND}
+ dev-ml/findlib
+"
+
+PATCHES=(
+ "${FILESDIR}/findlib.patch"
+)
+
+src_configure() {
+ ./configure --use-findlib --verbose $(usex X "--tk-x11" "--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/llvm-ocaml/Manifest b/dev-ml/llvm-ocaml/Manifest
index 06f6742d922f..268135d1d015 100644
--- a/dev-ml/llvm-ocaml/Manifest
+++ b/dev-ml/llvm-ocaml/Manifest
@@ -1,13 +1,11 @@
DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
-DIST llvmorg-11.0.0-rc3.tar.gz 122766783 BLAKE2B 052fdc864fed52692141284ebdc41d52d21fbeaf24ac5ed3e67701537baa683bae61b1c06de68322e0578a27a1f5a8856088cdc001d2b8d34d2ec88ae65ff739 SHA512 a28ce74775373c63fe23b3116cd25db0efb95c6fdb60e56f2522659a404a59576f3d9429a109cb0f90534927259289aa1c712673f36f92272d642bf8dce5699f
-DIST llvmorg-11.0.0-rc4.tar.gz 122768150 BLAKE2B e92417b6e1775a10c196534518036de6393e3cb9e0e656d4f864e7870be8fb0dad3f4cf170345e653ba60f36172df117977d5dfebe3d9ee7ec2c160d3dc9c5cd SHA512 ed2aee9f6d0bb887f27840158e9f95d94c9ad3981a0388a33fcd3e405f5072134a02999075238b6a2b8803149aa08ac790214605b186c2cc2d4827ba53c00de1
+DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc9da40911bbe9ee3531c15ada9165e5002b1c2f778cf8735858485ea05a8754e3d3a5f4b15bdd6cb33d64a14692984 SHA512 b6d38871ccce0e086e27d35e42887618d68e57d8274735c59e3eabc42dee352412489296293f8d5169fe0044936345915ee7da61ebdc64ec10f7737f6ecd90f2
DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
EBUILD llvm-ocaml-10.0.0.ebuild 3219 BLAKE2B 8d2ac0dc88b865f723c527315aaabb6bbd75773660b63197c833c72d7915495e494d73144f84a451dec3793d45a2f7f44dc22beb5c60f55dfd88a23bb04aede0 SHA512 fa83b587c1170564e25c040e2809daf6dc13d1718074d22a7093f08e7444d6378dbeb2f5ddc57f681f4a93b14c95275c87027c9e9191757b1fba4c9008464d38
EBUILD llvm-ocaml-10.0.1.ebuild 2960 BLAKE2B bf67406bf61b50af82f34276f7bfa6abe0bf809656e2addcc51efb7c1be5d4137462c9108239eea5f273a0e68f26c3300b3d2cc3cfe9df0c8555926e481fe231 SHA512 05e79634eb5e5ba38e0b0638a9627b7c8b38dfc7c685eaed8571283ed7791eb5d0ae2f6333cddf9b1f0f19b47e6d0e4c10444a4bc8bcdb69ce7061b25440a1b3
-EBUILD llvm-ocaml-11.0.0.9999.ebuild 2947 BLAKE2B b457ceed658d32cafc3926b32d73b4da03fb1b2b3d26988a95b839c75a97a61e401f1249acd10ba25b380ddac1ffa65b1e07ee97d054940da8d999bbb0fbe915 SHA512 8fb8849eef370b9becb05033c1108b0858dff95cfada75a634c52e558bf551346b69e6cfcd406c4c6a0d2a0660a00d92808c99471ec0b65ff5986f4cf399a630
-EBUILD llvm-ocaml-11.0.0_rc3.ebuild 2947 BLAKE2B b457ceed658d32cafc3926b32d73b4da03fb1b2b3d26988a95b839c75a97a61e401f1249acd10ba25b380ddac1ffa65b1e07ee97d054940da8d999bbb0fbe915 SHA512 8fb8849eef370b9becb05033c1108b0858dff95cfada75a634c52e558bf551346b69e6cfcd406c4c6a0d2a0660a00d92808c99471ec0b65ff5986f4cf399a630
-EBUILD llvm-ocaml-11.0.0_rc4.ebuild 2947 BLAKE2B b457ceed658d32cafc3926b32d73b4da03fb1b2b3d26988a95b839c75a97a61e401f1249acd10ba25b380ddac1ffa65b1e07ee97d054940da8d999bbb0fbe915 SHA512 8fb8849eef370b9becb05033c1108b0858dff95cfada75a634c52e558bf551346b69e6cfcd406c4c6a0d2a0660a00d92808c99471ec0b65ff5986f4cf399a630
-EBUILD llvm-ocaml-12.0.0.9999.ebuild 2947 BLAKE2B b457ceed658d32cafc3926b32d73b4da03fb1b2b3d26988a95b839c75a97a61e401f1249acd10ba25b380ddac1ffa65b1e07ee97d054940da8d999bbb0fbe915 SHA512 8fb8849eef370b9becb05033c1108b0858dff95cfada75a634c52e558bf551346b69e6cfcd406c4c6a0d2a0660a00d92808c99471ec0b65ff5986f4cf399a630
+EBUILD llvm-ocaml-11.0.0.9999.ebuild 3006 BLAKE2B 49ae9a36e5a8720945e225659420e22500d8231fcf2f0316437c33198c9aed7645e985c2c938cddb642bad34514f14d9dda6b7fbf1bf1e64f385a0769f527b03 SHA512 466eeba3ebc984efe34cf45386c67a48808e8eb629e2a555feb6994e74a83af6e0f097e21d6370e37339f24f37102b16dcbf2467516aaa39483a9f22ec997a04
+EBUILD llvm-ocaml-11.0.0.ebuild 3022 BLAKE2B 679d74e8ed16e3cc87396d3e4da97bfbddf353629854abcd537f9da30aa132d5c434aecbee6014547bb55541e84abff5459da083620e637b90339fe031733844 SHA512 ee373b66833f1e77bb29d9ccaa841229e9b78617bd155c671d6c9b96dec3a3973260df58f8b1c0f71f1d3a726bb8fc41f1efa966bedab84644aef27284c65873
+EBUILD llvm-ocaml-12.0.0.9999.ebuild 3011 BLAKE2B 00b8106524fda983dcc03bd0642f506c618e76534f8547b2c92814db9f57502e08c48e329cfec204e1988bd80668b2f7483b2493f85e648f1b942a464853035b SHA512 090967b0e335031c2a91a27bdedec2ddd2cb5120934839b87f92586c72f831a780a05414f15076f71f7a317d907f50d2617677bb0b654fa15e2a58db2d2a310b
EBUILD llvm-ocaml-9.0.1.ebuild 2922 BLAKE2B d7ae97c680d9f223a0fbaf2989ee60c4ae2baebf73664c9909485fea6c99f5c4c817ff522bee6175a741a5632687d1d0ea5b7b961587a258ca0737ac419390ac SHA512 dc30f078950d944a5c9d18d8804db82300845564afc05878cc7b157d37ad32259c528b358b9cd12684da3b9885b62e92cc6a32b46b8c4cbf48269839bd4cfa02
MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-11.0.0.9999.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-11.0.0.9999.ebuild
index 575154be6047..a39cfca35bc6 100644
--- a/dev-ml/llvm-ocaml/llvm-ocaml-11.0.0.9999.ebuild
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-11.0.0.9999.ebuild
@@ -35,6 +35,7 @@ DEPEND="${RDEPEND}"
BDEPEND="
dev-lang/perl
dev-ml/findlib
+ >=dev-util/cmake-3.16
test? ( dev-ml/ounit )
${PYTHON_DEPS}"
@@ -69,6 +70,8 @@ src_configure() {
-DLLVM_HOST_TRIPLE="${CHOST}"
+ -DPython3_EXECUTABLE="${PYTHON}"
+
# disable go bindings
-DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-11.0.0_rc3.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-11.0.0.ebuild
index 575154be6047..317ad24d0e20 100644
--- a/dev-ml/llvm-ocaml/llvm-ocaml-11.0.0_rc3.ebuild
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-11.0.0.ebuild
@@ -21,7 +21,7 @@ LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
SLOT="0/${PV}"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm ~x86"
IUSE="debug test ${ALL_LLVM_TARGETS[*]}"
REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )"
RESTRICT="!test? ( test )"
@@ -35,6 +35,7 @@ DEPEND="${RDEPEND}"
BDEPEND="
dev-lang/perl
dev-ml/findlib
+ >=dev-util/cmake-3.16
test? ( dev-ml/ounit )
${PYTHON_DEPS}"
@@ -69,6 +70,8 @@ src_configure() {
-DLLVM_HOST_TRIPLE="${CHOST}"
+ -DPython3_EXECUTABLE="${PYTHON}"
+
# disable go bindings
-DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-11.0.0_rc4.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-11.0.0_rc4.ebuild
deleted file mode 100644
index 575154be6047..000000000000
--- a/dev-ml/llvm-ocaml/llvm-ocaml-11.0.0_rc4.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-inherit cmake llvm llvm.org python-any-r1
-
-DESCRIPTION="OCaml bindings for LLVM"
-HOMEPAGE="https://llvm.org/"
-LLVM_COMPONENTS=( llvm )
-llvm.org_set_globals
-
-# Keep in sync with sys-devel/llvm
-ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC VE )
-ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430
- NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore
- "${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}" )
-ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
-LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0/${PV}"
-KEYWORDS=""
-IUSE="debug test ${ALL_LLVM_TARGETS[*]}"
-REQUIRED_USE="|| ( ${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(-)]"
-DEPEND="${RDEPEND}"
-BDEPEND="
- dev-lang/perl
- dev-ml/findlib
- test? ( dev-ml/ounit )
- ${PYTHON_DEPS}"
-
-pkg_setup() {
- LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
- python-any-r1_pkg_setup
-}
-
-src_configure() {
- local libdir=$(get_libdir)
- local mycmakeargs=(
- -DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-
- -DBUILD_SHARED_LIBS=OFF
- -DLLVM_BUILD_LLVM_DYLIB=ON
- -DLLVM_LINK_LLVM_DYLIB=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
- -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="$(get_lit_flags)"
- )
-
- # 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_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_build ocaml_all
-}
-
-src_test() {
- # respect TMPDIR!
- local -x LIT_PRESERVES_TMP=1
- cmake_build 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-12.0.0.9999.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-12.0.0.9999.ebuild
index 575154be6047..3ded7e4e44fb 100644
--- a/dev-ml/llvm-ocaml/llvm-ocaml-12.0.0.9999.ebuild
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-12.0.0.9999.ebuild
@@ -12,7 +12,7 @@ LLVM_COMPONENTS=( llvm )
llvm.org_set_globals
# Keep in sync with sys-devel/llvm
-ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC VE )
+ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC CSKY VE )
ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430
NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore
"${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}" )
@@ -35,6 +35,7 @@ DEPEND="${RDEPEND}"
BDEPEND="
dev-lang/perl
dev-ml/findlib
+ >=dev-util/cmake-3.16
test? ( dev-ml/ounit )
${PYTHON_DEPS}"
@@ -69,6 +70,8 @@ src_configure() {
-DLLVM_HOST_TRIPLE="${CHOST}"
+ -DPython3_EXECUTABLE="${PYTHON}"
+
# disable go bindings
-DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND
diff --git a/dev-ml/lwt/Manifest b/dev-ml/lwt/Manifest
index ff9165405cdf..740547c9f57a 100644
--- a/dev-ml/lwt/Manifest
+++ b/dev-ml/lwt/Manifest
@@ -1,5 +1,8 @@
+AUX lwt-5.3.0-ppxlib-0.18.0.patch 13548 BLAKE2B fa89411ea65421eb8f8b7f7f782817c27f21d88a12a95a6a8a9d858c6e6665d2a79432ec237daf77d594ba11e4ef1e71921779084055e8df695b696f81b6ce06 SHA512 cd5dc33e0b3366445ce491efda7ff55fcf7f628138fc8213dfa8a7d425d44fd7b312d9008ff1bad5216bb8179bc0e41e5844d1826237c3c26f657d7ec5410671
DIST lwt-3.0.0.tar.gz 285864 BLAKE2B d14f8f8a9e71a61c57bd7c208575849667dab4a4770b56a0d94e93024b22be9b7d88d10c0fa24eb8060b67c75e72c2c8bbfa0362f3aa815c76c93575225ce056 SHA512 270a6dc2fc58950380eecf72767782c72a5d72226f4af0e9a4f9b0e70b788eeb1d2727348ab8da4411ee59374a19524a6a793b14a26fe7051d51f987ef0e42b8
DIST lwt-3.1.0.tar.gz 285309 BLAKE2B ffc3a416491d4c7b7e7c0da67b48d9eeb5b7fa50e3637d4f0cfcd1689b75626b48c8dd6d91e87c93022047809a3774683c41ce620e07ee4d3e1409185e7f8d16 SHA512 0b2269e53f2e8a57e1ffd6f237c6b22de39a3b6b0d57276c7cb9371392aabc9fb6364b2617a6408ed0049ed64f71de0c540209cf83ce43899fd025295342eb0d
+DIST lwt-5.3.0.tar.gz 298152 BLAKE2B a39494bf98fcca07bf4601a742f4bfdc1ea2a67e2babbab650c41d2df58296a859520509ddc080af9c4d55be76439b401174720765fb942586d7c866f80cc538 SHA512 9922c19944595b0c07da8e1bbdecb2cc7c5a7edcdc2224215efb819d9c735da8986388a2446bd0762e28533f5d9d386970f07a4f1b0d14255c6743f3a1d16cb6
EBUILD lwt-3.0.0.ebuild 868 BLAKE2B baea13b202122c9d836d6e86eb814f46b3009b6d5f04b1648a958bf05cac881ca5e45316613b987f3e44e21f04f4366e74489e6bec6403e9a89c7d4cbacf5a4b SHA512 e803b0f9b9d97209a68cbed575b3b8b7bdd7031839e74f1ebd78c16c4729c10df202cc1e54d3291e977c093a11927a5049696897c84055e89dd267124b610971
EBUILD lwt-3.1.0.ebuild 1194 BLAKE2B a1ab34b8cdb6dd4ce5d859363505c885df31da5e4999269d6d7f695ef2e5612acabd9c4d6203aac550ab7614773e82f579333385621b95f79fa71d69078649e7 SHA512 b974e3c33bc9b63b15929bde88a2ad34d50048a14d9a8437180752355d43ef6fb38f62fc006f0c46b3001ca9dd4a8bab79c2fbea883876b15dea36b40298224f
-MISC metadata.xml 457 BLAKE2B 4214d9e88740d72fc22284b03d1b67940960d582a3debe014cf56c297fa919faf7535cd76ac8b85e6ef3fa28d5db0e3062c7653e6563149bc0461292636933cd SHA512 4e3d434fd211738f296b1a1c7ebd77b3243f1097fb9e34a296bd60ecf634c332ebe4b943f4a896eb66529f3d89ed8a0a7cec260afe8a84a9d9d3a05bc4aebade
+EBUILD lwt-5.3.0-r1.ebuild 804 BLAKE2B 35260bf4191d222cd53fdf530ff198a9168ad901f6af4ed43e896e32ac8afcd499021fda7e87f0e83bf66d48d89ae7c12b2595e4b92dba6dd077d893cdaf9d9a SHA512 cb3171bd8b8b5e1e9fec7eea46d2b05385feaffdf8b32f65fc9a67940973ea88336ca304d900a8b8cad6b704d386ca52d7f1ecf4426dab7e4ee6c78d85d51394
+MISC metadata.xml 534 BLAKE2B 04d77728a82e759ba24f80a4d02c289da849979c93fc6af3d60824eba4a18fb53eae33a4e5c33a6c4c0cd2ce0bc1d325bf86bca38f6f5cc4ffc4c339db6f3de8 SHA512 eb3f2fe064427ae98a683d5508134fafe1364a172cfef215a886209c3b6967f4e575a14e00ea8c93efcb20e742f0312780397cdf99eb56ec151ae30c50f0a072
diff --git a/dev-ml/lwt/files/lwt-5.3.0-ppxlib-0.18.0.patch b/dev-ml/lwt/files/lwt-5.3.0-ppxlib-0.18.0.patch
new file mode 100644
index 000000000000..0bda140294a0
--- /dev/null
+++ b/dev-ml/lwt/files/lwt-5.3.0-ppxlib-0.18.0.patch
@@ -0,0 +1,401 @@
+--- lwt-5.3.0-orig/lwt_ppx.opam 2020-04-23 16:32:55.000000000 +1000
++++ lwt-5.3.0/lwt_ppx.opam 2020-10-12 22:12:12.863159266 +1100
+@@ -20,8 +20,7 @@
+ "dune" {>= "1.8.0"}
+ "lwt"
+ "ocaml" {>= "4.02.0"}
+- "ocaml-migrate-parsetree" {>= "1.5.0"}
+- "ppx_tools_versioned" {>= "5.3.0"}
++ "ppxlib" {>= "0.16.0"}
+ ]
+
+ build: [
+--- lwt-5.3.0-orig/src/ppx/dune 2020-04-23 16:32:55.000000000 +1000
++++ lwt-5.3.0/src/ppx/dune 2020-10-12 22:11:33.844038953 +1100
+@@ -13,10 +13,10 @@
+ (public_name lwt_ppx)
+ (synopsis "Lwt PPX syntax extension")
+ (modules ppx_lwt)
+- (libraries compiler-libs.common ocaml-migrate-parsetree ppx_tools_versioned)
++ (libraries compiler-libs.common ppxlib)
+ (ppx_runtime_libraries lwt)
+ (kind ppx_rewriter)
+- (preprocess (pps ppx_tools_versioned.metaquot_410 |} ^ bisect_ppx ^ {|))
++ (preprocess (pps ppxlib.metaquot|} ^ bisect_ppx ^ {|))
+ (flags (:standard -w +A-4)))
+
+ |}
+--- lwt-5.3.0-orig/src/ppx/ppx_lwt.ml 2020-04-23 16:32:55.000000000 +1000
++++ lwt-5.3.0/src/ppx/ppx_lwt.ml 2020-10-12 22:10:11.298784433 +1100
+@@ -1,16 +1,11 @@
+-open! Migrate_parsetree
+-open! OCaml_410.Ast
+-open Ast_mapper
++open! Ppxlib
++open Ast_builder.Default
+ open! Ast_helper
+-open Asttypes
+-open Parsetree
+-
+-open Ast_convenience_410
+
+ (** {2 Convenient stuff} *)
+
+-let with_loc f {txt ; loc = _loc} =
+- (f txt) [@metaloc _loc]
++let with_loc f {txt ; loc } =
++ f ~loc txt
+
+ (** Test if a case is a catchall. *)
+ let is_catchall case =
+@@ -27,7 +22,7 @@
+ List.exists is_catchall cases
+ in
+ if not has_wildcard
+- then cases @ [Exp.case [%pat? exn] [%expr Lwt.fail exn]] [@metaloc Location.none]
++ then cases @ (let loc = Location.none in [Exp.case [%pat? exn] [%expr Lwt.fail exn]])
+ else cases
+
+ (** {3 Internal names} *)
+@@ -73,34 +68,33 @@
+ evar ~loc:binding.pvb_expr.pexp_loc (gen_name i)
+ in
+ let fun_ =
+- [%expr (fun [%p binding.pvb_pat] -> [%e aux (i+1) t])] [@metaloc e_loc]
++ let loc = e_loc in
++ [%expr (fun [%p binding.pvb_pat] -> [%e aux (i+1) t])]
+ in
+ let new_exp =
+- [%expr
+- let module Reraise = struct external reraise : exn -> 'a = "%reraise" end in
+- Lwt.backtrace_bind
+- (fun exn -> try Reraise.reraise exn with exn -> exn)
+- [%e name]
+- [%e fun_]
+- ] [@metaloc e_loc]
++ let loc = e_loc in
++ [%expr
++ let module Reraise = struct external reraise : exn -> 'a = "%reraise" end in
++ Lwt.backtrace_bind
++ (fun exn -> try Reraise.reraise exn with exn -> exn)
++ [%e name]
++ [%e fun_]
++ ]
+ in
+ { new_exp with pexp_attributes = binding.pvb_attributes }
+ in aux 0 l
+
+-(* Note: instances of [@metaloc !default_loc] below are workarounds for
+- https://github.com/ocaml-ppx/ppx_tools_versioned/issues/21. *)
+-
+ let lwt_sequence mapper ~exp ~lhs ~rhs ~ext_loc =
+- let pat= [%pat? ()][@metaloc ext_loc] in
+- let lhs, rhs = mapper.expr mapper lhs, mapper.expr mapper rhs in
+- [%expr
+- let module Reraise = struct external reraise : exn -> 'a = "%reraise" end in
+- Lwt.backtrace_bind
+- (fun exn -> try Reraise.reraise exn with exn -> exn)
+- [%e lhs]
+- (fun [%p pat] -> [%e rhs])
+- ]
+- [@metaloc exp.pexp_loc]
++ let pat= let loc = ext_loc in [%pat? ()] in
++ let lhs, rhs = mapper#expression lhs, mapper#expression rhs in
++ let loc = exp.pexp_loc in
++ [%expr
++ let module Reraise = struct external reraise : exn -> 'a = "%reraise" end in
++ Lwt.backtrace_bind
++ (fun exn -> try Reraise.reraise exn with exn -> exn)
++ [%e lhs]
++ (fun [%p pat] -> [%e rhs])
++ ]
+
+ (** For expressions only *)
+ (* We only expand the first level after a %lwt.
+@@ -121,7 +115,7 @@
+ (gen_bindings vbl)
+ (gen_binds exp.pexp_loc vbl e)
+ in
+- Some (mapper.expr mapper { new_exp with pexp_attributes })
++ Some (mapper#expression { new_exp with pexp_attributes })
+
+ (* [match%lwt $e$ with $c$] ≡ [Lwt.bind $e$ (function $c$)]
+ [match%lwt $e$ with exception $x$ | $c$] ≡
+@@ -134,11 +128,8 @@
+ | _ -> false)
+ in
+ if cases = [] then
+- raise (Location.Error (
+- Location.errorf
+- ~loc:exp.pexp_loc
+- "match%%lwt must contain at least one non-exception pattern."
+- ));
++ Location.raise_errorf ~loc:exp.pexp_loc
++ "match%%lwt must contain at least one non-exception pattern." ;
+ let exns =
+ exns |> List.map (
+ function
+@@ -150,22 +141,24 @@
+ let new_exp =
+ match exns with
+ | [] ->
+- [%expr Lwt.bind [%e e] [%e Exp.function_ cases]] [@metaloc !default_loc]
+- | _ -> [%expr Lwt.try_bind (fun () -> [%e e])
+- [%e Exp.function_ cases]
+- [%e Exp.function_ exns]]
+- [@metaloc !default_loc]
++ let loc = !default_loc in
++ [%expr Lwt.bind [%e e] [%e Exp.function_ cases]]
++ | _ ->
++ let loc = !default_loc in
++ [%expr Lwt.try_bind (fun () -> [%e e])
++ [%e Exp.function_ cases]
++ [%e Exp.function_ exns]]
+ in
+- Some (mapper.expr mapper { new_exp with pexp_attributes })
++ Some (mapper#expression { new_exp with pexp_attributes })
+
+ (* [assert%lwt $e$] ≡
+ [try Lwt.return (assert $e$) with exn -> Lwt.fail exn] *)
+ | Pexp_assert e ->
+ let new_exp =
++ let loc = !default_loc in
+ [%expr try Lwt.return (assert [%e e]) with exn -> Lwt.fail exn]
+- [@metaloc !default_loc]
+ in
+- Some (mapper.expr mapper { new_exp with pexp_attributes })
++ Some (mapper#expression { new_exp with pexp_attributes })
+
+ (* [while%lwt $cond$ do $body$ done] ≡
+ [let rec __ppx_lwt_loop () =
+@@ -175,15 +168,15 @@
+ *)
+ | Pexp_while (cond, body) ->
+ let new_exp =
++ let loc = !default_loc in
+ [%expr
+ let rec __ppx_lwt_loop () =
+ if [%e cond] then Lwt.bind [%e body] __ppx_lwt_loop
+ else Lwt.return_unit
+ in __ppx_lwt_loop ()
+ ]
+- [@metaloc !default_loc]
+ in
+- Some (mapper.expr mapper { new_exp with pexp_attributes })
++ Some (mapper#expression { new_exp with pexp_attributes })
+
+ (* [for%lwt $p$ = $start$ (to|downto) $end$ do $body$ done] ≡
+ [let __ppx_lwt_bound = $end$ in
+@@ -193,16 +186,19 @@
+ in __ppx_lwt_loop $start$]
+ *)
+ | Pexp_for ({ppat_desc = Ppat_var p_var; _} as p, start, bound, dir, body) ->
+- let comp, op = match dir with
+- | Upto -> evar ">", evar "+"
+- | Downto -> evar "<", evar "-"
++ let comp, op =
++ let loc = !default_loc in
++ match dir with
++ | Upto -> evar ~loc ">", evar ~loc "+"
++ | Downto -> evar ~loc "<", evar ~loc "-"
+ in
+- let p' = with_loc (fun s -> evar s) p_var in
++ let p' = with_loc evar p_var in
+
+- let exp_bound = [%expr __ppx_lwt_bound] [@metaloc bound.pexp_loc] in
+- let pat_bound = [%pat? __ppx_lwt_bound] [@metaloc bound.pexp_loc] in
++ let exp_bound = let loc = bound.pexp_loc in [%expr __ppx_lwt_bound] in
++ let pat_bound = let loc = bound.pexp_loc in [%pat? __ppx_lwt_bound] in
+
+ let new_exp =
++ let loc = !default_loc in
+ [%expr
+ let [%p pat_bound] : int = [%e bound] in
+ let rec __ppx_lwt_loop [%p p] =
+@@ -210,9 +206,8 @@
+ else Lwt.bind [%e body] (fun () -> __ppx_lwt_loop ([%e op] [%e p'] 1))
+ in __ppx_lwt_loop [%e start]
+ ]
+- [@metaloc !default_loc]
+ in
+- Some (mapper.expr mapper { new_exp with pexp_attributes })
++ Some (mapper#expression { new_exp with pexp_attributes })
+
+
+ (* [try%lwt $e$ with $c$] ≡
+@@ -221,6 +216,7 @@
+ | Pexp_try (expr, cases) ->
+ let cases = add_wildcard_case cases in
+ let new_exp =
++ let loc = !default_loc in
+ [%expr
+ let module Reraise = struct external reraise : exn -> 'a = "%reraise" end in
+ Lwt.backtrace_catch
+@@ -228,9 +224,8 @@
+ (fun () -> [%e expr])
+ [%e Exp.function_ cases]
+ ]
+- [@metaloc !default_loc]
+ in
+- Some (mapper.expr mapper { new_exp with pexp_attributes })
++ Some (mapper#expression { new_exp with pexp_attributes })
+
+ (* [if%lwt $c$ then $e1$ else $e2$] ≡
+ [match%lwt $c$ with true -> $e1$ | false -> $e2$]
+@@ -240,37 +235,37 @@
+ | Pexp_ifthenelse (cond, e1, e2) ->
+ let e2 =
+ match e2 with
+- | None -> [%expr Lwt.return_unit] [@metaloc !default_loc]
++ | None -> let loc = !default_loc in [%expr Lwt.return_unit]
+ | Some e -> e
+ in
+ let cases =
++ let loc = !default_loc in
+ [
+- Exp.case ([%pat? true] [@metaloc !default_loc]) e1 ;
+- Exp.case ([%pat? false] [@metaloc !default_loc]) e2 ;
++ Exp.case [%pat? true] e1 ;
++ Exp.case [%pat? false] e2 ;
+ ]
+ in
+ let new_exp =
++ let loc = !default_loc in
+ [%expr Lwt.bind [%e cond] [%e Exp.function_ cases]]
+- [@metaloc !default_loc]
+ in
+- Some (mapper.expr mapper { new_exp with pexp_attributes })
++ Some (mapper#expression { new_exp with pexp_attributes })
+
+ | _ ->
+ None
+
+ let warned = ref false
+
+-let mapper =
+- { default_mapper with
++class mapper = object (self)
++ inherit Ast_traverse.map as super
+
+- structure = begin fun mapper structure ->
+- if !warned then
+- default_mapper.structure mapper structure
++ method! structure = begin fun structure ->
++ if !warned then super#structure structure
+
+ else begin
+ warned := true;
+- let structure = default_mapper.structure mapper structure in
+- let loc = Location.in_file !Location.input_name in
++ let structure = super#structure structure in
++ let loc = Location.in_file !Ocaml_common.Location.input_name in
+
+ let warn_if condition message structure =
+ if condition then
+@@ -287,9 +282,9 @@
+ ("-no-sequence is a deprecated Lwt PPX option\n" ^
+ " See https://github.com/ocsigen/lwt/issues/495")
+ end
+- end;
++ end
+
+- expr = (fun mapper expr ->
++ method! expression = (fun expr ->
+ match expr with
+ | { pexp_desc=
+ Pexp_extension (
+@@ -297,7 +292,7 @@
+ PStr[{pstr_desc= Pstr_eval (exp, _);_}]);
+ _
+ }->
+- begin match lwt_expression mapper exp expr.pexp_attributes ext_loc with
++ begin match lwt_expression self exp expr.pexp_attributes ext_loc with
+ | Some expr' -> expr'
+ | None -> expr
+ end
+@@ -306,47 +301,45 @@
+ | [%expr [%e? exp ] [%finally [%e? finally]] ]
+ | [%expr [%e? exp ] [%lwt.finally [%e? finally]] ] ->
+ let new_exp =
+- [%expr
+- let module Reraise = struct external reraise : exn -> 'a = "%reraise" end in
+- Lwt.backtrace_finalize
+- (fun exn -> try Reraise.reraise exn with exn -> exn)
+- (fun () -> [%e exp])
+- (fun () -> [%e finally])
+- ]
+- [@metaloc !default_loc]
++ let loc = !default_loc in
++ [%expr
++ let module Reraise = struct external reraise : exn -> 'a = "%reraise" end in
++ Lwt.backtrace_finalize
++ (fun exn -> try Reraise.reraise exn with exn -> exn)
++ (fun () -> [%e exp])
++ (fun () -> [%e finally])
++ ]
+ in
+- mapper.expr mapper
++ super#expression
+ { new_exp with
+ pexp_attributes = expr.pexp_attributes @ exp.pexp_attributes
+ }
+
+ | [%expr [%finally [%e? _ ]]]
+ | [%expr [%lwt.finally [%e? _ ]]] ->
+- raise (Location.Error (
+- Location.errorf
+- ~loc:expr.pexp_loc
+- "Lwt's finally should be used only with the syntax: \"(<expr>)[%%finally ...]\"."
+- ))
++ Location.raise_errorf ~loc:expr.pexp_loc
++ "Lwt's finally should be used only with the syntax: \"(<expr>)[%%finally ...]\"."
+
+ | _ ->
+- default_mapper.expr mapper expr);
+- structure_item = (fun mapper stri ->
++ super#expression expr)
++
++ method! structure_item = (fun stri ->
+ default_loc := stri.pstr_loc;
+ match stri with
+ | [%stri let%lwt [%p? var] = [%e? exp]] ->
+ let warning =
+- str
++ estring ~loc:!default_loc
+ ("let%lwt should not be used at the module item level.\n" ^
+ "Replace let%lwt x = e by let x = Lwt_main.run (e)")
+ in
++ let loc = !default_loc in
+ [%stri
+ let [%p var] =
+ (Lwt_main.run [@ocaml.ppwarning [%e warning]])
+- [%e mapper.expr mapper exp]]
+- [@metaloc !default_loc]
++ [%e super#expression exp]]
+
+- | x -> default_mapper.structure_item mapper x);
+-}
++ | x -> super#structure_item x);
++end
+
+
+ let args =
+@@ -361,5 +354,8 @@
+ ]
+
+ let () =
+- Driver.register ~name:"ppx_lwt" ~args Versions.ocaml_410
+- (fun _config _cookies -> mapper)
++ let mapper = new mapper in
++ Driver.register_transformation "ppx_lwt"
++ ~impl:mapper#structure
++ ~intf:mapper#signature ;
++ List.iter (fun (key, spec, doc) -> Driver.add_arg key spec ~doc) args
+--- lwt-5.3.0-orig/src/ppx/ppx_lwt.mli 2020-04-23 16:32:55.000000000 +1000
++++ lwt-5.3.0/src/ppx/ppx_lwt.mli 2020-10-12 22:10:45.384889535 +1100
+@@ -161,4 +161,4 @@
+ *)
+
+
+-val mapper : Migrate_parsetree.OCaml_410.Ast.Ast_mapper.mapper
++class mapper : Ppxlib.Ast_traverse.map
diff --git a/dev-ml/lwt/lwt-5.3.0-r1.ebuild b/dev-ml/lwt/lwt-5.3.0-r1.ebuild
new file mode 100644
index 000000000000..a5de9c42f1eb
--- /dev/null
+++ b/dev-ml/lwt/lwt-5.3.0-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+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"
+
+SLOT="0/${PV}"
+LICENSE="LGPL-2.1-with-linking-exception"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+DEPEND="
+ dev-ml/seq:=
+ dev-ml/result:=
+ dev-ml/mmap:=
+ dev-ml/ocplib-endian:=
+ >=dev-ml/ppxlib-0.18.0:=
+ dev-ml/react:=
+ dev-ml/dune-configurator:=
+ dev-libs/libev"
+RDEPEND="${DEPEND}
+ !<www-servers/ocsigen-1.1"
+BDEPEND="
+ >=dev-ml/cppo-1.6.6
+ dev-ml/findlib"
+
+# backported from https://github.com/ocsigen/lwt/pull/807
+PATCHES=(
+ "${FILESDIR}"/${PN}-5.3.0-ppxlib-0.18.0.patch
+)
diff --git a/dev-ml/lwt/metadata.xml b/dev-ml/lwt/metadata.xml
index 78de251d544a..876bdf620f96 100644
--- a/dev-ml/lwt/metadata.xml
+++ b/dev-ml/lwt/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>gienah@gentoo.org</email>
+ <name>Mark Wright</name>
+ </maintainer>
<use>
<flag name="camlp4">Enable camlp4 syntax extension</flag>
<flag name="libev">Enable the <pkg>dev-libs/libev</pkg>-based backend.</flag>
diff --git a/dev-ml/mccs/Manifest b/dev-ml/mccs/Manifest
new file mode 100644
index 000000000000..1057d201088f
--- /dev/null
+++ b/dev-ml/mccs/Manifest
@@ -0,0 +1,3 @@
+DIST mccs-1.1.11.tar.gz 1008163 BLAKE2B 49f173b99baa1acfd96f8ef873b664ba61dc9a770ad62873f956f017e3940737be74f5d5392d4043c9ade3e74e09d9c6b11c47af7755558b25f1f62e6ab80d84 SHA512 095393ca63fb591a833a7a37117a80a2e817b437bbcd655301b376f749a3756c8aff26b2fcdebfc5f68b9c30d8971a7ba057f610117516e3e85a3fe7bd3906d0
+EBUILD mccs-1.1.11.ebuild 638 BLAKE2B 3f8081276ba129bef32d8d4e3d76e5ad764f39365ddf721b8546dfe885f9b7800187e961469d4b4966f032814aa856fae4b56c2f97724370372907205ba81730 SHA512 813e0371dcee50f5adef61011f32857937bcc1000b73c32e3b92018ef535aab1c2d3090ffff774678bea886e1b667e9d9f4a1e58658dde609e262f21cd08612f
+MISC metadata.xml 325 BLAKE2B 7385ff0e6224f5197139764e79e60e849806e74d9f15f17934358bb3cc9a7ff41213e53167351b4a1308e84a436f8e14e9416da49df5615f07d33604e09bcb45 SHA512 ae6f92a85cbac16fb2c53676e7b3d326bf637a47129f3f4b413ad3a4c9df4a807f10a8513f2876a9310efc8a2d8ad3215a448ae9a9ad9128e356403b394a58f4
diff --git a/dev-ml/mccs/mccs-1.1.11.ebuild b/dev-ml/mccs/mccs-1.1.11.ebuild
new file mode 100644
index 000000000000..b59ff733fe80
--- /dev/null
+++ b/dev-ml/mccs/mccs-1.1.11.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+MY_PV=$(ver_rs 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 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ dev-ml/cudf:=
+ sci-mathematics/glpk:=
+"
+DEPEND="${RDEPEND}
+ test? (
+ dev-ml/extlib:=
+ )
+"
+
+S=${WORKDIR}/ocaml-${PN}-$(ver_rs 2 '-')
diff --git a/dev-ml/mccs/metadata.xml b/dev-ml/mccs/metadata.xml
new file mode 100644
index 000000000000..cb477b7c6e26
--- /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="person">
+ <email>gienah@gentoo.org</email>
+ <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">AltGr/ocaml-mccs</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/mmap/Manifest b/dev-ml/mmap/Manifest
new file mode 100644
index 000000000000..aba1853f28e1
--- /dev/null
+++ b/dev-ml/mmap/Manifest
@@ -0,0 +1,5 @@
+DIST mmap-v1.0.2.tbz 14575 BLAKE2B ddc0ce540780bf362662b90ba0ba71098151bfaf2633161d747f6122b34b4cec813c0a839f5f702595fa9d81b24a4d550fcaa6600d6fdd7560947e71c87b1b6a SHA512 280afb62a0cc5b13f7e9485bb81c0fe6bff91a3838420495ce7a10709af987264590562f21b2d66e778b7e606be3f1f940ebb090e4fa0af5702f09bacab93cbe
+DIST mmap-v1.1.0.tbz 12312 BLAKE2B 3f688f5649ef51fc2a0cee76519da46dcfecd72a065de3cdc72412e27bfa39c26c6bb54d35ea6e3b139db0ccc75e9460f8285826c40ecc894a3782f279366686 SHA512 15e4ec2634998f321f495de5372dc75a3f4059ab7512115603ae8fd99a619c91299d34c8a12a697aa36df4ce14c90c66746b873eddf004b7bbbeaef8ec7858f5
+EBUILD mmap-1.0.2.ebuild 439 BLAKE2B ec4371daad00b5817c31e5cf3aab57e35f852d7846f16be88dab295842e4acc5e61411566d548de6438b1948adf34edfb13e2deae3d8a7c08f1084f9976886e3 SHA512 cbdd78d9d612bc9d1f50537c657126c978bf0eeef1a70826eddb520b4525a45580266d37f0a48b3d5987cf2d893d8aeafd59dee8ff25b98a7776025bc6e2c437
+EBUILD mmap-1.1.0.ebuild 439 BLAKE2B ec4371daad00b5817c31e5cf3aab57e35f852d7846f16be88dab295842e4acc5e61411566d548de6438b1948adf34edfb13e2deae3d8a7c08f1084f9976886e3 SHA512 cbdd78d9d612bc9d1f50537c657126c978bf0eeef1a70826eddb520b4525a45580266d37f0a48b3d5987cf2d893d8aeafd59dee8ff25b98a7776025bc6e2c437
+MISC metadata.xml 320 BLAKE2B 5af9b73b1a5dfa02956a9c31e9ba5c9a2ad1578c117cb55c46f33a4bc7afe4acfc74bb5cc25176e6d6f7bc9cba94ec1b379e8b99fa51a6a5773039e6e92afd3c SHA512 25aea58fe2509a172b1a93f263e5d3580c736f4d83f40050d0de7c6d13cf33033eee9e577ecbd7a1727572c60e3cfd29d1782365c4b26d17b893fe09f2b338bb
diff --git a/dev-ml/mmap/metadata.xml b/dev-ml/mmap/metadata.xml
new file mode 100644
index 000000000000..3c0ce5319562
--- /dev/null
+++ b/dev-ml/mmap/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>gienah@gentoo.org</email>
+ <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">mirage/mmap</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/mmap/mmap-1.0.2.ebuild b/dev-ml/mmap/mmap-1.0.2.ebuild
new file mode 100644
index 000000000000..7064da7c5444
--- /dev/null
+++ b/dev-ml/mmap/mmap-1.0.2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="File mapping"
+HOMEPAGE="https://github.com/mirage/mmap"
+SRC_URI="https://github.com/mirage/mmap/releases/download/v${PV}/${PN}-v${PV}.tbz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${PN}-v${PV}"
diff --git a/dev-ml/mmap/mmap-1.1.0.ebuild b/dev-ml/mmap/mmap-1.1.0.ebuild
new file mode 100644
index 000000000000..7064da7c5444
--- /dev/null
+++ b/dev-ml/mmap/mmap-1.1.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="File mapping"
+HOMEPAGE="https://github.com/mirage/mmap"
+SRC_URI="https://github.com/mirage/mmap/releases/download/v${PV}/${PN}-v${PV}.tbz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${PN}-v${PV}"
diff --git a/dev-ml/num/Manifest b/dev-ml/num/Manifest
index 1059a554855d..7adb6fbd5e0d 100644
--- a/dev-ml/num/Manifest
+++ b/dev-ml/num/Manifest
@@ -1,4 +1,5 @@
AUX num-1.3-cflags.patch 409 BLAKE2B 97db7e69d4bee7e6940386349620799d586ab7094a51995c015ddec399747381175936e523f25b2312aed434ef25dfbcc2d6ef3aaa502ade39ff14fbd0ead636 SHA512 95245b0c3738511ff6a8a43b5f4c8897a82502a751552e1f1c846f3c7bb1040a5227055a55303292c1eca18a454d0f7c038ef574f00a772db2b72611857e15b5
DIST num-1.3.tar.gz 66251 BLAKE2B d6fde246693c8aef3b881a4ebc2b601392e0f0bf561dc4f4d32a5e1f835a5186deba3ffa77c88c6c05cd6e837dc836567fcabffefae99ce1ccae94e1bdfc849a SHA512 c88310f8c45700990095e6b2e9abf24c27347711b9abfd1dde75e540fbbfc6a365e6713bd69f66009af305728fcb36dc61eb37fdd0be7d73824b0e92fbe8c031
+EBUILD num-1.3-r1.ebuild 810 BLAKE2B 2fa8b762ea14b725c67a0b82c66a977f8d2f7344ffd6122d1b15aa1df51efaeb763651c3d2347d98480e7cf3f8a2a7ce98fdd7709329249040bb2d8d827bdab0 SHA512 08f239c556753bfecc69e106b326544b490c1df71a8173456a840d46022f6fc134fe15bd820664c57006dc2253c768e8dafc5eda45de6226d9419a319fd7f76c
EBUILD num-1.3.ebuild 723 BLAKE2B 50ac5e2566b164c5b1aa77037a77f68763ab7d7db2d043f67ce011b1aaf49b97eacb6eaada17af468e9d0f4cc451f977e5964e789dcf03f2b7addce7c935d01b SHA512 d3c8198445dc5eae9c517243bd54a72762e0c3a698a4ef332e48c6fa8cdd1c9f18cab924980e575b8170a85e19766380a4b053b999e24dae5dd9d9233632fb7e
-MISC metadata.xml 247 BLAKE2B ca08677c4c0af66af431abe578122a2ea0278f7ffabab245eec806167a6226c65f97e9826d64fc4b82eb14b6200cd1e3a31a5b4999e18aac41a4f9af43d708d6 SHA512 fff6c25e644477aaa35b838e10c44ca8eae9824ef8f19795e31201db40c10068f0216dec38deb0ba80782155b43fd1d72fb888cb825eaabacc3bd1ec0d18f3ca
+MISC metadata.xml 352 BLAKE2B 09915ccff13920cb1e43159bf0219bd2312529a87c09f2ec689c575d8f87a78e23033a07c9052b535a8584b19fa06229cf9b5213013fd42d7a1b5354d8236ef6 SHA512 c5dbac31e43517ba73f20a6cf8119b27c2d13334f1736b7e92ee3d9685145fde839cbdd09af311c01a3c5897684bc6c1d668d9a2541b921c7a9816bb3afd3223
diff --git a/dev-ml/num/metadata.xml b/dev-ml/num/metadata.xml
index d0e866f244f8..000cf86e43c1 100644
--- a/dev-ml/num/metadata.xml
+++ b/dev-ml/num/metadata.xml
@@ -5,4 +5,8 @@
<email>tupone@gentoo.org</email>
<name>Tupone Alfredo</name>
</maintainer>
+ <maintainer type="person">
+ <email>gienah@gentoo.org</email>
+ <name>Mark Wright</name>
+ </maintainer>
</pkgmetadata>
diff --git a/dev-ml/num/num-1.3-r1.ebuild b/dev-ml/num/num-1.3-r1.ebuild
new file mode 100644
index 000000000000..ca07753a4fde
--- /dev/null
+++ b/dev-ml/num/num-1.3-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib findlib
+
+DESCRIPTION="Library for arbitrary-precision integer and rational arithmetic"
+HOMEPAGE="https://github.com/ocaml/num"
+SRC_URI="https://github.com/ocaml/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE=""
+
+DEPEND=">=dev-lang/ocaml-4.09.0:=[ocamlopt]
+ >=dev-ml/findlib-1.8.1[ocamlopt]"
+RDEPEND="${DEPEND}"
+BDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-cflags.patch
+)
+
+src_compile() {
+ emake CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+ findlib_src_preinst
+ OCAMLPATH="${OCAMLFIND_DESTDIR}" emake install DESTDIR="${D}"
+}
diff --git a/dev-ml/ocaml-autoconf/Manifest b/dev-ml/ocaml-autoconf/Manifest
index a22afd4851e0..22e48a87a599 100644
--- a/dev-ml/ocaml-autoconf/Manifest
+++ b/dev-ml/ocaml-autoconf/Manifest
@@ -1,3 +1,3 @@
DIST ocaml-autoconf-1.1.tar.gz 10987 BLAKE2B 830a5f5055866054fe251a5e67aad51985b047c1fa8f233453cea95cbc2a41c76e89bc1cf61c56562b0f2880fd6a40695358aea8c36a13df89f7f7ece2309e54 SHA512 ee99766df98b003a3caf33d1109fb0e0c068cecd16a4ea77f39adab910df3198981de45302bdedf17d9ae6b4801a1c45ce5a5f47860d789ba06027910aeea3a5
-EBUILD ocaml-autoconf-1.1-r1.ebuild 462 BLAKE2B 180369fb8bb59f11ef4ec43e48510d553d27d958fc4b18225627ef6d3d8a67a5bb16d3515bd6c85865e6a27c69011ec4e00c4b3f83fe1ff67bf717801e3ca8d2 SHA512 f3e45a790687ddf8e769a956ea5df5cbbe67d01bbb84f101cf6741ae8114177b40b4d79e31b66d27012ca1a2a189e4c4dca4eab73feb7dd35313943dea5a641b
+EBUILD ocaml-autoconf-1.1-r1.ebuild 469 BLAKE2B af1f2cafbe9e58e1c5777f512eae8a99dfe55acd01d39dd696c14c9e82b05426c48a9bfe0ebfe63df61e754222fd5441eec07147bec4787f0133abfa7ae91f81 SHA512 2cd6dc6e4b38a2ab855609649aefa73741c3438280694cb9ea2db433fdd325038e11368ce82505836f64a3d05bf5e31389b6f7819128273fa9b54c3b25affe9c
MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-ml/ocaml-autoconf/ocaml-autoconf-1.1-r1.ebuild b/dev-ml/ocaml-autoconf/ocaml-autoconf-1.1-r1.ebuild
index 7b2ab99fb8e2..3543bd9c3053 100644
--- a/dev-ml/ocaml-autoconf/ocaml-autoconf-1.1-r1.ebuild
+++ b/dev-ml/ocaml-autoconf/ocaml-autoconf-1.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="http://forge.ocamlcore.org/frs/download.php/282/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
src_install() {
emake DESTDIR="${D}" prefix="/usr" install
diff --git a/dev-ml/ocaml-compiler-libs/Manifest b/dev-ml/ocaml-compiler-libs/Manifest
index 91c2ed9668e2..0672d901ddbc 100644
--- a/dev-ml/ocaml-compiler-libs/Manifest
+++ b/dev-ml/ocaml-compiler-libs/Manifest
@@ -1,3 +1,5 @@
+DIST ocaml-compiler-libs-0.12.3.tar.gz 4982 BLAKE2B 83432cbb2707964f025b294a84cdcce77137156e409d85ce8615dd6e9a26ad085cd5de178ebeb7520cd95b19a15b3cfbf7ef9567d165b55e07850a231b68371c SHA512 748ae11fe4cedb12d153ef2e712a9899f6a7ab4a35ddb7c95c0ae25af979c3edf274046745dddb2253fc06be41d5b0029f11a5a823a17d1ee680ffb29c4bdc89
DIST ocaml-compiler-libs-0.9.0.tar.gz 6937 BLAKE2B d53a8312ffabfed0b137d435497b4d7953239f57176481f522cbb70fd49a1a8045850d7572830455aefff1a91c6c461c03f40392b386bacb03afda3f72e39005 SHA512 ee0751bcfb9cb75d272f7af4f7da184c0a8e348384a2481da9dea0245a4133de908a23d0a324e0353397a4f0c5bfd71d40a6a46dbd8e4acea922bad7cdc5ef64
+EBUILD ocaml-compiler-libs-0.12.3.ebuild 511 BLAKE2B e686fa23f7998dd096cd6a041a944b82c6a1ea85523747abb5176b665f063a8c3b868b00c0dc827be153851fce65e2e77d1783abaf2aa9dfafff8fac1b0460a7 SHA512 46c5e8ea62c35a9ae7b822c62834a13651fdfc0947a846c79c5f109e772c2cac20afa8d7ed0c96a72f54f59ab562da329ac53643bc97c70a8382fdef215cc2ba
EBUILD ocaml-compiler-libs-0.9.0.ebuild 503 BLAKE2B 33c52b9fcc53493a2ff3ccf0382727a646ea1f22c1584bafad31be9167e581003986d58cd25693d1d933fbbf92cdc1ce3aa5ece8ad300a7d4d70f9f982283b60 SHA512 0dbffb4360a13f62719e16ca2487eca8c09bca5ea1b32fe7f1608790c92e46d4a56f5693cfe697cf9df6369cc450a7c0df5d70d4ce820829b71cb65485042838
-MISC metadata.xml 262 BLAKE2B d7304653f48782c8efacafb545457ea98b6b4b2570591a8866e37d37e68c7d002868e0b5421143bad4a94a796131c268d1ed59c2ea72cc41a91ea26065aa359c SHA512 bf2d79c33f71e2966ce79323c84e33ad8d8aed07c32dada1b7e1ef851ebef6f94f5bccd2c9bba1cb3b78ea31a2b4ddfe0eacea85e9a2d9fe4691b849600f7825
+MISC metadata.xml 339 BLAKE2B a88542e3c94246704d78ae7795166cee13f24054bb39450b2c1b7f3c499514e67fcf38421100c96ca597115bf354a1e20290d22d57fa9313bfb6279020c2758e SHA512 5480f0fa988de348557ae888609a48a083798d9d4decb57e6b29c3789e83b4900a663ba15ef9cbf3c2574404046e4b1101026369355db6cdfdda8291a1eca0e5
diff --git a/dev-ml/ocaml-compiler-libs/metadata.xml b/dev-ml/ocaml-compiler-libs/metadata.xml
index b15fbc969a48..386b3cb8e9bc 100644
--- a/dev-ml/ocaml-compiler-libs/metadata.xml
+++ b/dev-ml/ocaml-compiler-libs/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>gienah@gentoo.org</email>
+ <name>Mark Wright</name>
+ </maintainer>
<upstream>
<remote-id type="github">janestreet/ocaml-compiler-libs</remote-id>
</upstream>
diff --git a/dev-ml/ocaml-compiler-libs/ocaml-compiler-libs-0.12.3.ebuild b/dev-ml/ocaml-compiler-libs/ocaml-compiler-libs-0.12.3.ebuild
new file mode 100644
index 000000000000..c298ee7aa979
--- /dev/null
+++ b/dev-ml/ocaml-compiler-libs/ocaml-compiler-libs-0.12.3.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+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 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ml/ocaml-ctypes/Manifest b/dev-ml/ocaml-ctypes/Manifest
index dcc4bac9bf92..596fdf23b0dd 100644
--- a/dev-ml/ocaml-ctypes/Manifest
+++ b/dev-ml/ocaml-ctypes/Manifest
@@ -2,8 +2,10 @@ DIST ocaml-ctypes-0.11.2.tar.gz 203564 BLAKE2B 2a8c0ee8f8dcd78c3f93b506e92f2c347
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 669 BLAKE2B 04d30b6950422de3bab6d2a9c978c76f11116846c62ad5999b5e880ad3b43343dc055a02da6b279cb852e9975631b8dad735589083b00eb3c01cda9aac8fabdb SHA512 f74ff20437a093cf2c34c9043b380be6115aa26bf129f66aa258461c3808f74dabc19973246dfef7ceec361aea681b2ac1e8eefd2b4ebc2dee15edf2fce63181
-EBUILD ocaml-ctypes-0.11.3.ebuild 672 BLAKE2B c616bea5bd0e2333029c7e7726e84734ba7ac4cc55249d750b1ab9bc952089f24e159583e341c3be627c228cc7c5c3de41b0f687c0cfeaf5f9a38006b12fbe0e SHA512 c5f9b645b6b2bd124efced6d2ae692f4c8196064a40a4b045dc0c3fe0b90713ba06ca20cbcb7e2a2a1bfea572fc628f6d31839f9d7a14a3e991ad7416c51710c
-EBUILD ocaml-ctypes-0.12.1.ebuild 709 BLAKE2B 8f97b11a69b0541095ff3fefea77e40008279b92d741ccd31003549a949d305e47878c171e6038f34f030e0fa5cfe07bf37be7ef9d99cc1faf0b58ee95b71a74 SHA512 b2acf3878c062e8e4fd1e5ae41e69e9b60a98517f17a8587ee754fe81770ab7a04fd75ad4260af4682eef1ead9e981170c5c2c7912c15626970e44f3687d0914
-EBUILD ocaml-ctypes-0.13.0.ebuild 709 BLAKE2B 8f97b11a69b0541095ff3fefea77e40008279b92d741ccd31003549a949d305e47878c171e6038f34f030e0fa5cfe07bf37be7ef9d99cc1faf0b58ee95b71a74 SHA512 b2acf3878c062e8e4fd1e5ae41e69e9b60a98517f17a8587ee754fe81770ab7a04fd75ad4260af4682eef1ead9e981170c5c2c7912c15626970e44f3687d0914
-MISC metadata.xml 259 BLAKE2B ddf8eb5d8aac74953e1b9d685367f3d641532971671f7c8e010ffcee7d4c55cb078da89f2e4d193e5db5bb960f6870c974891580fc1b8e20826315c174e8ca26 SHA512 be69c0254c3c0491d6e1cac0b7d62efed741aa262de2e2892c6ed343e42b30485e194488400442210b9d56613f45ae49f31f0e1674779af8285672721fc79f42
+DIST ocaml-ctypes-0.17.1.tar.gz 208101 BLAKE2B b9fe6632058a670c988ba9f1ae81b75aa5373de7231cef04d5e2ede61a44cbaa0324c04197a0a202847599a9bbe7dccd18fd3279f3f351493aaec4959caf3ada SHA512 1e197009f7e6b29b43944f757e987934337ebfa11bb2ff2ca8ba3ebc607e37cf1259d07a90d7faf4b91b49ee20d5c65357ad305f34ada0a8d336a3904233150e
+EBUILD ocaml-ctypes-0.11.2.ebuild 670 BLAKE2B 058d2278336a8fc5092606079078d2e7a19accff917bcb4679f700e5e5d07f71d4fa47079ee18a3d0b1b54bcc06f60f966aad047f44d1295edb9aae9df2b3c9d SHA512 d48415b9c30c6d63ba61c2bf98cbb2e459be1a412196c038caf9657914a8e579584f0c8eb22352c03c2f2f26c343ed3f13f2186be9f801f537a3b87f0f26e6b0
+EBUILD ocaml-ctypes-0.11.3.ebuild 673 BLAKE2B ab176999bacff4f722fccf3f38f007d2184a6e7d24ba23c242a12a79823f75ededec6d304de5d1ab8655f359a7864dc067e2ff362ac4a95481c5eb01c8e490ae SHA512 012872b8c32374e385a7d6725c4be3d1312c8a0f285264e03230f5164a49d61d78c56ef505ff8175e7e0f08e71a25ed4222f06dcc7f74df63dcd160ec95a9ac8
+EBUILD ocaml-ctypes-0.12.1.ebuild 710 BLAKE2B b5907498008fc21e9533983ba7b26ad5ced78ab269ef3bff391508bb1bda16ec6df97bef51842edef9aa7c57386c804b0af2ebda22a47253d86d1e61257e3704 SHA512 d56e928abe3e46637a14f837865a02a1083181ce8627d635ebb313db28ee65094e73e87451a18be45df72f182d4bdd37e10c40f386e31f4a8b201539bbf1cd29
+EBUILD ocaml-ctypes-0.13.0.ebuild 710 BLAKE2B b5907498008fc21e9533983ba7b26ad5ced78ab269ef3bff391508bb1bda16ec6df97bef51842edef9aa7c57386c804b0af2ebda22a47253d86d1e61257e3704 SHA512 d56e928abe3e46637a14f837865a02a1083181ce8627d635ebb313db28ee65094e73e87451a18be45df72f182d4bdd37e10c40f386e31f4a8b201539bbf1cd29
+EBUILD ocaml-ctypes-0.17.1.ebuild 805 BLAKE2B 636c3010c16883fe96817333884885db7ec0ddd885b0c7c9eef5bbb74fdee5606b6cefe2146d0b1c1edf9cd6524270e0c6b6bb730d8c09244db6e6a8fdb9abad SHA512 47174c36c496511138f40c935c615937c3ea73bf0cb0fd6e25742b072b6a97ddb4aa47162f2950ce616e80afa05e0051e163a7842e8289841b9b094233fb6365
+MISC metadata.xml 331 BLAKE2B 7deaed237d1fd18b923d5a0dee3595a7c59f35a0a4e900c417d52fad7d659d6db8b1f36d64a859df6a7770c401b9d8054f51a93dd6fdb738a34a82d8a7b08620 SHA512 35d5acf562fbf2745c71984f7bd26c5ade620c55b23a76a5b443a401a5484a3c58a74e1ab9ae0a0128b2a16c43f661f69e98cb886a3053cfc581ac618ff5c896
diff --git a/dev-ml/ocaml-ctypes/metadata.xml b/dev-ml/ocaml-ctypes/metadata.xml
index 036e86e13c25..e3a65adc3e77 100644
--- a/dev-ml/ocaml-ctypes/metadata.xml
+++ b/dev-ml/ocaml-ctypes/metadata.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
- <upstream>
- <remote-id type="github">ocamllabs/ocaml-ctypes</remote-id>
- </upstream>
+ <maintainer type="person">
+ <email>gienah@gentoo.org</email>
+ <name>Mark Wright</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
index c2e1edb4209f..4d8ab3652fdc 100644
--- a/dev-ml/ocaml-ctypes/ocaml-ctypes-0.11.2.ebuild
+++ b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.11.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -17,7 +17,7 @@ RESTRICT="!test? ( test )"
RDEPEND="
>=dev-lang/ocaml-4.02:=[ocamlopt]
- virtual/libffi
+ dev-libs/libffi
"
DEPEND="${RDEPEND}
test? ( dev-ml/ounit )"
diff --git a/dev-ml/ocaml-ctypes/ocaml-ctypes-0.11.3.ebuild b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.11.3.ebuild
index 7429fab28811..c1ff54bb429e 100644
--- a/dev-ml/ocaml-ctypes/ocaml-ctypes-0.11.3.ebuild
+++ b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.11.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -17,7 +17,7 @@ RESTRICT="!test? ( test )"
RDEPEND="
>=dev-lang/ocaml-4.02:=[ocamlopt]
- virtual/libffi
+ dev-libs/libffi
"
DEPEND="${RDEPEND}
test? ( dev-ml/ounit )"
diff --git a/dev-ml/ocaml-ctypes/ocaml-ctypes-0.12.1.ebuild b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.12.1.ebuild
index ea192196f12a..17a54dde7978 100644
--- a/dev-ml/ocaml-ctypes/ocaml-ctypes-0.12.1.ebuild
+++ b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.12.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -17,7 +17,7 @@ RESTRICT="!test? ( test )"
RDEPEND="
>=dev-lang/ocaml-4.02:=[ocamlopt]
- virtual/libffi
+ dev-libs/libffi
dev-ml/integers:=
"
DEPEND="${RDEPEND}
diff --git a/dev-ml/ocaml-ctypes/ocaml-ctypes-0.13.0.ebuild b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.13.0.ebuild
index ea192196f12a..17a54dde7978 100644
--- a/dev-ml/ocaml-ctypes/ocaml-ctypes-0.13.0.ebuild
+++ b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.13.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -17,7 +17,7 @@ RESTRICT="!test? ( test )"
RDEPEND="
>=dev-lang/ocaml-4.02:=[ocamlopt]
- virtual/libffi
+ dev-libs/libffi
dev-ml/integers:=
"
DEPEND="${RDEPEND}
diff --git a/dev-ml/ocaml-ctypes/ocaml-ctypes-0.17.1.ebuild b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.17.1.ebuild
new file mode 100644
index 000000000000..e4e0fb587c4e
--- /dev/null
+++ b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.17.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=dev-lang/ocaml-4.02:=[ocamlopt]
+ >=dev-libs/libffi-3.3_rc0:0/7
+ dev-ml/integers:=
+"
+DEPEND="${RDEPEND}
+ test? ( dev-ml/ounit2 dev-ml/lwt )"
+
+src_prepare() {
+ sed -e 's/oUnit/ounit2/g' -i Makefile.tests || die
+ default
+}
+
+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-expat/Manifest b/dev-ml/ocaml-expat/Manifest
index b0fa8c0a6dc0..a5f87e393f78 100644
--- a/dev-ml/ocaml-expat/Manifest
+++ b/dev-ml/ocaml-expat/Manifest
@@ -1,5 +1,7 @@
+AUX ounit2.patch 672 BLAKE2B a47afbc8d7c33483a8a732252f7a7a624f60364d2c055097a0af8f97b7022b09b297a4022a02317fd6e4843bd3f66a875feb8389750cd3f332560cbc38834e5b SHA512 5298115ef79f2d59cafd1c0d09e7dde8649dc16a7a84f77965078a62f76ee2d9348e10d0e2230efdd89c3ecf4cc59ba3fc7b3d5de4f2a428641e8a67a47dc220
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 823 BLAKE2B e79e689a1a2629aca38ffedaeba67a24aa45981e797648a50e0a9ef10249637a7c857820b4a3979529dce3b8820c5d85b64c9d4ed8b92a412b59f7c6421c5a59 SHA512 94bdbf2e30b52b0782b3f89a58514058c2d46049cf6045d431382b1d4c79d7672f1c9b0febd73a7e8c7fd9a19eca2166c073749767c069529e171e3e05a50150
+EBUILD ocaml-expat-1.1.0-r1.ebuild 906 BLAKE2B 0dae8b0ebabef5a8c84d85e1151e80fb271254f530f0939e6ebf988db9ca05b6605786fade5e50fe8c136dad436879f28e370d8b5d4eea79ef706262d1de94f0 SHA512 8a8cad1130b20d3467aacf86c53011c37e5710bb52dcf18a4721989b6a98c382b5c9b53722b2e2a08126329f7385b3fa10645da3162c5a28f8bfeef834e32016
EBUILD ocaml-expat-1.1.0.ebuild 823 BLAKE2B e79e689a1a2629aca38ffedaeba67a24aa45981e797648a50e0a9ef10249637a7c857820b4a3979529dce3b8820c5d85b64c9d4ed8b92a412b59f7c6421c5a59 SHA512 94bdbf2e30b52b0782b3f89a58514058c2d46049cf6045d431382b1d4c79d7672f1c9b0febd73a7e8c7fd9a19eca2166c073749767c069529e171e3e05a50150
-MISC metadata.xml 259 BLAKE2B 15d9dd0c2e0cf8df518c1b724362cd6b14648823e1837e19fe055aad4874cf9331e20b9416b73bcfed3141bbe41e8a7dbeb9f20a829872d3ca1ee721890104df SHA512 57f116015a1724a5cfba8c3f77ad0eefbcc51d8380a43856ee5ec8cee8767d96c3461cf48ad4ccdbe1842ead186c71092630ea5df967a4f2c646ef531eb8f32b
+MISC metadata.xml 331 BLAKE2B bab5b5dec6ca651b9ca68b86fbc7512bfeeb15946248234814bad8acf17aabb785e6bd23a645e205adb1c97907da43ea4dc052233c0f5b699551cae30eb77fb4 SHA512 da512352ddbdf8c8a274706656b4611e918089d0c970dc68d6ebc95200ba0900c5bfe3f7d5454d87ef7ddd5ec0e45b2da2aad531c2c22998ac0d5798fbd62d64
diff --git a/dev-ml/ocaml-expat/files/ounit2.patch b/dev-ml/ocaml-expat/files/ounit2.patch
new file mode 100644
index 000000000000..5cbcc4e12b98
--- /dev/null
+++ b/dev-ml/ocaml-expat/files/ounit2.patch
@@ -0,0 +1,17 @@
+Index: ocaml-expat-1.1.0/Makefile
+===================================================================
+--- ocaml-expat-1.1.0.orig/Makefile
++++ ocaml-expat-1.1.0/Makefile
+@@ -85,10 +85,10 @@ test: unittest
+ testopt: unittest.opt
+ ./unittest.opt
+ unittest: all unittest.ml
+- $(OCAMLFIND) ocamlc -o unittest -package oUnit -ccopt -L. -linkpkg \
++ $(OCAMLFIND) ocamlc -o unittest -package ounit2 -ccopt -L. -linkpkg \
+ $(ARCHIVE) unittest.ml
+ unittest.opt: allopt unittest.ml
+- $(OCAMLFIND) ocamlopt -o unittest.opt -package oUnit -ccopt -L. -linkpkg \
++ $(OCAMLFIND) ocamlopt -o unittest.opt -package ounit2 -ccopt -L. -linkpkg \
+ $(XARCHIVE) unittest.ml
+
+ ## Cleaning up
diff --git a/dev-ml/ocaml-expat/metadata.xml b/dev-ml/ocaml-expat/metadata.xml
index b6a93442203a..f91d68f6062b 100644
--- a/dev-ml/ocaml-expat/metadata.xml
+++ b/dev-ml/ocaml-expat/metadata.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
- <upstream>
- <remote-id type="github">whitequark/ocaml-expat</remote-id>
- </upstream>
+ <maintainer type="person">
+ <email>gienah@gentoo.org</email>
+ <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">whitequark/ocaml-expat</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ml/ocaml-expat/ocaml-expat-1.1.0-r1.ebuild b/dev-ml/ocaml-expat/ocaml-expat-1.1.0-r1.ebuild
new file mode 100644
index 000000000000..dbb092201584
--- /dev/null
+++ b/dev-ml/ocaml-expat/ocaml-expat-1.1.0-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit findlib
+
+IUSE="doc +ocamlopt test"
+RESTRICT="!test? ( 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/ounit2 )"
+
+SLOT="0/${PV}"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+PATCHES=( "${FILESDIR}/ounit2.patch" )
+
+src_compile() {
+ emake depend
+ emake all
+ if use ocamlopt; then
+ emake allopt
+ fi
+ if use doc; then
+ emake doc
+ fi
+}
+
+src_test() {
+ emake test
+ if use ocamlopt; then
+ emake testopt
+ fi
+}
+src_install() {
+ findlib_src_preinst
+ emake install
+
+ if use doc ; then
+ docinto html
+ dodoc -r doc/*
+ fi
+ dodoc README
+}
diff --git a/dev-ml/ocaml-gettext/Manifest b/dev-ml/ocaml-gettext/Manifest
index 212f0d3fb89f..09c8bc6b9641 100644
--- a/dev-ml/ocaml-gettext/Manifest
+++ b/dev-ml/ocaml-gettext/Manifest
@@ -1,8 +1,6 @@
-AUX oc43.patch 773 BLAKE2B 8b5d3892c5cc050000a6c2512a84e890871df90d93c62f952d68309949776a6cd17dc1a38b0bdab6c4698c22198a4fcc98f595efbc28e37e3620c71d1c5297fa SHA512 99d2a01f3a7db768d5832e6527adc77e4272675b1027c96972171e5da71b29654ddf06a91b0882f957419aa19a651da92ba7b1eef5e0cde9542f812ed386cf4a
AUX ocaml-unsafe-string.patch 599 BLAKE2B 22e49acb160c01cfc9eed25bfbfbf45b281ca049c77801a81c2d4a5191c50eea5650a2db2f34df1bd49169fa2bd49dbf957fee57e3fe181ef6c37252df04d693 SHA512 78ba4efdfb0e681c4ab77af7d957de7e56a67cd97557db991ab62ec857f8fa19d374c979b4773d2a9e146db5942ce124c1603aefab065c503ddded38eef9f6b7
-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 1232 BLAKE2B dc4ce36eda01887a0a0c2bf578145927fd05d595ce0c9abb88ae13da5db6f77186d6a9dc468b4e82696bb43c59e9309145e403be28dcc17b703d378b86875968 SHA512 3e196fb9d695413a7e2c4e7715fa575e87d40b7a54811b1583fd8f7dcdae5df90c76394eb76a5d8f514d32cd49c9025fb2dcf091fff79cd5cf0dac88a796c68f
-EBUILD ocaml-gettext-0.3.7-r1.ebuild 1261 BLAKE2B cfecfc4af8590c4192c91ed4c0018358b4056d6d3e5fd453c3f5b777d7b8e93a0f7e7724dc96b9471e2024a97510612ddcde19fcbde035aee7198fcbca595c91 SHA512 bd22e47e7a27b0b129378367b533dbd85428b153827ad29d36a618d49d3d701a8ae931cf2fa4241be93a43fa92ddb2c83afce5c3cc598b6b5a90ddaca9f2034d
-EBUILD ocaml-gettext-0.3.7.ebuild 1194 BLAKE2B 589c2f26e5752fe7267cfe2a2b327c55e98fc06240c828d4964c0f5fbefabe91b62f76622e3e84c3ef94ef430054df2a5efc2d80e068a0b7503def0adefccc23 SHA512 f0ad1b9ea7c1a2d320eb6ced4cb67638155f7f14234a3d946c2a6eaa5ba832d84fa1e6a2d525dcf36bfc938204dbb571ba25775e21c7fe77093aba10f06a2bbd
+DIST ocaml-gettext-0.4.2.tar.gz 110249 BLAKE2B 54a25ba9f8fb20194fdfaf651586222fab68f927ebfa711812f7c9a387ff40c19e1bf3f63124127356b32b0ca0be2c5ff4e1cdfaf5f3afe690b90c0ca96c470d SHA512 fb89be8d8d9e0ed9327b81a0c81c884ff3f1a97e46b475ef8084abded5c84a256de05d5aa0f42be94f43ab438276a4506af726b6950e4161359a9616fb5832ec
+EBUILD ocaml-gettext-0.3.7-r2.ebuild 1359 BLAKE2B 7ec1b27566f101a7e71cef5f63bf498dacc1f5f1452ab00f96b7cc7061964a1e60d4c7ea9e285f1991a8168675ff537ba99f6fbc7f2e65d9bfd185e8cf62fca7 SHA512 1aff6ac57461fe13814c0c905657bdce746f40813c4f0980bc25e98a805dd7007ca9fac5d7856b098c862c55794949702630668078642b871bdbeda88fa622e4
+EBUILD ocaml-gettext-0.4.2.ebuild 749 BLAKE2B 95dcdcaf9df4b0e51860abbc446a4c687ebfefb84d65fe6f5af6681cce65bf01e5760c434f316a970bbd1de1bba3a45e124b8d2dd53443710e8b2f827b0b9f3a SHA512 b606c611cdaa288e7cfd5885f78ece34685bed98262b011da34edc1d9791facf21e4563650bb43f289e03f6a82e8b1f3cde177810bbd46cdfd4e999c2b1027a9
MISC metadata.xml 255 BLAKE2B 9f20991c7f1da432327bc91492493455f3a029b147991795fe5e5eca1842a70342e85957766de7c6781a64f2fef770d1c8fcee6da23d87df6c5aed04cad21fbd SHA512 fbc3e6b159b378b12c4ba12e0dcf1dcf86aba2029af9959c244a9da1b4264dda7a1ff8c18655400b966bba88fcf26ba04ee371ede500e0c0c6bfc45350e954d5
diff --git a/dev-ml/ocaml-gettext/files/oc43.patch b/dev-ml/ocaml-gettext/files/oc43.patch
deleted file mode 100644
index 41996b941122..000000000000
--- a/dev-ml/ocaml-gettext/files/oc43.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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/ocaml-gettext-0.3.5-r1.ebuild b/dev-ml/ocaml-gettext/ocaml-gettext-0.3.5-r1.ebuild
deleted file mode 100644
index af60301a3390..000000000000
--- a/dev-ml/ocaml-gettext/ocaml-gettext-0.3.5-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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"
-RESTRICT="!test? ( 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-r1.ebuild b/dev-ml/ocaml-gettext/ocaml-gettext-0.3.7-r2.ebuild
index c4643c7c33ae..a71acc3dd624 100644
--- a/dev-ml/ocaml-gettext/ocaml-gettext-0.3.7-r1.ebuild
+++ b/dev-ml/ocaml-gettext/ocaml-gettext-0.3.7-r2.ebuild
@@ -17,7 +17,11 @@ RESTRICT="!test? ( test )"
PATCHES=( "${FILESDIR}"/ocaml-unsafe-string.patch )
-RDEPEND=">=dev-lang/ocaml-3.12.1:=
+# OCaml 4.10 does not support -unsafe-string by default
+# bug #666149
+RDEPEND="
+ >=dev-lang/ocaml-3.12.1:=
+ <dev-lang/ocaml-4.10.0:=
>=dev-ml/ocaml-fileutils-0.4.0:=
>=dev-ml/camomile-0.8.3:=
sys-devel/gettext
diff --git a/dev-ml/ocaml-gettext/ocaml-gettext-0.3.7.ebuild b/dev-ml/ocaml-gettext/ocaml-gettext-0.3.7.ebuild
deleted file mode 100644
index c6b4aeea4409..000000000000
--- a/dev-ml/ocaml-gettext/ocaml-gettext-0.3.7.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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"
-RESTRICT="!test? ( 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-gettext/ocaml-gettext-0.4.2.ebuild b/dev-ml/ocaml-gettext/ocaml-gettext-0.4.2.ebuild
new file mode 100644
index 000000000000..d9e81851498d
--- /dev/null
+++ b/dev-ml/ocaml-gettext/ocaml-gettext-0.4.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DUNE_PKG_NAME="gettext"
+inherit dune
+
+DESCRIPTION="Provides support for internationalization of OCaml program"
+HOMEPAGE="https://github.com/gildor478/ocaml-gettext"
+SRC_URI="https://github.com/gildor478/ocaml-gettext/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+ >=dev-ml/cppo-1.6.6
+ dev-ml/dune-configurator
+"
+RDEPEND="
+ dev-ml/base:=
+ >=dev-ml/camomile-0.8.3:=
+ >=dev-ml/ocaml-fileutils-0.4.0:=
+ sys-devel/gettext
+"
+DEPEND="
+ ${RDEPEND}
+ test? ( dev-ml/ounit )
+"
+
+src_install() {
+ dune_src_install
+}
diff --git a/dev-ml/ocaml-migrate-parsetree/Manifest b/dev-ml/ocaml-migrate-parsetree/Manifest
index c3b5bd2da042..8aa76a8df8f1 100644
--- a/dev-ml/ocaml-migrate-parsetree/Manifest
+++ b/dev-ml/ocaml-migrate-parsetree/Manifest
@@ -1,7 +1,9 @@
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
+DIST ocaml-migrate-parsetree-2.0.0.tar.gz 150973 BLAKE2B f9cdaabfccd82ba2fcd02a044815072ac6495c46ece5cce306a108246dbe68b711f163b05702dc657cc8ee56f1080a5e83430ce2084990fa4ab2a4740fef77c2 SHA512 eba6574339225c44a1872e91fb95b3e8953031b2550038497c57832c94b02297ca3215525341bbe114fe480198519965a6a1619e6490a57ad66f65eff66d160d
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 263 BLAKE2B 6ef7557f183910994ce8b65643e96bfacb7be040ca4924fcda975c33792696a1af9760ff4457ab9b6510f07b48c87f12324558828c83ae37502ce60e2653c0b0 SHA512 15095aa316b4a225ca2a733550c35440e968acbd629897415c1425144396ba1c0d5d0539c475e786c82bec50188aa2d4e0258191dc0a683585d9d71327911d6f
+EBUILD ocaml-migrate-parsetree-2.0.0.ebuild 536 BLAKE2B 09597773e464fc6d30cec839cf52afb8ed276c853bdfe05f37584a4c178b589315d270302446aa663d230dd7b6ac0ab27d9ff6f542bf9010749fbf369837b70e SHA512 a80dde2ccd6b0f356337147c07538c5c4d0cb2a83258e39d328460307ef2ef445ef87fb73c46497fa5f9390d708e20e152b06d2403f669802b0cf2505caab151
+MISC metadata.xml 342 BLAKE2B c1bebbec41dbc1faf00e8d1b04695a19d729b5d75c3972f2789ac59f8a8e7be896d8db38ffcf2f41484d611da662c546e6a3202b9ed63740050b9e19d23f288d SHA512 32160fb348d48bea4a6a814e76ae9058e87aee63167197b7ec77b1744c1b1fff8acace11fb970ba92c142ba6d5573cf3d8194df5dbb6b81fbf51eda865c8630a
diff --git a/dev-ml/ocaml-migrate-parsetree/metadata.xml b/dev-ml/ocaml-migrate-parsetree/metadata.xml
index fef8db57a990..418d2940e0c7 100644
--- a/dev-ml/ocaml-migrate-parsetree/metadata.xml
+++ b/dev-ml/ocaml-migrate-parsetree/metadata.xml
@@ -1,8 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>gienah@gentoo.org</email>
+ <name>Mark Wright</name>
+ </maintainer>
<upstream>
- <remote-id type="github">let-def/ocaml-migrate-parsetree</remote-id>
+ <remote-id type="github">ocaml-ppx/ocaml-migrate-parsetree</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-ml/ocaml-migrate-parsetree/ocaml-migrate-parsetree-2.0.0.ebuild b/dev-ml/ocaml-migrate-parsetree/ocaml-migrate-parsetree-2.0.0.ebuild
new file mode 100644
index 000000000000..08473031c00c
--- /dev/null
+++ b/dev-ml/ocaml-migrate-parsetree/ocaml-migrate-parsetree-2.0.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+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 ~ppc64 ~x86"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
+
+DEPEND="dev-ml/cinaps:="
+RDEPEND="${DEPEND}"
diff --git a/dev-ml/ocaml-ssl/Manifest b/dev-ml/ocaml-ssl/Manifest
index 66691138a1e7..fe4869fd1e2d 100644
--- a/dev-ml/ocaml-ssl/Manifest
+++ b/dev-ml/ocaml-ssl/Manifest
@@ -1,7 +1,5 @@
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 620 BLAKE2B d950526685d55613484cdd474a613bf6d2cc2d93f372580cac89241194ae6ce8c5f6d1645f751fdd702933a8cb431623ebe61fe7d4c6c3c8eb2a8a9150a9d930 SHA512 a9fd93d5eea87121d7f00e4b5b32f4e2a6780e4f60b9bd65e4e2af0db76cea76c20f8b543cd783e3303a1d699e4c51ab48d3f50d0964e88347237c07522e21bf
-EBUILD ocaml-ssl-0.5.4.ebuild 623 BLAKE2B fea8cc83a9b230c65703771659c7c5619de08b0f3db3ba13ee1741a92a5f2a3581ef8b0205a1b4c9f8e4a9f81c2c75d85e5bac7f3b4c391a9f86935e6e7e3016 SHA512 03115ad2f8da6806414183ad50aeed18d941282ddbbf114c552eca7fd9294ca8fecad656666c8f7f7386c27eb910e087f8cabc2ed375225ea1726b8f287f40b1
-EBUILD ocaml-ssl-0.5.5.ebuild 623 BLAKE2B fea8cc83a9b230c65703771659c7c5619de08b0f3db3ba13ee1741a92a5f2a3581ef8b0205a1b4c9f8e4a9f81c2c75d85e5bac7f3b4c391a9f86935e6e7e3016 SHA512 03115ad2f8da6806414183ad50aeed18d941282ddbbf114c552eca7fd9294ca8fecad656666c8f7f7386c27eb910e087f8cabc2ed375225ea1726b8f287f40b1
+DIST ocaml-ssl-0.5.9.tar.gz 32721 BLAKE2B c6b1ec659fddf384005f2cb045c0b0c059daaa93bd782904354e12e1ce63432c04c9bdc823dbfd0cd903ce872c91f0a750975cc69a56c9384ef6d09ed46c22cd SHA512 6826e5a6ab9f51013e8d097900f443d091e085e3d2d232a315a0e3a90ca334c9b9779d20dcae267f9ed961bc4a08fcb80372e669389c59a22d5c7706d37fcd5f
+EBUILD ocaml-ssl-0.5.3-r1.ebuild 619 BLAKE2B 183a3abfc50c321e29ad653cbe2055ba45873e621ffbed38d42008cf311ea3575de8209413b5dc91ed1eef8c2f1be9dfc9036b913e6f759293447dc91333183e SHA512 d6421c2302377ceed8b932b3f1e788ec77a53b6bdc9703f90a494b5cdba3a2f26e9eae81661a245a3cc395e5ffff5b0ae03aa78dad0de96597b5ce039b57c045
+EBUILD ocaml-ssl-0.5.9.ebuild 596 BLAKE2B c59b1a6b280d3506168a501dc5bb1162a276c9ea01873ba8a55351a4a9b769617b30f7918cee802370eee91b0bbad11fc1613df3f9da151146425ad8ece6f332 SHA512 e7f6faed62f89d48d15843779a0746f42d3c5b4dd27320695de4c7dc36a2e884bf693784dca6d4f2fccd3f412e2b5fe81f46941282b0a4b13ded5baaa1c62f33
MISC metadata.xml 301 BLAKE2B e06adb641ac1eec98b9d60d7b7c8f01bf5d495133b91dd1c6a586a7a212d7f5c1dd27efb42d6807d5e16eea5281379c8dd5abe0b0955ca0552b20bb714909a38 SHA512 1ec6a683ca7f9f8dad10cad74ae7a43770751ebaf4bac889b373285ba8ff4f151a746ca8973c9de0008254596d519f919f1d06beebf813f757f2971c816c0add
diff --git a/dev-ml/ocaml-ssl/ocaml-ssl-0.5.3.ebuild b/dev-ml/ocaml-ssl/ocaml-ssl-0.5.3-r1.ebuild
index cc7ee2277b7b..efafebb5ce0a 100644
--- a/dev-ml/ocaml-ssl/ocaml-ssl-0.5.3.ebuild
+++ b/dev-ml/ocaml-ssl/ocaml-ssl-0.5.3-r1.ebuild
@@ -1,23 +1,23 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# 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"
+IUSE="doc"
+
+DEPEND="
+ dev-libs/openssl:0=
+ <dev-lang/ocaml-4.09.0:="
+RDEPEND="${DEPEND}"
src_compile() {
emake -j1
diff --git a/dev-ml/ocaml-ssl/ocaml-ssl-0.5.4.ebuild b/dev-ml/ocaml-ssl/ocaml-ssl-0.5.4.ebuild
deleted file mode 100644
index f01f839f8aea..000000000000
--- a/dev-ml/ocaml-ssl/ocaml-ssl-0.5.4.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# 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"
-
-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
deleted file mode 100644
index f01f839f8aea..000000000000
--- a/dev-ml/ocaml-ssl/ocaml-ssl-0.5.5.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# 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"
-
-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.9.ebuild b/dev-ml/ocaml-ssl/ocaml-ssl-0.5.9.ebuild
new file mode 100644
index 000000000000..dfac745fb556
--- /dev/null
+++ b/dev-ml/ocaml-ssl/ocaml-ssl-0.5.9.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DUNE_PKG_NAME="ssl"
+inherit dune
+
+DESCRIPTION="OCaml bindings for OpenSSL"
+SRC_URI="https://github.com/savonet/ocaml-ssl/archive/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/savonet/ocaml-ssl"
+
+IUSE="+ocamlopt"
+
+BDEPEND="dev-ml/dune-configurator"
+DEPEND="dev-libs/openssl:0=
+ >=dev-lang/ocaml-3.10:=[ocamlopt?]"
+RDEPEND="${DEPEND}"
+
+SLOT="0/${PV}"
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+
+src_install() {
+ dune_src_install
+
+ dodoc CHANGES README.md
+}
diff --git a/dev-ml/ocamlbuild/Manifest b/dev-ml/ocamlbuild/Manifest
index a8a0883de7a7..61b3b7bebf7c 100644
--- a/dev-ml/ocamlbuild/Manifest
+++ b/dev-ml/ocamlbuild/Manifest
@@ -1,7 +1,9 @@
+AUX ocamlbuild-0.14.0-Disable-tests-failing-with-OCaml-4.08.0.patch 1259 BLAKE2B d5ef0954e0a998b1ede15404fa2ed2e4aa8cbdb556aa22665e3193e179348274963303f384e984f73c808f5745ef347b5764f4408ca20110fe03383f0d92ffc7 SHA512 84671a1db5e4df6b4c21e313bb7b620e83016015ee32f508bbb14f791d7e09f138e83891b5c18a7a8ea2f9dd0d056bc9757152211e818275182df02c9701570e
DIST ocamlbuild-0.10.1.tar.gz 193263 BLAKE2B cee82997a6b691b3df9b92055b74f05af57d7663f5dbb84701e66dffefcfe6ec00c9721e1872d546f2aea9237068e37ba7d94463d0002a8356dd4d84bc1865c0 SHA512 6d74bdce7fe147bf1a5fd570b569925b36b5f443c7251d1c13a0525e3086417b393a768722bf7d4b23a7e3178b0b3c2511499725c5a755d69783b8d555663e3b
DIST ocamlbuild-0.11.0.tar.gz 195297 BLAKE2B 2d653c402edf58035fa6efb65c99c956fe78efc4759f29c8ddab8263310a5d243d25d37d4c1a4f0699f151afb6d4c6df4c1550f95d6e915963b3d86923877225 SHA512 14bc44cc63b6c99e711658a1145247bad8263632fbb4550238cef15e226a76b83e51b83575a7a96f16b96ec321dedd0ef23f36166c354838aec1922f58179efd
DIST ocamlbuild-0.14.0.tar.gz 198267 BLAKE2B 355d61ba68e61b9ee18a9fc0fbb9062405f44707b180ca7ad4bfec727ca3d3d2cc08f17be118ca3a4161c7789d975e7f431812e9139d4fde85a1a27ab68c8ac3 SHA512 ae60247396399dfd35644c8c1986ef7679e5a9964df82e3388bfc6dd4c5b88a13d6869a698d14a9ac70dc48e4ce1c003f543c85426d8c862ca31dea37a554b07
-EBUILD ocamlbuild-0.10.1.ebuild 1037 BLAKE2B fd534a1bde1eae3851f7109695a012017657443dd4ef95ba6959dabbae19d2013ca8453fb6eb45392f5c66fbffb180b649574a030d7f79123d2f751c8023dcb2 SHA512 ff0de8a77cd41249d3c0953342665bd7a4ef70956040039f0f91004a09f03cfe0293287929ab654b8bad38605056f7c193dd52a69aac127d85d68b9245580b5b
-EBUILD ocamlbuild-0.11.0.ebuild 1127 BLAKE2B d95b57e29d00d3411b20b57499cca09f3f06929b1e715935e598e457dc9d9557f465a5024fe5ba5d7a1ac8e998a9997c81592832df9aa784f5e037f2a32a3e15 SHA512 e94a9ff4a40e32518392106fa92dd904cb702b414af75bdac79c718bc7542392b709371c61770f67609d005a127a9d05d562a25c9ecd1d52bda8cfe3bc05a3e1
-EBUILD ocamlbuild-0.14.0.ebuild 1068 BLAKE2B f40fc6a22f2f331b459acf31eda285532339d23f1e5bf49b59bd6d77db157a82d0c71251e7ca8c5475bea7844534959fca5a5a1063714d8ebf4ee0efd91389cb SHA512 a13864a59e50a74b8f06d9c749e941ebc0c20494f06324efdf3bfa6d8030811bc30f81ef79204ab6f44c8a1d87cfebbc7baa3b11001b6a3dc9319f0ac9854110
-MISC metadata.xml 248 BLAKE2B 0baa26cc2d6bf97034a28a0eaf70c71c088f133beb6d0c23414d2cc0c6f6b80cafc427e4e3336dde77669340cd71555fe7564011250045ef038abc19508bbd3d SHA512 dee41e91c23031fba453a79a56e048558d85197d7661b773b2c966c49a381d4539c7639bd1c94726de936b16a233b92424548da67859c9fcf9884348bb48d326
+EBUILD ocamlbuild-0.10.1.ebuild 1031 BLAKE2B edadfe7eab8fb9bbac62d1711fb56ebb329e8fd200debca7e5a8d47faf724b42f914ab7fa7f081cc1e5a1592a1ebc354b3c3b8e70c80d3e6e5bad65bbd2951f3 SHA512 c1df06d5e700637d6727dc043d2961d780913fb331452ebf1e5a0e6238dc575037d3d732164c3f192ad82c458aa5baacec276577c5fe44e07bde7060173f1156
+EBUILD ocamlbuild-0.11.0.ebuild 1120 BLAKE2B 92d4e78b8838ebfaa40e65d6661b5bd9af4f927ca73cdb54cd16876449009749399b582f4b2027313d2007db7eef6d8687cfffb565ef6fcbc74b7f025c737381 SHA512 59f0cedc3c19c20615648a9b8b7ac985b69e15feefb6a300f8e1d31e537c1fd37c64b58d1e0560020536c8c5f53f10968b6b7aa9a481515dc73a0b46514f706f
+EBUILD ocamlbuild-0.14.0-r1.ebuild 1150 BLAKE2B 592a50d86404cc499729403e4ea98abb559561de32ef7cedd6cf1cbdfd8b3879824362a1e4a783bdf5b811dcbebff8c16a0b9a6cf195ea11c52bc2614129528e SHA512 308ea522a74c0616cc6be9b444d6e0aa1e09197d1e9e0b687b137063c790dc8a9f286e2356a81e62edf4b1723478140b50301abbcad7de99c69541d1157ccbe9
+EBUILD ocamlbuild-0.14.0.ebuild 1177 BLAKE2B 3303eaaddf96eb32aef1a71937ec85389b3108e18ad059aa7bf50f9ca6f0c6bb5d575ff735cf18ff6722b5f2250e725fbb00c48902010c8a43f6c7bde9b61699 SHA512 cc11a58163fba7984148f8cc5524229c27cc7d71f6e0628d1b0439199ab324377e9dfc0ae54d575cc24ada2ab64e9054b8fec749d05169675b8dd5d1a623a3ee
+MISC metadata.xml 325 BLAKE2B 4474d60afbe0f4d19ef042c32db7f2c5b34bdf57a2b701d5d56c332fb29cd0416085a29f929f97b19fa0a54c74884122b978e6d893e83b28414cbacee54ea8f1 SHA512 aa8a60033589617e002ee8a9b4cbc4eff318e26246365c380174a69ddc124c38a4d3e8da0227288cdcdd0d509c52ddd5011a15313c96fb029d3783ca872d69bf
diff --git a/dev-ml/ocamlbuild/files/ocamlbuild-0.14.0-Disable-tests-failing-with-OCaml-4.08.0.patch b/dev-ml/ocamlbuild/files/ocamlbuild-0.14.0-Disable-tests-failing-with-OCaml-4.08.0.patch
new file mode 100644
index 000000000000..991f13238c05
--- /dev/null
+++ b/dev-ml/ocamlbuild/files/ocamlbuild-0.14.0-Disable-tests-failing-with-OCaml-4.08.0.patch
@@ -0,0 +1,39 @@
+From: Stephane Glondu <steph@glondu.net>
+Date: Fri, 2 Aug 2019 13:08:55 +0200
+Subject: Disable tests failing with OCaml 4.08.0
+
+---
+ testsuite/internal.ml | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/testsuite/internal.ml b/testsuite/internal.ml
+index d3c2004..a87f5e2 100644
+--- a/testsuite/internal.ml
++++ b/testsuite/internal.ml
+@@ -200,7 +200,7 @@ let () =
+ "]
+ ~targets:("src/foo.cmxs",[]) ();;
+
+-let () = test "StrictSequenceFlag"
++let _ignored () = test "StrictSequenceFlag"
+ ~options:[`no_ocamlfind; `quiet]
+ ~description:"strict_sequence tag"
+ ~tree:[T.f "hello.ml" ~content:"let () = 1; ()";
+@@ -219,7 +219,7 @@ Command exited with code 2."
+ )
+ ~targets:("hello.byte",[]) ();;
+
+-let () = test "StrictFormatsFlag"
++let _ignored () = test "StrictFormatsFlag"
+ ~options:[`no_ocamlfind; `quiet]
+ ~description:"strict_format tag"
+ ~tree:[T.f "hello.ml" ~content:"let _ = Printf.printf \"%.10s\"";
+@@ -230,7 +230,7 @@ Error: invalid format \"%.10s\": at character number 0, \
+ Command exited with code 2."
+ ~targets:("hello.byte",[]) ();;
+
+-let () = test "PrincipalFlag"
++let _ignored () = test "PrincipalFlag"
+ ~options:[`no_ocamlfind; `quiet]
+ ~description:"-principal tag"
+ ~tree:[T.f "hello.ml"
diff --git a/dev-ml/ocamlbuild/metadata.xml b/dev-ml/ocamlbuild/metadata.xml
index 4b8b15880263..234a45293e62 100644
--- a/dev-ml/ocamlbuild/metadata.xml
+++ b/dev-ml/ocamlbuild/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>gienah@gentoo.org</email>
+ <name>Mark Wright</name>
+ </maintainer>
<upstream>
<remote-id type="github">ocaml/ocamlbuild</remote-id>
</upstream>
diff --git a/dev-ml/ocamlbuild/ocamlbuild-0.10.1.ebuild b/dev-ml/ocamlbuild/ocamlbuild-0.10.1.ebuild
index a1e8c0d4d690..e290c9b2c3cc 100644
--- a/dev-ml/ocamlbuild/ocamlbuild-0.10.1.ebuild
+++ b/dev-ml/ocamlbuild/ocamlbuild-0.10.1.ebuild
@@ -9,7 +9,7 @@ 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-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="+ocamlopt"
# does not compile with ocaml-4.09 (bug # 708696 and #708872)
diff --git a/dev-ml/ocamlbuild/ocamlbuild-0.11.0.ebuild b/dev-ml/ocamlbuild/ocamlbuild-0.11.0.ebuild
index 96f238627e93..57eaf9b9882c 100644
--- a/dev-ml/ocamlbuild/ocamlbuild-0.11.0.ebuild
+++ b/dev-ml/ocamlbuild/ocamlbuild-0.11.0.ebuild
@@ -9,7 +9,7 @@ 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-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
IUSE="+ocamlopt test"
RESTRICT="!test? ( test )"
diff --git a/dev-ml/ocamlbuild/ocamlbuild-0.14.0-r1.ebuild b/dev-ml/ocamlbuild/ocamlbuild-0.14.0-r1.ebuild
new file mode 100644
index 000000000000..9f64c4e22b01
--- /dev/null
+++ b/dev-ml/ocamlbuild/ocamlbuild-0.14.0-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( 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 )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.14.0-Disable-tests-failing-with-OCaml-4.08.0.patch
+ )
+
+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.14.0.ebuild b/dev-ml/ocamlbuild/ocamlbuild-0.14.0.ebuild
index 9589db20dd0f..913b9be0fc9c 100644
--- a/dev-ml/ocamlbuild/ocamlbuild-0.14.0.ebuild
+++ b/dev-ml/ocamlbuild/ocamlbuild-0.14.0.ebuild
@@ -3,13 +3,15 @@
EAPI=5
+inherit eutils
+
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-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="+ocamlopt test"
RESTRICT="!test? ( test )"
@@ -20,6 +22,10 @@ RDEPEND="${DEPEND}
DEPEND="${DEPEND}
test? ( dev-ml/findlib )"
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-0.14.0-Disable-tests-failing-with-OCaml-4.08.0.patch
+}
+
src_configure() {
emake -f configure.make Makefile.config \
PREFIX="${EPREFIX}/usr" \
diff --git a/dev-ml/ocamlgraph/Manifest b/dev-ml/ocamlgraph/Manifest
index a5641e001df1..c21f1fda2c3b 100644
--- a/dev-ml/ocamlgraph/Manifest
+++ b/dev-ml/ocamlgraph/Manifest
@@ -2,6 +2,6 @@ AUX ocamlgraph-1.8.6-installfindlib.patch 1383 BLAKE2B dcdfa9cfde71eb22e05795041
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 1260 BLAKE2B d78bbf1b66db9a26baff4e146e1287effdd228bf86e2bdd54c02c9345f56eacbd04c72a54e6b2648f44d991ff33d151c83757d712318319d8c6c405d395cf0cd SHA512 6b96fbaa44fe9d4b7ac4a2ebb3ae318a5fb6ff892dda10f37ec8b112ae13fb1c03f0cd6e8de54f3061b3daf5e245427fc132fb8fc645621fba3ea2b3116bd017
+EBUILD ocamlgraph-1.8.7-r1.ebuild 1363 BLAKE2B 28025fea671e7b843a545e8fb1948c8aa60034f63a5d95f9974e06d5b9653dd74c181b6b5b1f2d40de30db795664b45a7db5d478d2e5ac499bed98bbaa478b3d SHA512 492aac98e26845283b78971c72ab68b81118db3997cfb2ed1764005b72f2c553f995af1142149277ec145fde1b6eda0504fdf57eed74c7c5277e767cf1ace9f5
+EBUILD ocamlgraph-1.8.8-r1.ebuild 1251 BLAKE2B 351eb2d6b472000d3cbd80ac0261f725e0b6dc00e508dce0d9c683d9cc26148b4227f6a72671a97261b7c2cd0356fd229086084bf18ff56683a982e83f8f3230 SHA512 6db448015f5671455346a43b412fc7cbfb9315c5f45db007b3bcc64b05999f256837cce7041dbf729e57108d789f57d9e14a4da0bebc35aeb0546c56b8b7c0ec
MISC metadata.xml 255 BLAKE2B 20e1fe9f33391368237c8ada78aa64c03d7fe94539dbfc0ff9824fe6f7653ce474bdf77a000ee4266352d32216efa0874b1018164d147fecebd153ef585f0ef2 SHA512 1c2273f62d1d1a9ac275ca127371f9be62684c77f89da9ff75a5c191794d2fc3d137a3f6c66e6a449c0bde7edbcce29dddf639793c5a93ab86ea49489bda1a12
diff --git a/dev-ml/ocamlgraph/ocamlgraph-1.8.7.ebuild b/dev-ml/ocamlgraph/ocamlgraph-1.8.7-r1.ebuild
index 09d0810bef2b..41454fc22085 100644
--- a/dev-ml/ocamlgraph/ocamlgraph-1.8.7.ebuild
+++ b/dev-ml/ocamlgraph/ocamlgraph-1.8.7-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
-inherit findlib eutils
+inherit eutils findlib
DESCRIPTION="O'Caml Graph library"
HOMEPAGE="http://ocamlgraph.lri.fr/index.en.html"
@@ -12,7 +12,7 @@ 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?] )"
+ gtk? ( dev-ml/lablgtk:2=[gnomecanvas,ocamlopt?] )"
DEPEND="${RDEPEND}
doc? ( dev-tex/hevea dev-ml/ocamlweb )"
IUSE="doc examples gtk +ocamlopt"
@@ -50,13 +50,14 @@ src_install() {
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
+ dodoc -r examples
docompress -x /usr/share/doc/${PF}/examples
fi
+
+ if use doc; then
+ docinto html
+ dodoc doc/*
+ fi
}
diff --git a/dev-ml/ocamlgraph/ocamlgraph-1.8.8.ebuild b/dev-ml/ocamlgraph/ocamlgraph-1.8.8-r1.ebuild
index b653703ff09d..6d7936b9e15f 100644
--- a/dev-ml/ocamlgraph/ocamlgraph-1.8.8.ebuild
+++ b/dev-ml/ocamlgraph/ocamlgraph-1.8.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -10,9 +10,9 @@ 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"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
RDEPEND=">=dev-lang/ocaml-3.10.2:=[ocamlopt?]
- gtk? ( dev-ml/lablgtk:=[gnomecanvas,ocamlopt?] )"
+ gtk? ( dev-ml/lablgtk:2=[gnomecanvas,ocamlopt?] )"
DEPEND="${RDEPEND}
doc? ( dev-tex/hevea dev-ml/ocamlweb )"
IUSE="doc examples gtk +ocamlopt"
@@ -45,13 +45,14 @@ src_install() {
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
+ dodoc -r examples
docompress -x /usr/share/doc/${PF}/examples
fi
+
+ if use doc; then
+ docinto html
+ dodoc doc/*
+ fi
}
diff --git a/dev-ml/ocamlnet/Manifest b/dev-ml/ocamlnet/Manifest
index a466d8bfb255..df5582fd184f 100644
--- a/dev-ml/ocamlnet/Manifest
+++ b/dev-ml/ocamlnet/Manifest
@@ -1,6 +1,6 @@
AUX ocaml405.patch 4761 BLAKE2B eb6a2fabcbcda0676652e4010e28edc8fd82b0d2307fb5d847105aff775e405b3399854d13be13660255aaf0a55627ab0d307545fbb7d91076a50ff103b97d34 SHA512 79378c0cb59ca4abc2280932045ca80e5d7e3ff47919067c363f96d32e24899825f79a83bcf0abfc600513eecc8e046382a42937545b4b62f9b5f992d8d29480
DIST ocamlnet-4.1.2.tar.gz 4623183 BLAKE2B 7e8d5cdc823b9e924258f75f00957ba185d49555377ba2a2d960c47e2ea958059e1ab62e27be63770bb4f547e1fa0cb788a54c3e698180b2b15f0097fe84455a SHA512 69f42042a54efd662db2217224da53513fc7e72c7b2313d4a4a1128f1b4624f4f6298434f5b19f354b832119ff151abc81e85eb0108d6eb24f30f82d176e0b4d
-DIST ocamlnet-4.1.4.tar.gz 4552969 BLAKE2B 3dfedcd09eb91d1ca8e13b7a87dfe70cfb88d57d0b4fa970fe6179affa05ba3fdeaad0dfbb6ac267e7a6530c289408b1a8ad66a805226245f80fe66770addad5 SHA512 ca502444f81898ccda27d61760a357aad59624cf3c4c025d49dd1c2e7bc3ef497c199634247ba7731e016c234e5cd92d2599d1ef9ecd55c3b6e7a64fc4773ee0
+DIST ocamlnet-4.1.8.tar.gz 4620065 BLAKE2B 8f84ce4d79de5f4a1f26d4e45f68327042b0adc22717e56eeaca03ee6371e9251c01e8736d3afe5c00a1c65ef0286d56a04c57e80377402bb19ff87955ae98d9 SHA512 e238235968b9546c60568a38e68e354378d30e7137973332dcb10da21fa775ab7b367889fc51f5bd7cb00e51582834cafe2a0c4706b0bc77a44d4571a6f22815
EBUILD ocamlnet-4.1.2.ebuild 1638 BLAKE2B b333c280a66e1500d2c99956c4d2bf21fc034e466fe2e777146f2477f88cf2709e22be8ffb03a1b991ffb9a5f1f28f7bc63b4f08e1fbee2217669313ccad5117 SHA512 5343d7253ae2019b0ddcda5ae1174038c3a32350b17c0b13216c9618f67101006b703e23d92b5462a15af1de250c0bc88754c55b9ea1970118d2a9253b4bfdd9
-EBUILD ocamlnet-4.1.4.ebuild 1585 BLAKE2B 2f56a4f9c6a9e528e08aaf1b393cedad05ea17ddbed7f214749f80cadadae4dcb4986b5d47eecb959de2868667ac76eab41b2b0b9df8a5ca15339d5be17f5ae2 SHA512 9324a69d39084ece0c4bb521d9f51424bb3df5252b216b55949ce64fae8dc73a7e002c080306f0efc2f648666894b3fe3356e5dbf38866f827f8d44a6e72b1eb
+EBUILD ocamlnet-4.1.8.ebuild 1630 BLAKE2B 36daf10d482752bcf2e84ee2cee4b5848bc0589c5ddbd402b6fbe36659f27a0669125de03a93ab224333ded36c0599009b8a26511187dd0f61d8f0643360c69e SHA512 ade6566f874f98a2fdf9843127fa0d16134d2c9b70da231e57dd6f18d80b3c79d27d8ef979b5f807f007d5b7087ffd7c035a2867a075b91da98056ec93962e82
MISC metadata.xml 340 BLAKE2B a5d53a85c5073945cf7c9c2368fa6f6b290d617f47e4f71482ac784e969e5ac26dc7df9e6261cb892f21d285b28b8ec2cc09e4d196b1e0b137b294ed9aad79f8 SHA512 e3341232ffe5655584bf06dbe24f44909512d2f73cc2f47a67e1c0116e1b86fc410d6910f74f752adcd78fd7706ece9f20367e10a1b4b075a7064f69d6a8b490
diff --git a/dev-ml/ocamlnet/ocamlnet-4.1.4.ebuild b/dev-ml/ocamlnet/ocamlnet-4.1.8.ebuild
index 1d38ddb0e813..57417a9cbe37 100644
--- a/dev-ml/ocamlnet/ocamlnet-4.1.4.ebuild
+++ b/dev-ml/ocamlnet/ocamlnet-4.1.8.ebuild
@@ -1,38 +1,40 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="5"
+EAPI=7
-inherit eutils findlib
+inherit 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"
+S="${WORKDIR}/${MY_P}"
LICENSE="ZLIB GPL-2+"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
IUSE="gtk kerberos tk httpd +ocamlopt +pcre ssl zip"
RESTRICT="installsources strip"
# 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}
+BDEPEND="
+ dev-ml/cppo
virtual/pkgconfig
"
-
-S=${WORKDIR}/${MY_P}
+RDEPEND="
+ >=dev-ml/findlib-1.0
+ >=dev-lang/ocaml-3.10.2:=[ocamlopt?]
+ pcre? ( >=dev-ml/pcre-ocaml-5:= )
+ tk? ( dev-ml/labltk:= )
+ ssl? ( net-libs/gnutls:= )
+ gtk? ( >=dev-ml/lablgtk-2:= )
+ kerberos? ( virtual/krb5 )
+ zip? ( dev-ml/camlzip:= )
+"
+DEPEND="${RDEPEND}"
ocamlnet_use_with() {
if use $1; then
@@ -61,7 +63,7 @@ src_configure() {
$(ocamlnet_use_enable tk tcl) \
$(ocamlnet_use_enable zip zip) \
$(ocamlnet_use_with httpd nethttpd) \
- || die "Error : econf failed!"
+ || die "Error: econf failed!"
}
src_compile() {
@@ -70,3 +72,7 @@ src_compile() {
emake -j1 opt
fi
}
+
+src_install() {
+ findlib_src_install
+}
diff --git a/dev-ml/ocamlsdl/Manifest b/dev-ml/ocamlsdl/Manifest
index 2a9ff6227839..3a81152fb94b 100644
--- a/dev-ml/ocamlsdl/Manifest
+++ b/dev-ml/ocamlsdl/Manifest
@@ -1,4 +1,5 @@
-AUX ocamlopt.patch 818 BLAKE2B 8b4f66bc97b7aa6defda38324004ac68911708358fd1f8fa736701b19982e983480d804b13ed655dfe185333a5a21c2d6deefbb6c95eaac2226303c063c53dab SHA512 02e9b226073a537f5fc95059fb840c2f4be373470dea81934bea39ed9db5f7132c24d4da81bd64a04b51b9b8ea0d4e0bbc4b0f0f0f352dd61fe74c05d815de73
+AUX ocamlsdl-0.9.1-fix-ocaml-4.09.0-compilation.patch 794 BLAKE2B 7a24e2c817b53464c8f1391084b8be3e58f3f95d22da746fbf1a1ee6abdfde8b5198a299ee8ea2fe009a6216890887548cfebf9d3e7de76dcd963a3cb2e81fbf SHA512 3e078c9fa3d22bc7d1471afe93342a5594d8128b6de6097ee67ef0762ca3827f4412fa730c066eb47c1cd25268044905b16e8805945ced2c980ff5ffc2d5b799
+AUX ocamlsdl-0.9.1-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
+EBUILD ocamlsdl-0.9.1.ebuild 1405 BLAKE2B e022f8dda06d22c9929266310e881e167c72553c2272c0791c10d6953b554a383d4f269c20eedb494eaab6a741619fc709ca9e6eff4d84922fc325464e6a8495 SHA512 644a21818ba43d743226ca2bcb4259809d67e4b5b4854794f0796c587ae84eee35a932ee304006e72ebd90c4d7b7daec9c9864929f9754796a06305c78161a70
MISC metadata.xml 245 BLAKE2B 061c12d0ba598827b52cd2af5321b8eea7e3110f1c75d694f36ceb2cb99af806bc3a7ef77ec1fd50754b6cedb70db1e1bbaeba782669b78caeeed83ca552a397 SHA512 a5af747d33959b0aa17b0427a4163fa3718edc16ecf361c27916947f769dbb6b9c3cc9d8bfb92234f4c3405bd6dc1a0a8343a7f5667c16fbfa406007bffab932
diff --git a/dev-ml/ocamlsdl/files/ocamlsdl-0.9.1-fix-ocaml-4.09.0-compilation.patch b/dev-ml/ocamlsdl/files/ocamlsdl-0.9.1-fix-ocaml-4.09.0-compilation.patch
new file mode 100644
index 000000000000..d8085a8289bc
--- /dev/null
+++ b/dev-ml/ocamlsdl/files/ocamlsdl-0.9.1-fix-ocaml-4.09.0-compilation.patch
@@ -0,0 +1,28 @@
+https://sources.debian.org/patches/ocamlsdl/0.9.1-3/0002-Fix-compilation-with-OCaml-4.08.0.patch/
+From: Stephane Glondu <steph@glondu.net>
+Date: Fri, 6 Sep 2019 09:35:32 +0200
+Subject: Fix compilation with OCaml 4.08.0
+
+---
+ src/sdlmouse.ml | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/sdlmouse.ml b/src/sdlmouse.ml
+index 5d3120b..39cc58d 100644
+--- a/src/sdlmouse.ml
++++ b/src/sdlmouse.ml
+@@ -49,12 +49,12 @@ external cursor_data : cursor -> cursor_data
+ = "ml_SDL_Cursor_data"
+
+ let string_of_bits x =
+- let s = String.make 8 ' ' in
++ let s = Bytes.make 8 ' ' in
+ for i=0 to 7 do
+ if x land (1 lsl i) <> 0
+ then s.[7-i] <- '@'
+ done ;
+- s
++ Bytes.to_string s
+
+ let pprint_cursor c =
+ let { data = data ; mask = mask } = cursor_data c in
diff --git a/dev-ml/ocamlsdl/files/ocamlopt.patch b/dev-ml/ocamlsdl/files/ocamlsdl-0.9.1-ocamlopt.patch
index 603654dceffa..603654dceffa 100644
--- a/dev-ml/ocamlsdl/files/ocamlopt.patch
+++ b/dev-ml/ocamlsdl/files/ocamlsdl-0.9.1-ocamlopt.patch
diff --git a/dev-ml/ocamlsdl/ocamlsdl-0.9.1.ebuild b/dev-ml/ocamlsdl/ocamlsdl-0.9.1.ebuild
index a18399af37b0..7f87baab89ee 100644
--- a/dev-ml/ocamlsdl/ocamlsdl-0.9.1.ebuild
+++ b/dev-ml/ocamlsdl/ocamlsdl-0.9.1.ebuild
@@ -1,12 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
-inherit findlib eutils
+inherit findlib
DESCRIPTION="OCaml SDL Bindings"
-
HOMEPAGE="http://ocamlsdl.sourceforge.net"
SRC_URI="mirror://sourceforge/ocamlsdl/${P}.tar.gz"
LICENSE="LGPL-2"
@@ -25,18 +24,19 @@ RDEPEND="
"
DEPEND="${RDEPEND}"
-src_prepare() {
- epatch "${FILESDIR}/ocamlopt.patch"
-}
+PATCHES=(
+ "${FILESDIR}/${PN}-0.9.1-ocamlopt.patch"
+ "${FILESDIR}/${PN}-0.9.1-fix-ocaml-4.09.0-compilation.patch"
+)
src_configure() {
myconf=""
if use opengl; then
- destdir=`ocamlfind printconf destdir`
- lablgldir=`find ${destdir} -name "lablgl" -or -name "lablGL"`
+ 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"`
+ destdir=$(ocamlc -where)
+ lablgldir=$(find ${destdir} -name "lablgl" -or -name "lablGL")
fi
if [ ! -z "${lablgldir}" ]; then
@@ -47,8 +47,9 @@ src_configure() {
#use noimage && myconf="${myconf} --without-sdl-image"
#use nomixer && myconf="${myconf} --without-sdl-mixer"
- econf $myconf \
- `use_enable truetype sdl-ttf`
+ econf \
+ $myconf \
+ $(use_enable truetype sdl-ttf)
}
src_install() {
@@ -58,6 +59,7 @@ src_install() {
doinfo doc/*.info*
if use doc; then
- dohtml doc/html/*
+ docinto html
+ dodoc doc/html/*
fi
}
diff --git a/dev-ml/ocamlweb/Manifest b/dev-ml/ocamlweb/Manifest
index efbaa261bb3b..3a2c444cdc0b 100644
--- a/dev-ml/ocamlweb/Manifest
+++ b/dev-ml/ocamlweb/Manifest
@@ -1,4 +1,8 @@
AUX ocamlweb-1.37-strip.patch 718 BLAKE2B b393c62c0ae1e276f0feebb0b9fb6d339af5bf57c9fb73864df2a42d51cabe695474b90bd567686af80ecbddad2981508ce8fb98d65a239bde8e7ecc89934edc SHA512 b4741ac5c7c4b3bbb1c1dae7449bb4b57cbf2b8c269b8ae668e5d14bc98ae973a83502c6bb560e06b9bd0536b4ec914713e159e286b41806071bcd160145b712
+AUX ocamlweb-1.41-ocaml-4.08.0.patch 1798 BLAKE2B 3bd06439f093dd25195070b41bfc59af9f0b54ad5d6dd0a705926961a1e60f49a64b62d11ffaa56f40bcd9cb0260344a8cd66f1c9b713b7238a2a83d710e06e5 SHA512 b9019c0377e24f719c086ce3ecc1117a2a96375f608d63a5267e0e6c466e60d43db2a714659201d2c74da7c0d7499c8c8982e31f5f87d7f6229a77f7ceb3dadf
+AUX ocamlweb-1.41-strip.patch 705 BLAKE2B 207e1771412bdba7985cebcb349e5c8fca09218dcee0ec78183bcb3160dc039e7ea7f81fbbdc2ef80dda05c1130faa24a3d09f4546262c4dbb832ed2b532b982 SHA512 54c211cb3b78b04bd4212acee0065e3c8614729a841691e1e29b8c553b73df20114bfcee4191ea519597c37a3c7344651647263fe6463829b780d7cc17710491
DIST ocamlweb-1.39.tar.gz 141866 BLAKE2B 14ab9c595133d34d9711da2232fdf6a89a7b134ec2537e70d6ee6ecbfdb19a8bfb6a1a7aed6207cbb1bbe1f5e7b651d33fed35d8f26129d69e29dc5995d5c342 SHA512 f4e2d330222378b632ace70efb7062c93002a85db6dc9a821706a76a1e1c00da4d4e82e618f162584003b821bc72d2d11508ae22474db61cc4367ed528d21d50
+DIST ocamlweb-1.41.tar.gz 141844 BLAKE2B b89b20bdc8b99d34069b2e32a6bd8c9684e294fba667a4b74080b34f37c6d90432c61e71e27f4f1772cda8a26891655bd99a21defa584f4a1c68ae1e0d58d454 SHA512 7a6403f8b0de3feeef9657e8aff10e6f1fe29edc400ce3f11c6435d6350314423fb74e192e4275a9ad47170019d6a960daf74f245539f0f3f2a6072cc7195442
EBUILD ocamlweb-1.39.ebuild 669 BLAKE2B 6e16d76acdc5611f0f56dcfa5ec30b753b058200e7dc675da98c3e4b0241368fc5a831a210006f7546a1443331fafc1242455f40885c2903a514e44935b03285 SHA512 643b172a6b98ea4e790f4ea556d49733eaf4d08969046b8d8e88c429972c23f5e91bee3adef320119291510fcf68acdc05d89e07ee79e956748b44418b8b1266
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+EBUILD ocamlweb-1.41.ebuild 723 BLAKE2B 03ab25140d652447c45361ef3e843d0b836436b785904ca03752157194a522f281227129e3e2361339c9d05232e0a07b6efb9738948a76fe07222f8bd5bcc2e4 SHA512 37489e88424c00029c7d4d8698bef36eb68af3fe402a5cba86bf437a6a08d071b603cda3b0695cd667f376000cf5f6b3810d9ba965351f562f60c81e5bba3142
+MISC metadata.xml 244 BLAKE2B c82f45966666e095a27d4d8b14f01f93e202177ea8222c5fc806f4e243b8ca653a61232533a6dd10ed36a35f765dc94cfc651f9fade565b8eedfe1129b5c2d23 SHA512 756b8d091c29b6c4c621ba30588da62cf99e777243fbdd88cc668f3ec071353beea675c853f8c58752fbc6c01c795760cb10428d3a7fd087967a88b885d91149
diff --git a/dev-ml/ocamlweb/files/ocamlweb-1.41-ocaml-4.08.0.patch b/dev-ml/ocamlweb/files/ocamlweb-1.41-ocaml-4.08.0.patch
new file mode 100644
index 000000000000..b8da9e02b032
--- /dev/null
+++ b/dev-ml/ocamlweb/files/ocamlweb-1.41-ocaml-4.08.0.patch
@@ -0,0 +1,53 @@
+From: Stephane Glondu <steph@glondu.net>
+Date: Fri, 6 Sep 2019 09:53:22 +0200
+Subject: Fix compilation with OCaml 4.08.0
+
+---
+ web.ml | 18 ++++++++++--------
+ 1 file changed, 10 insertions(+), 8 deletions(-)
+
+diff --git a/web.ml b/web.ml
+index 7dc1470..6f9ca51 100644
+--- a/web.ml
++++ b/web.ml
+@@ -247,14 +247,16 @@ let norm_string s =
+
+ let alpha_string s1 s2 =
+ match what_is_first_char s1, what_is_first_char s2 with
+- | Symbol, Symbol -> s1 < s2
+- | Symbol, _ -> true
+- | _, Symbol -> false
+- | _,_ -> norm_string s1 < norm_string s2
++ | Symbol, Symbol -> compare s1 s2
++ | Symbol, _ -> -1
++ | _, Symbol -> 1
++ | _,_ -> compare (norm_string s1) (norm_string s2)
++
++let ( ++ ) c1 c2 =
++ if c1 = 0 then c2 else c1
+
+ let order_entry e1 e2 =
+- (alpha_string e1.e_name e2.e_name) ||
+- (e1.e_name = e2.e_name && e1.e_type < e2.e_type)
++ alpha_string e1.e_name e2.e_name ++ compare e1.e_type e2.e_type
+
+ (*s The following function collects all the index entries and sort them
+ using [alpha_string], returning a list. *)
+@@ -264,7 +266,7 @@ module Idset = Set.Make(struct type t = index_entry let compare = compare end)
+ let all_entries () =
+ let s = Idmap.fold (fun x _ s -> Idset.add x s) !used Idset.empty in
+ let s = Idmap.fold (fun x _ s -> Idset.add x s) !defined s in
+- Sort.list order_entry (Idset.elements s)
++ List.sort order_entry (Idset.elements s)
+
+
+ (*s When we are in \LaTeX\ style, an index entry only consists in two lists
+@@ -324,7 +326,7 @@ let list_in_table id t =
+ try
+ let l = Whereset.elements (Idmap.find id t) in
+ let l = map_succeed_nf find_where l in
+- let l = Sort.list (fun x x' -> snd x < snd x') l in
++ let l = List.sort (fun x x' -> compare (snd x) (snd x')) l in
+ uniquize l
+ with Not_found ->
+ []
diff --git a/dev-ml/ocamlweb/files/ocamlweb-1.41-strip.patch b/dev-ml/ocamlweb/files/ocamlweb-1.41-strip.patch
new file mode 100644
index 000000000000..1cb407a4a51e
--- /dev/null
+++ b/dev-ml/ocamlweb/files/ocamlweb-1.41-strip.patch
@@ -0,0 +1,17 @@
+--- ocamlweb-1.41-orig/Makefile.in 2019-01-25 20:54:14.000000000 +1100
++++ ocamlweb-1.41/Makefile.in 2020-10-12 19:49:20.490860201 +1100
+@@ -61,14 +61,12 @@
+
+ ocamlweb: $(CAML_CMX) $(CAMLLEX_CMX) $(CMX)
+ $(CAMLCOPT) $(OPTFLAGS) -o $@ -I +compiler-libs ocamloptcomp.cmxa $(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
index 6f49eba8f496..a4f6be63adba 100644
--- a/dev-ml/ocamlweb/metadata.xml
+++ b/dev-ml/ocamlweb/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>gienah@gentoo.org</email>
+ <name>Mark Wright</name>
+ </maintainer>
</pkgmetadata>
diff --git a/dev-ml/ocamlweb/ocamlweb-1.41.ebuild b/dev-ml/ocamlweb/ocamlweb-1.41.ebuild
new file mode 100644
index 000000000000..74561b53a6b0
--- /dev/null
+++ b/dev-ml/ocamlweb/ocamlweb-1.41.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit latex-package
+
+DESCRIPTION="O'Caml literate programming tool"
+HOMEPAGE="https://www.lri.fr/~filliatr/ocamlweb/"
+SRC_URI="https://www.lri.fr/~filliatr/ftp/ocamlweb/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
+
+DEPEND=">=dev-lang/ocaml-4.08.0:=
+ virtual/latex-base
+ dev-texlive/texlive-latexextra
+ "
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.41-strip.patch"
+ "${FILESDIR}/${PN}-1.41-ocaml-4.08.0.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/Manifest b/dev-ml/ocplib-endian/Manifest
index fc2faf175c94..782b3c422f32 100644
--- a/dev-ml/ocplib-endian/Manifest
+++ b/dev-ml/ocplib-endian/Manifest
@@ -1,3 +1,5 @@
DIST ocplib-endian-1.0.tar.gz 62753 BLAKE2B d343343eb22b7ff591219ad0d45502e3450cd4200d8f3cc7f8a4783bdd93752d015b686b57aa574f58344dc44cec751ba89e68f93770ca5df73a98d95a604b8d SHA512 a08fd58ec5e72510c40e8b75e0ee8327ee658f479e45dd4632bc04e3907d04aaa3684df3b993ab63fc2a6c1f1a4fb32784e9b5258730d3b89a716300522d8d7f
+DIST ocplib-endian-1.1.tar.gz 17544 BLAKE2B 62e4b1cb998ac00fd3cfd7178939b6c9f8c1bebe7c0dc072fbb45b79172cb07f4466e5f1e6e93b41e3fb8c3df8020d2033eb24abfec4906d3ad003fa22bdcd27 SHA512 39351c666d1394770696fa89ac62f7c137ad1697d99888bfba2cc8de2c61df05dd8b3aa327c117bf38f3e29e081026d2c575c5ad0022bde92b3d43aba577d3f9
EBUILD ocplib-endian-1.0.ebuild 567 BLAKE2B ecafe568edef8828f8a5828f272006f43a783ede73fcbfe5912c6e2f32d86a3d81b5b4fa03d901d5c7819308f6485eafe402d9296a75dd72381c65dae1411364 SHA512 9d7e7db49577d98be5d4a6b861c04766d12e3368bdcef29ac61c6a91471adfea49c638cdb633225fa6e5dd06e4c6862dceaaf85a04365a62667d0ede0214773c
-MISC metadata.xml 267 BLAKE2B 9dc41201846b7c37b0ae0f25c33c80565f84e3af99d0deb4d679469fa7e2916478064a82add297168e990b11d5fbc26716660d1d0a3f257f74929260cba5757a SHA512 a8bccbd85788cc5c7439bac9926948a657331d96367e99d4e9d3466b30a83a02bfd2f56be92a943840d0507f2cec8552853750e31d6b258976e4747188162ddf
+EBUILD ocplib-endian-1.1-r1.ebuild 540 BLAKE2B 0d822598889fa857b5061c51e83396bf8a3c7d4c7ee9dce532e329cffbacb19f49c9040eb502139de1dacb2b72b0e87edcd987316b528f0743e94a55d09501b0 SHA512 21544a29bda1adf0b3b11b5368cd143f246e4ad24c5f86c19be9c5aa9af6af43fc8a69e73277aaf1d4be4534809fe3f8abbfd9bd8d92a88cd7651158ea7c57b7
+MISC metadata.xml 331 BLAKE2B 99f5f2a85b64311e955383fbd71c64c917376f9b831a7edaf202ef4bfa0e613c64bc889099db33d5837d5c4bab28e77ae210e40597c30586b97b69fbc719b7b7 SHA512 8dc69602c2b6c4296a4d8c8777baa73b00a39b5b2d2893a9d4896d96595223bc9be74d01bdc9051852ba96e6157f7fe145d42fc5816cc6c53a3b548ea2681e30
diff --git a/dev-ml/ocplib-endian/metadata.xml b/dev-ml/ocplib-endian/metadata.xml
index 97705efc3173..79e925f71327 100644
--- a/dev-ml/ocplib-endian/metadata.xml
+++ b/dev-ml/ocplib-endian/metadata.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
- <upstream>
- <remote-id type="github">OCamlPro/ocplib-endian</remote-id>
- </upstream>
+ <maintainer type="person">
+ <email>gienah@gentoo.org</email>
+ <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">OCamlPro/ocplib-endian</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ml/ocplib-endian/ocplib-endian-1.1-r1.ebuild b/dev-ml/ocplib-endian/ocplib-endian-1.1-r1.ebuild
new file mode 100644
index 000000000000..1cfb90194e02
--- /dev/null
+++ b/dev-ml/ocplib-endian/ocplib-endian-1.1-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+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 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+# 2 of 70 tests fail
+RESTRICT="test"
+
+BDEPEND=">=dev-ml/cppo-1.6.6"
diff --git a/dev-ml/octavius/Manifest b/dev-ml/octavius/Manifest
index 42342ace5367..c9d3b02305b5 100644
--- a/dev-ml/octavius/Manifest
+++ b/dev-ml/octavius/Manifest
@@ -1,3 +1,5 @@
DIST octavius-1.1.0.tar.gz 13767 BLAKE2B ad6f7a252ff853eb26348ce66cfa6ce9afdc4a4655d4f0c79e0f5e1ab354bfed62da396c312ca8b402ebf116a5be70afce7b26810723c2b27be37656bc63406f SHA512 db1f7da7af07d9ff1a4b1c51dbd2861e4dddab13958e7bccdd0c42494fa95f0b4277b222652ef73198f5aeb2ac44de4204459c7d1085810864958da251d5ec09
+DIST octavius-1.2.2.tar.gz 14910 BLAKE2B ad2c6cc274e205918276ed8ab58032ce3f5fb5d564c1ad7cc33c2d73accf1952e972899bd872b9bcb190fcfa223ee4de7f74fbeba44720b3fe78725d1d4d2561 SHA512 57e40f0bd03599bf0b14d85b29bef2214f9b9393917c0a65acf60cf028fe028a730a804f3c0101fee1378cacd4feb7a4f2df3c8411ceeb6bb34d47f849b7a55e
EBUILD octavius-1.1.0.ebuild 450 BLAKE2B 890d492333ee9bbcb5122a170202d1aaccb58eb49c1b4c69e93d1f21da3d64066afc9550b1e3342b3662c8f2d8318b8b89a7d3a4b198f3e8b80c2264cc88d0b7 SHA512 05466c47a33878bf1d50f3c08a97d0282f55b32aee80bded4724e6f4360dd369a98dd5ce42efcc9c1429bd615b674181ae46b7ee95509bb59eb1d43f699dcbb2
-MISC metadata.xml 250 BLAKE2B d35cce29eae671942c8eeb9e13e142a309427e0f1b4ed65ec56bceb3cc67a3b5a8eb66941e96128b22c0672b75d5ea4f8b391fd7e1623a93b1b69c9d060004d3 SHA512 51aa5775cfda0f2d1295e1d4651fb635e87655bb965cfe63b71b597f8f718045ff9ee9284981fe482183fa3ca292bb2d3250b23f73bf5b357d44a52516a25386
+EBUILD octavius-1.2.2.ebuild 431 BLAKE2B 05ffb5459a8ae306e0c68a1075d5f5c23ac7cf8de8a76bcc399ba04714a5ef8da62043ff02414cae8262e50423e2e0a69e918a411f78fb580fc136db04704c8d SHA512 b645bf6c1d3350d549fc86b72132f30991f17c4ed139cc1541ff2829bd35be9c5181bdca8babe6d24904a417c9886f47bed1ae75bde89281a445eaccf06243a9
+MISC metadata.xml 327 BLAKE2B 58702e13c3b8968a045cfef09983d51eefe7d52e2e698e79573403887bb75f0365c1aebb23a442227bd498ab62c5c6fbc41253fed5d289be7e6bb97a808edf99 SHA512 ebff2af79425cbf3b4b403ee4caa36ef7eade90779a52cf247c100684f973b80974e7c2c1f819168d17c692b2b8405bc2cfb6be14f6cbaf1a78785ae259279ba
diff --git a/dev-ml/octavius/metadata.xml b/dev-ml/octavius/metadata.xml
index fbaf2f9f38c4..365c9666dff4 100644
--- a/dev-ml/octavius/metadata.xml
+++ b/dev-ml/octavius/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>gienah@gentoo.org</email>
+ <name>Mark Wright</name>
+ </maintainer>
<upstream>
<remote-id type="github">ocaml-doc/octavius</remote-id>
</upstream>
diff --git a/dev-ml/octavius/octavius-1.2.2.ebuild b/dev-ml/octavius/octavius-1.2.2.ebuild
new file mode 100644
index 000000000000..e619b181ec6f
--- /dev/null
+++ b/dev-ml/octavius/octavius-1.2.2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+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 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+RDEPEND=""
+DEPEND="${DEPEND}"
diff --git a/dev-ml/ocurl/Manifest b/dev-ml/ocurl/Manifest
index 4b30499e8ce7..3f29e22beb2a 100644
--- a/dev-ml/ocurl/Manifest
+++ b/dev-ml/ocurl/Manifest
@@ -1,7 +1,5 @@
-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
+DIST ocurl-0.9.1.tar.gz 111393 BLAKE2B 83ec8f5e2e83b5cc519683556ca97818a092a80f41305394cc04088371c1179f256dee3d8a8e80597837fb156299698450c70ca00f1ec336ace46b02b84bb51e SHA512 f4acb596f213ce57e749c9805225330b532e17718f3b228745b438cd1fe6d89b37e56d401a11c329107729dd0e6bdd4a425d547f9a83dabe32edbf18aca585b5
EBUILD ocurl-0.7.10.ebuild 768 BLAKE2B 1f149546cd5a8f83a1d4d53cda2672d8f32c08d15c5f4e9dd521704175cc36c2852744b4f3058eb500447a49404608d9529a060833fefb32cd4d97c63dd4be75 SHA512 3f59e918a13afe9141041515ee93ee7cbb185918256db46293d8f51d90139226232c1e1f7ac72a4625da9ae18f2ebe8663ec060788953d8cf1bad732c7c400ad
-EBUILD ocurl-0.7.9.ebuild 761 BLAKE2B eac0a936f2bd14139c71209f5eae4a2f59af87e6559643a19befa4d45b5908c3b24859423a6da666534f83c6226c83be9263db136229898fc88724bc591929bd SHA512 984169a875b0225fa636afc1a552e77dcb8027e2172ad46468aad87d7769b76700602e81234d78816cd7d3e2d5a4fc6b5a42282a2b4d5b6ddaabe716460884bd
+EBUILD ocurl-0.9.1.ebuild 792 BLAKE2B c26cb7dbf1f4ee2a2d2227fb8172ec80f4540cd62043451686e27e678a4ac06319c9f8264dabd1a26828ef05960dfd2091c5972eee07727a9cf190d3498a1163 SHA512 a3508cabdbb86f129752c527ed25213cfba6fbc9c21af3a1f7c7b5c8424eb1f89725cae5c37d89904bc38d07555979b5a8b1d9da35b8f051acfc6849e744f3a0
MISC metadata.xml 248 BLAKE2B fe3026d958889632df0c7f1830afde1cbdb5897819d451db6a083424d0bf8d1e1b4481aa5d015116f6420f40a82270cb833357bddb31fcc2415124d5f81f80de SHA512 31d785847bcf3bdb00d8358b10c988f77c62121b8a287440917b1950fa35ac595527b85b5d3d0bda5abfd1e34802787f6dc6b810adf03a18e87ce4c9f1b30903
diff --git a/dev-ml/ocurl/ocurl-0.6.1.ebuild b/dev-ml/ocurl/ocurl-0.6.1.ebuild
deleted file mode 100644
index 39c4fd5cab5f..000000000000
--- a/dev-ml/ocurl/ocurl-0.6.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# 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.9.ebuild b/dev-ml/ocurl/ocurl-0.9.1.ebuild
index 978bdea229b6..d21999abf2a9 100644
--- a/dev-ml/ocurl/ocurl-0.7.9.ebuild
+++ b/dev-ml/ocurl/ocurl-0.9.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
inherit findlib
@@ -11,23 +11,21 @@ LICENSE="MIT"
SRC_URI="https://github.com/ygrek/ocurl/archive/${PV}.tar.gz -> ${P}.tar.gz"
SLOT="0/${PV}"
-IUSE="examples"
+IUSE="examples +ocamlopt"
+BDEPEND="virtual/pkgconfig"
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"
+ >=dev-lang/ocaml-3.12:=[ocamlopt?]"
+DEPEND="${RDEPEND}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-src_compile()
-{
+src_compile() {
emake -j1 all
}
-src_install()
-{
+src_install() {
findlib_src_install
dodoc CHANGES.txt README.md
if use examples; then
diff --git a/dev-ml/opam-client/Manifest b/dev-ml/opam-client/Manifest
new file mode 100644
index 000000000000..a501702d41ca
--- /dev/null
+++ b/dev-ml/opam-client/Manifest
@@ -0,0 +1,3 @@
+DIST opam-2.0.7.tar.gz 636708 BLAKE2B 2824a5c53f4103c267f99ae10f55df740b3afcc033321e888133817c0e53c4a8fc31738338df3d6d9ff8755987e85ade4a4726be98f77b06b81ffc1476d02c3d SHA512 2ade3998a94333a5a838b55e229ab0c707e678481cae892980b986fb86f39163070a9b7d3e0e87879cd57b91a33bf6a3e15f3786c3510a635e59383782218f1d
+EBUILD opam-client-2.0.7.ebuild 761 BLAKE2B d5109fc827941ca38c2aacd990413e663af88039c33c0eb1d7bc78d2af5dac8cc8d23060a4cb7a6b2c82c9ba99e87095fd3a2dba66a26215267dee93421e6133 SHA512 3a08ab42ae35d934ac1c87cae2d864ba3ed620ab18b63c8216b85f976eec71006c6583abc821ddd67f73e90da339edfe968cb15e5189254b81ebdd1ae253ad97
+MISC metadata.xml 319 BLAKE2B f3a6de363afedd8ecf6d5cd898b0ecc0c7da67070f8929f39f6e5395303505e9b2679cd32ba4445f155aa522bc09f5c6bdb09a3941f679c5eb1ff757040f0d40 SHA512 c251d0c83e251b9f20f83be5d67381c562400dc1567a4d3a32b396c309dc669b03f1d7e25e4d953c155d41aeaad07d47a67a2c602855cd45d5c9bb749dfa3b3f
diff --git a/dev-ml/opam-client/metadata.xml b/dev-ml/opam-client/metadata.xml
new file mode 100644
index 000000000000..970e090f0dfd
--- /dev/null
+++ b/dev-ml/opam-client/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>gienah@gentoo.org</email>
+ <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">ocaml/opam</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/opam-client/opam-client-2.0.7.ebuild b/dev-ml/opam-client/opam-client-2.0.7.ebuild
new file mode 100644
index 000000000000..f9a4f7fe06b9
--- /dev/null
+++ b/dev-ml/opam-client/opam-client-2.0.7.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="opam client libraries"
+HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam"
+SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+RDEPEND="
+ dev-ml/opam-state:=
+ dev-ml/opam-file-format:=
+ dev-ml/re:=
+ dev-ml/opam-solver:=
+ dev-ml/cmdliner:=
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/opam-${PV/_/-}"
+
+src_prepare() {
+ default
+ cat <<- EOF >> "${S}/dune"
+ (env
+ (dev
+ (flags (:standard -warn-error -3-9-33)))
+ (release
+ (flags (:standard -warn-error -3-9-33))))
+ EOF
+}
diff --git a/dev-ml/opam-core/Manifest b/dev-ml/opam-core/Manifest
new file mode 100644
index 000000000000..87bba10d765f
--- /dev/null
+++ b/dev-ml/opam-core/Manifest
@@ -0,0 +1,3 @@
+DIST opam-2.0.7.tar.gz 636708 BLAKE2B 2824a5c53f4103c267f99ae10f55df740b3afcc033321e888133817c0e53c4a8fc31738338df3d6d9ff8755987e85ade4a4726be98f77b06b81ffc1476d02c3d SHA512 2ade3998a94333a5a838b55e229ab0c707e678481cae892980b986fb86f39163070a9b7d3e0e87879cd57b91a33bf6a3e15f3786c3510a635e59383782218f1d
+EBUILD opam-core-2.0.7.ebuild 868 BLAKE2B 95450353248ac25ae9fa03c5f1f37ace1615dbe7c861011e906005835870e83a513b75b49a1bea8b48f2934439452695caea70bb9f224f75e4d28da31e3861ca SHA512 46dde7182f1ab6c0bd52368f158ec7a4038d3cc3b5b4ac7ac9486fe0f7a4bc02cf6ef5c61a855d8d17bed27e2acba6d3f0c5d463e10e6471f10c23a664c3bfe3
+MISC metadata.xml 319 BLAKE2B f3a6de363afedd8ecf6d5cd898b0ecc0c7da67070f8929f39f6e5395303505e9b2679cd32ba4445f155aa522bc09f5c6bdb09a3941f679c5eb1ff757040f0d40 SHA512 c251d0c83e251b9f20f83be5d67381c562400dc1567a4d3a32b396c309dc669b03f1d7e25e4d953c155d41aeaad07d47a67a2c602855cd45d5c9bb749dfa3b3f
diff --git a/dev-ml/opam-core/metadata.xml b/dev-ml/opam-core/metadata.xml
new file mode 100644
index 000000000000..970e090f0dfd
--- /dev/null
+++ b/dev-ml/opam-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="person">
+ <email>gienah@gentoo.org</email>
+ <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">ocaml/opam</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/opam-core/opam-core-2.0.7.ebuild b/dev-ml/opam-core/opam-core-2.0.7.ebuild
new file mode 100644
index 000000000000..a6adc1400f93
--- /dev/null
+++ b/dev-ml/opam-core/opam-core-2.0.7.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# We are opam
+OPAM_INSTALLER_DEP=" "
+
+inherit opam
+
+DESCRIPTION="Core libraries for opam"
+HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam"
+SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="
+ dev-ml/ocamlgraph:=
+ dev-ml/re:=
+ dev-ml/opam-file-format:=
+ dev-ml/cmdliner:=
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/opam-${PV/_/-}"
+OPAM_INSTALLER="${S}/opam-installer"
+
+src_prepare() {
+ default
+ cat <<- EOF >> "${S}/dune"
+ (env
+ (dev
+ (flags (:standard -warn-error -3-9)))
+ (release
+ (flags (:standard -warn-error -3-9))))
+ EOF
+}
+
+src_compile() {
+ emake -j1 opam-installer
+ emake -j1 ${PN}.install
+}
diff --git a/dev-ml/opam-file-format/Manifest b/dev-ml/opam-file-format/Manifest
new file mode 100644
index 000000000000..340a14482158
--- /dev/null
+++ b/dev-ml/opam-file-format/Manifest
@@ -0,0 +1,3 @@
+DIST opam-file-format-2.1.0.tar.gz 23233 BLAKE2B 34d832c5ee13a0db43e77f3b33e7728faa7dccccc8daed50dca89630ab11d6f307413b8fecfef5a7c3e0f7ea04ef27105c8f42d8b5227d2587bdc2c2defe59d3 SHA512 b948545497de0386457a9b5772924572249e38164aa49d5ab2ac9442d1231a56a3b8132a95197d74cbbe34336a7edc04eaca351a8763c4a009a512085ca0ab25
+EBUILD opam-file-format-2.1.0.ebuild 728 BLAKE2B 6750f5f33d722c8d2ca34fedac9317b01e3cf146f6bd517ff86b88b8ae857a65a894622a9c035372f67c2b601cdf91e0caba901234da5ce633987c79eff9840f SHA512 2d5e16e1b431be60174d0ef49ddc78f3696503c24b90a934fd60ebfc021f0fc56bbf73c13f096e40d46694d1e3befce3581f4a1745c526a06c82199ebc3eace2
+MISC metadata.xml 331 BLAKE2B 751c0b5766797be20f0bed7ef34e0e09ecc3c374e57e872f861662cb2cc950797d977c96edb5666390ed4acad198b92cab8eb1f3990daebd30fc47a121942a6e SHA512 1947996742f0cf50068b4bd36a75605ba80bd268b3b89c4a34686832212fa5eaf1c74430f7a1ff8ef577e7a69363f8bb2313f9a8c69ab631465e12f9b58900a6
diff --git a/dev-ml/opam-file-format/metadata.xml b/dev-ml/opam-file-format/metadata.xml
new file mode 100644
index 000000000000..bd15aa2f0672
--- /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="person">
+ <email>gienah@gentoo.org</email>
+ <name>Mark Wright</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.1.0.ebuild b/dev-ml/opam-file-format/opam-file-format-2.1.0.ebuild
new file mode 100644
index 000000000000..54b598e0e0a4
--- /dev/null
+++ b/dev-ml/opam-file-format/opam-file-format-2.1.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit findlib
+
+MY_PV="${PV/_beta/-beta}"
+MY_PV="${MY_PV/_rc/-rc}"
+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/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+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-format/Manifest b/dev-ml/opam-format/Manifest
new file mode 100644
index 000000000000..3c888fff621a
--- /dev/null
+++ b/dev-ml/opam-format/Manifest
@@ -0,0 +1,3 @@
+DIST opam-2.0.7.tar.gz 636708 BLAKE2B 2824a5c53f4103c267f99ae10f55df740b3afcc033321e888133817c0e53c4a8fc31738338df3d6d9ff8755987e85ade4a4726be98f77b06b81ffc1476d02c3d SHA512 2ade3998a94333a5a838b55e229ab0c707e678481cae892980b986fb86f39163070a9b7d3e0e87879cd57b91a33bf6a3e15f3786c3510a635e59383782218f1d
+EBUILD opam-format-2.0.7.ebuild 849 BLAKE2B 212adcdb209318c15e0bd587b2291509ea7a59d1d4589afd6b561ef436ffc6df70daa1cfed8b986a6625b95634c9a5553a5028c75dd2681eee6cac28b1b9c8d2 SHA512 637949eb0eee32363c56f4c7e33f8ad550fd2e6a02cc9781578e8e25199b3bd05016e52f46bb0ba12af387841a304de2c474b6684c1735c39170c22705cc79cb
+MISC metadata.xml 319 BLAKE2B f3a6de363afedd8ecf6d5cd898b0ecc0c7da67070f8929f39f6e5395303505e9b2679cd32ba4445f155aa522bc09f5c6bdb09a3941f679c5eb1ff757040f0d40 SHA512 c251d0c83e251b9f20f83be5d67381c562400dc1567a4d3a32b396c309dc669b03f1d7e25e4d953c155d41aeaad07d47a67a2c602855cd45d5c9bb749dfa3b3f
diff --git a/dev-ml/opam-format/metadata.xml b/dev-ml/opam-format/metadata.xml
new file mode 100644
index 000000000000..970e090f0dfd
--- /dev/null
+++ b/dev-ml/opam-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="person">
+ <email>gienah@gentoo.org</email>
+ <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">ocaml/opam</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/opam-format/opam-format-2.0.7.ebuild b/dev-ml/opam-format/opam-format-2.0.7.ebuild
new file mode 100644
index 000000000000..e163f465ffa9
--- /dev/null
+++ b/dev-ml/opam-format/opam-format-2.0.7.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# We are opam
+OPAM_INSTALLER_DEP=" "
+
+inherit opam
+
+DESCRIPTION="Core libraries for opam"
+HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam"
+SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="
+ dev-ml/opam-core:=
+ dev-ml/re:=
+ dev-ml/opam-file-format:=
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/opam-${PV/_/-}"
+OPAM_INSTALLER="${S}/opam-installer"
+
+src_prepare() {
+ default
+ cat <<- EOF >> "${S}/dune"
+ (env
+ (dev
+ (flags (:standard -warn-error -3-9)))
+ (release
+ (flags (:standard -warn-error -3-9))))
+ EOF
+}
+
+src_compile() {
+ emake -j1 opam-installer
+ emake -j1 ${PN}.install
+}
diff --git a/dev-ml/opam-installer/Manifest b/dev-ml/opam-installer/Manifest
new file mode 100644
index 000000000000..e23f8c03696f
--- /dev/null
+++ b/dev-ml/opam-installer/Manifest
@@ -0,0 +1,3 @@
+DIST opam-full-2.0.7.tar.gz 7929123 BLAKE2B 100acc2c31e97e47b0b584f3a153283593351d49d5e9cdaca42fdcc025b135d9538bd327927950e7e0972b20f561a0ee3d1d1b5b4b87e1e6af31761e311081e7 SHA512 670af4935bba0679c65f6592b7a52b1d429b604eb261e40b13cf72312aeb0bab0c5a76829a555fc5379a0371c352692cbabc46b460fcd9bf32b3cfebdaeceb81
+EBUILD opam-installer-2.0.7.ebuild 979 BLAKE2B 02fcbc0388aec4c5898b065b0418d65cf30903497a0b9ea676a49c1d3ae6b1f6282ab1d525a965d6ac6a5910a79033cabd8b69ccf872e92f40d8c929cc2eb59e SHA512 484bfccf97b0392792f71cffad42222a37a7ca7e351c3ec8aa7fa54fa04a2f8074fa26155c0f2619d4a48bceb9672c27c33f15621d12ac2d06a87d7dcfc6f682
+MISC metadata.xml 319 BLAKE2B f3a6de363afedd8ecf6d5cd898b0ecc0c7da67070f8929f39f6e5395303505e9b2679cd32ba4445f155aa522bc09f5c6bdb09a3941f679c5eb1ff757040f0d40 SHA512 c251d0c83e251b9f20f83be5d67381c562400dc1567a4d3a32b396c309dc669b03f1d7e25e4d953c155d41aeaad07d47a67a2c602855cd45d5c9bb749dfa3b3f
diff --git a/dev-ml/opam-installer/metadata.xml b/dev-ml/opam-installer/metadata.xml
new file mode 100644
index 000000000000..970e090f0dfd
--- /dev/null
+++ b/dev-ml/opam-installer/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>gienah@gentoo.org</email>
+ <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">ocaml/opam</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/opam-installer/opam-installer-2.0.7.ebuild b/dev-ml/opam-installer/opam-installer-2.0.7.ebuild
new file mode 100644
index 000000000000..276428f96786
--- /dev/null
+++ b/dev-ml/opam-installer/opam-installer-2.0.7.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# We are opam
+OPAM_INSTALLER_DEP=" "
+OPAM_SKIP_VALIDATION=yes
+
+inherit opam
+
+DESCRIPTION="Core installer for opam packages"
+HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam"
+SRC_URI="https://github.com/ocaml/opam/releases/download/${PV}/opam-full-${PV}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND=">=dev-lang/ocaml-4.02.3"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/opam-full-${PV/_/-}"
+OPAM_INSTALLER="${S}/opam-installer"
+
+src_configure() {
+ econf \
+ --prefix="${EPREFIX}/usr" \
+ --with-mccs \
+ --docdir="${EPREFIX}/usr/share/doc/${PF}" \
+ --mandir="${EPREFIX}/usr/share/man"
+}
+
+src_compile() {
+ sed -e 's/DUNE = .*$/DUNE = /' -i Makefile.config
+ emake lib-ext
+ #passing -jX to the dune build leads to errors
+ #see: https://github.com/ocaml/opam/issues/3585
+ emake DUNE_PROMOTE_ARG="" -j1
+}
diff --git a/dev-ml/opam-repository/Manifest b/dev-ml/opam-repository/Manifest
new file mode 100644
index 000000000000..4bf4a616a820
--- /dev/null
+++ b/dev-ml/opam-repository/Manifest
@@ -0,0 +1,3 @@
+DIST opam-2.0.7.tar.gz 636708 BLAKE2B 2824a5c53f4103c267f99ae10f55df740b3afcc033321e888133817c0e53c4a8fc31738338df3d6d9ff8755987e85ade4a4726be98f77b06b81ffc1476d02c3d SHA512 2ade3998a94333a5a838b55e229ab0c707e678481cae892980b986fb86f39163070a9b7d3e0e87879cd57b91a33bf6a3e15f3786c3510a635e59383782218f1d
+EBUILD opam-repository-2.0.7.ebuild 755 BLAKE2B 58f55bea8bc596b724fd507a896aa92344bd5c9c1f5221cf14354d061b420863ab6ad416f13c05feb840ea3928cf4e4a0c8805596d202eb28b8b23a8f8f04385 SHA512 224ab1242de083f3c5a24242c0f8c418c5fead9f11bd7fdd1f81d700a7a089d5baab8f14c03b9ab15ed57b8e16fa0ded4184d73f10a7d1a68894f13e086a1102
+MISC metadata.xml 319 BLAKE2B f3a6de363afedd8ecf6d5cd898b0ecc0c7da67070f8929f39f6e5395303505e9b2679cd32ba4445f155aa522bc09f5c6bdb09a3941f679c5eb1ff757040f0d40 SHA512 c251d0c83e251b9f20f83be5d67381c562400dc1567a4d3a32b396c309dc669b03f1d7e25e4d953c155d41aeaad07d47a67a2c602855cd45d5c9bb749dfa3b3f
diff --git a/dev-ml/opam-repository/metadata.xml b/dev-ml/opam-repository/metadata.xml
new file mode 100644
index 000000000000..970e090f0dfd
--- /dev/null
+++ b/dev-ml/opam-repository/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>gienah@gentoo.org</email>
+ <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">ocaml/opam</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/opam-repository/opam-repository-2.0.7.ebuild b/dev-ml/opam-repository/opam-repository-2.0.7.ebuild
new file mode 100644
index 000000000000..11652c5bbcb6
--- /dev/null
+++ b/dev-ml/opam-repository/opam-repository-2.0.7.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="opam repository libraries"
+HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam"
+SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+RDEPEND="
+ dev-ml/opam-format:=
+ dev-ml/re:=
+ dev-ml/dose3:=
+ dev-ml/opam-file-format:=
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/opam-${PV/_/-}"
+RESTRICT="test"
+
+src_prepare() {
+ default
+ cat <<- EOF >> "${S}/dune"
+ (env
+ (dev
+ (flags (:standard -warn-error -3-9-33)))
+ (release
+ (flags (:standard -warn-error -3-9-33))))
+ EOF
+}
diff --git a/dev-ml/opam-solver/Manifest b/dev-ml/opam-solver/Manifest
new file mode 100644
index 000000000000..ed70e4959c4c
--- /dev/null
+++ b/dev-ml/opam-solver/Manifest
@@ -0,0 +1,3 @@
+DIST opam-2.0.7.tar.gz 636708 BLAKE2B 2824a5c53f4103c267f99ae10f55df740b3afcc033321e888133817c0e53c4a8fc31738338df3d6d9ff8755987e85ade4a4726be98f77b06b81ffc1476d02c3d SHA512 2ade3998a94333a5a838b55e229ab0c707e678481cae892980b986fb86f39163070a9b7d3e0e87879cd57b91a33bf6a3e15f3786c3510a635e59383782218f1d
+EBUILD opam-solver-2.0.7.ebuild 826 BLAKE2B 3812fd475a39b6d5bce2b98f026e08e9741c757e6cd63bda28c4eed4ef7991a441623f2c9ef956613ae7c9c99431b24a9985c7f76d4f0c81f5fe78040da141c2 SHA512 fbe9b3452115f0fd3d484c1e5ed985e6277503ed5a45bb2884b504221e56a5dc09f2625b73f32b920d4a1b50f860d86d5fc78ef688fd6c5fc0a9adcfafb25d64
+MISC metadata.xml 319 BLAKE2B f3a6de363afedd8ecf6d5cd898b0ecc0c7da67070f8929f39f6e5395303505e9b2679cd32ba4445f155aa522bc09f5c6bdb09a3941f679c5eb1ff757040f0d40 SHA512 c251d0c83e251b9f20f83be5d67381c562400dc1567a4d3a32b396c309dc669b03f1d7e25e4d953c155d41aeaad07d47a67a2c602855cd45d5c9bb749dfa3b3f
diff --git a/dev-ml/opam-solver/metadata.xml b/dev-ml/opam-solver/metadata.xml
new file mode 100644
index 000000000000..970e090f0dfd
--- /dev/null
+++ b/dev-ml/opam-solver/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>gienah@gentoo.org</email>
+ <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">ocaml/opam</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/opam-solver/opam-solver-2.0.7.ebuild b/dev-ml/opam-solver/opam-solver-2.0.7.ebuild
new file mode 100644
index 000000000000..9183ce40afde
--- /dev/null
+++ b/dev-ml/opam-solver/opam-solver-2.0.7.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="opam solver"
+HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam"
+SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ dev-ml/opam-format:=
+ dev-ml/opam-file-format:=
+ dev-ml/re:=
+ >=dev-ml/mccs-1.1.4:=
+ dev-ml/dose3:=
+ dev-ml/cudf:=
+"
+DEPEND="${RDEPEND}
+ test? ( dev-ml/opam-client )"
+
+S="${WORKDIR}/opam-${PV/_/-}"
+
+src_prepare() {
+ default
+ cat <<- EOF >> "${S}/dune"
+ (env
+ (dev
+ (flags (:standard -warn-error -3-9-33)))
+ (release
+ (flags (:standard -warn-error -3-9-33))))
+ EOF
+}
diff --git a/dev-ml/opam-state/Manifest b/dev-ml/opam-state/Manifest
new file mode 100644
index 000000000000..3165716c2fed
--- /dev/null
+++ b/dev-ml/opam-state/Manifest
@@ -0,0 +1,3 @@
+DIST opam-2.0.7.tar.gz 636708 BLAKE2B 2824a5c53f4103c267f99ae10f55df740b3afcc033321e888133817c0e53c4a8fc31738338df3d6d9ff8755987e85ade4a4726be98f77b06b81ffc1476d02c3d SHA512 2ade3998a94333a5a838b55e229ab0c707e678481cae892980b986fb86f39163070a9b7d3e0e87879cd57b91a33bf6a3e15f3786c3510a635e59383782218f1d
+EBUILD opam-state-2.0.7.ebuild 738 BLAKE2B 06a42200b392ee033a9abf9baa3ffd2f9e0e07d486c8f788c86c615ca280e14563f49f3712a09185d704d5aa60ca78dd0ee8ca27cc0f3272cf5215b717e9919b SHA512 9693f5b0919884dd311656677661cc4e17302630c3f04d38b3218cb26e3d0bbc10a96124c7306c9f2c9b2b53490f616f564e7355118652df0d394262a7d015ea
+MISC metadata.xml 319 BLAKE2B f3a6de363afedd8ecf6d5cd898b0ecc0c7da67070f8929f39f6e5395303505e9b2679cd32ba4445f155aa522bc09f5c6bdb09a3941f679c5eb1ff757040f0d40 SHA512 c251d0c83e251b9f20f83be5d67381c562400dc1567a4d3a32b396c309dc669b03f1d7e25e4d953c155d41aeaad07d47a67a2c602855cd45d5c9bb749dfa3b3f
diff --git a/dev-ml/opam-state/metadata.xml b/dev-ml/opam-state/metadata.xml
new file mode 100644
index 000000000000..970e090f0dfd
--- /dev/null
+++ b/dev-ml/opam-state/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>gienah@gentoo.org</email>
+ <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">ocaml/opam</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/opam-state/opam-state-2.0.7.ebuild b/dev-ml/opam-state/opam-state-2.0.7.ebuild
new file mode 100644
index 000000000000..a0a6b6eda7c1
--- /dev/null
+++ b/dev-ml/opam-state/opam-state-2.0.7.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="opam state libraries"
+HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam"
+SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+RDEPEND="
+ dev-ml/opam-repository:=
+ dev-ml/re:=
+ dev-ml/opam-file-format:=
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/opam-${PV/_/-}"
+RESTRICT="test"
+
+src_prepare() {
+ default
+ cat <<- EOF >> "${S}/dune"
+ (env
+ (dev
+ (flags (:standard -warn-error -3-9-33)))
+ (release
+ (flags (:standard -warn-error -3-9-33))))
+ EOF
+}
diff --git a/dev-ml/opam/Manifest b/dev-ml/opam/Manifest
index 0514f5e6f25d..1f0979ce8c83 100644
--- a/dev-ml/opam/Manifest
+++ b/dev-ml/opam/Manifest
@@ -1,4 +1,6 @@
AUX stublibs.patch 591 BLAKE2B 6aca6475f230754bba8822d5181c9bb798004efad8a5656e7f5380d03544f6e67e875b0bc7ccce41ac0262af40961a823f6fd2906433a8c66f53d67d24cb0a5c SHA512 b10fd1ed192d6bba0c893538a6c936d37330f8fc89bfc30f334c5ef1086e4274b989c7ab8e059754d87cbb64897c0657a5ff49add456f83fb035185631bacce4
DIST opam-1.3.1.tar.gz 669485 BLAKE2B e1aed54175d46f5dd9fd989e56c25657370356e26df6976c01dd089e381291fa04e25da295104f85d513010cd028276d80ebf7a4a77b38f3e089e52f4e64f43a SHA512 d075c9b2c9670d712f29bd2df34b8020da52041fa2bbef599cb54a81f63554507d78bebece45ecf668d3d1d4ed514e4ab88a1d86b64088d283bca7a8e75ae582
+DIST opam-2.0.7.tar.gz 636708 BLAKE2B 2824a5c53f4103c267f99ae10f55df740b3afcc033321e888133817c0e53c4a8fc31738338df3d6d9ff8755987e85ade4a4726be98f77b06b81ffc1476d02c3d SHA512 2ade3998a94333a5a838b55e229ab0c707e678481cae892980b986fb86f39163070a9b7d3e0e87879cd57b91a33bf6a3e15f3786c3510a635e59383782218f1d
EBUILD opam-1.3.1-r1.ebuild 1099 BLAKE2B 95092c1bc70a559f6274c066310c068ca1a0d17a77181c9adad18bac5907d2b396850f6d8a141f11542b066c076a295b03cab367b802a623a83c86d6d9f0375c SHA512 46b3072db3b5fcbb32354caefae0f918733795594308591c0cdab47c2908e15c897ac09de0c810ceea2682e0e3065ead78942d105bda4a8b8b9e12d371db85af
-MISC metadata.xml 247 BLAKE2B 379ed32a531c78d906529cf752e44582b94118b1fce4f0aae58d64eefe50f482dbc28d8ddee2eefc2f1f52891575ada26315dab7740b74ad25d6565a34fc1ac8 SHA512 2f229fb34f8db9257f0bbf50656478b1bd4f06c740445e1626287658e7e52672ef532aae58befaf239b0cbf4c0f320e6bab47c8b5babcdd581d9d83dcc95e10b
+EBUILD opam-2.0.7.ebuild 795 BLAKE2B 2e176770e5172388b6d93e97757396874734b1ff0a5ea167b071c66cec4334589ab441db1bde9bed434397b09c6517d52c19f97b324cc1537b7b8624fe2b9845 SHA512 745467a937dc4323df6572f8413d5c422c156af2f8f742e4b40194a87dee3a746209a785f24ce4c619531f70256744e566d88780f5fee50dedeac344d2ef1132
+MISC metadata.xml 319 BLAKE2B f3a6de363afedd8ecf6d5cd898b0ecc0c7da67070f8929f39f6e5395303505e9b2679cd32ba4445f155aa522bc09f5c6bdb09a3941f679c5eb1ff757040f0d40 SHA512 c251d0c83e251b9f20f83be5d67381c562400dc1567a4d3a32b396c309dc669b03f1d7e25e4d953c155d41aeaad07d47a67a2c602855cd45d5c9bb749dfa3b3f
diff --git a/dev-ml/opam/metadata.xml b/dev-ml/opam/metadata.xml
index 9d94a67c8e6c..970e090f0dfd 100644
--- a/dev-ml/opam/metadata.xml
+++ b/dev-ml/opam/metadata.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
- <upstream>
- <remote-id type="github">ocaml/opam</remote-id>
- </upstream>
+ <maintainer type="person">
+ <email>gienah@gentoo.org</email>
+ <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">ocaml/opam</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ml/opam/opam-2.0.7.ebuild b/dev-ml/opam/opam-2.0.7.ebuild
new file mode 100644
index 000000000000..61db05b45f54
--- /dev/null
+++ b/dev-ml/opam/opam-2.0.7.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="A source-based package manager for OCaml"
+HOMEPAGE="http://opam.ocaml.org/"
+SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz"
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+RDEPEND="
+ dev-ml/cmdliner:=
+ dev-ml/cudf:=
+ dev-ml/dose3:=
+ dev-ml/extlib:=
+ dev-ml/opam-client:=
+ dev-ml/opam-file-format:=
+ dev-ml/re:="
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/opam-${PV/_/-}"
+
+src_prepare() {
+ default
+ cat <<- EOF >> "${S}/dune"
+ (env
+ (dev
+ (flags (:standard -warn-error -3-9-33)))
+ (release
+ (flags (:standard -warn-error -3-9-33))))
+ EOF
+}
diff --git a/dev-ml/ounit/Manifest b/dev-ml/ounit/Manifest
index 1e2fb4949ab7..98248af621f0 100644
--- a/dev-ml/ounit/Manifest
+++ b/dev-ml/ounit/Manifest
@@ -1,3 +1,3 @@
DIST ounit-2.0.6.tar.gz 114305 BLAKE2B 94ae4e2f7ace6fe5732253d724115cdc3e24af91db2066b36439501cb17df7f44fb9230242b8400ec59a72f9317c22361f068f7f2634d29ccfdcca63cb95c275 SHA512 466ec1f691a81e0abd93f698c7328e6db4fa2d617d8f5262d9f18b57ede3d389a3ee122ed7bccc8dff20600826fbbae1d17dd88d7c1329562798792fae54417d
-EBUILD ounit-2.0.6.ebuild 467 BLAKE2B 5d98f2c39230944bc3a2555ed19e649f21b1c0a31b7cdcdd0d903eb3c0c54b073d0cdc2aeeadca27b55b7fc25b8f38a4bf8987f89642dd0dfc91f7ccdc2a08e3 SHA512 1ed4883c62fca5854fc577ebce066add696f72732e5afaebcd5857f17580d45f9a4d5dce0402f1b81ec8e359bd5c39be31814047012e3217a579bd0c0f300fde
+EBUILD ounit-2.0.6.ebuild 474 BLAKE2B b2fe101070e188388d17423862e99d4da3fc45dd851058f7797940a01d4001601f25058073bbe70dc726a9538fad9b49cd7cd1c03be8d4e5d65727ed9aaf102e SHA512 a79fddf41d6000384c917c6ecbfa81349bc704492e4cb264f11a7e50e452c6795add9b9538857e49d874e0ffb786613b5277ca954bc853b56ae0f6d18d527ff7
MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-ml/ounit/ounit-2.0.6.ebuild b/dev-ml/ounit/ounit-2.0.6.ebuild
index 2a141c85006a..b39ae6572f54 100644
--- a/dev-ml/ounit/ounit-2.0.6.ebuild
+++ b/dev-ml/ounit/ounit-2.0.6.ebuild
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 x86"
DEPEND=""
RDEPEND="${DEPEND}"
IUSE=""
diff --git a/dev-ml/ounit2/Manifest b/dev-ml/ounit2/Manifest
new file mode 100644
index 000000000000..6e6638e460b8
--- /dev/null
+++ b/dev-ml/ounit2/Manifest
@@ -0,0 +1,3 @@
+DIST ounit-v2.2.3.tbz 57449 BLAKE2B cf4742c4800ff66551416e243285ae0264f94d1665f795039cd37ad717b09fa3ba5cdfb2380169dfcddea5a27a82373ae892adf11155147a081d734091bf39d8 SHA512 dff04859d263e5f80a1606156d07493d0320a2756d0a7f134c63c53078550c7b056587486922bc66a288413af30c59a7e47157636502c6dd10626cf75587f981
+EBUILD ounit2-2.2.3.ebuild 508 BLAKE2B 9177e5e6a4eaeffea07555e65b7998aaf3fd7678459cfd5b6a19e53f1d5ad60957156ef112adbd36a30894fcd40bcb692a490a189742ea310009cfb49f55c2b1 SHA512 46d354956d9218076bcf3d06ed8e52c1b2bd9480139ac500e1a4c8a50ed5a3a6e697153da42bc5c23920f7ef88a2201fa914815d07d99389c49ebf589fa6a88b
+MISC metadata.xml 324 BLAKE2B c449d9ce329170cbebc09d1d471261f181b5e7af06e527a395f85b34d5f017b8abc0ec1af1b479d43821b622acafdfad6f2630198b6a64486698ab1d58f9635e SHA512 0f47266f1a7c530341f2e048889f26df9da2830eeceac36efb5c7077c48c124c964e7443ad1bc6876aa4b82807b43584bce5fc4706074c8faf379c9c2d0628b4
diff --git a/dev-ml/ounit2/metadata.xml b/dev-ml/ounit2/metadata.xml
new file mode 100644
index 000000000000..3084165d7481
--- /dev/null
+++ b/dev-ml/ounit2/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>gienah@gentoo.org</email>
+ <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">gildor478/ounit</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/ounit2/ounit2-2.2.3.ebuild b/dev-ml/ounit2/ounit2-2.2.3.ebuild
new file mode 100644
index 000000000000..354af513eda9
--- /dev/null
+++ b/dev-ml/ounit2/ounit2-2.2.3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Unit testing framework for OCaml"
+HOMEPAGE="https://github.com/gildor478/ounit"
+SRC_URI="https://github.com/gildor478/ounit/releases/download/v${PV}/ounit-v${PV}.tbz"
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+DEPEND="
+ dev-ml/lwt:=
+ dev-ml/stdlib-shims:=
+"
+RDEPEND="${DEPEND}"
+BDEPEND=""
+IUSE="+ocamlopt"
+
+S="${WORKDIR}/ounit-v${PV}"
diff --git a/dev-ml/parmap/Manifest b/dev-ml/parmap/Manifest
index 76655276667b..5758fe513c7a 100644
--- a/dev-ml/parmap/Manifest
+++ b/dev-ml/parmap/Manifest
@@ -1,5 +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 1095 BLAKE2B 060fa7b4eb1c3af5b9984125ce945599b5c27cb5463ae884a723a63ac2b39469456c6487b2d117f26306523150100289f9a0b0e226a6ab0be45b26f5fb298a8f SHA512 f8403ed8186993626d39e91d8f0c97b9827654fd6ca3b6c66ca670c95e7bfc604b10f0a029cad4f52013ef8f7d88d3a09100997224c4f9ffe3fd6dfca341c20f
-EBUILD parmap-1.0_rc8.ebuild 1082 BLAKE2B d30c880b75c2f84b73724f351d964bdfcbdec71d8a824f2bd6012e03be0160a0c20221a6810bed877b8d407caf6cb6868c6b0aae58faf67b57dd27da081a0675 SHA512 c0d27175d13c6f6f21b1d46453d1a463b9ac5ab03230aab5a0fe591bb519e6280e73bd8b0af721774a1dfaacd224a65ab3a8e5c7f9bc5942f5feba93a9059711
+DIST parmap-1.1.1.tar.gz 44311 BLAKE2B db80056b2207d0e6723486b930bd0636171e0f2d710706b5348f2f098eb866fe9ab5dc516754e70bc81641484d4403868950ed6b35abd926d3212402f91ca41f SHA512 8333337b4f58496dad7c3417449ad6ba319c84d5cdb8434772479c9bde5708af95c230c9e1a9a31e4276d88cce3d827b1655c42a110ccd889d1735fcfecf0c20
+EBUILD parmap-1.0_rc8.ebuild 1089 BLAKE2B 0936f97f0d2464868df7ddd870b141e7689aeb612c279a1d3521f9c8c3b903dac29cc38f9b31e7e27c1b8e995e29852dec86ea92e2fc818c0ad51b3be8a9e575 SHA512 43b7b44ee2580f63037a136436bc30e4eb57544eefab41beb041424c19666ff2b063556ab2acf2c5980acaa8396ed348178e6b465afd500f810636c538428847
+EBUILD parmap-1.1.1.ebuild 608 BLAKE2B 024dd9b769c4db08d09efd56d471bf617f08b1aad57c0ba75210a35a161bcd7e2e3122f681c8fde8edcb1f2ac54df78ee0d666b5cd87ce8ddf92b0d5f43d5a7d SHA512 be0ce8c1b8ef873dd5291665649a2245cd4a92d6b804bdaf2aa89e2ccdb8cac5795a67caadf4edfef19cda92722186065ebf8e197e91d96ba304c2ec4dba3d61
MISC metadata.xml 252 BLAKE2B f4ca811a46e4c4d8138a2d55e501d8a11cb06e5a967ace489cfb7f5dc1e995773397b42aac371c88e846f223c2fed3a1fa202250f858610b4939bcb093b7333e SHA512 aa58d5e26ea4359f6e81c4e6292ca3fc91f74326810eee7905179665efc89fe23c72860b2821d8be6f97595f84abbc30dfaa423f5f530c30640105d22b16cb19
diff --git a/dev-ml/parmap/parmap-1.0_rc7-r1.ebuild b/dev-ml/parmap/parmap-1.0_rc7-r1.ebuild
deleted file mode 100644
index 442a609b95ea..000000000000
--- a/dev-ml/parmap/parmap-1.0_rc7-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# 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="https://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
index 594ea9593feb..1f698332db44 100644
--- a/dev-ml/parmap/parmap-1.0_rc8.ebuild
+++ b/dev-ml/parmap/parmap-1.0_rc8.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/rdicosmo/parmap/archive/${MY_PV}.tar.gz -> ${P}.tar.
LICENSE="LGPL-2-with-linking-exception"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
IUSE="+ocamlopt"
RDEPEND=">=dev-lang/ocaml-4.03:=[ocamlopt?]"
diff --git a/dev-ml/parmap/parmap-1.1.1.ebuild b/dev-ml/parmap/parmap-1.1.1.ebuild
new file mode 100644
index 000000000000..7290a63d2d42
--- /dev/null
+++ b/dev-ml/parmap/parmap-1.1.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+MY_PV="${PV/_/-}"
+DESCRIPTION="Library to exploit multicore architectures for OCaml programs"
+HOMEPAGE="https://www.dicosmo.org/code/parmap/"
+SRC_URI="https://github.com/rdicosmo/parmap/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV/+/-}"
+
+LICENSE="LGPL-2-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+BDEPEND="dev-ml/dune-configurator"
+RDEPEND=">=dev-lang/ocaml-4.03:=[ocamlopt?]"
+DEPEND="${RDEPEND}"
diff --git a/dev-ml/parsexp/Manifest b/dev-ml/parsexp/Manifest
new file mode 100644
index 000000000000..cbd6c73fc855
--- /dev/null
+++ b/dev-ml/parsexp/Manifest
@@ -0,0 +1,3 @@
+DIST parsexp-0.14.0.tar.gz 48617 BLAKE2B eba36c17f08b59ed7601c4f9906e80de45e377d0134fdee30b5536c3d91af0cb45a1cdab90333498da8bf3fcf5e5bea16a8f734e7f1a92c9b865cd3136a668c2 SHA512 d9e9ea936dcf23d700e6ddd4153a2a96df6819094eaebe15d949c4569fa5125ab308af2c10f4ba2161610d8673eeb3928dd19c10a21974c140e4c89537a86575
+EBUILD parsexp-0.14.0.ebuild 473 BLAKE2B 7fbbfa56c682b319af295caa6fb9251a8fd6ee7410ec02600d7e4f9abb2bc793e740dade3cf4947afec32ee7c027e5dc9266b7b2a8c3e15b8193e4e0e4fcff94 SHA512 855fcdc7ba28f0c8f57f76f49b83ef70183e05f16450d110ff86dcd5f03a223508a09dcd1d7ca6648f041f64e6275b4b804e9a874590933138d6e5b474246b7f
+MISC metadata.xml 327 BLAKE2B eb1bef386734e20b2bf5ced714d66bfdb38bd87264def3be40810290dd5f86be06c26e52798fb126d60aebf963549b861b728856aa008ef9e39a7ea8cfcdd725 SHA512 2c810d31bf8d5c848b17b1708e5efb65fed70f6590b2681b6e5aaa9b0d175f467dd69ccc4f978324a82cb21fae027a0d0376c46fcc2c8ddafe64a20cd6efa726
diff --git a/dev-ml/parsexp/metadata.xml b/dev-ml/parsexp/metadata.xml
new file mode 100644
index 000000000000..45889fd58f9d
--- /dev/null
+++ b/dev-ml/parsexp/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>gienah@gentoo.org</email>
+ <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">janestreet/parsexp</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/parsexp/parsexp-0.14.0.ebuild b/dev-ml/parsexp/parsexp-0.14.0.ebuild
new file mode 100644
index 000000000000..578f4c168d7b
--- /dev/null
+++ b/dev-ml/parsexp/parsexp-0.14.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="S-expression parsing library "
+HOMEPAGE="https://github.com/janestreet/parsexp"
+SRC_URI="https://github.com/janestreet/parsexp/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+RDEPEND="
+ dev-ml/sexplib0:=
+ dev-ml/base:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ml/pcre-ocaml/Manifest b/dev-ml/pcre-ocaml/Manifest
index 2c3727ad51a6..23fe40d2910f 100644
--- a/dev-ml/pcre-ocaml/Manifest
+++ b/dev-ml/pcre-ocaml/Manifest
@@ -1,9 +1,5 @@
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 724 BLAKE2B 4ca3b1461aaec1dc42b5e797ce7b2a741051d2b5354f4eec873fd5a4103b5f91a23009ecc700438456db32c134638d37693af2fc682088386cd320a451f8fa65 SHA512 cd931aa45d38323deee1a566b3b5f65bb014138d0970d841325d7538f58ae8ac9d956293a1ceeb222f816c2b7699ba5135f4142803e74c76b5de91feb1b8acc0
-EBUILD pcre-ocaml-7.3.0.ebuild 838 BLAKE2B 5456386e762ef62f2a1352d817e663974cd48a8afad40e94e00598840e40c677b4995e4a5d845ee2ae2a5b7fb8f2a892e1d3ceb20af445cb39b7a50c186afb8e SHA512 b4e11062f62d07f489c299a2ce603f7ad34329f2d8a2f3cebbed19128ebd98de35b43d1f03fdc6bbfbc8894f2606bf1701e9df7b3c99bdab2ca056e1d973b6ee
-EBUILD pcre-ocaml-7.3.2.ebuild 838 BLAKE2B 5456386e762ef62f2a1352d817e663974cd48a8afad40e94e00598840e40c677b4995e4a5d845ee2ae2a5b7fb8f2a892e1d3ceb20af445cb39b7a50c186afb8e SHA512 b4e11062f62d07f489c299a2ce603f7ad34329f2d8a2f3cebbed19128ebd98de35b43d1f03fdc6bbfbc8894f2606bf1701e9df7b3c99bdab2ca056e1d973b6ee
-EBUILD pcre-ocaml-7.3.3.ebuild 838 BLAKE2B 5456386e762ef62f2a1352d817e663974cd48a8afad40e94e00598840e40c677b4995e4a5d845ee2ae2a5b7fb8f2a892e1d3ceb20af445cb39b7a50c186afb8e SHA512 b4e11062f62d07f489c299a2ce603f7ad34329f2d8a2f3cebbed19128ebd98de35b43d1f03fdc6bbfbc8894f2606bf1701e9df7b3c99bdab2ca056e1d973b6ee
+DIST pcre-ocaml-7.4.6.tbz 41027 BLAKE2B 1faecd96cb6f7af248e8ace7409a49131f5c654320f8ac432fd4aff602d0c4187733419e9cc73ca52cf0a3e5b725afa9357fe9ec191bf1ca42d4dc47a36e45b7 SHA512 a356c78dc19d3b3741d1fa0277c4fb0cb545f12499165526fae80a0ff8a7b1f1e6e5e916b16f8336bcec3661de811686b814fe4afc677965fec7a63d4fc53b1f
+EBUILD pcre-ocaml-7.2.3.ebuild 709 BLAKE2B dbf57cfee3ff256ded13d85881ad747fee1802499172f20528cb30ddecd9d37f7b9adcf81419d042ab72d3924856559189b4416044b368b450b403968cd02995 SHA512 2c6e5106604be7c0f0e686fca818c618e64660c0bee5584fdc8072c9a94180c037663219d5453bf47b821c65aa3a12b7b1e0d891b79f2bf20d3c84e0f323138c
+EBUILD pcre-ocaml-7.4.6-r1.ebuild 720 BLAKE2B 66d17f763019820e0ed6a0024e1e7244b0dce99993bfdefabc10364d7ea87bc8ef768b4d63c31c4caf349292dd594cdc548629dd4056f739e2ceff536ba689b6 SHA512 69449d3d54a73122fd9f65ac519642ee77acc994eb1df83f542d01c933774ffaaef81c171482318738beb8426193c00b886a6d2d00a5d0dbcaad44619426108d
MISC metadata.xml 316 BLAKE2B c47754948a843c41e96ff4f56536fa7f1c9cfda9e55a6d710aec847762093d99e40363fd9ec1bb8f3a6fd00701564d38a88c872d6c5d84fa0152429be8c7b371 SHA512 3bd6c5b9e74890d4bb901aab45b5c2313143606189de938157b74a453cfd768bd6a6df592ac86b00c14a6df408c87a3a97ec347aebf5333ab49b9883117d531f
diff --git a/dev-ml/pcre-ocaml/pcre-ocaml-7.2.3.ebuild b/dev-ml/pcre-ocaml/pcre-ocaml-7.2.3.ebuild
index f4be028e4ee5..eb845aa29a3c 100644
--- a/dev-ml/pcre-ocaml/pcre-ocaml-7.2.3.ebuild
+++ b/dev-ml/pcre-ocaml/pcre-ocaml-7.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -24,7 +24,7 @@ DOCS=( "AUTHORS.txt" "CHANGES.txt" "README.md" )
src_install() {
oasis_src_install
if use examples ; then
- insinto /usr/share/doc/${PF}
- doins -r examples
+ docinto examples
+ dodoc -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
deleted file mode 100644
index 47033ef2b054..000000000000
--- a/dev-ml/pcre-ocaml/pcre-ocaml-7.3.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# 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"
-
-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
deleted file mode 100644
index 47033ef2b054..000000000000
--- a/dev-ml/pcre-ocaml/pcre-ocaml-7.3.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# 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"
-
-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.4.6-r1.ebuild
index 47033ef2b054..9463a69362fd 100644
--- a/dev-ml/pcre-ocaml/pcre-ocaml-7.3.3.ebuild
+++ b/dev-ml/pcre-ocaml/pcre-ocaml-7.4.6-r1.ebuild
@@ -1,41 +1,31 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
-inherit opam
+inherit dune
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"
+S="${WORKDIR}/pcre-${PV}"
+
LICENSE="LGPL-2.1-with-linking-exception"
-IUSE="examples"
+IUSE="examples +ocamlopt"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+BDEPEND="dev-ml/dune-configurator"
RDEPEND=">=dev-libs/libpcre-4.5"
-DEPEND="${RDEPEND}
- dev-ml/jbuilder
- dev-ml/base
+DEPEND="
+ ${RDEPEND}
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
+ dune_src_install pcre
if use examples ; then
- insinto /usr/share/doc/${PF}
- doins -r examples
+ dodoc -r examples
fi
}
diff --git a/dev-ml/ppx_assert/Manifest b/dev-ml/ppx_assert/Manifest
index f68f89f40b1a..0f60f9bef9de 100644
--- a/dev-ml/ppx_assert/Manifest
+++ b/dev-ml/ppx_assert/Manifest
@@ -1,3 +1,5 @@
+DIST ppx_assert-0.14.0.tar.gz 7239 BLAKE2B 730d1cceee88728291473e73120cc1ae19477927c8f5e20b1a455ab78e34c5917907a60e03ea7d2b898ccb99e42755f1ad918d7fa59ae64bac84fd8356af7647 SHA512 b8ae4a1f08e9110f0809f98d1e0126d50101db7c5b87aa166294aed29df420a079fd2c0797c2888718acd8cd4f2aaaa98f0c445e5fb1423325cc89801e7d52b1
DIST ppx_assert-0.9.0.tar.gz 9419 BLAKE2B 7e6ea363182ce3f057e54ae54e2d7b3236d909a748c74ee79209d97de001bf1df1934bccc95bf93e674aedd5c5f5029748747242acb1246f1f08a02f8b9b6309 SHA512 4debf617f1b0244d306b65d72cbf04f4a820a8d9433180d462ff462d2bf6eb01643897cc35de75d435fedfa1bf8266263c0e73328f02b5c957a3423eb535925f
+EBUILD ppx_assert-0.14.0.ebuild 763 BLAKE2B 259471ba2ee5dbffca863430d916081820c2db30196a384106fef3fd34673932c80838658761e901a006a3d3a627dbd57beca4d65a524579d628c4d39941af90 SHA512 af67688ae84afd18b09e69e480cdcd49bb358fbf39fcf8094498750f944c3af361227b96f5e0794352f07c83d1191fe2cecd7781c2abb1f4855fbbf2a7458ffa
EBUILD ppx_assert-0.9.0.ebuild 692 BLAKE2B 950e2c913ab4a6e45ebfbbfe813260f2839acf3cda2b307dd941d76105910ee811d092ec3396cbc881e43471134b53e2faf9b41811b32b6c59f00178340a5989 SHA512 b8c325aa51bdee1bfc9293d723136f7c674445557631aabe328a23bc84bbb3cf235af3ac684fcfd4abf771e258d4073cf220f03e94b1ae09fdfd1a8bed21fb0e
-MISC metadata.xml 253 BLAKE2B 13fba4c1dfb53a2e6c05f84fab2a261c6357e4dcf949339bbae2deb92eafdde0767d47f644c6b583b39123a16248af13a245a05dae2627900c8bab67afa9a132 SHA512 c9f3517a93e015b7e16fda41cf468314590ab9c129fb3b34ed29c66de2ac44abcdc6271907b2a63637dafe1accc452cb02344116faa5b40e379392b7b2e73b1f
+MISC metadata.xml 330 BLAKE2B eaeee64f3cb9dc4bf3441dd056378a9505934294b4181499dcb9be9f182ff2c10fe00c73f748cb7cd5b9aebcb4ed33c08c0aa69ec7f35ddeac989e4997730f23 SHA512 d05d2e3223b8b74b81c8c6f742c000d4bae1d538759b3a517656797c98b36db4870556664077b46e7b8dd309b027b2afce096b62f69eae95081b6bed02af8835
diff --git a/dev-ml/ppx_assert/metadata.xml b/dev-ml/ppx_assert/metadata.xml
index 40b93dd331cd..b83f7118873b 100644
--- a/dev-ml/ppx_assert/metadata.xml
+++ b/dev-ml/ppx_assert/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>gienah@gentoo.org</email>
+ <name>Mark Wright</name>
+ </maintainer>
<upstream>
<remote-id type="github">janestreet/ppx_assert</remote-id>
</upstream>
diff --git a/dev-ml/ppx_assert/ppx_assert-0.14.0.ebuild b/dev-ml/ppx_assert/ppx_assert-0.14.0.ebuild
new file mode 100644
index 000000000000..9156a42f4fe4
--- /dev/null
+++ b/dev-ml/ppx_assert/ppx_assert-0.14.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+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 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+DEPEND="
+ >=dev-ml/base-0.14.0:=
+ dev-ml/findlib:=
+ >=dev-ml/ppx_cold-0.14.0:=
+ >=dev-ml/ppx_compare-0.14.0:=
+ >=dev-ml/ppx_here-0.14.0:=
+ >=dev-ml/ppx_sexp_conv-0.14.1:=
+ >=dev-ml/ppxlib-0.18.0:=
+ >=dev-ml/ocaml-compiler-libs-0.11.0:=
+ >=dev-ml/ocaml-migrate-parsetree-2.0.0:=
+ dev-ml/cinaps:=
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-ml/ppx_base/Manifest b/dev-ml/ppx_base/Manifest
index ba26d982b1ea..d92e87eb2f62 100644
--- a/dev-ml/ppx_base/Manifest
+++ b/dev-ml/ppx_base/Manifest
@@ -1,3 +1,5 @@
+DIST ppx_base-0.14.0.tar.gz 2953 BLAKE2B d62187d4b359dab01f88054ffb53a434402af022849a633749f3d60b625967a30b6c2ef58b838ef2ee6261d675da60f03d062ae1dc8391d5a4f0bb9cb3d719b0 SHA512 d41f36e3ddec7bdffaa93d8ec4110a197ef4d4af4f9173e060b0f1c5d9c95a33ee13379e41dc027f1103faea3b8ec4e314387b0844a7fcb78d0770ffa44c99e8
DIST ppx_base-0.9.0.tar.gz 5255 BLAKE2B ba5d1670ba0da8c13c30dab65885cb9d406d7259ca57841867f4b2c7720f8202fb34074b5bc8f03cb0858427c79e61d4a33098c846c61ebcc98d40799ced9274 SHA512 660f6b210eb6d7bd33c279ffa8bbf01c21b9db5d7827cf6fded8c52e8d4f2f5468a76c2eab86c2b868ac859bbc81db7189c71ccc1701bf57030f82d8eda4339e
+EBUILD ppx_base-0.14.0.ebuild 706 BLAKE2B ef97565b60691699dedf4ddbe8229df75e43fc1505a3fd7f779fd32b474393928a93bad3b4d951427b3cc0da6a6ba74af2c76bee1bdaa349e362fdf81ffb6380 SHA512 be5e5f87dca0000b76c9372c96a5501b76fe08722fc5968ba2fe18954f4cd56d6e957d2238431937b0a504f89c5a8e6ae9b5a63830f72f399629e7cf3288d4f5
EBUILD ppx_base-0.9.0.ebuild 635 BLAKE2B 7c0da2099b0fb19f7eed2f360b81a86a037792692993df5bdbc9a4cae1d3c6904d5e7f63d737315bbd30e24934a271890a1b4e8f3f61ae07dfa344affe8fcfb7 SHA512 a7643e1e9196b7a1022b88be184897eed4958c5b418d214ab8f4d72b24f12577426e750e9ad411265c09d263d2ca3a8bd23989cad92812abc57bc5165dc25261
-MISC metadata.xml 251 BLAKE2B 0936395d26cca241aed895d6840b19c898d1dbc2768f6c3b176e209bc4034089cac7101849c52c735f2ef8d8a66f3a6f690f4821e7096a6419004070d00346a4 SHA512 99ec249f9345bf9cc9efb7f3540cdeb31a8423367fb59f1d93fb7a17c14082a1190fa44db145a97610846f58062b15fb5e5eb37a812ec97a92ed968ba6a2093e
+MISC metadata.xml 328 BLAKE2B e1b7328cfa327457bf60415f4804f0495186b938be4e3e100d1ed396c8e9479b2837e613c1d7d088a29844049d45c35ee0eb7d5c70f73b21440769e85af440f0 SHA512 1ebbfe4c55a306032694f13d87c4367debb228c67862d8dce7dd2132533bae52091cbf1183cc970f4a4ae5db62e5cc82f3541d052633f34338487f7d62741b03
diff --git a/dev-ml/ppx_base/metadata.xml b/dev-ml/ppx_base/metadata.xml
index 7f767d650dc4..9949f15ae8cc 100644
--- a/dev-ml/ppx_base/metadata.xml
+++ b/dev-ml/ppx_base/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>gienah@gentoo.org</email>
+ <name>Mark Wright</name>
+ </maintainer>
<upstream>
<remote-id type="github">janestreet/ppx_base</remote-id>
</upstream>
diff --git a/dev-ml/ppx_base/ppx_base-0.14.0.ebuild b/dev-ml/ppx_base/ppx_base-0.14.0.ebuild
new file mode 100644
index 000000000000..5ada3ce808c0
--- /dev/null
+++ b/dev-ml/ppx_base/ppx_base-0.14.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+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 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+DEPEND="
+ >=dev-ml/ppx_cold-0.14.0:=
+ >=dev-ml/ppx_compare-0.14.0:=
+ >=dev-ml/ppx_enumerate-0.14.0:=
+ >=dev-ml/ppx_hash-0.14.0:=
+ >=dev-ml/ppx_js_style-0.14.0:=
+ >=dev-ml/ppx_sexp_conv-0.14.0:=
+ >=dev-ml/ppxlib-0.18.0:=
+ >=dev-ml/ocaml-migrate-parsetree-2.0.0:=
+ dev-ml/cinaps:=
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-ml/ppx_bench/Manifest b/dev-ml/ppx_bench/Manifest
index 979b793afe4a..a5be55a13b9e 100644
--- a/dev-ml/ppx_bench/Manifest
+++ b/dev-ml/ppx_bench/Manifest
@@ -1,3 +1,5 @@
+DIST ppx_bench-0.14.1.tar.gz 9132 BLAKE2B d8590c0b80bbde553ec28514017df6f5deaf93fc693f3c1f102a0ad1f7e616a9308b51d0fb2535f1f8279ddfb9760bdf6b546acaa06bf6181848b3f93771061d SHA512 f359ebf33b1efe91dad9c844a16a0629cd079423a10da39d093af1e1d3c94872328de9a9272a741bf8f4bca5945556d5bc70a0f8994886a934eb933959c5db63
DIST ppx_bench-0.9.1.tar.gz 11097 BLAKE2B cdf7cd97a1ce702c75aa87a717b5d7905931571c0b000cef5a4af29e18f15c22adbf4882ef5453ddd97def6b5ea7885835dc69237e70e13138670a5ced4c966b SHA512 1963525719178e34f50ee8dbe3cabe8582ffc08835e542d1ae593d6a250d4f841be53c96fbc203d620e11f9ad2a9f591e545656c3b254bd60db614ec1e06947d
+EBUILD ppx_bench-0.14.1.ebuild 619 BLAKE2B 3c6d9ff56a749d0ce5b8660da4d665cce10d92b8c65fa2a375f85dca42fce31a68dc958a92abe7261b067432a08f04c91db9c34eecfb8bca06eca7b7a483f5a5 SHA512 efe263850c261f683b4280e3ca0ef98ec259de5474c7aa6be230bd112868ea29f2f92c7cdc071f6472c165974df898e088e1c84f46895bef4f50aeacbdc3cb72
EBUILD ppx_bench-0.9.1.ebuild 594 BLAKE2B 5c312a3ad712b957218e4c2f1ec96fb1150a712097e97d3e4411e939784e7804af1078b6b4e2dc45c8c0d94d6483824cc34980251ed388e35368c86d03ee355f SHA512 81001420a848631304e656ec7b737e08e55ecd07442bb1bbce9da9fab58d288dc699fb4bded6d8ea31738259dedb7cf2e1376a62d8e078b6bd09adb736f24adc
-MISC metadata.xml 252 BLAKE2B ae722b791348c4a02ec10c52e35848be26118027ebb22bcf2b433c599931ba006d160833ce52883208e6c1293a8b006f9edbeb35afc4e284e2d283b0bb471131 SHA512 2a3df3125cf78c2a7b9e8eebe151408f4bde04afb15c5a4035c63d11b63aff4af5b4f540dbc7297cd406fccc570d3cd9cd65f75fff0cad5cca21436f7c9391ec
+MISC metadata.xml 329 BLAKE2B 603e518714536ef813a6eb2372362ba884cd60bd0ff64ea434bfcac84073ca973d211fe28e623b140dbf901b77737585358f95f67902e3e4f11b49e618d382a7 SHA512 73de0019be9f826fc7092793418865c36a41ca67eeb2c8d1ff10aef5b3a0f61d78ac29489e271b7405d71a768371522847cf3eb331265e3aa745b538ccb0b61c
diff --git a/dev-ml/ppx_bench/metadata.xml b/dev-ml/ppx_bench/metadata.xml
index 04fcf9da109a..8101d49c7a8c 100644
--- a/dev-ml/ppx_bench/metadata.xml
+++ b/dev-ml/ppx_bench/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>gienah@gentoo.org</email>
+ <name>Mark Wright</name>
+ </maintainer>
<upstream>
<remote-id type="github">janestreet/ppx_bench</remote-id>
</upstream>
diff --git a/dev-ml/ppx_bench/ppx_bench-0.14.1.ebuild b/dev-ml/ppx_bench/ppx_bench-0.14.1.ebuild
new file mode 100644
index 000000000000..578b4fa4b9c7
--- /dev/null
+++ b/dev-ml/ppx_bench/ppx_bench-0.14.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+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 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+DEPEND="
+ >=dev-ml/ppx_inline_test-0.14.1:=
+ >=dev-ml/ppxlib-0.18.0:=
+ >=dev-ml/stdio-0.14.0:=
+ >=dev-ml/ocaml-migrate-parsetree-2.0.0:=
+ dev-ml/cinaps:=
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-ml/ppx_bin_prot/Manifest b/dev-ml/ppx_bin_prot/Manifest
index a472466f73bd..aca755cd2850 100644
--- a/dev-ml/ppx_bin_prot/Manifest
+++ b/dev-ml/ppx_bin_prot/Manifest
@@ -1,3 +1,5 @@
+DIST ppx_bin_prot-0.14.0.tar.gz 36642 BLAKE2B 6a80f574fad5e3ba2bb1adad8e6af86a9bd463ab7ed8976901234694a56f9e17c04ccc74f0bd4a18c75f1a4ccd81848218078bb387f8ff2f5df337c5f2492226 SHA512 7d61624d18fd76daed5a5d60d16ac0a3fd658ef650ee6ae4b65346e96d1718a044deb3ca6fbb63c69176505f64d0d1b6becd8419061cfb69466d45e16964329b
DIST ppx_bin_prot-0.9.0.tar.gz 35234 BLAKE2B 883e7d8b3919d640408fd1efa22df6656d1146d2771313ee29bda287f8ec412b4acdabebb8ea3548918370a6048543b93e17b22141ac672a4b8c628d0c678844 SHA512 f900741f4caeec86ec9d73a086ffeec21789bdd99ca7b09a808a3e281038d587c9c326cc1217957fcd828c4e1da5902f6dee3bf4ba7a22feca5424573215a00c
+EBUILD ppx_bin_prot-0.14.0.ebuild 733 BLAKE2B 1b221cd3d1189c63bb6212553a261d6f31053154bc89e2214905a7afb2cf24c193ce24cdbbba65806b817959d751762d267a8b5b29ff3a78065886eb3ce7f2fd SHA512 eed2b13b175bc61fec11cc9e51fbe7d9576496ca02e17f741e475cc170cc35190f9bc669d48f24e89476ed78d88f366d16d2bec6a60ca2e627c507e506cf6f37
EBUILD ppx_bin_prot-0.9.0.ebuild 626 BLAKE2B c99c9a9912fa82ac2c3ff2e2567edf83ee1f0f59350203805b477b09a3a095d50790f43d1bfa5aa56d169f973ad0916c2ce275db8a30b70641ccd0e5c2e65744 SHA512 669745108b8016690c058a4c64b5ed103b0e4f8a4256871fce5ba2d0d2a631be02e6c8a4bb2ad476e7538461b21188ebdaf467b11ee59df39f333e4d6c82fe6d
-MISC metadata.xml 255 BLAKE2B e2a814c388a071c4357d01e65f31cf751cd1bf012cdecbbc8d8d95de647a85d43888f5bfe14f9cf1994a94947aa14fa6ef9b7545d49f601ed4c6974a06693568 SHA512 3c425c171074c8ef2abe5a1faa44ce4ebc59f7d826fa5dffb1e42a00a782388f3d797d4c93ce54f9f6635555cd2b9394e0f0080825301058e59e3095c8d55328
+MISC metadata.xml 332 BLAKE2B fd73be12947f8034f214321a34f0ea94e430a27f967fedbe2532e407b6a018483e4ac02927e2b35584b163fcba3e4ad3ad6902b34da79c159c44479bf455ea58 SHA512 d2907c1f5c0e51d6dca9b80b4c536d837ed6ce3b0683a446851d1abc5d873e15c26c543eaa4a790b63e10e335ea762190f568d9e182ec780b29d41f3055f19db
diff --git a/dev-ml/ppx_bin_prot/metadata.xml b/dev-ml/ppx_bin_prot/metadata.xml
index 7a2f01fd7a1f..1854dc854561 100644
--- a/dev-ml/ppx_bin_prot/metadata.xml
+++ b/dev-ml/ppx_bin_prot/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>gienah@gentoo.org</email>
+ <name>Mark Wright</name>
+ </maintainer>
<upstream>
<remote-id type="github">janestreet/ppx_bin_prot</remote-id>
</upstream>
diff --git a/dev-ml/ppx_bin_prot/ppx_bin_prot-0.14.0.ebuild b/dev-ml/ppx_bin_prot/ppx_bin_prot-0.14.0.ebuild
new file mode 100644
index 000000000000..3844f9272325
--- /dev/null
+++ b/dev-ml/ppx_bin_prot/ppx_bin_prot-0.14.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+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 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+ >=dev-ml/base-0.14.0:=
+ dev-ml/findlib:=
+ >=dev-ml/bin_prot-0.14.0:=
+ >=dev-ml/ppx_here-0.14.0:=
+ >=dev-ml/ppxlib-0.18.0:=
+ >=dev-ml/ocaml-migrate-parsetree-2.0.0:=
+ dev-ml/cinaps:=
+ "
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND}
+ test? (
+ dev-ml/ppx_jane
+ )"
diff --git a/dev-ml/ppx_cold/Manifest b/dev-ml/ppx_cold/Manifest
new file mode 100644
index 000000000000..7c35a704cce8
--- /dev/null
+++ b/dev-ml/ppx_cold/Manifest
@@ -0,0 +1,3 @@
+DIST ppx_cold-0.14.0.tar.gz 3778 BLAKE2B 5ae223047858ff11f90067fcb2a6541c964cd929e45fe9d43256b75a81599d6aa0aaf37fe7274e98c64b6448846ab8c64b1c092171392f74a395ea08ea0a60d8 SHA512 3655602defe6b5cd9740eb4cfcf480eded6912674df28955502adcd0d8d6901551e137b0660a389f8be2c88b3aebc830f57089d2ac1a82f7b9efdbaea358fe07
+EBUILD ppx_cold-0.14.0.ebuild 607 BLAKE2B d1295802e99e1150eb9157fd287d177ea9c201617efef3718ada9bd9da32de60bfb16e4f9a8d55530f5ed5c1ed8127d60131c7bbc152ee89ceca64e389033826 SHA512 7713470b611575457e9b056d01f2ce61181e26f670564b7f226e6e8f84186915a4dca15c6ba0bc535c22128db65ae6ed325be1ef8014a9612ee2dc2da2c68af4
+MISC metadata.xml 328 BLAKE2B b725f5ab6ec86d11cdb6281bd31feff543275a0dc04e2f2ec86f8ca7f3ad60e2812f753d616b7121f51f24649dbdf5dcb76cbb9fd727ddd90ab9d6a828a6667d SHA512 7425343bbb1452bc1a7c890937e41c05485e609b6154e56c08d50ea151d2683d832ee501750a8abe829ee0aa84995a164a8be62c0f6ad3284f5f94b2e8155576
diff --git a/dev-ml/ppx_cold/metadata.xml b/dev-ml/ppx_cold/metadata.xml
new file mode 100644
index 000000000000..fce837d2f493
--- /dev/null
+++ b/dev-ml/ppx_cold/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>gienah@gentoo.org</email>
+ <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">janestreet/ppx_cold</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/ppx_cold/ppx_cold-0.14.0.ebuild b/dev-ml/ppx_cold/ppx_cold-0.14.0.ebuild
new file mode 100644
index 000000000000..3776b63f834e
--- /dev/null
+++ b/dev-ml/ppx_cold/ppx_cold-0.14.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Expands [@cold] into [@inline never][@specialise never][@local never]"
+HOMEPAGE="https://github.com/janestreet/ppx_cold"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+DEPEND="
+ >=dev-ml/base-0.14.0:=
+ dev-ml/findlib:=
+ >=dev-ml/ppxlib-0.18.0:=
+ >=dev-ml/ocaml-migrate-parsetree-2.0.0:=
+ dev-ml/cinaps:=
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-ml/ppx_compare/Manifest b/dev-ml/ppx_compare/Manifest
index 523a8fa08663..5f5cd5853eee 100644
--- a/dev-ml/ppx_compare/Manifest
+++ b/dev-ml/ppx_compare/Manifest
@@ -1,3 +1,5 @@
+DIST ppx_compare-0.14.0.tar.gz 13614 BLAKE2B 081e91192f987095a773964b56838b05fb18ea23599eeeb28d297ac81ff7439067ffa0941cf4d64921abad68f9dca90560463b9f059f35ed3147333ba697a88c SHA512 be02c8114e0915439c04b3d796029ad124e9a2e637032d6a86a41c03b81985cb0f68f65bc43c1d12221b521f6fa10006a105b3ffe95e991ed9695692fd0763cb
DIST ppx_compare-0.9.0.tar.gz 11760 BLAKE2B 8db18a56185371e56addddeac4ec94e1260f06edc7dbc835efcf2f6788f42c36746858fd96e7fc94aaaf52b118a95581388276b90d8d489a9f4707af2c157811 SHA512 4f154bb67c2241712986247f8b3ed04b4ba874424171989f0421193a15cea45dedbf1c546408421bf33839ea45b85a45ec1cb43c034373fd80198ddb5d9045fe
+EBUILD ppx_compare-0.14.0.ebuild 666 BLAKE2B 2fa6979605dce29f0479b6e03fa4820d3c2ff180eee9510ad1ca9869f551cc3991c1bb5f506179107a670f948b5f67c2ae4771812bc9577b3a2fd76a18f3d350 SHA512 a5036ffb8e76b01cd638ec60225b9e1cb075a97171d1170d95ef49c58f6826c3da02572f039dd9013178f778ae7de2875bd3fee998b10fd569223a29aafa2440
EBUILD ppx_compare-0.9.0-r1.ebuild 603 BLAKE2B 2a649d2d33fc23a391ef4ed979e5785dc1e1e6bade572d2946d170c3ede8441e2061f543c6f01e9d068c1c83ba76d46a9827e18d03045f7ca6fe1678b94cdc75 SHA512 4c042cf01de3d80cdb34ab804d0337d1f85b00fb64e4b7b0d9d45cfa4c181758b300c1c8a85a56b8d0393f530adff8c403a0398508957bd49a3b782d6f37fa5a
-MISC metadata.xml 254 BLAKE2B 391630e4e40e12ed6cc64695ae52fcb5ca8665e62aa01cedcf300948248d482d463f8a242c431e57261ac2acde1a8bc37b96b4bf4afdf7de3c2286b60d33205f SHA512 73e82ca25e22fd3e6c3d8d6ab33b128ca85edca1ade0879456f3c6fb04ed4fc313f6a138e433f330ad163815434ef53f8e536eb2b4125571fce01c79b8028f6a
+MISC metadata.xml 331 BLAKE2B 2e62d03cfab08dd1a75ab9c733f70d0b6a375c77168629014eb0d0d03df232d881cac220781f8dd833235fefbe29f07117946a65cdd33fef28fbbddfb70d9db9 SHA512 eb5cae5da9de9fa2d2c96634cb1cae94f3d37e003f860ffe93e6d99274fe0f3c3063453864f6b71ad3987b75d45386e727de674094cacb2ff8494dd4f29059ae
diff --git a/dev-ml/ppx_compare/metadata.xml b/dev-ml/ppx_compare/metadata.xml
index beacad414601..5bc9e8d7dd51 100644
--- a/dev-ml/ppx_compare/metadata.xml
+++ b/dev-ml/ppx_compare/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>gienah@gentoo.org</email>
+ <name>Mark Wright</name>
+ </maintainer>
<upstream>
<remote-id type="github">janestreet/ppx_compare</remote-id>
</upstream>
diff --git a/dev-ml/ppx_compare/ppx_compare-0.14.0.ebuild b/dev-ml/ppx_compare/ppx_compare-0.14.0.ebuild
new file mode 100644
index 000000000000..5b57cccc6aec
--- /dev/null
+++ b/dev-ml/ppx_compare/ppx_compare-0.14.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+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 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+DEPEND="
+ >=dev-ml/base-0.14.0:=
+ dev-ml/findlib:=
+ >=dev-ml/ppxlib-0.18.0:=
+ >=dev-ml/ocaml-migrate-parsetree-2.0.0:=
+ dev-ml/cinaps:=
+"
+
+RDEPEND="${DEPEND}"
+
+# Error: No rule found for test/comparelib_test__Check_optims.o
+RESTRICT=test
diff --git a/dev-ml/ppx_custom_printf/Manifest b/dev-ml/ppx_custom_printf/Manifest
index 2a7f1ba12da5..276e45ce87a8 100644
--- a/dev-ml/ppx_custom_printf/Manifest
+++ b/dev-ml/ppx_custom_printf/Manifest
@@ -1,3 +1,6 @@
+AUX ppx_custom_printf-0.14.0-ppxlib-0.18.0.patch 1692 BLAKE2B fee56511e88124c2df3cc075b99e97834794e997c4cf87bb3e5d018cacbf3b4ffeed886f3bac054e17b4d3e4695d8499b830fd2ee18cabef7381d352a33dcb9e SHA512 48e2a0e92d14533e66b59487c90d4c8bc0022af7a7db05b8708a5d71eadab011fb6c5e63d81f1d6fafe329f41328d2d0fb540888b9f6bfa53dc72330b5800f04
+DIST ppx_custom_printf-0.14.0.tar.gz 9600 BLAKE2B 7b921188e158d59a160502b410ac780709b40fd408cf2e06a0adb70952ef3e72144deaee1c40df512cc09997ce87621e0be2a32d28e8408914fb90f3416e0532 SHA512 2f607df87aa372ef602b4aeb44a2d697ff8696001161e544398c3675280ef7af402f4b34b8cfce900791129d2a9db13ccbf4e73518f58487adc47d5188c8652c
DIST ppx_custom_printf-0.9.0.tar.gz 11527 BLAKE2B ad1791f1bad3c8583e67ca6300e98e8a7a047f723bbaa7c80cf6224f7333e7893fce7289456c39f6959089f15cc0da20106b33689ab198b1f47f6dc0bd853c77 SHA512 7608e09aac26f4f51d124d30c25a510abb73bea606007524a5563f5bb2c0e71f1ff033edb32c48f0c69656e8c3924b57186639812b1a647ce31f7ae15dc466cb
+EBUILD ppx_custom_printf-0.14.0.ebuild 694 BLAKE2B d6afc0b0bfaf83e39edf62c71b2d4429a5cd3d676d6e72b49d82b465b193051549eebab1aa227a3730819117aab89a698edf83e8ca6b03ea3ee8c28ed1453578 SHA512 44791b2796dce9b1553707610b8e172844631f409083d1e5a41952867ce8c5691d2e68e53416ddbb276785f00e5926ced8358e709e0068b25bb374d92b5bc345
EBUILD ppx_custom_printf-0.9.0-r1.ebuild 645 BLAKE2B 24bdab2519315f8153e2e1a9034291bef09df3d03bb4ea9b463ea80d5b7dca4db4423875cf0c91315b19ef6a31c849ae2a320d65185b6baab7840ecda6940153 SHA512 258cdc49534126c7c5c26d03c927be5132d55b1b99fb76a3c62925df6c45a542e15dbcdaf6597349005a2b7d5a58ee157384f078aedf8367572db46d9af9bd11
-MISC metadata.xml 260 BLAKE2B 7148212699c76e565a6e3fa0b354f77287f42e58da2942a48e6a731beaca5d881e362ec362b43759422f5705392442b0e5eb3d173880fd8fc27177f02b4b8873 SHA512 eeeb523bc242ff396f3ba58feb5a6c0aa59308005ac880717be1cf7f3c88e1fab26d217e9812363a34212b9886be0e6a27bae4ca361e1b8ed817b73389fca215
+MISC metadata.xml 337 BLAKE2B 0c3a2a4da646e74eba801d91e7b0347bb2d4f82f9c67c948d2df83e8bcc24de8c04c913ad8fea547cc39b3713e71da905451bcaf5a9a8a194cec7332d85db806 SHA512 c559c7204d7ab47b35dbdde65f0146c492238ea7975b1cc4ab21848b3ca6ac9118c8c4e1a5e3c6ec5e071d4c61284374ba84796491a1cee2dd21be84dd941d08
diff --git a/dev-ml/ppx_custom_printf/files/ppx_custom_printf-0.14.0-ppxlib-0.18.0.patch b/dev-ml/ppx_custom_printf/files/ppx_custom_printf-0.14.0-ppxlib-0.18.0.patch
new file mode 100644
index 000000000000..95cd58aee4cd
--- /dev/null
+++ b/dev-ml/ppx_custom_printf/files/ppx_custom_printf-0.14.0-ppxlib-0.18.0.patch
@@ -0,0 +1,41 @@
+commit 50f8f706e868f8ebac4f2f1392365f994d674463 (HEAD, origin/upgrade-ppxlib-0.18.0)
+Author: Nathan Rebours <nathan.p.rebours@gmail.com>
+Date: Mon Oct 5 17:56:52 2020 +0200
+
+ Make ppx_custom_printf compatible with ppxlib.0.18.0
+
+ ppxlib.0.18.0 upgrades to the 4.11 AST which results in a change
+ in string constants representation. This PR makes ppx_custom_printf
+ compatible with the latest ppxlib.
+
+ You might want for the actual release of ppxlib.0.18.0 before merging
+ this!
+
+ Signed-off-by: Nathan Rebours <nathan.p.rebours@gmail.com>
+
+diff --git a/ppx_custom_printf.opam b/ppx_custom_printf.opam
+index 80ea710..1cc3d11 100644
+--- a/ppx_custom_printf.opam
++++ b/ppx_custom_printf.opam
+@@ -15,7 +15,7 @@ depends: [
+ "base" {>= "v0.14" & < "v0.15"}
+ "ppx_sexp_conv" {>= "v0.14" & < "v0.15"}
+ "dune" {>= "2.0.0"}
+- "ppxlib" {>= "0.11.0"}
++ "ppxlib" {>= "0.18.0"}
+ ]
+ synopsis: "Printf-style format-strings for user-defined string conversion"
+ description: "
+diff --git a/src/ppx_custom_printf.ml b/src/ppx_custom_printf.ml
+index 18ad7fd..e9ad8b3 100644
+--- a/src/ppx_custom_printf.ml
++++ b/src/ppx_custom_printf.ml
+@@ -264,7 +264,7 @@ let expand_format_string ~loc fmt_string =
+ let expand e =
+ match e.pexp_desc with
+ | Pexp_apply ({ pexp_attributes = ident_attrs; _ },
+- [ (Nolabel, { pexp_desc = Pexp_constant (Pconst_string (str, _))
++ [ (Nolabel, { pexp_desc = Pexp_constant (Pconst_string (str, _, _))
+ ; pexp_loc = loc; pexp_loc_stack = _
+ ; pexp_attributes = str_attrs }) ]) ->
+ assert_no_attributes ident_attrs;
diff --git a/dev-ml/ppx_custom_printf/metadata.xml b/dev-ml/ppx_custom_printf/metadata.xml
index db6f32d8ab1d..bd8c830ce5d7 100644
--- a/dev-ml/ppx_custom_printf/metadata.xml
+++ b/dev-ml/ppx_custom_printf/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>gienah@gentoo.org</email>
+ <name>Mark Wright</name>
+ </maintainer>
<upstream>
<remote-id type="github">janestreet/ppx_custom_printf</remote-id>
</upstream>
diff --git a/dev-ml/ppx_custom_printf/ppx_custom_printf-0.14.0.ebuild b/dev-ml/ppx_custom_printf/ppx_custom_printf-0.14.0.ebuild
new file mode 100644
index 000000000000..91fc0960056c
--- /dev/null
+++ b/dev-ml/ppx_custom_printf/ppx_custom_printf-0.14.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+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 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+DEPEND="
+ >=dev-ml/base-0.14.0:=
+ dev-ml/findlib:=
+ >=dev-ml/ppx_sexp_conv-0.14.1:=
+ >=dev-ml/ppxlib-0.18.0:=
+ >=dev-ml/ocaml-migrate-parsetree-2.0.0:=
+ dev-ml/cinaps:=
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-ppxlib-0.18.0.patch )
diff --git a/dev-ml/ppx_derivers/Manifest b/dev-ml/ppx_derivers/Manifest
index be25e55fdace..cca031875ed9 100644
--- a/dev-ml/ppx_derivers/Manifest
+++ b/dev-ml/ppx_derivers/Manifest
@@ -1,3 +1,5 @@
DIST ppx_derivers-1.0.tar.gz 1467 BLAKE2B 94946c5d04e314bfbe146534fb19e88a16670dc3f5d47c15496142dd9a256ebbe4387f24a9fe31b1aee804d064bea0a9136685372399a38ac82dedafe677934a SHA512 2e2437094362088f9a1601ca3c2f0b82ec079b9a34e502234aef36158ea7a3f2236f1d2526df1a75bcb851346ebaaf717eaf72253935f7ea4024d3dc20512e85
+DIST ppx_derivers-1.2.1.tar.gz 2530 BLAKE2B d0a8a214e93908cfff1d418fe1b729a7ca502fb6dc983d3a837f6846aec891627457df72a610736d929c83622202bd5a00451c1c24510a642b4c133ce60416b8 SHA512 ef0796fe2592e653d34ba01d206d4b507429882a2aaadcb89c7f807c33a417f2871b0c94ade5c92aefd9487daa582e19d88ad5a5eaa631e8162ae12f4a0756c6
EBUILD ppx_derivers-1.0.ebuild 426 BLAKE2B 91552788b46b1a766bbf3b4ab91f911329a9a02665f0ebc045e480bd6da9accb939672ad08a54d8ab2d494e852d5189208444c43e9f41b74d3dc51cf6e1ea7fe SHA512 9c8aaf21a446b609d4223390c3f3caa77425f96c177a2869e74615295ffee80e28d1efe75b0186b65c5c30162a9bdb28bae009ba9d38080ebc48fbcf30deeb63
-MISC metadata.xml 249 BLAKE2B 3bf402181fc811de1b0171162c425f1fdc7c9273dbe07d6e2194b4a35616ad197c96f7ae78f4475b8635912c6d6a9a83a4960201d72622b7012c6b7b8207ef1a SHA512 4c58a324157bb213bf685bfd6fd7aa1a1ba4c56a8294a83c736026b24bcdf21388ef38766668c55cb2f05ef202652d59f92dacf1745482ff64cc10dcb9355f4d
+EBUILD ppx_derivers-1.2.1.ebuild 434 BLAKE2B 16f8d3054763c0339d1593098bab40d1db5f92a20cf1c13e4341b7df3ea2730cd23b956821dee4e4999a552a70f32f53b59eeb51ce4d3f85a55d0ff8125e196d SHA512 3a6ecf66acd172f39d9ee8878890329b063e4e147d1ce5cd44cb1e350bff893f2d2beab2c8520e225d6172470a67d9c4922c0a0ea11187167b40e46d80ba35d5
+MISC metadata.xml 326 BLAKE2B 47cfaf71bd6893debdbaf5f5e59316247e5b632f98b755711420d3159f171922d5b781778f9ea3a78d015d59eac44b8a1cfd956e6d30b7910e59c5d7fbb30312 SHA512 e9c22d0a8e279dd6345c197c5db53869f2a9cb33f2039812cfdc93e3c7c90f4b6cb4a83ab9d0b822bbd12f86d01474aa3b65e5d6b19e55a51e869d2d10e5fefe
diff --git a/dev-ml/ppx_derivers/metadata.xml b/dev-ml/ppx_derivers/metadata.xml
index 8cefe9903afe..60ca2c998ff0 100644
--- a/dev-ml/ppx_derivers/metadata.xml
+++ b/dev-ml/ppx_derivers/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>gienah@gentoo.org</email>
+ <name>Mark Wright</name>
+ </maintainer>
<upstream>
<remote-id type="github">diml/ppx_derivers</remote-id>
</upstream>
diff --git a/dev-ml/ppx_derivers/ppx_derivers-1.2.1.ebuild b/dev-ml/ppx_derivers/ppx_derivers-1.2.1.ebuild
new file mode 100644
index 000000000000..5422a26d9b5c
--- /dev/null
+++ b/dev-ml/ppx_derivers/ppx_derivers-1.2.1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+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 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ml/ppx_deriving/Manifest b/dev-ml/ppx_deriving/Manifest
index 7e9a27bf56c5..30c79d181b67 100644
--- a/dev-ml/ppx_deriving/Manifest
+++ b/dev-ml/ppx_deriving/Manifest
@@ -1,3 +1,5 @@
DIST ppx_deriving-4.2.tar.gz 48327 BLAKE2B 8ce5ccbfb7992fbd5e9c777ad0b577f8846d92df21926a877fb8f7b6804acc4fa2fd78586fc209c3bd83b8496eb6f8e8ee37c39e0c7462fb55f39389356f3c8f SHA512 084526157d6f4b41f7ad73157c5edb54d5bb9130d706525031670d8495ede8af5545302f442c2d2c506772201b79ccc93bdc7fead9455d3a59977ddfa9c3284d
+DIST ppx_deriving-4.5.tar.gz 45886 BLAKE2B 257bacda986a3830e3efd55b8e97d8c633b64740a36c7954c7b13ef42578fef8795f268e709a2b7285fa3dda1297afe7cfcc277da8557ed654dda6401a550680 SHA512 f79153c5231ba1e03a3491fde95ca82ecb62fe05b60a649a374d2fbc5ea5dd9242126de7dfbe917c22fd7077c026c940e18c6b36c5ce0ec4bb6e07f11d2b710b
EBUILD ppx_deriving-4.2-r1.ebuild 1222 BLAKE2B 46f7ae25cf2dc8cea15959a6efbd2b3ebaf7c68a70737283046e4fbfdac94cd69f5a956575d5863b47da76e79bd5a4b429dca0f4326adbdc3cb61567c60e703c SHA512 9ffcdecfe0ba84ba5517c2bd9cb401e0bb08431bead6ef85ebdaf0b15d3f3d2a3e92c50cdc028c47543a5a13135843244dcfbfcff6f680329e90dc4cf8199a4b
-MISC metadata.xml 254 BLAKE2B ce96d6d38c5258e243e62822836004808f6f50ddbc288f47129729f09e66394efd7d3119c756d19f57a6297b450a7b012c322e1ce7e7e5ec165af946fd595032 SHA512 c71804728b241a1c03b33e606bdd694fe64a7108aa61f6b81ca4abca26c5337f8b6ddb74affc2acbc44f4d522a10475fa7506241f2c76225cde9e6568dc60953
+EBUILD ppx_deriving-4.5.ebuild 686 BLAKE2B e04594fc0ad2e0aa69fce618c65958ac86e5eb84ce763b4d70775750ac539049fbe7eecb69b8ee5253b7c43d045ed196b5425e095bcacdeee6a66d294c384db9 SHA512 b93e2da7b431cb5daedfb8fb2d61ea819155a1a0164880c8dbced6eb7e1ae9aa9dcfd2763aa4e108e58a4d3b47525722ee7906c6387919f146cfcd1d9ba637ce
+MISC metadata.xml 331 BLAKE2B 6b066536e1294c46f3a701317330ab6af84c74731a79c83a0a706528de457cc5681fa7722f198a899f158d139833ff9d7a005ae03eb4071089067f0880b3efb2 SHA512 eebc80d708fb3baafb41b4a4bd21202b6fe69c59d833d6a5772531ac860683b3a467ad813a5338766ee5796354996230af990ce8e59a5b9dc0386f81555eff71
diff --git a/dev-ml/ppx_deriving/metadata.xml b/dev-ml/ppx_deriving/metadata.xml
index ee4d37328cad..0fea406d5fda 100644
--- a/dev-ml/ppx_deriving/metadata.xml
+++ b/dev-ml/ppx_deriving/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>gienah@gentoo.org</email>
+ <name>Mark Wright</name>
+ </maintainer>
<upstream>
<remote-id type="github">ocaml-ppx/ppx_deriving</remote-id>
</upstream>
diff --git a/dev-ml/ppx_deriving/ppx_deriving-4.5.ebuild b/dev-ml/ppx_deriving/ppx_deriving-4.5.ebuild
new file mode 100644
index 000000000000..648dc3f3f471
--- /dev/null
+++ b/dev-ml/ppx_deriving/ppx_deriving-4.5.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+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 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( 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
+ dev-ml/ppxfind
+ test? ( dev-ml/ounit2 )"
+PATCHES=( "${FILESDIR}/ounit2.patch" )
diff --git a/dev-ml/ppx_driver/Manifest b/dev-ml/ppx_driver/Manifest
index aabe8115cd8d..2e9032ae00e0 100644
--- a/dev-ml/ppx_driver/Manifest
+++ b/dev-ml/ppx_driver/Manifest
@@ -1,3 +1,5 @@
+DIST ppx_driver-0.11.0.tar.gz 9157 BLAKE2B 053e710c3d8cb6096c893bd5308fbe2b4563dfb2de3c006402ae363aed60db31a3bb1b7656f0565ce13d88368d8b6bef68658f81190dda397562d462828618f4 SHA512 d7ef318f6f0c6e4c56537584bb50b6673b294b67ac264208b7c8b4bcc9d0ca6baf1cbea752459b12d9102bb84a392047c907c65afd23760cac1cc4465ed85ea9
DIST ppx_driver-0.9.1.tar.gz 28637 BLAKE2B d787ac91713bd750d2d2bde5830df3abb1a07be6672000d7a6de6c125a7627e7a5b94aa9f8f87e2c6c57a7a92073c44e18c7285575aad02f5db9c7b4419647d8 SHA512 1e3647e34fb9e6d44b783fae1fce21413e5591f8934c3d2ddac3d1b37019b0d95117c8d64abf14cbfe4f67147612371ec1eb76b477763b062206ffc9b46688d7
+EBUILD ppx_driver-0.11.0.ebuild 513 BLAKE2B 939eddb8517867236381098096fe9156fbe5bf4b101dc398488bfd1f7858b1581abb86e8cad9233d5a579c957c29bf5f2ba9fe1a6f05993c4d78b216a16b4c6e SHA512 ca62d132a8840d5dd93c4ba253b9f9fa1fad6ef1acac70685266ca045e93d08c4e7c764ed8ba2c2737b1c44ad348473e2a7650df163b18eea1b8e28b5970784f
EBUILD ppx_driver-0.9.1-r1.ebuild 584 BLAKE2B fb729e4ae41008ce616f784cee3a81048c46df5e27050b4118937b7fe71b738cb75813c06db95e161dcd43c587b8659d43e8927c59b9b9057e51ae826925824a SHA512 13c48ae64e7d2c8f2c5e39125873eb573d2aace46ad87989e11bde24d16b3bc4ca47a340322adec8a22834f74495e2f4dd7e6e1436932bdaa45e469f7f46ef91
-MISC metadata.xml 253 BLAKE2B 5181111ba67681e3faf163903ba46c833f47b1ffc8baa2b6a5a13926508c46fd47553835b82f803d0a5a1f6220daec42a1bb7d9c4f00b6681b3a2d21ff1cbecb SHA512 3140a003b9eda9761883e478972d61fe343e5a396b410ac8bfa37d19c25ab4dadc1d911a43076d3591d9416c80722e256b10893e20e0996d77e020e4f5b70305
+MISC metadata.xml 330 BLAKE2B b26e242c2907dec64f194c92a1e3f967cfadba1966632646d2903c2d010d59d45de6ad7da3d7a54a6e380f076bb7f3a6a15fed04d16552f913b1f86a1ed8128a SHA512 754889cdf700f13e44cb022e9d2750c63145b51b792a67e8003162baf40a0f7402835d14f573db348f99137f47375f169232e85a10cd881b1882cd7da1b7253c
diff --git a/dev-ml/ppx_driver/metadata.xml b/dev-ml/ppx_driver/metadata.xml
index 305fe7348cce..c69342dd5815 100644
--- a/dev-ml/ppx_driver/metadata.xml
+++ b/dev-ml/ppx_driver/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>gienah@gentoo.org</email>
+ <name>Mark Wright</name>
+ </maintainer>
<upstream>
<remote-id type="github">janestreet/ppx_driver</remote-id>
</upstream>
diff --git a/dev-ml/ppx_driver/ppx_driver-0.11.0.ebuild b/dev-ml/ppx_driver/ppx_driver-0.11.0.ebuild
new file mode 100644
index 000000000000..494c07cf18ee
--- /dev/null
+++ b/dev-ml/ppx_driver/ppx_driver-0.11.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+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 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+DEPEND="
+ dev-ml/ppxlib:=
+ dev-ml/ocaml-migrate-parsetree:=
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-ml/ppx_enumerate/Manifest b/dev-ml/ppx_enumerate/Manifest
index 0652236c894f..64eb073bc4b8 100644
--- a/dev-ml/ppx_enumerate/Manifest
+++ b/dev-ml/ppx_enumerate/Manifest
@@ -1,3 +1,5 @@
+DIST ppx_enumerate-0.14.0.tar.gz 9487 BLAKE2B 7f87a1c9c2ae0b365b5fdc44b906ef5330e28586aea741ca51dcddd8b0cf591e28f59e21d4050078c42072b96a96e5c6430d5ade4334d49aeec142db058ee3fc SHA512 d7f61ba792af81395c76e51bcb81b467ae4b67fdc3022d2e55ab0682bb4710e9a96852457721567a9f13606bd4290dbac8fd34421b0dffbabdd9debd1268ecc5
DIST ppx_enumerate-0.9.0.tar.gz 10967 BLAKE2B a5e742c5009c16d07cb23d7fba8cd4d41cd3f2ec543f47fce65c3731bb81b140a601ec492c0f5f8a5a62c2ac64f41a8093a7e5c96b251ad3b85944aab19c167c SHA512 46e979528af75313fcbfee4d1437156ded90d46f7608271a77ad41bb7e087e2ea4f61f534624b23679c4edf812d2fcfe26b9b634c3fcb691e2da2388ae04950c
+EBUILD ppx_enumerate-0.14.0.ebuild 597 BLAKE2B 1ba52e97f343a46027bba73704c8ded57385337a06c331da4f7bc953057f1aa35dd14c51552b42c6d002c38e5994339abb9a97fa81d18a2769be0a3afc108cf7 SHA512 b82f00cc4dc1df5de521d2f7decfffbf79a172d9a1920fa7fcfc57eaf85cffa277bcd0748afbac96f95100688fd3357cc3c1696c514388dee73779fda1f9321a
EBUILD ppx_enumerate-0.9.0.ebuild 598 BLAKE2B 2bdb21355e0fbf93fc52a837a304a67ea2588aa1737d8ca5f26623f7cf4c6a425975bc74a4deae78b6e61e9628b52f5cdc73dfb39c5089ba97470fb85993ad63 SHA512 f9127b765f4fc1b644dbedd46167330af272ab1d4647e9b5043de00e9eebbd235ad1f2d97f36267ae6905f7863ad2cefc01a3d7a80e809686f0f756a140d189d
-MISC metadata.xml 256 BLAKE2B 5e1b290dd68f36e30713475073f8b98cd081ed74ff8094ae2b925230cf25d6247a43a322a255b47f98ba11342c22fdc78c9dc75ad0dbddba3ac9e5c12c813bba SHA512 9d4f1c1cb39901498669fd0ed5346d1835925136714a50a3512d381fa7d1d446bfed0881fcb17156f80d8b1d861c631c0d6c13c140bbbe0658bb056d78459646
+MISC metadata.xml 333 BLAKE2B 3a42b489d3adecb6f1e0fca9a618da3c7605c75a7c082f6f5994c5cddce8edb236990e70e19972784f63495bfae2976b40445ccfe8ab54f8e995f43f407485f4 SHA512 ce79a07e2dac8be109cb6c0de8ff1c7e88ec520f4ef897311142821d809c2983f7d307d3b74ecd432f2c4c90ad45b1dd3db476178e5297fa212fedb7fd79e47f
diff --git a/dev-ml/ppx_enumerate/metadata.xml b/dev-ml/ppx_enumerate/metadata.xml
index 42deaa7b6871..0691d2ad6671 100644
--- a/dev-ml/ppx_enumerate/metadata.xml
+++ b/dev-ml/ppx_enumerate/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>gienah@gentoo.org</email>
+ <name>Mark Wright</name>
+ </maintainer>
<upstream>
<remote-id type="github">janestreet/ppx_enumerate</remote-id>
</upstream>
diff --git a/dev-ml/ppx_enumerate/ppx_enumerate-0.14.0.ebuild b/dev-ml/ppx_enumerate/ppx_enumerate-0.14.0.ebuild
new file mode 100644
index 000000000000..7953780e4e2f
--- /dev/null
+++ b/dev-ml/ppx_enumerate/ppx_enumerate-0.14.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+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 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+DEPEND="
+ >=dev-ml/base-0.14.0:=
+ dev-ml/findlib:=
+ >=dev-ml/ppxlib-0.18.0:=
+ >=dev-ml/ocaml-migrate-parsetree-2.0.0:=
+ dev-ml/cinaps:=
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-ml/ppx_expect/Manifest b/dev-ml/ppx_expect/Manifest
index 47585819a58c..3b73c968bdb3 100644
--- a/dev-ml/ppx_expect/Manifest
+++ b/dev-ml/ppx_expect/Manifest
@@ -1,3 +1,6 @@
+AUX ppx_expect-0.14.0-ppxlib-0.18.0.patch 1641 BLAKE2B ea0857a3681c6bce3a39191904a2223d899e9cfb362c9961e897c613dfa8f5879837cc80120653db88bd509c16b474079cf9c8ddfce3e6b79b12ddb284dab1e6 SHA512 11ab0e5d9a97d1a5749ba728c197c4a56905b21b7628d6a2c3594e46960b07bf6d9eb50d25ffc7bec77ea1e966d5016d8a20c5608f09817c73e06021c11ae372
+DIST ppx_expect-0.14.0.tar.gz 45661 BLAKE2B 0cba3840743d45f0f11936f090319aab3237c7a14389eb6d035a3b7cdac91e0b169c3ed84407e1bb01a00738bf97b62dba313965e93a2177388666764fe5854b SHA512 7de5d84640d16101d38140b5f621301c9935e3161a7c7d978373940be92fa7f14cad429e79eec294a20d1f379e969cf3c25d15810f1a4d3ad1bb8ba0eb7d7109
DIST ppx_expect-0.9.0.tar.gz 33700 BLAKE2B f03d1183b12efe84016a15b6a6b45b7bef93b23bc4d470c2796361aca2be229fc9447103c0a31d95a94f6c05bbabf1cbe9d138dc3518df9f505b6b009eefb104 SHA512 b8a6941f3ac0dea2167d7fe5c61e7adf605f5399e11049b5c9f22c613182983a014d05c2fb16e7a2dc94dbccf445e1801c39a89e6d995b5599cb40ee4322148e
+EBUILD ppx_expect-0.14.0.ebuild 875 BLAKE2B 01c4da58e36551b5e0c8d5902e8938ba49fe6c744b452cdd8cf031986cf6d0f384427b2a971e798a49b30f9a66dbc6b243b2b2a3617deda0a52100835a4a2549 SHA512 05faaa980d20732c04aef724f073b90483f616c5413255abcb765dd829a0737cd858b8f26c0d1bb12f34942ee8a2bef7c102fefb37a4a9d24aac197d7d467149
EBUILD ppx_expect-0.9.0.ebuild 803 BLAKE2B db16cfe2c0f98e9608036e6ed55f82ce0c000e4719ad610ed2a63a00f30dbd4d726be74c15648b1d158751eba3dafcde8af0c22341e3539f6d29aaa0272c430e SHA512 75d553529f0b249139a1d81f5990c10711e0580046f089be442ea328fe9f96045677e7149018bf75aec5cc9ab0fe20e74d411fa782b9371fb7a4dcfd80f2f992
-MISC metadata.xml 253 BLAKE2B 38d7ab4cc453c4cd6c5702c795033e7eab92b609f29fb270ef4462980620d7dae1bf5f8b8bb4e7e26b44adb6660acd7212a699b92e04558da0beec35433fe05b SHA512 3b0b5d1fa1fb91f37614f0f180cdace4bd35d5dc9495e5e651a656b6be6cd3e6e9fb9c37d2f062fde154cd81f37b784cee47bddb7ca95afd665159f20f416551
+MISC metadata.xml 330 BLAKE2B e031c1f0eaf438287c35084bdb699a00355fd4a9b2212ccb8dfb68eaba636ceae95a0f4e2566af067d947a2decb54095c52aa9c9f04137cde288b26694ed8b1b SHA512 4c224163c55960a36b9f9dd73db1c66c2c4212c6e10e817931b51aad0d288600567ac0a66117aeeddf2fdbcdbc3ce563c7462128876eccbda3c670c42673b812
diff --git a/dev-ml/ppx_expect/files/ppx_expect-0.14.0-ppxlib-0.18.0.patch b/dev-ml/ppx_expect/files/ppx_expect-0.14.0-ppxlib-0.18.0.patch
new file mode 100644
index 000000000000..f30da03701ba
--- /dev/null
+++ b/dev-ml/ppx_expect/files/ppx_expect-0.14.0-ppxlib-0.18.0.patch
@@ -0,0 +1,42 @@
+commit 7f46c2d22a87b99c70a220c1b13aaa34c6d217ff (HEAD, origin/upgrade-ppxlib-0.18.0)
+Author: Nathan Rebours <nathan.p.rebours@gmail.com>
+Date: Mon Oct 5 17:46:34 2020 +0200
+
+ Make ppx_expect compatible with ppxlib.0.18.0
+
+ ppxlib.0.18.0 upgrades to the 4.11 AST which results in a change
+ in string constants representation. This PR makes ppx_expect
+ compatible with the latest ppxlib.
+
+ You might want for the actual release of ppxlib.0.18.0 before merging
+ this!
+
+ Signed-off-by: Nathan Rebours <nathan.p.rebours@gmail.com>
+
+diff --git a/expect_payload/ppx_expect_payload.ml b/expect_payload/ppx_expect_payload.ml
+index 23a12e1..fd2a5bb 100644
+--- a/expect_payload/ppx_expect_payload.ml
++++ b/expect_payload/ppx_expect_payload.ml
+@@ -86,7 +86,7 @@ let make ~kind payload ~(extension_id_loc : Location.t) =
+ let pattern () =
+ Ast_pattern.(
+ map
+- (single_expr_payload (pexp_loc __ (pexp_constant (pconst_string __ __))))
+- ~f:(fun f loc s tag -> f (Some (loc, s, tag)))
++ (single_expr_payload (pexp_loc __ (pexp_constant (pconst_string __ __ __))))
++ ~f:(fun f loc s _loc tag -> f (Some (loc, s, tag)))
+ ||| map (pstr nil) ~f:(fun f -> f None))
+ ;;
+diff --git a/ppx_expect.opam b/ppx_expect.opam
+index dcce541..59adadb 100644
+--- a/ppx_expect.opam
++++ b/ppx_expect.opam
+@@ -17,7 +17,7 @@ depends: [
+ "ppx_inline_test" {>= "v0.14" & < "v0.15"}
+ "stdio" {>= "v0.14" & < "v0.15"}
+ "dune" {>= "2.0.0"}
+- "ppxlib" {>= "0.11.0"}
++ "ppxlib" {>= "0.18.0"}
+ "re" {>= "1.8.0"}
+ ]
+ synopsis: "Cram like framework for OCaml"
diff --git a/dev-ml/ppx_expect/metadata.xml b/dev-ml/ppx_expect/metadata.xml
index e40e4cf098df..ec7beb371c4d 100644
--- a/dev-ml/ppx_expect/metadata.xml
+++ b/dev-ml/ppx_expect/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>gienah@gentoo.org</email>
+ <name>Mark Wright</name>
+ </maintainer>
<upstream>
<remote-id type="github">janestreet/ppx_expect</remote-id>
</upstream>
diff --git a/dev-ml/ppx_expect/ppx_expect-0.14.0.ebuild b/dev-ml/ppx_expect/ppx_expect-0.14.0.ebuild
new file mode 100644
index 000000000000..9a38ce530841
--- /dev/null
+++ b/dev-ml/ppx_expect/ppx_expect-0.14.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+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 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+ >=dev-ml/base-0.14.0:=
+ >=dev-ml/ppx_here-0.14.0:=
+ >=dev-ml/ppx_inline_test-0.14.1:=
+ >=dev-ml/stdio-0.14.0:=
+ >=dev-ml/ppxlib-0.18.0:=
+ >=dev-ml/ocaml-compiler-libs-0.11.0:=
+ >=dev-ml/ocaml-migrate-parsetree-2.0.0:=
+ dev-ml/cinaps:=
+ dev-ml/re:=
+"
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND}
+ test? (
+ dev-ml/ppx_jane
+ )"
+# https://bugs.gentoo.org/749291#c2
+RESTRICT=test
+
+PATCHES=( "${FILESDIR}"/${P}-ppxlib-0.18.0.patch )
diff --git a/dev-ml/ppx_fail/Manifest b/dev-ml/ppx_fail/Manifest
index 6d7ee214fced..3de811dc6b33 100644
--- a/dev-ml/ppx_fail/Manifest
+++ b/dev-ml/ppx_fail/Manifest
@@ -1,3 +1,5 @@
+DIST ppx_fail-0.14.0.tar.gz 3773 BLAKE2B ef5c7a84808045a9b9ddb78556061ec0d9b04f5b08d5cb4096c353d0e38aa3bca360538efe53cf5faffad6628634d689504c063bbb563790c15a4f3d327f8c14 SHA512 a683430e5cdb50b52846b45d0e25a7b2498f14f34153319cb3ffd30e7b6e493f36790ffc5ea82ec3fbb0281a29e13bb2df10a1754ec32f0e5faad0890b6d211e
DIST ppx_fail-0.9.0.tar.gz 5908 BLAKE2B 671d6c565ffef4582600346642d64884706c9f5bbff114868b0069f82abea3241c44bd92472e40b11365a560335efac59f2a93ab993d19cf98c2a3da09c5968d SHA512 43bd13d5e41f7a297da2c67b032b9d88b94ab2ef152f756738e2bab41aa22829ec3a17d2824243e5194c4d2ee9ea567f06a638172f8c77ca7c466a641da8017a
+EBUILD ppx_fail-0.14.0.ebuild 582 BLAKE2B b2fd4fc732cddfd58f54b5b0c634aaa147778814543e32ee9048aaf830df09a0aff766362710e44e36a319bd2d1d03809770666352fb3df6d44619f6f0da55d1 SHA512 94a253790e8a136ef9e136ff4c7caeee7474ca00e79586783d2c84c4843ea380caf071e7841cda481737913d02ba10a805268d77f1e1f608529e1f460760c525
EBUILD ppx_fail-0.9.0.ebuild 558 BLAKE2B 82c0eaf5b8399c798fffd80a74846d331ed7e125c7f75cd8feffe641433fe476da6142194c8ecdc04e7f26bb029fefa316893245fe4063c185914ac0379d5679 SHA512 1779731707eed4ccea346845234b2818a18c4bc7cb3e2d0509177a74bf4ceb2af6a577474e8b0eca9e29abc91d572e05cbdb30c0fa0257336e1a92a7a6b1718e
-MISC metadata.xml 251 BLAKE2B 8bd0b124c905abf953e85733b72eb9045bb12f475b71f5a67fd42b9887d5d27fe7787cae0e1dab366b0c6f9359c5a4df10aea4481088876b25dc7742e797afa8 SHA512 0154478bd7d994dabecb734935b7dad3be04b1bc7278e27031c36fdd4e981652697000c135fddbd3c118e8dd7071925c62c554e873bec6650be662f9e55e4241
+MISC metadata.xml 328 BLAKE2B d09fe18ea7642f2083ebca4f813869ce5eee47414bf3af2406e52923b195372b7137053ed85fa3a60736b85990c6798f2bc0f1ba69e011094a2f7e4006bcb074 SHA512 5de95d96b1297f11516645aa34c9f9f833c72dd4a640e1b1a800531968765019174366f3264798849765012f1761d8f2177b7daba31ccda1493ed003ac23de1e
diff --git a/dev-ml/ppx_fail/metadata.xml b/dev-ml/ppx_fail/metadata.xml
index e8071816757a..35728b324db4 100644
--- a/dev-ml/ppx_fail/metadata.xml
+++ b/dev-ml/ppx_fail/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>gienah@gentoo.org</email>
+ <name>Mark Wright</name>
+ </maintainer>
<upstream>
<remote-id type="github">janestreet/ppx_fail</remote-id>
</upstream>
diff --git a/dev-ml/ppx_fail/ppx_fail-0.14.0.ebuild b/dev-ml/ppx_fail/ppx_fail-0.14.0.ebuild
new file mode 100644
index 000000000000..793492cbea15
--- /dev/null
+++ b/dev-ml/ppx_fail/ppx_fail-0.14.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+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 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+DEPEND="
+ >=dev-ml/base-0.14.0:=
+ >=dev-ml/ppx_here-0.14.0:=
+ >=dev-ml/ppxlib-0.18.0:=
+ >=dev-ml/ocaml-migrate-parsetree-2.0.0:=
+ dev-ml/cinaps:=
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-ml/ppx_fields_conv/Manifest b/dev-ml/ppx_fields_conv/Manifest
index a92b19534cbf..11051f33f47b 100644
--- a/dev-ml/ppx_fields_conv/Manifest
+++ b/dev-ml/ppx_fields_conv/Manifest
@@ -1,3 +1,6 @@
+AUX ppx_fields_conv-0.14.1-ppxlib-0.18.0.patch 2477 BLAKE2B fa3c0da65865573142d3f552492fbda53f0015297cb5d7899e5b3c0c9f1cfca8c040a3371620a81de6a9bcd5c6983af45567a81e1fd38122f7790eeb58c752f5 SHA512 b18dcd556c4a88035ed3f5367cdc19986960c247114fe5bdb5f78b3f4bfc1486a488b4393d6d8ff4ae78e2b924252e30f234932ca846c5803f7db1e058e702d4
+DIST ppx_fields_conv-0.14.1.tar.gz 14348 BLAKE2B 09bd2db4dab314ba50bcd5566c4ba4fd834fc34ba15be2132d5cbe3c27e5c76e37b4cccd3bc4cc4a5bd930f95215f6100557b89e44d54e906e382381be1fe257 SHA512 afd0f16b851e2984e46ac1d9347268a1cdb9a9054ea18435a5030dd512ba56f97b54639cc6cc6254498ca3fd2fa4d5c0053c7f2ceddd531ebbd9afef5b5f3e3d
DIST ppx_fields_conv-0.9.0.tar.gz 15171 BLAKE2B 5a0051a1b362dcf15ddd4ec4f3f6f4df6d709a8c2709222a2d2502eb12b8728fb28ce9213a1789270d30505c6084ab8203dc7b49d7043d9820aabb0cc74c51c2 SHA512 1edcd7076c1dbba84b86f05624b3792404b24ae4414ee0c3b32dcfc998da77a2a9d52d063fefc24be21d98472d6f58880c37ac29c610fb5b8a401224fc654ec1
+EBUILD ppx_fields_conv-0.14.1.ebuild 672 BLAKE2B 09ab8474817fd449b00d85ffcda17e3c61b97a62a6be0b3abc0c09d465f4b486e69631b7e8a7438378e0e279bf3dda6283423cec1c35e7e3617a72881432e969 SHA512 3440c0043db39ca2c8dfa6f1ce470f8a3a4349c1b1c1e95c708988bfdf2953378a068837c2984730785f3f4bb94eff9024fd96e7b69d2a5caf39c06c645a1bb2
EBUILD ppx_fields_conv-0.9.0-r1.ebuild 652 BLAKE2B 2ea1eed022ac76e42c56a2c364f703c9f68ca9266836c2465291bbbbe3a14b8fa8001393f7f32ad554196e201279dbb20708fb05ecd564d21fb5f10f56dee71a SHA512 efe73ceafc884d13db789224d506745d614b2351ddc6f365d2a3c9adeaa5d671659f9bcd21ec8204bb3bcedc9eaafd113c81d8d6df4da3f796abb5cd6c967714
-MISC metadata.xml 258 BLAKE2B a755351062621815bf57c7a4492cfb2d92f14a0f753c9596ae7be977ec0d045b65cf4c775d82af704659733c7fc8df81e6bc34084ed4565bfb391fef33b15778 SHA512 a962cdf6abc3e5efc9d129362dc90b35c0a317b4914925081a6cca031e4037134940e945c3bdcb5df62f16065d3b6d1e51c629876c766238a31651cbd3c796a0
+MISC metadata.xml 335 BLAKE2B e0b5f44d914f2c0f4be92d8dd9bfcc7d31c9611967e3ffb8613020da75f7743626a7a3ca3997ceef4dee553d93a877ca4a4dfc71479f1ef8519de4b7f9eccc69 SHA512 286086f10f94d23ddedabd099ecd0f9a4017e0921fb4fa7bee307a6dc6340a3c54d2d7aa630b7b2f28b496dbddc482ef56916b3d989928f1bcb6540fc8e8a530
diff --git a/dev-ml/ppx_fields_conv/files/ppx_fields_conv-0.14.1-ppxlib-0.18.0.patch b/dev-ml/ppx_fields_conv/files/ppx_fields_conv-0.14.1-ppxlib-0.18.0.patch
new file mode 100644
index 000000000000..23b5a8be82c2
--- /dev/null
+++ b/dev-ml/ppx_fields_conv/files/ppx_fields_conv-0.14.1-ppxlib-0.18.0.patch
@@ -0,0 +1,60 @@
+commit f3c6846ad9015de0adb44f519ff010ff0ed51180 (HEAD, origin/upgrade-ppxlib-0.18.0)
+Author: Nathan Rebours <nathan.p.rebours@gmail.com>
+Date: Mon Oct 5 18:20:23 2020 +0200
+
+ Make ppx_fields_conv compatible with ppxlib.0.18.0
+
+ ppxlib.0.18.0 upgrades to the 4.11 AST which results in a change
+ in string constants representation. This PR makes ppx_fields_conv
+ compatible with the latest ppxlib.
+
+ You might want for the actual release of ppxlib.0.18.0 before merging
+ this!
+
+ Signed-off-by: Nathan Rebours <nathan.p.rebours@gmail.com>
+
+diff --git a/ppx_fields_conv.opam b/ppx_fields_conv.opam
+index 91a9692..3e2d24a 100644
+--- a/ppx_fields_conv.opam
++++ b/ppx_fields_conv.opam
+@@ -15,7 +15,7 @@ depends: [
+ "base" {>= "v0.14" & < "v0.15"}
+ "fieldslib" {>= "v0.14" & < "v0.15"}
+ "dune" {>= "2.0.0"}
+- "ppxlib" {>= "0.14.0"}
++ "ppxlib" {>= "0.18.0"}
+ ]
+ synopsis: "Generation of accessor and iteration functions for ocaml records"
+ description: "
+diff --git a/src/ppx_fields_conv.ml b/src/ppx_fields_conv.ml
+index 130e82b..87752cb 100644
+--- a/src/ppx_fields_conv.ml
++++ b/src/ppx_fields_conv.ml
+@@ -34,9 +34,6 @@ let check_no_collision =
+
+ module A = struct (* Additional AST construction helpers *)
+
+- let exp_string : (loc:Location.t -> string -> expression) = fun ~loc s ->
+- pexp_constant ~loc (Pconst_string (s,None))
+-
+ let pat_name : (loc:Location.t -> string -> pattern) = fun ~loc name ->
+ ppat_var ~loc (Loc.make name ~loc)
+
+@@ -440,7 +437,7 @@ module Gen_struct = struct
+ [%expr
+ Fieldslib.Field.Field { Fieldslib.Field.For_generated_code.
+ force_variance = (fun (_ : [%t perm]) -> ());
+- name = [%e A.exp_string ~loc name];
++ name = [%e estring ~loc name];
+ getter = [%e A.exp_name ~loc name];
+ setter = [%e setter_field];
+ fset = [%e fset];}]
+@@ -725,7 +722,7 @@ module Gen_struct = struct
+ let getter_and_setters, fields = gen_fields ~private_ ~loc labdecs in
+ let create = creation_fun ~loc record_name labdecs in
+ let simple_create = simple_creation_fun ~loc record_name labdecs in
+- let names = List.map (Inspect.field_names labdecs) ~f:(A.exp_string ~loc) in
++ let names = List.map (Inspect.field_names labdecs) ~f:(estring ~loc) in
+ let fields_module =
+ if String.equal record_name "t" then "Fields" else "Fields_of_" ^ record_name
+ in
diff --git a/dev-ml/ppx_fields_conv/metadata.xml b/dev-ml/ppx_fields_conv/metadata.xml
index 69d1f03f1b85..06458282b1c0 100644
--- a/dev-ml/ppx_fields_conv/metadata.xml
+++ b/dev-ml/ppx_fields_conv/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>gienah@gentoo.org</email>
+ <name>Mark Wright</name>
+ </maintainer>
<upstream>
<remote-id type="github">janestreet/ppx_fields_conv</remote-id>
</upstream>
diff --git a/dev-ml/ppx_fields_conv/ppx_fields_conv-0.14.1.ebuild b/dev-ml/ppx_fields_conv/ppx_fields_conv-0.14.1.ebuild
new file mode 100644
index 000000000000..2d1108cc9703
--- /dev/null
+++ b/dev-ml/ppx_fields_conv/ppx_fields_conv-0.14.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+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 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+DEPEND="
+ >=dev-ml/base-0.14.0:=
+ >=dev-ml/fieldslib-0.14.0:=
+ >=dev-ml/ppxlib-0.18.0:=
+ >=dev-ml/ocaml-migrate-parsetree-2.0.0:=
+ dev-ml/cinaps:=
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-ppxlib-0.18.0.patch )
diff --git a/dev-ml/ppx_fixed_literal/Manifest b/dev-ml/ppx_fixed_literal/Manifest
new file mode 100644
index 000000000000..f5c30b0ce96a
--- /dev/null
+++ b/dev-ml/ppx_fixed_literal/Manifest
@@ -0,0 +1,3 @@
+DIST ppx_fixed_literal-0.14.0.tar.gz 3643 BLAKE2B 7b84dda448f179e778356c3fd5cfdd1dbcb479e03d4e6a9bbd6d2b47c748d0795c18605a86e13e5680bcf23f383d99513408a441fc1fba188d66dad0bd58e875 SHA512 5e30c5238c20a4b6f164ebe29b5f6d4bc074f03fb62aac30a1d129c4fb466124bb163c45e6cc95ad34385ee2e621cf3a1366d3bd9b224438fc575f862f6f73c2
+EBUILD ppx_fixed_literal-0.14.0.ebuild 633 BLAKE2B aef975ce1213189ca924be216d09cc02edc5aa0580179de17611337671649c8de91a99b3cd8c15cc3b245e2a90bbaa88ff762fe108dc47fc1487bb67265ea47f SHA512 6b0c4029e323fbd084e423785c79628840f98c3b0fb2f794f416103fa967bc3c1c7bcceb85e078f71a5d524bff83629a05ca6442d4ee4bac22d58c7b868665cb
+MISC metadata.xml 337 BLAKE2B 1aaea70bd9122f38e546ff2a48009fd39f2b056adc520249fc8bcb7b6ec19cb35ea5c7e53f0a62d82ab2d27d3c5eaae6b8e5fc8a16e92a8051c2ec2dd79b284c SHA512 d128764c0474937a2edefaaafcd80e59260d5812e4783406e053955abbaeff51cc4baf74acad5349bc7b27174eba629b2b3f7e29f7439e3ce55d47b49d082ef5
diff --git a/dev-ml/ppx_fixed_literal/metadata.xml b/dev-ml/ppx_fixed_literal/metadata.xml
new file mode 100644
index 000000000000..257ae7bfeade
--- /dev/null
+++ b/dev-ml/ppx_fixed_literal/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>gienah@gentoo.org</email>
+ <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">janestreet/ppx_fixed_literal</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/ppx_fixed_literal/ppx_fixed_literal-0.14.0.ebuild b/dev-ml/ppx_fixed_literal/ppx_fixed_literal-0.14.0.ebuild
new file mode 100644
index 000000000000..3c1f7ed4ea9d
--- /dev/null
+++ b/dev-ml/ppx_fixed_literal/ppx_fixed_literal-0.14.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Simpler notation for fixed point literals"
+HOMEPAGE="https://github.com/janestreet/ppx_fixed_literal"
+SRC_URI="https://github.com/janestreet/ppx_fixed_literal/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+DEPEND="
+ >=dev-ml/base-0.14.0:=
+ dev-ml/findlib:=
+ >=dev-ml/ppxlib-0.18.0:=
+ >=dev-ml/ocaml-compiler-libs-0.11.0:=
+ >=dev-ml/ocaml-migrate-parsetree-2.0.0:=
+ dev-ml/cinaps:=
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-ml/ppx_hash/Manifest b/dev-ml/ppx_hash/Manifest
index 9bba154e9aa8..4f9055e6ed0d 100644
--- a/dev-ml/ppx_hash/Manifest
+++ b/dev-ml/ppx_hash/Manifest
@@ -1,3 +1,5 @@
+DIST ppx_hash-0.14.0.tar.gz 27859 BLAKE2B 0d89eeec154e62ae42ddaff6b0ccdf827ad768e0f19dcdfd4f8b940f594856c8fc036fa02a2462666f2ee4b675e1594837d196fb92cdbb9f8bdf4e171ce90374 SHA512 21d68c0655c21fcd0cecceb8c69e45706b57db160e49c3b112e67cc874a8084946dbae8709ed99f24e7282182c7238cf95ef00bec3ac5a271409e9d5f788467c
DIST ppx_hash-0.9.0.tar.gz 26942 BLAKE2B 589b9fe1ced89c0dbbc9d3472e21c278a9d1d29c1ceaa3a19ae853727cb4fc446e67deb8b63274ccfbd95fbfa49a5e8cba764bf2a3ae26bb994c9fb16f2b9f32 SHA512 401a87f5cc357ad50fc23f2450b84d6113cd79c1d2506f6e95476795fde0f3240ca252fc3bfe083f9ee1d0511ea3909481387ecf597edef6f90f9756a5a97096
+EBUILD ppx_hash-0.14.0.ebuild 704 BLAKE2B 3cc1c25b92f8e79fb1a8635fb7856439c54beaa8ff573eb0f1b39f55ef2f3b1710fe2892222707347db6c93bb8390394d6bb8dee6dde05a1d3ab17ed8f3da810 SHA512 2c79ff3eb6d1fd61167f15fea5c5638bf2811b38a3b288b4bfe0e5776eeecd261ae24e33d8003785bd420dd676e196eabfcc99bbd73a86d6996d8e9451b7f4f6
EBUILD ppx_hash-0.9.0.ebuild 681 BLAKE2B d14ce12eeca5d14a1c6bb9bfaa06b5337af64bccd943e7eb7572c9b91011b7d49ad2977c16e81272e151e5575a5d163099ac1159af22d5e7c76b5ff3d34a2f68 SHA512 33f1de12502e0d160d7c1ac5939c943c8402edf41afd3243e96649d8d4ea37310f1c0153b9ff2137c27ccbf077e3dfdd9b89466e75b1b73ba2826b8efc28de26
-MISC metadata.xml 251 BLAKE2B 3e99b397ec8d96feaf8ccf628688c66e453468d65f8d808800a649cb90702dc0e02114e76ab88a6b033474cf67cadf05ae192c4624424185d7761435774e35ad SHA512 ce7c2aa927cb9c6f5d1fb5aabf66c22463af8a2a083e421561257729b985fb9dfb61002a3ec8e615e38693b8d9cd843fccf8bf8f10f5779dde4293571b025b38
+MISC metadata.xml 328 BLAKE2B e3bc65066fc6191e3fbb581975d600b3d163c84a52a610dbee0ce89ea9c66acdb00802dac0106cd01b4ccc6ee5f66586d72f80b9cada5c42b2f2c26dc2d87756 SHA512 68886429b8ef42f0e0c873d2f23bc829b30a1a795c9267f723ab08c6ff2c4a542da653bd00eb8ec4cfa63a5ca8c26f3ab0174919b3dde8c92747ee2891dc3cb8
diff --git a/dev-ml/ppx_hash/metadata.xml b/dev-ml/ppx_hash/metadata.xml
index 5a09c9e93857..45d95eaf5e0f 100644
--- a/dev-ml/ppx_hash/metadata.xml
+++ b/dev-ml/ppx_hash/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>gienah@gentoo.org</email>
+ <name>Mark Wright</name>
+ </maintainer>
<upstream>
<remote-id type="github">janestreet/ppx_hash</remote-id>
</upstream>
diff --git a/dev-ml/ppx_hash/ppx_hash-0.14.0.ebuild b/dev-ml/ppx_hash/ppx_hash-0.14.0.ebuild
new file mode 100644
index 000000000000..0c1ab6bbd8cf
--- /dev/null
+++ b/dev-ml/ppx_hash/ppx_hash-0.14.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+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 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+DEPEND="
+ >=dev-ml/base-0.14.0:=
+ >=dev-ml/ppx_compare-0.14.0:=
+ >=dev-ml/ppx_sexp_conv-0.14.0:=
+ >=dev-ml/ppxlib-0.18.0:=
+ >=dev-ml/ocaml-compiler-libs-0.11.0:=
+ >=dev-ml/ocaml-migrate-parsetree-2.0.0:=
+ dev-ml/cinaps:=
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-ml/ppx_here/Manifest b/dev-ml/ppx_here/Manifest
index 8a0bb70143e8..41bd837042f3 100644
--- a/dev-ml/ppx_here/Manifest
+++ b/dev-ml/ppx_here/Manifest
@@ -1,3 +1,5 @@
+DIST ppx_here-0.14.0.tar.gz 5005 BLAKE2B 1711ec047c85af76d2343895e54889fec6e9aa29d4d188e83ff9d9ee12cecf42e4ca968a97f341a818f87efc0cc6ccb7e26f025e8af2195c341cb57325aec62b SHA512 3386e9c727f93be86de1daee2e94c9b7a22bcb4bd0ef20bd2c40ac227723ac36c9ac04fd3e16121731227a9b5256898594e0f33860864edf6f15797b98b114da
DIST ppx_here-0.9.1.tar.gz 7225 BLAKE2B 7115c77477b2bab47febfafe55d422bef03c32502d9d0064c5633d6925faf1b3a8b580f2a0974edcf86613f9b2582b0067f3e08a4ca474333f7e15c2c7adb87d SHA512 ca21fb490a4d980616349850b781e4ee02c0eb8a27e8ef9d4092d15ee235ffc504dab1b2a3db44fc6a84fa6b2cdbd67c0c4adbc41fb094b7bb9d4f710193aaf2
+EBUILD ppx_here-0.14.0.ebuild 670 BLAKE2B d26435b0bac445fba81a6174007130292be680d5953a16138b98b6483936d13e4045ad2fbce03a822c0d414d180ef0e7612fa86925d40ee65ac7defb2932cb76 SHA512 3be24c4bc109445ebc3485bc2b1f1b1feab87eb74a6af303c84bc6a7a35a0c779dbd783dbe6815522b35168d92d06e46eab0b0bf80228ae3f2fa97d8d8941bd2
EBUILD ppx_here-0.9.1.ebuild 538 BLAKE2B 64924fd0c832b54f95ec5293842b4cda4f0d315ad79861c87aa4487270e6e2e4e3658a9eee8300cf2e9c21336beb7007ff4e537e6a6ca01dc70746ba83ab216f SHA512 2ad8d7d1bdc781bce326f8c535bff2d814e6536194945a7ec27b1ee021bea4a409e5f5a7d5b4de1b3c3e169d9780ce54d195441363d8d68239a584111d00401f
-MISC metadata.xml 251 BLAKE2B dc11dd144255a1ad5928a87deecdc2b62690cce7d9f3dd15f64f0ab63268260c0a92c0be2d64e4292aaf8e4fbf3da635b156cd5aea340464bb02b46aa1211bc2 SHA512 6eda4b7e26dad39e12b55076f859d529045d1ff7cf629c6c7c40b8bee25c4d9fae6e5682af9d989da686cc2a7575a1bed217fbeff086f70fe4bbe1e11986c634
+MISC metadata.xml 328 BLAKE2B 237c41f5203286b25de7ce745ff90b0ba2300827a054fb00cd00779abd0faba6657e0d29f5d6b07e7a318c9759725a029091de2e94e3bc354e172450bff3f1e9 SHA512 695ad950cf7bb20dba1394f7204baa066fd5aeed13415cf0ed4b67c425ab275d35a624d710197ce62e51f414c5ad8e8b32ec1f692f5f87070ba6ecd8d65c8c91
diff --git a/dev-ml/ppx_here/metadata.xml b/dev-ml/ppx_here/metadata.xml
index 73cffad57b88..24b631f152ae 100644
--- a/dev-ml/ppx_here/metadata.xml
+++ b/dev-ml/ppx_here/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>gienah@gentoo.org</email>
+ <name>Mark Wright</name>
+ </maintainer>
<upstream>
<remote-id type="github">janestreet/ppx_here</remote-id>
</upstream>
diff --git a/dev-ml/ppx_here/ppx_here-0.14.0.ebuild b/dev-ml/ppx_here/ppx_here-0.14.0.ebuild
new file mode 100644
index 000000000000..f9579bcec43b
--- /dev/null
+++ b/dev-ml/ppx_here/ppx_here-0.14.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+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 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+DEPEND="
+ >=dev-ml/base-0.14.0:=
+ dev-ml/findlib:=
+ >=dev-ml/ppxlib-0.18.0:=
+ >=dev-ml/ocaml-compiler-libs-0.11.0:=
+ >=dev-ml/ocaml-migrate-parsetree-2.0.0:=
+ dev-ml/cinaps:=
+"
+RDEPEND="${DEPEND}"
+
+# Error: No rule found for test/dummy.ml.pp
+RESTRICT=test
diff --git a/dev-ml/ppx_inline_test/Manifest b/dev-ml/ppx_inline_test/Manifest
index 4afaee5ec85c..e3009bf3df74 100644
--- a/dev-ml/ppx_inline_test/Manifest
+++ b/dev-ml/ppx_inline_test/Manifest
@@ -1,3 +1,5 @@
+DIST ppx_inline_test-0.14.1.tar.gz 19683 BLAKE2B f40e462d8eca18734883fd0b8777a9c69c0cc2741df8e95ade64685ea0b8d51dc614db6a4e93016fec0e2b521ea803a52b85d4b6e030239f6736f4f89da5a721 SHA512 24bda655ae8e1110d9550730281ab908a1795b1412545717a06e01143a80f92ba0a9d42cb20c4c9283f0725003a5c41c187bd46732ef2dd724a4714d9d41814e
DIST ppx_inline_test-0.9.2.tar.gz 19280 BLAKE2B 3cd354f27c69bc4fdd29b6a8b0637a08f247774127512886341ec04b8957bd2a66ed6bbfad95d1a529e4c670c815bdbfbfb80ecb9c6e02949a8d34d938d515c3 SHA512 39261a51201b2b7fbd6f4f53c72b2921da9f5a47f726479f65f976ed3979630f0a8587328f4536e42d24315d341afbe2770084ffd951569564a3145cd154be5f
+EBUILD ppx_inline_test-0.14.1.ebuild 701 BLAKE2B ac9439711ce2616d8d499d047a5a833032c6224cbeed2de5bbbc7fe247288134f083fcdbf038ce26e541a16ca06056ae4ccad30132ec62206de4537bcc28126b SHA512 8d9f56116ebba157936dbe76ac8e3f64db7fb4c0117fc5eae8924eee5bde801f150a78cb5dc009ab24e15797bef80462ba5247b914c70ad5a87a089587c69bb8
EBUILD ppx_inline_test-0.9.2.ebuild 616 BLAKE2B 0342fcbaade3e899a698527ff2f25b45ab52efa5b338e39dd3bedc7753ef282ef7dfbc292d60b309b5f0235086ec6cf080da8ca915c3b5ce3c8b787ffb3f2c07 SHA512 b89457983098553cfa2064f0300915aa65ed3291226ae8014b023ca3268f66a783629d899984bbc643fafcfa6ea96812b7be177e8978e1482a849e57245aaf75
-MISC metadata.xml 258 BLAKE2B f8ad2e9dca9466fc2b8a450ff88d053eddbfe17a9d87c30828b18042caeb4ca43daef04fa52bd66398285699832c2fbb5a6049a167236cadf6daef59cd930001 SHA512 eec1b071634e5c1edc1c5eab4797c744fb733654654193ceb50f2f412b5e3cc4d02a86ccf2cc7ad2414c5bd5fefe5a6b3e27c49c80718431f75418f71fdc3e54
+MISC metadata.xml 335 BLAKE2B 411e745b4816ad16d72cd6a1f2aa65e9764f7bc07afcb48d27e7a72086a231abfef2eaf17ddc3f91a1f5efb71b35ce58321518c2df4d29e89bf94a05e96c67f5 SHA512 d12a744043bf4c3806f26de92e9fdccf972ef02bbc0e904cfcc6f712fd22551ebc0e45bd6c01dd3b6aa781ec19a9a987fc7688b1ab9e73a00221309e454702e7
diff --git a/dev-ml/ppx_inline_test/metadata.xml b/dev-ml/ppx_inline_test/metadata.xml
index d700cdb85213..b8d06ea426a3 100644
--- a/dev-ml/ppx_inline_test/metadata.xml
+++ b/dev-ml/ppx_inline_test/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>gienah@gentoo.org</email>
+ <name>Mark Wright</name>
+ </maintainer>
<upstream>
<remote-id type="github">janestreet/ppx_inline_test</remote-id>
</upstream>
diff --git a/dev-ml/ppx_inline_test/ppx_inline_test-0.14.1.ebuild b/dev-ml/ppx_inline_test/ppx_inline_test-0.14.1.ebuild
new file mode 100644
index 000000000000..0e46df31114a
--- /dev/null
+++ b/dev-ml/ppx_inline_test/ppx_inline_test-0.14.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+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 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+DEPEND="
+ >=dev-ml/base-0.14.0:=
+ >=dev-ml/ppxlib-0.18.0:=
+ >=dev-ml/ocaml-compiler-libs-0.11.0:=
+ >=dev-ml/ocaml-migrate-parsetree-2.0.0:=
+ dev-ml/cinaps:=
+ >=dev-ml/time_now-0.14.0:=
+"
+RDEPEND="${DEPEND}"
+# https://bugs.gentoo.org/749291#c2
+RESTRICT=test
diff --git a/dev-ml/ppx_jane/Manifest b/dev-ml/ppx_jane/Manifest
index 4df197f26c95..77e7bb246136 100644
--- a/dev-ml/ppx_jane/Manifest
+++ b/dev-ml/ppx_jane/Manifest
@@ -1,3 +1,5 @@
+DIST ppx_jane-0.14.0.tar.gz 4593 BLAKE2B 787fc0701ba0361446cb210c23469881da8fbab28460262a7bdca8723af158ed8deeb4597a31c8d89a4d44e5263c74e0ebc504b83827e0a34870a503b2ea9053 SHA512 b51bef2330ebb8d361b3f856a0526a5290664b68fa56a02de7020b0e27aaf5a378f1b22fc9a24007bfc812af67eb79343b2bdc3ca550108393323b99e29c623d
DIST ppx_jane-0.9.0.tar.gz 5831 BLAKE2B 0eda7b2a71c7e80d7febea6f204aaf7ccebff321f14a423bfe289fd3144251aeba0c3a15db360cd0732196900cdf3eeb5860db14fd001215bdc29e6471c94c52 SHA512 18b09c060519b94013c78ef4673ec7c26f465453391c6ad2ea3235b6f8e23208879c5d4e69dc01915cfb694b23171397af5e4b7208556a369d191c081c86fc2a
+EBUILD ppx_jane-0.14.0.ebuild 1213 BLAKE2B 4adde398f342ab9667441ae15dbb0db3514e53b2b4c47ebee69f193258b1216f950aaa6a5c66bfb549ef928172c6040355934c74cb1031529e31cdee55e7c979 SHA512 db45e183647cd3184fbb07c1271eeb13822f08f9d454050144ec016544de745260042600072bfe7b5df182c77d5bd554a7b32e1631587b6578a0c927430abfe6
EBUILD ppx_jane-0.9.0.ebuild 914 BLAKE2B 90861ed5244a66337830c60af25416d604ade64d346fa9cc7d2c6b7b47969318fdaa4895e762672e42e88e2c78fc8fce2ca4fcc6c9cee6ab38da919581bbcfc5 SHA512 9196f84ca6064327fe9037cdabe62ccda2a36a930a6a00d149e98eae297adad026a60e2e3cabd7f24900b303d9f48e048eaca6fb07040ba7a88c5be15f3de211
-MISC metadata.xml 251 BLAKE2B 68aac1192eaa46ec9bbe0e6d48f78ef283c442b152bb3059e403264d5e3196b9a656e46a055725acde63c7e7c0498836530f8bff9e1745b9d290ad03b80706ee SHA512 93223233acfbdd3e0155e569ff27e7210c9e77d969e5182d0ad0b220376a2783ebb7e3917efb3c0793678ab9eacef0cfdb08dd4ee246326471b89ccf72ade526
+MISC metadata.xml 328 BLAKE2B d5721b2e76d6c81a526a2c1f5fccc7b3b8aa440be22c18e64decd28d640d3358324f9a5343ac6a398054bb91c19514b447eb2215e841ad7af31608e037fb55ec SHA512 a04207d7044dc3a1203beeedee4769be6cb409f228cbe9783161c566ad0920e96125aed62958a3e8ed14c577eef647de22d5c53ded7228173f6d3df7d478d5a0
diff --git a/dev-ml/ppx_jane/metadata.xml b/dev-ml/ppx_jane/metadata.xml
index 4f7c369b5773..1ad033b289c7 100644
--- a/dev-ml/ppx_jane/metadata.xml
+++ b/dev-ml/ppx_jane/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>gienah@gentoo.org</email>
+ <name>Mark Wright</name>
+ </maintainer>
<upstream>
<remote-id type="github">janestreet/ppx_jane</remote-id>
</upstream>
diff --git a/dev-ml/ppx_jane/ppx_jane-0.14.0.ebuild b/dev-ml/ppx_jane/ppx_jane-0.14.0.ebuild
new file mode 100644
index 000000000000..4bc7b5b4b42e
--- /dev/null
+++ b/dev-ml/ppx_jane/ppx_jane-0.14.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+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 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+DEPEND="
+ >=dev-ml/base_quickcheck-0.14.0:=
+ >=dev-ml/ppx_assert-0.14.0:=
+ >=dev-ml/ppx_base-0.14.0:=
+ >=dev-ml/ppx_bench-0.14.1:=
+ >=dev-ml/ppx_bin_prot-0.14.0:=
+ >=dev-ml/ppx_custom_printf-0.14.0:=
+ >=dev-ml/ppx_expect-0.14.0:=
+ >=dev-ml/ppx_fail-0.14.0:=
+ >=dev-ml/ppx_fields_conv-0.14.1:=
+ >=dev-ml/ppx_fixed_literal-0.14.0:=
+ >=dev-ml/ppx_here-0.14.0:=
+ >=dev-ml/ppx_inline_test-0.14.1:=
+ >=dev-ml/ppx_let-0.14.0:=
+ >=dev-ml/ppx_module_timer-0.14.0:=
+ >=dev-ml/ppx_optcomp-0.14.0:=
+ >=dev-ml/ppx_optional-0.14.0:=
+ >=dev-ml/ppx_pipebang-0.14.0:=
+ >=dev-ml/ppx_sexp_message-0.14.0:=
+ >=dev-ml/ppx_sexp_value-0.14.0:=
+ >=dev-ml/ppx_stable-0.14.1:=
+ >=dev-ml/ppx_string-0.14.1:=
+ >=dev-ml/ppx_typerep_conv-0.14.1:=
+ >=dev-ml/ppx_variants_conv-0.14.1:=
+ >=dev-ml/ppxlib-0.18.0:=
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-ml/ppx_js_style/Manifest b/dev-ml/ppx_js_style/Manifest
index f8de163b70e2..fd1037e39070 100644
--- a/dev-ml/ppx_js_style/Manifest
+++ b/dev-ml/ppx_js_style/Manifest
@@ -1,3 +1,5 @@
+DIST ppx_js_style-0.14.0.tar.gz 10587 BLAKE2B 8219a69526be53b9fce488f725c79ff30c451c556853aa54d8dbbd7040a76df37ac8942ae05cdcbbe6d839a64d5b471f53a2fce276e547a17e68490c1ec1ab19 SHA512 3561b7668bafc421fa82c3c80e019185924bfc8cafab6ef81299395061db78261005bdd34be5bed8a80bec84306b9294e6398a3a1ee0a269f7b8f3942953a6a4
DIST ppx_js_style-0.9.0.tar.gz 8182 BLAKE2B e2c4bffb07882d49f3839b2a402e2617b9e19147a0d4ff4c7aa4fb4a350d2208eccd76ec64828c4d56edce8f811c462396aa805ca3440b93ba22790d59c8dd23 SHA512 9790223a2d8f6db090cfa4d7ff3d3d1c8a22b07863dd3c5674216836b23cfdb3b014ebc092e173ddfe725ccf73fc7830a8a88effab1df9d80875f918b9558051
+EBUILD ppx_js_style-0.14.0.ebuild 645 BLAKE2B c20e910432824d5f1dd69ea8e59946d72a6eafe1772a6486c0c15f419d28621fa433c0212584244266fc93eee50ef0bb423a9ec45e27a5f18a8b62712b878226 SHA512 4d1dcec54676cd578c3ccfeeb6def21f70abd8208a2be52a2b1eada4e997168f1fb8ab7571de1c039c47036bcba1a3101ee4cdcdb8cfe37a77bfc177e059a41e
EBUILD ppx_js_style-0.9.0.ebuild 582 BLAKE2B 53c693c0bfdf52c14b48e4e60bc5ea791ff7c416b4bb60e45aed57ef15624e07fb2a60a2caaeaca0461d3093fdbdb3678540587654b5669bce40e92f90213d09 SHA512 c6a9d80217ae323e284be7244f38955495a852168de81c5e9137d1a470f2e8ab5b2e670c37bf88fcc8f7953a56b4fba17d7854bfcad101bd5964055d3f2f528d
-MISC metadata.xml 255 BLAKE2B 4f41fadc22d799cdcc1893a032a715aeadcb03f05de157a0a787102e0c294b4ac0eab1996aa07c97215c7cdf7de78e0af2ab1b3d98b530d3b2b490f6aade8379 SHA512 b0e6ea4682d3b7dd76f0eaed62f80ddccc3f360a021601b98a9f3fb22dadf6040d13d9f21c8edef638421365b1aca34c0adec0669c8ac7ab8481111334b706f0
+MISC metadata.xml 332 BLAKE2B 2efc9a64be7da306761ea6261393aa5a6f00d658668791e30f83fd13effcc70d5c3ecea46a49534e38cb9e02402ca9b1d17a699ed1d85ece1177da815048c47d SHA512 8abe379a3bf4e2212ec8566b9ab5fa6f82f5ca522953e12019f97b15c090f05b090a3364f39b62103a3c75c8a4493a7a4a9a112b0cb3acba7677cbd385e2f486
diff --git a/dev-ml/ppx_js_style/metadata.xml b/dev-ml/ppx_js_style/metadata.xml
index 3272a51e2cff..0d5d7a713ab7 100644
--- a/dev-ml/ppx_js_style/metadata.xml
+++ b/dev-ml/ppx_js_style/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>gienah@gentoo.org</email>
+ <name>Mark Wright</name>
+ </maintainer>
<upstream>
<remote-id type="github">janestreet/ppx_js_style</remote-id>
</upstream>
diff --git a/dev-ml/ppx_js_style/ppx_js_style-0.14.0.ebuild b/dev-ml/ppx_js_style/ppx_js_style-0.14.0.ebuild
new file mode 100644
index 000000000000..a515f55da5e5
--- /dev/null
+++ b/dev-ml/ppx_js_style/ppx_js_style-0.14.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+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 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+DEPEND="
+ >=dev-ml/base-0.14.0:=
+ dev-ml/findlib:=
+ dev-ml/octavius:=
+ >=dev-ml/ppxlib-0.18.0:=
+ >=dev-ml/ocaml-compiler-libs-0.11.0:=
+ >=dev-ml/ocaml-migrate-parsetree-2.0.0:=
+ dev-ml/cinaps:=
+ "
+RDEPEND="${DEPEND}"
diff --git a/dev-ml/ppx_let/Manifest b/dev-ml/ppx_let/Manifest
index 276d49ae14c2..e73c36183cba 100644
--- a/dev-ml/ppx_let/Manifest
+++ b/dev-ml/ppx_let/Manifest
@@ -1,3 +1,5 @@
+DIST ppx_let-0.14.0.tar.gz 10822 BLAKE2B c1dc155afb0bc52bb22d65c2c19536d41d53e4cf10d39b70ebadf1cf8cfb37ff1c25d9fcfb48f9421a0c55887acc2c6ce72d531593a61654146d3196fa83499d SHA512 79f2dcf2c76308b5993d1b9dad5c961b816dcc4ae43d856c51c196a67eb21b2f51135762e52d512afa9b45aca30002abbca76036ebcc117464a4823d1c40ed0c
DIST ppx_let-0.9.0.tar.gz 9245 BLAKE2B 827efa86db6981416c07205bf520d750dea6b6a2f1789faaeb59fcc7ddff78470e9670c471c5c3e5b6929181149404b86e3bbe6e67ffa2946895a7d464079316 SHA512 545cdf341dafaab958e1dfec476f3a714ae5899dea3775ace443e36fe4d55136489ae376f2394dbecdcbcb4dbc66e41a1de147b2774c9a0c7508b827acba4250
+EBUILD ppx_let-0.14.0.ebuild 597 BLAKE2B d8bf0e00777d336cc01baf0acace880341537c1a32822ff2ce6e4359085ddda111fd84488ae1748cfc41292c36b1c225483121188f851f2925112b26f8754a93 SHA512 0de8b9a2c63bb7c39fa65ee1c3e42a4b2f8ba8cb6f78046a88c70b89c7254a18ef4a7b0ad0bd012ccb8bfe67b41c7a44faac3ce523b202d62c5965c194383abe
EBUILD ppx_let-0.9.0.ebuild 501 BLAKE2B a5327ddf65cce332852580b7285cb60dca6ae3a63c76be094eb0481416beb45ab3084432c3e2b19ee5aa6010280e4d7e88625498f99733c6244b9f63ea186210 SHA512 35320c9a364d3113ab5dd7b9b3ccd204c61f6960bf0bbdfe6c76173a2ff81109d47f4852e13b3ca8560e7bc6d22b8518f8308d315e205f438f69a996bad95ddb
-MISC metadata.xml 250 BLAKE2B 8b618a04d1835326fab81db781e0f155714956899b156e118e05d69f4f3231cd43da5861a57b0d575db602ac54ab8c550a2bd43d073a3096083d2326c9a04bfb SHA512 f67f682edcd1e6774d65491510d6910afeb62ed75b034e49710d3d5a1b7b99f1f22e2de22eb9203586308336357a04e7b82204014302e9ec6d4ebcc3bbce7084
+MISC metadata.xml 327 BLAKE2B 0cd5041ec372afcf534df7c3904b2796f7adae1be8c2ec6b4342b032a7a945b04b395aeb93178ba331b1e44f6d159213cf3c327045805b98961f25fc0cfd0c41 SHA512 15f1f3965d557e5cd2d9a56d5d76cfb0371523f1e27a6c0cc65832c2eab083a8c2129c967e51defe000f76da18b24bb771f1a59e0828307ae9b07d7903486ff7
diff --git a/dev-ml/ppx_let/metadata.xml b/dev-ml/ppx_let/metadata.xml
index 0fcc4e6ccaeb..94e867485031 100644
--- a/dev-ml/ppx_let/metadata.xml
+++ b/dev-ml/ppx_let/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>gienah@gentoo.org</email>
+ <name>Mark Wright</name>
+ </maintainer>
<upstream>
<remote-id type="github">janestreet/ppx_let</remote-id>
</upstream>
diff --git a/dev-ml/ppx_let/ppx_let-0.14.0.ebuild b/dev-ml/ppx_let/ppx_let-0.14.0.ebuild
new file mode 100644
index 000000000000..8cd7d3961b48
--- /dev/null
+++ b/dev-ml/ppx_let/ppx_let-0.14.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+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 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+DEPEND="
+ >=dev-ml/base-0.14.0:=
+ dev-ml/findlib:=
+ >=dev-ml/ppxlib-0.18.0:=
+ >=dev-ml/ocaml-compiler-libs-0.11.0:=
+ >=dev-ml/ocaml-migrate-parsetree-2.0.0:=
+ dev-ml/cinaps:=
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-ml/ppx_metaquot/Manifest b/dev-ml/ppx_metaquot/Manifest
index 0fb3e50b7854..9bb6e5b7b38c 100644
--- a/dev-ml/ppx_metaquot/Manifest
+++ b/dev-ml/ppx_metaquot/Manifest
@@ -1,3 +1,5 @@
+DIST ppx_metaquot-0.11.0.tar.gz 5407 BLAKE2B 610f3197e2809914232310363775bb5f0f889681fec1274071eba71617131b863f6229e85dcdf3749dbb300a980f39dfeacfe23f388f5f898d01925d07fbcc43 SHA512 59d95a5d9298d47adc9e3ca531aae59c91cfa019d90a5d8aa5e11de6bf1f3d3fcd2dbc800028a3ab999ba51257f695116b0a32a96c958bafea39761fe5db230b
DIST ppx_metaquot-0.9.0.tar.gz 6801 BLAKE2B b5629da4c2460ed064e614e0051bd104fd731526498ffd085a75039672c186f314918c4c355a9dacfee7982c06b338950de0a670b27bd061e19b688a21693c08 SHA512 7645f02f964f2a33836f947a725384f95c7724dcd88c031aa3dd2d255127a21d473e19ff77cb917f845930ab44541a4698becf56721cc1a0a0eee5912947cd22
+EBUILD ppx_metaquot-0.11.0.ebuild 469 BLAKE2B 690ca22e12d8ab60c1165da107d57b5b3d948d881dd4100d3b52ba9cc9c54c1ad690d3ced05aca88b517f23dbc569c3a488333f8804fcc99fb6996660c6f44b9 SHA512 f3d162a13b3c9329d41c502ea4ac9c32e20d49fb0bd9eef169f4870044cf7c70c027548cb66dcb9962a0f68f3f6e42aabc34b3e782745739d0453b94f187092b
EBUILD ppx_metaquot-0.9.0.ebuild 594 BLAKE2B f71b7eb1e1bb1603f15582c62e35ea6da4f9d9bcddb4f875e324f3e4fd080bfc1415a86bc8e1baa3e10917d8333cc16d5bfbd12e27cff776801d15cef2dc2a69 SHA512 78cc5d4fd248e0a277e61b34e0c85fbb700f5cedf4eabe331995a185a13747fe9fe66457edac74c97367d6d519359a939f547fa9dd0b08b0d1b5c5afbc1c2d1d
-MISC metadata.xml 255 BLAKE2B fcbf1fab1602517bb56010a6601cdfd6a178b1359572f496a6d168210af21319b60771d362efc52b908dc65e5a83ebf33fd5ef696c1fe131aedef0aebce19363 SHA512 d72c8cc39275b75dc8a43490d6b607a63874fd1e9e17a4fadfd18a66647901e1e8637e1ad3208d61c6a9b74f205ca57587ea440fac5ef597b425a5ecde0ecde0
+MISC metadata.xml 332 BLAKE2B 8f74ef84efdd30605ca120024b04014dd82bb6d3902d167919216da7fe28c44028ff281e3d81f8ac3769cd674c7bea61e65961fde530da9b073b6e6f52bd8bf5 SHA512 5849ed7bc902c04088bc204e977955d94f8b5fe40a7b5b74290651979e810d3e8df50a3edf592235d52c4eb046aae61f597385e28ed3229ecbaef3e3e61c9bd9
diff --git a/dev-ml/ppx_metaquot/metadata.xml b/dev-ml/ppx_metaquot/metadata.xml
index cc4e02414d74..dac500f6bc30 100644
--- a/dev-ml/ppx_metaquot/metadata.xml
+++ b/dev-ml/ppx_metaquot/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>gienah@gentoo.org</email>
+ <name>Mark Wright</name>
+ </maintainer>
<upstream>
<remote-id type="github">janestreet/ppx_metaquot</remote-id>
</upstream>
diff --git a/dev-ml/ppx_metaquot/ppx_metaquot-0.11.0.ebuild b/dev-ml/ppx_metaquot/ppx_metaquot-0.11.0.ebuild
new file mode 100644
index 000000000000..2964c1cc7826
--- /dev/null
+++ b/dev-ml/ppx_metaquot/ppx_metaquot-0.11.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+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 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+DEPEND="dev-ml/ppxlib:="
+RDEPEND="${DEPEND}"
diff --git a/dev-ml/ppx_module_timer/Manifest b/dev-ml/ppx_module_timer/Manifest
new file mode 100644
index 000000000000..2bad5e46024e
--- /dev/null
+++ b/dev-ml/ppx_module_timer/Manifest
@@ -0,0 +1,3 @@
+DIST ppx_module_timer-0.14.0.tar.gz 7262 BLAKE2B 6fafc6b4b449071f4a95619d078814b0c3ace3574df46585b72549e5db349ab476124c217f46c6903c7c8a059f779dc62cc8a079eb1ef6b4854646fdabdf04bf SHA512 cd9b6bbd6461b7408a31a0f6ca010a3c755db1f4a22150645c530e7b4a0a4c76a308ad0f8aeddc54914a116f6d74bd738604cfd9d9d255197f9ea18904d715e7
+EBUILD ppx_module_timer-0.14.0.ebuild 698 BLAKE2B 505e84cada63476532c1cb761b783e0fed9b3252737c95e21ae1ba0c0f1edd5d3d06abade388f41780911346d8a5b7e25297e4c6e900175bb7fac7465da3908d SHA512 b9604ba88f529d83af34b3a61ae133b562016fd61ae4891a5ccccd076c9a764764781aff977c879b085c2d4683bb4008b1be7955edd3c83c483da6b02995c14f
+MISC metadata.xml 336 BLAKE2B fcd9193e61914fe9c93d8cfe3f70b49d1824f003d1e335ce82b97396d258ab33137f3d4c2d75e6a3ea34fd81b86fb9f246074745eaee78e22103d4a6d7a312cf SHA512 8d07c2758fab53cb742090d7c33fb1f5af751d6e7bd0c2c7e8386590b41125476102451676bddd65d01a536cdbaf2bf86f31f9fecf672566176ce45f11ca951b
diff --git a/dev-ml/ppx_module_timer/metadata.xml b/dev-ml/ppx_module_timer/metadata.xml
new file mode 100644
index 000000000000..b993e4623ddc
--- /dev/null
+++ b/dev-ml/ppx_module_timer/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>gienah@gentoo.org</email>
+ <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">janestreet/ppx_module_timer</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/ppx_module_timer/ppx_module_timer-0.14.0.ebuild b/dev-ml/ppx_module_timer/ppx_module_timer-0.14.0.ebuild
new file mode 100644
index 000000000000..c4ce24c4a2ff
--- /dev/null
+++ b/dev-ml/ppx_module_timer/ppx_module_timer-0.14.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Ppx rewriter that records top-level module startup times"
+HOMEPAGE="https://github.com/janestreet/ppx_module_timer"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+DEPEND="
+ >=dev-ml/base-0.14.0:=
+ >=dev-ml/ppx_base-0.14.0:=
+ >=dev-ml/stdio-0.14.0:=
+ >=dev-ml/time_now-0.14.0:=
+ >=dev-ml/ppxlib-0.18.0:=
+ >=dev-ml/ocaml-compiler-libs-0.11.0:=
+ >=dev-ml/ocaml-migrate-parsetree-2.0.0:=
+ dev-ml/cinaps:=
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-ml/ppx_optcomp/Manifest b/dev-ml/ppx_optcomp/Manifest
index 3ec13caca8ad..5492b1850452 100644
--- a/dev-ml/ppx_optcomp/Manifest
+++ b/dev-ml/ppx_optcomp/Manifest
@@ -1,3 +1,6 @@
+AUX ppx_optcomp-0.14.0-ppxlib-0.18.0.patch 2581 BLAKE2B bf7f888acc462481e03a2d091e9a453d87f9173708c865c419d0d1e89dc315225196ac5e275de7957649ce7c09d056622998aeb3555b274c4e1e6c283193dd6f SHA512 cb50911a137c0fa0efcafdd9bd6cfa0e196c20816e7696bff7ad8aa81d015f18b534c8f0fdf47da0ce4289409cd5fd3b01ef051d3139fd30ac834d91a80ce47d
+DIST ppx_optcomp-0.14.0.tar.gz 16583 BLAKE2B 9b139708e02501245d5440a862324fe0191c9c96772e6599ed474a734263c4d2c0fa08fff666abd2efb218ec03a2b9b47c5ef6480d53a8d0f280550b741ac39a SHA512 e86b108d805500cbd7be628f41436ec8de0e8622d4218631d01bf73b0e70da0a057b8531465206baa9b8851ce9c22c5cd53921fccfae352ee46527d69964dc44
DIST ppx_optcomp-0.9.0.tar.gz 14611 BLAKE2B 6fc431fd3ed173835a48814718a05b3ae619f182f4c008415dba77c88bfeab780e6fc49c4faed2ee4e362b6a151544b1a707651dcbfdbfcdce979a2a3d6d6c02 SHA512 ce4a5049045458533b783b99b7569e72e074bd425a81315d43fcab26dbc2a4b141cfda2b2365c69b3d0251f2bf0b8c8f0d14fc8883f1a0f4edae824776565a9c
+EBUILD ppx_optcomp-0.14.0.ebuild 694 BLAKE2B 2f0b81c29854620fb4be914618e1d5bc8a5ede91250cee9ebcd9950e11ff4e317a7e607578e5d9cf604c3bad2026da8a67b954f0123309cda326d9c17306cb55 SHA512 939ca0bbf0b437ae8afb5f21a857d4a0e3f465f4b038eb4d810a86cc8d4af015fe69d2741c2b9f463cb6e1df8b9e029a633075b1e211d57433cef978c0d37f41
EBUILD ppx_optcomp-0.9.0-r3.ebuild 526 BLAKE2B 78ff4bbfdf7781a0ba8a6b6a5fd0b6f2b432c3f247d056a34a3ad4a2fd11fcb139b3d6ad46e166896f492fda9367fcbc0cc8180d5bbbac243cfa75e7ba5c4b99 SHA512 e61daab3a1868d7348ff05977bef647f6be54c4883789265f38dccfb3b8d9311b3c3599c59fa374ee8945454baf91634fa859ed060e04cb98457543aabdde967
-MISC metadata.xml 254 BLAKE2B e8b174fb629dd9c675bc12b7789454c91c8b2f689140c70345cff6e2ae8fd78c55963e983ccb922940cd82bca702e9c9fe3668dbecef06775038693c8b8d3f8c SHA512 f8061b6d24fbe6afdff7284e2fc85aeff0c10df1baf44639e329e7ff25b44d351d87c705307602936a98a6a0f3db78c0c5d0d6cb79b779d0816957db62a535e1
+MISC metadata.xml 331 BLAKE2B 849b5e0d1adf1511346568c3ed8cf159eebca2fa7162f6a128fb67c36e3025664ff8a2965c28aeec97deb37b237ef64af014b87119083a5ed0b2ab322f1f1251 SHA512 5743f8c155c33c49d6e9a3ae4def1849553c8ff74c30e0e0694fbf9a798c4cf74b6c1347596ad7a849d564b6aef2423ddf7fbe25df8f2114548753d5f727d6de
diff --git a/dev-ml/ppx_optcomp/files/ppx_optcomp-0.14.0-ppxlib-0.18.0.patch b/dev-ml/ppx_optcomp/files/ppx_optcomp-0.14.0-ppxlib-0.18.0.patch
new file mode 100644
index 000000000000..063b9df74aba
--- /dev/null
+++ b/dev-ml/ppx_optcomp/files/ppx_optcomp-0.14.0-ppxlib-0.18.0.patch
@@ -0,0 +1,63 @@
+commit a4422ecd7e0677569533b1dae07924f5d786e8f6 (HEAD, origin/upgrade-ppxlib-0.18.0)
+Author: Nathan Rebours <nathan.p.rebours@gmail.com>
+Date: Mon Oct 5 18:35:26 2020 +0200
+
+ Make ppx_optcomp compatible with ppxlib.0.18.0
+
+ ppxlib.0.18.0 upgrades to the 4.11 AST which results in a change
+ in string constants representation. This PR makes ppx_optcomp
+ compatible with the latest ppxlib.
+
+ You might want for the actual release of ppxlib.0.18.0 before merging
+ this!
+
+ Signed-off-by: Nathan Rebours <nathan.p.rebours@gmail.com>
+
+diff --git a/ppx_optcomp.opam b/ppx_optcomp.opam
+index 20eb7c5..cbe8b5c 100644
+--- a/ppx_optcomp.opam
++++ b/ppx_optcomp.opam
+@@ -15,7 +15,7 @@ depends: [
+ "base" {>= "v0.14" & < "v0.15"}
+ "stdio" {>= "v0.14" & < "v0.15"}
+ "dune" {>= "2.0.0"}
+- "ppxlib" {>= "0.11.0"}
++ "ppxlib" {>= "0.18.0"}
+ ]
+ synopsis: "Optional compilation for OCaml"
+ description: "
+diff --git a/src/interpreter.ml b/src/interpreter.ml
+index f1da14b..1c6d726 100644
+--- a/src/interpreter.ml
++++ b/src/interpreter.ml
+@@ -241,7 +241,7 @@ let rec eval env e : Value.t =
+ match e.pexp_desc with
+ | Pexp_constant (Pconst_integer (x, None)) -> Int (parse_int loc x)
+ | Pexp_constant (Pconst_char x ) -> Char x
+- | Pexp_constant (Pconst_string (x, _ )) -> String x
++ | Pexp_constant (Pconst_string (x, _, _ )) -> String x
+
+ | Pexp_construct ({ txt = Lident "true" ; _ }, None) -> Bool true
+ | Pexp_construct ({ txt = Lident "false"; _ }, None) -> Bool false
+@@ -361,7 +361,7 @@ and bind env patt value =
+
+ | Ppat_constant (Pconst_integer (x, None)), Int y when parse_int loc x = y -> env
+ | Ppat_constant (Pconst_char x ), Char y when Char.equal x y -> env
+- | Ppat_constant (Pconst_string (x, _ )), String y when String.equal x y -> env
++ | Ppat_constant (Pconst_string (x, _, _ )), String y when String.equal x y -> env
+
+ | Ppat_construct ({ txt = Lident "true" ; _ }, None), Bool true -> env
+ | Ppat_construct ({ txt = Lident "false"; _ }, None), Bool false -> env
+diff --git a/src/ppx_optcomp.ml b/src/ppx_optcomp.ml
+index a2573de..d87ea24 100644
+--- a/src/ppx_optcomp.ml
++++ b/src/ppx_optcomp.ml
+@@ -81,7 +81,7 @@ module Ast_utils = struct
+ let get_string ~loc payload =
+ let e = get_expr ~loc payload in
+ match e with
+- | { pexp_desc = Pexp_constant (Pconst_string (x, _ )); _ } -> x
++ | { pexp_desc = Pexp_constant (Pconst_string (x, _, _ )); _ } -> x
+ | _ -> Location.raise_errorf ~loc "optcomp: invalid directive syntax, expected string"
+
+ end
diff --git a/dev-ml/ppx_optcomp/metadata.xml b/dev-ml/ppx_optcomp/metadata.xml
index f45619ffca46..30b65cf1fd3a 100644
--- a/dev-ml/ppx_optcomp/metadata.xml
+++ b/dev-ml/ppx_optcomp/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>gienah@gentoo.org</email>
+ <name>Mark Wright</name>
+ </maintainer>
<upstream>
<remote-id type="github">janestreet/ppx_optcomp</remote-id>
</upstream>
diff --git a/dev-ml/ppx_optcomp/ppx_optcomp-0.14.0.ebuild b/dev-ml/ppx_optcomp/ppx_optcomp-0.14.0.ebuild
new file mode 100644
index 000000000000..baf7b1c68d1d
--- /dev/null
+++ b/dev-ml/ppx_optcomp/ppx_optcomp-0.14.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+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 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+DEPEND="
+ >=dev-ml/base-0.14.0:=
+ dev-ml/findlib:=
+ >=dev-ml/stdio-0.14.0:=
+ >=dev-ml/ppxlib-0.18.0:=
+ >=dev-ml/ocaml-compiler-libs-0.11.0:=
+ >=dev-ml/ocaml-migrate-parsetree-2.0.0:=
+ dev-ml/cinaps:=
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-ppxlib-0.18.0.patch )
diff --git a/dev-ml/ppx_optional/Manifest b/dev-ml/ppx_optional/Manifest
index 9abcb3f0d7ed..5eeff11a6241 100644
--- a/dev-ml/ppx_optional/Manifest
+++ b/dev-ml/ppx_optional/Manifest
@@ -1,3 +1,5 @@
+DIST ppx_optional-0.14.0.tar.gz 6090 BLAKE2B 99c5ed7ab6b6c555477eaf468786cc175ff8c8ac4d0c6abb8110637da57396ed599d5c10bd35f3d5ff27a41b00314ca355596e4158c4d792fcb37d547455b90d SHA512 70ed28a974ea1bbcb3fe2e54911e355da54fafd6dff3e74c471126a824c28e9a180777e96e17c4a7a52be4be507fbbc0fa3e92310346dbaf5ab8711845e92e40
DIST ppx_optional-0.9.0.tar.gz 6940 BLAKE2B 28b9ab2b8cc20f295e927533ff9eed694289987914105758d3c014d06064bd21016d44bc7ad72b331a4c887848ed9c2dd75a0a48b6d5f330de898087596d1cc3 SHA512 c341bc8e64b7caf7af5c878747697330db84b14959f22930dd6919cc861dce847983771cbad2ed7800ab8c64704e88fa0d8db3ca7c8f2924bf785a4dccd17fa0
+EBUILD ppx_optional-0.14.0.ebuild 529 BLAKE2B c30d6a1dc4b1bc9a314af08b24644b5099bca59f455e13f397b7c956a20d1a6cf0bb974fae1a67b25f10580a5aa3423cce2bae5b572bac878db4873e93a2eee2 SHA512 891d895610677fbaef81adaac534cb157cd7eca9767864dd7f1a0e26d3a7a4ec1053d9c98c10dccc111e00e900f1e59cf95e67c0c94b85741d2d6ac2815876f2
EBUILD ppx_optional-0.9.0.ebuild 541 BLAKE2B eaead536ee9b791dcf1ea8c4b43a37f9bda86598dc02a5c76c213af082eedcb7ec99033783fb5c1345b8ad5c38edbaa8da148bedbaa3b11c550f8fed6f73304e SHA512 3f085f451459dfa4f66fe38d85f5288adf02d16d939a080686d83d7bbed4b839aa2f9ec73b37c09718c9158b3f86259ae893e7d6a98469bcd21b6eba0d158dc9
-MISC metadata.xml 255 BLAKE2B 6b2443d99913e571e51183353a0f3ef4129d1567f706f0f66d2a82676218193d67fdc0972fe86145f3eff6bbddc701cbe4e200529c48e4ad6924ffad29d2d026 SHA512 12b44bf6b75813b4ff16196c152327e6d6c072aa7a05354f0cd2d0d711750fa70c722dbacf80141ed611013f4d9ca1fd2a85ef0added2fd69e1f19ee6a087985
+MISC metadata.xml 332 BLAKE2B 0824f2e9534fb0da9c6173262e70e59d7734d171ec01c274504636f71ead682799e16f7aa6d4ed90af336f3d68b2668eee86371c6be191903b81147b885ff53d SHA512 9dcc5fdfff88c79298e80a8dac25bd130a53ab4f02fda52336cb753de685d45c7769c8b0a1697e5fe11b78acfbf19e8798790ba4c6e4c697006107762b5f88ee
diff --git a/dev-ml/ppx_optional/metadata.xml b/dev-ml/ppx_optional/metadata.xml
index aa510eb3b023..8a58c771030e 100644
--- a/dev-ml/ppx_optional/metadata.xml
+++ b/dev-ml/ppx_optional/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>gienah@gentoo.org</email>
+ <name>Mark Wright</name>
+ </maintainer>
<upstream>
<remote-id type="github">janestreet/ppx_optional</remote-id>
</upstream>
diff --git a/dev-ml/ppx_optional/ppx_optional-0.14.0.ebuild b/dev-ml/ppx_optional/ppx_optional-0.14.0.ebuild
new file mode 100644
index 000000000000..4cec3e5f6025
--- /dev/null
+++ b/dev-ml/ppx_optional/ppx_optional-0.14.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+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 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+DEPEND="
+ dev-ml/base:=
+ dev-ml/ppxlib:=
+ dev-ml/ocaml-migrate-parsetree:=
+ dev-ml/result:=
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-ml/ppx_pipebang/Manifest b/dev-ml/ppx_pipebang/Manifest
index a0cdcbb2b652..13dd813b5e99 100644
--- a/dev-ml/ppx_pipebang/Manifest
+++ b/dev-ml/ppx_pipebang/Manifest
@@ -1,3 +1,5 @@
+DIST ppx_pipebang-0.14.0.tar.gz 3766 BLAKE2B a2e99dd5e27ddbca5d77b1c215757d8d0d2d54b53511f0db93a09a16c25b5c5e429a08c8d42c7e4843eeb23c346649dea5700c445afe176f4b1625340901b6c1 SHA512 b07004aef0865c877f8f814068b514298568078785586933f400350d1a1dae3eb4aafe1ba4f12e17a3e2a3945297162c4a725ebfbc153e80b412c6086019959a
DIST ppx_pipebang-0.9.0.tar.gz 5964 BLAKE2B ce001d207a59b1e99f7a023c2823d1b90233762147ad377aa54f7c771041e77081f7f9b05a0f36cb9a2f6379622a9686fa5bad8974d7707dc0b22b3c704edac6 SHA512 d0e82152d257f7214e577e37046877a9c4129c6a9fd79f83912c6335455add4302d927e70117a1e9386c448686d271a7596b3fd2ef0b5f2bda8010cbb9157751
+EBUILD ppx_pipebang-0.14.0.ebuild 607 BLAKE2B 8bc86d11f9848c9edef0ff658c0b47685c41e6b4527bb933d33aa952d7b80842a59138c0ab5c5a41d0103d4506a4e107b558d24603521b912ad2c7f7bcb67b22 SHA512 af1c957a449ad140e75c34213f7ef71cb60589f0b3ede1d43806164beb6927e16c6a72d941324ceee520960a0d8673217ec857b60ac35492ee084b7dbe6a416c
EBUILD ppx_pipebang-0.9.0.ebuild 576 BLAKE2B b3cdc15a04f75c3179a4d6acbb7438cc3ca5eab44521170228f13979c502630f81e1daa366e26611d7fe1971b1941bec8c357b538e00b2bc695e7a6c06e41afe SHA512 d0b26da06387b21925fdc0bd9c878fd04d9182c564633af13413d6739a6150113ada6da608b587bb95e90bb9d3e2b0c72011b96e0cbab725efba6e555938f7c7
-MISC metadata.xml 255 BLAKE2B dfc7d43c11d53db3a028303d051cf3d5ba95fb16549c62f36bdaab341ede7a99ae4ec43b7f3c5f70f347c0db302385cbd5fdc1f0e35f9e5456a76adaf63d3124 SHA512 db6b5e7985f47a44114f25cd4999e67ce6df553f099e792fccfc3b46bf3b82d76f412929ddb3f943d49344bfe9c217d357783008c08549b7b49faa38692c180e
+MISC metadata.xml 332 BLAKE2B 14afd3db00086d729807a4c4305a3e884ba3ac50c56933ca29e9a9cccc93760b9eea1f2faa70ce2da7a4d682868af4348c6b1633e375a5162a768a440f646df8 SHA512 180f11fe1d90e525f33b0cf5c58e7d75845defa23c0d3b4d1b630e1f264048728f08a0f146912036830185429ff496b716269720f34e5b38528fe242174e6855
diff --git a/dev-ml/ppx_pipebang/metadata.xml b/dev-ml/ppx_pipebang/metadata.xml
index b7e3332536f9..91b6ab049cba 100644
--- a/dev-ml/ppx_pipebang/metadata.xml
+++ b/dev-ml/ppx_pipebang/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>gienah@gentoo.org</email>
+ <name>Mark Wright</name>
+ </maintainer>
<upstream>
<remote-id type="github">janestreet/ppx_pipebang</remote-id>
</upstream>
diff --git a/dev-ml/ppx_pipebang/ppx_pipebang-0.14.0.ebuild b/dev-ml/ppx_pipebang/ppx_pipebang-0.14.0.ebuild
new file mode 100644
index 000000000000..2726dec13376
--- /dev/null
+++ b/dev-ml/ppx_pipebang/ppx_pipebang-0.14.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+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 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+DEPEND="
+ >=dev-ml/ppxlib-0.18.0:=
+ >=dev-ml/ocaml-compiler-libs-0.11.0:=
+ >=dev-ml/ocaml-migrate-parsetree-2.0.0:=
+ dev-ml/cinaps:=
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-ml/ppx_sexp_conv/Manifest b/dev-ml/ppx_sexp_conv/Manifest
index 184ae927d58a..4b645f5cd93b 100644
--- a/dev-ml/ppx_sexp_conv/Manifest
+++ b/dev-ml/ppx_sexp_conv/Manifest
@@ -1,3 +1,6 @@
+AUX ppx_sexp_conv-0.14.1-ppxlib-0.18.0.patch 1548 BLAKE2B 2adef4e4a978e6a01b9f18aece888ce12c5ad0498411d9072c6ac4787e22d4053e89acff47e22d388305754304989e52c646eb93dc2652a93a0bf9b816c172f1 SHA512 92d4a04e54d290f90699d0c1f59d8805062d3949987787dfa5c033091948ededde5cc1d97d9b0be1b5a0b4168ba7e85720569f72e9de5325e6891357de800468
+DIST ppx_sexp_conv-0.14.1.tar.gz 49857 BLAKE2B ede55963d995917bd0c4a1464b58f8584ec6be4793df706fd3be96670fe685aba82459f9a1e4c6117c594953a3f23c502cc609f1069d482d24278baf7ed87ed5 SHA512 5018abe07300f67cb2c8b8cd8242403a91ac6b7fda13fe43060b3b09635082a7ad45858c7c6442a5fcae2b6d7d398a03eec16cfcbc5fd59f7f3f5c5fd1ad56f9
DIST ppx_sexp_conv-0.9.0.tar.gz 28000 BLAKE2B 2536d3ddbd4ee83baf9eade208983ce9856318079e29da9858838c985b904a7e2e1c6e3ea06bd1360cc17e619f1e952634554e89b294dd00981934679b384c3f SHA512 af3d28a3cdb7c796549a2598c218f69a69d58da715ef2d16077c3adeb22823fa7bec6bc0d8cb6caaf2a0adb56dfcb39d667975959251fb310b69d6abe8302845
+EBUILD ppx_sexp_conv-0.14.1.ebuild 709 BLAKE2B 9b6b38db4a7dd99a00444baad524fb20a7b2cb67e0107335552245fd656421c60bcc15b9ec63763c5882856cd049e9d66fd91b8237314549e320a6dec98dc206 SHA512 491b5479ddf8108a4831592266c181b0bb8bca706c0b4a581ee200abb1d988af2fb95aeacc9e66e12a86d6ce81f8cc1ae1ac0c4c067eb18413131b382522e1cb
EBUILD ppx_sexp_conv-0.9.0-r1.ebuild 672 BLAKE2B b69d608e4a8ed118085afff45f91d08621b302d08a87b06f2dd6fffb75f799f58352906c3e65519aa3f3f66348f151c1fbb0c289877e24b018f35809b932da1c SHA512 e5eb7f825efaecb7d4dc53e854e3d97eab0b89cd08c2cb9640b19082cb7d2e7aadf8a27a7a3de610ad4216a642fbb908c9249dd4aa7e8f2f57f19b30bdadca83
-MISC metadata.xml 256 BLAKE2B 9beeb72fa62df66e447930b73333f683c778b24dae13a80bd843dfbcbf2515c3c95bdb112635f6992a9a8d9e31974ffaf59a3d706c81283b48680559aa6748cd SHA512 50fb6daa4e12433fa230fc756a8bfae5f686e748c50aa656e61a56e9191f924b7d11a83768266a0e4bdb4d8dc233a5cc8194dfb0f2d88edb3396c46473108e02
+MISC metadata.xml 333 BLAKE2B 45f215f8e13fc5d782348eda68fe18a1975f6b1e5a7770b2d6f28429f26314c53d2b6bedbf4f195e5868123b5bf40bf208efcc83c2296399dad4d4fb3ac0b3a2 SHA512 7c1cb3a5c022fef141fe5144f122b4a11d4c4584f76998f47e0c57411ad3e64a545919ebe81939d941358760193aa062a5fe63737072f8e53afc46fae605463f
diff --git a/dev-ml/ppx_sexp_conv/files/ppx_sexp_conv-0.14.1-ppxlib-0.18.0.patch b/dev-ml/ppx_sexp_conv/files/ppx_sexp_conv-0.14.1-ppxlib-0.18.0.patch
new file mode 100644
index 000000000000..48004a4f26e2
--- /dev/null
+++ b/dev-ml/ppx_sexp_conv/files/ppx_sexp_conv-0.14.1-ppxlib-0.18.0.patch
@@ -0,0 +1,41 @@
+commit 13e9b27f5f9550b825128f8cd1f31d20dc8fa91b (HEAD, origin/upgrade-ppxlib-0.18.0)
+Author: Nathan Rebours <nathan.p.rebours@gmail.com>
+Date: Mon Oct 5 17:33:56 2020 +0200
+
+ Make ppx_sexp_conv compatible with ppxlib.0.18.0
+
+ ppxlib.0.18.0 upgrades to the 4.11 AST which results in a change
+ in string constants representation. This PR makes ppx_sexp_conv
+ compatible with the latest ppxlib.
+
+ You might want for the actual release of ppxlib.0.18.0 before merging
+ this!
+
+ Signed-off-by: Nathan Rebours <nathan.p.rebours@gmail.com>
+
+diff --git a/expander/sexp_grammar_lifter.ml b/expander/sexp_grammar_lifter.ml
+index 05005bf..17f1e73 100644
+--- a/expander/sexp_grammar_lifter.ml
++++ b/expander/sexp_grammar_lifter.ml
+@@ -28,7 +28,7 @@ type atom = Atom.t
+ type var_name = Sexp.Private.Raw_grammar.var_name
+ type type_name = Sexp.Private.Raw_grammar.type_name
+
+-let lift_string ~loc s = pexp_constant ~loc (Pconst_string (s, None))
++let lift_string ~loc s = pexp_constant ~loc (Pconst_string (s, loc, None))
+ let lift_var_name = lift_string
+ let lift_type_name = lift_string
+
+diff --git a/ppx_sexp_conv.opam b/ppx_sexp_conv.opam
+index 06fd03e..05c4182 100644
+--- a/ppx_sexp_conv.opam
++++ b/ppx_sexp_conv.opam
+@@ -15,7 +15,7 @@ depends: [
+ "base" {>= "v0.14" & < "v0.15"}
+ "sexplib0" {>= "v0.14" & < "v0.15"}
+ "dune" {>= "2.0.0"}
+- "ppxlib" {>= "0.11.0"}
++ "ppxlib" {>= "0.18.0"}
+ ]
+ synopsis: "[@@deriving] plugin to generate S-expression conversion functions"
+ description: "
diff --git a/dev-ml/ppx_sexp_conv/metadata.xml b/dev-ml/ppx_sexp_conv/metadata.xml
index 0ff7a80359e7..49e0dac594b0 100644
--- a/dev-ml/ppx_sexp_conv/metadata.xml
+++ b/dev-ml/ppx_sexp_conv/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>gienah@gentoo.org</email>
+ <name>Mark Wright</name>
+ </maintainer>
<upstream>
<remote-id type="github">janestreet/ppx_sexp_conv</remote-id>
</upstream>
diff --git a/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.14.1.ebuild b/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.14.1.ebuild
new file mode 100644
index 000000000000..238d51096eef
--- /dev/null
+++ b/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.14.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+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 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+DEPEND="
+ >=dev-ml/base-0.14.0:=
+ dev-ml/findlib:=
+ >=dev-ml/ppxlib-0.18.0:=
+ >=dev-ml/ocaml-compiler-libs-0.11.0:=
+ >=dev-ml/ocaml-migrate-parsetree-2.0.0:=
+ dev-ml/cinaps:=
+ dev-ml/sexplib0:=
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-ppxlib-0.18.0.patch )
diff --git a/dev-ml/ppx_sexp_message/Manifest b/dev-ml/ppx_sexp_message/Manifest
index f41be4a9a0de..2bda753b7930 100644
--- a/dev-ml/ppx_sexp_message/Manifest
+++ b/dev-ml/ppx_sexp_message/Manifest
@@ -1,3 +1,6 @@
+AUX ppx_sexp_message-0.14.0-ppxlib-0.18.0.patch 1680 BLAKE2B 0e5af99fccc4cbce9edc29b2f97c93816b7d07f05930e9f64f109c669391fcb745f226335b369221ce704d8c572ae46713446a5c5d4d9ad15bb0657717dd794c SHA512 bdd8677849346b9c1a20991477e84ccc0a886d668008a5bd6febc48603faf649d7c333536a587dfc4c0212802a73e0f7a17e1e0b61ba8168768b8bdb03c6c95c
+DIST ppx_sexp_message-0.14.0.tar.gz 7738 BLAKE2B a00577faf55b0816991bfe6f11fdc21d9b56893c29e67036483adce56c095cb8a2ee9014f9f0768ab96bbd28fe2f46b262e8a6122cf66ccb2740af7be890db0d SHA512 627f8e52914ef228277ff31a0d2262de823767fa0b510b1a29cbfc754c7cbc84cabe7c94de3e3a72d888d19e23584ebcc46c16997ffd7cdae41378cb44b2bc23
DIST ppx_sexp_message-0.9.0.tar.gz 8965 BLAKE2B df59ff7f598a7ff19a16829addbc5b49f2e7dfb2b30aab43f5d220f6d45f625750ca1d63eba3187b09d494a2c06af642c2a2e4d581c6a247440ba06d6f46dae0 SHA512 38a376b23372b8699fef76085ad2ead7b5fb34b823b0c7e3e52ac90654133a44429d7a3383197b78c8f01a7b64753ce424d5138b8aef596d236ce9c798ec1887
+EBUILD ppx_sexp_message-0.14.0.ebuild 752 BLAKE2B 7f7ebbacfd031e5759edf9fcf0cdfda80792f3121455191c5d49862c55a15d997fa3240cbd0206f7bcc18ef343c4c0119e0cd22bdc19c0c0ac9f2328bc0f611b SHA512 a698423b290759a48a1d653108678870076347dcee8aa1864df288efa3a32c723cf6c141e8f7924624863f3c90e5950f1a4da0ca72c211afa7e1133058f7ebd4
EBUILD ppx_sexp_message-0.9.0.ebuild 627 BLAKE2B 85780c5fd9fca2ea855128218368f7440e3c1f82495521df568bc9e5f2585362eeeb3f9623468f67b15f701b72d36ccf445464cd65d2dec8d55a6dba95041e88 SHA512 4f8d7cff0f326aab6e58498a151bc8404861a8e00de01d821e1654b8aefd6f2a9cc4d9b059a9c5954815aadf12d202dd6c9eb7bd052d53fbc71efa8454ac7157
-MISC metadata.xml 259 BLAKE2B 014198d6394d58358c22eb106d648e2c9ba32d42e9bb016c5cfa40abd830a6f525d9a8f3eba08d868a97d06e9ad5459b5a1c8a266ca94a12aa4add23616e72f4 SHA512 0445833a41f98e2291ac25f61e995c5ba2c1034777a9eb3f4334fdcffa8b8fd06a2bc5c04f575dedbe737434bd3c17c21f476ea03600a56f9e6432392e8b2ff6
+MISC metadata.xml 336 BLAKE2B a45b57026388e3f2fe8e287bd04c2eb6303d48ad5105853f4700d51bdc118029fed73463e88068af76e520569f4183761c163e9b8bdbb4b6b2941d305f8067cf SHA512 f47319f87ec2fbda8fe70a65e99a427a86711ed75d57ab7365fac6050d00ec919139be5eeb2b3cf7ed82defe6daa65743cbbbb3e9cce3e0dcd122965cfde24d6
diff --git a/dev-ml/ppx_sexp_message/files/ppx_sexp_message-0.14.0-ppxlib-0.18.0.patch b/dev-ml/ppx_sexp_message/files/ppx_sexp_message-0.14.0-ppxlib-0.18.0.patch
new file mode 100644
index 000000000000..a472c5ab29a1
--- /dev/null
+++ b/dev-ml/ppx_sexp_message/files/ppx_sexp_message-0.14.0-ppxlib-0.18.0.patch
@@ -0,0 +1,41 @@
+commit fd604b269398aebdb0c5fa5511d9f3c38b6ecb45 (HEAD, origin/upgrade-ppxlib-0.18.0)
+Author: Nathan Rebours <nathan.p.rebours@gmail.com>
+Date: Mon Oct 5 18:04:41 2020 +0200
+
+ Make ppx_sexp_message compatible with ppxlib.0.18.0
+
+ ppxlib.0.18.0 upgrades to the 4.11 AST which results in a change
+ in string constants representation. This PR makes ppx_sexp_message
+ compatible with the latest ppxlib.
+
+ You might want for the actual release of ppxlib.0.18.0 before merging
+ this!
+
+ Signed-off-by: Nathan Rebours <nathan.p.rebours@gmail.com>
+
+diff --git a/expander/ppx_sexp_message_expander.ml b/expander/ppx_sexp_message_expander.ml
+index e0c2477..c801cd7 100644
+--- a/expander/ppx_sexp_message_expander.ml
++++ b/expander/ppx_sexp_message_expander.ml
+@@ -97,7 +97,7 @@ let sexp_of_expr ~omit_nil e =
+ let e = rewrite_here e in
+ let loc = { e.pexp_loc with loc_ghost = true } in
+ match e.pexp_desc with
+- | Pexp_constant (Pconst_string ("", _)) -> Absent
++ | Pexp_constant (Pconst_string ("", _, _)) -> Absent
+ | Pexp_constant const ->
+ present_or_omit_nil ~loc ~omit_nil:false (sexp_of_constant ~loc const)
+ | Pexp_constraint (expr, ctyp) -> sexp_of_constraint ~omit_nil ~loc expr ctyp
+diff --git a/ppx_sexp_message.opam b/ppx_sexp_message.opam
+index d8a6d95..3d6ef41 100644
+--- a/ppx_sexp_message.opam
++++ b/ppx_sexp_message.opam
+@@ -16,7 +16,7 @@ depends: [
+ "ppx_here" {>= "v0.14" & < "v0.15"}
+ "ppx_sexp_conv" {>= "v0.14" & < "v0.15"}
+ "dune" {>= "2.0.0"}
+- "ppxlib" {>= "0.11.0"}
++ "ppxlib" {>= "0.18.0"}
+ ]
+ synopsis: "A ppx rewriter for easy construction of s-expressions"
+ description: "
diff --git a/dev-ml/ppx_sexp_message/metadata.xml b/dev-ml/ppx_sexp_message/metadata.xml
index 715559feb2c9..2f418c1a3acf 100644
--- a/dev-ml/ppx_sexp_message/metadata.xml
+++ b/dev-ml/ppx_sexp_message/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>gienah@gentoo.org</email>
+ <name>Mark Wright</name>
+ </maintainer>
<upstream>
<remote-id type="github">janestreet/ppx_sexp_message</remote-id>
</upstream>
diff --git a/dev-ml/ppx_sexp_message/ppx_sexp_message-0.14.0.ebuild b/dev-ml/ppx_sexp_message/ppx_sexp_message-0.14.0.ebuild
new file mode 100644
index 000000000000..5e36fc89d1ae
--- /dev/null
+++ b/dev-ml/ppx_sexp_message/ppx_sexp_message-0.14.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+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 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+DEPEND="
+ >=dev-ml/base-0.14.0:=
+ dev-ml/findlib:=
+ >=dev-ml/ppx_here-0.14.0:=
+ >=dev-ml/ppx_sexp_conv-0.14.0:=
+ >=dev-ml/ppxlib-0.18.0:=
+ >=dev-ml/ocaml-compiler-libs-0.11.0:=
+ >=dev-ml/ocaml-migrate-parsetree-2.0.0:=
+ dev-ml/cinaps:=
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-ppxlib-0.18.0.patch )
diff --git a/dev-ml/ppx_sexp_value/Manifest b/dev-ml/ppx_sexp_value/Manifest
index 12d1d127beaa..f942efb2593a 100644
--- a/dev-ml/ppx_sexp_value/Manifest
+++ b/dev-ml/ppx_sexp_value/Manifest
@@ -1,3 +1,5 @@
+DIST ppx_sexp_value-0.14.0.tar.gz 7740 BLAKE2B f495d0b9032a73cd6a62292185e77cfe6206bb06564e663c04a20c9430dd4188da529bef6428a7a07309109ec7fc51d3909ac58d5760c1fab618f59eee8a6b63 SHA512 d33ed503025e07588a21ca6796004dd53ddfb9f67f3527d066c4767734fb8723d0a9d31082d285ba82996d8b69faecb624f116046ea8048637f05773ee3e89a8
DIST ppx_sexp_value-0.9.0.tar.gz 10666 BLAKE2B db3f3bc626b00dd6bf6c1ab1afedfd581ec48689307c1ad52767b0aa64d5c36a10556b37ac3e2e2fecf1eb5230ab1e049f458ff3c8c039cf789146f1458dbf2a SHA512 7dcb8f70a7938d26fc5a1afea2bf5e77c4996d8e82720206ab9e5a462a59182dcedfbfede49ed83ed50f2683776b75fb5bae00c53fc451b03f6a33e126566e84
+EBUILD ppx_sexp_value-0.14.0.ebuild 661 BLAKE2B f11ca6994e4493be0238284262be0546a11844c14f9993de5fd5906215b80a7fe67f6327ec0a385767dbfdbe2c6383834626fdf15c68c81737ffffbe937818a6 SHA512 9de33ac205026af196e036193ef49cc8482c2c89bb191f54b2ff52082fd3bfb11b75e6d9e56b0c6017d04ec33e025ae11eeedff79769546147d70e59733168d7
EBUILD ppx_sexp_value-0.9.0.ebuild 606 BLAKE2B 90de0d943c0e9d0c8301d3ceb36d3cdd7d57c7b1bbb1bd79b167b3a69923b3737eb2a954ff3b4e64136595feed121f789ae7fe9611c78f4ea41d638717da6806 SHA512 5a2ff310c079ae90f881e79978d907f001e7b5c0a025a20c0740d696c6c949e6fed1b67a9419279a51c97ba440ad87ae9ad50df107ba472cba81fa34e5530ee1
-MISC metadata.xml 257 BLAKE2B 9e49ee1907ba0c44ab9161613a2ae1b4e11a282f1d1458347c6e5c4d8cec62b0e1a16fe37470a8f019adeedc7e4e703d90947d5a2401bf48126302038777511d SHA512 b91419faa3d2ab252550fcd9dd85237c5cb61a50f45f10007888260112354101a41fcc6c48b2e0c764318ebb91fb19956af49e92c95c09ca1928d176f42d9a73
+MISC metadata.xml 334 BLAKE2B c17548f659e0297d185796232a140f6d2a2c85e1d038c056e163d3934224cc4b3850ff03817ae76d4063d4190490d78bafcb43d528b1f0faf6ecd0b84e3c65b7 SHA512 cbb908f8f3ba3fc50735a4b9f7009ebaeac63d9079ac95f861d080bb6a53cd05c53a9aedfa386a60a9c7a6928bd1a4eea34a9c9b6b7d6835ff3ebf37c7aa281c
diff --git a/dev-ml/ppx_sexp_value/metadata.xml b/dev-ml/ppx_sexp_value/metadata.xml
index 77efff66f4ea..8bfb2fda744c 100644
--- a/dev-ml/ppx_sexp_value/metadata.xml
+++ b/dev-ml/ppx_sexp_value/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>gienah@gentoo.org</email>
+ <name>Mark Wright</name>
+ </maintainer>
<upstream>
<remote-id type="github">janestreet/ppx_sexp_value</remote-id>
</upstream>
diff --git a/dev-ml/ppx_sexp_value/ppx_sexp_value-0.14.0.ebuild b/dev-ml/ppx_sexp_value/ppx_sexp_value-0.14.0.ebuild
new file mode 100644
index 000000000000..f3f793e4263b
--- /dev/null
+++ b/dev-ml/ppx_sexp_value/ppx_sexp_value-0.14.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+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 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+DEPEND="
+ >=dev-ml/base-0.14.0:=
+ >=dev-ml/ppx_here-0.14.0:=
+ >=dev-ml/ppx_sexp_conv-0.14.0:=
+ >=dev-ml/ppxlib-0.18.0:=
+ >=dev-ml/ocaml-compiler-libs-0.11.0:=
+ >=dev-ml/ocaml-migrate-parsetree-2.0.0:=
+ dev-ml/cinaps:=
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-ml/ppx_stable/Manifest b/dev-ml/ppx_stable/Manifest
new file mode 100644
index 000000000000..080dd277f134
--- /dev/null
+++ b/dev-ml/ppx_stable/Manifest
@@ -0,0 +1,3 @@
+DIST ppx_stable-0.14.1.tar.gz 12031 BLAKE2B 837a53206d3a8d651d53f665daebbcfde3a1b5d55f1ed13d3ac8feecbd9ba0fb24ad7bb1cf24a0bfa00a41a46c3ef0f84385bc8792685f42ef18facf88ce348f SHA512 1c99a61537a2ce7d40208c64efbf71c54726b228d3746f2afaf9e813b3fed9c8016bb2eb859be24993c7c922a34f574e1028db8e7ee922d4772336dc0496df74
+EBUILD ppx_stable-0.14.1.ebuild 589 BLAKE2B 7ef716ce0e375b1d5e0ef9440441bffaab72a40d729cd6eec86ad69e026ad6b8343185e5ad4576852b868f547bad10885b1d8275e2b4042578985fbc21a6ecd9 SHA512 c0627bb9975c59014c5c3c855b97e094418db901cd502364adc2bf27179b7c9fe7a43ed22b012a6e76251963ce1cf26436d5c956c5b37c2056a1654213870d98
+MISC metadata.xml 330 BLAKE2B 3b852bd33543a26c8ec12308502baf80a2a19337135c7e64d62184919ee6de8725f46296cb34e4fb7165d1a7c3962f7cc7b4ec07c4b6c5bd53d8fb6de07e07ab SHA512 edfcfb94e81c48d1ff01524b7c3687a071c95299852fbec37383d6af7ed39be811fc3c3ec0a935f5b1cb2230738a8a3ada5ff8b2c1062c061cf78e46fb417b22
diff --git a/dev-ml/ppx_stable/metadata.xml b/dev-ml/ppx_stable/metadata.xml
new file mode 100644
index 000000000000..b92f10916eeb
--- /dev/null
+++ b/dev-ml/ppx_stable/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>gienah@gentoo.org</email>
+ <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">janestreet/ppx_stable</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/ppx_stable/ppx_stable-0.14.1.ebuild b/dev-ml/ppx_stable/ppx_stable-0.14.1.ebuild
new file mode 100644
index 000000000000..9cd15a40373b
--- /dev/null
+++ b/dev-ml/ppx_stable/ppx_stable-0.14.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Stable types conversions generator"
+HOMEPAGE="https://github.com/janestreet/ppx_stable"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+DEPEND="
+ >=dev-ml/base-0.14.0:=
+ >=dev-ml/ppxlib-0.18.0:=
+ >=dev-ml/ocaml-compiler-libs-0.11.0:=
+ >=dev-ml/ocaml-migrate-parsetree-2.0.0:=
+ dev-ml/cinaps:=
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-ml/ppx_string/Manifest b/dev-ml/ppx_string/Manifest
new file mode 100644
index 000000000000..5501f53afe13
--- /dev/null
+++ b/dev-ml/ppx_string/Manifest
@@ -0,0 +1,3 @@
+DIST ppx_string-0.14.1.tar.gz 4807 BLAKE2B 2ce5cf2d5dd913f05e66c24ea5be2ce4a56c59b7e5faecf003a573274bfaef3834935276e110fba1d0af3a3ef9d6ca730622dc780ab6063945a01aa3d6900a43 SHA512 2b570ca3d248f89ee1903e6ea40fbcd9c5c72809ff1f42dc67e9d41f6c297465ae47ffdbeda9f263dddf14c9c460bbbdee01243cef838d0ec49493c3b5644aee
+EBUILD ppx_string-0.14.1.ebuild 658 BLAKE2B 76abf940a0c46be6466c2cd416dd04a3f446da8cca2154efa8faf390557e14c9573d91031976672baeed787b1b9421032dc4673ed7ce1cd055bdd7ebddd09083 SHA512 03462b3aa6e4eb5e827a4f4249f37557694e2581c2865f343ce3323d5a03862648cc9f3cea6ee540ae2aaade2b8646e2d31d36806a766710dc02d99a9e4ed45e
+MISC metadata.xml 330 BLAKE2B 8a254f960154cdca219a8a0839d20a0b1b59499050aad7a319a14ea9d25488ae8f831522f06ad207e2b54d67ada15c3f8a55ac31fcfff24bbdb7d7992c371681 SHA512 039ca9055143f9795534cb4c0092f6618b7f091e0cef20cd2e831a67318ac20ce7fcc0118f45058c8f4665ca30585f6e6ec87f3a65fabd27dc9d4f3433ed1eb3
diff --git a/dev-ml/ppx_string/metadata.xml b/dev-ml/ppx_string/metadata.xml
new file mode 100644
index 000000000000..1350c31c1a0c
--- /dev/null
+++ b/dev-ml/ppx_string/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>gienah@gentoo.org</email>
+ <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">janestreet/ppx_string</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/ppx_string/ppx_string-0.14.1.ebuild b/dev-ml/ppx_string/ppx_string-0.14.1.ebuild
new file mode 100644
index 000000000000..da70fa07c084
--- /dev/null
+++ b/dev-ml/ppx_string/ppx_string-0.14.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Ppx extension for string interpolation"
+HOMEPAGE="https://github.com/janestreet/ppx_string"
+SRC_URI="https://github.com/janestreet/ppx_string/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+DEPEND="
+ >=dev-ml/base-0.14.0:=
+ >=dev-ml/ppx_base-0.14.0:=
+ >=dev-ml/ppxlib-0.18.0:=
+ >=dev-ml/ocaml-compiler-libs-0.11.0:=
+ >=dev-ml/ocaml-migrate-parsetree-2.0.0:=
+ dev-ml/cinaps:=
+ >=dev-ml/stdio-0.14.0:=
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-ml/ppx_tools/Manifest b/dev-ml/ppx_tools/Manifest
index 0c00e499c54a..b0c4347f64f0 100644
--- a/dev-ml/ppx_tools/Manifest
+++ b/dev-ml/ppx_tools/Manifest
@@ -2,7 +2,9 @@ AUX ocaml404.patch 2031 BLAKE2B 02341fa3b292d713995f95d76f1b47970b9ff34d8b177212
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
DIST ppx_tools-5.3.4.08.0.tar.gz 18590 BLAKE2B fac872d113ab1bf9135357dea47d468924e16a1a038b64152d5ebb27daa69a8c2d906750146157954f4d95769535f4a93c1ecc9582ca0313d601a06606196c00 SHA512 817e2688d60f013fa42ffa263cfcc15cfae820240d2e54dfedf1f4a4191f9b9fc365a190cc7eeb9082ed72fbf3c94d6ba72c38c7db3e2bcac49a17ba590d71b5
+DIST ppx_tools-6.2.tar.gz 46150 BLAKE2B f8af2a1eee81d5a1e73ac606ab79d285c8c226533bcf715ed22386aecfaf51260fb9a5075d270675f1b601cb174b68d8c85556f418031a7b6bda06c4376fe443 SHA512 fc3943c69901ef46843355c3482d5a1481d05ee94fb0a344ec04101059a02cbaa76fed5742cfae82730edf378f2e140d859a5cf590653f85359255d451f07dc8
EBUILD ppx_tools-5.0.4.03.0.ebuild 807 BLAKE2B b71640ed43baaf8afaa8d841d78461f3f66cdade8f22a93aaaac04093dda070d2b0512a8b6ebfc7eabd400b70c852155db5101bdd5c3ab6b46561f0a9db3ae99 SHA512 f231b7ad6f417b2635b7cd1dc765717398074aea040011e25caf81bc25a46e214f9e653dcb33759bcefaa8b359b08f1e37cf2b42d78c5575f3a2563e7810f287
EBUILD ppx_tools-5.0.4.05.0.ebuild 708 BLAKE2B 58acde9589203a439a9148eb7373d32f8852efb9aa3cddc2d5b74f73e357614767893adc7ebae38b913e698181e295ca7cb8dc0b6b33f85a84422bb202ea1c01 SHA512 457523621d33361f16fe821025b90c7c29ef2b007f85c9ae7156a036d67d50b894e05c3284434e4d1495df2c0c1a4cd7f5c00434b3204644a758486ae5e3d1a4
EBUILD ppx_tools-5.3.4.08.0.ebuild 651 BLAKE2B ea64e3cb4c471e62f145ee3e79a3554579d07eaf7b6159c37c36f9688de786076b0a056eb5c301265bf561e4e17023ee5730414b68ebd60e279b7bb687fd0e1e SHA512 1cf8e5cb010eaf775e88fc0a39648bdfffacfd3b4e21538a2d5800fb3724576b2dd31d94319f43e3302bb4c8bfdcf871418a609375732469f87bb3ae6905a278
-MISC metadata.xml 258 BLAKE2B f63381850c8356a44f5eaf677dec2b8420303db8a602b1efb7225d2c6d32efd345e3ac9cde4edee359c4e8bbdaf6c228336ee2ecb48d03335e66cf33ba9a22d0 SHA512 c873e3353f031c0cf5427e0a05c2ebf9112b50cd682193dbc73f7489d5c4996fed07c5540a3301d3c1dfb508ed27c776a2953bab2ce94c843b75d2eb8d0c68bb
+EBUILD ppx_tools-6.2.ebuild 502 BLAKE2B 6a1d63c8438455ab861e9442642d4f74aae65669791c74e9ac821e532fbcff27e0073a90a4bc787dec7e5ffaa19bec2aeded22c525fc68905567ece9007d8826 SHA512 28057bdec60fd7213fc656a77d780035049188fd7b98e9d45c7cfe0e35a045a9ad2199ec0701b6f317493fa6c35d33187015f8473fb6fa839de266e3b3f52367
+MISC metadata.xml 330 BLAKE2B 52495fb4974c24c4cc083ea661dc08c13f4bcee587270fd157cc92d14a2abdf0272fff8f521cb010a893e47b44ac311fa06275b7ecabeed8a212495206460cd0 SHA512 1a3847e8e4675cdbe31ca7d176ac94ddb9ee3584d2b5dfc09798071a7bc10ca92bbe0e759684025563831b5e8b2f11bc51728a8b5422780c50a756e00d3ea7c5
diff --git a/dev-ml/ppx_tools/metadata.xml b/dev-ml/ppx_tools/metadata.xml
index e8d73658568c..5631f770f367 100644
--- a/dev-ml/ppx_tools/metadata.xml
+++ b/dev-ml/ppx_tools/metadata.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
- <upstream>
- <remote-id type="github">alainfrisch/ppx_tools</remote-id>
- </upstream>
+ <maintainer type="person">
+ <email>gienah@gentoo.org</email>
+ <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">alainfrisch/ppx_tools</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ml/ppx_tools/ppx_tools-6.2.ebuild b/dev-ml/ppx_tools/ppx_tools-6.2.ebuild
new file mode 100644
index 000000000000..9ae7a2184389
--- /dev/null
+++ b/dev-ml/ppx_tools/ppx_tools-6.2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+MY_PV=$(ver_rs 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 ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+S="${WORKDIR}/${PN}-$(ver_rs 2 '-')"
diff --git a/dev-ml/ppx_typerep_conv/Manifest b/dev-ml/ppx_typerep_conv/Manifest
index b0fb346839af..6b067727db3b 100644
--- a/dev-ml/ppx_typerep_conv/Manifest
+++ b/dev-ml/ppx_typerep_conv/Manifest
@@ -1,3 +1,5 @@
+DIST ppx_typerep_conv-0.14.1.tar.gz 9453 BLAKE2B 4acafdd51df0659746697283aa3240f1b1403e4e9f9b5fafa6c4b09f4c76f6ac645e2ccab53cba7371b5b004edba38d24198334d10b295d90c8ba5814a602a23 SHA512 6e32f6c2cf6c370fcb8d3b341dbd797c3b7c2557c8604253d744b266c9a3f4984e62ffe6ec5717044378f81e5b78e7f206a7f0f4b43c0dda97a4e7ece745d26d
DIST ppx_typerep_conv-0.9.0.tar.gz 10844 BLAKE2B 4c21e9529c587507eef26fc53ae2c1153cbecd754d6b36b73ee6e639a13d872932a421207224c392394a52767f5fde66441cf19318499c8604c2e20b9583841a SHA512 155838bf6dce45a043624845ce882eee374df344f76a9433a1170d89cc27856a634f4ca31ad28e46b28c5103d00c3d8d7d79692872c5dfc35d0b4a7eebdb3d1d
+EBUILD ppx_typerep_conv-0.14.1.ebuild 645 BLAKE2B 535ddcc279b5afa73d2c6488f3eb19b08526321b0e0838bfd55c8099189ebb4d506f6a8ebbeeee7af0ee41e35a942f3c8de2bf778f29951438981a952823c2ce SHA512 07e3eb7997373268cf398953d8a605d8e2fb8f3fd888170734eeae61720e09f0c955b00cddba8b4a0b659afbe8570279504eee674dae8841e35f78bc93760b6b
EBUILD ppx_typerep_conv-0.9.0.ebuild 606 BLAKE2B da77568f0ff5a883337f385f96079930e0e5bf40e60d3987779af3f047f188f18b80ecc4b9529424fe72e9952def0b558998cc81c497998672ea96eb6cd2509c SHA512 784430fd32a3c7f8fecbd9a8dbd277a81402c7a890a507fa5f59d70515fef30c32b3ec7e3f78ebb979617305ebd5e5274fd191d4fb5e92379ae2d4ba635c1188
-MISC metadata.xml 259 BLAKE2B d058f985d8889ace37fa844a21970d26537e44613f524bc3106a4cbce4f60a032bd807de2ca9478d01fb7ae4043a97fa1ce8a6efa10e1765d57a9d7a01dbe037 SHA512 1c1b813b80eae82c19f0486f3456b2e6e57fa3cc78bab3966397e6be13fe67938eef22fd7f3ec5bce6558b7cfe7029cec69a7c75b2ace6bac5e1101b4f244ca2
+MISC metadata.xml 336 BLAKE2B b93b48a36cacdd36a6fb9eff83d9bd9dc83b011d60260bd52d0f14d70841e2d0b190a2b2bfd38c5f24f864c235c6eeeb798e758e54f558a5b1d41e2269c2f9bc SHA512 bdd31d24e32edbf793ebe406975633356c13f2e963f7a6b800b3573b40332fcd23d1c369431d0021d12f9398c9d3b90701617ac87979ef07f3595ee89b1382c0
diff --git a/dev-ml/ppx_typerep_conv/metadata.xml b/dev-ml/ppx_typerep_conv/metadata.xml
index becb16a3d46c..23f2e859b2a3 100644
--- a/dev-ml/ppx_typerep_conv/metadata.xml
+++ b/dev-ml/ppx_typerep_conv/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>gienah@gentoo.org</email>
+ <name>Mark Wright</name>
+ </maintainer>
<upstream>
<remote-id type="github">janestreet/ppx_typerep_conv</remote-id>
</upstream>
diff --git a/dev-ml/ppx_typerep_conv/ppx_typerep_conv-0.14.1.ebuild b/dev-ml/ppx_typerep_conv/ppx_typerep_conv-0.14.1.ebuild
new file mode 100644
index 000000000000..c2794da592a2
--- /dev/null
+++ b/dev-ml/ppx_typerep_conv/ppx_typerep_conv-0.14.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+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 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+DEPEND="
+ >=dev-ml/base-0.14.0:=
+ >=dev-ml/typerep-0.14.0:=
+ >=dev-ml/ppxlib-0.18.0:=
+ >=dev-ml/ocaml-compiler-libs-0.11.0:=
+ >=dev-ml/ocaml-migrate-parsetree-2.0.0:=
+ dev-ml/cinaps:=
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-ml/ppx_variants_conv/Manifest b/dev-ml/ppx_variants_conv/Manifest
index 34053c3eaa4f..e821d0ba85c2 100644
--- a/dev-ml/ppx_variants_conv/Manifest
+++ b/dev-ml/ppx_variants_conv/Manifest
@@ -1,3 +1,5 @@
+DIST ppx_variants_conv-0.14.1.tar.gz 9640 BLAKE2B a73241a8dfc1cf41d2ad184f7e321484525794e66a1e881c822616aca6f8d221e9e699464716410a71ae3cbd542eef6315e0d183447e5e0e49bdb02935876375 SHA512 2ee21751de1595e56b151d87413554af5c0aaf92053ddd2834cadea812f1f59fcd078f6f4a9e9894eca9ffbf211ed2de996df065534c84256dc9670ee8fcbed5
DIST ppx_variants_conv-0.9.0.tar.gz 10649 BLAKE2B 824405cce55213ab055fb576becba6b7c2111501ad9e2784fd4eb62c32edf1288eb66f1e8d4c0e78e6aeb8ecf4ad62819b767c4d0a7eedc5ddbd3803d60e028a SHA512 4bb7c087c835fe0c8debc25b66dab9da2da3a5ad4eef856845075a146a2fe3a2598a5b77851bd922b532b57cb821ee934336f8638d44cc0fd81faefcc56e1d89
+EBUILD ppx_variants_conv-0.14.1.ebuild 670 BLAKE2B c7c1a4422a8072c5d5e6d1ce2f8c58f29855211b2ec93a92065a043599ffdfc8468c95ca478b236fc9a0ed4050a340bc9fca18337ab20ee16a3c199b65e2c687 SHA512 6e4d5b91240e35f97dfa177b5accf87d46bd4acd422026dc8465d32ef69f976bc6f33126ecccf253538043f5a6051fda2c00305cb31c1cab2fd45c0b1159803c
EBUILD ppx_variants_conv-0.9.0.ebuild 630 BLAKE2B cc9749b8da218416be67eba83f186f9d49c9b11e31e221774b7b6b46d06f964950534b2b2d7b2e7f3c84ad165cb0b324e35b1782d29c1a0d9f3a7edb2b6a22da SHA512 85764a2d7fd531292563763ed40953aff421bef807852309f405d2c685f074dbdfb611ad74acb9c3f1a8ca1b023a63a87fe760100a127ea8a2984addce2bec05
-MISC metadata.xml 260 BLAKE2B 9dd14697de219bb21cc4ac4540c181973190f72d89a80d16b7807f9624206f45f3717ebf8e7081d6562ccdc6a51e6b2e6186500aa39dc87a34fae55c36dfdba1 SHA512 74d3ce8508076fc88295da38deba854581c3ee6dd3b9da70117e02f01f2a5b35f4b89ee41c37e0ffdf899bb99eb76ba40b04a14b1d34b468a0a280b0c9765838
+MISC metadata.xml 337 BLAKE2B 5254872d7404a8e6a56798027330a413825b7fb00b840779d2abd6daf6e59dc6d989fd7023c2e8e94f96e6961e78b99e5d832b3f12811a7162d28d5802ff910f SHA512 a327e1e31bd3a43373bb9146f138a35664d831e41d0bc91d35c9ac986841bd1f9e56fe268a14abb9bd45d53e59ae327e36a6756993733dd8eab70a6af86db23a
diff --git a/dev-ml/ppx_variants_conv/metadata.xml b/dev-ml/ppx_variants_conv/metadata.xml
index eb825b2006d2..c250bb0849f9 100644
--- a/dev-ml/ppx_variants_conv/metadata.xml
+++ b/dev-ml/ppx_variants_conv/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>gienah@gentoo.org</email>
+ <name>Mark Wright</name>
+ </maintainer>
<upstream>
<remote-id type="github">janestreet/ppx_variants_conv</remote-id>
</upstream>
diff --git a/dev-ml/ppx_variants_conv/ppx_variants_conv-0.14.1.ebuild b/dev-ml/ppx_variants_conv/ppx_variants_conv-0.14.1.ebuild
new file mode 100644
index 000000000000..48de4c8a412b
--- /dev/null
+++ b/dev-ml/ppx_variants_conv/ppx_variants_conv-0.14.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+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 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+DEPEND="
+ >=dev-ml/base-0.14.0:=
+ >=dev-ml/variantslib-0.14.0:=
+ >=dev-ml/ppxlib-0.18.0:=
+ >=dev-ml/ocaml-compiler-libs-0.11.0:=
+ >=dev-ml/ocaml-migrate-parsetree-2.0.0:=
+ dev-ml/cinaps:=
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-ml/ppxfind/Manifest b/dev-ml/ppxfind/Manifest
new file mode 100644
index 000000000000..dd31749dce97
--- /dev/null
+++ b/dev-ml/ppxfind/Manifest
@@ -0,0 +1,3 @@
+DIST ppxfind-1.4.tbz 4083 BLAKE2B 3661827c897a74af21f0d10c9435b74845fc4832cb1b50a510fdf7c33cd877faee5ddcb8307c65903a4692fcb58ca264e0c0b44433a34a59a12f8eb2917e12e9 SHA512 f80b0ee09fb536aa9f154da80d06a1b68ba3b10605fb7338bd6449beb5c8d00e983bf66b4a63e12659ae1410fea56d0a2c4cfd43584616438504628035bcb981
+EBUILD ppxfind-1.4.ebuild 456 BLAKE2B 733af347df4e09398b44a321d605bba20381b0811024ae1440ed817ff730418e9faa6ec32d98626340e633e84855bc1c8f3c88a4269bb1347b7f6391efaa7039 SHA512 8d038373e8ec0e31665f31f067760db99da915d3640484147a252d606e5fac9f748636c8893f0ecd6b3946789d6db9e7f20d3e48f15873c8810f34ff891684a8
+MISC metadata.xml 321 BLAKE2B e43aa79e30e4b00e79a6a7e407d325687cd25aa5cab943972047c71976121556bce4272097e7bb211d97e98aae9703c040878964d81b25d758744bbaba3411ba SHA512 41d0a9e934cacd8666b533aee7e34cb19fb2a6b42431437191a4a5668b18434ee751bed4e738efbafc66e468fcde7103ff67890b78f1a1c953909cf04dca776b
diff --git a/dev-ml/ppxfind/metadata.xml b/dev-ml/ppxfind/metadata.xml
new file mode 100644
index 000000000000..b40103350cee
--- /dev/null
+++ b/dev-ml/ppxfind/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>gienah@gentoo.org</email>
+ <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">diml/ppxfind</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/ppxfind/ppxfind-1.4.ebuild b/dev-ml/ppxfind/ppxfind-1.4.ebuild
new file mode 100644
index 000000000000..364bb0ea69ce
--- /dev/null
+++ b/dev-ml/ppxfind/ppxfind-1.4.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="ocamlfind ppx tool"
+HOMEPAGE="https://github.com/diml/ppxfind"
+SRC_URI="https://github.com/diml/ppxfind/releases/download/${PV}/${P}.tbz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+DEPEND="
+ dev-ml/ocaml-migrate-parsetree:=
+ dev-ml/findlib:=
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-ml/ppxlib/Manifest b/dev-ml/ppxlib/Manifest
new file mode 100644
index 000000000000..55192a6bcacd
--- /dev/null
+++ b/dev-ml/ppxlib/Manifest
@@ -0,0 +1,3 @@
+DIST ppxlib-0.18.0.tar.gz 192929 BLAKE2B db14821aa77eac02038632ee8a9756ffd7a7b561c5852c4a5bb6882da531a6d2833737d4d1d372ff73251c168e2da57c7df0c724b1d9a6c4829632881aa4d2b3 SHA512 73b785eec34ca68451936c750ff68a4799b8c265cd973a587bd77b60cb933409eed4edfd4c9a4b0b1ada8d3a0bae5c5c719e4258d00cb0290a6842c67be1fd3d
+EBUILD ppxlib-0.18.0.ebuild 764 BLAKE2B dc0bf7be03916c85152c42d30a6aa83a72df8b6e2a0488e03ca59ee5318327753a3d2f930fa823918bf6b672090336bfc9ef5bd55e1989865eb098309ceac969 SHA512 0fa630d3d4573a33aef2dac989772dc1c6db23e3c676a34f8fa12521e4154a88e9c561a152c2e6f485cac3055b174d8588d8ef7bbbe331f145c38013481338e8
+MISC metadata.xml 325 BLAKE2B 5a543664917ee3d50700a88590bd3b5f3e7c8578d438e491b3450f4ff2127359062b59e5de4c96a6d0423e96003bed9655719398aac9dc723855f73a32d652a9 SHA512 26f7aedfdf8374d63bea2450524d4a3727101c127e79fc7a28b3f06d82c9fb2ad30408c64f6d4e1cd03aa1aa239b3445b08780ec3a214a615c9ad81aa51081bb
diff --git a/dev-ml/ppxlib/metadata.xml b/dev-ml/ppxlib/metadata.xml
new file mode 100644
index 000000000000..c37ad7574836
--- /dev/null
+++ b/dev-ml/ppxlib/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>gienah@gentoo.org</email>
+ <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">ocaml-ppx/ppxlib</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/ppxlib/ppxlib-0.18.0.ebuild b/dev-ml/ppxlib/ppxlib-0.18.0.ebuild
new file mode 100644
index 000000000000..5fa6ce7a3233
--- /dev/null
+++ b/dev-ml/ppxlib/ppxlib-0.18.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Base library and tools for ppx rewriters "
+HOMEPAGE="https://github.com/ocaml-ppx/ppxlib"
+SRC_URI="https://github.com/ocaml-ppx/ppxlib/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+ >=dev-ml/base-0.11.0:=
+ dev-ml/findlib:=
+ >=dev-ml/ocaml-compiler-libs-0.11.0:=
+ >=dev-ml/ocaml-migrate-parsetree-2.0.0:=
+ dev-ml/cinaps:=
+ dev-ml/sexplib0:=
+ dev-ml/stdlib-shims:=
+ >=dev-ml/ppx_derivers-1.2.1:=
+ >=dev-ml/stdio-0.11.0:=
+"
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND}
+ test? (
+ dev-ml/cinaps
+ )"
diff --git a/dev-ml/re/Manifest b/dev-ml/re/Manifest
new file mode 100644
index 000000000000..4493673a1d71
--- /dev/null
+++ b/dev-ml/re/Manifest
@@ -0,0 +1,4 @@
+AUX ounit2.patch 345 BLAKE2B 9db15f913a961c6aec6025ecf9c7dbf37dfed084e57246cb7e52012b548199014c8b93e0d75c6baf5b32a4cc806584bf3a50d48a50a8fa81d08690dd43aff072 SHA512 c002d4e2343931b6954828226678ec2b1e878fc36bdd031cb0e9158222e375b3595b2e58ef7de3b9ff9613b44ffdb29d8e5fe4fb8284a7ad1815712893bf9cb1
+DIST ocaml-re-1.9.0.tar.gz 83642 BLAKE2B abcabb80ffef241fc7e8ea075f49365cc64f8749db1d1f7eb654eeb52f5be8e96756f98ae7903391a26d8537f82e105878a38a15923d7f93c61abd5c08d3ff98 SHA512 3e11c6eccf573ab5d7f43accf1f1ac9eda0d7320067e142b9f76b309315c1e30d22c5bb80c7a54b05d9c92d3518d26ea82b5093de9b48f86e3c62d6073f14eda
+EBUILD re-1.9.0.ebuild 614 BLAKE2B 5d01e8d90a04696ee267d2fa0f9881a242b381e0b1f2f424ae7e040db97c057c71342b75afa591b04dc5a4887b6def63a7562313c98b7cfc7ecaba9bcb10d3b0 SHA512 1050db0064859e2a92e11b419a88253806ac7c1371573beb84818a2e9b79c07e9d3676c404c7cbc9ae6ec2da52710a2315e53bde5ec8b629ccb9f8020b2e18c3
+MISC metadata.xml 323 BLAKE2B 12cef941c01aa9109d95a6eb116cb0eb92f22b6512a515ec21e8afbb74c6c0a647a551cf137296dba04a8e1a12b2c61ecb232be64fda7037937646c55cf994f7 SHA512 50408e8915dbefe6c8a9806200510e64b6573b691aa1546aa1593c852c4ee4af8a21fac60b1e72168205dcf0ee45b06676053a09ad4915b1be188a03e1a9b892
diff --git a/dev-ml/re/files/ounit2.patch b/dev-ml/re/files/ounit2.patch
new file mode 100644
index 000000000000..1210491bc142
--- /dev/null
+++ b/dev-ml/re/files/ounit2.patch
@@ -0,0 +1,11 @@
+Index: ocaml-re-1.9.0/lib_test/fort_unit/dune
+===================================================================
+--- ocaml-re-1.9.0.orig/lib_test/fort_unit/dune
++++ ocaml-re-1.9.0/lib_test/fort_unit/dune
+@@ -3,4 +3,4 @@
+ (library
+ (name fort_unit)
+ (wrapped false)
+- (libraries re oUnit))
+\ No newline at end of file
++ (libraries re ounit2))
diff --git a/dev-ml/re/metadata.xml b/dev-ml/re/metadata.xml
new file mode 100644
index 000000000000..5fa0f8468f55
--- /dev/null
+++ b/dev-ml/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="person">
+ <email>gienah@gentoo.org</email>
+ <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">ocaml/ocaml-re</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/re/re-1.9.0.ebuild b/dev-ml/re/re-1.9.0.ebuild
new file mode 100644
index 000000000000..67924252e952
--- /dev/null
+++ b/dev-ml/re/re-1.9.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+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 -> ocaml-${P}.tar.gz"
+S="${WORKDIR}/ocaml-${P}"
+
+LICENSE="LGPL-2-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="!dev-ml/ocaml-re
+ dev-ml/seq:=
+"
+DEPEND="${RDEPEND}
+ test? ( dev-ml/ounit )"
+
+PATCHES=( "${FILESDIR}/ounit2.patch" )
diff --git a/dev-ml/react/Manifest b/dev-ml/react/Manifest
index 0fa79cd103da..f141d35e97b2 100644
--- a/dev-ml/react/Manifest
+++ b/dev-ml/react/Manifest
@@ -1,3 +1,4 @@
DIST react-1.2.1.tbz 39184 BLAKE2B 0ad5fd576c08292011e6543462295a11b77048f59aaaf34726c078c654fba4a9b7dd0bb6a6579fad04a6cd217b29f4efc15de9b7d9b208c593b481610534d9c8 SHA512 60f8788cc820e2be5303caedc80a377c8e5deab170d0eb9df71ff99d6fc57f31357824522f973c6e0d6b3979b58272e7f90b829474a494b94565279c53e8fbb1
+EBUILD react-1.2.1-r1.ebuild 658 BLAKE2B afe410ecc66cf66be9bdcd7c6ce87e6f32bc184153b5aac08d482bfc97e76e898e8cd67cd1ea1bd49fd2238dd85efaafb6825dffd4fd63352a3ad5c85a9a722a SHA512 acdb8967ebcbd843d6b63662d19d2107763dce4267cddef43f9449230977aad700db45fff5cd5e5e9a29383ce8289de850bb2bf503e94b572afdfa83ebb5dc32
EBUILD react-1.2.1.ebuild 648 BLAKE2B b880919996694717b60c3fd703dc0b94bde370170cfae93e65078d9756d088d0f4f2e4c4d68e09643140a9685cd274f4300b0f87fce8c8b2f33c959fd2e6748f SHA512 a6bca798f789abf1d6ee227c1e9e30c1287f598cbd0d7b18d1c64af00225c5ff85f2df048d65754efc86061d81b8363fdd6f06fa8d56c17eee88e27729c7542d
MISC metadata.xml 803 BLAKE2B 81ae42db1eee6a5ea870a1fb7412bbf7727170dd1e9a42a6bca98ebfccabaeead3423140ebfc7bd04dde30add471de9e950c81a845a1582749302e1218ec1110 SHA512 b23c33ca0645d4c199a6b1d77d857d869d9f63e09ab93238819db8750ff7818d5bca38c6df6baf9c74b8199eca015c0a1bae93c747140d978052ccdc51e5904b
diff --git a/dev-ml/react/react-1.2.1-r1.ebuild b/dev-ml/react/react-1.2.1-r1.ebuild
new file mode 100644
index 000000000000..8f19e9401a65
--- /dev/null
+++ b/dev-ml/react/react-1.2.1-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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 ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( 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/result/Manifest b/dev-ml/result/Manifest
index 9b396a8a77ff..cfccf59e3d04 100644
--- a/dev-ml/result/Manifest
+++ b/dev-ml/result/Manifest
@@ -1,3 +1,5 @@
DIST result-1.2.tar.gz 2100 BLAKE2B 9c746c85200ad6af1014dbc4959347b19f48f24448fb36a33b0b50f8d3d8cf4536f7ea3e994953d29122c8dafe87289707eeab67f7a0dc44d0bc509715169e79 SHA512 b47fe24302182642c7dfb3329a9a475518fca01ed7080fb625379abbb7ada0bec4a27e666886c101ba4b0083eeb6312740d99ef764690d38ee6e6d8960fc9b87
+DIST result-1.5.tar.gz 2291 BLAKE2B 76010676aa806fac3766e9ba70b770b3bd01347b1365892beba4c33415d0942a9368f0437ee5a8339b355b939d1625b2fa9c8ad4cf774007637eb51f4b20f11b SHA512 5ca3aab3b46bff7f4fa4517b5d823de196d7a97a8b94a8e416a5e237061482f4d0030c6a339291d5aa8f68020ee11aed743b730970105a2303e6a93d26ca676a
EBUILD result-1.2.ebuild 563 BLAKE2B a8b4d1bee26726d7b7a32c572309971d9be669bf84c82fecd42721579208c1034585e02bd9ecc510601ad1303655eb015269a627a014c374dac703a869f20b01 SHA512 f413b92901bdf028cdfea175326f331a2664a560ccd4bb0ee7dff922ec8c85fbc1d122abe06b090b29daab0bb2bd876b8f0fc327ee733317a89a0c6d6b706d69
-MISC metadata.xml 249 BLAKE2B 1387017b008b6162a2386ec65adf9023d496f0ba3521cb90d0bfd71d3648e87d432f667d25581e590903fd6a6cc257d412e90e73cae9e08fb56d3e25bad595a4 SHA512 c50ea66c86a0c544e47230cbcc1f722fafc3d89a0617fa046ec3bc97080aee2028b45081de4a884320cc0122358173d882456fa9bda7d1c088646364b55ad6b9
+EBUILD result-1.5.ebuild 417 BLAKE2B d1a664a27619642eb611e74ce99320d8d2b554765bae0b413110c841e749fcab2a5d9afecbea51a73b563759339b7fdff304f4375592e80dacf77f74da88535c SHA512 763de23d3a11bd1f5bac274f5786b3615f9825b6136e9f7cf0cc44d6d23703a8b1849f93fbb51c1981a65e72c51243e6d19064d99dc63e1a6838b127d4427c47
+MISC metadata.xml 326 BLAKE2B 654b7ffe8dd0fc4cb37f18afd5f9f39149e7244beb54f42688965c5b67eca7093b81d7ba4349e49d66943aef48e69e40a5df83ee2e3869cfb2513e9b836ab3dd SHA512 b667f60e0e7ce8439e7b100b99046324ee1dd2eee5379bafe48334b7bb63aec7f49df08e18a46febd8c8185fd4b0dfcdaeeeb91f11b32354e88264f2a234fb9e
diff --git a/dev-ml/result/metadata.xml b/dev-ml/result/metadata.xml
index 3fca8513dd2e..ffa2962f92c9 100644
--- a/dev-ml/result/metadata.xml
+++ b/dev-ml/result/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>gienah@gentoo.org</email>
+ <name>Mark Wright</name>
+ </maintainer>
<upstream>
<remote-id type="github">janestreet/result</remote-id>
</upstream>
diff --git a/dev-ml/result/result-1.5.ebuild b/dev-ml/result/result-1.5.ebuild
new file mode 100644
index 000000000000..5284eb6beba6
--- /dev/null
+++ b/dev-ml/result/result-1.5.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+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 ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ml/seq/Manifest b/dev-ml/seq/Manifest
index 8185cb412af7..c59825f4a5e0 100644
--- a/dev-ml/seq/Manifest
+++ b/dev-ml/seq/Manifest
@@ -1,4 +1,7 @@
+AUX META.seq 137 BLAKE2B e40237cb64a5c1a7378e88d2d0ed186b3c9926453a92321b4cd3769e3e18ed63626484b7181323f6c5d552c5dcebe2a30d9d5305e4d4dfd0c110d5636d6b0f7d SHA512 1ad76cc25bf663d5d35e5ea9057bff11e7882d8ddc4367b6e38a761df0aa7a8fe76de2fe3b7080a575572dad26556261a05f6044906d7874df89e0157e35e623
AUX seq-0.1-gentoo.patch 309 BLAKE2B c80895e464359e67350ee3f0a183f3dfde63d718775876acad3905446c62dac229ad173b334020f4b2d51807b37d15e526ea98fd3ce2bf27ee8fe751c77c6d11 SHA512 0f93ed7035bc7138518b99471d64cf6144cfd3d4aeb08445a7fc6b2ae631a96a242a1dceaa5014b6503149ad24a1f048c1f0ea435ff38e8c76452f0bafffe540
+AUX seq.install 30 BLAKE2B 4f3676729c9b48eb67adc238eeb6162cb38c0cbae4ba8aff46255987c6dfe64094bb9706a0d8e97ce2a423ff48dd01b426571a2e96ef6a487cd3b6b4beea6020 SHA512 915b9de54aa9e0489876094ed83690c653c0436b4e0ef502ab28aa1133d10f3b30baa190306629ccc94b5bfa837bff4426ed32e627cfad8954d32e0d8536a6e0
DIST seq-0.1.tar.gz 2452 BLAKE2B 4f673c3909611957fc882c548c8549cbcad1e93101e1968f001609108b89f4cee13b055a7a8e75e9c36d33074863532b7d84461f036d14c468d5baadde411295 SHA512 cf0df428408efd8f593765c419007c3b181c1234fa957bd09bd96bbbbc7950dcd329429a8a22573680fdfd46847e21befae29ade967509690428ba2b90fe83f2
EBUILD seq-0.1.ebuild 721 BLAKE2B 9c51848bdd583c605856613c7f80fa5c6c8bff817043cb907dc72450de50c780b1eeb73336c9aa6dab884afc43c97cedb152a2d8abf725901cbaa46011676298 SHA512 9ef41b4d2b1dd58754c85521550dc096e636e5d0e18fae22e8b300b893388594d045bcbbb2b30f83dcf41d1a1e59bef9f1c24f98149f262193645116938d44ef
-MISC metadata.xml 247 BLAKE2B ca08677c4c0af66af431abe578122a2ea0278f7ffabab245eec806167a6226c65f97e9826d64fc4b82eb14b6200cd1e3a31a5b4999e18aac41a4f9af43d708d6 SHA512 fff6c25e644477aaa35b838e10c44ca8eae9824ef8f19795e31201db40c10068f0216dec38deb0ba80782155b43fd1d72fb888cb825eaabacc3bd1ec0d18f3ca
+EBUILD seq-1.ebuild 552 BLAKE2B 1cc7c58894503841b2288a628505382293865565982ad10e466ee41aefe3823f76d9f7bc8dcc7751ed7539258b31585d75eb7e3d9348cba462ae8795a373dee1 SHA512 663eb04eb4c7ddaf64c72f9d3923410eec0a3d6d2b323de7c15dbdc886fca311b39ca3799f5133849eb85ba2f05565004a750f3290b0026e3292e815fdb98f1f
+MISC metadata.xml 352 BLAKE2B 09915ccff13920cb1e43159bf0219bd2312529a87c09f2ec689c575d8f87a78e23033a07c9052b535a8584b19fa06229cf9b5213013fd42d7a1b5354d8236ef6 SHA512 c5dbac31e43517ba73f20a6cf8119b27c2d13334f1736b7e92ee3d9685145fde839cbdd09af311c01a3c5897684bc6c1d668d9a2541b921c7a9816bb3afd3223
diff --git a/dev-ml/seq/files/META.seq b/dev-ml/seq/files/META.seq
new file mode 100644
index 000000000000..06b95eff3f8d
--- /dev/null
+++ b/dev-ml/seq/files/META.seq
@@ -0,0 +1,4 @@
+name="seq"
+version="[distributed with OCaml 4.07 or above]"
+description="dummy backward-compatibility package for iterators"
+requires=""
diff --git a/dev-ml/seq/files/seq.install b/dev-ml/seq/files/seq.install
new file mode 100644
index 000000000000..c4d70206e13f
--- /dev/null
+++ b/dev-ml/seq/files/seq.install
@@ -0,0 +1,3 @@
+lib:[
+ "META.seq" {"META"}
+]
diff --git a/dev-ml/seq/metadata.xml b/dev-ml/seq/metadata.xml
index d0e866f244f8..000cf86e43c1 100644
--- a/dev-ml/seq/metadata.xml
+++ b/dev-ml/seq/metadata.xml
@@ -5,4 +5,8 @@
<email>tupone@gentoo.org</email>
<name>Tupone Alfredo</name>
</maintainer>
+ <maintainer type="person">
+ <email>gienah@gentoo.org</email>
+ <name>Mark Wright</name>
+ </maintainer>
</pkgmetadata>
diff --git a/dev-ml/seq/seq-1.ebuild b/dev-ml/seq/seq-1.ebuild
new file mode 100644
index 000000000000..36f5f1234a69
--- /dev/null
+++ b/dev-ml/seq/seq-1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit opam
+
+DESCRIPTION="Compatibility package for OCaml's standard iterator type starting from 4.07."
+HOMEPAGE="https://github.com/ocaml/opam-repository/blob/master/packages/seq/seq.base/opam"
+SRC_URI=""
+
+LICENSE="public-domain"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+"
+BDEPEND=""
+S="${WORKDIR}"
+
+src_prepare() {
+ cp "${FILESDIR}/"{seq.install,META.seq} "${S}/" || die
+ default
+}
diff --git a/dev-ml/sexplib/Manifest b/dev-ml/sexplib/Manifest
index eaf90ea2f5cd..ca68bb9fa151 100644
--- a/dev-ml/sexplib/Manifest
+++ b/dev-ml/sexplib/Manifest
@@ -1,5 +1,7 @@
+DIST sexplib-0.14.0.tar.gz 54055 BLAKE2B d0ee1470fb9d28eb6d6ed3aaf0f6bd63d7c4860183ac287054f08bc54d57d0c52ebf9fe516aa991d8c66967ecc6ad95b6a6d19eb40a9f610a6f91f832d9d2e20 SHA512 e77a9ae8991e6b73de57ab6b7068d6482471dd34ff0af23b93b5ba57bd69493d15db3279d3b328280f716e531c08c2a6c39bfaa886f1934240dcc13724673684
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.14.0.ebuild 551 BLAKE2B e85fdc1adec13e759ca51b58cfb64b999f3ac195bb320a397ea86e8efa0f83ca106065541ffac6632ad09ffdb15ef42d01f7ca0bcf7f12efece663399b2f876d SHA512 89af039a80a2ce82969b7b0761c4d0055cfe47f20a96154bee91c18f5bb17a106261358ff8660dfd6fa3b45dec2a94b29be35b5030b4a11c01f2c66bd8e97a4f
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 318 BLAKE2B 94d2bd4e11bc3eb230b40659e895e02461ba630f2a9958ccb0c7b93257ce1094a0cb1be6de2adad6e1bff1336b382716426304d95e2ddb10779028dae1850347 SHA512 e61d6cd232b6851868ab87294c1a5626cf4c614d580fd7ff22d3e558dbc89c5bb6e0bd6e44b7e4dc84a9afb06eba5c8d375860f1aa957cae4c6e62df1b1f6302
+MISC metadata.xml 388 BLAKE2B 23f492dd7a7797c6277c5dccf9905c219db4c09b178c391acef1c51305e1506622f9b25d3ed04167fc2f660c206e1aea215d9687b2c65c8380a33ea4ed4cde58 SHA512 b542052f955aac7e88fa6dfa85c90b73ed401a79a60dab436274d8dcb07eb8d4876ced76a07b42d8b342327a4287d070c2e72546156bae2ccfd8dcf04fb71f68
diff --git a/dev-ml/sexplib/metadata.xml b/dev-ml/sexplib/metadata.xml
index 214264c2beb2..33a396fe6e79 100644
--- a/dev-ml/sexplib/metadata.xml
+++ b/dev-ml/sexplib/metadata.xml
@@ -1,9 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
- <upstream>
- <remote-id type="bitbucket">yminsky/ocaml-core</remote-id>
- <remote-id type="github">janestreet/sexplib</remote-id>
- </upstream>
+ <maintainer type="person">
+ <email>gienah@gentoo.org</email>
+ <name>Mark Wright</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.14.0.ebuild b/dev-ml/sexplib/sexplib-0.14.0.ebuild
new file mode 100644
index 000000000000..66434610d364
--- /dev/null
+++ b/dev-ml/sexplib/sexplib-0.14.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+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 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+RDEPEND="
+ dev-ml/parsexp:=
+ dev-ml/base:=
+ dev-ml/sexplib0:=
+ dev-ml/num:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ml/sexplib0/Manifest b/dev-ml/sexplib0/Manifest
new file mode 100644
index 000000000000..3ee69f5d51b3
--- /dev/null
+++ b/dev-ml/sexplib0/Manifest
@@ -0,0 +1,3 @@
+DIST sexplib0-0.14.0.tar.gz 17677 BLAKE2B bf906491cd8c8021b6737fa6a9510ad7421a01c448bd1e136cd7244eaeb27674a4c3e739be601a66b1f23a2f6dd2f19771b66fde88a2f3e75e24111ae5ace3e5 SHA512 cfffb390809a1ed3b99d3326a7c5035e2fedf7af084d94f6c0cff98ba641056b5b2896d56d32b1b27bdde29b199bbd32d174cdee84c2e1541cb7f2e4bf00e4ed
+EBUILD sexplib0-0.14.0.ebuild 485 BLAKE2B 3474192335a4c23fbf3cc8dcaf4c4fb5da5adeded38c588cbf4f3a6ca058e62233f641c9488f555ef23f831fd5370f8d4cf59c8d960a4628350870bbef24c3e5 SHA512 fd6e13ee9ea0c84a8a91e56a72d97b9a44ed4a7c9fcbe6dd18b18aa9b4c5e66fab3ea9073580958f264dd325a04d88b2de7c871fc50d0798c55be1aa323c264c
+MISC metadata.xml 328 BLAKE2B 3a2077d8c80066249fe3d5401d0e25146e1ed79066f956b3af8e5163b17c79e8bc889cce6b3e8ecd75965111c6bfe574948ec65234b8ac7245042688ba3dde0d SHA512 8803fb7e2bcb8483ca7a3eb32ae4d55ee55c534f9440367c88b1c63c6d77114167c592fb641854f7a9d14e7afa5c374c5350347b6394e5b08f7d49815e57617c
diff --git a/dev-ml/sexplib0/metadata.xml b/dev-ml/sexplib0/metadata.xml
new file mode 100644
index 000000000000..e579604e5a49
--- /dev/null
+++ b/dev-ml/sexplib0/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>gienah@gentoo.org</email>
+ <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">janestreet/sexplib0</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/sexplib0/sexplib0-0.14.0.ebuild b/dev-ml/sexplib0/sexplib0-0.14.0.ebuild
new file mode 100644
index 000000000000..7a42c86148c0
--- /dev/null
+++ b/dev-ml/sexplib0/sexplib0-0.14.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Library for automated conversion of OCaml-values to and from S-expressions"
+HOMEPAGE="https://github.com/janestreet/sexplib0"
+SRC_URI="https://github.com/janestreet/sexplib0/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ml/splittable_random/Manifest b/dev-ml/splittable_random/Manifest
new file mode 100644
index 000000000000..aeea2f09f386
--- /dev/null
+++ b/dev-ml/splittable_random/Manifest
@@ -0,0 +1,3 @@
+DIST splittable_random-0.14.0.tar.gz 9942 BLAKE2B 3147e290cbf7a6e2ce8994ce0f95f392a4f7f24f7c2b6fd1b5394ec537e8be7efbefebcb8f2794e026cdd30596e6defde86126646b19f6d299ee79dbaa4d4bb7 SHA512 c8c006bba0f74e53892d9fd364de4d822182ce5371deae4f5d881d59ad6b9a8a429ac6aca54ae95edf312565b87e89a2c2546a349b2e6de2a78ece0655a09b94
+EBUILD splittable_random-0.14.0.ebuild 574 BLAKE2B 2d32b4ee7d51981fef1d8de4a1c85f33fcbe970ef0e7556e948321b232d54440f872df28424b362d4b7b7306106e21c2c99d2fe6a13bc331c90066a20c490b97 SHA512 8b53aa007ee7e2edc0e8a09c5c84ddf1bf2c6f0558b3b24b89a5119a8aea8f51f7a02089064fd5c6f5f187782ff28a3691e966bf6fbe9fc3f7a276d6a290001c
+MISC metadata.xml 337 BLAKE2B c5a5577ba2d95c9deef4c031c8d3844ddc00da5f8003c204f3b7b46cc55f62cd791fc0ab4389b614dcdc8e96e2b852c108429e31031c586827365f5f1191b416 SHA512 1c95f3248d1baaa26bf1ef5080a0a5c5a433e35a6ff05aecc6f209534fa49e38407dce86f4d48490ddc20c4cd6909af35e62684a70ef50e9054347db7f14151b
diff --git a/dev-ml/splittable_random/metadata.xml b/dev-ml/splittable_random/metadata.xml
new file mode 100644
index 000000000000..22ce63f341b2
--- /dev/null
+++ b/dev-ml/splittable_random/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>gienah@gentoo.org</email>
+ <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">janestreet/splittable_random</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/splittable_random/splittable_random-0.14.0.ebuild b/dev-ml/splittable_random/splittable_random-0.14.0.ebuild
new file mode 100644
index 000000000000..cc9e8ce123ef
--- /dev/null
+++ b/dev-ml/splittable_random/splittable_random-0.14.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="PRNG that can be split into independent streams"
+HOMEPAGE="https://github.com/janestreet/splittable_random"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+RDEPEND="
+ dev-ml/base:=
+ dev-ml/ppx_assert:=
+ dev-ml/ppx_bench:=
+ dev-ml/ppx_inline_test:=
+ dev-ml/ppx_sexp_message:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ml/stdio/Manifest b/dev-ml/stdio/Manifest
index 4019140f765c..7eab8347e4d2 100644
--- a/dev-ml/stdio/Manifest
+++ b/dev-ml/stdio/Manifest
@@ -1,5 +1,7 @@
+DIST stdio-0.14.0.tar.gz 7867 BLAKE2B e9aa9727489bf59350fe87323689a5c4f5bf710bb4932b0153c4ad742db5fe03a05728d86c281796cb77d1aef9ba2cc1b236630cb125d1d182c54c344a0ee335 SHA512 74cac04bd6b1be8c13f739445185286a910f66877cb61c8f22b4027dbc3f82021030d55eb7c8471bac850fc7c0f86462a8e26653c7a08c95fb7eea16512c5f61
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.14.0.ebuild 478 BLAKE2B dd0ee16ee8e32016b21b4e10d90f901899ff3dcba3685919bc18f961320f3e35bf0fabb19d3560a39904e3e4cc284f0e6671dcd8249935181fbdd1137ad06610 SHA512 720111b58a734528bd7284c7f5df8b4d8da8f25d6e1158c010c3fb5f003a6ef7b56cf3f0390864d3de60bc7513e41c469c0b2313ea22e1e08f733e106b4ddba2
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 248 BLAKE2B 0ea5efdb3867f8234cfd4825b1942388d32da43ef9c1f6a1b4984fa9d8d36a4d1a3b4c31a2b5bdcfe14cf357bd3d5bae0b6c91ce0e47f24f6eb97b4668f01a02 SHA512 084c750f1421cb9eb60b018f6c31e829e5fda6a832fc90c73f862e245816a1462e4cd3e338466df14b5eb9807d7ea427902ad45036520db302456be17652ee9c
+MISC metadata.xml 325 BLAKE2B 9e2084c9f60c4c54c73bff9b53e44fa94847ec3aaaf1e0bef8b965e90efe64c5b43f95f1d4eb096266203cf51b06ddddb8d5106b1895f6b33a5df43608134140 SHA512 c287d74c6ed1a0e22fbfc82198e9e458ad7e340bb45a56a220d054089e71d11241026c849c2ca236cb3c8fd7450dcbf37bfe6553cea621f1c763a712e93b0de8
diff --git a/dev-ml/stdio/metadata.xml b/dev-ml/stdio/metadata.xml
index ce97306373ea..07fb8f069c5a 100644
--- a/dev-ml/stdio/metadata.xml
+++ b/dev-ml/stdio/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>gienah@gentoo.org</email>
+ <name>Mark Wright</name>
+ </maintainer>
<upstream>
<remote-id type="github">janestreet/stdio</remote-id>
</upstream>
diff --git a/dev-ml/stdio/stdio-0.14.0.ebuild b/dev-ml/stdio/stdio-0.14.0.ebuild
new file mode 100644
index 000000000000..3de25802f3b8
--- /dev/null
+++ b/dev-ml/stdio/stdio-0.14.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+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 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+RDEPEND="
+ >=dev-ml/base-0.11.0:=
+ dev-ml/sexplib0:="
+DEPEND="${RDEPEND}"
diff --git a/dev-ml/stdlib-shims/Manifest b/dev-ml/stdlib-shims/Manifest
index b81d2785c01f..accd1eb13e99 100644
--- a/dev-ml/stdlib-shims/Manifest
+++ b/dev-ml/stdlib-shims/Manifest
@@ -1,3 +1,3 @@
DIST stdlib-shims-0.2.0.tbz 15980 BLAKE2B 4d83b8642a4bccc9f090c0a2f23a4d2f16bbf2ec686ab41e357f5f544d659e82f10cba85f9d578c939a2a874d0006b7fd17846bb8ffe1b6fc7cb760e4aa33db1 SHA512 19e8d8e004583e94ce060d3598c886dae1c24dd79dfd177aab4bd2865846f668a83071f087d9371393f226c14c90042eb2ec76619654c655995aeff9d4765621
-EBUILD stdlib-shims-0.2.0.ebuild 476 BLAKE2B 5010e59d3380e937bac49755b67779aefb8b5de880ef2c55eaebe497a0e37a456db440a12167072a57a4fa68d317a74031c68fd3ffb85989ab9b8c36aac44fdf SHA512 dcf9251828ec56f934e3a42eb28917e5cdeb56b0ef45c9ec3a2ceeb234b9138520db88392b4c39b6dfc3f82d04cfffb1b4cac74151f3f626d4083defea1a9389
+EBUILD stdlib-shims-0.2.0.ebuild 500 BLAKE2B 265060b6809275d3a75fc4e8fee815e684f291b3f844386448c08744cf55cd14c64dc23ed35e67faab57d1687b0a6749e4a343e61782402a68c67143e4828755 SHA512 6efd9216b7f588e7d0b25a04338746e2b27d96d71f970d46c9b1895a0afb735f7f8e15f05ee528cf1393519bb471aa40ebc2820615986871de5143373c7ab5d1
MISC metadata.xml 864 BLAKE2B bcf80992555101e1ba8eb6ca81df5a810b7351e4ce141842082c1981988b0a8529a83971f6f90be2a03cee9ba13a83679c5bfab6ed218e997b000c996ce6a0c1 SHA512 533ee9f2bedd5163669b6e23763ed90eb3ff180465a453e2a5d87271c0f4ac112aed7f073e88acf79eedc0d7495551e4670bfc1256a19053a2c021a91442a123
diff --git a/dev-ml/stdlib-shims/stdlib-shims-0.2.0.ebuild b/dev-ml/stdlib-shims/stdlib-shims-0.2.0.ebuild
index bedd6b873ecc..74657c7a3029 100644
--- a/dev-ml/stdlib-shims/stdlib-shims-0.2.0.ebuild
+++ b/dev-ml/stdlib-shims/stdlib-shims-0.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ocaml/${PN}/releases/download/${PV}/${P}.tbz"
LICENSE="LGPL-2.1-with-linking-exception"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
IUSE="ocamlopt"
DOCS=( "README.md" "CHANGES.md" "LICENSE" )
diff --git a/dev-ml/time_now/Manifest b/dev-ml/time_now/Manifest
new file mode 100644
index 000000000000..a626d056af41
--- /dev/null
+++ b/dev-ml/time_now/Manifest
@@ -0,0 +1,3 @@
+DIST time_now-0.14.0.tar.gz 3666 BLAKE2B 131d4b585ac981fe306ea93f17e332cfabe86a3f8f4564a76e4dc694f9c624e91fe0f0ce26a4ada9fdf0239033fcd29065d76a37e6fb4b79927d116531c04909 SHA512 1b6d1a754e46f1756aa2aad3590e5052999f567630297491d62228ad733b189fbbfc0589b7bafd74e9f77ca0c0421093054e9062d2d5a7d7ed05930be67e9a5f
+EBUILD time_now-0.14.0.ebuild 532 BLAKE2B 0732cea3bf5efd4b7c37ebb4869bb1c222421362c1ea6c43936af3772fd5d65398172ffaa384d858208d8d6a850a7715cb276189c34fbaf3591dfdf859fd9488 SHA512 e3429644229d81140ac181017ee028378db8910cfd4f44c142b4784f494c124a2a165d1b7a7b5ab6c349a057422da801dad6326b01ff31eb116cca52a07bfe78
+MISC metadata.xml 328 BLAKE2B 563dcd4d5d36906144c5cfd7aedbf719431104073eda4634b914e76f72083ee174989c40e169495d376f9e7d92ff2f52a76d5481a6b27eec99c6288a5a7b2304 SHA512 827e7f01c055215b6b0dff4cd4d652d10ff84e26b5919da370a16c9c256e965567bfe07b5300d8758e335e0b7bf779230eb0fcd8860a148a89b1f1e1c664a0af
diff --git a/dev-ml/time_now/metadata.xml b/dev-ml/time_now/metadata.xml
new file mode 100644
index 000000000000..b78a86fdab86
--- /dev/null
+++ b/dev-ml/time_now/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>gienah@gentoo.org</email>
+ <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">janestreet/time_now</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/time_now/time_now-0.14.0.ebuild b/dev-ml/time_now/time_now-0.14.0.ebuild
new file mode 100644
index 000000000000..44465dffd133
--- /dev/null
+++ b/dev-ml/time_now/time_now-0.14.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Reports the current time"
+HOMEPAGE="https://github.com/janestreet/time_now"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+DEPEND="
+ dev-ml/base:=
+ dev-ml/jane-street-headers:=
+ dev-ml/jst-config:=
+ dev-ml/ppx_base:=
+ dev-ml/ppx_optcomp:=
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-ml/topkg/Manifest b/dev-ml/topkg/Manifest
index 2e4b0a9595ff..75cbba759aa8 100644
--- a/dev-ml/topkg/Manifest
+++ b/dev-ml/topkg/Manifest
@@ -1,5 +1,7 @@
DIST topkg-0.9.0.tar.gz 120352 BLAKE2B 1122fe8b60e3d104136810a2cec8460c24a26061eff55e80347d2ecf197afee949e8afaca94a6615da31a8c3acaf113b44b16dbf2430fda6724e440597775bb5 SHA512 823fe1abb344d7800e09411c952bd276ecea97b5d9c124d986e26b9128d03b3ad023a38560198e476ef8f949ecb456078e332bda94075e9b746e43d3059a8fdb
DIST topkg-0.9.1.tar.gz 120943 BLAKE2B 39ac0d1d247183cf9f007c65b09d413ad6a89982d84269e99585ed5f15df4d7683de61548dba6ca5a1299f96206bfd2dc1042486410caa202938dc15e936446b SHA512 19773eb764b53a6e5110c44d7942d2557d6c8502a3037b57f7737efc08f4cc374845b431fdb1465207693d15a4b072aea3db97f8e60e069e3d24ae150e8c5c8f
+DIST topkg-1.0.3.tar.gz 122302 BLAKE2B c3c583fe6d9c6602c9eeae6ba76f0b8e1eda754cb2ffed8f6a9b51eeea53a2d16ad0af5bf3bf1f257233481efd1e7fecfca7185773dcb4258f6a0a8195aaf61f SHA512 b4f3393b142c5c2d71bb4a25f5af020831bd48ad5c354b68cf5a2df2044b534024f0568da93ad26ca383c97ba4277b4878dba7ce9267146f3805c67f52950cbf
EBUILD topkg-0.9.0.ebuild 916 BLAKE2B 1761376572d2877fefb6457a88c76267457729159192c2b874b46fe53741cdbe43f86799cbc4155be3242a8885556fd3e7f086c5e3ccd9c5e675d211f30b9289 SHA512 b6a9f03fce4061d0fe98fa0fb091a060b3a50a3114836c979062fd64784669256db510500cfa363dd66dbb5c043c994dc6b0dad958b0f977f27ba018061e28f4
EBUILD topkg-0.9.1.ebuild 916 BLAKE2B 1761376572d2877fefb6457a88c76267457729159192c2b874b46fe53741cdbe43f86799cbc4155be3242a8885556fd3e7f086c5e3ccd9c5e675d211f30b9289 SHA512 b6a9f03fce4061d0fe98fa0fb091a060b3a50a3114836c979062fd64784669256db510500cfa363dd66dbb5c043c994dc6b0dad958b0f977f27ba018061e28f4
-MISC metadata.xml 246 BLAKE2B dff31f4829283c7ca96516cadee0549432d092fe3304b5a66cc8a7ef2b6814a95fa8de556f2cee1a47c0a2d1894b12609da0878be0c117c719e488c3bc76d155 SHA512 e8cbe0461345bd68528b74ea43823f6929e826c3b464d5a42007155a8cdeb2fbc3b9a7c6937c88b6da5e7ba5db813b1711093d27033282df8621a192ed207cda
+EBUILD topkg-1.0.3.ebuild 922 BLAKE2B ff39cda98770545c0d609eb74b8e831517428f1b5239279511afd5027b00be92848d9fe170bab9d4a03e142099987f0436b0dc72976fec05f33bf4db007431d6 SHA512 cf84a0fc86afb2f518f03dc4b47fd8d8c2a4216634c2b331ffd118a00eef1607857b0d0c8856bd8f12bb043f21058a3fd260c772601908a3d3aaba44ce5e3387
+MISC metadata.xml 323 BLAKE2B f100a88587e1fed61b21439574a4ab40316daf7389f6ccc48d58dd2c3c52dc78945bfdb68b04759cf27b27ee4830f8f58ed88fb13f1d3b250931cced000f0449 SHA512 d2a20e5e628dc479e33282f2ebd612004040ff05208916aa695db6393f762ab88e3bd19814c25a532b825a0720b6974f9c726d5153d668dca34ac528e4f51bff
diff --git a/dev-ml/topkg/metadata.xml b/dev-ml/topkg/metadata.xml
index 5c8e10a7c535..5b0819cca142 100644
--- a/dev-ml/topkg/metadata.xml
+++ b/dev-ml/topkg/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>gienah@gentoo.org</email>
+ <name>Mark Wright</name>
+ </maintainer>
<upstream>
<remote-id type="github">dbuenzli/topkg</remote-id>
</upstream>
diff --git a/dev-ml/topkg/topkg-1.0.3.ebuild b/dev-ml/topkg/topkg-1.0.3.ebuild
new file mode 100644
index 000000000000..f3e08b9674bf
--- /dev/null
+++ b/dev-ml/topkg/topkg-1.0.3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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 ~ppc64 ~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/typerep/Manifest b/dev-ml/typerep/Manifest
index 05cade9a22c7..7542042ef00e 100644
--- a/dev-ml/typerep/Manifest
+++ b/dev-ml/typerep/Manifest
@@ -1,3 +1,5 @@
+DIST typerep-0.14.0.tar.gz 22936 BLAKE2B 353a42f0f14bf6cbfc88670ca3d42af5873db1fcf805c30d03e95990ccd6d5fe2f5604931dc213fa921683de639717d288b2eac620cc2a4981cb792a65736e8d SHA512 53b719ee06d06d7833cbe57811fe54d57a36055fa8e4255909273a267000e20628b8b8f6d27c22385753ea461d461f87a1eb1fc9711c52405a89d1493f54f37f
DIST typerep-0.9.0.tar.gz 24934 BLAKE2B 83e0cd9419c11a1b8dbce6730404dbe4b00597e441943d8315ad5a583ff50376c95413695e327996b07557b1b481df8ab15db5b37c3ac4c8396b7ed51aa822ea SHA512 f71fa3968ff5e93c384a97e2d39af0de33f4889643a7e43d70a777214dc4c7f35b3fac0864ffee99334cf03866a695f7afd1a907d5c7f3cec0d472b729adf9cc
+EBUILD typerep-0.14.0.ebuild 477 BLAKE2B 9d607d7b2f510f3600829a71a1beb07d26573274eb655ca603e1919dd2136d916be826082d858aa2aba8fa0dd66cb0889495d51863ebf552e6b8b2fe58007577 SHA512 092731cd211bd9d614d1a65e9875e9b2825ba73dad36ed60d19a9453d6c45a01161f9ba11f040bc8977aae2ca5877f5afbc85c15675adb1263b2ed34fb6db371
EBUILD typerep-0.9.0.ebuild 477 BLAKE2B b49346885d12aae201b75ebe9060b02778c61e52779c452fb378011284a349f8bbf53f34b75f081ebc302894f2d91fb9b9ac1d1acb663a8c7ffdfde87fb9ca52 SHA512 5e7bf0fe698123824f02cd7e5bf0e733bdc1e2dabad4c448644ee91ecc62951e03ee5585308038a7050275da05929455d77227470c76d2df294267867e58ecc2
-MISC metadata.xml 250 BLAKE2B ca5096ccdf0528d9422782583b3c30c97b8c612372117da39464ed148a860d2b4bff4223f3dc441cc9938f4c7587c062bf67649db5fd9aa962e9e785694eff94 SHA512 bc7eade632facd407f7d81d62c167ae90df51cf01b87f3009c067e362be7746ed1fb73a6d5d8c922fa2e519c6642c3725b618804bf67fb44da68c08993f17419
+MISC metadata.xml 327 BLAKE2B 03148261c61030653269555bdd1946cbc3ba93e5529e3c1a2734af31c22ffadb5c41f4856e2fa1be7f8d18befde507795e0fa9b73f36e7e9a6a7ca7442c3ba55 SHA512 206bb81579390a8b1f21f6dd1a0383c4a4f77a900fff577ad1b1ffdeb72b940da999203f423d8576c5a10802c1e6400fa510ee1d5ff6d1718538c8a1f7977481
diff --git a/dev-ml/typerep/metadata.xml b/dev-ml/typerep/metadata.xml
index 39191cd86181..f3f7dc32a8b3 100644
--- a/dev-ml/typerep/metadata.xml
+++ b/dev-ml/typerep/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>gienah@gentoo.org</email>
+ <name>Mark Wright</name>
+ </maintainer>
<upstream>
<remote-id type="github">janestreet/typerep</remote-id>
</upstream>
diff --git a/dev-ml/typerep/typerep-0.14.0.ebuild b/dev-ml/typerep/typerep-0.14.0.ebuild
new file mode 100644
index 000000000000..42b1cedad4e8
--- /dev/null
+++ b/dev-ml/typerep/typerep-0.14.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+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 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+DEPEND="dev-ml/base:="
+RDEPEND="${DEPEND}"
diff --git a/dev-ml/variantslib/Manifest b/dev-ml/variantslib/Manifest
index abd0f8702607..ab76601ce36e 100644
--- a/dev-ml/variantslib/Manifest
+++ b/dev-ml/variantslib/Manifest
@@ -1,3 +1,5 @@
+DIST variantslib-0.14.0.tar.gz 2951 BLAKE2B a3197f7e06d4340ae73d76d477fd1e0ce038b4829aa3a9d0e0ea3e5251f9ca7c43798005138993a16c860ebf4d08a7e54621359c2a030f3866b62a02de4c326f SHA512 0cb18475668eb8e6091f8a779587f0d643dd0325b0f8518e53469dd12769a3ed6fa4f9c2651a21f8b07992d7b29f6664c4d3bf49f46ed6d7002de07b5014e4f3
DIST variantslib-0.9.0.tar.gz 5590 BLAKE2B 8b6b4c1e1d21e7f6c9bdc1813ea811dc4680506a2a8b2f8c869d8ba2583f07e99d717c0f6a984f6ca3c2e809c9eb2e7c497dcde1f0085e054de383b032f3e94e SHA512 2fd28063d307396da866be70480ba7f953d90ec32a55d31dad649eadb6141572e428f055cad02787654477c4a308313ecb7be4b9b80828af9d9870ad325b9f4d
+EBUILD variantslib-0.14.0.ebuild 463 BLAKE2B bd6134866fb9d016fda026c9ceceb79845842292cd02d517e7cb05dd6084b4a130d7d78e1b34b75584f2c6b459484210a7d6a93d234b0650f08e4f140aca1ad7 SHA512 0d43fc1352c9d3eebfde9e5fffb99b4c47fcbc730f1887b9e7d9a54cb21cad56dd89942b4798b6cb99c8e2e2d369e58db9506df11c9928c4227614a25032c5b2
EBUILD variantslib-0.9.0.ebuild 499 BLAKE2B f2373d07ff68c513932e1bf2796376539310d2cdd667cd96ec72ecf1f6b569f47fc44569638345dec3de774942e1de0c49bdc931f96aada95e72f5bd43ad8841 SHA512 528e313d67489af325215a9a49d4bf134ad434d97e527102e4adefb2a2ecadfaf7483a54e6ffdf608b9afd68e2297285bd10bc67aa5865157e0d6300a21d144d
-MISC metadata.xml 322 BLAKE2B 340274b42223a6a85b111008144888675617310798af65bd362d494049a130c82ac2cbc136c2ac5aeea984582680356444b08fb540c6957b12bf6daade39b2d5 SHA512 60bfc5140d42edaf7e250ff248552b755561b6a0f26efec33d40a42076546a113c98b15aa98958f6498042aca10fb9885e157871f9fc1306f803c6667234e2ea
+MISC metadata.xml 392 BLAKE2B 9fac74caa06597173406f1c8296a3ae475a5bcae79285f6183c9848bb334c4c638ec8a27aeb5bd76d3dc4c565fa621735f54410577767f65e7a081160b4916ec SHA512 cf8ff30836ce92efe8473004198b710f0fc9deaeb595ae3666596afca05f4fcf4087f8e1efc2f9e511cc24ccb5093dafe35eef1b2325b83bfae8d15e0111d42c
diff --git a/dev-ml/variantslib/metadata.xml b/dev-ml/variantslib/metadata.xml
index 0abb370a4464..fa46caee57a0 100644
--- a/dev-ml/variantslib/metadata.xml
+++ b/dev-ml/variantslib/metadata.xml
@@ -1,9 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
- <upstream>
- <remote-id type="bitbucket">yminsky/ocaml-core</remote-id>
- <remote-id type="github">janestreet/variantslib</remote-id>
- </upstream>
+ <maintainer type="person">
+ <email>gienah@gentoo.org</email>
+ <name>Mark Wright</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.14.0.ebuild b/dev-ml/variantslib/variantslib-0.14.0.ebuild
new file mode 100644
index 000000000000..a7dd94b303d6
--- /dev/null
+++ b/dev-ml/variantslib/variantslib-0.14.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+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 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+RDEPEND="
+ dev-ml/base:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ml/xml-light/Manifest b/dev-ml/xml-light/Manifest
index 479a750efa52..520ecd013126 100644
--- a/dev-ml/xml-light/Manifest
+++ b/dev-ml/xml-light/Manifest
@@ -3,5 +3,5 @@ AUX 02_cmi_depends.dpatch 492 BLAKE2B 1b6094d0b024c9381ae15e73ca593835bf1f4d3d2b
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
+EBUILD xml-light-2.2-r3.ebuild 1265 BLAKE2B 4a4962ee84c74350b436707d85315d3b539b8a83e07f30794ca3143daf4aafa2408f5fe0e993d22a22b70994b5b43b7f1ee86c68e3407306c8215b141ae710a8 SHA512 39f55aee6079cb47bccebc8ea7ad216d2d23a3e471b368f7f08c63541a04fbb5ddba22796f9435658a1fcc1ba9ac1bc0aed0622b9fdc35085a8a26e6867f4511
MISC metadata.xml 245 BLAKE2B 5599732e8923ea2b90a26adcb5708b6cf95cd3db28e810b9f881ac7d0e2c63745609f4c6e21708bdda7792f769df77bfa4b9d4d135eda71831efcaaab122c384 SHA512 1c6cdb75d4cbbd8d3a5f2cc24950924c030db330e135cf2cacecdaaa99ee65117efd7abd9f8652bf5dfa8169d427f51ff84123aab11fa8ef82498a6834b0805a
diff --git a/dev-ml/xml-light/xml-light-2.2-r3.ebuild b/dev-ml/xml-light/xml-light-2.2-r3.ebuild
index f7244b272a18..b0608f4c82ce 100644
--- a/dev-ml/xml-light/xml-light-2.2-r3.ebuild
+++ b/dev-ml/xml-light/xml-light-2.2-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="http://tech.motion-twin.com/zip/${P}.zip"
LICENSE="LGPL-2.1"
SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
IUSE="doc +ocamlopt"
RDEPEND="dev-lang/ocaml:=[ocamlopt?]"
diff --git a/dev-ml/zarith/Manifest b/dev-ml/zarith/Manifest
index b24fa95281c7..275903bc3044 100644
--- a/dev-ml/zarith/Manifest
+++ b/dev-ml/zarith/Manifest
@@ -1,6 +1,8 @@
AUX zarith-1.9.1-ar.patch 221 BLAKE2B 6772e1a5c30a5b9dd6e170860b82e82bd2e5dc5b145d69f20354bcc9fff037098ad03c8365347663dc49499ec72da15f098e186e5b1721f8acb65b7875253155 SHA512 34a5e88ea485ba12b37c7e0fdcd6e21ad64453802fcc48fca39042d52d7b21997888c3c9e76754fe0ceb326dfb2a9a443ba3794b9628ec78f94aa5ea791ffeb2
+DIST zarith-1.10.tar.gz 95543 BLAKE2B 4effafb5a4f90fe48282feb6a3deb07cde4e465c52149d663b1185f82c20ad7e72a02e5965cc3d589ea873f82c33f69dcb47299bbd6a9fa7a6fd686ce14ad61d SHA512 94958feccd3be863b4bcc7887f5108099962402ab6eddbae42420cd04323aafe930dac75c6f1f3d50d8f57cdd2108f1b25546999bac3f03a0a682127d5b67612
DIST zarith-1.7.tar.gz 89617 BLAKE2B ee8a272a7421d9e723af8aa6207da8fe046585804e669058b6dec8fb47cab80e438d0520c1b61ed6c79bc279d162a7a1043fa40e74c50342b7e4d553ca8e8f5b SHA512 812b5f9b24ce7a24d3370b8728ff6eeb56e3280fa1573e694fe54e781668c29bf8ff95e94aeff59df948adc85b8acd6b4efe117fb50a124f19b4227bee78e753
DIST zarith-1.9.1.tar.gz 92321 BLAKE2B d61def81600cb5f3ae931eabebcdf081b6025dd24b1deae46a55f5db4f2c67d44b38b9cb9d73fc7fd9bd76c81545294373e3df5969da217209079a2912a8e285 SHA512 e77620c66a59d35811acfc45c7ef3f0d50d3042194654b1f5b652a2ed5fb9d5f88e9173222e5ced286c61854434da05a4d96668089faa66ff2917afa677fc32f
+EBUILD zarith-1.10.ebuild 1470 BLAKE2B b582fe34fbdf05490c4f9b78da27d72030a612793331899339d3a5668a4ba1e87d614449598545b36ed33f142f8e0667f3784c341cfb927cf8332643e1b127fd SHA512 00feec6fbb015cbf954a8af57673984c4d50a664b0bbebc6a72dbc627053bbcc8f4997a5ff3bf347cc0d741e14f657a8b3c21a9d79152386d170db168650bc98
EBUILD zarith-1.7.ebuild 1324 BLAKE2B 25281d39a44be1b345fab0ba5ff4bd34c1355a2f9bd5a80ffbe8d3d7685bec4ced72865c29a56f69b9db4555a35eac0c752b6752d0083c3d2a018ad50d8e47ba SHA512 33c9759c47aef05c74514d71077b2ab791f83b4d8b46bc32b12b75ddc7032dc4fe5b04ed7690e6a251f54994b5793d0c1c4a5eeb06f53f5eacb5ec5ff18267bf
-EBUILD zarith-1.9.1.ebuild 1450 BLAKE2B 445e84c1a64dfed9bc0531d20cd27cb9883725ead822b20c9b0d5ac0435718e641c01b728f58025a2142e22f0f8472ee464d1c0046519a08ab331f451abaea91 SHA512 6fbb575272c9ca293d4019cc88f38d7137ac2080f1f426678e5e9703df8cafa0d0f4cf5b7740bac4cd0359b602a523c4bb9c614b3c700444be93771ebb47da3e
+EBUILD zarith-1.9.1.ebuild 1460 BLAKE2B ae8dd8e3eb7d55a6ace369189c77dde72d156c830fafa37f74218d0ed4f96ba40867ddf9f6ec7d2ac3ace0c2a62d8e7137f6e63705de28b3ba8f3b3e9fe1d342 SHA512 5abcc22e0cb2a954a24dc0b4fb517c72dd09631b7ba89f64609dbe2c648dbd5cec79ac7f93973d9448f9d081189541e74e17adaae8043031a9ae73e536d8f528
MISC metadata.xml 399 BLAKE2B 8d0594f3da1c885b3c23bc0bd85bb499b46c1bf9e6d9ce97d03a5bbb9b3ef07be3fe71887464d0334eb5338db123a07113b40f83c4887a99041eccd77d3aed21 SHA512 a1b5ac5f460c86208b260d2adf19bcfe4e34c076be1aa4f52aef993d8e709411ecaf3fa0b6170b0fca952ae7fc1c8e70cb20f7d40ea528ec69dc32624a61faf0
diff --git a/dev-ml/zarith/zarith-1.10.ebuild b/dev-ml/zarith/zarith-1.10.ebuild
new file mode 100644
index 000000000000..6ae953c8daea
--- /dev/null
+++ b/dev-ml/zarith/zarith-1.10.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit findlib multilib
+
+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 ~arm ~arm64 ~ppc ~x86"
+IUSE="doc mpir +ocamlopt"
+
+RDEPEND="
+ >=dev-lang/ocaml-4.05:=[ocamlopt?]
+ !mpir? ( dev-libs/gmp:0= )
+ mpir? ( sci-libs/mpir )"
+
+DEPEND="${RDEPEND} dev-lang/perl"
+DOCS=( README.md Changes )
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.9.1-ar.patch
+)
+
+S="${WORKDIR}/Zarith-release-${PV}"
+
+src_configure() {
+ tc-export CC AR
+ ./configure -host "${CHOST}" \
+ -ocamllibdir /usr/$(get_libdir)/ocaml \
+ -installdir "${ED}"/usr/$(get_libdir)/ocaml \
+ $(usex mpir "-mpir" "-gmp") || die
+}
+
+src_compile() {
+ emake -j 1 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
+ dosym zarith/libzarith.a /usr/$(get_libdir)/ocaml/libzarith.a
+ use doc && HTML_DOCS=( html/* )
+ einstalldocs
+}
diff --git a/dev-ml/zarith/zarith-1.9.1.ebuild b/dev-ml/zarith/zarith-1.9.1.ebuild
index 61de687ce253..04d89fe5a523 100644
--- a/dev-ml/zarith/zarith-1.9.1.ebuild
+++ b/dev-ml/zarith/zarith-1.9.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ocaml/Zarith/archive/release-${PV}.tar.gz -> ${P}.ta
LICENSE="LGPL-2.1-with-linking-exception"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ppc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc x86"
IUSE="doc mpir +ocamlopt"
RDEPEND="