gentoo resync : 24.07.2021

19 files changed, 509 insertions, 0 deletions

diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index a14e62487a62..3ce5380fcbbd 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/dose3/Manifest b/dev-ml/dose3/Manifest
index 912836e8e1e0..cbaa7ac9d721 100644
--- a/dev-ml/dose3/Manifest
+++ b/dev-ml/dose3/Manifest
@@ -1,7 +1,9 @@
+DIST dose3-6.1.tar.gz 1422879 BLAKE2B b42da3abec4ff9d5d81ea9dbeba0f6acd39fa076c5cb51eb4ae04223ae01078425a7c5d9e80110e7946f8ae87bf7d8c6c124965c3cc47fb1e16473f225dc8adf SHA512 603462645bac190892a816ecb36ef7b9c52f0020f8d7710dc430e2db65122090fdedb24a8d2e03c32bf53a96515f5b51499603b839680d0a7a2146d6e0fb6e34
 DIST dose3_5.0.1-16.debian.tar.xz 39448 BLAKE2B a5ae8c74ee1a5a89bf3594cbaf0b37703fcf03a03e336c6b91626fcb6767518c517bf28ec4a24f6cbeb40e1544b34e95855507f39aacca110e8daa6e6e5d3994 SHA512 52d14a45bc0b0a66c4cf3acc05b479b1456c78fa8cb0e453a01dd2f0d849dfcf959bd9e8ff8d505272ad7ad542ff402013746816ead3ccd2dbd0bed572ee2930
 DIST dose3_5.0.1.orig.tar.gz 297433 BLAKE2B 74ae954604f26398f091b4f14d2a633132ae62102f52af13284af27e41cd7c47afb1b533b0821a8921ba33fa6658e94b3bb6bf5f104f48881a50e14517cd65e2 SHA512 e66526319446054041f138ee2633043d0832089f6a554cf566a28de899d10383acfb1aa6bf1a368811602939676510933a7d2404fd34dbeba15045b458f5af84
 DIST dose3_6.0.1-2.debian.tar.xz 23320 BLAKE2B 0351a715756b76c1f81fdf5599d10373ce85554f1d63b4dcbaa647dcf81b099e59c68f93413ca391bdf17b52831b085a7d2b86bc64d86676763bbabd7804a6a4 SHA512 219bb7614d1200adb5d22032cb3d7442c16cdce785088f58b3fcc188856b93817f0157ea6ed1bd72e1f565b9a98df145c188e0fa5d7f538d616b7eccc20ab706
 DIST dose3_6.0.1.orig.tar.gz 1417354 BLAKE2B c5fb08c853d2d3589416237addf767912fffab5ef74b7f3332799ae350a371307bd06a24abe6565d2d00aedc01f58d0a2583db6d2d76fc2ebee634b05405ab86 SHA512 cb9dad4ae296b85317f60133bb9dcc63dad8560486e2bd83139205810643e701de5e9834d8d2de34d8237d0abfd394970088c73eeab08956fc9c4178411303ea
 EBUILD dose3-5.0.1_p16-r3.ebuild 2256 BLAKE2B 04d27714676035014da0ff4dc1b062f4d790629f6aa2487f6afa05e4d95088148a1d7822910833c906b7bf0d9f88003e487582ce46802400291164a7c3bb1716 SHA512 c453ec3a3a63f761e58d0d0d48ab83570eaf9530a17855806e27240b87f1379aead72f528ab907bb33e4c8eae9bdd8b94d53b1b52eda1926b0ab5c07116b3fd7
 EBUILD dose3-6.0.1_p2.ebuild 1290 BLAKE2B 0b1bd09cf903e03dfe054ed3109fa8376c9228bc533620f6ec668bf76867e5d1bb24e44050ba080abb97cd1a4cb713fd2a061f2367e6afbe81c7c428c3d51034 SHA512 97abd4158824da5464b4d2bec931676f45f2dba744886ef835a3a97839bebae2f001ec6a8fef8dd8cec43ee1c288aedc14d92895af807951c3fa248d82d78798
+EBUILD dose3-6.1.ebuild 1035 BLAKE2B 8edbe50b5af19c45f7467814f5335a53a308c62e5debe48fd903157c85342c40a96b0604f1dddcf99a78c9a7bab79ad93a29806b51f2e2df3b903e04fbc21642 SHA512 86f7198d0b8f338c13114ead3970c98a3d2a1e8194560adb124fa83425c8bc48d7bbeca9a6002eb315a7513a12f7403f181981b254036267076117e1e4b8109d
 MISC metadata.xml 567 BLAKE2B edf392175ce748915b9584ba1bb3885338c52f2c85f0beaa7695ecc556319af95d3485ab8bf94d97975e4cea2b30ddd47e31fe5df8a97911ddca0e720903c760 SHA512 254fd968a79b76a7ee792091a1106d20e76d168f57afa415aace3d150c793613c73d3bbd9d8a150d99595445ade1966da0dc059cb61dfae084478a5aeddb7fc8
