summaryrefslogtreecommitdiff
path: root/dev-ml
diff options
context:
space:
mode:
Diffstat (limited to 'dev-ml')
-rw-r--r--dev-ml/alcotest/alcotest-1.4.0.ebuild2
-rw-r--r--dev-ml/alcotest/metadata.xml2
-rw-r--r--dev-ml/astring/metadata.xml2
-rw-r--r--dev-ml/async/metadata.xml2
-rw-r--r--dev-ml/async_extra/metadata.xml2
-rw-r--r--dev-ml/async_kernel/metadata.xml7
-rw-r--r--dev-ml/async_rpc_kernel/metadata.xml2
-rw-r--r--dev-ml/async_ssl/metadata.xml2
-rw-r--r--dev-ml/async_unix/metadata.xml7
-rw-r--r--dev-ml/base/base-0.14.0.ebuild1
-rw-r--r--dev-ml/base/metadata.xml2
-rw-r--r--dev-ml/base_bigstring/metadata.xml2
-rw-r--r--dev-ml/base_quickcheck/Manifest1
-rw-r--r--dev-ml/base_quickcheck/base_quickcheck-0.14.0-r1.ebuild (renamed from dev-ml/base_quickcheck/base_quickcheck-0.14.0.ebuild)1
-rw-r--r--dev-ml/base_quickcheck/base_quickcheck-0.14.1-r1.ebuild29
-rw-r--r--dev-ml/base_quickcheck/metadata.xml2
-rw-r--r--dev-ml/bigarray-compat/bigarray-compat-1.0.0.ebuild2
-rw-r--r--dev-ml/bigarray-compat/metadata.xml2
-rw-r--r--dev-ml/bin_prot/metadata.xml2
-rw-r--r--dev-ml/biniou/metadata.xml2
-rw-r--r--dev-ml/bos/bos-0.1.6.ebuild2
-rw-r--r--dev-ml/bos/bos-0.2.0-r1.ebuild (renamed from dev-ml/bos/bos-0.2.0.ebuild)4
-rw-r--r--dev-ml/bos/metadata.xml2
-rw-r--r--dev-ml/cairo2/cairo2-0.6.2.ebuild2
-rw-r--r--dev-ml/cairo2/metadata.xml2
-rw-r--r--dev-ml/calendar/metadata.xml2
-rw-r--r--dev-ml/calendars/calendars-1.0.0.ebuild2
-rw-r--r--dev-ml/calendars/metadata.xml2
-rw-r--r--dev-ml/camlbz2/camlbz2-0.7.0.ebuild5
-rw-r--r--dev-ml/camlbz2/metadata.xml2
-rw-r--r--dev-ml/camldbm/metadata.xml2
-rw-r--r--dev-ml/camlidl/metadata.xml2
-rw-r--r--dev-ml/camlp4/Manifest1
-rw-r--r--dev-ml/camlp4/camlp4-4.05_p1-r1.ebuild13
-rw-r--r--dev-ml/camlp4/camlp4-4.09_p1-r1.ebuild (renamed from dev-ml/camlp4/camlp4-4.09_p1.ebuild)13
-rw-r--r--dev-ml/camlp4/camlp4-4.10_p1-r2.ebuild (renamed from dev-ml/camlp4/camlp4-4.10_p1-r1.ebuild)13
-rw-r--r--dev-ml/camlp4/camlp4-4.11_p1-r2.ebuild51
-rw-r--r--dev-ml/camlp4/camlp4-4.12-r1.ebuild (renamed from dev-ml/camlp4/camlp4-4.11_p1-r1.ebuild)13
-rw-r--r--dev-ml/camlp4/camlp4-4.13-r1.ebuild (renamed from dev-ml/camlp4/camlp4-4.12.ebuild)13
-rw-r--r--dev-ml/camlp4/metadata.xml2
-rw-r--r--dev-ml/camlp5/Manifest1
-rw-r--r--dev-ml/camlp5/camlp5-8.00.02.ebuild58
-rw-r--r--dev-ml/camlp5/metadata.xml2
-rw-r--r--dev-ml/camlpdf/metadata.xml2
-rw-r--r--dev-ml/camlzip/Manifest1
-rw-r--r--dev-ml/camlzip/camlzip-1.11.ebuild42
-rw-r--r--dev-ml/camlzip/metadata.xml2
-rw-r--r--dev-ml/camomile/metadata.xml2
-rw-r--r--dev-ml/cinaps/cinaps-0.14.0.ebuild8
-rw-r--r--dev-ml/cinaps/cinaps-0.15.1.ebuild2
-rw-r--r--dev-ml/cinaps/metadata.xml2
-rw-r--r--dev-ml/cmdliner/metadata.xml2
-rw-r--r--dev-ml/core/Manifest1
-rw-r--r--dev-ml/core/core-0.14.0-r3.ebuild1
-rw-r--r--dev-ml/core/core-0.14.1.ebuild30
-rw-r--r--dev-ml/core/metadata.xml2
-rw-r--r--dev-ml/core_bench/metadata.xml2
-rw-r--r--dev-ml/core_kernel/Manifest1
-rw-r--r--dev-ml/core_kernel/core_kernel-0.14.2.ebuild44
-rw-r--r--dev-ml/core_kernel/metadata.xml2
-rw-r--r--dev-ml/cppo/Manifest1
-rw-r--r--dev-ml/cppo/cppo-1.6.8.ebuild19
-rw-r--r--dev-ml/cppo/metadata.xml2
-rw-r--r--dev-ml/cryptokit/metadata.xml2
-rw-r--r--dev-ml/csexp/csexp-1.3.2-r1.ebuild11
-rw-r--r--dev-ml/csexp/csexp-1.5.1.ebuild13
-rw-r--r--dev-ml/csexp/metadata.xml2
-rw-r--r--dev-ml/cstruct/Manifest1
-rw-r--r--dev-ml/cstruct/cstruct-5.2.0.ebuild24
-rw-r--r--dev-ml/cstruct/metadata.xml11
-rw-r--r--dev-ml/cudf/cudf-0.9-r2.ebuild (renamed from dev-ml/cudf/cudf-0.9-r1.ebuild)9
-rw-r--r--dev-ml/cudf/metadata.xml2
-rw-r--r--dev-ml/dose3/dose3-5.0.1_p16-r4.ebuild (renamed from dev-ml/dose3/dose3-5.0.1_p16-r3.ebuild)2
-rw-r--r--dev-ml/dose3/dose3-6.0.1_p2-r1.ebuild (renamed from dev-ml/dose3/dose3-6.0.1_p2.ebuild)4
-rw-r--r--dev-ml/dose3/dose3-6.1-r1.ebuild (renamed from dev-ml/dose3/dose3-6.1.ebuild)4
-rw-r--r--dev-ml/dose3/metadata.xml2
-rw-r--r--dev-ml/dune-configurator/Manifest1
-rw-r--r--dev-ml/dune-configurator/dune-configurator-2.8.2-r1.ebuild5
-rw-r--r--dev-ml/dune-configurator/dune-configurator-2.8.4.ebuild5
-rw-r--r--dev-ml/dune-configurator/dune-configurator-2.9.0.ebuild5
-rw-r--r--dev-ml/dune-configurator/dune-configurator-2.9.1.ebuild116
-rw-r--r--dev-ml/dune-configurator/metadata.xml2
-rw-r--r--dev-ml/dune-private-libs/Manifest1
-rw-r--r--dev-ml/dune-private-libs/dune-private-libs-2.9.1.ebuild119
-rw-r--r--dev-ml/dune-private-libs/metadata.xml2
-rw-r--r--dev-ml/dune/Manifest1
-rw-r--r--dev-ml/dune/dune-2.9.1.ebuild47
-rw-r--r--dev-ml/dune/metadata.xml2
-rw-r--r--dev-ml/duration/metadata.xml2
-rw-r--r--dev-ml/easy-format/metadata.xml2
-rw-r--r--dev-ml/extlib/extlib-1.7.8.ebuild2
-rw-r--r--dev-ml/extlib/metadata.xml2
-rw-r--r--dev-ml/facile/facile-1.1.3.ebuild12
-rw-r--r--dev-ml/facile/metadata.xml2
-rw-r--r--dev-ml/fieldslib/metadata.xml2
-rw-r--r--dev-ml/findlib/metadata.xml2
-rw-r--r--dev-ml/fmt/metadata.xml2
-rw-r--r--dev-ml/fpath/fpath-0.7.2.ebuild2
-rw-r--r--dev-ml/fpath/fpath-0.7.3.ebuild2
-rw-r--r--dev-ml/fpath/metadata.xml2
-rw-r--r--dev-ml/graphics/graphics-5.1.2.ebuild2
-rw-r--r--dev-ml/graphics/metadata.xml2
-rw-r--r--dev-ml/gsl-ocaml/metadata.xml2
-rw-r--r--dev-ml/integers/metadata.xml2
-rw-r--r--dev-ml/jane-street-headers/metadata.xml2
-rw-r--r--dev-ml/jingoo/jingoo-1.4.2.ebuild2
-rw-r--r--dev-ml/jingoo/metadata.xml2
-rw-r--r--dev-ml/jsonm/metadata.xml2
-rw-r--r--dev-ml/jst-config/Manifest1
-rw-r--r--dev-ml/jst-config/jst-config-0.14.1.ebuild23
-rw-r--r--dev-ml/jst-config/metadata.xml2
-rw-r--r--dev-ml/lablgl/metadata.xml2
-rw-r--r--dev-ml/lablgtk-sourceview/metadata.xml2
-rw-r--r--dev-ml/lablgtk/metadata.xml2
-rw-r--r--dev-ml/labltk/labltk-8.06.10.ebuild9
-rw-r--r--dev-ml/labltk/metadata.xml2
-rw-r--r--dev-ml/llvm-ocaml/Manifest2
-rw-r--r--dev-ml/llvm-ocaml/llvm-ocaml-13.0.0.9999.ebuild16
-rw-r--r--dev-ml/llvm-ocaml/llvm-ocaml-13.0.0.ebuild (renamed from dev-ml/llvm-ocaml/llvm-ocaml-12.0.0.ebuild)18
-rw-r--r--dev-ml/llvm-ocaml/llvm-ocaml-14.0.0.9999.ebuild16
-rw-r--r--dev-ml/llvm-ocaml/metadata.xml2
-rw-r--r--dev-ml/logs/metadata.xml2
-rw-r--r--dev-ml/lwt/files/lwt-5.3.0-ocaml-4.12.patch24
-rw-r--r--dev-ml/lwt/lwt-5.3.0-r1.ebuild1
-rw-r--r--dev-ml/lwt/metadata.xml6
-rw-r--r--dev-ml/lwt_ssl/metadata.xml2
-rw-r--r--dev-ml/markup/markup-1.0.2.ebuild2
-rw-r--r--dev-ml/markup/metadata.xml2
-rw-r--r--dev-ml/mccs/Manifest1
-rw-r--r--dev-ml/mccs/mccs-1.1.11.ebuild30
-rw-r--r--dev-ml/mccs/mccs-1.1.13.ebuild2
-rw-r--r--dev-ml/mccs/metadata.xml2
-rw-r--r--dev-ml/menhir/menhir-20210419-r1.ebuild2
-rw-r--r--dev-ml/menhir/metadata.xml2
-rw-r--r--dev-ml/merlin-extend/merlin-extend-0.3-r1.ebuild5
-rw-r--r--dev-ml/merlin-extend/merlin-extend-0.6.ebuild5
-rw-r--r--dev-ml/merlin-extend/metadata.xml2
-rw-r--r--dev-ml/merlin/Manifest4
-rw-r--r--dev-ml/merlin/merlin-4.1-r2.ebuild11
-rw-r--r--dev-ml/merlin/merlin-4.2.ebuild83
-rw-r--r--dev-ml/merlin/merlin-4.3.1.ebuild84
-rw-r--r--dev-ml/merlin/metadata.xml2
-rw-r--r--dev-ml/metadata.xml2
-rw-r--r--dev-ml/mirage-clock/metadata.xml2
-rw-r--r--dev-ml/mmap/metadata.xml2
-rw-r--r--dev-ml/mtime/metadata.xml2
-rw-r--r--dev-ml/mtime/mtime-1.2.0.ebuild2
-rw-r--r--dev-ml/num/metadata.xml2
-rw-r--r--dev-ml/num/num-1.4-r2.ebuild (renamed from dev-ml/num/num-1.4-r1.ebuild)9
-rw-r--r--dev-ml/ocaml-augeas/metadata.xml2
-rw-r--r--dev-ml/ocaml-autoconf/metadata.xml2
-rw-r--r--dev-ml/ocaml-base64/metadata.xml2
-rw-r--r--dev-ml/ocaml-base64/ocaml-base64-3.5.0.ebuild2
-rw-r--r--dev-ml/ocaml-compiler-libs/Manifest1
-rw-r--r--dev-ml/ocaml-compiler-libs/metadata.xml2
-rw-r--r--dev-ml/ocaml-compiler-libs/ocaml-compiler-libs-0.12.3.ebuild2
-rw-r--r--dev-ml/ocaml-compiler-libs/ocaml-compiler-libs-0.12.4.ebuild15
-rw-r--r--dev-ml/ocaml-ctypes/metadata.xml2
-rw-r--r--dev-ml/ocaml-ctypes/ocaml-ctypes-0.19.1.ebuild2
-rw-r--r--dev-ml/ocaml-doc/metadata.xml2
-rw-r--r--dev-ml/ocaml-expat/metadata.xml2
-rw-r--r--dev-ml/ocaml-fileutils/metadata.xml2
-rw-r--r--dev-ml/ocaml-gettext-camomile/metadata.xml2
-rw-r--r--dev-ml/ocaml-gettext-stub/metadata.xml2
-rw-r--r--dev-ml/ocaml-gettext/metadata.xml2
-rw-r--r--dev-ml/ocaml-gettext/ocaml-gettext-0.3.7-r3.ebuild2
-rw-r--r--dev-ml/ocaml-hashcons/metadata.xml2
-rw-r--r--dev-ml/ocaml-migrate-parsetree/metadata.xml2
-rw-r--r--dev-ml/ocaml-migrate-parsetree/ocaml-migrate-parsetree-2.2.0.ebuild5
-rw-r--r--dev-ml/ocaml-sqlite3/metadata.xml2
-rw-r--r--dev-ml/ocaml-ssl/metadata.xml2
-rw-r--r--dev-ml/ocamlbuild/metadata.xml2
-rw-r--r--dev-ml/ocamlbuild/ocamlbuild-0.11.0.ebuild7
-rw-r--r--dev-ml/ocamlbuild/ocamlbuild-0.14.0-r1.ebuild7
-rw-r--r--dev-ml/ocamlgraph/metadata.xml2
-rw-r--r--dev-ml/ocamlnet/metadata.xml2
-rw-r--r--dev-ml/ocamlnet/ocamlnet-4.1.9.ebuild2
-rw-r--r--dev-ml/ocamlsdl/metadata.xml2
-rw-r--r--dev-ml/ocamlweb/metadata.xml2
-rw-r--r--dev-ml/ocamlweb/ocamlweb-1.41-r1.ebuild (renamed from dev-ml/ocamlweb/ocamlweb-1.41.ebuild)3
-rw-r--r--dev-ml/ocplib-endian/metadata.xml2
-rw-r--r--dev-ml/ocplib-simplex/metadata.xml2
-rw-r--r--dev-ml/octavius/metadata.xml2
-rw-r--r--dev-ml/ocurl/metadata.xml2
-rw-r--r--dev-ml/opam-client/Manifest2
-rw-r--r--dev-ml/opam-client/metadata.xml2
-rw-r--r--dev-ml/opam-client/opam-client-2.0.8-r1.ebuild2
-rw-r--r--dev-ml/opam-client/opam-client-2.0.8.ebuild1
-rw-r--r--dev-ml/opam-client/opam-client-2.1.0.ebuild40
-rw-r--r--dev-ml/opam-core/Manifest2
-rw-r--r--dev-ml/opam-core/metadata.xml2
-rw-r--r--dev-ml/opam-core/opam-core-2.1.0.ebuild46
-rw-r--r--dev-ml/opam-file-format/metadata.xml2
-rw-r--r--dev-ml/opam-file-format/opam-file-format-2.1.3.ebuild2
-rw-r--r--dev-ml/opam-format/Manifest2
-rw-r--r--dev-ml/opam-format/metadata.xml2
-rw-r--r--dev-ml/opam-format/opam-format-2.0.8-r2.ebuild1
-rw-r--r--dev-ml/opam-format/opam-format-2.0.8-r3.ebuild2
-rw-r--r--dev-ml/opam-format/opam-format-2.1.0.ebuild42
-rw-r--r--dev-ml/opam-installer/Manifest2
-rw-r--r--dev-ml/opam-installer/metadata.xml2
-rw-r--r--dev-ml/opam-installer/opam-installer-2.0.8-r2.ebuild2
-rw-r--r--dev-ml/opam-installer/opam-installer-2.0.8-r3.ebuild2
-rw-r--r--dev-ml/opam-installer/opam-installer-2.1.0.ebuild40
-rw-r--r--dev-ml/opam-repository/Manifest2
-rw-r--r--dev-ml/opam-repository/metadata.xml2
-rw-r--r--dev-ml/opam-repository/opam-repository-2.0.8-r1.ebuild2
-rw-r--r--dev-ml/opam-repository/opam-repository-2.0.8.ebuild1
-rw-r--r--dev-ml/opam-repository/opam-repository-2.1.0.ebuild39
-rw-r--r--dev-ml/opam-solver/Manifest2
-rw-r--r--dev-ml/opam-solver/metadata.xml2
-rw-r--r--dev-ml/opam-solver/opam-solver-2.0.8-r1.ebuild2
-rw-r--r--dev-ml/opam-solver/opam-solver-2.1.0.ebuild42
-rw-r--r--dev-ml/opam-state/Manifest2
-rw-r--r--dev-ml/opam-state/metadata.xml2
-rw-r--r--dev-ml/opam-state/opam-state-2.0.8-r1.ebuild2
-rw-r--r--dev-ml/opam-state/opam-state-2.0.8.ebuild1
-rw-r--r--dev-ml/opam-state/opam-state-2.1.0.ebuild38
-rw-r--r--dev-ml/opam/Manifest3
-rw-r--r--dev-ml/opam/metadata.xml2
-rw-r--r--dev-ml/opam/opam-2.0.8-r1.ebuild1
-rw-r--r--dev-ml/opam/opam-2.0.8-r2.ebuild2
-rw-r--r--dev-ml/opam/opam-2.0.9.ebuild41
-rw-r--r--dev-ml/opam/opam-2.1.0.ebuild41
-rw-r--r--dev-ml/ounit2/metadata.xml2
-rw-r--r--dev-ml/parmap/metadata.xml2
-rw-r--r--dev-ml/parmap/parmap-1.2.3.ebuild2
-rw-r--r--dev-ml/parsexp/Manifest1
-rw-r--r--dev-ml/parsexp/metadata.xml2
-rw-r--r--dev-ml/parsexp/parsexp-0.14.0.ebuild2
-rw-r--r--dev-ml/parsexp/parsexp-0.14.1.ebuild21
-rw-r--r--dev-ml/patience_diff/metadata.xml7
-rw-r--r--dev-ml/pcre-ocaml/metadata.xml2
-rw-r--r--dev-ml/pcre-ocaml/pcre-ocaml-7.4.6-r2.ebuild (renamed from dev-ml/pcre-ocaml/pcre-ocaml-7.4.6-r1.ebuild)8
-rw-r--r--dev-ml/ppx_assert/files/ppx_assert-0.14.0-4.12.patch30
-rw-r--r--dev-ml/ppx_assert/metadata.xml6
-rw-r--r--dev-ml/ppx_assert/ppx_assert-0.14.0.ebuild2
-rw-r--r--dev-ml/ppx_base/metadata.xml2
-rw-r--r--dev-ml/ppx_bench/metadata.xml2
-rw-r--r--dev-ml/ppx_bin_prot/metadata.xml2
-rw-r--r--dev-ml/ppx_bin_prot/ppx_bin_prot-0.14.0.ebuild9
-rw-r--r--dev-ml/ppx_cold/metadata.xml2
-rw-r--r--dev-ml/ppx_compare/metadata.xml2
-rw-r--r--dev-ml/ppx_custom_printf/metadata.xml2
-rw-r--r--dev-ml/ppx_derivers/metadata.xml2
-rw-r--r--dev-ml/ppx_deriving/metadata.xml2
-rw-r--r--dev-ml/ppx_deriving/ppx_deriving-5.2.1.ebuild2
-rw-r--r--dev-ml/ppx_enumerate/metadata.xml2
-rw-r--r--dev-ml/ppx_expect/metadata.xml2
-rw-r--r--dev-ml/ppx_expect/ppx_expect-0.14.0.ebuild14
-rw-r--r--dev-ml/ppx_expect/ppx_expect-0.14.1.ebuild10
-rw-r--r--dev-ml/ppx_fail/metadata.xml2
-rw-r--r--dev-ml/ppx_fields_conv/metadata.xml2
-rw-r--r--dev-ml/ppx_fixed_literal/metadata.xml2
-rw-r--r--dev-ml/ppx_hash/metadata.xml2
-rw-r--r--dev-ml/ppx_here/metadata.xml2
-rw-r--r--dev-ml/ppx_inline_test/metadata.xml2
-rw-r--r--dev-ml/ppx_jane/metadata.xml2
-rw-r--r--dev-ml/ppx_js_style/metadata.xml2
-rw-r--r--dev-ml/ppx_let/metadata.xml2
-rw-r--r--dev-ml/ppx_metaquot/metadata.xml2
-rw-r--r--dev-ml/ppx_module_timer/metadata.xml2
-rw-r--r--dev-ml/ppx_optcomp/Manifest1
-rw-r--r--dev-ml/ppx_optcomp/metadata.xml2
-rw-r--r--dev-ml/ppx_optcomp/ppx_optcomp-0.14.3.ebuild26
-rw-r--r--dev-ml/ppx_optional/metadata.xml2
-rw-r--r--dev-ml/ppx_pipebang/metadata.xml2
-rw-r--r--dev-ml/ppx_sexp_conv/metadata.xml2
-rw-r--r--dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.14.2-r1.ebuild (renamed from dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.14.2.ebuild)4
-rw-r--r--dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.14.3.ebuild2
-rw-r--r--dev-ml/ppx_sexp_message/metadata.xml2
-rw-r--r--dev-ml/ppx_sexp_value/metadata.xml2
-rw-r--r--dev-ml/ppx_stable/metadata.xml2
-rw-r--r--dev-ml/ppx_string/metadata.xml2
-rw-r--r--dev-ml/ppx_tools/Manifest1
-rw-r--r--dev-ml/ppx_tools/metadata.xml6
-rw-r--r--dev-ml/ppx_tools/ppx_tools-6.3.ebuild4
-rw-r--r--dev-ml/ppx_tools/ppx_tools-6.4.ebuild19
-rw-r--r--dev-ml/ppx_tools_versioned/metadata.xml2
-rw-r--r--dev-ml/ppx_typerep_conv/metadata.xml2
-rw-r--r--dev-ml/ppx_typerep_conv/ppx_typerep_conv-0.14.1-r1.ebuild (renamed from dev-ml/ppx_typerep_conv/ppx_typerep_conv-0.14.1.ebuild)2
-rw-r--r--dev-ml/ppx_typerep_conv/ppx_typerep_conv-0.14.2.ebuild2
-rw-r--r--dev-ml/ppx_variants_conv/files/ppx_variants_conv-0.14.1-ppxlib-0.23-compatibility.patch31
-rw-r--r--dev-ml/ppx_variants_conv/metadata.xml6
-rw-r--r--dev-ml/ppx_variants_conv/ppx_variants_conv-0.14.1-r1.ebuild29
-rw-r--r--dev-ml/ppxfind/metadata.xml2
-rw-r--r--dev-ml/ppxlib/Manifest1
-rw-r--r--dev-ml/ppxlib/files/ppxlib-0.23.0-fix-ocaml-4.13.patch23
-rw-r--r--dev-ml/ppxlib/metadata.xml2
-rw-r--r--dev-ml/ppxlib/ppxlib-0.18.0.ebuild10
-rw-r--r--dev-ml/ppxlib/ppxlib-0.20.0-r1.ebuild (renamed from dev-ml/ppxlib/ppxlib-0.20.0.ebuild)7
-rw-r--r--dev-ml/ppxlib/ppxlib-0.21.0-r3.ebuild (renamed from dev-ml/ppxlib/ppxlib-0.21.0-r1.ebuild)17
-rw-r--r--dev-ml/ppxlib/ppxlib-0.22.0-r3.ebuild (renamed from dev-ml/ppxlib/ppxlib-0.22.0-r1.ebuild)17
-rw-r--r--dev-ml/ppxlib/ppxlib-0.22.2-r2.ebuild47
-rw-r--r--dev-ml/ppxlib/ppxlib-0.23.0-r1.ebuild (renamed from dev-ml/ppxlib/ppxlib-0.22.2.ebuild)13
-rw-r--r--dev-ml/protocol_version_header/metadata.xml2
-rw-r--r--dev-ml/re/Manifest1
-rw-r--r--dev-ml/re/metadata.xml2
-rw-r--r--dev-ml/re/re-1.10.3.ebuild25
-rw-r--r--dev-ml/react/metadata.xml2
-rw-r--r--dev-ml/reactiveData/metadata.xml2
-rw-r--r--dev-ml/result/metadata.xml2
-rw-r--r--dev-ml/rresult/metadata.xml2
-rw-r--r--dev-ml/rresult/rresult-0.5.0.ebuild2
-rw-r--r--dev-ml/rresult/rresult-0.6.0.ebuild2
-rw-r--r--dev-ml/seq/metadata.xml2
-rw-r--r--dev-ml/seq/seq-0.2.2.ebuild2
-rw-r--r--dev-ml/sexplib/metadata.xml2
-rw-r--r--dev-ml/sexplib0/metadata.xml2
-rw-r--r--dev-ml/spawn/metadata.xml2
-rw-r--r--dev-ml/splittable_random/metadata.xml2
-rw-r--r--dev-ml/stdio/metadata.xml2
-rw-r--r--dev-ml/stdlib-shims/metadata.xml2
-rw-r--r--dev-ml/stdlib-shims/stdlib-shims-0.2.0.ebuild2
-rw-r--r--dev-ml/stdlib-shims/stdlib-shims-0.3.0.ebuild2
-rw-r--r--dev-ml/textutils/metadata.xml2
-rw-r--r--dev-ml/time_now/metadata.xml2
-rw-r--r--dev-ml/timezone/metadata.xml2
-rw-r--r--dev-ml/topkg/metadata.xml2
-rw-r--r--dev-ml/typerep/metadata.xml2
-rw-r--r--dev-ml/uchar/metadata.xml2
-rw-r--r--dev-ml/unidecode/metadata.xml2
-rw-r--r--dev-ml/unidecode/unidecode-0.4.0.ebuild2
-rw-r--r--dev-ml/uucp/Manifest1
-rw-r--r--dev-ml/uucp/metadata.xml2
-rw-r--r--dev-ml/uucp/uucp-13.0.0-r2.ebuild2
-rw-r--r--dev-ml/uucp/uucp-14.0.0.ebuild28
-rw-r--r--dev-ml/uuidm/metadata.xml2
-rw-r--r--dev-ml/uunf/metadata.xml2
-rw-r--r--dev-ml/uunf/uunf-13.0.0-r1.ebuild (renamed from dev-ml/uunf/uunf-13.0.0.ebuild)12
-rw-r--r--dev-ml/uutf/metadata.xml2
-rw-r--r--dev-ml/uutf/uutf-1.0.1.ebuild2
-rw-r--r--dev-ml/uutf/uutf-1.0.2.ebuild4
-rw-r--r--dev-ml/variantslib/metadata.xml2
-rw-r--r--dev-ml/xml-light/metadata.xml2
-rw-r--r--dev-ml/yojson/metadata.xml2
-rw-r--r--dev-ml/zarith/Manifest1
-rw-r--r--dev-ml/zarith/metadata.xml2
-rw-r--r--dev-ml/zarith/zarith-1.11.ebuild58
-rw-r--r--dev-ml/zarith/zarith-1.12.ebuild5
340 files changed, 1938 insertions, 534 deletions
diff --git a/dev-ml/alcotest/alcotest-1.4.0.ebuild b/dev-ml/alcotest/alcotest-1.4.0.ebuild
index 0ca71621477e..5b7a4817580f 100644
--- a/dev-ml/alcotest/alcotest-1.4.0.ebuild
+++ b/dev-ml/alcotest/alcotest-1.4.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mirage/alcotest/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="ISC"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
IUSE="+ocamlopt"
RDEPEND="
diff --git a/dev-ml/alcotest/metadata.xml b/dev-ml/alcotest/metadata.xml
index 4bbe1ec66737..33063c514b9c 100644
--- a/dev-ml/alcotest/metadata.xml
+++ b/dev-ml/alcotest/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>ml@gentoo.org</email>
diff --git a/dev-ml/astring/metadata.xml b/dev-ml/astring/metadata.xml
index f6b0d38f281a..77058ca4dd9c 100644
--- a/dev-ml/astring/metadata.xml
+++ b/dev-ml/astring/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<upstream>
diff --git a/dev-ml/async/metadata.xml b/dev-ml/async/metadata.xml
index b5f6401a4539..22844762fd3f 100644
--- a/dev-ml/async/metadata.xml
+++ b/dev-ml/async/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<upstream>
diff --git a/dev-ml/async_extra/metadata.xml b/dev-ml/async_extra/metadata.xml
index b9222275c3a1..4f2433f3e01b 100644
--- a/dev-ml/async_extra/metadata.xml
+++ b/dev-ml/async_extra/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<upstream>
diff --git a/dev-ml/async_kernel/metadata.xml b/dev-ml/async_kernel/metadata.xml
index c8d693fb756d..84b93df47b35 100644
--- a/dev-ml/async_kernel/metadata.xml
+++ b/dev-ml/async_kernel/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>ML</name>
+ </maintainer>
<upstream>
<remote-id type="github">janestreet/async_kernel</remote-id>
</upstream>
diff --git a/dev-ml/async_rpc_kernel/metadata.xml b/dev-ml/async_rpc_kernel/metadata.xml
index 840191421805..11690b3c7d66 100644
--- a/dev-ml/async_rpc_kernel/metadata.xml
+++ b/dev-ml/async_rpc_kernel/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<upstream>
diff --git a/dev-ml/async_ssl/metadata.xml b/dev-ml/async_ssl/metadata.xml
index c800129a2d12..536c9f583769 100644
--- a/dev-ml/async_ssl/metadata.xml
+++ b/dev-ml/async_ssl/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<upstream>
diff --git a/dev-ml/async_unix/metadata.xml b/dev-ml/async_unix/metadata.xml
index d9a00265fb78..517a5e2afdfd 100644
--- a/dev-ml/async_unix/metadata.xml
+++ b/dev-ml/async_unix/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>ML</name>
+ </maintainer>
<upstream>
<remote-id type="github">janestreet/async_unix</remote-id>
</upstream>
diff --git a/dev-ml/base/base-0.14.0.ebuild b/dev-ml/base/base-0.14.0.ebuild
index c45143ed9c05..335aee9d07c6 100644
--- a/dev-ml/base/base-0.14.0.ebuild
+++ b/dev-ml/base/base-0.14.0.ebuild
@@ -15,6 +15,7 @@ KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
IUSE="+ocamlopt"
RDEPEND="
+ <dev-lang/ocaml-4.12
>=dev-ml/sexplib0-0.14.0:=
dev-ml/dune-configurator:=
"
diff --git a/dev-ml/base/metadata.xml b/dev-ml/base/metadata.xml
index 2d3d3fe848fd..105d3775caed 100644
--- a/dev-ml/base/metadata.xml
+++ b/dev-ml/base/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>gienah@gentoo.org</email>
diff --git a/dev-ml/base_bigstring/metadata.xml b/dev-ml/base_bigstring/metadata.xml
index 19d0dd1957af..9749d2e03e16 100644
--- a/dev-ml/base_bigstring/metadata.xml
+++ b/dev-ml/base_bigstring/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>ml@gentoo.org</email>
diff --git a/dev-ml/base_quickcheck/Manifest b/dev-ml/base_quickcheck/Manifest
index c6ba569c9cc2..7e2546e715c7 100644
--- a/dev-ml/base_quickcheck/Manifest
+++ b/dev-ml/base_quickcheck/Manifest
@@ -1 +1,2 @@
DIST base_quickcheck-0.14.0.tar.gz 66736 BLAKE2B eeaa92ec0eec4736be911128f46b8e4698034b2cb8afa131b31ee96a6edb5db0f28cfd611c101e4417305ee5a1babc2f869f4690b266218562a8fc50f5830acf SHA512 52333bee2591531665b8f8ad0fac1cdaa607b448d0a33b9b905cf98e00df5a700bf0a4ee3cdf3c06d7fcb2b5190363dd5908cc743b2854af9ce5c8d743e3fd58
+DIST base_quickcheck-0.14.1.tar.gz 66827 BLAKE2B 2a274fc0edab3daf7e3d671f7ea24912ecf273cf2b4cb4ab2bd74171a8848163526f97ed860b44aeaa9f3f3faabb22f4598bf604b33c8401733faa22ca7a3c93 SHA512 5d5a3a070a6903ffdd1e13754721d48a9df164f78bd569d3a18b3fd808354550e4603b76d5e48eaa6a4c4d3433f18bb29888478d640fde9ea004619448c3d7d0
diff --git a/dev-ml/base_quickcheck/base_quickcheck-0.14.0.ebuild b/dev-ml/base_quickcheck/base_quickcheck-0.14.0-r1.ebuild
index da316d2b46e8..22f5dc4817f2 100644
--- a/dev-ml/base_quickcheck/base_quickcheck-0.14.0.ebuild
+++ b/dev-ml/base_quickcheck/base_quickcheck-0.14.0-r1.ebuild
@@ -23,6 +23,7 @@ DEPEND="
>=dev-ml/ppx_sexp_value-0.14.0:=
dev-ml/splittable_random:=
>=dev-ml/ppxlib-0.18.0:=
+ <dev-ml/ppxlib-0.22.0:=
>=dev-ml/ocaml-migrate-parsetree-2.0.0:=
dev-ml/cinaps:=
"
diff --git a/dev-ml/base_quickcheck/base_quickcheck-0.14.1-r1.ebuild b/dev-ml/base_quickcheck/base_quickcheck-0.14.1-r1.ebuild
new file mode 100644
index 000000000000..7b0d4c531b9f
--- /dev/null
+++ b/dev-ml/base_quickcheck/base_quickcheck-0.14.1-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 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.22.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
index 7249c288755a..642560dc2cb2 100644
--- a/dev-ml/base_quickcheck/metadata.xml
+++ b/dev-ml/base_quickcheck/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>gienah@gentoo.org</email>
diff --git a/dev-ml/bigarray-compat/bigarray-compat-1.0.0.ebuild b/dev-ml/bigarray-compat/bigarray-compat-1.0.0.ebuild
index 3ffba6aed6fb..fbf62fa457b2 100644
--- a/dev-ml/bigarray-compat/bigarray-compat-1.0.0.ebuild
+++ b/dev-ml/bigarray-compat/bigarray-compat-1.0.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mirage/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="ISC"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
IUSE="+ocamlopt"
DEPEND=""
diff --git a/dev-ml/bigarray-compat/metadata.xml b/dev-ml/bigarray-compat/metadata.xml
index f38a6788956b..4e31b18af813 100644
--- a/dev-ml/bigarray-compat/metadata.xml
+++ b/dev-ml/bigarray-compat/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>ml@gentoo.org</email>
diff --git a/dev-ml/bin_prot/metadata.xml b/dev-ml/bin_prot/metadata.xml
index 506875a7ca56..e64fd5be8ef6 100644
--- a/dev-ml/bin_prot/metadata.xml
+++ b/dev-ml/bin_prot/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>gienah@gentoo.org</email>
diff --git a/dev-ml/biniou/metadata.xml b/dev-ml/biniou/metadata.xml
index 087765862406..6d36cfe8f79e 100644
--- a/dev-ml/biniou/metadata.xml
+++ b/dev-ml/biniou/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<name>François-Xavier Carton</name>
diff --git a/dev-ml/bos/bos-0.1.6.ebuild b/dev-ml/bos/bos-0.1.6.ebuild
index 3c9f713bc4d4..1c8791ab0f6b 100644
--- a/dev-ml/bos/bos-0.1.6.ebuild
+++ b/dev-ml/bos/bos-0.1.6.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://erratique.ch/software/bos/releases/${P}.tbz"
LICENSE="ISC"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-ml/bos/bos-0.2.0.ebuild b/dev-ml/bos/bos-0.2.0-r1.ebuild
index f1bcc15aeb1a..b4f383fa7696 100644
--- a/dev-ml/bos/bos-0.2.0.ebuild
+++ b/dev-ml/bos/bos-0.2.0-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://erratique.ch/software/bos/releases/${P}.tbz"
LICENSE="ISC"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~x86"
IUSE="test"
RESTRICT="!test? ( test )"
@@ -18,7 +18,7 @@ RDEPEND="dev-lang/ocaml:=
dev-ml/astring:=
dev-ml/fpath:=
dev-ml/fmt:=
- dev-ml/logs:="
+ dev-ml/logs:=[fmt]"
DEPEND="${RDEPEND}"
BDEPEND="dev-ml/findlib
dev-ml/ocamlbuild
diff --git a/dev-ml/bos/metadata.xml b/dev-ml/bos/metadata.xml
index e9a40f8fd223..f6f0b1476383 100644
--- a/dev-ml/bos/metadata.xml
+++ b/dev-ml/bos/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>ml@gentoo.org</email>
diff --git a/dev-ml/cairo2/cairo2-0.6.2.ebuild b/dev-ml/cairo2/cairo2-0.6.2.ebuild
index 812ac046545e..a24437297856 100644
--- a/dev-ml/cairo2/cairo2-0.6.2.ebuild
+++ b/dev-ml/cairo2/cairo2-0.6.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Chris00/ocaml-cairo/releases/download/${PV}/cairo2-$
LICENSE="LGPL-3"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
IUSE="+ocamlopt"
DEPEND="
diff --git a/dev-ml/cairo2/metadata.xml b/dev-ml/cairo2/metadata.xml
index 1474195572d8..ad3433b6f057 100644
--- a/dev-ml/cairo2/metadata.xml
+++ b/dev-ml/cairo2/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>ml@gentoo.org</email>
diff --git a/dev-ml/calendar/metadata.xml b/dev-ml/calendar/metadata.xml
index 6f49eba8f496..85e4ed814fa2 100644
--- a/dev-ml/calendar/metadata.xml
+++ b/dev-ml/calendar/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/dev-ml/calendars/calendars-1.0.0.ebuild b/dev-ml/calendars/calendars-1.0.0.ebuild
index 23b2fd6daec4..3b03bc654b4e 100644
--- a/dev-ml/calendars/calendars-1.0.0.ebuild
+++ b/dev-ml/calendars/calendars-1.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/geneweb/${PN}/archive/v${PV}.tar.gz
LICENSE="GPL-3"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="+ocamlopt test"
RESTRICT="!test? ( test )"
diff --git a/dev-ml/calendars/metadata.xml b/dev-ml/calendars/metadata.xml
index 78982c1e880f..eb6966491ecd 100644
--- a/dev-ml/calendars/metadata.xml
+++ b/dev-ml/calendars/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>ml@gentoo.org</email>
diff --git a/dev-ml/camlbz2/camlbz2-0.7.0.ebuild b/dev-ml/camlbz2/camlbz2-0.7.0.ebuild
index 774e2b6b2f7f..a406153daeb5 100644
--- a/dev-ml/camlbz2/camlbz2-0.7.0.ebuild
+++ b/dev-ml/camlbz2/camlbz2-0.7.0.ebuild
@@ -13,7 +13,6 @@ SRC_URI="https://gitlab.com/irill/camlbz2/-/archive/${PV}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0/${PV}"
KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
-IUSE="doc"
DEPEND="
app-arch/bzip2
@@ -21,9 +20,6 @@ DEPEND="
"
RDEPEND="${DEPEND}"
-DOCS=( ChangeLog README ROADMAP BUGS )
-HTML_DOCS=( doc/. )
-
src_prepare() {
default
@@ -40,5 +36,4 @@ src_compile() {
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 a4f6be63adba..0aa68b1689b9 100644
--- a/dev-ml/camlbz2/metadata.xml
+++ b/dev-ml/camlbz2/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>gienah@gentoo.org</email>
diff --git a/dev-ml/camldbm/metadata.xml b/dev-ml/camldbm/metadata.xml
index 9f27ba42c7de..ff5a0cd1ae3d 100644
--- a/dev-ml/camldbm/metadata.xml
+++ b/dev-ml/camldbm/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>ml@gentoo.org</email>
diff --git a/dev-ml/camlidl/metadata.xml b/dev-ml/camlidl/metadata.xml
index 1b2becffa26c..bef24d2c2337 100644
--- a/dev-ml/camlidl/metadata.xml
+++ b/dev-ml/camlidl/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/dev-ml/camlp4/Manifest b/dev-ml/camlp4/Manifest
index 05a69dfc98a1..2cfdd7888a13 100644
--- a/dev-ml/camlp4/Manifest
+++ b/dev-ml/camlp4/Manifest
@@ -3,3 +3,4 @@ DIST camlp4-4.09_p1.tar.gz 649702 BLAKE2B 2bf0fd0b4f22d21b9fa7e195a26f4dece56549
DIST camlp4-4.10_p1.tar.gz 650092 BLAKE2B d7a6221dba5f6ec6963fe35236c29f39b8ae8f928618b5a58f72e7b1cc1f50d716b110f9684150716b56784cf703c0d8fcbc1aad32aeab638faca9c1bf2d5b9e SHA512 7ae0e20053a43399daa4ee9b93b6f4dbebc3e17c5ee79d069c4903cdfb2bf1cfc7d6badecf92fcf62e97a5f85f3be6ed82a62eb2a311bf6398b2792eacf763d8
DIST camlp4-4.11_p1.tar.gz 650280 BLAKE2B 6fe46b49c1f2b2e5fc87fbbbdba3ccae795c555737495c298456b84f0dca79c750aa6e4ab2c23bbc7ba4724defdfb739e370f468a78658035474d2f3ad255995 SHA512 8e572602c1c465017a234565efa2249c935ba1ad3d399a6b264bfbec345958130a96311c79e437ac995e3ead9ff7b4f2d3fe6aa4a3a82431ae0cc6257a300f4c
DIST camlp4-4.12.tar.gz 650428 BLAKE2B 4957d3db73ec82fbac58dd95fa13c48f9f8480a70cd6bded43a00df0a182f9b9e31a43acef8264f9d940776667d10b0a5c46bded59ebf4a645719264628428fc SHA512 0a19bb596e47076a28a6bea62007f1d3b59c4d688075f6b723abaa205c555707feb4ea0624259994a4ba5251fdea9dc61cdc936dc13611b36937e755a4bc9b7b
+DIST camlp4-4.13.tar.gz 650642 BLAKE2B 5bf70b21f47eefe4631227d0d30fdd08ab965020026d0183fc94b9dbfd1eee45626afbe62bf9507b1a887217cf9245901d40f25cce9430155eb9ec1ddc577554 SHA512 d3307bd11b813540d126719c0afe7e75a7740d0851b272be9bd1a28e8b1ab1ed9a7576109000c8d6cee7ece7f777122aa83917a48147d42ed8f4d72994397819
diff --git a/dev-ml/camlp4/camlp4-4.05_p1-r1.ebuild b/dev-ml/camlp4/camlp4-4.05_p1-r1.ebuild
index 8133a505cfb0..7c3455031b75 100644
--- a/dev-ml/camlp4/camlp4-4.05_p1-r1.ebuild
+++ b/dev-ml/camlp4/camlp4-4.05_p1-r1.ebuild
@@ -15,10 +15,10 @@ SLOT="0/${PV}"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
IUSE="+ocamlopt"
-DEPEND="dev-lang/ocaml:0/$(ver_cut 1-2)[ocamlopt?]"
-RDEPEND="${DEPEND}"
-DEPEND="${DEPEND}
- dev-ml/ocamlbuild"
+RDEPEND="dev-lang/ocaml:0/$(ver_cut 1-2)[ocamlopt?]"
+DEPEND="${RDEPEND}
+ dev-ml/ocamlbuild
+ dev-ml/findlib:="
src_configure() {
./configure \
@@ -38,4 +38,9 @@ src_compile() {
src_install() {
emake DESTDIR="${D}" install install-META
dodoc CHANGES.md README.md
+
+ if has_version ">=dev-ml/findlib-1.9" ; then
+ # See bug #803275
+ rm "${ED}/usr/$(get_libdir)/ocaml/camlp4/META" || die
+ fi
}
diff --git a/dev-ml/camlp4/camlp4-4.09_p1.ebuild b/dev-ml/camlp4/camlp4-4.09_p1-r1.ebuild
index 80481b707c6d..4df4e6606fe2 100644
--- a/dev-ml/camlp4/camlp4-4.09_p1.ebuild
+++ b/dev-ml/camlp4/camlp4-4.09_p1-r1.ebuild
@@ -15,10 +15,10 @@ SLOT="0/${PV}"
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="+ocamlopt"
-DEPEND="dev-lang/ocaml:0/4.09[ocamlopt?]"
-RDEPEND="${DEPEND}"
-DEPEND="${DEPEND}
- dev-ml/ocamlbuild"
+RDEPEND="dev-lang/ocaml:0/4.09[ocamlopt?]"
+DEPEND="${RDEPEND}
+ dev-ml/ocamlbuild
+ dev-ml/findlib:="
S=${WORKDIR}/${P/_p/-}
PATCHES=( "${FILESDIR}/reload.patch" )
@@ -41,4 +41,9 @@ src_compile() {
src_install() {
emake DESTDIR="${D}" install install-META
dodoc CHANGES.md README.md
+
+ if has_version ">=dev-ml/findlib-1.9" ; then
+ # See bug #803275
+ rm "${ED}/usr/$(get_libdir)/ocaml/camlp4/META" || die
+ fi
}
diff --git a/dev-ml/camlp4/camlp4-4.10_p1-r1.ebuild b/dev-ml/camlp4/camlp4-4.10_p1-r2.ebuild
index d7ad1f1cfbb1..539fe3cd8554 100644
--- a/dev-ml/camlp4/camlp4-4.10_p1-r1.ebuild
+++ b/dev-ml/camlp4/camlp4-4.10_p1-r2.ebuild
@@ -15,10 +15,10 @@ SLOT="0/${PV}"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
IUSE="+ocamlopt"
-DEPEND="dev-lang/ocaml:0/$(ver_cut 1-2)[ocamlopt?]"
-RDEPEND="${DEPEND}"
-DEPEND="${DEPEND}
- dev-ml/ocamlbuild"
+RDEPEND="dev-lang/ocaml:0/$(ver_cut 1-2)[ocamlopt?]"
+DEPEND="${RDEPEND}
+ dev-ml/ocamlbuild
+ dev-ml/findlib:="
S=${WORKDIR}/${P/_p/-}
PATCHES=( "${FILESDIR}/reload.patch" )
@@ -41,4 +41,9 @@ src_compile() {
src_install() {
emake DESTDIR="${D}" install install-META
dodoc CHANGES.md README.md
+
+ if has_version ">=dev-ml/findlib-1.9" ; then
+ # See bug #803275
+ rm "${ED}/usr/$(get_libdir)/ocaml/camlp4/META" || die
+ fi
}
diff --git a/dev-ml/camlp4/camlp4-4.11_p1-r2.ebuild b/dev-ml/camlp4/camlp4-4.11_p1-r2.ebuild
new file mode 100644
index 000000000000..24d6b91a79bb
--- /dev/null
+++ b/dev-ml/camlp4/camlp4-4.11_p1-r2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 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"
+
+RDEPEND="dev-lang/ocaml:0/$(ver_cut 1-2)[ocamlopt?]"
+DEPEND="${RDEPEND}
+ dev-ml/ocamlbuild
+ dev-ml/findlib:="
+
+QA_FLAGS_IGNORED='.*'
+
+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
+
+ if has_version ">=dev-ml/findlib-1.9" ; then
+ # See bug #803275
+ rm "${ED}/usr/$(get_libdir)/ocaml/camlp4/META" || die
+ fi
+}
diff --git a/dev-ml/camlp4/camlp4-4.11_p1-r1.ebuild b/dev-ml/camlp4/camlp4-4.12-r1.ebuild
index 8162ce77f937..e159ddff977f 100644
--- a/dev-ml/camlp4/camlp4-4.11_p1-r1.ebuild
+++ b/dev-ml/camlp4/camlp4-4.12-r1.ebuild
@@ -15,10 +15,10 @@ SLOT="0/${PV}"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
IUSE="+ocamlopt"
-DEPEND="dev-lang/ocaml:0/$(ver_cut 1-2)[ocamlopt?]"
-RDEPEND="${DEPEND}"
-DEPEND="${DEPEND}
- dev-ml/ocamlbuild"
+RDEPEND="dev-lang/ocaml:0/$(ver_cut 1-2)[ocamlopt?]"
+DEPEND="${RDEPEND}
+ dev-ml/ocamlbuild
+ dev-ml/findlib:="
QA_FLAGS_IGNORED='.*'
@@ -43,4 +43,9 @@ src_compile() {
src_install() {
emake DESTDIR="${D}" install install-META
dodoc CHANGES.md README.md
+
+ if has_version ">=dev-ml/findlib-1.9" ; then
+ # See bug #803275
+ rm "${ED}/usr/$(get_libdir)/ocaml/camlp4/META" || die
+ fi
}
diff --git a/dev-ml/camlp4/camlp4-4.12.ebuild b/dev-ml/camlp4/camlp4-4.13-r1.ebuild
index 8162ce77f937..e159ddff977f 100644
--- a/dev-ml/camlp4/camlp4-4.12.ebuild
+++ b/dev-ml/camlp4/camlp4-4.13-r1.ebuild
@@ -15,10 +15,10 @@ SLOT="0/${PV}"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
IUSE="+ocamlopt"
-DEPEND="dev-lang/ocaml:0/$(ver_cut 1-2)[ocamlopt?]"
-RDEPEND="${DEPEND}"
-DEPEND="${DEPEND}
- dev-ml/ocamlbuild"
+RDEPEND="dev-lang/ocaml:0/$(ver_cut 1-2)[ocamlopt?]"
+DEPEND="${RDEPEND}
+ dev-ml/ocamlbuild
+ dev-ml/findlib:="
QA_FLAGS_IGNORED='.*'
@@ -43,4 +43,9 @@ src_compile() {
src_install() {
emake DESTDIR="${D}" install install-META
dodoc CHANGES.md README.md
+
+ if has_version ">=dev-ml/findlib-1.9" ; then
+ # See bug #803275
+ rm "${ED}/usr/$(get_libdir)/ocaml/camlp4/META" || die
+ fi
}
diff --git a/dev-ml/camlp4/metadata.xml b/dev-ml/camlp4/metadata.xml
index 110b0d3f8c84..6fc7b322fcdb 100644
--- a/dev-ml/camlp4/metadata.xml
+++ b/dev-ml/camlp4/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>ml@gentoo.org</email>
diff --git a/dev-ml/camlp5/Manifest b/dev-ml/camlp5/Manifest
index a8818df9974a..2e6e02fb6c36 100644
--- a/dev-ml/camlp5/Manifest
+++ b/dev-ml/camlp5/Manifest
@@ -3,4 +3,5 @@ DIST camlp5-7.12.tar.gz 1008350 BLAKE2B 8f390f6d617a6ef029462aa74ca4d80c0e2eb267
DIST camlp5-7.13.tar.gz 1031832 BLAKE2B 2afd7e269092d9c40f263e9ce92b3b9f66b0b3f0ae01da43e2094c6a919aa9f26790030f835b630547d51e7bb4a08e74ac8522e7f308864896fa0414370f8f2f SHA512 8ab94b951e6791be895c70e32b930e498229c9ba7bccc505a3e7c2a91ca12fe038b979b9d5822b43e9c74ee2bf552efa1af7a61f1d287100803efb540d5db8b2
DIST camlp5-7.14.tar.gz 1044110 BLAKE2B c9aa5be80df8d2c376fc41c157b2cd86658dbb90e1babd346b7681afd7453649c7f3682f95f238e51b74b3b3a7a2c5b5a854be892b30a7d1e3b62c3272f5442e SHA512 1b39949c532ca622b01a8e800aa1dcad34f1c944ffe580003642bd742dedc158f3ee54602f3b05f89c0e259525d7feed101b971ebd589449b6d56046389a5bf6
DIST camlp5-8.00.01.tar.gz 1321790 BLAKE2B df4403af56cd07f8e07745bdb73f698ddba24803cde22f11cfbeda425d4360f51be45a92b3f522c52a204f867bb3403dacebf20bfe463f6fd751901102ef2213 SHA512 f40e57845ac4a14cf260ddd9df616d12df09f67efaf6735e915598aee981721e8203bf9203fb83d08e34e43021c08003de64dbf3bdcd4d12fd079542fb7649aa
+DIST camlp5-8.00.02.tar.gz 1340114 BLAKE2B a251973253a729fd568f9a8410d43e963ca4879b7298186358293869bec0eabe79e97f819cd4af3c771490fbd4a7bd8cb1d47482f4fe699720b3577bad8536f4 SHA512 b9950cac70e77d62f147dc8edac0aef2a2bb563ca7bbc709dcf030e2536a0973188414c8612f8b2441a6e05c4d09579bc474974513bf0c59ad4702a46a0cc7f6
DIST camlp5-8.00.tar.gz 1321320 BLAKE2B 14957ea83e40f3e2f68c7cbbec1ab84325eba1057f38905a37f9516a99a009024ee0b463cf588880d23d94e710b027b835dd51153a429c8bda22be7fe95dc911 SHA512 6a0d19ced4d94cd3afebfbc373d344229c5faf088e8910dea32ed4dfa841dd9844c72849f8a6281e2bce55295665eae90391cf29d062a44b083761a9e04bce93
diff --git a/dev-ml/camlp5/camlp5-8.00.02.ebuild b/dev-ml/camlp5/camlp5-8.00.02.ebuild
new file mode 100644
index 000000000000..fe4e5ebe5766
--- /dev/null
+++ b/dev-ml/camlp5/camlp5-8.00.02.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 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${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-rel${PV}"
+
+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}"
+
+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() {
+ ulimit -s 11530000
+ emake out
+ if use ocamlopt; then
+ emake opt
+ emake opt.opt
+ fi
+}
+
+src_test() {
+ emake bootstrap
+}
+
+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/metadata.xml b/dev-ml/camlp5/metadata.xml
index a0efa42d1bbe..d938964beb0e 100644
--- a/dev-ml/camlp5/metadata.xml
+++ b/dev-ml/camlp5/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>ml@gentoo.org</email>
diff --git a/dev-ml/camlpdf/metadata.xml b/dev-ml/camlpdf/metadata.xml
index f338f6f42e76..fce9dcd784fb 100644
--- a/dev-ml/camlpdf/metadata.xml
+++ b/dev-ml/camlpdf/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<upstream>
diff --git a/dev-ml/camlzip/Manifest b/dev-ml/camlzip/Manifest
index 2cb16e028b34..d6e4ea7f08f8 100644
--- a/dev-ml/camlzip/Manifest
+++ b/dev-ml/camlzip/Manifest
@@ -1 +1,2 @@
DIST camlzip-1.10.tar.gz 27335 BLAKE2B bbf24953634278589395dd9fcedf1e3becce8dad1f380393dc3ac59589143e1685dc14085ef566e12fb751c6f1a333dd368795a5083b94a43b71e058e86489f3 SHA512 5c42e0d808230e3820b2e7ef34b544ca51a7bf0a484ce4e1c8b1e4966133196bb3ff7c3ca85b9c50050aca389316eb52f0335f6e2ad60c000594a33171b9a9a9
+DIST camlzip-1.11.tar.gz 28483 BLAKE2B b270e2a764547117d87a18f9ccca82891bc0dce182ea84f76b693acb34488ff25d8975154b843787554798bfd34c16dc6a25c431f8674c8c59eb2c195167c12b SHA512 4d69ef900437e66e00cd345497ec70f407f28cd8344ee5f2fad685d3bfe356924597d1854b752f2841b4007f96d6e0307cfae7e13cfb6f74951ae3eba5198a06
diff --git a/dev-ml/camlzip/camlzip-1.11.ebuild b/dev-ml/camlzip/camlzip-1.11.ebuild
new file mode 100644
index 000000000000..09d1e837bb67
--- /dev/null
+++ b/dev-ml/camlzip/camlzip-1.11.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit findlib
+
+DESCRIPTION="Compressed file access ML library (ZIP, GZIP and JAR)"
+HOMEPAGE="https://github.com/xavierleroy/camlzip"
+SRC_URI="https://github.com/xavierleroy/camlzip/archive/rel$(ver_rs 1- '').tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-rel$(ver_rs 1- '')"
+
+LICENSE="LGPL-2.1"
+SLOT="1/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+RDEPEND=">=dev-lang/ocaml-4.07:=[ocamlopt?]
+ >=sys-libs/zlib-1.1.3"
+DEPEND="${RDEPEND}"
+
+QA_FLAGS_IGNORED=(
+ "usr/lib.*/ocaml/stublibs/dllcamlzip.so"
+ "usr/lib.*/ocaml/zip/zip.cmxs"
+)
+
+src_compile() {
+ emake all
+
+ if use ocamlopt; then
+ emake allopt
+ fi
+}
+
+src_install() {
+ findlib_src_preinst
+
+ emake DESTDIR="${D}" install-findlib
+ dosym zip/libcamlzip.a /usr/$(get_libdir)/ocaml/libcamlzip.a
+
+ dodoc README.md Changes
+}
diff --git a/dev-ml/camlzip/metadata.xml b/dev-ml/camlzip/metadata.xml
index 5bec2e3de616..9e95733ad01b 100644
--- a/dev-ml/camlzip/metadata.xml
+++ b/dev-ml/camlzip/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>ml@gentoo.org</email>
diff --git a/dev-ml/camomile/metadata.xml b/dev-ml/camomile/metadata.xml
index 6a4596bff983..1e19ff097ea1 100644
--- a/dev-ml/camomile/metadata.xml
+++ b/dev-ml/camomile/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>ml@gentoo.org</email>
diff --git a/dev-ml/cinaps/cinaps-0.14.0.ebuild b/dev-ml/cinaps/cinaps-0.14.0.ebuild
index 300f13b069f1..891d83ba04c5 100644
--- a/dev-ml/cinaps/cinaps-0.14.0.ebuild
+++ b/dev-ml/cinaps/cinaps-0.14.0.ebuild
@@ -15,14 +15,12 @@ KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
IUSE="+ocamlopt test"
RESTRICT="!test? ( test )"
-DEPEND="
+RDEPEND="
dev-ml/findlib:=
dev-ml/re:=
"
-RDEPEND="${DEPEND}"
-BDEPEND=""
-DEPEND="${DEPEND}
+DEPEND="${RDEPEND}
test? (
dev-ml/ppx_jane
- )
+ )
"
diff --git a/dev-ml/cinaps/cinaps-0.15.1.ebuild b/dev-ml/cinaps/cinaps-0.15.1.ebuild
index beef48458589..52c200249b97 100644
--- a/dev-ml/cinaps/cinaps-0.15.1.ebuild
+++ b/dev-ml/cinaps/cinaps-0.15.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ocaml-ppx/cinaps/archive/v${PV}.tar.gz -> ${P}.tar.g
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
IUSE="+ocamlopt test"
RESTRICT="!test? ( test )"
diff --git a/dev-ml/cinaps/metadata.xml b/dev-ml/cinaps/metadata.xml
index 5009a28d6d44..c6b9383e0800 100644
--- a/dev-ml/cinaps/metadata.xml
+++ b/dev-ml/cinaps/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>ml@gentoo.org</email>
diff --git a/dev-ml/cmdliner/metadata.xml b/dev-ml/cmdliner/metadata.xml
index a4f6be63adba..0aa68b1689b9 100644
--- a/dev-ml/cmdliner/metadata.xml
+++ b/dev-ml/cmdliner/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>gienah@gentoo.org</email>
diff --git a/dev-ml/core/Manifest b/dev-ml/core/Manifest
index 82e5ecf49a8f..f0084c0cd37c 100644
--- a/dev-ml/core/Manifest
+++ b/dev-ml/core/Manifest
@@ -1 +1,2 @@
DIST core-0.14.0.tar.gz 361607 BLAKE2B 1602857bee142c23101380e6d54b6f8df1be8bb67e8f8baf7ca65c2f248d1ff9794e33d96cc58ca1f591b69e4a16b7873043549e01d38e2fc390c884d117d0a3 SHA512 fd3202c115ccda53aa32233f2eac223dcc3fb6272fd6327ea6aa5dcd3b7295936d86102640046c961a2af45d62aa3563a2701a2e0ef54f6cd2bfcb81609639f4
+DIST core-0.14.1.tar.gz 361679 BLAKE2B ca43016c760e620f9073defd84a07bacaa0557d42fd9a60d6c4c894187671526ae07e0b93d29bee961b3460e1b0ec5cb346cc711d583c71fde94a9bf9992bf7e SHA512 29482b1f611f2f15f11562bfed7f8a47d2926333601ed57867c8c134d4b10dbf2ba0309ceb6ae602fe8bca1e1f9324603dba37a5df3183cd0cb690104817ed3f
diff --git a/dev-ml/core/core-0.14.0-r3.ebuild b/dev-ml/core/core-0.14.0-r3.ebuild
index 1774dc183f88..59ff7c24b085 100644
--- a/dev-ml/core/core-0.14.0-r3.ebuild
+++ b/dev-ml/core/core-0.14.0-r3.ebuild
@@ -18,6 +18,7 @@ IUSE="+ocamlopt"
RESTRICT="test"
RDEPEND="
+ <dev-lang/ocaml-4.12
dev-ml/base:=
dev-ml/core_kernel:=
dev-ml/jst-config:=
diff --git a/dev-ml/core/core-0.14.1.ebuild b/dev-ml/core/core-0.14.1.ebuild
new file mode 100644
index 000000000000..360f559aa22d
--- /dev/null
+++ b/dev-ml/core/core-0.14.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Jane Street's alternative to the standard library"
+HOMEPAGE="https://github.com/janestreet/core"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+# TODO: Wants quickcheck_deprecated?
+RESTRICT="test"
+
+RDEPEND="
+ dev-ml/base:=
+ dev-ml/core_kernel:=
+ dev-ml/jst-config:=
+ dev-ml/ppx_jane:=
+ dev-ml/sexplib:=
+ dev-ml/spawn:=
+ dev-ml/stdio:=
+ dev-ml/timezone:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ml/core/metadata.xml b/dev-ml/core/metadata.xml
index 8957be334536..bf187579da70 100644
--- a/dev-ml/core/metadata.xml
+++ b/dev-ml/core/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>ml@gentoo.org</email>
diff --git a/dev-ml/core_bench/metadata.xml b/dev-ml/core_bench/metadata.xml
index 9a90d2fb326c..494cd343b1f5 100644
--- a/dev-ml/core_bench/metadata.xml
+++ b/dev-ml/core_bench/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>ml@gentoo.org</email>
diff --git a/dev-ml/core_kernel/Manifest b/dev-ml/core_kernel/Manifest
index 3224a8f054ef..2571279db940 100644
--- a/dev-ml/core_kernel/Manifest
+++ b/dev-ml/core_kernel/Manifest
@@ -1 +1,2 @@
DIST core_kernel-0.14.1.tar.gz 701832 BLAKE2B 0463641f8ab663f00dff59e1ac0b9693f15b71e4f9fa001b54d2449b8a18c8f618a7d7d3149084699d12d4c9834a20fcda6882549f4c69c219e3489ee1223dba SHA512 56488260fce8a066bba06efc349b4760c55d7d2fe38ed47dd7f37d0deb9ea05838a87713ec778df83d7805da5a54513a97d9e678640bb977bfd342bb748e7a33
+DIST core_kernel-0.14.2.tar.gz 701911 BLAKE2B e784d6d8f53df03ffb56075a43bdfc82d5099740c4eebdfdebe196cb3c97211b95892af18ab0f69b3143a873962fa74afe09a961ad851fb8eb4f30287e538157 SHA512 d0f719734d920d98c55ac7d1aa8ab5b3de7a3896f6cd8b1ffc5147c689f072361e79045a0b34c1f5359dbf492e612eabd613c4724fe60d45345c2944dcdcf6de
diff --git a/dev-ml/core_kernel/core_kernel-0.14.2.ebuild b/dev-ml/core_kernel/core_kernel-0.14.2.ebuild
new file mode 100644
index 000000000000..21ede2227bb8
--- /dev/null
+++ b/dev-ml/core_kernel/core_kernel-0.14.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="System-independent part of Core"
+HOMEPAGE="https://github.com/janestreet/core_kernel"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+# Wants quickcheck_deprecated for now
+RESTRICT="test"
+
+RDEPEND="
+ dev-lang/ocaml:=
+ dev-ml/base:=
+ dev-ml/base_bigstring:=
+ dev-ml/base_quickcheck:=
+ dev-ml/bin_prot:=
+ dev-ml/fieldslib:=
+ dev-ml/jane-street-headers:=
+ dev-ml/jst-config:=
+ dev-ml/ppx_assert:=
+ dev-ml/ppx_base:=
+ dev-ml/ppx_hash:=
+ dev-ml/ppx_inline_test:=
+ dev-ml/ppx_jane:=
+ dev-ml/ppx_sexp_conv:=
+ dev-ml/ppx_sexp_message:=
+ dev-ml/splittable_random:=
+ dev-ml/sexplib:=
+ dev-ml/stdio:=
+ dev-ml/time_now:=
+ dev-ml/typerep:=
+ dev-ml/variantslib:=
+ dev-ml/ocaml-migrate-parsetree:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ml/core_kernel/metadata.xml b/dev-ml/core_kernel/metadata.xml
index 04ce58761077..0af84898d98d 100644
--- a/dev-ml/core_kernel/metadata.xml
+++ b/dev-ml/core_kernel/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>ml@gentoo.org</email>
diff --git a/dev-ml/cppo/Manifest b/dev-ml/cppo/Manifest
index 6a2e3013087b..99782bdb1e77 100644
--- a/dev-ml/cppo/Manifest
+++ b/dev-ml/cppo/Manifest
@@ -1 +1,2 @@
DIST cppo-1.6.7.tar.gz 29032 BLAKE2B cc02666ca5fbc903cf6a749ee08f7fe34bad4604635084bbf964afdde66783c01e3d48d515eb42a5188189fef67ebe7cf79c0205c60537c9d1a8b14f453fd248 SHA512 fb2865b4004fe3f17d5893659fca90c01557cf6be789500c54b06ac8e0d097181c9f6437f178aae6d786b3f6b639859bc68400f4a7c59e7acd4f296cf8271a9d
+DIST cppo-1.6.8.tar.gz 29063 BLAKE2B 503c9dcc5f25cf69caa5057753ece9e107383a94d191a15f8056f7f417fa252147f2b2d3011493b80728aeca6979c0097e42b1d1af174784528959870366f5f9 SHA512 069bbe0ef09c03b0dc4b5795f909c3ef872fe99c6f1e6704a0fa97594b1570b3579226ec67fe11d696ccc349a4585055bbaf07c65eff423aa45af28abf38c858
diff --git a/dev-ml/cppo/cppo-1.6.8.ebuild b/dev-ml/cppo/cppo-1.6.8.ebuild
new file mode 100644
index 000000000000..2ceba92466f3
--- /dev/null
+++ b/dev-ml/cppo/cppo-1.6.8.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2021 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 afdbbf102335..f3d3dfc342da 100644
--- a/dev-ml/cppo/metadata.xml
+++ b/dev-ml/cppo/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>ml@gentoo.org</email>
diff --git a/dev-ml/cryptokit/metadata.xml b/dev-ml/cryptokit/metadata.xml
index 27cbaa2e3649..090898169d22 100644
--- a/dev-ml/cryptokit/metadata.xml
+++ b/dev-ml/cryptokit/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<upstream>
diff --git a/dev-ml/csexp/csexp-1.3.2-r1.ebuild b/dev-ml/csexp/csexp-1.3.2-r1.ebuild
index 3299c8a7c789..824799a6c309 100644
--- a/dev-ml/csexp/csexp-1.3.2-r1.ebuild
+++ b/dev-ml/csexp/csexp-1.3.2-r1.ebuild
@@ -15,11 +15,6 @@ KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
IUSE="+ocamlopt test"
RESTRICT="!test? ( test )"
-DEPEND="
- >=dev-ml/result-1.5:=[ocamlopt=]
-"
-RDEPEND="${DEPEND}"
-BDEPEND=""
-DEPEND="${DEPEND}
- test? ( dev-ml/ppx_expect )
-"
+RDEPEND=">=dev-ml/result-1.5:=[ocamlopt=]"
+DEPEND="${RDEPEND}
+ test? ( dev-ml/ppx_expect )"
diff --git a/dev-ml/csexp/csexp-1.5.1.ebuild b/dev-ml/csexp/csexp-1.5.1.ebuild
index 471655dd5cf4..824799a6c309 100644
--- a/dev-ml/csexp/csexp-1.5.1.ebuild
+++ b/dev-ml/csexp/csexp-1.5.1.ebuild
@@ -11,15 +11,10 @@ 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"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
IUSE="+ocamlopt test"
RESTRICT="!test? ( test )"
-DEPEND="
- >=dev-ml/result-1.5:=[ocamlopt=]
-"
-RDEPEND="${DEPEND}"
-BDEPEND=""
-DEPEND="${DEPEND}
- test? ( dev-ml/ppx_expect )
-"
+RDEPEND=">=dev-ml/result-1.5:=[ocamlopt=]"
+DEPEND="${RDEPEND}
+ test? ( dev-ml/ppx_expect )"
diff --git a/dev-ml/csexp/metadata.xml b/dev-ml/csexp/metadata.xml
index bf15c79305e0..61dd6e34a8cf 100644
--- a/dev-ml/csexp/metadata.xml
+++ b/dev-ml/csexp/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>ml@gentoo.org</email>
diff --git a/dev-ml/cstruct/Manifest b/dev-ml/cstruct/Manifest
deleted file mode 100644
index 0fe7a4ca8905..000000000000
--- a/dev-ml/cstruct/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST cstruct-v5.2.0.tbz 227195 BLAKE2B 21eb94d0bbfb6f633f37ed7d6db716f7011765219f98f437d1c4ba4778e5d71fce37db1523d5f940d784779dfae1cccda7c521c5b3a2f46048d136a069d1099e SHA512 4e8cb53801980dacb9c9153bada89557ffcd9afaac262592fe6243bec3e76d5d1cfe3babe133a9a32e35ed00d98a4b54d55403e8505cca6a1328be50fadb5f37
diff --git a/dev-ml/cstruct/cstruct-5.2.0.ebuild b/dev-ml/cstruct/cstruct-5.2.0.ebuild
deleted file mode 100644
index f2b874f5dceb..000000000000
--- a/dev-ml/cstruct/cstruct-5.2.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit dune
-
-MYP=${PN}-v${PV}
-
-DESCRIPTION="Map OCaml arrays onto C-like structs"
-HOMEPAGE="https://github.com/mirage/ocaml-cstruct https://mirage.io"
-SRC_URI="https://github.com/mirage/ocaml-${PN}/releases/download/v${PV}/${MYP}.tbz"
-
-LICENSE="ISC"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE="+ocamlopt"
-
-RDEPEND="dev-ml/async_unix:=
- dev-ml/bigarray-compat:=
- >=dev-ml/ppx_tools_versioned-5.4.0:="
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"/${MYP}
diff --git a/dev-ml/cstruct/metadata.xml b/dev-ml/cstruct/metadata.xml
deleted file mode 100644
index 3f974fc39b86..000000000000
--- a/dev-ml/cstruct/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>ml@gentoo.org</email>
- <name>ML</name>
- </maintainer>
- <upstream>
- <remote-id type="github">mirage/ocaml-cstruct</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-ml/cudf/cudf-0.9-r1.ebuild b/dev-ml/cudf/cudf-0.9-r2.ebuild
index 769436a427c4..dcde53347192 100644
--- a/dev-ml/cudf/cudf-0.9-r1.ebuild
+++ b/dev-ml/cudf/cudf-0.9-r2.ebuild
@@ -12,7 +12,7 @@ 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"
+IUSE="+ocamlopt llvm-libunwind test"
RESTRICT="!test? ( test )"
RDEPEND="
@@ -20,7 +20,8 @@ RDEPEND="
dev-ml/extlib:=
dev-ml/findlib:=
dev-libs/glib:2
- sys-libs/libunwind:=
+ llvm-libunwind? ( sys-libs/llvm-libunwind:= )
+ !llvm-libunwind? ( sys-libs/libunwind:= )
sys-libs/ncurses:=
"
DEPEND="${RDEPEND}
@@ -41,10 +42,10 @@ src_prepare() {
-e 's|make|$(MAKE)|g' \
Makefile || die
sed -i \
- -e 's|-lncurses|$(shell ${PKG_CONFIG} --libs ncurses glib-2.0 libunwind)|g' \
+ -e 's|-lncurses|$(shell ${PKG_CONFIG} --libs ncurses glib-2.0) -lunwind|g' \
c-lib/Makefile || die
sed -i \
- -e 's|-lcurses|$(shell ${PKG_CONFIG} --libs ncurses glib-2.0 libunwind)|g' \
+ -e 's|-lcurses|$(shell ${PKG_CONFIG} --libs ncurses glib-2.0) -lunwind|g' \
c-lib/Makefile.variants || die
tc-export CC PKG_CONFIG
diff --git a/dev-ml/cudf/metadata.xml b/dev-ml/cudf/metadata.xml
index e24f3283a006..c765c1971790 100644
--- a/dev-ml/cudf/metadata.xml
+++ b/dev-ml/cudf/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>ml@gentoo.org</email>
diff --git a/dev-ml/dose3/dose3-5.0.1_p16-r3.ebuild b/dev-ml/dose3/dose3-5.0.1_p16-r4.ebuild
index 8a2d9bb0eca3..fd0e74c8c652 100644
--- a/dev-ml/dose3/dose3-5.0.1_p16-r3.ebuild
+++ b/dev-ml/dose3/dose3-5.0.1_p16-r4.ebuild
@@ -39,7 +39,7 @@ RDEPEND="
rpm4? ( app-arch/rpm )
"
DEPEND="${RDEPEND}
- test? ( dev-python/pyyaml[libyaml] )
+ test? ( dev-python/pyyaml[libyaml(+)] )
"
# missing test data
diff --git a/dev-ml/dose3/dose3-6.0.1_p2.ebuild b/dev-ml/dose3/dose3-6.0.1_p2-r1.ebuild
index 717fe2ff2ee1..481f80ee4a29 100644
--- a/dev-ml/dose3/dose3-6.0.1_p2.ebuild
+++ b/dev-ml/dose3/dose3-6.0.1_p2-r1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}-$(ver_cut 1-3)"
LICENSE="LGPL-3"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
IUSE="+ocamlopt test"
BDEPEND="
@@ -35,7 +35,7 @@ RDEPEND="
app-arch/rpm
"
DEPEND="${RDEPEND}
- test? ( dev-python/pyyaml[libyaml] )
+ test? ( dev-python/pyyaml[libyaml(+)] )
"
# missing test data
diff --git a/dev-ml/dose3/dose3-6.1.ebuild b/dev-ml/dose3/dose3-6.1-r1.ebuild
index 4cb33909265c..bbef234541cc 100644
--- a/dev-ml/dose3/dose3-6.1.ebuild
+++ b/dev-ml/dose3/dose3-6.1-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}-$(ver_cut 1-3)"
LICENSE="LGPL-3"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ~ppc64 x86"
IUSE="+ocamlopt test"
BDEPEND="
@@ -34,7 +34,7 @@ RDEPEND="
app-arch/rpm
"
DEPEND="${RDEPEND}
- test? ( dev-python/pyyaml[libyaml] )
+ test? ( dev-python/pyyaml[libyaml(+)] )
"
# missing test data
diff --git a/dev-ml/dose3/metadata.xml b/dev-ml/dose3/metadata.xml
index 6a93d78a32ca..0c7983eb8f80 100644
--- a/dev-ml/dose3/metadata.xml
+++ b/dev-ml/dose3/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>ml@gentoo.org</email>
diff --git a/dev-ml/dune-configurator/Manifest b/dev-ml/dune-configurator/Manifest
index 614e62e968ee..730aae6dcc88 100644
--- a/dev-ml/dune-configurator/Manifest
+++ b/dev-ml/dune-configurator/Manifest
@@ -1,3 +1,4 @@
DIST dune-2.8.2.tar.gz 1369417 BLAKE2B d846d35675a18abc3ccc57a52574d81a8fb4f082d9935912f035061c1107b47be8752daeb9c49bb2af4877e419a6c8bc30f846db6d773cf5267d3d761272a872 SHA512 fcbe45ea59492517e0868bf1f801c2bd2f3b1b30234e36d789c33e7ee48bd724726beb211697f3820609bbc27923c8c37d7be89dcbd059558014743360f2d0b7
DIST dune-2.8.4.tar.gz 1372925 BLAKE2B 5b6d6738a0dc701d852e6cc59a1998f64c006d233f43a804b0b9b677a6eadda25aa20f52799c90910d361e4bc565636a50d218ad5d0a9927239adc5be36b3889 SHA512 13b36eb6a943f9513987a23dab467b2e449cc3a4de35227f8323c3c724b27f19daac500602141ab22a04579243333c8484ce27a7f73e46a72e796d30fb1c3253
DIST dune-2.9.0.tar.gz 1385143 BLAKE2B c973e4b2c5780a3e4902c31c030b2560fe5be313338a5188edc9b7ff97b63968baba267966d095076bed4f1527a8b8b5a0f980e74f53476d70ec53f20dc661a6 SHA512 1c3b64746b00215cd97b36c0f1c6e2416c9d15c795265634240e9da37e2c2fce02ab3c309a0cb967f9f20a5c6df14e943c3c2942c1a8f4743c3a19c699f4eb24
+DIST dune-2.9.1.tar.gz 1385381 BLAKE2B 27224f803547d02f7110dcfc486ef41f9a4586f6f862ef7f8bbf05cc1f3f6dc8ea03fca99c01842f4226ea3d08f4127daa0e5811dd46cc00f1b96ad7eaafe43d SHA512 4fcff34de4acc4429dd73864ca90e695d8ba436839fd679608f7db292e44be70c3db455a58f59477f2055f84ce497bfa8e90e485ed9536acad3c1b3be3d4be77
diff --git a/dev-ml/dune-configurator/dune-configurator-2.8.2-r1.ebuild b/dev-ml/dune-configurator/dune-configurator-2.8.2-r1.ebuild
index a4ac4db266dd..28997fac63b7 100644
--- a/dev-ml/dune-configurator/dune-configurator-2.8.2-r1.ebuild
+++ b/dev-ml/dune-configurator/dune-configurator-2.8.2-r1.ebuild
@@ -16,13 +16,12 @@ KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
IUSE="+ocamlopt test"
RESTRICT="!test? ( test )"
-DEPEND="
+RDEPEND="
~dev-ml/dune-private-libs-${PV}:=[ocamlopt=]
dev-ml/csexp:=[ocamlopt=]
dev-ml/result:=[ocamlopt=]
"
-RDEPEND="${DEPEND}"
-DEPEND="${DEPEND}
+DEPEND="${RDEPEND}
test? (
dev-ml/core_bench
dev-ml/menhir
diff --git a/dev-ml/dune-configurator/dune-configurator-2.8.4.ebuild b/dev-ml/dune-configurator/dune-configurator-2.8.4.ebuild
index 61ca3646a68e..d47c38cb2a82 100644
--- a/dev-ml/dune-configurator/dune-configurator-2.8.4.ebuild
+++ b/dev-ml/dune-configurator/dune-configurator-2.8.4.ebuild
@@ -16,13 +16,12 @@ KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
IUSE="+ocamlopt test"
RESTRICT="!test? ( test )"
-DEPEND="
+RDEPEND="
~dev-ml/dune-private-libs-${PV}:=[ocamlopt=]
dev-ml/csexp:=[ocamlopt=]
dev-ml/result:=[ocamlopt=]
"
-RDEPEND="${DEPEND}"
-DEPEND="${DEPEND}
+DEPEND="${RDEPEND}
test? (
dev-ml/core_bench
dev-ml/menhir
diff --git a/dev-ml/dune-configurator/dune-configurator-2.9.0.ebuild b/dev-ml/dune-configurator/dune-configurator-2.9.0.ebuild
index 87edcf4c3a33..a8a42765fa98 100644
--- a/dev-ml/dune-configurator/dune-configurator-2.9.0.ebuild
+++ b/dev-ml/dune-configurator/dune-configurator-2.9.0.ebuild
@@ -16,13 +16,12 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
IUSE="+ocamlopt test"
RESTRICT="!test? ( test )"
-DEPEND="
+RDEPEND="
~dev-ml/dune-private-libs-${PV}:=[ocamlopt=]
dev-ml/csexp:=[ocamlopt=]
dev-ml/result:=[ocamlopt=]
"
-RDEPEND="${DEPEND}"
-DEPEND="${DEPEND}
+DEPEND="${RDEPEND}
test? (
dev-ml/core_bench
dev-ml/menhir
diff --git a/dev-ml/dune-configurator/dune-configurator-2.9.1.ebuild b/dev-ml/dune-configurator/dune-configurator-2.9.1.ebuild
new file mode 100644
index 000000000000..a8a42765fa98
--- /dev/null
+++ b/dev-ml/dune-configurator/dune-configurator-2.9.1.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2021 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"
+S="${WORKDIR}/dune-${PV}"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ ~dev-ml/dune-private-libs-${PV}:=[ocamlopt=]
+ dev-ml/csexp:=[ocamlopt=]
+ dev-ml/result:=[ocamlopt=]
+"
+DEPEND="${RDEPEND}
+ test? (
+ dev-ml/core_bench
+ dev-ml/menhir
+ dev-ml/opam
+ dev-ml/ppx_expect
+ )
+"
+# TODO for test deps:
+# Add cram?
+# Add dev-ml/js_of_ocaml once dev-ml/ocaml-base64 is ported to Dune
+# Add coq?
+
+src_prepare() {
+ default
+
+ # Keep this list in sync with dev-ml/dune-private-libs
+ local bad_tests=(
+ # List of tests calling git, mercurial, etc
+ test/blackbox-tests/test-cases/dune-project-meta/main.t
+ test/blackbox-tests/test-cases/meta-template-version-bug.t
+ test/blackbox-tests/test-cases/subst/project-name-restriction.t
+ test/blackbox-tests/test-cases/subst/with-opam-file.t
+ test/blackbox-tests/test-cases/subst.t
+ test/blackbox-tests/test-cases/subst/unicode.t
+ test/blackbox-tests/test-cases/subst/from-project-file.t
+ test/blackbox-tests/test-cases/trace-file.t
+ otherlibs/build-info/test/run.t
+ test/expect-tests/vcs_tests.ml
+
+ # Strange failures, seemingly from newer versions of deps
+ test/blackbox-tests/test-cases/merlin/allow_approximate_merlin_warn.t
+ test/blackbox-tests/test-cases/merlin/merlin-tests.t
+ test/blackbox-tests/test-cases/merlin/github4125.t
+ test/blackbox-tests/test-cases/install-dry-run.t
+ test/blackbox-tests/test-cases/c-flags.t
+ test/blackbox-tests/test-cases/install-libdir.t
+ test/blackbox-tests/test-cases/dune-cache/trim.t
+
+ # Strange failures about opam not being initialised
+ test/blackbox-tests/test-cases/merlin/merlin-from-subdir.t
+ test/blackbox-tests/test-cases/merlin/symlinks.t
+ test/blackbox-tests/test-cases/merlin/src-dirs-of-deps.t
+ test/blackbox-tests/test-cases/merlin/per-module-pp.t
+ test/blackbox-tests/test-cases/merlin/server.t
+ test/blackbox-tests/test-cases/github1946.t
+ test/blackbox-tests/test-cases/github759.t
+
+ # Wants nodejs!
+ test/blackbox-tests/test-cases/jsoo/simple.t
+ test/blackbox-tests/test-cases/jsoo/inline-tests.t
+ test/blackbox-tests/test-cases/jsoo/github3622.t
+ # Wants js_of_ocaml (can't include yet b/c of ocaml-base64 porting)
+ test/blackbox-tests/test-cases/jsoo/explicit-js-mode-specified.t
+
+ # Wants coq which doesn't build for me right now
+ test/blackbox-tests/test-cases/coq/rec-module.t
+ test/blackbox-tests/test-cases/coq/compose-sub-theory.t
+ test/blackbox-tests/test-cases/coq/native-compose.t
+ test/blackbox-tests/test-cases/coq/base-unsound.t
+ test/blackbox-tests/test-cases/coq/base.t
+ test/blackbox-tests/test-cases/coq/native-single.t
+ test/blackbox-tests/test-cases/coq/compose-simple.t
+ test/blackbox-tests/test-cases/coq/ml-lib.t
+ test/blackbox-tests/test-cases/coq/extract.t
+ test/blackbox-tests/test-cases/coq/compose-plugin.t
+
+ # Unpackaged dependencies (a rabbit hole for now)
+ # utop -> lambda-term, zed
+ test/blackbox-tests/test-cases/utop/github3188.t
+ test/blackbox-tests/test-cases/utop/utop-simple.t
+ test/blackbox-tests/test-cases/utop/utop-default.t
+ test/blackbox-tests/test-cases/utop/utop-default-implementation.t
+ test/blackbox-tests/test-cases/utop/utop-ppx-rewriters.t
+ # ocamlformat
+ test/blackbox-tests/test-cases/formatting.t
+ # mdx
+ test/blackbox-tests/test-cases/mdx-stanza.t
+ # odoc
+ test/blackbox-tests/test-cases/odoc/odoc-simple.t
+ test/blackbox-tests/test-cases/odoc/odoc-package-mld-link.t
+ test/blackbox-tests/test-cases/odoc/multiple-private-libs.t
+ test/blackbox-tests/test-cases/odoc/odoc-unique-mlds.t
+ test/blackbox-tests/test-cases/odoc/github717-odoc-index.t
+ test/blackbox-tests/test-cases/odoc/warnings.t
+ )
+
+ rm -r ${bad_tests[@]} || die "Failed to remove broken/inappropriate tests"
+}
+
+src_configure() {
+ :
+}
diff --git a/dev-ml/dune-configurator/metadata.xml b/dev-ml/dune-configurator/metadata.xml
index bae8c45155b7..fc93c9f51f3a 100644
--- a/dev-ml/dune-configurator/metadata.xml
+++ b/dev-ml/dune-configurator/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>ml@gentoo.org</email>
diff --git a/dev-ml/dune-private-libs/Manifest b/dev-ml/dune-private-libs/Manifest
index 614e62e968ee..730aae6dcc88 100644
--- a/dev-ml/dune-private-libs/Manifest
+++ b/dev-ml/dune-private-libs/Manifest
@@ -1,3 +1,4 @@
DIST dune-2.8.2.tar.gz 1369417 BLAKE2B d846d35675a18abc3ccc57a52574d81a8fb4f082d9935912f035061c1107b47be8752daeb9c49bb2af4877e419a6c8bc30f846db6d773cf5267d3d761272a872 SHA512 fcbe45ea59492517e0868bf1f801c2bd2f3b1b30234e36d789c33e7ee48bd724726beb211697f3820609bbc27923c8c37d7be89dcbd059558014743360f2d0b7
DIST dune-2.8.4.tar.gz 1372925 BLAKE2B 5b6d6738a0dc701d852e6cc59a1998f64c006d233f43a804b0b9b677a6eadda25aa20f52799c90910d361e4bc565636a50d218ad5d0a9927239adc5be36b3889 SHA512 13b36eb6a943f9513987a23dab467b2e449cc3a4de35227f8323c3c724b27f19daac500602141ab22a04579243333c8484ce27a7f73e46a72e796d30fb1c3253
DIST dune-2.9.0.tar.gz 1385143 BLAKE2B c973e4b2c5780a3e4902c31c030b2560fe5be313338a5188edc9b7ff97b63968baba267966d095076bed4f1527a8b8b5a0f980e74f53476d70ec53f20dc661a6 SHA512 1c3b64746b00215cd97b36c0f1c6e2416c9d15c795265634240e9da37e2c2fce02ab3c309a0cb967f9f20a5c6df14e943c3c2942c1a8f4743c3a19c699f4eb24
+DIST dune-2.9.1.tar.gz 1385381 BLAKE2B 27224f803547d02f7110dcfc486ef41f9a4586f6f862ef7f8bbf05cc1f3f6dc8ea03fca99c01842f4226ea3d08f4127daa0e5811dd46cc00f1b96ad7eaafe43d SHA512 4fcff34de4acc4429dd73864ca90e695d8ba436839fd679608f7db292e44be70c3db455a58f59477f2055f84ce497bfa8e90e485ed9536acad3c1b3be3d4be77
diff --git a/dev-ml/dune-private-libs/dune-private-libs-2.9.1.ebuild b/dev-ml/dune-private-libs/dune-private-libs-2.9.1.ebuild
new file mode 100644
index 000000000000..7b6b59feb352
--- /dev/null
+++ b/dev-ml/dune-private-libs/dune-private-libs-2.9.1.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2021 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"
+S="${WORKDIR}/dune-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+ ~dev-ml/dune-${PV}
+ test? (
+ dev-ml/core_bench
+ dev-ml/menhir
+ dev-ml/opam
+ dev-ml/ppx_expect
+ )
+"
+DEPEND="
+ dev-ml/csexp:=[ocamlopt=]
+ dev-ml/findlib:=[ocamlopt=]
+ >=dev-lang/ocaml-4.09:=
+"
+RDEPEND="${DEPEND}"
+
+# TODO for test deps:
+# Add cram?
+# Add dev-ml/js_of_ocaml once dev-ml/ocaml-base64 is ported to Dune
+# Add coq?
+
+src_prepare() {
+ default
+
+ # Keep this list in sync with dev-ml/dune-configurator
+ local bad_tests=(
+ # List of tests calling git, mercurial, etc
+ test/blackbox-tests/test-cases/dune-project-meta/main.t
+ test/blackbox-tests/test-cases/meta-template-version-bug.t
+ test/blackbox-tests/test-cases/subst/project-name-restriction.t
+ test/blackbox-tests/test-cases/subst/with-opam-file.t
+ test/blackbox-tests/test-cases/subst.t
+ test/blackbox-tests/test-cases/subst/unicode.t
+ test/blackbox-tests/test-cases/subst/from-project-file.t
+ test/blackbox-tests/test-cases/trace-file.t
+ otherlibs/build-info/test/run.t
+ test/expect-tests/vcs_tests.ml
+
+ # Strange failures, seemingly from newer versions of deps
+ test/blackbox-tests/test-cases/merlin/allow_approximate_merlin_warn.t
+ test/blackbox-tests/test-cases/merlin/merlin-tests.t
+ test/blackbox-tests/test-cases/merlin/github4125.t
+ test/blackbox-tests/test-cases/install-dry-run.t
+ test/blackbox-tests/test-cases/c-flags.t
+ test/blackbox-tests/test-cases/install-libdir.t
+ test/blackbox-tests/test-cases/dune-cache/trim.t
+
+ # Strange failures about opam not being initialised
+ test/blackbox-tests/test-cases/merlin/merlin-from-subdir.t
+ test/blackbox-tests/test-cases/merlin/symlinks.t
+ test/blackbox-tests/test-cases/merlin/src-dirs-of-deps.t
+ test/blackbox-tests/test-cases/merlin/per-module-pp.t
+ test/blackbox-tests/test-cases/merlin/server.t
+ test/blackbox-tests/test-cases/github1946.t
+ test/blackbox-tests/test-cases/github759.t
+
+ # Wants nodejs!
+ test/blackbox-tests/test-cases/jsoo/simple.t
+ test/blackbox-tests/test-cases/jsoo/inline-tests.t
+ test/blackbox-tests/test-cases/jsoo/github3622.t
+ # Wants js_of_ocaml (can't include yet b/c of ocaml-base64 porting)
+ test/blackbox-tests/test-cases/jsoo/explicit-js-mode-specified.t
+
+ # Wants coq which doesn't build for me right now
+ test/blackbox-tests/test-cases/coq/rec-module.t
+ test/blackbox-tests/test-cases/coq/compose-sub-theory.t
+ test/blackbox-tests/test-cases/coq/native-compose.t
+ test/blackbox-tests/test-cases/coq/base-unsound.t
+ test/blackbox-tests/test-cases/coq/base.t
+ test/blackbox-tests/test-cases/coq/native-single.t
+ test/blackbox-tests/test-cases/coq/compose-simple.t
+ test/blackbox-tests/test-cases/coq/ml-lib.t
+ test/blackbox-tests/test-cases/coq/extract.t
+ test/blackbox-tests/test-cases/coq/compose-plugin.t
+
+ # Unpackaged dependencies (a rabbit hole for now)
+ # utop -> lambda-term, zed
+ test/blackbox-tests/test-cases/utop/github3188.t
+ test/blackbox-tests/test-cases/utop/utop-simple.t
+ test/blackbox-tests/test-cases/utop/utop-default.t
+ test/blackbox-tests/test-cases/utop/utop-default-implementation.t
+ test/blackbox-tests/test-cases/utop/utop-ppx-rewriters.t
+ # ocamlformat
+ test/blackbox-tests/test-cases/formatting.t
+ # mdx
+ test/blackbox-tests/test-cases/mdx-stanza.t
+ # odoc
+ test/blackbox-tests/test-cases/odoc/odoc-simple.t
+ test/blackbox-tests/test-cases/odoc/odoc-package-mld-link.t
+ test/blackbox-tests/test-cases/odoc/multiple-private-libs.t
+ test/blackbox-tests/test-cases/odoc/odoc-unique-mlds.t
+ test/blackbox-tests/test-cases/odoc/github717-odoc-index.t
+ test/blackbox-tests/test-cases/odoc/warnings.t
+ )
+
+ rm -r ${bad_tests[@]} || die "Failed to remove broken/inappropriate tests"
+}
+
+src_configure() {
+ :
+}
diff --git a/dev-ml/dune-private-libs/metadata.xml b/dev-ml/dune-private-libs/metadata.xml
index bae8c45155b7..fc93c9f51f3a 100644
--- a/dev-ml/dune-private-libs/metadata.xml
+++ b/dev-ml/dune-private-libs/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>ml@gentoo.org</email>
diff --git a/dev-ml/dune/Manifest b/dev-ml/dune/Manifest
index 30f281ba25cd..0170ea58709a 100644
--- a/dev-ml/dune/Manifest
+++ b/dev-ml/dune/Manifest
@@ -4,3 +4,4 @@ DIST dune-2.7.1.tar.gz 1290915 BLAKE2B 85a2dee92d1ead03b43b80742c291f4470dd9e1d8
DIST dune-2.8.2.tar.gz 1369417 BLAKE2B d846d35675a18abc3ccc57a52574d81a8fb4f082d9935912f035061c1107b47be8752daeb9c49bb2af4877e419a6c8bc30f846db6d773cf5267d3d761272a872 SHA512 fcbe45ea59492517e0868bf1f801c2bd2f3b1b30234e36d789c33e7ee48bd724726beb211697f3820609bbc27923c8c37d7be89dcbd059558014743360f2d0b7
DIST dune-2.8.4.tar.gz 1372925 BLAKE2B 5b6d6738a0dc701d852e6cc59a1998f64c006d233f43a804b0b9b677a6eadda25aa20f52799c90910d361e4bc565636a50d218ad5d0a9927239adc5be36b3889 SHA512 13b36eb6a943f9513987a23dab467b2e449cc3a4de35227f8323c3c724b27f19daac500602141ab22a04579243333c8484ce27a7f73e46a72e796d30fb1c3253
DIST dune-2.9.0.tar.gz 1385143 BLAKE2B c973e4b2c5780a3e4902c31c030b2560fe5be313338a5188edc9b7ff97b63968baba267966d095076bed4f1527a8b8b5a0f980e74f53476d70ec53f20dc661a6 SHA512 1c3b64746b00215cd97b36c0f1c6e2416c9d15c795265634240e9da37e2c2fce02ab3c309a0cb967f9f20a5c6df14e943c3c2942c1a8f4743c3a19c699f4eb24
+DIST dune-2.9.1.tar.gz 1385381 BLAKE2B 27224f803547d02f7110dcfc486ef41f9a4586f6f862ef7f8bbf05cc1f3f6dc8ea03fca99c01842f4226ea3d08f4127daa0e5811dd46cc00f1b96ad7eaafe43d SHA512 4fcff34de4acc4429dd73864ca90e695d8ba436839fd679608f7db292e44be70c3db455a58f59477f2055f84ce497bfa8e90e485ed9536acad3c1b3be3d4be77
diff --git a/dev-ml/dune/dune-2.9.1.ebuild b/dev-ml/dune/dune-2.9.1.ebuild
new file mode 100644
index 000000000000..93856341506f
--- /dev/null
+++ b/dev-ml/dune/dune-2.9.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 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="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=dev-lang/ocaml-4.08:=
+ !dev-ml/jbuilder
+"
+DEPEND="
+ ${RDEPEND}
+ dev-ml/findlib
+ test? (
+ dev-ml/core_bench
+ dev-ml/ppx_bench
+ dev-ml/ppx_expect
+ )
+"
+
+QA_FLAGS_IGNORED="usr/bin/dune"
+
+src_configure() {
+ :
+}
+
+src_compile() {
+ ocaml bootstrap.ml || die
+ ./dune.exe build -p "${PN}" --profile dune-bootstrap -j $(makeopts_jobs) || die
+}
+
+src_install() {
+ default
+ mv "${ED}"/usr/doc "${ED}"/usr/share/doc/${PF} || die
+ mv "${ED}"/usr/man "${ED}"/usr/share/man || die
+}
diff --git a/dev-ml/dune/metadata.xml b/dev-ml/dune/metadata.xml
index bae8c45155b7..fc93c9f51f3a 100644
--- a/dev-ml/dune/metadata.xml
+++ b/dev-ml/dune/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>ml@gentoo.org</email>
diff --git a/dev-ml/duration/metadata.xml b/dev-ml/duration/metadata.xml
index b73d0d4e9531..68075586e3a6 100644
--- a/dev-ml/duration/metadata.xml
+++ b/dev-ml/duration/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<upstream>
diff --git a/dev-ml/easy-format/metadata.xml b/dev-ml/easy-format/metadata.xml
index 8dc07cfbef83..3e9b5df74698 100644
--- a/dev-ml/easy-format/metadata.xml
+++ b/dev-ml/easy-format/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<upstream>
diff --git a/dev-ml/extlib/extlib-1.7.8.ebuild b/dev-ml/extlib/extlib-1.7.8.ebuild
index 7061582188c4..78f973f346e5 100644
--- a/dev-ml/extlib/extlib-1.7.8.ebuild
+++ b/dev-ml/extlib/extlib-1.7.8.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/ocaml-${P}"
LICENSE="LGPL-2.1"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="doc +ocamlopt"
# See bug #704146
diff --git a/dev-ml/extlib/metadata.xml b/dev-ml/extlib/metadata.xml
index f36445f85327..a06e42eb98d7 100644
--- a/dev-ml/extlib/metadata.xml
+++ b/dev-ml/extlib/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>gienah@gentoo.org</email>
diff --git a/dev-ml/facile/facile-1.1.3.ebuild b/dev-ml/facile/facile-1.1.3.ebuild
index 06cb817ed4bc..2ae3f2c3be86 100644
--- a/dev-ml/facile/facile-1.1.3.ebuild
+++ b/dev-ml/facile/facile-1.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -18,8 +18,6 @@ DEPEND="${RDEPEND}
sys-apps/sed
"
-DOCS=( README )
-
PATCHES=( "${FILESDIR}/${PN}"-1.1-make.patch ) # Fix building on FreeBSD
src_prepare() {
@@ -35,11 +33,14 @@ src_prepare() {
-e 's:^.*facile\.cmxa::'\
-e 's:^.*facile\.a::' Makefile || die "failed to remove native code objects"
fi
+ sed -i \
+ -e 's|$(FACILE|$(DESTDIR)$(FACILE|g' \
+ Makefile || die
}
src_configure() {
# This is a custom configure script and it does not support standard options
- ./configure --faciledir "${D}"$(ocamlc -where)/facile/ || die
+ ./configure || die
}
src_test() {
@@ -48,6 +49,5 @@ src_test() {
src_install() {
dodir $(ocamlc -where)
- emake install
- einstalldocs
+ default
}
diff --git a/dev-ml/facile/metadata.xml b/dev-ml/facile/metadata.xml
index c3a9509486b8..6a07ccba4a46 100644
--- a/dev-ml/facile/metadata.xml
+++ b/dev-ml/facile/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>ml@gentoo.org</email>
diff --git a/dev-ml/fieldslib/metadata.xml b/dev-ml/fieldslib/metadata.xml
index 03041d90ca0d..202b19309b53 100644
--- a/dev-ml/fieldslib/metadata.xml
+++ b/dev-ml/fieldslib/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>gienah@gentoo.org</email>
diff --git a/dev-ml/findlib/metadata.xml b/dev-ml/findlib/metadata.xml
index 4e251464bf4c..15a5100c0fbb 100644
--- a/dev-ml/findlib/metadata.xml
+++ b/dev-ml/findlib/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>ml@gentoo.org</email>
diff --git a/dev-ml/fmt/metadata.xml b/dev-ml/fmt/metadata.xml
index d2d34c4dda8b..52bd8afcdc32 100644
--- a/dev-ml/fmt/metadata.xml
+++ b/dev-ml/fmt/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<upstream>
diff --git a/dev-ml/fpath/fpath-0.7.2.ebuild b/dev-ml/fpath/fpath-0.7.2.ebuild
index 7aded5cba303..c2909f3c6d01 100644
--- a/dev-ml/fpath/fpath-0.7.2.ebuild
+++ b/dev-ml/fpath/fpath-0.7.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://erratique.ch/software/fpath/releases/${P}.tbz"
LICENSE="ISC"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
IUSE=""
RDEPEND="
diff --git a/dev-ml/fpath/fpath-0.7.3.ebuild b/dev-ml/fpath/fpath-0.7.3.ebuild
index 13e85c27b103..6882f7558f4c 100644
--- a/dev-ml/fpath/fpath-0.7.3.ebuild
+++ b/dev-ml/fpath/fpath-0.7.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://erratique.ch/software/fpath/releases/${P}.tbz"
LICENSE="ISC"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~x86"
RDEPEND="dev-ml/result:=
dev-ml/astring:=
diff --git a/dev-ml/fpath/metadata.xml b/dev-ml/fpath/metadata.xml
index df3bd5289615..8e5dcf7722f4 100644
--- a/dev-ml/fpath/metadata.xml
+++ b/dev-ml/fpath/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>ml@gentoo.org</email>
diff --git a/dev-ml/graphics/graphics-5.1.2.ebuild b/dev-ml/graphics/graphics-5.1.2.ebuild
index 68860652dce7..7a3977c3a2ce 100644
--- a/dev-ml/graphics/graphics-5.1.2.ebuild
+++ b/dev-ml/graphics/graphics-5.1.2.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 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
RDEPEND="dev-ml/dune-configurator:=[ocamlopt?]
>=dev-lang/ocaml-4.09:=
diff --git a/dev-ml/graphics/metadata.xml b/dev-ml/graphics/metadata.xml
index 9f27ba42c7de..ff5a0cd1ae3d 100644
--- a/dev-ml/graphics/metadata.xml
+++ b/dev-ml/graphics/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>ml@gentoo.org</email>
diff --git a/dev-ml/gsl-ocaml/metadata.xml b/dev-ml/gsl-ocaml/metadata.xml
index d7d246046a4d..0412d9a480ac 100644
--- a/dev-ml/gsl-ocaml/metadata.xml
+++ b/dev-ml/gsl-ocaml/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/dev-ml/integers/metadata.xml b/dev-ml/integers/metadata.xml
index 7c1e38b98cec..b5afba098fd0 100644
--- a/dev-ml/integers/metadata.xml
+++ b/dev-ml/integers/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>gienah@gentoo.org</email>
diff --git a/dev-ml/jane-street-headers/metadata.xml b/dev-ml/jane-street-headers/metadata.xml
index c938bbaf6059..d94a2d2b18fa 100644
--- a/dev-ml/jane-street-headers/metadata.xml
+++ b/dev-ml/jane-street-headers/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>gienah@gentoo.org</email>
diff --git a/dev-ml/jingoo/jingoo-1.4.2.ebuild b/dev-ml/jingoo/jingoo-1.4.2.ebuild
index 21270b6af09c..7002d58653e8 100644
--- a/dev-ml/jingoo/jingoo-1.4.2.ebuild
+++ b/dev-ml/jingoo/jingoo-1.4.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/tategakibunko/${PN}/archive/v${PV}.tar.gz
LICENSE="ISC"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="+ocamlopt test"
RESTRICT="!test? ( test )"
diff --git a/dev-ml/jingoo/metadata.xml b/dev-ml/jingoo/metadata.xml
index 3789f3a63313..ea773c8ddc23 100644
--- a/dev-ml/jingoo/metadata.xml
+++ b/dev-ml/jingoo/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>ml@gentoo.org</email>
diff --git a/dev-ml/jsonm/metadata.xml b/dev-ml/jsonm/metadata.xml
index 6f49eba8f496..85e4ed814fa2 100644
--- a/dev-ml/jsonm/metadata.xml
+++ b/dev-ml/jsonm/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/dev-ml/jst-config/Manifest b/dev-ml/jst-config/Manifest
index cfc8c7df8140..9542f0b66b95 100644
--- a/dev-ml/jst-config/Manifest
+++ b/dev-ml/jst-config/Manifest
@@ -1 +1,2 @@
DIST jst-config-0.14.0.tar.gz 4916 BLAKE2B e052cf9aad6e7bef737cd39643663b4577cffe9b9a8e116a8f23ce8d92ebb172d8c66eb20976c319593c217d95de253b4b7f86c05616bf665061896989f0908c SHA512 9d76f3394490762aaef36a3fd3ced4769da05e5a62176bb215379f18a29eab5089e65f599a3a3621937a5a79fcbda22cecf189e8e290acffef5b565e1b4d3b58
+DIST jst-config-0.14.1.tar.gz 4931 BLAKE2B b24aefa5f4e0b76c3cfd1ecbb9ae7789891db8ade236f6071b814dc3d4be6d94ad39b2d0808ca81a633f2b7a31db18b530c73a7a0c43c65f4ddc8abe90adddd6 SHA512 0a43ba941c2915afb30b3cdc09c3c83e05d5b1367bf89aaa4b3adb72878c8435e07838bcf345452c25482d7621d2a7277b92328a2a8842ec172d4bf73005d9c2
diff --git a/dev-ml/jst-config/jst-config-0.14.1.ebuild b/dev-ml/jst-config/jst-config-0.14.1.ebuild
new file mode 100644
index 000000000000..17ae2234d2b2
--- /dev/null
+++ b/dev-ml/jst-config/jst-config-0.14.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 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
index 9695c81b0cf8..b755007bde8c 100644
--- a/dev-ml/jst-config/metadata.xml
+++ b/dev-ml/jst-config/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>gienah@gentoo.org</email>
diff --git a/dev-ml/lablgl/metadata.xml b/dev-ml/lablgl/metadata.xml
index 1b2becffa26c..bef24d2c2337 100644
--- a/dev-ml/lablgl/metadata.xml
+++ b/dev-ml/lablgl/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/dev-ml/lablgtk-sourceview/metadata.xml b/dev-ml/lablgtk-sourceview/metadata.xml
index 856df00497e6..a80d577d653e 100644
--- a/dev-ml/lablgtk-sourceview/metadata.xml
+++ b/dev-ml/lablgtk-sourceview/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>ml@gentoo.org</email>
diff --git a/dev-ml/lablgtk/metadata.xml b/dev-ml/lablgtk/metadata.xml
index b47954e05bc3..28432628ae4c 100644
--- a/dev-ml/lablgtk/metadata.xml
+++ b/dev-ml/lablgtk/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>ml@gentoo.org</email>
diff --git a/dev-ml/labltk/labltk-8.06.10.ebuild b/dev-ml/labltk/labltk-8.06.10.ebuild
index 6acd06b500f4..11b2200caa2d 100644
--- a/dev-ml/labltk/labltk-8.06.10.ebuild
+++ b/dev-ml/labltk/labltk-8.06.10.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 ~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:=
@@ -22,9 +22,14 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}/findlib.patch"
- "${FILESDIR}"/${P}-this-expression-has-type.patch
)
+src_prepare() {
+ has_version "dev-lang/ocaml:0/4.11" && \
+ eapply "${FILESDIR}"/${P}-this-expression-has-type.patch
+ default
+}
+
src_configure() {
./configure --use-findlib --verbose $(usex X "--tk-x11" "--tk-no-x11") || die "configure failed!"
}
diff --git a/dev-ml/labltk/metadata.xml b/dev-ml/labltk/metadata.xml
index 9f27ba42c7de..ff5a0cd1ae3d 100644
--- a/dev-ml/labltk/metadata.xml
+++ b/dev-ml/labltk/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>ml@gentoo.org</email>
diff --git a/dev-ml/llvm-ocaml/Manifest b/dev-ml/llvm-ocaml/Manifest
index 104b03477e7a..10303759a732 100644
--- a/dev-ml/llvm-ocaml/Manifest
+++ b/dev-ml/llvm-ocaml/Manifest
@@ -1,4 +1,4 @@
DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
-DIST llvmorg-12.0.0.tar.gz 134226215 BLAKE2B f9c3ba8c58571855caa4f206fd285c9b5be66672fb0814cb8bc0964a051f57f5d35013aa1e27cbda502652b37df1ec23474129109e76a42066847860db441dbe SHA512 0cff02155c5ac0d6db2b72d60d9819d5b5dd859663b45f721b1c7540239c2fceb1f57d9173f6870c49de851c242ed8e85c5c6d6577a1f8092a7c5dcd12513b26
DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
+DIST llvmorg-13.0.0.tar.gz 147270176 BLAKE2B 628f316b580e1edf3a58d4825b724df759e6ed2a4116802470c04562caefc392fa325c91f388036365a2e45a9595cca6d3557fab12984fc8bcfef29c9116d822 SHA512 8004c05d32b9720fb3391783621690c1df9bd1e97e72cbff9192ed88a84b0acd303b61432145fa917b5b5e548c8cee29b24ef8547dcc8677adf4816e7a8a0eb2
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-13.0.0.9999.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-13.0.0.9999.ebuild
index d082ba50ed27..d0039fc6ae95 100644
--- a/dev-ml/llvm-ocaml/llvm-ocaml-13.0.0.9999.ebuild
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-13.0.0.9999.ebuild
@@ -9,18 +9,10 @@ inherit cmake llvm llvm.org python-any-r1
DESCRIPTION="OCaml bindings for LLVM"
HOMEPAGE="https://llvm.org/"
-# Keep in sync with sys-devel/llvm
-ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC CSKY M68k 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_}" )
-
LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
SLOT="0/${PV}"
KEYWORDS=""
-IUSE="debug test ${ALL_LLVM_TARGETS[*]}"
-REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )"
+IUSE="debug test"
RESTRICT="!test? ( test )"
RDEPEND="
@@ -28,11 +20,6 @@ RDEPEND="
dev-ml/ocaml-ctypes:=
~sys-devel/llvm-${PV}:=[debug?]
!sys-devel/llvm[ocaml(-)]"
-for x in "${ALL_LLVM_TARGETS[@]}"; do
- RDEPEND+="
- ${x}? ( ~sys-devel/llvm-${PV}[${x}] )"
-done
-unset x
DEPEND="${RDEPEND}"
BDEPEND="
@@ -43,6 +30,7 @@ BDEPEND="
${PYTHON_DEPS}"
LLVM_COMPONENTS=( llvm )
+LLVM_USE_TARGETS=llvm
llvm.org_set_globals
pkg_setup() {
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-12.0.0.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-13.0.0.ebuild
index b88949c4b08d..6fb5f35078cf 100644
--- a/dev-ml/llvm-ocaml/llvm-ocaml-12.0.0.ebuild
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-13.0.0.ebuild
@@ -3,24 +3,16 @@
EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit cmake llvm llvm.org python-any-r1
DESCRIPTION="OCaml bindings for LLVM"
HOMEPAGE="https://llvm.org/"
-# Keep in sync with sys-devel/llvm
-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[@]}" )
-ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
-
LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
SLOT="0/${PV}"
KEYWORDS="~amd64 ~arm ~x86"
-IUSE="debug test ${ALL_LLVM_TARGETS[*]}"
-REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )"
+IUSE="debug test"
RESTRICT="!test? ( test )"
RDEPEND="
@@ -28,11 +20,6 @@ RDEPEND="
dev-ml/ocaml-ctypes:=
~sys-devel/llvm-${PV}:=[debug?]
!sys-devel/llvm[ocaml(-)]"
-for x in "${ALL_LLVM_TARGETS[@]}"; do
- RDEPEND+="
- ${x}? ( ~sys-devel/llvm-${PV}[${x}] )"
-done
-unset x
DEPEND="${RDEPEND}"
BDEPEND="
@@ -43,6 +30,7 @@ BDEPEND="
${PYTHON_DEPS}"
LLVM_COMPONENTS=( llvm )
+LLVM_USE_TARGETS=llvm
llvm.org_set_globals
pkg_setup() {
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-14.0.0.9999.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-14.0.0.9999.ebuild
index d082ba50ed27..d0039fc6ae95 100644
--- a/dev-ml/llvm-ocaml/llvm-ocaml-14.0.0.9999.ebuild
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-14.0.0.9999.ebuild
@@ -9,18 +9,10 @@ inherit cmake llvm llvm.org python-any-r1
DESCRIPTION="OCaml bindings for LLVM"
HOMEPAGE="https://llvm.org/"
-# Keep in sync with sys-devel/llvm
-ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC CSKY M68k 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_}" )
-
LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
SLOT="0/${PV}"
KEYWORDS=""
-IUSE="debug test ${ALL_LLVM_TARGETS[*]}"
-REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )"
+IUSE="debug test"
RESTRICT="!test? ( test )"
RDEPEND="
@@ -28,11 +20,6 @@ RDEPEND="
dev-ml/ocaml-ctypes:=
~sys-devel/llvm-${PV}:=[debug?]
!sys-devel/llvm[ocaml(-)]"
-for x in "${ALL_LLVM_TARGETS[@]}"; do
- RDEPEND+="
- ${x}? ( ~sys-devel/llvm-${PV}[${x}] )"
-done
-unset x
DEPEND="${RDEPEND}"
BDEPEND="
@@ -43,6 +30,7 @@ BDEPEND="
${PYTHON_DEPS}"
LLVM_COMPONENTS=( llvm )
+LLVM_USE_TARGETS=llvm
llvm.org_set_globals
pkg_setup() {
diff --git a/dev-ml/llvm-ocaml/metadata.xml b/dev-ml/llvm-ocaml/metadata.xml
index 89c4bdb96049..3ad9b7a7c0eb 100644
--- a/dev-ml/llvm-ocaml/metadata.xml
+++ b/dev-ml/llvm-ocaml/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>llvm@gentoo.org</email>
diff --git a/dev-ml/logs/metadata.xml b/dev-ml/logs/metadata.xml
index c409d1b308a9..42a0d1c20433 100644
--- a/dev-ml/logs/metadata.xml
+++ b/dev-ml/logs/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>ml@gentoo.org</email>
diff --git a/dev-ml/lwt/files/lwt-5.3.0-ocaml-4.12.patch b/dev-ml/lwt/files/lwt-5.3.0-ocaml-4.12.patch
new file mode 100644
index 000000000000..048e28d1d6bc
--- /dev/null
+++ b/dev-ml/lwt/files/lwt-5.3.0-ocaml-4.12.patch
@@ -0,0 +1,24 @@
+--- a/src/unix/lwt_unix.cppo.ml 2021-10-01 20:35:45.285987395 +0200
++++ b/src/unix/lwt_unix.cppo.ml 2021-10-01 20:36:19.570493202 +0200
+@@ -1819,6 +1819,9 @@
+ | SO_ACCEPTCONN
+ | TCP_NODELAY
+ | IPV6_ONLY
++#if OCAML_VERSION >= (4, 12, 0)
++ | SO_REUSEPORT
++#endif
+
+ type socket_int_option =
+ Unix.socket_int_option =
+--- a/src/unix/lwt_unix.cppo.mli 2021-10-01 20:33:57.558539065 +0200
++++ b/src/unix/lwt_unix.cppo.mli 2021-10-01 20:35:30.393202008 +0200
+@@ -1008,6 +1008,9 @@
+ | SO_ACCEPTCONN
+ | TCP_NODELAY
+ | IPV6_ONLY
++#if OCAML_VERSION >= (4, 12, 0)
++ | SO_REUSEPORT
++#endif
+
+ type socket_int_option =
+ Unix.socket_int_option =
diff --git a/dev-ml/lwt/lwt-5.3.0-r1.ebuild b/dev-ml/lwt/lwt-5.3.0-r1.ebuild
index b635eab67eb5..8e708c4359be 100644
--- a/dev-ml/lwt/lwt-5.3.0-r1.ebuild
+++ b/dev-ml/lwt/lwt-5.3.0-r1.ebuild
@@ -32,4 +32,5 @@ BDEPEND="
# backported from https://github.com/ocsigen/lwt/pull/807
PATCHES=(
"${FILESDIR}"/${PN}-5.3.0-ppxlib-0.18.0.patch
+ "${FILESDIR}"/${P}-ocaml-4.12.patch
)
diff --git a/dev-ml/lwt/metadata.xml b/dev-ml/lwt/metadata.xml
index 5b7d7469f26d..52dc9a8f7464 100644
--- a/dev-ml/lwt/metadata.xml
+++ b/dev-ml/lwt/metadata.xml
@@ -1,6 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>ML</name>
+ </maintainer>
<maintainer type="person">
<email>gienah@gentoo.org</email>
<name>Mark Wright</name>
diff --git a/dev-ml/lwt_ssl/metadata.xml b/dev-ml/lwt_ssl/metadata.xml
index 4320b69371ea..83c7d13d18c9 100644
--- a/dev-ml/lwt_ssl/metadata.xml
+++ b/dev-ml/lwt_ssl/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>ml@gentoo.org</email>
diff --git a/dev-ml/markup/markup-1.0.2.ebuild b/dev-ml/markup/markup-1.0.2.ebuild
index 65041afd6bac..9cf732cb7579 100644
--- a/dev-ml/markup/markup-1.0.2.ebuild
+++ b/dev-ml/markup/markup-1.0.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/aantron/markup.ml/archive/${PV}.tar.gz -> ${P}.tar.g
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
IUSE="+ocamlopt test"
RESTRICT="!test? ( test )"
diff --git a/dev-ml/markup/metadata.xml b/dev-ml/markup/metadata.xml
index 41afb4a0fa40..72955463219e 100644
--- a/dev-ml/markup/metadata.xml
+++ b/dev-ml/markup/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>ml@gentoo.org</email>
diff --git a/dev-ml/mccs/Manifest b/dev-ml/mccs/Manifest
index 978984dbf799..15f8de3c4fa9 100644
--- a/dev-ml/mccs/Manifest
+++ b/dev-ml/mccs/Manifest
@@ -1,2 +1 @@
-DIST mccs-1.1.11.tar.gz 1008163 BLAKE2B 49f173b99baa1acfd96f8ef873b664ba61dc9a770ad62873f956f017e3940737be74f5d5392d4043c9ade3e74e09d9c6b11c47af7755558b25f1f62e6ab80d84 SHA512 095393ca63fb591a833a7a37117a80a2e817b437bbcd655301b376f749a3756c8aff26b2fcdebfc5f68b9c30d8971a7ba057f610117516e3e85a3fe7bd3906d0
DIST mccs-1.1.13.tar.gz 1024449 BLAKE2B c653c7d0b5fb6f9ea8facd8bfab517d80c7ec8cfd1ca512d81b81760e1d21c6978696af1cac596f0b11014464851c0c32e3bb5c6f70d88ad1bb7ef0034b8ff7d SHA512 2c2bc3c0e82b53a0e20c2542704eba8e3a2a1884f31b1a0a0079dd22fc02be8a8a62e582bdbf501339be0e9d6824872d737087e0fe150073b29b374505de073d
diff --git a/dev-ml/mccs/mccs-1.1.11.ebuild b/dev-ml/mccs/mccs-1.1.11.ebuild
deleted file mode 100644
index 09637d8cbca7..000000000000
--- a/dev-ml/mccs/mccs-1.1.11.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 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/mccs-1.1.13.ebuild b/dev-ml/mccs/mccs-1.1.13.ebuild
index 13b947434b03..9c0417e9c5bc 100644
--- a/dev-ml/mccs/mccs-1.1.13.ebuild
+++ b/dev-ml/mccs/mccs-1.1.13.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}"/ocaml-${PN}-$(ver_rs 2 '-')
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
IUSE="+ocamlopt test"
RESTRICT="!test? ( test )"
diff --git a/dev-ml/mccs/metadata.xml b/dev-ml/mccs/metadata.xml
index cb477b7c6e26..5ccba8b16116 100644
--- a/dev-ml/mccs/metadata.xml
+++ b/dev-ml/mccs/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>gienah@gentoo.org</email>
diff --git a/dev-ml/menhir/menhir-20210419-r1.ebuild b/dev-ml/menhir/menhir-20210419-r1.ebuild
index eee8ab93b315..4c393d9c4ec6 100644
--- a/dev-ml/menhir/menhir-20210419-r1.ebuild
+++ b/dev-ml/menhir/menhir-20210419-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitlab.inria.fr/fpottier/${PN}/-/archive/${PV}/${P}.tar.gz"
LICENSE="GPL-2 LGPL-2-with-linking-exception"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
IUSE="+ocamlopt"
src_install() {
diff --git a/dev-ml/menhir/metadata.xml b/dev-ml/menhir/metadata.xml
index 9f27ba42c7de..ff5a0cd1ae3d 100644
--- a/dev-ml/menhir/metadata.xml
+++ b/dev-ml/menhir/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>ml@gentoo.org</email>
diff --git a/dev-ml/merlin-extend/merlin-extend-0.3-r1.ebuild b/dev-ml/merlin-extend/merlin-extend-0.3-r1.ebuild
index 049701ee3106..e4f2fb196f08 100644
--- a/dev-ml/merlin-extend/merlin-extend-0.3-r1.ebuild
+++ b/dev-ml/merlin-extend/merlin-extend-0.3-r1.ebuild
@@ -13,9 +13,8 @@ LICENSE="MIT"
SLOT="0/${PV}"
KEYWORDS="~amd64"
-DEPEND="dev-lang/ocaml:0/4.05"
-RDEPEND="${DEPEND}"
-DEPEND="${DEPEND}
+RDEPEND="dev-lang/ocaml:0/4.05"
+DEPEND="${RDEPEND}
dev-ml/cppo"
src_install() {
diff --git a/dev-ml/merlin-extend/merlin-extend-0.6.ebuild b/dev-ml/merlin-extend/merlin-extend-0.6.ebuild
index d1ed1442d2d0..8643e7059fd7 100644
--- a/dev-ml/merlin-extend/merlin-extend-0.6.ebuild
+++ b/dev-ml/merlin-extend/merlin-extend-0.6.ebuild
@@ -13,9 +13,8 @@ LICENSE="MIT"
SLOT="0/${PV}"
KEYWORDS="~amd64"
-DEPEND="dev-lang/ocaml:="
-RDEPEND="${DEPEND}"
-DEPEND="${DEPEND}
+RDEPEND="dev-lang/ocaml:="
+DEPEND="${RDEPEND}
dev-ml/cppo"
src_install() {
diff --git a/dev-ml/merlin-extend/metadata.xml b/dev-ml/merlin-extend/metadata.xml
index 2bb5f122ff9d..8a9aa7ffdc8f 100644
--- a/dev-ml/merlin-extend/metadata.xml
+++ b/dev-ml/merlin-extend/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>ml@gentoo.org</email>
diff --git a/dev-ml/merlin/Manifest b/dev-ml/merlin/Manifest
index 22bfea096e99..e46fef33184a 100644
--- a/dev-ml/merlin/Manifest
+++ b/dev-ml/merlin/Manifest
@@ -1,2 +1,6 @@
DIST merlin-3.4.2.tar.gz 11016272 BLAKE2B 6fa55423df7ae8f7a8056e90be630f148dd101194de1921605843caf805bd6c9694fa3fe5b8c2f8eff5d57d7d0e9d8653036b6165a49af655158925c7af87d2f SHA512 8225366ebf27ca656ca89fe00d5aec581487ae332aeab81568e7606eaf575648a7614d4d2de8e0757a4e69c6f4014fefa4574c95da13d42acb310c9dd58a468a
DIST merlin-4.1.tar.gz 2136082 BLAKE2B 3e7e1996611f0cefb3a33b2a78cd36b6e8b84d48bc48f46c45ba340c4be1b93b4a1876f8f4192e911c1c384c416ad7502ba3c7a2abb72eff01215f9fb26bfaf0 SHA512 f0f3ada007f8214b97a8557bddca87eded48ee01a8bb88aba6476e52881ead52d9f47e2666a9292b5c6a490e4cfdc7d8bb322e8489f78eaac7b0f80b6d1e87bc
+DIST merlin-4.2-411.tar.gz 1601588 BLAKE2B 348b48ccf2b209bb511450e4ba46ceb3639b1a5facd70bec4519369907e162e95575fa101aa1b79c56719927272a4feebf981692ea2bcb2299fc2c284833b1be SHA512 9ca8d3690621019b8213abcc1a32e1d754b93849f0bbd79bcab3a14915acc295eb60a7b68e997a75e777daaef83d5ca3e81944b7baf352dc4cce8480905ea2d7
+DIST merlin-4.2-ocaml-4.12.patch.gz 816740 BLAKE2B d96ab1059683799312fc8828e8a46bccaae9279b6d711eb7ed47b6e8631d80e09f236bf6f726bafb37ae243457df3220a9948f4f6de6da20c2a6c66a1edb8f3f SHA512 4eef08ac8a7f240596395d8460a4d3195c1483fb686aa7d5231d7ea28c9c6996196890f76feae951d2539ac7abc1f16ee3c453031e6d19af554ff27d67a63229
+DIST merlin-4.3.1-411.tar.gz 1626551 BLAKE2B c4340ff9b50c72208c4cb13d13e26f36463d7c257530d183a293eaaf3d86aaa71745d8154bb5c0e2149003b3cbe5a127fb6187e7bb7fa7024924fd239f981cfc SHA512 bcbba0c1bb1c84eef7becc4a537e1c2a4bd370a33333bfba1029c82fa8b1d9cdf367f98779fe3329286e418c41b06b49bfe796f5cf8058bcd189b4f33aad1abf
+DIST merlin-4.3.1-ocaml-4.12.patch.gz 818559 BLAKE2B accf65bd5d5798bafe2be022d685da8f829aa9a9c98784420d8a62646d80ab73d1e189e3601266e09eebd4732ae241e8d11dc9663adac3b03a555db663a6d649 SHA512 8823b6e30e49ab3cf35a78063066f01aa7dcbc9174d45b0fed94a3f50e388c35e7ac810c5548c57d7bcf9304b045c483080496865b011269913120a5509a1149
diff --git a/dev-ml/merlin/merlin-4.1-r2.ebuild b/dev-ml/merlin/merlin-4.1-r2.ebuild
index 70e3b0b53a56..1433cc088f65 100644
--- a/dev-ml/merlin/merlin-4.1-r2.ebuild
+++ b/dev-ml/merlin/merlin-4.1-r2.ebuild
@@ -13,7 +13,8 @@ SRC_URI="https://github.com/ocaml/merlin/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
KEYWORDS="~amd64"
-IUSE="emacs +ocamlopt"
+IUSE="emacs +ocamlopt test"
+RESTRICT="!test? ( test )"
RDEPEND="
dev-ml/csexp:=
@@ -26,7 +27,8 @@ RDEPEND="
app-emacs/company-mode
)
"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+ test? ( app-misc/jq )"
SITEFILE="50${PN}-gentoo.el"
@@ -35,10 +37,13 @@ src_prepare() {
# Handle installation via the eclass
rm emacs/dune || die
+
+ # rm failing test
+ rm -r tests/test-dirs/locate/context-detection/cd-mod_constr.t || die
}
src_compile() {
- dune_src_compile
+ dune build @install
if use emacs ; then
# Build the emacs integration
diff --git a/dev-ml/merlin/merlin-4.2.ebuild b/dev-ml/merlin/merlin-4.2.ebuild
new file mode 100644
index 000000000000..ba04028ea42c
--- /dev/null
+++ b/dev-ml/merlin/merlin-4.2.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# TODO: vim-plugin, although it's not clear how to make it work here
+inherit elisp-common dune
+
+DESCRIPTION="Context sensitive completion for OCaml in Vim and Emacs"
+HOMEPAGE="https://github.com/ocaml/merlin"
+SRC_URI="https://github.com/ocaml/merlin/archive/v${PV}-411.tar.gz -> ${P}-411.tar.gz
+ https://dev.gentoo.org/~tupone/distfiles/${P}-ocaml-4.12.patch.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="emacs +ocamlopt test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ dev-ml/csexp:=
+ dev-ml/yojson:=
+ dev-ml/menhir:=
+ || (
+ dev-lang/ocaml:0/4.11
+ dev-lang/ocaml:0/4.12
+ )
+ emacs? (
+ >=app-editors/emacs-23.1:*
+ app-emacs/auto-complete
+ app-emacs/company-mode
+ )
+"
+DEPEND="${RDEPEND}
+ test? ( app-misc/jq )"
+
+SITEFILE="50${PN}-gentoo.el"
+
+S="${WORKDIR}"/${P}-411
+
+src_prepare() {
+ has_version "dev-lang/ocaml:0/4.12" && \
+ eapply "${WORKDIR}"/${P}-ocaml-4.12.patch
+ default
+
+ # Handle installation via the eclass
+ rm emacs/dune || die
+
+ # rm failing test
+ rm -r tests/test-dirs/locate/context-detection/cd-mod_constr.t || die
+}
+
+src_compile() {
+ dune build @install
+
+ if use emacs ; then
+ # Build the emacs integration
+ cd emacs || die
+
+ # iedit isn't packaged yet
+ rm merlin-iedit.el || die
+
+ elisp-compile *.el
+ fi
+}
+
+src_install() {
+ dune_src_install
+
+ if use emacs ; then
+ cd "${S}/emacs" || die
+ elisp-install ${PN} *.el *.elc
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+ fi
+}
+
+pkg_postinst() {
+ use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+}
diff --git a/dev-ml/merlin/merlin-4.3.1.ebuild b/dev-ml/merlin/merlin-4.3.1.ebuild
new file mode 100644
index 000000000000..d269247a3728
--- /dev/null
+++ b/dev-ml/merlin/merlin-4.3.1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# TODO: vim-plugin, although it's not clear how to make it work here
+inherit elisp-common dune
+
+DESCRIPTION="Context sensitive completion for OCaml in Vim and Emacs"
+HOMEPAGE="https://github.com/ocaml/merlin"
+SRC_URI="https://github.com/ocaml/merlin/archive/v${PV}-411.tar.gz -> ${P}-411.tar.gz
+ https://dev.gentoo.org/~tupone/distfiles/${P}-ocaml-4.12.patch.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="emacs +ocamlopt test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ dev-ml/csexp:=
+ dev-ml/yojson:=
+ dev-ml/menhir:=
+ >=dev-ml/dune-2.9
+ || (
+ dev-lang/ocaml:0/4.11
+ dev-lang/ocaml:0/4.12
+ )
+ emacs? (
+ >=app-editors/emacs-23.1:*
+ app-emacs/auto-complete
+ app-emacs/company-mode
+ )
+"
+DEPEND="${RDEPEND}
+ test? ( app-misc/jq )"
+
+SITEFILE="50${PN}-gentoo.el"
+
+S="${WORKDIR}"/${P}-411
+
+src_prepare() {
+ has_version "dev-lang/ocaml:0/4.12" && \
+ eapply "${WORKDIR}"/${P}-ocaml-4.12.patch
+ default
+
+ # Handle installation via the eclass
+ rm emacs/dune || die
+
+ # rm failing test
+ rm -r tests/test-dirs/locate/context-detection/cd-mod_constr.t || die
+}
+
+src_compile() {
+ dune build @install
+
+ if use emacs ; then
+ # Build the emacs integration
+ cd emacs || die
+
+ # iedit isn't packaged yet
+ rm merlin-iedit.el || die
+
+ elisp-compile *.el
+ fi
+}
+
+src_install() {
+ dune_src_install
+
+ if use emacs ; then
+ cd "${S}/emacs" || die
+ elisp-install ${PN} *.el *.elc
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+ fi
+}
+
+pkg_postinst() {
+ use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+}
diff --git a/dev-ml/merlin/metadata.xml b/dev-ml/merlin/metadata.xml
index fe5fd4f15a0a..48df2876cb6e 100644
--- a/dev-ml/merlin/metadata.xml
+++ b/dev-ml/merlin/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>ml@gentoo.org</email>
diff --git a/dev-ml/metadata.xml b/dev-ml/metadata.xml
index 8c47159ecc84..3e46743445fa 100644
--- a/dev-ml/metadata.xml
+++ b/dev-ml/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE catmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<catmetadata>
<longdescription lang="en">
The dev-ml category contains libraries and utilities relevant to the
diff --git a/dev-ml/mirage-clock/metadata.xml b/dev-ml/mirage-clock/metadata.xml
index 6bb533907705..0be54068848e 100644
--- a/dev-ml/mirage-clock/metadata.xml
+++ b/dev-ml/mirage-clock/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>ml@gentoo.org</email>
diff --git a/dev-ml/mmap/metadata.xml b/dev-ml/mmap/metadata.xml
index 75a96f40ae08..2b542985c0c4 100644
--- a/dev-ml/mmap/metadata.xml
+++ b/dev-ml/mmap/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>gienah@gentoo.org</email>
diff --git a/dev-ml/mtime/metadata.xml b/dev-ml/mtime/metadata.xml
index 9a976f832f42..bd6382d05138 100644
--- a/dev-ml/mtime/metadata.xml
+++ b/dev-ml/mtime/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>ml@gentoo.org</email>
diff --git a/dev-ml/mtime/mtime-1.2.0.ebuild b/dev-ml/mtime/mtime-1.2.0.ebuild
index a6d491ea6add..4ca1ab377ca3 100644
--- a/dev-ml/mtime/mtime-1.2.0.ebuild
+++ b/dev-ml/mtime/mtime-1.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://erratique.ch/software/mtime/releases/${P}.tbz"
LICENSE="ISC"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-ml/num/metadata.xml b/dev-ml/num/metadata.xml
index e24f3283a006..c765c1971790 100644
--- a/dev-ml/num/metadata.xml
+++ b/dev-ml/num/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>ml@gentoo.org</email>
diff --git a/dev-ml/num/num-1.4-r1.ebuild b/dev-ml/num/num-1.4-r2.ebuild
index cf5b56b7a6d8..cf3d3b3bc4c9 100644
--- a/dev-ml/num/num-1.4-r1.ebuild
+++ b/dev-ml/num/num-1.4-r2.ebuild
@@ -16,6 +16,7 @@ KEYWORDS="amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-
IUSE="+ocamlopt"
RDEPEND="dev-lang/ocaml:=[ocamlopt?]"
+DEPEND="dev-ml/findlib:="
src_compile() {
emake CFLAGS="${CFLAGS}" NATDYNLINK="$(usex ocamlopt true false)"
@@ -27,6 +28,10 @@ src_test() {
}
src_install() {
- findlib_src_preinst
- OCAMLPATH="${OCAMLFIND_DESTDIR}" emake install DESTDIR="${D}" NATDYNLINK="$(usex ocamlopt true false)"
+ findlib_src_install
+
+ if has_version ">=dev-ml/findlib-1.9" ; then
+ # See bug #803275
+ rm "${ED}/usr/$(get_libdir)/ocaml/num-top/META" || die
+ fi
}
diff --git a/dev-ml/ocaml-augeas/metadata.xml b/dev-ml/ocaml-augeas/metadata.xml
index b11b3f0e5dd7..afa919e68fb5 100644
--- a/dev-ml/ocaml-augeas/metadata.xml
+++ b/dev-ml/ocaml-augeas/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>prometheanfire@gentoo.org</email>
diff --git a/dev-ml/ocaml-autoconf/metadata.xml b/dev-ml/ocaml-autoconf/metadata.xml
index 6f49eba8f496..85e4ed814fa2 100644
--- a/dev-ml/ocaml-autoconf/metadata.xml
+++ b/dev-ml/ocaml-autoconf/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/dev-ml/ocaml-base64/metadata.xml b/dev-ml/ocaml-base64/metadata.xml
index df10f7dcf086..9152c2c8dcd7 100644
--- a/dev-ml/ocaml-base64/metadata.xml
+++ b/dev-ml/ocaml-base64/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>ml@gentoo.org</email>
diff --git a/dev-ml/ocaml-base64/ocaml-base64-3.5.0.ebuild b/dev-ml/ocaml-base64/ocaml-base64-3.5.0.ebuild
index 423c07131828..8cd94a37b883 100644
--- a/dev-ml/ocaml-base64/ocaml-base64-3.5.0.ebuild
+++ b/dev-ml/ocaml-base64/ocaml-base64-3.5.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mirage/ocaml-base64/archive/v${PV}.tar.gz -> ${P}.ta
LICENSE="ISC"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
IUSE="+ocamlopt test"
RESTRICT="!test? ( test )"
diff --git a/dev-ml/ocaml-compiler-libs/Manifest b/dev-ml/ocaml-compiler-libs/Manifest
index e5be20a0a169..fefe68183192 100644
--- a/dev-ml/ocaml-compiler-libs/Manifest
+++ b/dev-ml/ocaml-compiler-libs/Manifest
@@ -1 +1,2 @@
DIST ocaml-compiler-libs-0.12.3.tar.gz 4982 BLAKE2B 83432cbb2707964f025b294a84cdcce77137156e409d85ce8615dd6e9a26ad085cd5de178ebeb7520cd95b19a15b3cfbf7ef9567d165b55e07850a231b68371c SHA512 748ae11fe4cedb12d153ef2e712a9899f6a7ab4a35ddb7c95c0ae25af979c3edf274046745dddb2253fc06be41d5b0029f11a5a823a17d1ee680ffb29c4bdc89
+DIST ocaml-compiler-libs-0.12.4.tar.gz 5435 BLAKE2B 2c7b3f79315945d094dd4102da748dda55265bdd36753606ec03eef6a39eb385b84e7bfd0f43a04583271bf7c53b15481e9dcbb48c362d472bb3f740ec48853a SHA512 cf08e8d4bf25fff26a16a05036f08247176f4845d9d9ada85944c3fa89b6df9a5092d7a1025415a3b2ce00dd45b544cc82247648cf3952be2304e5d9ebab121d
diff --git a/dev-ml/ocaml-compiler-libs/metadata.xml b/dev-ml/ocaml-compiler-libs/metadata.xml
index 386b3cb8e9bc..28dbaa21bbfb 100644
--- a/dev-ml/ocaml-compiler-libs/metadata.xml
+++ b/dev-ml/ocaml-compiler-libs/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>gienah@gentoo.org</email>
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
index ce40ed8ba22c..345396f5fa7c 100644
--- 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
@@ -9,7 +9,7 @@ DESCRIPTION="Repackage the OCaml compiler libs so they do not expose everything
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"
+LICENSE="MIT"
SLOT="0/${PV}"
KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
IUSE="+ocamlopt"
diff --git a/dev-ml/ocaml-compiler-libs/ocaml-compiler-libs-0.12.4.ebuild b/dev-ml/ocaml-compiler-libs/ocaml-compiler-libs-0.12.4.ebuild
new file mode 100644
index 000000000000..e7afbbcd5579
--- /dev/null
+++ b/dev-ml/ocaml-compiler-libs/ocaml-compiler-libs-0.12.4.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2021 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="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
diff --git a/dev-ml/ocaml-ctypes/metadata.xml b/dev-ml/ocaml-ctypes/metadata.xml
index e3a65adc3e77..04cdc9138e6f 100644
--- a/dev-ml/ocaml-ctypes/metadata.xml
+++ b/dev-ml/ocaml-ctypes/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>gienah@gentoo.org</email>
diff --git a/dev-ml/ocaml-ctypes/ocaml-ctypes-0.19.1.ebuild b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.19.1.ebuild
index 40a1bee9e11b..805f10af8954 100644
--- a/dev-ml/ocaml-ctypes/ocaml-ctypes-0.19.1.ebuild
+++ b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.19.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ocamllabs/ocaml-ctypes/archive/${PV}.tar.gz -> ${P}.
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-ml/ocaml-doc/metadata.xml b/dev-ml/ocaml-doc/metadata.xml
index 7a38bb900964..115e9d64a669 100644
--- a/dev-ml/ocaml-doc/metadata.xml
+++ b/dev-ml/ocaml-doc/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/dev-ml/ocaml-expat/metadata.xml b/dev-ml/ocaml-expat/metadata.xml
index f91d68f6062b..f9eec310268a 100644
--- a/dev-ml/ocaml-expat/metadata.xml
+++ b/dev-ml/ocaml-expat/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>gienah@gentoo.org</email>
diff --git a/dev-ml/ocaml-fileutils/metadata.xml b/dev-ml/ocaml-fileutils/metadata.xml
index 76b0f0d3ff23..8c93c36b4450 100644
--- a/dev-ml/ocaml-fileutils/metadata.xml
+++ b/dev-ml/ocaml-fileutils/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<longdescription>
POSIX-like file manipulation functions inspired by
diff --git a/dev-ml/ocaml-gettext-camomile/metadata.xml b/dev-ml/ocaml-gettext-camomile/metadata.xml
index 7c93d1f89b11..7366e353387f 100644
--- a/dev-ml/ocaml-gettext-camomile/metadata.xml
+++ b/dev-ml/ocaml-gettext-camomile/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>rkitover@gmail.com</email>
diff --git a/dev-ml/ocaml-gettext-stub/metadata.xml b/dev-ml/ocaml-gettext-stub/metadata.xml
index 7c93d1f89b11..7366e353387f 100644
--- a/dev-ml/ocaml-gettext-stub/metadata.xml
+++ b/dev-ml/ocaml-gettext-stub/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>rkitover@gmail.com</email>
diff --git a/dev-ml/ocaml-gettext/metadata.xml b/dev-ml/ocaml-gettext/metadata.xml
index 7c93d1f89b11..7366e353387f 100644
--- a/dev-ml/ocaml-gettext/metadata.xml
+++ b/dev-ml/ocaml-gettext/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>rkitover@gmail.com</email>
diff --git a/dev-ml/ocaml-gettext/ocaml-gettext-0.3.7-r3.ebuild b/dev-ml/ocaml-gettext/ocaml-gettext-0.3.7-r3.ebuild
index 7af5b26e0ad4..ca902d4b1b81 100644
--- a/dev-ml/ocaml-gettext/ocaml-gettext-0.3.7-r3.ebuild
+++ b/dev-ml/ocaml-gettext/ocaml-gettext-0.3.7-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/gildor478/ocaml-gettext/archive/${PV}.tar.gz -> ${P}
LICENSE="LGPL-2.1-with-linking-exception"
SLOT="0/${PV}"
KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
+IUSE="doc +ocamlopt test"
RESTRICT="!test? ( test )"
PATCHES=( "${FILESDIR}"/ocaml-unsafe-string.patch )
diff --git a/dev-ml/ocaml-hashcons/metadata.xml b/dev-ml/ocaml-hashcons/metadata.xml
index 445c6d93296f..31fdf2acd84c 100644
--- a/dev-ml/ocaml-hashcons/metadata.xml
+++ b/dev-ml/ocaml-hashcons/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<upstream>
diff --git a/dev-ml/ocaml-migrate-parsetree/metadata.xml b/dev-ml/ocaml-migrate-parsetree/metadata.xml
index a5f97e49777d..dc9f17fc0754 100644
--- a/dev-ml/ocaml-migrate-parsetree/metadata.xml
+++ b/dev-ml/ocaml-migrate-parsetree/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>ml@gentoo.org</email>
diff --git a/dev-ml/ocaml-migrate-parsetree/ocaml-migrate-parsetree-2.2.0.ebuild b/dev-ml/ocaml-migrate-parsetree/ocaml-migrate-parsetree-2.2.0.ebuild
index 15c2c38d9b40..ae708d50d3c2 100644
--- a/dev-ml/ocaml-migrate-parsetree/ocaml-migrate-parsetree-2.2.0.ebuild
+++ b/dev-ml/ocaml-migrate-parsetree/ocaml-migrate-parsetree-2.2.0.ebuild
@@ -11,8 +11,9 @@ SRC_URI="https://github.com/let-def/ocaml-migrate-parsetree/archive/v${PV}.tar.g
LICENSE="LGPL-2.1"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
IUSE="+ocamlopt test"
-RESTRICT="!test? ( test )"
+RESTRICT="!test? ( test ) strip"
DEPEND="test? ( dev-ml/cinaps )"
+BDEPEND=">=dev-ml/dune-2.3"
diff --git a/dev-ml/ocaml-sqlite3/metadata.xml b/dev-ml/ocaml-sqlite3/metadata.xml
index ed2908f25514..e224fe800acf 100644
--- a/dev-ml/ocaml-sqlite3/metadata.xml
+++ b/dev-ml/ocaml-sqlite3/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<upstream>
diff --git a/dev-ml/ocaml-ssl/metadata.xml b/dev-ml/ocaml-ssl/metadata.xml
index 35f7fc885090..261f69f24930 100644
--- a/dev-ml/ocaml-ssl/metadata.xml
+++ b/dev-ml/ocaml-ssl/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>ml@gentoo.org</email>
diff --git a/dev-ml/ocamlbuild/metadata.xml b/dev-ml/ocamlbuild/metadata.xml
index f4df6bd2b9a9..e79a47c58389 100644
--- a/dev-ml/ocamlbuild/metadata.xml
+++ b/dev-ml/ocamlbuild/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>ml@gentoo.org</email>
diff --git a/dev-ml/ocamlbuild/ocamlbuild-0.11.0.ebuild b/dev-ml/ocamlbuild/ocamlbuild-0.11.0.ebuild
index 13bf43e48525..5d11a50d5da0 100644
--- a/dev-ml/ocamlbuild/ocamlbuild-0.11.0.ebuild
+++ b/dev-ml/ocamlbuild/ocamlbuild-0.11.0.ebuild
@@ -14,11 +14,8 @@ IUSE="+ocamlopt test"
RESTRICT="!test? ( test )"
# does not compile with ocaml-4.09 (bug # 708696 and #708872)
-DEPEND="<dev-lang/ocaml-4.09:=[ocamlopt?]"
-RDEPEND="${DEPEND}
- !<dev-ml/findlib-1.6.1-r1
-"
-DEPEND="${DEPEND}
+RDEPEND="<dev-lang/ocaml-4.09:=[ocamlopt?]"
+DEPEND="${RDEPEND}
test? ( dev-ml/findlib )"
src_prepare() {
diff --git a/dev-ml/ocamlbuild/ocamlbuild-0.14.0-r1.ebuild b/dev-ml/ocamlbuild/ocamlbuild-0.14.0-r1.ebuild
index 47ec79c0341e..f6b0bede9b18 100644
--- a/dev-ml/ocamlbuild/ocamlbuild-0.14.0-r1.ebuild
+++ b/dev-ml/ocamlbuild/ocamlbuild-0.14.0-r1.ebuild
@@ -13,11 +13,8 @@ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 x86 ~amd64-linux ~x
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}
+RDEPEND=">=dev-lang/ocaml-4.02.3-r1:=[ocamlopt?]"
+DEPEND="${RDEPEND}
test? ( dev-ml/findlib )"
PATCHES=(
diff --git a/dev-ml/ocamlgraph/metadata.xml b/dev-ml/ocamlgraph/metadata.xml
index 755517efcd9d..d153e13b620d 100644
--- a/dev-ml/ocamlgraph/metadata.xml
+++ b/dev-ml/ocamlgraph/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>ml@gentoo.org</email>
diff --git a/dev-ml/ocamlnet/metadata.xml b/dev-ml/ocamlnet/metadata.xml
index 0923c7f5f4ff..1cd5b462ca9d 100644
--- a/dev-ml/ocamlnet/metadata.xml
+++ b/dev-ml/ocamlnet/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>ml@gentoo.org</email>
diff --git a/dev-ml/ocamlnet/ocamlnet-4.1.9.ebuild b/dev-ml/ocamlnet/ocamlnet-4.1.9.ebuild
index c0ee784e835e..8976098b07bc 100644
--- a/dev-ml/ocamlnet/ocamlnet-4.1.9.ebuild
+++ b/dev-ml/ocamlnet/ocamlnet-4.1.9.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="ZLIB GPL-2+"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
IUSE="kerberos tk httpd +ocamlopt +pcre ssl zip"
RESTRICT="installsources strip"
diff --git a/dev-ml/ocamlsdl/metadata.xml b/dev-ml/ocamlsdl/metadata.xml
index c78ab1795227..2ce0fe2f56d9 100644
--- a/dev-ml/ocamlsdl/metadata.xml
+++ b/dev-ml/ocamlsdl/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<upstream>
diff --git a/dev-ml/ocamlweb/metadata.xml b/dev-ml/ocamlweb/metadata.xml
index e24f3283a006..c765c1971790 100644
--- a/dev-ml/ocamlweb/metadata.xml
+++ b/dev-ml/ocamlweb/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>ml@gentoo.org</email>
diff --git a/dev-ml/ocamlweb/ocamlweb-1.41.ebuild b/dev-ml/ocamlweb/ocamlweb-1.41-r1.ebuild
index 1cd6b57b27bb..0e13362dc9ee 100644
--- a/dev-ml/ocamlweb/ocamlweb-1.41.ebuild
+++ b/dev-ml/ocamlweb/ocamlweb-1.41-r1.ebuild
@@ -19,12 +19,13 @@ RESTRICT="!test? ( test )"
DEPEND=">=dev-lang/ocaml-4.08.0:=
virtual/latex-base
dev-texlive/texlive-latexextra"
+RDEPEND="${DEPEND}"
BDEPEND="test? ( dev-tex/hevea )"
PATCHES=(
"${FILESDIR}/${PN}-1.41-strip.patch"
"${FILESDIR}/${PN}-1.41-ocaml-4.08.0.patch"
- )
+)
QA_FLAGS_IGNORED=/usr/bin/ocamlweb
diff --git a/dev-ml/ocplib-endian/metadata.xml b/dev-ml/ocplib-endian/metadata.xml
index 79e925f71327..6da7348d3c73 100644
--- a/dev-ml/ocplib-endian/metadata.xml
+++ b/dev-ml/ocplib-endian/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>gienah@gentoo.org</email>
diff --git a/dev-ml/ocplib-simplex/metadata.xml b/dev-ml/ocplib-simplex/metadata.xml
index 9a08a32b302f..ca4503f2a0c2 100644
--- a/dev-ml/ocplib-simplex/metadata.xml
+++ b/dev-ml/ocplib-simplex/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>ml@gentoo.org</email>
diff --git a/dev-ml/octavius/metadata.xml b/dev-ml/octavius/metadata.xml
index 365c9666dff4..ca7833d1aea6 100644
--- a/dev-ml/octavius/metadata.xml
+++ b/dev-ml/octavius/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>gienah@gentoo.org</email>
diff --git a/dev-ml/ocurl/metadata.xml b/dev-ml/ocurl/metadata.xml
index f896efe32475..367a88d8036b 100644
--- a/dev-ml/ocurl/metadata.xml
+++ b/dev-ml/ocurl/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<upstream>
diff --git a/dev-ml/opam-client/Manifest b/dev-ml/opam-client/Manifest
index a8c97c7a26f1..0b145947da01 100644
--- a/dev-ml/opam-client/Manifest
+++ b/dev-ml/opam-client/Manifest
@@ -1,2 +1,4 @@
DIST opam-2.0.8.tar.gz 643221 BLAKE2B 66510a18285f315fe95665e8ba2f334dd44211c716543cdc25f2951a7dfe537f115981046e5963fd08deea4c76f5672fa7cf8e7af2274a713a3165bdd0bac8c2 SHA512 14737dc994be2c54dfeaf2658d3713178033e1bc2b4b845a58b4bfc118bbbf12b502924add0ae32b4b2b6c1944462e5ee7143df3de362d9ee39573249d013bc9
DIST opam-2.0.9.tar.gz 644429 BLAKE2B d96ee79685a8ee8ff82c7570a747c80e38d86e513736a27904a4e471d1eaf432db72998251ac786cb8fbf1ad425fff42b772c5d26934e0929aae75c0946d4659 SHA512 0d8ee19ac0f3df9de4fd9cfa8daab1f7228f090f5e2e7e26bedf24d8c2ab377aade95048f2d7cd9ee9dbbe738729e26dc99f41f730fa2252df74953362464a22
+DIST opam-2.1.0-dose3-6.patch.xz 5896 BLAKE2B f605064ebae7d327895729962a345a3c679519895aa2568f0c2d199d4ba9d6ae948a4fc418cfd26cc65079eb6ef3545f24a35e08c969d215529664a80d0c9147 SHA512 e00da74d7baef62319e884e3a05112bcf86a02d887c274bd15fb0d15bb8198e9a37a421f388bec3fce198e7a1b4d37024b18609dc65978c6ee8a7889df9bd608
+DIST opam-2.1.0.tar.gz 825966 BLAKE2B 42ab8ad2825e4e167618ece7bd2ce77ff055d584039fe2f644fa1c3e99d175cc7047f32bda53599af4fb177d844970883125cebca823024d1bc43a34857f20c5 SHA512 c0060e609c49a12dc8f64accef990aa593db818b72df3984fb9b4b22d8678b46c515916c84134a62dab614c716b61788eadc954d295f32c1f27d38aec22b3edf
diff --git a/dev-ml/opam-client/metadata.xml b/dev-ml/opam-client/metadata.xml
index 856df00497e6..a80d577d653e 100644
--- a/dev-ml/opam-client/metadata.xml
+++ b/dev-ml/opam-client/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>ml@gentoo.org</email>
diff --git a/dev-ml/opam-client/opam-client-2.0.8-r1.ebuild b/dev-ml/opam-client/opam-client-2.0.8-r1.ebuild
index 4b52fb7e1ef9..03972111ac0f 100644
--- a/dev-ml/opam-client/opam-client-2.0.8-r1.ebuild
+++ b/dev-ml/opam-client/opam-client-2.0.8-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/opam-${PV/_/-}"
LICENSE="LGPL-2.1"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~x86"
IUSE="+ocamlopt"
RDEPEND="
diff --git a/dev-ml/opam-client/opam-client-2.0.8.ebuild b/dev-ml/opam-client/opam-client-2.0.8.ebuild
index cb9b0a4fcf42..3a2775f3db09 100644
--- a/dev-ml/opam-client/opam-client-2.0.8.ebuild
+++ b/dev-ml/opam-client/opam-client-2.0.8.ebuild
@@ -16,6 +16,7 @@ KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
IUSE="+ocamlopt"
RDEPEND="
+ <dev-lang/ocaml-4.12
dev-ml/cmdliner:=
~dev-ml/opam-repository-${PV}:=
~dev-ml/opam-state-${PV}:=
diff --git a/dev-ml/opam-client/opam-client-2.1.0.ebuild b/dev-ml/opam-client/opam-client-2.1.0.ebuild
new file mode 100644
index 000000000000..b03d1b117962
--- /dev/null
+++ b/dev-ml/opam-client/opam-client-2.1.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 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"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/dev-ml/opam/opam-2.1.0-dose3-6.patch.xz"
+S="${WORKDIR}/opam-${PV/_/-}"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+RDEPEND="
+ dev-ml/cmdliner:=
+ ~dev-ml/opam-repository-${PV}:=
+ ~dev-ml/opam-state-${PV}:=
+ ~dev-ml/opam-solver-${PV}:=
+ dev-ml/opam-file-format:=
+ dev-ml/re:=
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${WORKDIR}"/opam-2.1.0-dose3-6.patch )
+
+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
index a8c97c7a26f1..0b145947da01 100644
--- a/dev-ml/opam-core/Manifest
+++ b/dev-ml/opam-core/Manifest
@@ -1,2 +1,4 @@
DIST opam-2.0.8.tar.gz 643221 BLAKE2B 66510a18285f315fe95665e8ba2f334dd44211c716543cdc25f2951a7dfe537f115981046e5963fd08deea4c76f5672fa7cf8e7af2274a713a3165bdd0bac8c2 SHA512 14737dc994be2c54dfeaf2658d3713178033e1bc2b4b845a58b4bfc118bbbf12b502924add0ae32b4b2b6c1944462e5ee7143df3de362d9ee39573249d013bc9
DIST opam-2.0.9.tar.gz 644429 BLAKE2B d96ee79685a8ee8ff82c7570a747c80e38d86e513736a27904a4e471d1eaf432db72998251ac786cb8fbf1ad425fff42b772c5d26934e0929aae75c0946d4659 SHA512 0d8ee19ac0f3df9de4fd9cfa8daab1f7228f090f5e2e7e26bedf24d8c2ab377aade95048f2d7cd9ee9dbbe738729e26dc99f41f730fa2252df74953362464a22
+DIST opam-2.1.0-dose3-6.patch.xz 5896 BLAKE2B f605064ebae7d327895729962a345a3c679519895aa2568f0c2d199d4ba9d6ae948a4fc418cfd26cc65079eb6ef3545f24a35e08c969d215529664a80d0c9147 SHA512 e00da74d7baef62319e884e3a05112bcf86a02d887c274bd15fb0d15bb8198e9a37a421f388bec3fce198e7a1b4d37024b18609dc65978c6ee8a7889df9bd608
+DIST opam-2.1.0.tar.gz 825966 BLAKE2B 42ab8ad2825e4e167618ece7bd2ce77ff055d584039fe2f644fa1c3e99d175cc7047f32bda53599af4fb177d844970883125cebca823024d1bc43a34857f20c5 SHA512 c0060e609c49a12dc8f64accef990aa593db818b72df3984fb9b4b22d8678b46c515916c84134a62dab614c716b61788eadc954d295f32c1f27d38aec22b3edf
diff --git a/dev-ml/opam-core/metadata.xml b/dev-ml/opam-core/metadata.xml
index 856df00497e6..a80d577d653e 100644
--- a/dev-ml/opam-core/metadata.xml
+++ b/dev-ml/opam-core/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>ml@gentoo.org</email>
diff --git a/dev-ml/opam-core/opam-core-2.1.0.ebuild b/dev-ml/opam-core/opam-core-2.1.0.ebuild
new file mode 100644
index 000000000000..200b36c8bd17
--- /dev/null
+++ b/dev-ml/opam-core/opam-core-2.1.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 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"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/dev-ml/opam/opam-2.1.0-dose3-6.patch.xz"
+S="${WORKDIR}/opam-${PV}"
+OPAM_INSTALLER="${S}/opam-installer"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+ dev-ml/ocamlgraph:=
+ dev-ml/re:=
+ dev-ml/opam-file-format:=
+ dev-ml/cmdliner:=
+"
+DEPEND="${RDEPEND}
+ dev-ml/cppo"
+
+PATCHES=( "${WORKDIR}"/opam-2.1.0-dose3-6.patch )
+
+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/metadata.xml b/dev-ml/opam-file-format/metadata.xml
index e96aa44304ad..813063ac79de 100644
--- a/dev-ml/opam-file-format/metadata.xml
+++ b/dev-ml/opam-file-format/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>ml@gentoo.org</email>
diff --git a/dev-ml/opam-file-format/opam-file-format-2.1.3.ebuild b/dev-ml/opam-file-format/opam-file-format-2.1.3.ebuild
index fe3328205eeb..943ebfa49c02 100644
--- a/dev-ml/opam-file-format/opam-file-format-2.1.3.ebuild
+++ b/dev-ml/opam-file-format/opam-file-format-2.1.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/ocaml/opam-file-format/archive/${MY_PV}.tar.gz -> ${
LICENSE="LGPL-2.1"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~x86"
IUSE="+ocamlopt test"
RESTRICT="!test? ( test )"
diff --git a/dev-ml/opam-format/Manifest b/dev-ml/opam-format/Manifest
index a8c97c7a26f1..0b145947da01 100644
--- a/dev-ml/opam-format/Manifest
+++ b/dev-ml/opam-format/Manifest
@@ -1,2 +1,4 @@
DIST opam-2.0.8.tar.gz 643221 BLAKE2B 66510a18285f315fe95665e8ba2f334dd44211c716543cdc25f2951a7dfe537f115981046e5963fd08deea4c76f5672fa7cf8e7af2274a713a3165bdd0bac8c2 SHA512 14737dc994be2c54dfeaf2658d3713178033e1bc2b4b845a58b4bfc118bbbf12b502924add0ae32b4b2b6c1944462e5ee7143df3de362d9ee39573249d013bc9
DIST opam-2.0.9.tar.gz 644429 BLAKE2B d96ee79685a8ee8ff82c7570a747c80e38d86e513736a27904a4e471d1eaf432db72998251ac786cb8fbf1ad425fff42b772c5d26934e0929aae75c0946d4659 SHA512 0d8ee19ac0f3df9de4fd9cfa8daab1f7228f090f5e2e7e26bedf24d8c2ab377aade95048f2d7cd9ee9dbbe738729e26dc99f41f730fa2252df74953362464a22
+DIST opam-2.1.0-dose3-6.patch.xz 5896 BLAKE2B f605064ebae7d327895729962a345a3c679519895aa2568f0c2d199d4ba9d6ae948a4fc418cfd26cc65079eb6ef3545f24a35e08c969d215529664a80d0c9147 SHA512 e00da74d7baef62319e884e3a05112bcf86a02d887c274bd15fb0d15bb8198e9a37a421f388bec3fce198e7a1b4d37024b18609dc65978c6ee8a7889df9bd608
+DIST opam-2.1.0.tar.gz 825966 BLAKE2B 42ab8ad2825e4e167618ece7bd2ce77ff055d584039fe2f644fa1c3e99d175cc7047f32bda53599af4fb177d844970883125cebca823024d1bc43a34857f20c5 SHA512 c0060e609c49a12dc8f64accef990aa593db818b72df3984fb9b4b22d8678b46c515916c84134a62dab614c716b61788eadc954d295f32c1f27d38aec22b3edf
diff --git a/dev-ml/opam-format/metadata.xml b/dev-ml/opam-format/metadata.xml
index 856df00497e6..a80d577d653e 100644
--- a/dev-ml/opam-format/metadata.xml
+++ b/dev-ml/opam-format/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>ml@gentoo.org</email>
diff --git a/dev-ml/opam-format/opam-format-2.0.8-r2.ebuild b/dev-ml/opam-format/opam-format-2.0.8-r2.ebuild
index 54b3b0ce46df..eb552240221e 100644
--- a/dev-ml/opam-format/opam-format-2.0.8-r2.ebuild
+++ b/dev-ml/opam-format/opam-format-2.0.8-r2.ebuild
@@ -19,6 +19,7 @@ KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
IUSE="+ocamlopt"
RDEPEND="
+ <dev-lang/ocaml-4.12
~dev-ml/opam-core-${PV}:=
dev-ml/re:=
dev-ml/opam-file-format:=
diff --git a/dev-ml/opam-format/opam-format-2.0.8-r3.ebuild b/dev-ml/opam-format/opam-format-2.0.8-r3.ebuild
index ace83b9a6ae8..a58e8467aae8 100644
--- a/dev-ml/opam-format/opam-format-2.0.8-r3.ebuild
+++ b/dev-ml/opam-format/opam-format-2.0.8-r3.ebuild
@@ -15,7 +15,7 @@ OPAM_INSTALLER="${S}/opam-installer"
LICENSE="LGPL-2.1"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~x86"
IUSE="+ocamlopt"
RDEPEND="
diff --git a/dev-ml/opam-format/opam-format-2.1.0.ebuild b/dev-ml/opam-format/opam-format-2.1.0.ebuild
new file mode 100644
index 000000000000..027845d265fc
--- /dev/null
+++ b/dev-ml/opam-format/opam-format-2.1.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# We are opam
+OPAM_INSTALLER_DEP=" "
+inherit dune
+
+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"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/dev-ml/opam/opam-2.1.0-dose3-6.patch.xz"
+S="${WORKDIR}/opam-${PV}"
+OPAM_INSTALLER="${S}/opam-installer"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+RDEPEND="
+ ~dev-ml/opam-core-${PV}:=
+ dev-ml/re:=
+ dev-ml/opam-file-format:=
+ >=dev-ml/dose3-6.0:=
+"
+DEPEND="${RDEPEND}
+ dev-ml/cppo"
+
+PATCHES=( "${WORKDIR}"/opam-2.1.0-dose3-6.patch )
+
+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-installer/Manifest b/dev-ml/opam-installer/Manifest
index d6e4ebdb9a8f..f32e897aec2c 100644
--- a/dev-ml/opam-installer/Manifest
+++ b/dev-ml/opam-installer/Manifest
@@ -1,2 +1,4 @@
+DIST opam-2.1.0-dose3-6.patch.xz 5896 BLAKE2B f605064ebae7d327895729962a345a3c679519895aa2568f0c2d199d4ba9d6ae948a4fc418cfd26cc65079eb6ef3545f24a35e08c969d215529664a80d0c9147 SHA512 e00da74d7baef62319e884e3a05112bcf86a02d887c274bd15fb0d15bb8198e9a37a421f388bec3fce198e7a1b4d37024b18609dc65978c6ee8a7889df9bd608
DIST opam-full-2.0.8.tar.gz 8006252 BLAKE2B 26348bdbb8bdc2fbf9d736286c1f4134ce065e8c15e34d51c8d2c6e5338fd6db089df38a19b07cde70770724fc4cc3dbd9e7d75628e5435ca8a2f8c0d4d3f2f0 SHA512 f08893ad0c1e124368168f28dcb5c3293e443da712d7b12db432c21ff72f7e1440bcc7156f49661d286360a16dcd166d3d02ecdebf8b1cda7c7df2b22e48f80f
DIST opam-full-2.0.9.tar.gz 8029605 BLAKE2B c2ae06bdbbdbe9db270ec0027ec8d13a228f0af2ae5089476fa3a698d27e1f47abf2e3a15ecc9ca610717ba6b979b4ca76cce56c52f6592ae789b88fb5e5b68d SHA512 9f44d878a2599a876f5e5b9b7457b6f446a5e59156ed3d449dcc29e40c44df8b69da619eabdf030e45526fba4bd9a00c65dec2c36552d2e03788596b0aceee85
+DIST opam-full-2.1.0.tar.gz 9136886 BLAKE2B 3d51159568b6e85834f70a3545fe37d82470d4253bf9db6fef32b4314fd0a82182737bba6be62a9dd04b6d8fb8d7468b2e23ac39fa475f467adfdb0ec8d52181 SHA512 2c4955e450cde7211dbab507cbdc5d6e67805353e384df525d77ebf5561d6a4de91f7e5691567b2dc61146fc29df6fa5dc8aa8562330a4746db3a52b7487811a
diff --git a/dev-ml/opam-installer/metadata.xml b/dev-ml/opam-installer/metadata.xml
index 856df00497e6..a80d577d653e 100644
--- a/dev-ml/opam-installer/metadata.xml
+++ b/dev-ml/opam-installer/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>ml@gentoo.org</email>
diff --git a/dev-ml/opam-installer/opam-installer-2.0.8-r2.ebuild b/dev-ml/opam-installer/opam-installer-2.0.8-r2.ebuild
index 0794b29319b7..739c1989676d 100644
--- a/dev-ml/opam-installer/opam-installer-2.0.8-r2.ebuild
+++ b/dev-ml/opam-installer/opam-installer-2.0.8-r2.ebuild
@@ -16,7 +16,7 @@ OPAM_INSTALLER="${S}/opam-installer"
LICENSE="LGPL-2.1"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
RDEPEND="
>=dev-lang/ocaml-4.02.3
diff --git a/dev-ml/opam-installer/opam-installer-2.0.8-r3.ebuild b/dev-ml/opam-installer/opam-installer-2.0.8-r3.ebuild
index a2b88905a299..919e02b41347 100644
--- a/dev-ml/opam-installer/opam-installer-2.0.8-r3.ebuild
+++ b/dev-ml/opam-installer/opam-installer-2.0.8-r3.ebuild
@@ -16,7 +16,7 @@ OPAM_INSTALLER="${S}/opam-installer"
LICENSE="LGPL-2.1"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
# Cherry-picked from https://deb.debian.org/debian/pool/main/o/opam/opam_2.0.8-1.debian.tar.xz
PATCHES=( "${FILESDIR}/debian-Port-to-Dose3-6.0.1.patch" )
diff --git a/dev-ml/opam-installer/opam-installer-2.1.0.ebuild b/dev-ml/opam-installer/opam-installer-2.1.0.ebuild
new file mode 100644
index 000000000000..1ea426a6380d
--- /dev/null
+++ b/dev-ml/opam-installer/opam-installer-2.1.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 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 dune
+
+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"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/dev-ml/opam/opam-2.1.0-dose3-6.patch.xz"
+S="${WORKDIR}/opam-full-${PV/_/-}"
+OPAM_INSTALLER="${S}/_build/install/default/bin/opam-installer"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+PATCHES=( "${WORKDIR}"/opam-2.1.0-dose3-6.patch )
+
+RDEPEND="
+ >=dev-lang/ocaml-4.02.3
+ dev-ml/cmdliner:=
+ ~dev-ml/opam-format-${PV}
+ >=dev-ml/dose3-6
+"
+DEPEND="${RDEPEND}
+ dev-ml/findlib"
+
+src_configure() {
+ econf \
+ --prefix="${EPREFIX}/usr" \
+ --with-mccs \
+ --docdir="${EPREFIX}/usr/share/doc/${PF}" \
+ --mandir="${EPREFIX}/usr/share/man"
+}
diff --git a/dev-ml/opam-repository/Manifest b/dev-ml/opam-repository/Manifest
index a8c97c7a26f1..0b145947da01 100644
--- a/dev-ml/opam-repository/Manifest
+++ b/dev-ml/opam-repository/Manifest
@@ -1,2 +1,4 @@
DIST opam-2.0.8.tar.gz 643221 BLAKE2B 66510a18285f315fe95665e8ba2f334dd44211c716543cdc25f2951a7dfe537f115981046e5963fd08deea4c76f5672fa7cf8e7af2274a713a3165bdd0bac8c2 SHA512 14737dc994be2c54dfeaf2658d3713178033e1bc2b4b845a58b4bfc118bbbf12b502924add0ae32b4b2b6c1944462e5ee7143df3de362d9ee39573249d013bc9
DIST opam-2.0.9.tar.gz 644429 BLAKE2B d96ee79685a8ee8ff82c7570a747c80e38d86e513736a27904a4e471d1eaf432db72998251ac786cb8fbf1ad425fff42b772c5d26934e0929aae75c0946d4659 SHA512 0d8ee19ac0f3df9de4fd9cfa8daab1f7228f090f5e2e7e26bedf24d8c2ab377aade95048f2d7cd9ee9dbbe738729e26dc99f41f730fa2252df74953362464a22
+DIST opam-2.1.0-dose3-6.patch.xz 5896 BLAKE2B f605064ebae7d327895729962a345a3c679519895aa2568f0c2d199d4ba9d6ae948a4fc418cfd26cc65079eb6ef3545f24a35e08c969d215529664a80d0c9147 SHA512 e00da74d7baef62319e884e3a05112bcf86a02d887c274bd15fb0d15bb8198e9a37a421f388bec3fce198e7a1b4d37024b18609dc65978c6ee8a7889df9bd608
+DIST opam-2.1.0.tar.gz 825966 BLAKE2B 42ab8ad2825e4e167618ece7bd2ce77ff055d584039fe2f644fa1c3e99d175cc7047f32bda53599af4fb177d844970883125cebca823024d1bc43a34857f20c5 SHA512 c0060e609c49a12dc8f64accef990aa593db818b72df3984fb9b4b22d8678b46c515916c84134a62dab614c716b61788eadc954d295f32c1f27d38aec22b3edf
diff --git a/dev-ml/opam-repository/metadata.xml b/dev-ml/opam-repository/metadata.xml
index 856df00497e6..a80d577d653e 100644
--- a/dev-ml/opam-repository/metadata.xml
+++ b/dev-ml/opam-repository/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>ml@gentoo.org</email>
diff --git a/dev-ml/opam-repository/opam-repository-2.0.8-r1.ebuild b/dev-ml/opam-repository/opam-repository-2.0.8-r1.ebuild
index 77365ae1bced..aab9a3c1727e 100644
--- a/dev-ml/opam-repository/opam-repository-2.0.8-r1.ebuild
+++ b/dev-ml/opam-repository/opam-repository-2.0.8-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/opam-${PV/_/-}"
LICENSE="LGPL-2.1"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~x86"
IUSE="+ocamlopt"
RESTRICT="test"
diff --git a/dev-ml/opam-repository/opam-repository-2.0.8.ebuild b/dev-ml/opam-repository/opam-repository-2.0.8.ebuild
index 632b71026c65..4bfd5662c257 100644
--- a/dev-ml/opam-repository/opam-repository-2.0.8.ebuild
+++ b/dev-ml/opam-repository/opam-repository-2.0.8.ebuild
@@ -17,6 +17,7 @@ IUSE="+ocamlopt"
RESTRICT="test"
RDEPEND="
+ <dev-lang/ocaml-4.12
~dev-ml/opam-format-${PV}:=
dev-ml/re:=
dev-ml/dose3:=
diff --git a/dev-ml/opam-repository/opam-repository-2.1.0.ebuild b/dev-ml/opam-repository/opam-repository-2.1.0.ebuild
new file mode 100644
index 000000000000..b7f297cca04b
--- /dev/null
+++ b/dev-ml/opam-repository/opam-repository-2.1.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 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"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/dev-ml/opam/opam-2.1.0-dose3-6.patch.xz"
+S="${WORKDIR}/opam-${PV/_/-}"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+RESTRICT="test"
+
+RDEPEND="
+ ~dev-ml/opam-format-${PV}:=
+ dev-ml/re:=
+ >=dev-ml/dose3-6.0:=
+ dev-ml/opam-file-format:=
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${WORKDIR}"/opam-2.1.0-dose3-6.patch )
+
+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
index a8c97c7a26f1..0b145947da01 100644
--- a/dev-ml/opam-solver/Manifest
+++ b/dev-ml/opam-solver/Manifest
@@ -1,2 +1,4 @@
DIST opam-2.0.8.tar.gz 643221 BLAKE2B 66510a18285f315fe95665e8ba2f334dd44211c716543cdc25f2951a7dfe537f115981046e5963fd08deea4c76f5672fa7cf8e7af2274a713a3165bdd0bac8c2 SHA512 14737dc994be2c54dfeaf2658d3713178033e1bc2b4b845a58b4bfc118bbbf12b502924add0ae32b4b2b6c1944462e5ee7143df3de362d9ee39573249d013bc9
DIST opam-2.0.9.tar.gz 644429 BLAKE2B d96ee79685a8ee8ff82c7570a747c80e38d86e513736a27904a4e471d1eaf432db72998251ac786cb8fbf1ad425fff42b772c5d26934e0929aae75c0946d4659 SHA512 0d8ee19ac0f3df9de4fd9cfa8daab1f7228f090f5e2e7e26bedf24d8c2ab377aade95048f2d7cd9ee9dbbe738729e26dc99f41f730fa2252df74953362464a22
+DIST opam-2.1.0-dose3-6.patch.xz 5896 BLAKE2B f605064ebae7d327895729962a345a3c679519895aa2568f0c2d199d4ba9d6ae948a4fc418cfd26cc65079eb6ef3545f24a35e08c969d215529664a80d0c9147 SHA512 e00da74d7baef62319e884e3a05112bcf86a02d887c274bd15fb0d15bb8198e9a37a421f388bec3fce198e7a1b4d37024b18609dc65978c6ee8a7889df9bd608
+DIST opam-2.1.0.tar.gz 825966 BLAKE2B 42ab8ad2825e4e167618ece7bd2ce77ff055d584039fe2f644fa1c3e99d175cc7047f32bda53599af4fb177d844970883125cebca823024d1bc43a34857f20c5 SHA512 c0060e609c49a12dc8f64accef990aa593db818b72df3984fb9b4b22d8678b46c515916c84134a62dab614c716b61788eadc954d295f32c1f27d38aec22b3edf
diff --git a/dev-ml/opam-solver/metadata.xml b/dev-ml/opam-solver/metadata.xml
index 856df00497e6..a80d577d653e 100644
--- a/dev-ml/opam-solver/metadata.xml
+++ b/dev-ml/opam-solver/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>ml@gentoo.org</email>
diff --git a/dev-ml/opam-solver/opam-solver-2.0.8-r1.ebuild b/dev-ml/opam-solver/opam-solver-2.0.8-r1.ebuild
index aa993e87c76c..5a8e924ec8fa 100644
--- a/dev-ml/opam-solver/opam-solver-2.0.8-r1.ebuild
+++ b/dev-ml/opam-solver/opam-solver-2.0.8-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/opam-${PV/_/-}"
LICENSE="LGPL-2.1"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~x86"
IUSE="+ocamlopt test"
RESTRICT="!test? ( test )"
diff --git a/dev-ml/opam-solver/opam-solver-2.1.0.ebuild b/dev-ml/opam-solver/opam-solver-2.1.0.ebuild
new file mode 100644
index 000000000000..3ee659981fd5
--- /dev/null
+++ b/dev-ml/opam-solver/opam-solver-2.1.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 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"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/dev-ml/opam/opam-2.1.0-dose3-6.patch.xz"
+S="${WORKDIR}/opam-${PV/_/-}"
+
+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-${PV}:=
+ dev-ml/opam-file-format:=
+ dev-ml/re:=
+ >=dev-ml/mccs-1.1.4:=
+ >=dev-ml/dose3-6.0:=
+ dev-ml/cudf:=
+"
+DEPEND="${RDEPEND}
+ test? ( dev-ml/opam-client )"
+
+PATCHES=( "${WORKDIR}"/opam-2.1.0-dose3-6.patch )
+
+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
index a8c97c7a26f1..0b145947da01 100644
--- a/dev-ml/opam-state/Manifest
+++ b/dev-ml/opam-state/Manifest
@@ -1,2 +1,4 @@
DIST opam-2.0.8.tar.gz 643221 BLAKE2B 66510a18285f315fe95665e8ba2f334dd44211c716543cdc25f2951a7dfe537f115981046e5963fd08deea4c76f5672fa7cf8e7af2274a713a3165bdd0bac8c2 SHA512 14737dc994be2c54dfeaf2658d3713178033e1bc2b4b845a58b4bfc118bbbf12b502924add0ae32b4b2b6c1944462e5ee7143df3de362d9ee39573249d013bc9
DIST opam-2.0.9.tar.gz 644429 BLAKE2B d96ee79685a8ee8ff82c7570a747c80e38d86e513736a27904a4e471d1eaf432db72998251ac786cb8fbf1ad425fff42b772c5d26934e0929aae75c0946d4659 SHA512 0d8ee19ac0f3df9de4fd9cfa8daab1f7228f090f5e2e7e26bedf24d8c2ab377aade95048f2d7cd9ee9dbbe738729e26dc99f41f730fa2252df74953362464a22
+DIST opam-2.1.0-dose3-6.patch.xz 5896 BLAKE2B f605064ebae7d327895729962a345a3c679519895aa2568f0c2d199d4ba9d6ae948a4fc418cfd26cc65079eb6ef3545f24a35e08c969d215529664a80d0c9147 SHA512 e00da74d7baef62319e884e3a05112bcf86a02d887c274bd15fb0d15bb8198e9a37a421f388bec3fce198e7a1b4d37024b18609dc65978c6ee8a7889df9bd608
+DIST opam-2.1.0.tar.gz 825966 BLAKE2B 42ab8ad2825e4e167618ece7bd2ce77ff055d584039fe2f644fa1c3e99d175cc7047f32bda53599af4fb177d844970883125cebca823024d1bc43a34857f20c5 SHA512 c0060e609c49a12dc8f64accef990aa593db818b72df3984fb9b4b22d8678b46c515916c84134a62dab614c716b61788eadc954d295f32c1f27d38aec22b3edf
diff --git a/dev-ml/opam-state/metadata.xml b/dev-ml/opam-state/metadata.xml
index 856df00497e6..a80d577d653e 100644
--- a/dev-ml/opam-state/metadata.xml
+++ b/dev-ml/opam-state/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>ml@gentoo.org</email>
diff --git a/dev-ml/opam-state/opam-state-2.0.8-r1.ebuild b/dev-ml/opam-state/opam-state-2.0.8-r1.ebuild
index cf9ab72c819e..ce874e2ac46b 100644
--- a/dev-ml/opam-state/opam-state-2.0.8-r1.ebuild
+++ b/dev-ml/opam-state/opam-state-2.0.8-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/opam-${PV/_/-}"
LICENSE="LGPL-2.1"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~x86"
IUSE="+ocamlopt"
RESTRICT="test"
diff --git a/dev-ml/opam-state/opam-state-2.0.8.ebuild b/dev-ml/opam-state/opam-state-2.0.8.ebuild
index 48e053b3e9cf..9e492c922944 100644
--- a/dev-ml/opam-state/opam-state-2.0.8.ebuild
+++ b/dev-ml/opam-state/opam-state-2.0.8.ebuild
@@ -17,6 +17,7 @@ IUSE="+ocamlopt"
RESTRICT="test"
RDEPEND="
+ <dev-lang/ocaml-4.12
dev-ml/re:=
dev-ml/opam-file-format:=
~dev-ml/opam-repository-${PV}:=
diff --git a/dev-ml/opam-state/opam-state-2.1.0.ebuild b/dev-ml/opam-state/opam-state-2.1.0.ebuild
new file mode 100644
index 000000000000..6c2a6cf8e81f
--- /dev/null
+++ b/dev-ml/opam-state/opam-state-2.1.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 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"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/dev-ml/opam/opam-2.1.0-dose3-6.patch.xz"
+S="${WORKDIR}/opam-${PV/_/-}"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+RESTRICT="test"
+
+RDEPEND="
+ dev-ml/re:=
+ dev-ml/opam-file-format:=
+ ~dev-ml/opam-repository-${PV}:=
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${WORKDIR}"/opam-2.1.0-dose3-6.patch )
+
+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 6022b2986d90..0b145947da01 100644
--- a/dev-ml/opam/Manifest
+++ b/dev-ml/opam/Manifest
@@ -1 +1,4 @@
DIST opam-2.0.8.tar.gz 643221 BLAKE2B 66510a18285f315fe95665e8ba2f334dd44211c716543cdc25f2951a7dfe537f115981046e5963fd08deea4c76f5672fa7cf8e7af2274a713a3165bdd0bac8c2 SHA512 14737dc994be2c54dfeaf2658d3713178033e1bc2b4b845a58b4bfc118bbbf12b502924add0ae32b4b2b6c1944462e5ee7143df3de362d9ee39573249d013bc9
+DIST opam-2.0.9.tar.gz 644429 BLAKE2B d96ee79685a8ee8ff82c7570a747c80e38d86e513736a27904a4e471d1eaf432db72998251ac786cb8fbf1ad425fff42b772c5d26934e0929aae75c0946d4659 SHA512 0d8ee19ac0f3df9de4fd9cfa8daab1f7228f090f5e2e7e26bedf24d8c2ab377aade95048f2d7cd9ee9dbbe738729e26dc99f41f730fa2252df74953362464a22
+DIST opam-2.1.0-dose3-6.patch.xz 5896 BLAKE2B f605064ebae7d327895729962a345a3c679519895aa2568f0c2d199d4ba9d6ae948a4fc418cfd26cc65079eb6ef3545f24a35e08c969d215529664a80d0c9147 SHA512 e00da74d7baef62319e884e3a05112bcf86a02d887c274bd15fb0d15bb8198e9a37a421f388bec3fce198e7a1b4d37024b18609dc65978c6ee8a7889df9bd608
+DIST opam-2.1.0.tar.gz 825966 BLAKE2B 42ab8ad2825e4e167618ece7bd2ce77ff055d584039fe2f644fa1c3e99d175cc7047f32bda53599af4fb177d844970883125cebca823024d1bc43a34857f20c5 SHA512 c0060e609c49a12dc8f64accef990aa593db818b72df3984fb9b4b22d8678b46c515916c84134a62dab614c716b61788eadc954d295f32c1f27d38aec22b3edf
diff --git a/dev-ml/opam/metadata.xml b/dev-ml/opam/metadata.xml
index 856df00497e6..a80d577d653e 100644
--- a/dev-ml/opam/metadata.xml
+++ b/dev-ml/opam/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>ml@gentoo.org</email>
diff --git a/dev-ml/opam/opam-2.0.8-r1.ebuild b/dev-ml/opam/opam-2.0.8-r1.ebuild
index 6fd893a1ef12..d380dc8772c7 100644
--- a/dev-ml/opam/opam-2.0.8-r1.ebuild
+++ b/dev-ml/opam/opam-2.0.8-r1.ebuild
@@ -16,6 +16,7 @@ KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
IUSE="+ocamlopt"
RDEPEND="
+ <dev-lang/ocaml-4.12
dev-ml/cmdliner:=
dev-ml/cudf:=
dev-ml/dose3:=
diff --git a/dev-ml/opam/opam-2.0.8-r2.ebuild b/dev-ml/opam/opam-2.0.8-r2.ebuild
index e882aefd038f..405deff7d89a 100644
--- a/dev-ml/opam/opam-2.0.8-r2.ebuild
+++ b/dev-ml/opam/opam-2.0.8-r2.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/opam-${PV/_/-}"
LICENSE="LGPL-2.1-with-linking-exception"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~x86"
IUSE="+ocamlopt"
RDEPEND="
diff --git a/dev-ml/opam/opam-2.0.9.ebuild b/dev-ml/opam/opam-2.0.9.ebuild
new file mode 100644
index 000000000000..e882aefd038f
--- /dev/null
+++ b/dev-ml/opam/opam-2.0.9.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 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"
+S="${WORKDIR}/opam-${PV/_/-}"
+
+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-6.0:=
+ dev-ml/extlib:=
+ ~dev-ml/opam-client-${PV}:=
+ dev-ml/opam-file-format:=
+ dev-ml/re:="
+DEPEND="${RDEPEND}"
+
+# Cherry-picked from https://deb.debian.org/debian/pool/main/o/opam/opam_2.0.8-1.debian.tar.xz
+PATCHES=( "${FILESDIR}/debian-Port-to-Dose3-6.0.1.patch" )
+
+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/opam-2.1.0.ebuild b/dev-ml/opam/opam-2.1.0.ebuild
new file mode 100644
index 000000000000..c123071f54ab
--- /dev/null
+++ b/dev-ml/opam/opam-2.1.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 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"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/dev-ml/opam/opam-2.1.0-dose3-6.patch.xz"
+S="${WORKDIR}/opam-${PV/_/-}"
+
+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-6.0:=
+ dev-ml/extlib:=
+ ~dev-ml/opam-client-${PV}:=
+ dev-ml/opam-file-format:=
+ dev-ml/re:="
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${WORKDIR}"/opam-2.1.0-dose3-6.patch )
+
+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/ounit2/metadata.xml b/dev-ml/ounit2/metadata.xml
index a7987b4aa43b..9b9b179cf556 100644
--- a/dev-ml/ounit2/metadata.xml
+++ b/dev-ml/ounit2/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>ml@gentoo.org</email>
diff --git a/dev-ml/parmap/metadata.xml b/dev-ml/parmap/metadata.xml
index 19becceff313..6f88a7f16d78 100644
--- a/dev-ml/parmap/metadata.xml
+++ b/dev-ml/parmap/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>ml@gentoo.org</email>
diff --git a/dev-ml/parmap/parmap-1.2.3.ebuild b/dev-ml/parmap/parmap-1.2.3.ebuild
index f121c81a3f1e..170399c1cc16 100644
--- a/dev-ml/parmap/parmap-1.2.3.ebuild
+++ b/dev-ml/parmap/parmap-1.2.3.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}-${MY_PV/+/-}"
LICENSE="LGPL-2-with-linking-exception"
SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
IUSE="+ocamlopt"
BDEPEND="dev-ml/dune-configurator"
diff --git a/dev-ml/parsexp/Manifest b/dev-ml/parsexp/Manifest
index 36d1d62ef689..d3a2583063af 100644
--- a/dev-ml/parsexp/Manifest
+++ b/dev-ml/parsexp/Manifest
@@ -1 +1,2 @@
DIST parsexp-0.14.0.tar.gz 48617 BLAKE2B eba36c17f08b59ed7601c4f9906e80de45e377d0134fdee30b5536c3d91af0cb45a1cdab90333498da8bf3fcf5e5bea16a8f734e7f1a92c9b865cd3136a668c2 SHA512 d9e9ea936dcf23d700e6ddd4153a2a96df6819094eaebe15d949c4569fa5125ab308af2c10f4ba2161610d8673eeb3928dd19c10a21974c140e4c89537a86575
+DIST parsexp-0.14.1.tar.gz 48617 BLAKE2B d491b8c28eb0a269985df107152b6239513fb9d59dc723c9692dd436883331ce23fdd714bc467b4fcdaba81baa2adb2421110e92fb5bd3f526437856f4edaa02 SHA512 c9d6a00dbe49272fa32ba3684249d5085482fe2024795391aa3605b21962e9d426535a46d7139b487332b86e05f042226dd1a8166d2a3cb9dcee9b4b06b81ab8
diff --git a/dev-ml/parsexp/metadata.xml b/dev-ml/parsexp/metadata.xml
index ec5d4ff1ab88..52964dbdc913 100644
--- a/dev-ml/parsexp/metadata.xml
+++ b/dev-ml/parsexp/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>gienah@gentoo.org</email>
diff --git a/dev-ml/parsexp/parsexp-0.14.0.ebuild b/dev-ml/parsexp/parsexp-0.14.0.ebuild
index fef7fd77106b..f8584c55d192 100644
--- a/dev-ml/parsexp/parsexp-0.14.0.ebuild
+++ b/dev-ml/parsexp/parsexp-0.14.0.ebuild
@@ -9,7 +9,7 @@ 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"
+LICENSE="MIT"
SLOT="0/${PV}"
KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
IUSE="+ocamlopt"
diff --git a/dev-ml/parsexp/parsexp-0.14.1.ebuild b/dev-ml/parsexp/parsexp-0.14.1.ebuild
new file mode 100644
index 000000000000..810e47fb94a5
--- /dev/null
+++ b/dev-ml/parsexp/parsexp-0.14.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 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="MIT"
+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/patience_diff/metadata.xml b/dev-ml/patience_diff/metadata.xml
index 11578db4e5d5..c87f5360ebd1 100644
--- a/dev-ml/patience_diff/metadata.xml
+++ b/dev-ml/patience_diff/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>ML</name>
+ </maintainer>
<upstream>
<remote-id type="github">janestreet/patience_diff</remote-id>
</upstream>
diff --git a/dev-ml/pcre-ocaml/metadata.xml b/dev-ml/pcre-ocaml/metadata.xml
index f76c701b6740..17ff7c86c5ae 100644
--- a/dev-ml/pcre-ocaml/metadata.xml
+++ b/dev-ml/pcre-ocaml/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>ml@gentoo.org</email>
diff --git a/dev-ml/pcre-ocaml/pcre-ocaml-7.4.6-r1.ebuild b/dev-ml/pcre-ocaml/pcre-ocaml-7.4.6-r2.ebuild
index a5f56117f2dd..7bc4861b3f59 100644
--- a/dev-ml/pcre-ocaml/pcre-ocaml-7.4.6-r1.ebuild
+++ b/dev-ml/pcre-ocaml/pcre-ocaml-7.4.6-r2.ebuild
@@ -16,11 +16,9 @@ SLOT="0/${PV}"
KEYWORDS="amd64 ~arm ~arm64 ppc x86"
BDEPEND="dev-ml/dune-configurator"
-RDEPEND=">=dev-libs/libpcre-4.5"
-DEPEND="
- ${RDEPEND}
- dev-ml/stdio
-"
+RDEPEND=">=dev-libs/libpcre-4.5
+ dev-ml/stdio:="
+DEPEND="${RDEPEND}"
src_install() {
dune_src_install pcre
diff --git a/dev-ml/ppx_assert/files/ppx_assert-0.14.0-4.12.patch b/dev-ml/ppx_assert/files/ppx_assert-0.14.0-4.12.patch
new file mode 100644
index 000000000000..80ff9fb1eb47
--- /dev/null
+++ b/dev-ml/ppx_assert/files/ppx_assert-0.14.0-4.12.patch
@@ -0,0 +1,30 @@
+--- a/runtime-lib/runtime.ml 2021-09-30 19:07:51.592766183 +0200
++++ b/runtime-lib/runtime.ml 2021-09-30 19:11:18.035634157 +0200
+@@ -71,7 +71,7 @@
+ end;
+ `Fail (expect, got)
+
+-let test_result_or_eq ~sexpifier ~comparator ?equal ~expect ~got =
++let test_result_or_eq ~sexpifier ~comparator ~equal ~expect ~got =
+ let pass =
+ match equal with
+ | None -> comparator got expect = 0
+@@ -89,7 +89,7 @@
+ ]
+
+ let test_eq ~pos ~sexpifier ~comparator ~here ?message ?equal t1 t2 =
+- match test_result_or_eq ~sexpifier ~comparator ?equal ~expect:t1 ~got:t2 with
++ match test_result_or_eq ~sexpifier ~comparator ~equal ~expect:t1 ~got:t2 with
+ | `Pass -> ()
+ | `Fail (t1, t2) -> test_eq_failed ~message ~pos ~here ~t1 ~t2
+
+@@ -99,7 +99,7 @@
+ Sexp.List [Sexp.Atom "got"; got];
+ ]
+
+-let test_result ~pos ~sexpifier ~comparator ~here ?message ?equal ~expect ~got =
+- match test_result_or_eq ~sexpifier ~comparator ?equal ~expect ~got with
++let[@warning "-16"] test_result ~pos ~sexpifier ~comparator ~here ?message ?equal ~expect ~got =
++ match test_result_or_eq ~sexpifier ~comparator ~equal ~expect ~got with
+ | `Pass -> ()
+ | `Fail (expect, got) -> test_result_failed ~message ~pos ~here ~expect ~got
diff --git a/dev-ml/ppx_assert/metadata.xml b/dev-ml/ppx_assert/metadata.xml
index b83f7118873b..d0d7bf7876c6 100644
--- a/dev-ml/ppx_assert/metadata.xml
+++ b/dev-ml/ppx_assert/metadata.xml
@@ -1,6 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>ML</name>
+ </maintainer>
<maintainer type="person">
<email>gienah@gentoo.org</email>
<name>Mark Wright</name>
diff --git a/dev-ml/ppx_assert/ppx_assert-0.14.0.ebuild b/dev-ml/ppx_assert/ppx_assert-0.14.0.ebuild
index 4db2bc4b5920..0be3c6c2301b 100644
--- a/dev-ml/ppx_assert/ppx_assert-0.14.0.ebuild
+++ b/dev-ml/ppx_assert/ppx_assert-0.14.0.ebuild
@@ -27,3 +27,5 @@ DEPEND="
dev-ml/cinaps:=
"
RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-4.12.patch )
diff --git a/dev-ml/ppx_base/metadata.xml b/dev-ml/ppx_base/metadata.xml
index 9949f15ae8cc..97b1c5ce5692 100644
--- a/dev-ml/ppx_base/metadata.xml
+++ b/dev-ml/ppx_base/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>gienah@gentoo.org</email>
diff --git a/dev-ml/ppx_bench/metadata.xml b/dev-ml/ppx_bench/metadata.xml
index 8101d49c7a8c..2d39cc2f1789 100644
--- a/dev-ml/ppx_bench/metadata.xml
+++ b/dev-ml/ppx_bench/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>gienah@gentoo.org</email>
diff --git a/dev-ml/ppx_bin_prot/metadata.xml b/dev-ml/ppx_bin_prot/metadata.xml
index 1854dc854561..8920b99b1025 100644
--- a/dev-ml/ppx_bin_prot/metadata.xml
+++ b/dev-ml/ppx_bin_prot/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>gienah@gentoo.org</email>
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
index 5c074d9d55ca..d2f36bcbc01f 100644
--- 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
@@ -15,17 +15,16 @@ KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
IUSE="+ocamlopt test"
RESTRICT="!test? ( test )"
-DEPEND="
+RDEPEND="
>=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:=
+ >=dev-ml/ocaml-migrate-parsetree-2.0.0:=
+ dev-ml/cinaps:=
"
-RDEPEND="${DEPEND}"
-DEPEND="${DEPEND}
+DEPEND="${RDEPEND}
test? (
dev-ml/ppx_jane
)"
diff --git a/dev-ml/ppx_cold/metadata.xml b/dev-ml/ppx_cold/metadata.xml
index 6f4a7fe7e1eb..f8049dce70ad 100644
--- a/dev-ml/ppx_cold/metadata.xml
+++ b/dev-ml/ppx_cold/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>gienah@gentoo.org</email>
diff --git a/dev-ml/ppx_compare/metadata.xml b/dev-ml/ppx_compare/metadata.xml
index 3ab5bd7e5b35..9fb55f427c15 100644
--- a/dev-ml/ppx_compare/metadata.xml
+++ b/dev-ml/ppx_compare/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>ml@gentoo.org</email>
diff --git a/dev-ml/ppx_custom_printf/metadata.xml b/dev-ml/ppx_custom_printf/metadata.xml
index bd8c830ce5d7..bea85e467e83 100644
--- a/dev-ml/ppx_custom_printf/metadata.xml
+++ b/dev-ml/ppx_custom_printf/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>gienah@gentoo.org</email>
diff --git a/dev-ml/ppx_derivers/metadata.xml b/dev-ml/ppx_derivers/metadata.xml
index 60ca2c998ff0..d4a00b62a982 100644
--- a/dev-ml/ppx_derivers/metadata.xml
+++ b/dev-ml/ppx_derivers/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>gienah@gentoo.org</email>
diff --git a/dev-ml/ppx_deriving/metadata.xml b/dev-ml/ppx_deriving/metadata.xml
index 196c8d34a1f0..28dc5257f5da 100644
--- a/dev-ml/ppx_deriving/metadata.xml
+++ b/dev-ml/ppx_deriving/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>ml@gentoo.org</email>
diff --git a/dev-ml/ppx_deriving/ppx_deriving-5.2.1.ebuild b/dev-ml/ppx_deriving/ppx_deriving-5.2.1.ebuild
index 73a1495d16a7..40839d6f4a08 100644
--- a/dev-ml/ppx_deriving/ppx_deriving-5.2.1.ebuild
+++ b/dev-ml/ppx_deriving/ppx_deriving-5.2.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ocaml-ppx/ppx_deriving/archive/v${PV}.tar.gz -> ${P}
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
IUSE="+ocamlopt test"
RESTRICT="!test? ( test )"
diff --git a/dev-ml/ppx_enumerate/metadata.xml b/dev-ml/ppx_enumerate/metadata.xml
index 0691d2ad6671..e54ea8f37b8b 100644
--- a/dev-ml/ppx_enumerate/metadata.xml
+++ b/dev-ml/ppx_enumerate/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>gienah@gentoo.org</email>
diff --git a/dev-ml/ppx_expect/metadata.xml b/dev-ml/ppx_expect/metadata.xml
index 4c6149713324..56f1e73abc39 100644
--- a/dev-ml/ppx_expect/metadata.xml
+++ b/dev-ml/ppx_expect/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>ml@gentoo.org</email>
diff --git a/dev-ml/ppx_expect/ppx_expect-0.14.0.ebuild b/dev-ml/ppx_expect/ppx_expect-0.14.0.ebuild
index b055cba214fa..6fd1fa74a288 100644
--- a/dev-ml/ppx_expect/ppx_expect-0.14.0.ebuild
+++ b/dev-ml/ppx_expect/ppx_expect-0.14.0.ebuild
@@ -15,23 +15,23 @@ KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
IUSE="+ocamlopt test"
RESTRICT="!test? ( test )"
-DEPEND="
+RDEPEND="
>=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/ocaml-compiler-libs-0.11.0:=
+ >=dev-ml/ocaml-migrate-parsetree-2.0.0:=
+ dev-ml/cinaps:=
dev-ml/re:=
"
-RDEPEND="${DEPEND}"
-DEPEND="${DEPEND}
+DEPEND="${RDEPEND}
test? (
dev-ml/ppx_jane
)"
+
# https://bugs.gentoo.org/749291#c2
-RESTRICT=test
+RESTRICT="test"
PATCHES=( "${FILESDIR}"/${P}-ppxlib-0.18.0.patch )
diff --git a/dev-ml/ppx_expect/ppx_expect-0.14.1.ebuild b/dev-ml/ppx_expect/ppx_expect-0.14.1.ebuild
index 9d7682d713fc..5463fa2ad199 100644
--- a/dev-ml/ppx_expect/ppx_expect-0.14.1.ebuild
+++ b/dev-ml/ppx_expect/ppx_expect-0.14.1.ebuild
@@ -11,11 +11,11 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
LICENSE="Apache-2.0"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
IUSE="+ocamlopt test"
RESTRICT="!test? ( test )"
-DEPEND="
+RDEPEND="
>=dev-ml/base-0.14.0:=
>=dev-ml/ppx_here-0.14.0:=
>=dev-ml/ppx_inline_test-0.14.1:=
@@ -26,10 +26,10 @@ DEPEND="
dev-ml/cinaps:=
dev-ml/re:=
"
-RDEPEND="${DEPEND}"
-DEPEND="${DEPEND}
+DEPEND="${RDEPEND}
test? (
dev-ml/ppx_jane
)"
+
# https://bugs.gentoo.org/749291#c2
-RESTRICT=test
+RESTRICT="test"
diff --git a/dev-ml/ppx_fail/metadata.xml b/dev-ml/ppx_fail/metadata.xml
index 35728b324db4..ea62fbbf5e52 100644
--- a/dev-ml/ppx_fail/metadata.xml
+++ b/dev-ml/ppx_fail/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>gienah@gentoo.org</email>
diff --git a/dev-ml/ppx_fields_conv/metadata.xml b/dev-ml/ppx_fields_conv/metadata.xml
index 06458282b1c0..de9c03f93188 100644
--- a/dev-ml/ppx_fields_conv/metadata.xml
+++ b/dev-ml/ppx_fields_conv/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>gienah@gentoo.org</email>
diff --git a/dev-ml/ppx_fixed_literal/metadata.xml b/dev-ml/ppx_fixed_literal/metadata.xml
index bba8ca659214..6b86e89cdc8e 100644
--- a/dev-ml/ppx_fixed_literal/metadata.xml
+++ b/dev-ml/ppx_fixed_literal/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>gienah@gentoo.org</email>
diff --git a/dev-ml/ppx_hash/metadata.xml b/dev-ml/ppx_hash/metadata.xml
index 45d95eaf5e0f..a9ed00055e96 100644
--- a/dev-ml/ppx_hash/metadata.xml
+++ b/dev-ml/ppx_hash/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>gienah@gentoo.org</email>
diff --git a/dev-ml/ppx_here/metadata.xml b/dev-ml/ppx_here/metadata.xml
index 24b631f152ae..53a6f382c39c 100644
--- a/dev-ml/ppx_here/metadata.xml
+++ b/dev-ml/ppx_here/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>gienah@gentoo.org</email>
diff --git a/dev-ml/ppx_inline_test/metadata.xml b/dev-ml/ppx_inline_test/metadata.xml
index b8d06ea426a3..4c0b0f680501 100644
--- a/dev-ml/ppx_inline_test/metadata.xml
+++ b/dev-ml/ppx_inline_test/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>gienah@gentoo.org</email>
diff --git a/dev-ml/ppx_jane/metadata.xml b/dev-ml/ppx_jane/metadata.xml
index 1ad033b289c7..2722d9bcf8c9 100644
--- a/dev-ml/ppx_jane/metadata.xml
+++ b/dev-ml/ppx_jane/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>gienah@gentoo.org</email>
diff --git a/dev-ml/ppx_js_style/metadata.xml b/dev-ml/ppx_js_style/metadata.xml
index 0d5d7a713ab7..cbc6fa1aac0d 100644
--- a/dev-ml/ppx_js_style/metadata.xml
+++ b/dev-ml/ppx_js_style/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>gienah@gentoo.org</email>
diff --git a/dev-ml/ppx_let/metadata.xml b/dev-ml/ppx_let/metadata.xml
index 94e867485031..04bc3565268a 100644
--- a/dev-ml/ppx_let/metadata.xml
+++ b/dev-ml/ppx_let/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>gienah@gentoo.org</email>
diff --git a/dev-ml/ppx_metaquot/metadata.xml b/dev-ml/ppx_metaquot/metadata.xml
index dac500f6bc30..380b6c5bbb6e 100644
--- a/dev-ml/ppx_metaquot/metadata.xml
+++ b/dev-ml/ppx_metaquot/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>gienah@gentoo.org</email>
diff --git a/dev-ml/ppx_module_timer/metadata.xml b/dev-ml/ppx_module_timer/metadata.xml
index b916abe0f3a0..a3f52bca1c2f 100644
--- a/dev-ml/ppx_module_timer/metadata.xml
+++ b/dev-ml/ppx_module_timer/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>gienah@gentoo.org</email>
diff --git a/dev-ml/ppx_optcomp/Manifest b/dev-ml/ppx_optcomp/Manifest
index 2c8054a9d09c..ba84a1b65683 100644
--- a/dev-ml/ppx_optcomp/Manifest
+++ b/dev-ml/ppx_optcomp/Manifest
@@ -1 +1,2 @@
DIST ppx_optcomp-0.14.0.tar.gz 16583 BLAKE2B 9b139708e02501245d5440a862324fe0191c9c96772e6599ed474a734263c4d2c0fa08fff666abd2efb218ec03a2b9b47c5ef6480d53a8d0f280550b741ac39a SHA512 e86b108d805500cbd7be628f41436ec8de0e8622d4218631d01bf73b0e70da0a057b8531465206baa9b8851ce9c22c5cd53921fccfae352ee46527d69964dc44
+DIST ppx_optcomp-0.14.3.tar.gz 16749 BLAKE2B 3c6dd2b5ac0a10e3d95c6a734ee09b0bef8af6d949c9f31150f1f8ac14ec72bb06455c3bf0c025bc99b939fa86b0d730abd8aefcdbd3998bfc16eef7a6a766bd SHA512 73b53dece639aebe20a8c9eaec50f6f491ac8163d96ceab66169d99f9bb50ed9c40c38731cd6e8543dae97c3a45650733d622e5bd4a2db812000c4694c823157
diff --git a/dev-ml/ppx_optcomp/metadata.xml b/dev-ml/ppx_optcomp/metadata.xml
index 30b65cf1fd3a..293ab3d79b9d 100644
--- a/dev-ml/ppx_optcomp/metadata.xml
+++ b/dev-ml/ppx_optcomp/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>gienah@gentoo.org</email>
diff --git a/dev-ml/ppx_optcomp/ppx_optcomp-0.14.3.ebuild b/dev-ml/ppx_optcomp/ppx_optcomp-0.14.3.ebuild
new file mode 100644
index 000000000000..a55939544f16
--- /dev/null
+++ b/dev-ml/ppx_optcomp/ppx_optcomp-0.14.3.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 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}"
diff --git a/dev-ml/ppx_optional/metadata.xml b/dev-ml/ppx_optional/metadata.xml
index 8a58c771030e..3b7c6eee710d 100644
--- a/dev-ml/ppx_optional/metadata.xml
+++ b/dev-ml/ppx_optional/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>gienah@gentoo.org</email>
diff --git a/dev-ml/ppx_pipebang/metadata.xml b/dev-ml/ppx_pipebang/metadata.xml
index 91b6ab049cba..53e82939506d 100644
--- a/dev-ml/ppx_pipebang/metadata.xml
+++ b/dev-ml/ppx_pipebang/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>gienah@gentoo.org</email>
diff --git a/dev-ml/ppx_sexp_conv/metadata.xml b/dev-ml/ppx_sexp_conv/metadata.xml
index 9bee6e451eb3..ed23cfd61524 100644
--- a/dev-ml/ppx_sexp_conv/metadata.xml
+++ b/dev-ml/ppx_sexp_conv/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>ml@gentoo.org</email>
diff --git a/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.14.2.ebuild b/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.14.2-r1.ebuild
index 426c7be12542..7cdc3f5e627e 100644
--- a/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.14.2.ebuild
+++ b/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.14.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/ppx_sexp_conv/archive/v${PV}.tar.gz -> ${
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
IUSE="+ocamlopt"
# Upper bound on ppxlib for bug #769536
@@ -19,7 +19,7 @@ DEPEND="
>=dev-ml/base-0.14.0:=
dev-ml/findlib:=
>=dev-ml/ppxlib-0.18.0:=
- <=dev-ml/ppxlib-0.20.0:=
+ <dev-ml/ppxlib-0.21.0:=
>=dev-ml/ocaml-compiler-libs-0.11.0:=
>=dev-ml/ocaml-migrate-parsetree-2.0.0:=
dev-ml/cinaps:=
diff --git a/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.14.3.ebuild b/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.14.3.ebuild
index 4c7a9470da50..e757ef8332b3 100644
--- a/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.14.3.ebuild
+++ b/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.14.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/ppx_sexp_conv/archive/v${PV}.tar.gz -> ${
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
IUSE="+ocamlopt"
# Upper bound on ppxlib for bug #769536
diff --git a/dev-ml/ppx_sexp_message/metadata.xml b/dev-ml/ppx_sexp_message/metadata.xml
index 2f418c1a3acf..6e0c122a1c3f 100644
--- a/dev-ml/ppx_sexp_message/metadata.xml
+++ b/dev-ml/ppx_sexp_message/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>gienah@gentoo.org</email>
diff --git a/dev-ml/ppx_sexp_value/metadata.xml b/dev-ml/ppx_sexp_value/metadata.xml
index 8bfb2fda744c..108677a9d0bf 100644
--- a/dev-ml/ppx_sexp_value/metadata.xml
+++ b/dev-ml/ppx_sexp_value/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>gienah@gentoo.org</email>
diff --git a/dev-ml/ppx_stable/metadata.xml b/dev-ml/ppx_stable/metadata.xml
index 0eb54d519244..7807fdf468bc 100644
--- a/dev-ml/ppx_stable/metadata.xml
+++ b/dev-ml/ppx_stable/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>gienah@gentoo.org</email>
diff --git a/dev-ml/ppx_string/metadata.xml b/dev-ml/ppx_string/metadata.xml
index d8a1d8c4676f..e048423a4f9f 100644
--- a/dev-ml/ppx_string/metadata.xml
+++ b/dev-ml/ppx_string/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>gienah@gentoo.org</email>
diff --git a/dev-ml/ppx_tools/Manifest b/dev-ml/ppx_tools/Manifest
index 5963a560f3ba..be9333053897 100644
--- a/dev-ml/ppx_tools/Manifest
+++ b/dev-ml/ppx_tools/Manifest
@@ -1,2 +1,3 @@
DIST ppx_tools-6.2.tar.gz 46150 BLAKE2B f8af2a1eee81d5a1e73ac606ab79d285c8c226533bcf715ed22386aecfaf51260fb9a5075d270675f1b601cb174b68d8c85556f418031a7b6bda06c4376fe443 SHA512 fc3943c69901ef46843355c3482d5a1481d05ee94fb0a344ec04101059a02cbaa76fed5742cfae82730edf378f2e140d859a5cf590653f85359255d451f07dc8
DIST ppx_tools-6.3.tar.gz 18811 BLAKE2B b1389dbe0c6fd855cafc8d64a9db550866317172909c2731f01acd412c6f8147f07e19a82d527187d0b211fca9eb2f2ad63bb53e8f375b0b8107c4e723710000 SHA512 6a88f6f877f49ea8736aeca60673a19c52d5104ad9e2a3e56db3f71cd557d39df9c709c4e678ccf10263ff1f3e0504f4676227bd05ceba1e0294453a988a736c
+DIST ppx_tools-6.4.tar.gz 19051 BLAKE2B dcb3e5a4ca5dd6243cae013739b93c6fe100ca21ad56c46e284255977f4e6d4263ef8d937ed672939e5b31bbe0904dcb1d71105f49385ad5d43404b19a9fe2c6 SHA512 514aa283f6bee11bf257abec98a751c656db63203caa4caee5ce606bcdee75891441a794b0bac22e2ff2e5d2760cd39ffaa2fce6bb118155daf05175917e6e7c
diff --git a/dev-ml/ppx_tools/metadata.xml b/dev-ml/ppx_tools/metadata.xml
index 5631f770f367..3bce000f5f82 100644
--- a/dev-ml/ppx_tools/metadata.xml
+++ b/dev-ml/ppx_tools/metadata.xml
@@ -1,6 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>ML</name>
+ </maintainer>
<maintainer type="person">
<email>gienah@gentoo.org</email>
<name>Mark Wright</name>
diff --git a/dev-ml/ppx_tools/ppx_tools-6.3.ebuild b/dev-ml/ppx_tools/ppx_tools-6.3.ebuild
index 1d025b5dacda..fa8079b62de1 100644
--- a/dev-ml/ppx_tools/ppx_tools-6.3.ebuild
+++ b/dev-ml/ppx_tools/ppx_tools-6.3.ebuild
@@ -13,5 +13,7 @@ S="${WORKDIR}/${PN}-$(ver_rs 2 '-')"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
IUSE="+ocamlopt"
+
+BDEPEND="dev-ml/cppo"
diff --git a/dev-ml/ppx_tools/ppx_tools-6.4.ebuild b/dev-ml/ppx_tools/ppx_tools-6.4.ebuild
new file mode 100644
index 000000000000..b8c31373448b
--- /dev/null
+++ b/dev-ml/ppx_tools/ppx_tools-6.4.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2021 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"
+S="${WORKDIR}/${PN}-$(ver_rs 2 '-')"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+BDEPEND="dev-ml/cppo"
diff --git a/dev-ml/ppx_tools_versioned/metadata.xml b/dev-ml/ppx_tools_versioned/metadata.xml
index ddebaeb27d82..4644bdd631ff 100644
--- a/dev-ml/ppx_tools_versioned/metadata.xml
+++ b/dev-ml/ppx_tools_versioned/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<upstream>
diff --git a/dev-ml/ppx_typerep_conv/metadata.xml b/dev-ml/ppx_typerep_conv/metadata.xml
index 72fb97feee61..fb00cc80ec86 100644
--- a/dev-ml/ppx_typerep_conv/metadata.xml
+++ b/dev-ml/ppx_typerep_conv/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>ml@gentoo.org</email>
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-r1.ebuild
index 35c02ef0a8cb..d864e10d34aa 100644
--- 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-r1.ebuild
@@ -18,7 +18,7 @@ DEPEND="
>=dev-ml/base-0.14.0:=
>=dev-ml/typerep-0.14.0:=
>=dev-ml/ppxlib-0.18.0:=
- <=dev-ml/ppxlib-0.20.0:=
+ <dev-ml/ppxlib-0.21.0:=
>=dev-ml/ocaml-compiler-libs-0.11.0:=
>=dev-ml/ocaml-migrate-parsetree-2.0.0:=
dev-ml/cinaps:=
diff --git a/dev-ml/ppx_typerep_conv/ppx_typerep_conv-0.14.2.ebuild b/dev-ml/ppx_typerep_conv/ppx_typerep_conv-0.14.2.ebuild
index d7592ebf551d..33347b97f969 100644
--- a/dev-ml/ppx_typerep_conv/ppx_typerep_conv-0.14.2.ebuild
+++ b/dev-ml/ppx_typerep_conv/ppx_typerep_conv-0.14.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
IUSE="+ocamlopt"
DEPEND="
diff --git a/dev-ml/ppx_variants_conv/files/ppx_variants_conv-0.14.1-ppxlib-0.23-compatibility.patch b/dev-ml/ppx_variants_conv/files/ppx_variants_conv-0.14.1-ppxlib-0.23-compatibility.patch
new file mode 100644
index 000000000000..d8df60aeec71
--- /dev/null
+++ b/dev-ml/ppx_variants_conv/files/ppx_variants_conv-0.14.1-ppxlib-0.23-compatibility.patch
@@ -0,0 +1,31 @@
+From 6103f6fc56f978c847ba7c1f2d9f38ee93a5e337 Mon Sep 17 00:00:00 2001
+From: Sonja Heinze <sonjaleaheinze@gmail.com>
+Date: Tue, 9 Mar 2021 12:57:47 +0100
+Subject: [PATCH] Adapt to Ppxlib's API change
+
+Ppxlib is removing Lexer.keyword_table from the API in exchange for
+the more lightweight Keyword.is_keyword.
+
+Signed-off-by: Sonja Heinze <sonjaleaheinze@gmail.com>
+--- a/ppx_variants_conv.opam
++++ b/ppx_variants_conv.opam
+@@ -15,7 +15,7 @@ depends: [
+ "base" {>= "v0.14" & < "v0.15"}
+ "variantslib" {>= "v0.14" & < "v0.15"}
+ "dune" {>= "2.0.0"}
+- "ppxlib" {>= "0.14.0"}
++ "ppxlib" {>= "0.23.0"}
+ ]
+ synopsis: "Generation of accessor and iteration functions for ocaml variant types"
+ description: "
+--- a/src/ppx_variants_conv.ml
++++ b/src/ppx_variants_conv.ml
+@@ -66,7 +66,7 @@ end
+
+ let variant_name_to_string v =
+ let s = String.lowercase v in
+- if Caml.Hashtbl.mem Lexer.keyword_table s
++ if Keyword.is_keyword s
+ then s ^ "_"
+ else s
+
diff --git a/dev-ml/ppx_variants_conv/metadata.xml b/dev-ml/ppx_variants_conv/metadata.xml
index c250bb0849f9..b5b4c3bff187 100644
--- a/dev-ml/ppx_variants_conv/metadata.xml
+++ b/dev-ml/ppx_variants_conv/metadata.xml
@@ -1,6 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>ML</name>
+ </maintainer>
<maintainer type="person">
<email>gienah@gentoo.org</email>
<name>Mark Wright</name>
diff --git a/dev-ml/ppx_variants_conv/ppx_variants_conv-0.14.1-r1.ebuild b/dev-ml/ppx_variants_conv/ppx_variants_conv-0.14.1-r1.ebuild
new file mode 100644
index 000000000000..8915cf1f56d1
--- /dev/null
+++ b/dev-ml/ppx_variants_conv/ppx_variants_conv-0.14.1-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 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.23.0:=
+ >=dev-ml/ocaml-compiler-libs-0.11.0:=
+ >=dev-ml/ocaml-migrate-parsetree-2.0.0:=
+ dev-ml/cinaps:=
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.14.1-ppxlib-0.23-compatibility.patch
+)
diff --git a/dev-ml/ppxfind/metadata.xml b/dev-ml/ppxfind/metadata.xml
index a63014b289a3..8eb95a3e7a89 100644
--- a/dev-ml/ppxfind/metadata.xml
+++ b/dev-ml/ppxfind/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>ml@gentoo.org</email>
diff --git a/dev-ml/ppxlib/Manifest b/dev-ml/ppxlib/Manifest
index 3e10474789b7..0fe2462e7822 100644
--- a/dev-ml/ppxlib/Manifest
+++ b/dev-ml/ppxlib/Manifest
@@ -3,3 +3,4 @@ DIST ppxlib-0.20.0.tar.gz 193453 BLAKE2B baf5703737792f274654de489aee31c1d324011
DIST ppxlib-0.21.0.tar.gz 201905 BLAKE2B f7a7b69ab07b2a5dce542877989fb4ca820acdda375371895072b857a44e8e7f437695f43990472dfad88261179ff07bd33f6e39881c2b28ff2650d7e2a53bdf SHA512 5760ecc8a5e0c0f49ad4f0d3ba2546185d36411f4292c4ebfbf0c9520438546a60d8fe0b265cec70793b03cc684e399401ff761cb1c369966add70118f1ecda5
DIST ppxlib-0.22.0.tar.gz 202241 BLAKE2B 6b18ceb23e248eb2b4faed66ba0ea1cbee36df61cee9458fc0fd7057eff433340cb602a429c3f100ee054da06d9de20eca44e5ecc4ba98c888cfec2c83097151 SHA512 11442120c24bf60d9de90c9a325de9e5d87d87ba08d8e4cd216a3434f422c62427aa4214909b80646db638423ea35dff4280d5a70cf51bdfadc0a97745c32d41
DIST ppxlib-0.22.2.tar.gz 202895 BLAKE2B 41d2c2e698846e5dfeb4158966b65dd29b253645b0286d0eab5a9dfb0e684b8b43f17a32b23023198d2c4e50e836705d2c965ea74ef337c5b0cf6aecd6fa4167 SHA512 3a83693551f11965b219a9caa4eaffbf358ea1311e05a38bfd531b8ad225d6571d86db7282e1d5bdc09775f2ba47791c03351402720cf5c2adefc52926d498e4
+DIST ppxlib-0.23.0.tar.gz 364308 BLAKE2B b1cc622eb5e01c455da437365053fd32a00d33007520cf28536e1f45c142aa0a9083da614110c1096fd3f8326453eb037a8c0054e00e17a813f99f3d8efde5d7 SHA512 9d6692ec4247031f26aed3bdc59808a5f929c34dbac3515a8b2a61c59ec118f0e90d12948d22aea40e9f01b1ed782e9dfa5b0263314b967217b2ac4006446c53
diff --git a/dev-ml/ppxlib/files/ppxlib-0.23.0-fix-ocaml-4.13.patch b/dev-ml/ppxlib/files/ppxlib-0.23.0-fix-ocaml-4.13.patch
new file mode 100644
index 000000000000..00bf6dc0e4cc
--- /dev/null
+++ b/dev-ml/ppxlib/files/ppxlib-0.23.0-fix-ocaml-4.13.patch
@@ -0,0 +1,23 @@
+https://github.com/ocaml-ppx/ppxlib/commit/ce371cfb4c2ad712cd8e9b803bbf4ef650aa5e72
+
+From: Sonja Heinze <sonjaleaheinze@gmail.com>
+Date: Fri, 10 Sep 2021 16:08:22 +0200
+Subject: [PATCH] Make our expect-test version compatible with 4.13 compiler
+
+The Warnings.parse_options function was returning a unit on older compilers
+and is returning an alert option now, but under the hood it still has the
+same side-effects.
+
+Signed-off-by: Sonja Heinze <sonjaleaheinze@gmail.com>
+--- a/test/expect/expect_test.ml
++++ b/test/expect/expect_test.ml
+@@ -63,7 +63,7 @@ let main () =
+ setup_printers ppf;
+ Topfind.log := ignore;
+
+- Warnings.parse_options false "@a-4-29-40-41-42-44-45-48-58";
++ let _ = Warnings.parse_options false "@a-4-29-40-41-42-44-45-48-58" in
+ Clflags.real_paths := false;
+ Toploop.initialize_toplevel_env ();
+
+
diff --git a/dev-ml/ppxlib/metadata.xml b/dev-ml/ppxlib/metadata.xml
index 41c7d3b61556..44e36d49260e 100644
--- a/dev-ml/ppxlib/metadata.xml
+++ b/dev-ml/ppxlib/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>ml@gentoo.org</email>
diff --git a/dev-ml/ppxlib/ppxlib-0.18.0.ebuild b/dev-ml/ppxlib/ppxlib-0.18.0.ebuild
index 3cee14a81864..2358fdf46446 100644
--- a/dev-ml/ppxlib/ppxlib-0.18.0.ebuild
+++ b/dev-ml/ppxlib/ppxlib-0.18.0.ebuild
@@ -5,6 +5,11 @@ EAPI=7
inherit dune
+# Note that new "major" versions may change which OCaml version they support
+# See:
+# https://github.com/ocaml-ppx/ppxlib/issues/243
+# https://github.com/ocaml-ppx/ppxlib/issues/232
+
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"
@@ -15,7 +20,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
IUSE="+ocamlopt test"
RESTRICT="!test? ( test )"
-DEPEND="
+RDEPEND="
>=dev-ml/base-0.11.0:=
dev-ml/findlib:=
>=dev-ml/ocaml-compiler-libs-0.11.0:=
@@ -26,8 +31,7 @@ DEPEND="
>=dev-ml/ppx_derivers-1.2.1:=
>=dev-ml/stdio-0.11.0:=
"
-RDEPEND="${DEPEND}"
-DEPEND="${DEPEND}
+DEPEND="${RDEPEND}
test? (
dev-ml/cinaps
)"
diff --git a/dev-ml/ppxlib/ppxlib-0.20.0.ebuild b/dev-ml/ppxlib/ppxlib-0.20.0-r1.ebuild
index d7f81c1a3a3b..d1dbfa8de952 100644
--- a/dev-ml/ppxlib/ppxlib-0.20.0.ebuild
+++ b/dev-ml/ppxlib/ppxlib-0.20.0-r1.ebuild
@@ -5,6 +5,11 @@ EAPI=7
inherit dune
+# Note that new "major" versions may change which OCaml version they support
+# See:
+# https://github.com/ocaml-ppx/ppxlib/issues/243
+# https://github.com/ocaml-ppx/ppxlib/issues/232
+
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"
@@ -25,5 +30,5 @@ RDEPEND="
>=dev-ml/ppx_derivers-1.2.1:=
>=dev-ml/stdio-0.11.0:=
"
-DEPEND="${DEPEND}
+DEPEND="${RDEPEND}
test? ( dev-ml/cinaps:= )"
diff --git a/dev-ml/ppxlib/ppxlib-0.21.0-r1.ebuild b/dev-ml/ppxlib/ppxlib-0.21.0-r3.ebuild
index 4e0bb08cb7f4..d6be89711e15 100644
--- a/dev-ml/ppxlib/ppxlib-0.21.0-r1.ebuild
+++ b/dev-ml/ppxlib/ppxlib-0.21.0-r3.ebuild
@@ -5,6 +5,11 @@ EAPI=7
inherit dune
+# Note that new "major" versions may change which OCaml version they support
+# See:
+# https://github.com/ocaml-ppx/ppxlib/issues/243
+# https://github.com/ocaml-ppx/ppxlib/issues/232
+
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"
@@ -15,7 +20,6 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
IUSE="+ocamlopt test"
RESTRICT="!test? ( test )"
-# nss[utils] has /usr/bin/pp
RDEPEND="
>=dev-ml/base-0.11.0:=
dev-ml/findlib:=
@@ -25,11 +29,18 @@ RDEPEND="
dev-ml/stdlib-shims:=
>=dev-ml/ppx_derivers-1.2.1:=
>=dev-ml/stdio-0.11.0:=
- !dev-libs/nss[utils]
"
-DEPEND="${DEPEND}
+DEPEND="${RDEPEND}
test? (
dev-ml/cinaps:=
dev-ml/re:=
)
"
+
+src_install() {
+ dune_src_install
+
+ # Clashes with dev-libs/nss[utils], accidentally installed upstream
+ # https://github.com/ocaml-ppx/ppxlib/issues/224
+ rm "${ED}"/usr/bin/pp || die
+}
diff --git a/dev-ml/ppxlib/ppxlib-0.22.0-r1.ebuild b/dev-ml/ppxlib/ppxlib-0.22.0-r3.ebuild
index 116ac1f1e0ee..bb3fbecbb17a 100644
--- a/dev-ml/ppxlib/ppxlib-0.22.0-r1.ebuild
+++ b/dev-ml/ppxlib/ppxlib-0.22.0-r3.ebuild
@@ -5,6 +5,11 @@ EAPI=7
inherit dune
+# Note that new "major" versions may change which OCaml version they support
+# See:
+# https://github.com/ocaml-ppx/ppxlib/issues/243
+# https://github.com/ocaml-ppx/ppxlib/issues/232
+
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"
@@ -15,16 +20,14 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
IUSE="+ocamlopt test"
RESTRICT="!test? ( test )"
-# nss[utils] has /usr/bin/pp
RDEPEND="
>=dev-ml/ocaml-compiler-libs-0.11.0:=
>=dev-ml/ocaml-migrate-parsetree-2.1.0:=
dev-ml/sexplib0:=
dev-ml/stdlib-shims:=
>=dev-ml/ppx_derivers-1.2.1:=
- !dev-libs/nss[utils]
"
-DEPEND="${DEPEND}
+DEPEND="${RDEPEND}
test? (
dev-ml/findlib:=
>=dev-ml/base-0.11.0:=
@@ -34,3 +37,11 @@ DEPEND="${DEPEND}
)
"
BDEPEND=">=dev-ml/dune-2.8"
+
+src_install() {
+ dune_src_install
+
+ # Clashes with dev-libs/nss[utils], accidentally installed upstream
+ # https://github.com/ocaml-ppx/ppxlib/issues/224
+ rm "${ED}"/usr/bin/pp || die
+}
diff --git a/dev-ml/ppxlib/ppxlib-0.22.2-r2.ebuild b/dev-ml/ppxlib/ppxlib-0.22.2-r2.ebuild
new file mode 100644
index 000000000000..33ca5ab0fb8d
--- /dev/null
+++ b/dev-ml/ppxlib/ppxlib-0.22.2-r2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+# Note that new "major" versions may change which OCaml version they support
+# See:
+# https://github.com/ocaml-ppx/ppxlib/issues/243
+# https://github.com/ocaml-ppx/ppxlib/issues/232
+
+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 )"
+
+RDEPEND="
+ >=dev-ml/ocaml-compiler-libs-0.11.0:=
+ >=dev-ml/ocaml-migrate-parsetree-2.2.0:=
+ dev-ml/sexplib0:=
+ dev-ml/stdlib-shims:=
+ >=dev-ml/ppx_derivers-1.2.1:=
+"
+DEPEND="${RDEPEND}
+ test? (
+ dev-ml/findlib:=
+ >=dev-ml/base-0.11.0:=
+ dev-ml/cinaps:=
+ dev-ml/re:=
+ >=dev-ml/stdio-0.11.0:=
+ )
+"
+BDEPEND=">=dev-ml/dune-2.8"
+
+src_install() {
+ dune_src_install
+
+ # Clashes with dev-libs/nss[utils], accidentally installed upstream
+ # https://github.com/ocaml-ppx/ppxlib/issues/224
+ rm "${ED}"/usr/bin/pp || die
+}
diff --git a/dev-ml/ppxlib/ppxlib-0.22.2.ebuild b/dev-ml/ppxlib/ppxlib-0.23.0-r1.ebuild
index bc486940ff77..5cb0b9a5899a 100644
--- a/dev-ml/ppxlib/ppxlib-0.22.2.ebuild
+++ b/dev-ml/ppxlib/ppxlib-0.23.0-r1.ebuild
@@ -5,6 +5,11 @@ EAPI=7
inherit dune
+# Note that new "major" versions may change which OCaml version they support
+# See:
+# https://github.com/ocaml-ppx/ppxlib/issues/243
+# https://github.com/ocaml-ppx/ppxlib/issues/232
+
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"
@@ -15,16 +20,14 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
IUSE="+ocamlopt test"
RESTRICT="!test? ( test )"
-# nss[utils] has /usr/bin/pp
RDEPEND="
>=dev-ml/ocaml-compiler-libs-0.11.0:=
>=dev-ml/ocaml-migrate-parsetree-2.2.0:=
dev-ml/sexplib0:=
dev-ml/stdlib-shims:=
>=dev-ml/ppx_derivers-1.2.1:=
- !dev-libs/nss[utils]
"
-DEPEND="${DEPEND}
+DEPEND="${RDEPEND}
test? (
dev-ml/findlib:=
>=dev-ml/base-0.11.0:=
@@ -34,3 +37,7 @@ DEPEND="${DEPEND}
)
"
BDEPEND=">=dev-ml/dune-2.8"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-fix-ocaml-4.13.patch
+)
diff --git a/dev-ml/protocol_version_header/metadata.xml b/dev-ml/protocol_version_header/metadata.xml
index 90d70ef938a9..2dc487fda89e 100644
--- a/dev-ml/protocol_version_header/metadata.xml
+++ b/dev-ml/protocol_version_header/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>ml@gentoo.org</email>
diff --git a/dev-ml/re/Manifest b/dev-ml/re/Manifest
index dff48b3bc245..45db396b8581 100644
--- a/dev-ml/re/Manifest
+++ b/dev-ml/re/Manifest
@@ -1 +1,2 @@
+DIST ocaml-re-1.10.3.tar.gz 90155 BLAKE2B 44f7779e2004c8ac24f6bf476edaea5f6469fd64319c681df1917d571e5f4175559516e5f19bcf5eee19687eb3ad0c93b672b97cfdc54f29803180b3b9a229d7 SHA512 c86bc375d52ba4d0363d56636dd389c29ce3fc430f569fd5c3af3265023bb80462d94ea9fce97387fdebc8731d33166871ac2f9162327674c2b97bdbde423bbd
DIST ocaml-re-1.9.0.tar.gz 83642 BLAKE2B abcabb80ffef241fc7e8ea075f49365cc64f8749db1d1f7eb654eeb52f5be8e96756f98ae7903391a26d8537f82e105878a38a15923d7f93c61abd5c08d3ff98 SHA512 3e11c6eccf573ab5d7f43accf1f1ac9eda0d7320067e142b9f76b309315c1e30d22c5bb80c7a54b05d9c92d3518d26ea82b5093de9b48f86e3c62d6073f14eda
diff --git a/dev-ml/re/metadata.xml b/dev-ml/re/metadata.xml
index e4f5c058dcb3..eefaf58ede59 100644
--- a/dev-ml/re/metadata.xml
+++ b/dev-ml/re/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>ml@gentoo.org</email>
diff --git a/dev-ml/re/re-1.10.3.ebuild b/dev-ml/re/re-1.10.3.ebuild
new file mode 100644
index 000000000000..9dc727449c23
--- /dev/null
+++ b/dev-ml/re/re-1.10.3.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 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/ounit2 )"
+
+PATCHES=( "${FILESDIR}/ounit2.patch" )
diff --git a/dev-ml/react/metadata.xml b/dev-ml/react/metadata.xml
index 39df5e2337a3..9371e28a658c 100644
--- a/dev-ml/react/metadata.xml
+++ b/dev-ml/react/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<longdescription lang="en">
diff --git a/dev-ml/reactiveData/metadata.xml b/dev-ml/reactiveData/metadata.xml
index 4aa903da617b..1c641ea72ce6 100644
--- a/dev-ml/reactiveData/metadata.xml
+++ b/dev-ml/reactiveData/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<upstream>
diff --git a/dev-ml/result/metadata.xml b/dev-ml/result/metadata.xml
index ffa2962f92c9..2dae997b6863 100644
--- a/dev-ml/result/metadata.xml
+++ b/dev-ml/result/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>gienah@gentoo.org</email>
diff --git a/dev-ml/rresult/metadata.xml b/dev-ml/rresult/metadata.xml
index 0f9a40bf9252..94c9ab51a46f 100644
--- a/dev-ml/rresult/metadata.xml
+++ b/dev-ml/rresult/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>ml@gentoo.org</email>
diff --git a/dev-ml/rresult/rresult-0.5.0.ebuild b/dev-ml/rresult/rresult-0.5.0.ebuild
index 9b9cecabf140..3d12ef8d3f7a 100644
--- a/dev-ml/rresult/rresult-0.5.0.ebuild
+++ b/dev-ml/rresult/rresult-0.5.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://erratique.ch/software/rresult/releases/${P}.tbz"
LICENSE="ISC"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
IUSE=""
RDEPEND="dev-ml/result:="
diff --git a/dev-ml/rresult/rresult-0.6.0.ebuild b/dev-ml/rresult/rresult-0.6.0.ebuild
index 0c47040813b3..cdea5cc2d55d 100644
--- a/dev-ml/rresult/rresult-0.6.0.ebuild
+++ b/dev-ml/rresult/rresult-0.6.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://erratique.ch/software/rresult/releases/${P}.tbz"
LICENSE="ISC"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~x86"
RDEPEND="dev-ml/result:="
DEPEND="${RDEPEND}"
diff --git a/dev-ml/seq/metadata.xml b/dev-ml/seq/metadata.xml
index e24f3283a006..c765c1971790 100644
--- a/dev-ml/seq/metadata.xml
+++ b/dev-ml/seq/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>ml@gentoo.org</email>
diff --git a/dev-ml/seq/seq-0.2.2.ebuild b/dev-ml/seq/seq-0.2.2.ebuild
index 0027a100131d..2f4f1e6fa6e4 100644
--- a/dev-ml/seq/seq-0.2.2.ebuild
+++ b/dev-ml/seq/seq-0.2.2.ebuild
@@ -11,5 +11,5 @@ SRC_URI="https://github.com/c-cube/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
IUSE="+ocamlopt"
diff --git a/dev-ml/sexplib/metadata.xml b/dev-ml/sexplib/metadata.xml
index 33a396fe6e79..5c1f1d9c78a6 100644
--- a/dev-ml/sexplib/metadata.xml
+++ b/dev-ml/sexplib/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>gienah@gentoo.org</email>
diff --git a/dev-ml/sexplib0/metadata.xml b/dev-ml/sexplib0/metadata.xml
index 87919029451d..fdce54b24021 100644
--- a/dev-ml/sexplib0/metadata.xml
+++ b/dev-ml/sexplib0/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>gienah@gentoo.org</email>
diff --git a/dev-ml/spawn/metadata.xml b/dev-ml/spawn/metadata.xml
index 4d2739a06438..1de34d8d6d0c 100644
--- a/dev-ml/spawn/metadata.xml
+++ b/dev-ml/spawn/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>ml@gentoo.org</email>
diff --git a/dev-ml/splittable_random/metadata.xml b/dev-ml/splittable_random/metadata.xml
index ca905a069955..17b925685fdc 100644
--- a/dev-ml/splittable_random/metadata.xml
+++ b/dev-ml/splittable_random/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>ml@gentoo.org</email>
diff --git a/dev-ml/stdio/metadata.xml b/dev-ml/stdio/metadata.xml
index 07fb8f069c5a..baebfc1d0444 100644
--- a/dev-ml/stdio/metadata.xml
+++ b/dev-ml/stdio/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>gienah@gentoo.org</email>
diff --git a/dev-ml/stdlib-shims/metadata.xml b/dev-ml/stdlib-shims/metadata.xml
index f24db56fc6f5..9eb14ab819d0 100644
--- a/dev-ml/stdlib-shims/metadata.xml
+++ b/dev-ml/stdlib-shims/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<longdescription>
Compatibility library for OCaml compilers before 4.08 to allow calling
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 5ce9d879e11b..9f748eb07a6d 100644
--- a/dev-ml/stdlib-shims/stdlib-shims-0.2.0.ebuild
+++ b/dev-ml/stdlib-shims/stdlib-shims-0.2.0.ebuild
@@ -12,6 +12,6 @@ SRC_URI="https://github.com/ocaml/${PN}/releases/download/${PV}/${P}.tbz"
LICENSE="LGPL-2.1-with-linking-exception"
SLOT="0"
KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
-IUSE="ocamlopt"
+IUSE="+ocamlopt"
DOCS=( "README.md" "CHANGES.md" "LICENSE" )
diff --git a/dev-ml/stdlib-shims/stdlib-shims-0.3.0.ebuild b/dev-ml/stdlib-shims/stdlib-shims-0.3.0.ebuild
index 135f3ce10d48..f4a918c72443 100644
--- a/dev-ml/stdlib-shims/stdlib-shims-0.3.0.ebuild
+++ b/dev-ml/stdlib-shims/stdlib-shims-0.3.0.ebuild
@@ -12,6 +12,6 @@ SRC_URI="https://github.com/ocaml/${PN}/releases/download/${PV}/${P}.tbz"
LICENSE="LGPL-2.1-with-linking-exception"
SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="ocamlopt"
+IUSE="+ocamlopt"
DOCS=( "README.md" "CHANGES.md" "LICENSE" )
diff --git a/dev-ml/textutils/metadata.xml b/dev-ml/textutils/metadata.xml
index 259c45b83ced..99fac2737bd9 100644
--- a/dev-ml/textutils/metadata.xml
+++ b/dev-ml/textutils/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>ml@gentoo.org</email>
diff --git a/dev-ml/time_now/metadata.xml b/dev-ml/time_now/metadata.xml
index 7f3d529ba9a3..ad8043fb109c 100644
--- a/dev-ml/time_now/metadata.xml
+++ b/dev-ml/time_now/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>gienah@gentoo.org</email>
diff --git a/dev-ml/timezone/metadata.xml b/dev-ml/timezone/metadata.xml
index 58b29d804a67..33a0c218ffc7 100644
--- a/dev-ml/timezone/metadata.xml
+++ b/dev-ml/timezone/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>ml@gentoo.org</email>
diff --git a/dev-ml/topkg/metadata.xml b/dev-ml/topkg/metadata.xml
index 5b0819cca142..89dfbe9fd6b7 100644
--- a/dev-ml/topkg/metadata.xml
+++ b/dev-ml/topkg/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>gienah@gentoo.org</email>
diff --git a/dev-ml/typerep/metadata.xml b/dev-ml/typerep/metadata.xml
index d4bd94e13be7..bc075c37e5c8 100644
--- a/dev-ml/typerep/metadata.xml
+++ b/dev-ml/typerep/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>ml@gentoo.org</email>
diff --git a/dev-ml/uchar/metadata.xml b/dev-ml/uchar/metadata.xml
index 4cae75b9a5d6..8537daf2f86b 100644
--- a/dev-ml/uchar/metadata.xml
+++ b/dev-ml/uchar/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<upstream>
diff --git a/dev-ml/unidecode/metadata.xml b/dev-ml/unidecode/metadata.xml
index 9e612d997389..853d794cb827 100644
--- a/dev-ml/unidecode/metadata.xml
+++ b/dev-ml/unidecode/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>ml@gentoo.org</email>
diff --git a/dev-ml/unidecode/unidecode-0.4.0.ebuild b/dev-ml/unidecode/unidecode-0.4.0.ebuild
index 35cfaf39fd6c..3c454ae57fd8 100644
--- a/dev-ml/unidecode/unidecode-0.4.0.ebuild
+++ b/dev-ml/unidecode/unidecode-0.4.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/geneweb/${PN}/archive/v${PV}.tar.gz
LICENSE="GPL-3"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="+ocamlopt test"
RESTRICT="!test? ( test )"
diff --git a/dev-ml/uucp/Manifest b/dev-ml/uucp/Manifest
index 08d06a8a8e95..783aec0484d8 100644
--- a/dev-ml/uucp/Manifest
+++ b/dev-ml/uucp/Manifest
@@ -1 +1,2 @@
DIST uucp-13.0.0.tbz 466488 BLAKE2B 90b62446ed069f95b0ca8bbad8273b215f0a66f6a3d19639d60a73f440268e9274d4e98e7ac8a534bbb6a34ab485e989432894f22f2f5c1303ca49f828efe859 SHA512 24d0fc75ba337115fd6445d3c3dfa60fe5f6920b227cd8360cd60ad51b652ccc2129a47f195f7559d99635367e64855343dc03de1109987f296a280e0fefff4d
+DIST uucp-14.0.0.tbz 476162 BLAKE2B 1c75b7bf98858bc60dee12bebfa99556afd6b344b65b12a4eafcbd39c57e2359f1a47aa0f28c5450f078db95d78ab545eecf84d0d5dbadb2bf1705c17e7179a4 SHA512 2d0224aed5d5accbb121624898f08598e8c74a2415942f159a54221c0cdac62ed64fc70a039c833e50110cefce77754ada9ac2d58f79a6fc9331135326fe6899
diff --git a/dev-ml/uucp/metadata.xml b/dev-ml/uucp/metadata.xml
index 26a42e76def9..6324572bea0e 100644
--- a/dev-ml/uucp/metadata.xml
+++ b/dev-ml/uucp/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>ml@gentoo.org</email>
diff --git a/dev-ml/uucp/uucp-13.0.0-r2.ebuild b/dev-ml/uucp/uucp-13.0.0-r2.ebuild
index 2dd9913cbd8d..c962b6b160fe 100644
--- a/dev-ml/uucp/uucp-13.0.0-r2.ebuild
+++ b/dev-ml/uucp/uucp-13.0.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://erratique.ch/software/uucp/releases/${P}.tbz"
LICENSE="ISC"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
DEPEND="dev-ml/topkg
diff --git a/dev-ml/uucp/uucp-14.0.0.ebuild b/dev-ml/uucp/uucp-14.0.0.ebuild
new file mode 100644
index 000000000000..ec89c6b0ae38
--- /dev/null
+++ b/dev-ml/uucp/uucp-14.0.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit opam
+
+DESCRIPTION="Unicode character properties for OCaml"
+HOMEPAGE="https://erratique.ch/software/uucp https://github.com/dbuenzli/uucp"
+SRC_URI="https://erratique.ch/software/uucp/releases/${P}.tbz"
+
+LICENSE="ISC"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-ml/topkg
+ dev-ml/findlib"
+RDEPEND="${DEPEND}"
+BDEPEND="dev-ml/ocamlbuild"
+OPAM_FILE=opam
+
+src_compile() {
+ ocaml pkg/pkg.ml build \
+ --with-uutf true \
+ --with-uunf false \
+ --with-cmdliner true \
+ || die
+}
diff --git a/dev-ml/uuidm/metadata.xml b/dev-ml/uuidm/metadata.xml
index 01e057cc5972..b17050c8b495 100644
--- a/dev-ml/uuidm/metadata.xml
+++ b/dev-ml/uuidm/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>ml@gentoo.org</email>
diff --git a/dev-ml/uunf/metadata.xml b/dev-ml/uunf/metadata.xml
index 206743db91c8..4cd14005b4ca 100644
--- a/dev-ml/uunf/metadata.xml
+++ b/dev-ml/uunf/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>ml@gentoo.org</email>
diff --git a/dev-ml/uunf/uunf-13.0.0.ebuild b/dev-ml/uunf/uunf-13.0.0-r1.ebuild
index 5c1c8bdaf9b8..bc1af4246d94 100644
--- a/dev-ml/uunf/uunf-13.0.0.ebuild
+++ b/dev-ml/uunf/uunf-13.0.0-r1.ebuild
@@ -11,17 +11,21 @@ SRC_URI="https://erratique.ch/software/uunf/releases/${P}.tbz"
LICENSE="ISC"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
-DEPEND="dev-ml/topkg
- dev-ml/uutf
- dev-ml/cmdliner"
+DEPEND="dev-ml/topkg:=
+ dev-ml/uutf:=
+ dev-ml/cmdliner:="
RDEPEND="${DEPEND}"
BDEPEND="dev-ml/findlib"
OPAM_FILE=opam
src_compile() {
+ # Increase stack limit to 11GiB to avoid stack overflow error.
+ # bug #798270
+ ulimit -s 11530000
+
ocaml pkg/pkg.ml build \
|| die
}
diff --git a/dev-ml/uutf/metadata.xml b/dev-ml/uutf/metadata.xml
index 4aefe5b72ed8..1ca2f2a4810f 100644
--- a/dev-ml/uutf/metadata.xml
+++ b/dev-ml/uutf/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>ml@gentoo.org</email>
diff --git a/dev-ml/uutf/uutf-1.0.1.ebuild b/dev-ml/uutf/uutf-1.0.1.ebuild
index ca6cd4708b6e..d182d94e70ca 100644
--- a/dev-ml/uutf/uutf-1.0.1.ebuild
+++ b/dev-ml/uutf/uutf-1.0.1.ebuild
@@ -53,7 +53,7 @@ src_install() {
use ocamlopt && nativelibs="$(echo _build/src/uutf.cm{x,xa,xs} _build/src/uutf.a)"
ocamlfind install uutf _build/pkg/META _build/src/uutf.mli _build/src/uutf.cm{a,i} ${nativelibs} || die
- use utftrip && newbin utftrip.$(usex ocamlopt native byte) utftrip
+ use utftrip && newbin _build/test/utftrip.$(usex ocamlopt native byte) utftrip
dodoc CHANGES.md README.md
if use doc ; then
diff --git a/dev-ml/uutf/uutf-1.0.2.ebuild b/dev-ml/uutf/uutf-1.0.2.ebuild
index 320c6dea77ec..76819981b6cc 100644
--- a/dev-ml/uutf/uutf-1.0.2.ebuild
+++ b/dev-ml/uutf/uutf-1.0.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://erratique.ch/software/uutf/releases/${P}.tbz"
LICENSE="ISC"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
IUSE="doc utftrip +ocamlopt test"
RESTRICT="!test? ( test )"
REQUIRED_USE="utftrip? ( ocamlopt )"
@@ -53,7 +53,7 @@ src_install() {
use ocamlopt && nativelibs="$(echo _build/src/uutf.cm{x,xa,xs} _build/src/uutf.a)"
ocamlfind install uutf _build/pkg/META _build/src/uutf.mli _build/src/uutf.cm{a,i} ${nativelibs} || die
- use utftrip && newbin utftrip.$(usex ocamlopt native byte) utftrip
+ use utftrip && newbin _build/test/utftrip.$(usex ocamlopt native byte) utftrip
dodoc CHANGES.md README.md
if use doc ; then
diff --git a/dev-ml/variantslib/metadata.xml b/dev-ml/variantslib/metadata.xml
index fa46caee57a0..36b3dabf112a 100644
--- a/dev-ml/variantslib/metadata.xml
+++ b/dev-ml/variantslib/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>gienah@gentoo.org</email>
diff --git a/dev-ml/xml-light/metadata.xml b/dev-ml/xml-light/metadata.xml
index 6f49eba8f496..85e4ed814fa2 100644
--- a/dev-ml/xml-light/metadata.xml
+++ b/dev-ml/xml-light/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/dev-ml/yojson/metadata.xml b/dev-ml/yojson/metadata.xml
index 02bc47a8d9a2..0bff28c27b11 100644
--- a/dev-ml/yojson/metadata.xml
+++ b/dev-ml/yojson/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<name>François-Xavier Carton</name>
diff --git a/dev-ml/zarith/Manifest b/dev-ml/zarith/Manifest
index 9638f9f30e0a..3f61bef4a069 100644
--- a/dev-ml/zarith/Manifest
+++ b/dev-ml/zarith/Manifest
@@ -1,2 +1 @@
-DIST zarith-1.11.tar.gz 98909 BLAKE2B 01deed333dc79dfdb5748c835ef80403c7892e36e461a1c65e5bb97f147b32df2e6cbe8f4e9b916aabc3bd2479bd97439a68d9cdb123d15b7c9ed0e3e7f784f3 SHA512 7c0645d63511d42b763cd0a33b3fb139c26d23ae0cf59cd651388644cb8e7c43a83265d55d69ff3320d8c4586c4f8dbd9c3412197bab2e110c38e6e7dac88b83
DIST zarith-1.12.tar.gz 93695 BLAKE2B b9622e2f397887d08fb8a8520419cf459e99906c05a897af91258b17d92d3fbbd2314a0a4be8a56a07074dcb0a0d04c896b3b5e69526a6c81a8a07b657d1bfec SHA512 8075573ae65579a2606b37dd1b213032a07d220d28c733f9288ae80d36f8a2cc4d91632806df2503c130ea9658dc207ee3a64347c21aa53969050a208f5b2bb4
diff --git a/dev-ml/zarith/metadata.xml b/dev-ml/zarith/metadata.xml
index 98fa0a2215bc..6d4c3b60cfec 100644
--- a/dev-ml/zarith/metadata.xml
+++ b/dev-ml/zarith/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>ml@gentoo.org</email>
diff --git a/dev-ml/zarith/zarith-1.11.ebuild b/dev-ml/zarith/zarith-1.11.ebuild
deleted file mode 100644
index b6074eeede19..000000000000
--- a/dev-ml/zarith/zarith-1.11.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit findlib toolchain-funcs
-
-DESCRIPTION="Arithmetic and logic operations over arbitrary-precision integers"
-HOMEPAGE="https://github.com/ocaml/Zarith"
-SRC_URI="https://github.com/ocaml/Zarith/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc x86"
-IUSE="doc mpir +ocamlopt"
-RESTRICT="!ocamlopt? ( test )"
-
-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 )
-
-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() {
- emake HASOCAMLOPT=yes HASDYNLINK=yes tests
-}
-
-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.12.ebuild b/dev-ml/zarith/zarith-1.12.ebuild
index 365b3503fd38..1b285165f7c6 100644
--- a/dev-ml/zarith/zarith-1.12.ebuild
+++ b/dev-ml/zarith/zarith-1.12.ebuild
@@ -29,8 +29,10 @@ src_configure() {
tc-export CC AR
./configure \
-ocamllibdir /usr/$(get_libdir)/ocaml \
- -installdir "${ED}"/usr/$(get_libdir)/ocaml \
$(usex mpir "-mpir" "-gmp") || die
+ sed -i \
+ -e 's|$(INSTALLDIR)|$(DESTDIR)$(INSTALLDIR)|g' \
+ project.mak || die
}
src_compile() {
@@ -48,6 +50,7 @@ src_install() {
emake \
HASOCAMLOPT=$(usex ocamlopt yes no) \
HASDYNLINK=$(usex ocamlopt yes no) \
+ DESTDIR="${ED}" \
install
dosym zarith/libzarith.a /usr/$(get_libdir)/ocaml/libzarith.a