diff --git a/dev-ml/dose3/dose3-6.1.ebuild b/dev-ml/dose3/dose3-6.1.ebuild
new file mode 100644
index 000000000000..ac9e12e891ab
--- /dev/null
+++ b/dev-ml/dose3/dose3-6.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Library to perform analysis on package repositories"
+HOMEPAGE="http://www.mancoosi.org/software/ https://gforge.inria.fr/projects/dose"
+SRC_URI="https://gitlab.com/irill/${PN}/-/archive/${PV}/${P}.tar.gz"
+S="${WORKDIR}/${PN}-$(ver_cut 1-3)"
+
+LICENSE="LGPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64"
+IUSE="+ocamlopt test"
+
+BDEPEND="
+	dev-ml/findlib
+	dev-ml/ocamlbuild
+"
+RDEPEND="
+	>=dev-lang/ocaml-4.03:=[ocamlopt=]
+	dev-ml/ocaml-base64:=[ocamlopt=]
+	>=dev-ml/cudf-0.7:=[ocamlopt=]
+	>=dev-ml/extlib-1.7.8:=[ocamlopt=]
+	>=dev-ml/ocamlgraph-2.0.0:=[ocamlopt=]
+	>=dev-ml/re-1.2.2:=[ocamlopt=]
+	dev-ml/parmap:=[ocamlopt=]
+	>=dev-ml/camlzip-1.08:=[ocamlopt=]
+	>=dev-ml/camlbz2-0.7.0:=
+	dev-ml/ocaml-expat:=[ocamlopt=]
+	dev-ml/xml-light:=[ocamlopt=]
+	app-arch/rpm
+"
+DEPEND="${RDEPEND}
+	test? ( dev-python/pyyaml[libyaml] )
+"
+
+# missing test data
+RESTRICT="test"
+
+QA_FLAGS_IGNORED='.*'
diff --git a/dev-ml/dune-configurator/Manifest b/dev-ml/dune-configurator/Manifest
index 04e14541f025..30ffd015b9d8 100644
--- a/dev-ml/dune-configurator/Manifest
+++ b/dev-ml/dune-configurator/Manifest
@@ -1,5 +1,7 @@
 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
 EBUILD dune-configurator-2.8.2-r1.ebuild 3691 BLAKE2B 6cceed0e264b8c1a8a6bc19b4fd790426f68556bf17b0fa80d8e3ec4f129aac627301f4dc61005e9bda9706f5d60425d1576044ef4a6c14e20e1a16c4e1790e4 SHA512 2d7b330a4fa3fb4ad8ddef912aa05f2b2d83123d434189a48b1a6f5b058ac3d80541e51d7ea53d5b85316c61914d1dfe7b814f773621522f52e23481bd7d3bc2
 EBUILD dune-configurator-2.8.4.ebuild 4113 BLAKE2B a7b7a6dd0339659e6a1f7a2a1e3ca9a086d849860164c1fda0f3f605208ba2fc71226688f87ffc29a8aef0db03713b2ce135ff8ba80b1e6b555d04c7b630460b SHA512 248672c231a7c1971ee4fb15ec5bc9c73b90a470dd2c41f6e69c1e8a1aa79cf1d77a4a7fde288a6ecfa3d798ca8ea70957a8925652b527920d3f7546e1edd53d
+EBUILD dune-configurator-2.9.0.ebuild 4119 BLAKE2B 41ee9db5c9e79840dae7e1cf2489f83f154ba64a90e32260fdb0af5b738e046a0d4d9912c59301fbf9567f3beb502e0164a7a9a7abaf3a4d0fc4f87949663b2f SHA512 17f1777fbacebca4abbf2636a6b6ff46a5b58fa32d28fee2cd6b9e9168f2200ba31f1b998ff3f4fd9b59a6b1df7afb4320f82ae5197a32c5a3d15a3aaf9cdacd
 MISC metadata.xml 412 BLAKE2B 1ac46aa4fe2b5f531debe5c283c36db66a98d2120ceaa389bb2fe5c9c989a8185d0c66df879bfcd65f89e6e304359beadd632e445220a633887237bc9159ad8d SHA512 74df6c8368d4283dbda004fba147e5fa5c82165dc6a7553bf61f49d93ef7283160f6c193505d42f4043e2d3ac3227d4d29ee99827845726f146603088a61d76a
diff --git a/dev-ml/dune-configurator/dune-configurator-2.9.0.ebuild b/dev-ml/dune-configurator/dune-configurator-2.9.0.ebuild
new file mode 100644
index 000000000000..87edcf4c3a33
--- /dev/null
+++ b/dev-ml/dune-configurator/dune-configurator-2.9.0.ebuild
@@ -0,0 +1,117 @@
+# 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 )"
+
+DEPEND="
+	~dev-ml/dune-private-libs-${PV}:=[ocamlopt=]
+	dev-ml/csexp:=[ocamlopt=]
+	dev-ml/result:=[ocamlopt=]
+"
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND}
+	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-private-libs/Manifest b/dev-ml/dune-private-libs/Manifest
index a09a9f4ac453..f0ed52517a43 100644
--- a/dev-ml/dune-private-libs/Manifest
+++ b/dev-ml/dune-private-libs/Manifest
@@ -1,5 +1,7 @@
 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
 EBUILD dune-private-libs-2.8.2-r1.ebuild 3691 BLAKE2B 7275871c01c4f1c68db72e7c0fe976103dd916007fee23c901f5007783b84a113f30857fb1106f64e0e01a3b4db2cae19115cd29a921ccf7a7c4527234c21d3f SHA512 846081c97aa0fd064e2089fc9d17b87ca6ca2c247341ddd1704bd53170c829151a8a3b4fa9404b71eed99705e4d437c31baff7be7835c1150750900940617d7a
 EBUILD dune-private-libs-2.8.4.ebuild 4113 BLAKE2B abbb2c64d54ffe7b78468d37517a83725e561ba58cfc85f710576342720bb92bc8b40e7818ebc1537c0ce5651d1a38ae8da5ffaeab278a63364a5298bbab44c7 SHA512 6d6f87691c660cd4d01e8a3adb86cb46b2cbac3b4288e8f9d34a89795bf8e7891badd9bc364ed8593c85a8b45bcde24da03c1cb6026c054aef3d164f47598ceb
+EBUILD dune-private-libs-2.9.0.ebuild 4119 BLAKE2B eaea1ebab708adcbd6d1807cb2a14010e3cac7d7dbaeaa12c291ea2d2c4dc804a5e34a4a2c02ac342f73d98f09156ceb5bee510fe0d15dc91bbfdf7afd70dc2e SHA512 458293150214b84f21c2aa64923bf04fe49e7f7d1bd075219e12bed6ccf989bc2af492c15e0b18979e85483c15e13a35d481c3a1f18540b27a14d3302105f49a
 MISC metadata.xml 412 BLAKE2B 1ac46aa4fe2b5f531debe5c283c36db66a98d2120ceaa389bb2fe5c9c989a8185d0c66df879bfcd65f89e6e304359beadd632e445220a633887237bc9159ad8d SHA512 74df6c8368d4283dbda004fba147e5fa5c82165dc6a7553bf61f49d93ef7283160f6c193505d42f4043e2d3ac3227d4d29ee99827845726f146603088a61d76a
diff --git a/dev-ml/dune-private-libs/dune-private-libs-2.9.0.ebuild b/dev-ml/dune-private-libs/dune-private-libs-2.9.0.ebuild
new file mode 100644
index 000000000000..7b6b59feb352
--- /dev/null
+++ b/dev-ml/dune-private-libs/dune-private-libs-2.9.0.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/Manifest b/dev-ml/dune/Manifest
index 4612307713ea..98a7fc4db374 100644
--- a/dev-ml/dune/Manifest
+++ b/dev-ml/dune/Manifest
@@ -3,9 +3,11 @@ DIST dune-2.1.0.tar.gz 1170295 BLAKE2B 16ee2c34e0183bd255d23410f70001ca008b8e828
 DIST dune-2.7.1.tar.gz 1290915 BLAKE2B 85a2dee92d1ead03b43b80742c291f4470dd9e1d843fdb257754c567e2329c101d11b42573da19de537f0d8591ebdacfcaab1099e0f46bdeebcd8421eb1bbcb2 SHA512 b77d0e207263107365e5a6e94423e8ab4ddbab1f920872d915e4014b7cc69915274b53fe946bb4b29dfe3de2bf5573ab3b2bffb4db8eb50b472e7dfb6cab88b7
 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
 EBUILD dune-1.11.4.ebuild 670 BLAKE2B adc969c1d17b4012bf83eee162f575ac804a97fb73cdfe49479fc6c8c0e63a45b60b21d0e33ef335b58b8576e7efbc8298972da3d8c6d0dd1d7ee0192c77bc07 SHA512 0edaaa2853cabda0a8aae6f67b633262608592e1cbe0fa0043f8bc9a4af80fd2a7f5b10ec2156d8c384ae4cf69fbc63c41e31672c45afadae849f03bc2d01c71
 EBUILD dune-2.1.0.ebuild 675 BLAKE2B 96dd8ec1a6c065919c057a9faf06321f60aec1bf4d14db47b194ddbac137a614898331b02c45b528ded939f94576de2789a1c1b0fb7796f4e37a7b2f196dce5b SHA512 b655265fa0774f42cb9428c2d86f574b311660a88300c8e0bb9c35aa4b5d5750bb6392084614c2cdbfee6766c7a50067b0be9ff0f3e8c4ca1f8bd4e9cb918acb
 EBUILD dune-2.7.1.ebuild 767 BLAKE2B 18b22cc6407814bdef1baedfe7c325224d69fd126c301117df421e063021d16f9d8a5582e2bc6f10dab9f60c27f2fa4901514930fed56c3ec390f00697817d94 SHA512 789838c90fd024367af2cdb5b5f125b0a2d58f5afbac1af09d7b69968503e0256d4974453e1b5c958d3e73c00ec24442f34c448dc2913742ad31bd059c49379c
 EBUILD dune-2.8.2.ebuild 896 BLAKE2B 528ec447be147ccfb4a710413611572d965436af2329ca4d24ca98f8171085890d1578f6bb184a1440b1e4e071ae14b53d095606af7ab6aca322a93aeeae8338 SHA512 30d730b466910f63939417076c699235e00dcad0df4050916626aa08ffbb81cb1521d3fb8fc2234f2ab1d45d4b10b7656719f4bf63ed2d9383d2c6caa2906924
 EBUILD dune-2.8.4.ebuild 896 BLAKE2B 528ec447be147ccfb4a710413611572d965436af2329ca4d24ca98f8171085890d1578f6bb184a1440b1e4e071ae14b53d095606af7ab6aca322a93aeeae8338 SHA512 30d730b466910f63939417076c699235e00dcad0df4050916626aa08ffbb81cb1521d3fb8fc2234f2ab1d45d4b10b7656719f4bf63ed2d9383d2c6caa2906924
+EBUILD dune-2.9.0.ebuild 902 BLAKE2B 56cfab513a0767ba85a2e8808e8f3a7cc687869a8c60366a42d278ee52774078690b8c4110bdbeac07fc3699cc1fb1dd4f1efd6087c3e086c9ae2da862a691ac SHA512 5c954d7e379db8aaf2eca54cdd084c2146e627bd61b0ce556fabc1d2c4de31738f98df0f07518a15257887f80db92e2cd5c7a587c8d72b9266fabe35093c6cc9
 MISC metadata.xml 412 BLAKE2B 1ac46aa4fe2b5f531debe5c283c36db66a98d2120ceaa389bb2fe5c9c989a8185d0c66df879bfcd65f89e6e304359beadd632e445220a633887237bc9159ad8d SHA512 74df6c8368d4283dbda004fba147e5fa5c82165dc6a7553bf61f49d93ef7283160f6c193505d42f4043e2d3ac3227d4d29ee99827845726f146603088a61d76a
diff --git a/dev-ml/dune/dune-2.9.0.ebuild b/dev-ml/dune/dune-2.9.0.ebuild
new file mode 100644
index 000000000000..47084c42bd00
--- /dev/null
+++ b/dev-ml/dune/dune-2.9.0.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/findlib/Manifest b/dev-ml/findlib/Manifest
index 0d9670b83520..52dc5d4cf602 100644
--- a/dev-ml/findlib/Manifest
+++ b/dev-ml/findlib/Manifest
@@ -1,4 +1,6 @@
 AUX externalmeta7.patch 527 BLAKE2B bf4a4aec02096766f9741705fbf99201c742abc992ddb05c143378d7bb6d0b79f3c3541199eb5a81142fa1b317980646c3fe12528f792cbfaa7762f024bd88d1 SHA512 61c1e03e5b0d021f2cd7d013bed54edd610edb48cf9f6c063d3542abea2d2fc811c1cf7284b54a584491064dee8dd4e72656ba90a63c144586f40705b8443a1d
 DIST findlib-1.8.1.tar.gz 261544 BLAKE2B acfa9d4e0d118ebbc0dd7b03da1fe5eaa994e5fec13dc54e60ba42f643d93968469a1a43fe4f832433dca6c3902e8846616fcf460c748bf037fe16cb2f93a847 SHA512 0d8e1ff21217fcc6823aab3ac71282789691e4ae8c3607703d0393468247f93e2d084bd4e2a8795b523f2c7f193521d3aae4b8122c934ebf8b58c3185a5bc9c1
+DIST findlib-1.9.1.tar.gz 273012 BLAKE2B 8b51e3ca3dde04e77e225638f9d45166acf42fb1e3321aa5ce6e66fcddcfb978a301f2fa22a26172e1a8c2f8a879c5d1d10e8c984994d6b2879c21c4392955ce SHA512 83a05f3e310fa7cabb0475c5525f7a87c1b6bc2dc5e39f094cabfb5d944a826a5581844ba00ec1a48dd96184eb9de3c4d1055cdddee2b83c700a2de5a6dc6f84
 EBUILD findlib-1.8.1-r2.ebuild 1670 BLAKE2B f64382277a45d1cbe278e6eb389cafd2fb255363694b36483b8eef0c33af4f08db95f2ab14b13a02f985c3e8b04940a39cb175616ad9e224893175342ff4be38 SHA512 9c51f008f2a9ee6189ee1a541f8187a149195dd114694ef35cd0c7774bdb128bf32df8a4f8f28dccec656eb8d5540590f24fb458aec84cadb1b04bbededd03fa
+EBUILD findlib-1.9.1.ebuild 1629 BLAKE2B be50bf81301e64b7eebefea1e7ee454f0ff42062bf54621d92f0dd427bcee2f031f743957fff86a1e7a9d5be9075488891a2c39884a60458de5e725edf81f1fc SHA512 e3d9d8083d36446a0ed05fa6cbaf844ccb5c8fec59ff396bca6f9f600a6408c038bdb6693d1b135b4e8ef125f5fcc9f9f0e44583bc768de09fb92b65e6f4ec03
 MISC metadata.xml 417 BLAKE2B 2ea51d563846cf4b4a6826678f68a32db60cd0c5174524701e6d91c59c8be896f26b6a7f7ce458b9466424d7325542219c7fb2b59d2114cf2a29a0d8772fe92f SHA512 d4243498f26d7517fd55467382b8968e75e3593f1d3ba76c87cc0a53746e6e500c2bab475e51c9490abccf4ca5044637f681f5b50ad090d72e580eff9358ca6e
diff --git a/dev-ml/findlib/findlib-1.9.1.ebuild b/dev-ml/findlib/findlib-1.9.1.ebuild
new file mode 100644
index 000000000000..4a52a554364a
--- /dev/null
+++ b/dev-ml/findlib/findlib-1.9.1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="OCaml tool to find/use non-standard packages"
+HOMEPAGE="http://projects.camlcity.org/projects/findlib.html"
+SRC_URI="http://download.camlcity.org/download/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="doc +ocamlopt tk"
+
+DEPEND=">=dev-lang/ocaml-4.02.3-r1:=[ocamlopt?]
+	tk? ( dev-ml/labltk:= )"
+RDEPEND="${DEPEND}"
+
+QA_FLAGS_IGNORED='.*'
+
+src_prepare() {
+	default
+	export ocamlfind_destdir="${EPREFIX}/usr/$(get_libdir)/ocaml"
+	export stublibs="${ocamlfind_destdir}/stublibs"
+}
+
+src_configure() {
+	local myconf
+	use tk && myconf="-with-toolbox"
+	./configure -bindir "${EPREFIX}"/usr/bin -mandir "${EPREFIX}"/usr/share/man \
+		-sitelib ${ocamlfind_destdir} \
+		-config ${ocamlfind_destdir}/findlib/findlib.conf \
+		-no-custom \
+		${myconf} || die "configure failed"
+}
+
+src_compile() {
+	emake -j1 all
+	if use ocamlopt; then
+		emake -j1 opt # optimized code
+	fi
+}
+
+src_install() {
+	emake prefix="${D}" install
+
+	dodir "${stublibs#${EPREFIX}}"
+
+	if use doc; then
+		cd "${S}/doc" || die
+		dodoc QUICKSTART README DOCINFO
+		docinto html
+		dodoc -r ref-html guide-html
+	fi
+}
+
+check_stublibs() {
+	local ocaml_stdlib=`ocamlc -where`
+	local ldconf="${ocaml_stdlib}/ld.conf"
+
+	if [ ! -e ${ldconf} ]
+	then
+		echo "${ocaml_stdlib}" > ${ldconf}
+		echo "${ocaml_stdlib}/stublibs" >> ${ldconf}
+	fi
+
+	if [ -z `grep -e ${stublibs} ${ldconf}` ]
+	then
+		echo ${stublibs} >> ${ldconf}
+	fi
+}
+
+pkg_postinst() {
+	check_stublibs
+}
diff --git a/dev-ml/graphics/Manifest b/dev-ml/graphics/Manifest
index 91460cd0bc31..5c58dae29b93 100644
--- a/dev-ml/graphics/Manifest
+++ b/dev-ml/graphics/Manifest
@@ -1,3 +1,5 @@
 DIST graphics-5.1.1.tbz 58713 BLAKE2B 75f81b938be8a44f904418851ed747742ad63556ef94c533872f4b04705a0209a06f969add207bf332e1ab3d6a98a819c0ed2b0f50bdf1275f5d57ff6caa2fed SHA512 15adbe03211e7392a2fded2d9fd5e0cc2c532b4a1de3b6c90945e9e99cc4f419583a204f357f8c9fd92d1ffce48e13e1f146da1f009eb4645150b7394f799e0a
+DIST graphics-5.1.2.tbz 58863 BLAKE2B 640a288759f5c233f3ded3c0e974329b0b8a41ab60772d0d41e6f89057432215a35c0f06facc552fcacf2e1fb8d0f5c47bc5d0aad5ca89dcf4ab71732a9b1c9f SHA512 1387c1ecf5dfd62c3927f1f8ce0bcc8b162ef22f15bfd41eba47c955091f7ce5f19395beab550d31cff38d22c4ad097350975381e60936a0004271e96f65b09b
 EBUILD graphics-5.1.1-r1.ebuild 517 BLAKE2B b524e4a516d11651721d075acb1aee40581737b818ddcb98aec15334fafd0215dfb62d21e6275befb196477e4a641999e3fb6dde544f87822f8d5fe319fc7a55 SHA512 ec78284c78bdb135056c98ca415700b5de7e5f8c937c7d53855743d6d210b90e5dbf1db7e7ddb20664062f16c4971d36e0490dcc72b64852ea35f4eb9560fafa
+EBUILD graphics-5.1.2.ebuild 523 BLAKE2B 7bfec9f03f0829ca0d2d2d5e2c38dff5b7e27e05f24b14c749897d2a2ae519bf086206804f5aedc8069b19a36162030b300540e6450d79fb624a12867eaea3d0 SHA512 cb2278d0019721404922c5ebe82b316a6691fda75a6b36ee0e993268a78e317bd1f61b2300bb80284ee3e7150177da3c3e8f1b375f3951cbaa9cdf54d1de743e
 MISC metadata.xml 232 BLAKE2B 502ab2778b7b5d1ac9441b71cab7ff412fbb5663747f4abfc59fb45559185dda510683f1e8ffea5db8f6b31874ca209fde5c524e3526cb125931ee1feb7ee68d SHA512 7ac25a89f6b48a8e858fd1e9f4d3e938a82a4591f21249d81e8d9f1d028c5f427a3669933a932c0e8a1dc7455106696e3bfba3573976edcd8c7ec89368dacde2
diff --git a/dev-ml/graphics/graphics-5.1.2.ebuild b/dev-ml/graphics/graphics-5.1.2.ebuild
new file mode 100644
index 000000000000..68860652dce7
--- /dev/null
+++ b/dev-ml/graphics/graphics-5.1.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="The OCaml graphics library"
+HOMEPAGE="https://github.com/ocaml/graphics"
+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"
+
+RDEPEND="dev-ml/dune-configurator:=[ocamlopt?]
+	>=dev-lang/ocaml-4.09:=
+	x11-libs/libX11:="
+DEPEND="${RDEPEND}"
+BDEPEND=""
+
+IUSE="+ocamlopt"
diff --git a/dev-ml/markup/Manifest b/dev-ml/markup/Manifest
index 2b5abbb3042d..758e2996feec 100644
--- a/dev-ml/markup/Manifest
+++ b/dev-ml/markup/Manifest
@@ -1,3 +1,5 @@
 DIST markup-1.0.0.tar.gz 280927 BLAKE2B cdf670e97c9f6e9b514d98f19a50bb4915c0c434a4ca27ac71be36f3893ed049eef8c0b5f48893e3f247938283272ff0c03d24743d679ef5e0296f7059131c58 SHA512 6383ed24fd86be0f6a64d9386b547d323fa0e763571ff3e7405119173c6ac6a7ed043bc0d35afd6e933101f22ed4b2f8baa08ba07d3df57a68015caaf79030ab
+DIST markup-1.0.2.tar.gz 281957 BLAKE2B 04094edf2b6e7cec8de8e1d2ebc9c43b55aa18ccd7c38ee07217a7578764e1b919da8f30b3855d04deb75862be9c429ddf2c24c7a8a2baa2ed01921514f3b334 SHA512 6a04240da095a7557932e26b8f20979e0a8dc4ef2b5ce98aac7dfcaf82f0350397633120b638f76efd2a30a482a2381566b66a35c0585535e225f44004539b87
 EBUILD markup-1.0.0.ebuild 546 BLAKE2B 5e6b2a2f5c9d21407a27e2f1207f13fe834ae3a19b1f63c900846a9a3b2245a1bbb30533e169bb19c08eb4615fa6093031404e1c7174eca66f8e9d7551bb9353 SHA512 da5764d2f11222f03be7811a4bf5fe23c4190866aa3ea0e351d223615384e737b943a8f5c311a1532219d951ee6ef708e74e7758364f6d46276261d16f03bbc6
+EBUILD markup-1.0.2.ebuild 546 BLAKE2B 5e6b2a2f5c9d21407a27e2f1207f13fe834ae3a19b1f63c900846a9a3b2245a1bbb30533e169bb19c08eb4615fa6093031404e1c7174eca66f8e9d7551bb9353 SHA512 da5764d2f11222f03be7811a4bf5fe23c4190866aa3ea0e351d223615384e737b943a8f5c311a1532219d951ee6ef708e74e7758364f6d46276261d16f03bbc6
 MISC metadata.xml 324 BLAKE2B e168b429839fdf6aa127eecfdb0d6d53bca42fd44a4a111c0fe88c92f956c4d84cdff299977727ed510d2fa75409c3119c399b774acb3e10eae4c4bbeda272db SHA512 15681de57dd33e743107811a6f05c0139cad1488009191cbb8396f344e29ead53fa8ba09bbb914c0e53d87439d2e83a864c5f162e099ae027b5b0958b6946214
diff --git a/dev-ml/markup/markup-1.0.2.ebuild b/dev-ml/markup/markup-1.0.2.ebuild
new file mode 100644
index 000000000000..65041afd6bac
--- /dev/null
+++ b/dev-ml/markup/markup-1.0.2.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="Error-recovering streaming HTML5 and XML parsers"
+HOMEPAGE="https://github.com/aantron/markup.ml"
+SRC_URI="https://github.com/aantron/markup.ml/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-ml/lwt
+	dev-ml/uutf"
+DEPEND="${RDEPEND}
+	test? ( dev-ml/ounit2 )"
+
+S="${WORKDIR}/${PN}.ml-${PV}"
diff --git a/dev-ml/menhir/Manifest b/dev-ml/menhir/Manifest
index 2ab49aa90fd9..4c5b63084c22 100644
--- a/dev-ml/menhir/Manifest
+++ b/dev-ml/menhir/Manifest
@@ -1,3 +1,5 @@
 DIST menhir-20190924.tar.gz 2491000 BLAKE2B 463825aa0f3ea41e49d9c130226bc8bbfc2b96650debf8d79422a90b93338ead58e01aa0c34b2161e4383d1c9a8d77ab58bb1da78e3187ed60b02e13f7742844 SHA512 8036eb8a65f123ceadd21739d88dafca54a2338fc168922a1301a9fbe709ac5e8e7214d95d8114f3798c15f458822e64dcedb94f7fff18ab6f9ccfb6de462e46
+DIST menhir-20210419.tar.gz 1136536 BLAKE2B 9d95600221aca25983674fa736c35ac0c5f2809a8aade5f9163a7b8baaacc660c03376b52749ae1d75d0d35ad8f4710d7f43832ef5ee0283fce7f7a41f15c120 SHA512 cca9037586635a6603531629671cc1448d65deb47c66654928d34c9163c4b501901428afc95eb0efdfc7f010d2efa176385420d9296d59b840176e07b8bf0fce
 EBUILD menhir-20190924.ebuild 915 BLAKE2B c33ff204555d700ec02abc8bef23ca5e30767b409f3d226dd5fd380ce75d11fc1bb228d3446c3f7d1822530e6a556225138fa2700ea8ed99c828bdcc0dd983d4 SHA512 0ea611c2f1f32aaeee73ee407a9eae82a24bca518e006eeb66b33ab5f1f0adb3c06ff85fd2c0a99fdd865f8a3245239165617a0c3ccbe815009aa761b8ad7b21
+EBUILD menhir-20210419-r1.ebuild 543 BLAKE2B 12230575ad22528949d5388f1e57f447334f306df992328b2974b017fedc2c2d1be99978bb2c2d3ab5d9ef5097e73596127f0907a0693a3ba792c63306ea3a3c SHA512 f262ea1825b660624d8716b44aed0b6bec99ea5448dcf29e9c960d9c5b45e168fb904c14b6b724505507aa145546de13582ab207508603696c175ed08de155ec
 MISC metadata.xml 232 BLAKE2B 502ab2778b7b5d1ac9441b71cab7ff412fbb5663747f4abfc59fb45559185dda510683f1e8ffea5db8f6b31874ca209fde5c524e3526cb125931ee1feb7ee68d SHA512 7ac25a89f6b48a8e858fd1e9f4d3e938a82a4591f21249d81e8d9f1d028c5f427a3669933a932c0e8a1dc7455106696e3bfba3573976edcd8c7ec89368dacde2
diff --git a/dev-ml/menhir/menhir-20210419-r1.ebuild b/dev-ml/menhir/menhir-20210419-r1.ebuild
new file mode 100644
index 000000000000..eee8ab93b315
--- /dev/null
+++ b/dev-ml/menhir/menhir-20210419-r1.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="LR(1) parser generator for the OCaml language"
+HOMEPAGE="http://gallium.inria.fr/~fpottier/menhir/"
+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"
+IUSE="+ocamlopt"
+
+src_install() {
+	dune_src_install menhir
+	dune_src_install menhirLib
+	dune_src_install menhirSdk
+}
diff --git a/dev-ml/merlin-extend/Manifest b/dev-ml/merlin-extend/Manifest
index 8ad287c5a8d1..fedd8c78ee07 100644
--- a/dev-ml/merlin-extend/Manifest
+++ b/dev-ml/merlin-extend/Manifest
@@ -1,3 +1,5 @@
 DIST merlin-extend-0.3.tar.gz 15422 BLAKE2B cfd658c9afa6f4500899c342c86c75399cbbef89fe5817c2a957ec93ba02c360fff66e01b81890d19c87a89380ba1cd352a2ffdc10a2dc53c7d535e8af5f720a SHA512 1e6436299b38c7fa57ae5b681a1409795545bc6f5956d6b1c37cbfdbdabfd90da476c030067fe2e016c823d60d1e5498c4536c869bf58425e1a6ff78295efba4
+DIST merlin-extend-0.6.tar.gz 8098 BLAKE2B c8adb32c03a3fe423aa1bb9e10ed9d5041cfbbdc991ae656180debbcad6ee72404bdd7c03d8ee609b809aa27e8013f14785204c759221e33405182ef6c9d1616 SHA512 5cfe4bb1fe8804dcb52eb4cebea6176b5d50fdafbdcd4f5854726c74f196ad06fe3b1b46dde7622f2e5c99ce6bfea9efd070fb81e5fd5e2b5197f40cee109ea7
 EBUILD merlin-extend-0.3-r1.ebuild 486 BLAKE2B f227cdf4269f27a1b06b23535039c85b4bbc8482e2ae752a4dc45c2abf643fa5d025d4d852c13ac3ea0b264494047fbe86411b770659f3f2e258d8ba149e01d5 SHA512 ed84872092614bb99c9a623d098d40cdbfd51d69e7ae1432d20f6b8efd81bec7cdc9b860fb274840fa73029b87ac381d0ea0fab73da863757094b32c41647024
+EBUILD merlin-extend-0.6.ebuild 481 BLAKE2B c8323e66fd99225ee36771290b137526def8d831098e944fb7e708bd8c7c22de7f50aff8c3b3097443149cc55d59acd5c40c91507354ee093c11e176e751ee7f SHA512 dabec95c8a521ff3a0a2ce2c5924d50d48baf38c94a791bd37ec85db704f2707f4c3217c0dd0d9af022d596e15055eab941e06f49d25f2b0fbbb92c2677ee127
 MISC metadata.xml 318 BLAKE2B b58e16f26419d26ae958729d1b854a1ea29f3e71c9c9b6bfcc7851c1b0248bc26bc0e13028cab62744013280a88254d42e03e7894994033de077b781eaa76ecf SHA512 c50c068b90bc67f46cc5016182ecd06929dd31c2bff0a63065196a0adf382dcbe33f2e4a19a1e5744ce4d805a9d342ce1c9ceda4e1079f061af3497df2302365
diff --git a/dev-ml/merlin-extend/merlin-extend-0.6.ebuild b/dev-ml/merlin-extend/merlin-extend-0.6.ebuild
new file mode 100644
index 000000000000..d1ed1442d2d0
--- /dev/null
+++ b/dev-ml/merlin-extend/merlin-extend-0.6.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit findlib
+
+DESCRIPTION="SDK to extend Merlin"
+HOMEPAGE="https://github.com/let-def/merlin-extend"
+SRC_URI="https://github.com/let-def/merlin-extend/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+
+DEPEND="dev-lang/ocaml:="
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND}
+	dev-ml/cppo"
+
+src_install() {
+	findlib_src_preinst
+	default
+}