gentoo resync : 22.12.2021

author: V3n3RiX <venerix@koprulu.sector> 2021-12-22 14:08:05 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2021-12-22 14:08:05 +0000
commit: 93a93e9a3b53c1a73142a305ea1f8136846942ee (patch)
tree: b9791a06ab3284e27b568412c59316c66240c682 /dev-ml
parent: 2771f79232c273bc2a57d23bf335dd81ccf6af28 (diff)
102 files changed, 997 insertions, 62 deletions
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index c8bdcd1c67a6..baed885e3bf0 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/biniou/Manifest b/dev-ml/biniou/Manifest
index 0fc826fb6d17..d0922a2fa5bb 100644
--- a/dev-ml/biniou/Manifest
+++ b/dev-ml/biniou/Manifest
@@ -1,3 +1,3 @@
 DIST biniou-1.2.1.tar.gz 23970 BLAKE2B 139f17e3fd31f3f834c8111d81cecfa5fa48f860fc4fc898f7896b6d39a9756989504fa88901efaa0f67a51de25cdf304bea2ecabf15ea9cace59b4b311c00e1 SHA512 f0166666559f3a767fdc6987bad45ec4a772b70b8880b6d769ef644c9bfd46962f089c7b5dfff368413015e765daf4bacffe253bdb3478d9a4d30a15f0d29589
 EBUILD biniou-1.2.1.ebuild 512 BLAKE2B b3e8d9196a7de4ae7bf5dae3d29530cec59655464402ea245d6b087152d3a856d61487d53524356b5310b9936d2c8e87e24eafbbe419184090c27bb24720c437 SHA512 4c6b55613e66315870e62da45392477d86c2bbf306dacf923e5a2eda55970f96556eeb9bec624a9931f322319d8952a7f242c812bfa8de4b682afbfa9108f7e3
-MISC metadata.xml 487 BLAKE2B b3f972a43e646fbd9eb28199f462e95fa747068f09c4748cfdbed7d24588b4ba51a1141b6ec0ab480eab556f7b5d47b7fcce0ce0e45f3235c8846aa2a5b38f74 SHA512 e64f3bc3152069fd949418629043775e4692671fff997bd1ac03d1bfb95edddbf7d7cec566d91b9b073ec4cbdf27d361045f4a2d6b31e1785623bca700b15706
+MISC metadata.xml 529 BLAKE2B 218317babc4f52056fb2ab85c81d39b104ef54ccb70dbba57611a0f269be7dbe9bc3b16ce88da466931343cf8307298b7d7d7ca42ae987a72bd94295aa7a8998 SHA512 6ac34d359d7a3390c0346c1265a5fa0831379826234272549596afb67edf3fbb21adc9b2db2faea67c504c0b90f06901e8bf4dfb6238c10e6175c069edbfcedd
diff --git a/dev-ml/biniou/metadata.xml b/dev-ml/biniou/metadata.xml
index 6d36cfe8f79e..981218bd78b5 100644
--- a/dev-ml/biniou/metadata.xml
+++ b/dev-ml/biniou/metadata.xml
@@ -1,15 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<name>François-Xavier Carton</name>
-		<email>fx.carton91@gmail.com</email>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">mjambon/biniou</remote-id>
-	</upstream>
+  <maintainer type="person" proxied="yes">
+    <name>François-Xavier Carton</name>
+    <email>fx.carton91@gmail.com</email>
+  </maintainer>
+  <maintainer type="project">
+    <email>ml@gentoo.org</email>
+    <name>ML</name>
+  </maintainer>
+  <upstream>
+    <bugs-to>https://github.com/mjambon/biniou/issues/</bugs-to>
+    <remote-id type="github">mjambon/biniou</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-ml/charinfo_width/Manifest b/dev-ml/charinfo_width/Manifest
new file mode 100644
index 000000000000..fc8be0287b2e
--- /dev/null
+++ b/dev-ml/charinfo_width/Manifest
@@ -0,0 +1,3 @@
+DIST charinfo_width-1.1.0.tar.gz 8307 BLAKE2B fcb37b82e2eb914322c78bcfebf901d713b55edc1c069b46cb157bbe1292b63aa69f4679f9077308a17e7d31d7c972e6b636ce7dad22fc963aedc33039dfbcfb SHA512 c8dac9eb6f520213de69b23433e2f0d6a21578c70ae69fb682065e707363968959395a6ddc6c88893e08372a138287318634b52a8b4fb70ac988b4ad4a18b140
+EBUILD charinfo_width-1.1.0.ebuild 550 BLAKE2B 9463df45de66f3c05a2c293ba76fbb912e58ad08cee699d4f77504005dcfd1a38256a2ce0d1d1c185ee44ce6616359ece1cc2932ec7d778ecc003c55692b7aec SHA512 3c89edce883b866ed39e06b76df0a3fb93702205bc0d912ae706f48d631cc586d360fd8353060870c7314f108dd6eb708e8ac6184224d06f8fa8e5c0e7973e43
+MISC metadata.xml 399 BLAKE2B cc514ca26c34243f87448acac32db48a8be50869579ba9ca7cfe7c30705d5ab828b7da3b30343f82a5f80552fcb19b3687185a70633cf5b1c1c22b8cf5bc37ed SHA512 2366456ee12b3e61d9c252ae316b87efa88ccaec87d05ba3a47f250c9db56fb7c57c6160054b26bf0b34a27c85e475cf91db04f4247d2de018b7ef0e15d78c5c
diff --git a/dev-ml/charinfo_width/charinfo_width-1.1.0.ebuild b/dev-ml/charinfo_width/charinfo_width-1.1.0.ebuild
new file mode 100644
index 000000000000..93fb360c531e
--- /dev/null
+++ b/dev-ml/charinfo_width/charinfo_width-1.1.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="charInfo_width"
+DUNE_PKG_NAME="${MY_PN}"
+
+inherit dune
+
+DESCRIPTION="Determine column width for a character"
+HOMEPAGE="https://github.com/kandu/charInfo_width"
+SRC_URI="https://github.com/kandu/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+ocamlopt"
+
+RDEPEND="
+	dev-ml/camomile:=
+	dev-ml/ppx_expect:=
+	dev-ml/result:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ml/charinfo_width/metadata.xml b/dev-ml/charinfo_width/metadata.xml
new file mode 100644
index 000000000000..75f35c2292c1
--- /dev/null
+++ b/dev-ml/charinfo_width/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ml@gentoo.org</email>
+    <name>ML</name>
+  </maintainer>
+  <upstream>
+    <bugs-to>https://github.com/kandu/charInfo_width/issues/</bugs-to>
+    <remote-id type="github">kandu/charInfo_width</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ml/dune-build-info/Manifest b/dev-ml/dune-build-info/Manifest
new file mode 100644
index 000000000000..54a857cc7f56
--- /dev/null
+++ b/dev-ml/dune-build-info/Manifest
@@ -0,0 +1,3 @@
+DIST dune-2.9.1.tar.gz 1385381 BLAKE2B 27224f803547d02f7110dcfc486ef41f9a4586f6f862ef7f8bbf05cc1f3f6dc8ea03fca99c01842f4226ea3d08f4127daa0e5811dd46cc00f1b96ad7eaafe43d SHA512 4fcff34de4acc4429dd73864ca90e695d8ba436839fd679608f7db292e44be70c3db455a58f59477f2055f84ce497bfa8e90e485ed9536acad3c1b3be3d4be77
+EBUILD dune-build-info-2.9.1.ebuild 517 BLAKE2B a7c02238857706cecab9fe1c0efeedea17ec80c791f0fedc1361be9727ae6a45691b1746098b40e7dd25c7a22c599cfc9304254e4142c9f0f0e952055b06d344 SHA512 1b369cd3d131b4c5c293c157fadf24b600dd3dd9fc78dd120a858b19309eae6fa9ef4c7d4bb8ccbaf4add58a038ccfdd25830f47f877eac59371b2d7c8beaac1
+MISC metadata.xml 380 BLAKE2B a55122ee1d38e6491f4f2c955ab0271647054d171979d9b3a964c9d1c7239aeb17c89768008a36bd583b373069f387de809a8a62af68f725568f201f2be8b979 SHA512 9b49e03db4133c31c38c13f2502ebd56833c516d27facf46b9d83eaaf3982c3d5dd4e2dc2a1b5e5cbf8cbc60405f4aa2f0bd7a0886c3ead97598e139cac3d595
diff --git a/dev-ml/dune-build-info/dune-build-info-2.9.1.ebuild b/dev-ml/dune-build-info/dune-build-info-2.9.1.ebuild
new file mode 100644
index 000000000000..c23cca94315a
--- /dev/null
+++ b/dev-ml/dune-build-info/dune-build-info-2.9.1.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="Embed locations informations inside executable and libraries"
+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 ~x86"
+IUSE="+ocamlopt"
+RESTRICT="test"
+
+src_configure() {
+	:
+}
+
+src_compile() {
+	dune build -p ${PN} @install || die
+}
diff --git a/dev-ml/dune-build-info/metadata.xml b/dev-ml/dune-build-info/metadata.xml
new file mode 100644
index 000000000000..3cf03b345ced
--- /dev/null
+++ b/dev-ml/dune-build-info/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ml@gentoo.org</email>
+    <name>ML</name>
+  </maintainer>
+  <upstream>
+    <bugs-to>https://github.com/ocaml/dune/issues/</bugs-to>
+    <remote-id type="github">ocaml/dune</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ml/dune-configurator/Manifest b/dev-ml/dune-configurator/Manifest
index b63ed9665dba..cc5245106e47 100644
--- a/dev-ml/dune-configurator/Manifest
+++ b/dev-ml/dune-configurator/Manifest
@@ -5,5 +5,5 @@ DIST dune-2.9.1.tar.gz 1385381 BLAKE2B 27224f803547d02f7110dcfc486ef41f9a4586f6f
 EBUILD dune-configurator-2.8.2-r1.ebuild 3673 BLAKE2B d31ebf45cc51b44d9adaf9492aa713f1a42c85921dfae894e8c59604126e046615236eb28b77da0da683e8cb0e758b83f4c85e16b905b56b2ed0718fc4393338 SHA512 a3bd94c56071878c025d5f384419636b1a6cdd9cf4f972ea4ea92667b8b0e47d32199a44c79206d1e9a76f96fbc8aae4b86f10792c989934ef7e66ae551265d3
 EBUILD dune-configurator-2.8.4.ebuild 4095 BLAKE2B 440ac69c0b4571560d90c39ee5f2ed6860bb1b592c7e2b3fae4c2d02bd1e953be24af97f436566d618b6ff5d0523ae25516d3f7d15b2960daa4f92eb3bae4170 SHA512 d03fcad1bd2d4679881607f5af4b7995b41492336331201fb5457e410014d0eb1c652e747b78e78385c03520748a5ca7cabd8debb4a52548ddc9cce06aea9917
 EBUILD dune-configurator-2.9.0.ebuild 4101 BLAKE2B fa84f951fac3a9e4882c3542cdbcbe0b8e0ef5ce6bc8835481a33e95dc216b29b662b4c4d995f7ad17b10a68ed53f422973c82d355a41f12c9ad00758bb5cc17 SHA512 d98dd50f8d1a1624aaf7b76d1a3827560324f0eff3e5040643794ed0f6385c8ddaefbed05f471b7119fb757b15673a6907f622891ef11ae8c71e233c45a82f6c
-EBUILD dune-configurator-2.9.1.ebuild 4101 BLAKE2B fa84f951fac3a9e4882c3542cdbcbe0b8e0ef5ce6bc8835481a33e95dc216b29b662b4c4d995f7ad17b10a68ed53f422973c82d355a41f12c9ad00758bb5cc17 SHA512 d98dd50f8d1a1624aaf7b76d1a3827560324f0eff3e5040643794ed0f6385c8ddaefbed05f471b7119fb757b15673a6907f622891ef11ae8c71e233c45a82f6c
+EBUILD dune-configurator-2.9.1.ebuild 4097 BLAKE2B 8f1426be7f8513b3bc962a2d0fc4540442513375e3fe71d07eda106db0665c2e735ffb48f2205e3bbd8e8b146c8ad6db6b1e14ae08a2f7a67773ef7538da24a3 SHA512 d16f4bf7c9841b1ab41b21deb90c8456b085bb5f642899e7eceea44a7dc4d92b5897d8bd7657eb0e2dc3a64fb07ee318b5f0a7e407730f7b41c32bd86d3d9f56
 MISC metadata.xml 413 BLAKE2B 68bcbe6d091780d3ea48707a42b402cfcc075b1ca0c58a8e145bc8ae6e89806361325f772e9e8b05484fc258f09e33c18fa329a494881e3275f534c65b283c15 SHA512 6520ccff6f2071125a07d0e6bc365c8a919ff32791af97fc633ef68b351de8295454884126334e182da7233744d489acfeb2519c3935990ad21eb20da3f5a1f9
diff --git a/dev-ml/dune-configurator/dune-configurator-2.9.1.ebuild b/dev-ml/dune-configurator/dune-configurator-2.9.1.ebuild
index a8a42765fa98..b781e0525f03 100644
--- a/dev-ml/dune-configurator/dune-configurator-2.9.1.ebuild
+++ b/dev-ml/dune-configurator/dune-configurator-2.9.1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/dune-${PV}"
 
 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/dune-private-libs/Manifest b/dev-ml/dune-private-libs/Manifest
index b520d90c0a58..6a21b4477224 100644
--- a/dev-ml/dune-private-libs/Manifest
+++ b/dev-ml/dune-private-libs/Manifest
@@ -5,5 +5,5 @@ DIST dune-2.9.1.tar.gz 1385381 BLAKE2B 27224f803547d02f7110dcfc486ef41f9a4586f6f
 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
-EBUILD dune-private-libs-2.9.1.ebuild 4119 BLAKE2B eaea1ebab708adcbd6d1807cb2a14010e3cac7d7dbaeaa12c291ea2d2c4dc804a5e34a4a2c02ac342f73d98f09156ceb5bee510fe0d15dc91bbfdf7afd70dc2e SHA512 458293150214b84f21c2aa64923bf04fe49e7f7d1bd075219e12bed6ccf989bc2af492c15e0b18979e85483c15e13a35d481c3a1f18540b27a14d3302105f49a
+EBUILD dune-private-libs-2.9.1.ebuild 4115 BLAKE2B f11748a476cf78bc630d0672a9e94d5c7a2e3a7ae0ddc85ddb6489fdcae825faeb13587fdcfd8e04899fd26e3d35138ba62ac695cdcd859c0e02edba1a47e34a SHA512 cf4f33ccdbcaaec6ae90b2a4fbf6c0d0830a50c98dc2de49d492fad1838b61fcb0b295133e88c2017aea77e6484a69ae308af3eeed9820612ae5e255828e55c1
 MISC metadata.xml 413 BLAKE2B 68bcbe6d091780d3ea48707a42b402cfcc075b1ca0c58a8e145bc8ae6e89806361325f772e9e8b05484fc258f09e33c18fa329a494881e3275f534c65b283c15 SHA512 6520ccff6f2071125a07d0e6bc365c8a919ff32791af97fc633ef68b351de8295454884126334e182da7233744d489acfeb2519c3935990ad21eb20da3f5a1f9
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
index 7b6b59feb352..2fac15d055e9 100644
--- 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
@@ -12,7 +12,7 @@ S="${WORKDIR}/dune-${PV}"
 
 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 )"
 
diff --git a/dev-ml/dune-site/Manifest b/dev-ml/dune-site/Manifest
new file mode 100644
index 000000000000..5cc8c2466123
--- /dev/null
+++ b/dev-ml/dune-site/Manifest
@@ -0,0 +1,3 @@
+DIST dune-2.9.1.tar.gz 1385381 BLAKE2B 27224f803547d02f7110dcfc486ef41f9a4586f6f862ef7f8bbf05cc1f3f6dc8ea03fca99c01842f4226ea3d08f4127daa0e5811dd46cc00f1b96ad7eaafe43d SHA512 4fcff34de4acc4429dd73864ca90e695d8ba436839fd679608f7db292e44be70c3db455a58f59477f2055f84ce497bfa8e90e485ed9536acad3c1b3be3d4be77
+EBUILD dune-site-2.9.1.ebuild 596 BLAKE2B fa03797d6cb98422acafc3854035967c7f8b58271f7155e4abe02061357165df76223e6eb01f76b67468ce09e1752056a242b247b3432ad086367a12b6bdf662 SHA512 c6d3e08817f15d05b9f07f2cc40b6908deb00e68fd79e5ebac95a86c57b95d2d31071e6dbe9b4d87401a5813e23e7ae1b6077ba22f74a356b93dd5a530a333e6
+MISC metadata.xml 380 BLAKE2B a55122ee1d38e6491f4f2c955ab0271647054d171979d9b3a964c9d1c7239aeb17c89768008a36bd583b373069f387de809a8a62af68f725568f201f2be8b979 SHA512 9b49e03db4133c31c38c13f2502ebd56833c516d27facf46b9d83eaaf3982c3d5dd4e2dc2a1b5e5cbf8cbc60405f4aa2f0bd7a0886c3ead97598e139cac3d595
diff --git a/dev-ml/dune-site/dune-site-2.9.1.ebuild b/dev-ml/dune-site/dune-site-2.9.1.ebuild
new file mode 100644
index 000000000000..25ec385655d8
--- /dev/null
+++ b/dev-ml/dune-site/dune-site-2.9.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="Embed locations informations inside executable and libraries"
+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 ~x86"
+IUSE="+ocamlopt"
+RESTRICT="test"
+
+RDEPEND="
+	~dev-ml/dune-private-libs-${PV}:=[ocamlopt=]
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	:
+}
+
+src_compile() {
+	dune build -p ${PN} @install || die
+}
diff --git a/dev-ml/dune-site/metadata.xml b/dev-ml/dune-site/metadata.xml
new file mode 100644
index 000000000000..3cf03b345ced
--- /dev/null
+++ b/dev-ml/dune-site/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ml@gentoo.org</email>
+    <name>ML</name>
+  </maintainer>
+  <upstream>
+    <bugs-to>https://github.com/ocaml/dune/issues/</bugs-to>
+    <remote-id type="github">ocaml/dune</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ml/dune/Manifest b/dev-ml/dune/Manifest
index 4f35cf6a203e..7c9ee2bffbd2 100644
--- a/dev-ml/dune/Manifest
+++ b/dev-ml/dune/Manifest
@@ -11,5 +11,5 @@ EBUILD dune-2.7.1.ebuild 767 BLAKE2B 18b22cc6407814bdef1baedfe7c325224d69fd126c3
 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
-EBUILD dune-2.9.1.ebuild 903 BLAKE2B f3df6ccdf9cefd2d7f1ba4d9bfb5ede97639919a214e7fd709cb7928b5923f84a41bce96055108a40ddef55ace5a6301b2aa08b3ac6ca6d374f1621a6c56aaf0 SHA512 f8f733b489eaddecda74cdccc66932716f0103151d98778278bc4cf929eb03a6011679f8f4e529c86d491ac1d3cb6469e366326e97f656c72a1a4ce5063e4f93
+EBUILD dune-2.9.1.ebuild 899 BLAKE2B b2c0ccba4c16e614eb4f4381955c5b615b5cbe2943e7e2c04863f00e85b580d91e56e1526af65c72e8388b3b2b6253883e9bbc1857785ed8ed4b103e8845f815 SHA512 69976a1641eca9a00b35efe8663f8a2e8073bef7b290a553730bbf180d43248e16fad5a92e3483ec9b0f19a5ce7a86659e80ac3b4e05ed76169ea4e8b4d480ca
 MISC metadata.xml 413 BLAKE2B 68bcbe6d091780d3ea48707a42b402cfcc075b1ca0c58a8e145bc8ae6e89806361325f772e9e8b05484fc258f09e33c18fa329a494881e3275f534c65b283c15 SHA512 6520ccff6f2071125a07d0e6bc365c8a919ff32791af97fc633ef68b351de8295454884126334e182da7233744d489acfeb2519c3935990ad21eb20da3f5a1f9
diff --git a/dev-ml/dune/dune-2.9.1.ebuild b/dev-ml/dune/dune-2.9.1.ebuild
index 93856341506f..4746983b3343 100644
--- a/dev-ml/dune/dune-2.9.1.ebuild
+++ b/dev-ml/dune/dune-2.9.1.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ml/fix/Manifest b/dev-ml/fix/Manifest
new file mode 100644
index 000000000000..369665690fba
--- /dev/null
+++ b/dev-ml/fix/Manifest
@@ -0,0 +1,3 @@
+DIST fix-20211125.tar.gz 383709 BLAKE2B f74b41e10579423449ec4c78ddc2d58d94c0ba96fe46676979c8f8e31c49a4ab2b305f78082785c52ff3665f19162b14c849b80ba0d09819e327ce7f390ff2d2 SHA512 2ffd3bea841247adeaf8d9ba3cf76669f31dcca97a2ebd415ca3b4540cf273c95f6a0e8bc990aed36dd097b09cf0603c676127ca4141f281f1ae8bb343d90d5f
+EBUILD fix-20211125.ebuild 437 BLAKE2B 40d9660055c43555c2fa2078d62d92a4104b8a14df12cf61a4870be87eac58e1b9419e48e71d90e558ff5a33f53b3e27559d00fc773aa34bffff5a7199885bd5 SHA512 9827863c70e2f1ca1697910452ead7ca12b3f1e9032c15b4558049df3963a3078b098dcfd8e662b269ab68489dfdb1e7959fbe05c90e1191fdd80db9a60bb4ce
+MISC metadata.xml 336 BLAKE2B d846dc519387396575449c27ea9e8d69d1a8c86d049c235a6dec571babdbdf3c528b2d8fe6cb431ab6cedc91d92b4c2c3937f2005a60609138a7be726b49ae33 SHA512 e76df4523b542f2cd71387adf61c67a871393d562548f0c28a7add52be627dbab53530993233da405a5ec6ec61756d726127d0dd9bebfb3f448c1058769f89c3
diff --git a/dev-ml/fix/fix-20211125.ebuild b/dev-ml/fix/fix-20211125.ebuild
new file mode 100644
index 000000000000..9117c4de5fdd
--- /dev/null
+++ b/dev-ml/fix/fix-20211125.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Facilities for memoization and fixed points"
+HOMEPAGE="https://gitlab.inria.fr/fpottier/fix"
+SRC_URI="https://gitlab.inria.fr/fpottier/fix/-/archive/${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+ocamlopt"
+RESTRICT="test"  # regenerate & qcheck not yet packaged
diff --git a/dev-ml/fix/metadata.xml b/dev-ml/fix/metadata.xml
new file mode 100644
index 000000000000..1e1b31b6d744
--- /dev/null
+++ b/dev-ml/fix/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ml@gentoo.org</email>
+    <name>ML</name>
+  </maintainer>
+  <upstream>
+    <bugs-to>https://gitlab.inria.fr/fpottier/fix/-/issues/</bugs-to>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ml/fmt/Manifest b/dev-ml/fmt/Manifest
index 1ae379484904..273013782d24 100644
--- a/dev-ml/fmt/Manifest
+++ b/dev-ml/fmt/Manifest
@@ -1,5 +1,5 @@
 DIST fmt-0.8.9.tbz 21469 BLAKE2B 4cddf626118c9bdea435f9db4e6a3c0b92b49b2c07d1b0f708ae7b82963453be666ad49df196d98b466236509d3fa5a519e191da6b2385a308d1019f1583f0b5 SHA512 19b97caf5d2dbe86cd75bec478707b8f4e4b899b2a11ce04790dc5acb5c9ed6ea98047de52ee50c6480231a16307af2541eabaa94d18d7d008f7a67496f5f626
 DIST fmt-0.9.0.tbz 22699 BLAKE2B 6c251b7c32093a5860b8e5c18f6a92573e664e8a20eb4b85dc6e601a04045d9c55c1e4a4f5cb879ccc92046c15c5ff97d1877ab78ecfaa2a4aa83a9f49fd409e SHA512 66cf4b8bb92232a091dfda5e94d1c178486a358cdc34b1eec516d48ea5acb6209c0dfcb416f0c516c50ddbddb3c94549a45e4a6d5c5fd1c81d3374dec823a83b
 EBUILD fmt-0.8.9-r1.ebuild 834 BLAKE2B 190d96c89021110250dcec8a7fcf6afcffc25fff399bc8b44a312efcda447d2444bd9b4194e245843f189746dfd94970dbda218a6727248ef6d2ff94e657d728 SHA512 7908d43f5cb907314c301a0524750fc2e2a97c7a027e118ce235d959863f2ca0bc1f154365518bfecedbac9e458ffbea5cf8989199eaee666c4f6545726a574a
-EBUILD fmt-0.9.0.ebuild 871 BLAKE2B ffaff296b0a6e5988cf0896584727e19f5f2176bfc118021fcd64999a9a02769cc0a1bb661565a10abad603a7d094d7508a8327f0fe52db01c84509ccc55f2b5 SHA512 2632ac52a642ccc8f5fedf774664fedb37369805b91029816a3c8bd771386abbf7bb56b94fa9ef9e3718eca03833ffa64c7bbf4b41033b6da049e77a509d607f
+EBUILD fmt-0.9.0.ebuild 865 BLAKE2B 5751e2cf42fdff26576afaf15c5fcd5199a1e48fb6478ba64e9bd3bd4becd9fca040158c41a50df83c1147640b60ec3e55828c9eca3e3934412fc4484f762958 SHA512 ff21fc041d133d5decd09522442bf304b731f4b740c0e3388c817d9817bffe092d30a7b067ef2ab17b55d9741fe4c13275246239d8fd11131d8f5819ab914011
 MISC metadata.xml 245 BLAKE2B fc55e865a04721eb22b544bbdad9960ab2fd5957dc7332f8a3c1b2d162fb6f33ef2d7fe263f1cb80525372b5469b4bd1bde4af0a34c5b2533f1ed540540bd720 SHA512 65b3bea831b7ea0a1bd555c8d768f8733feb52378bc68b92e1156fac09e6bba370c07d9318525c848a23c0f019cb1bbfa9638e4a6ce4f2e6f2487fb90025de63
diff --git a/dev-ml/fmt/fmt-0.9.0.ebuild b/dev-ml/fmt/fmt-0.9.0.ebuild
index 2c981562f8e6..84c17b3fcdd1 100644
--- a/dev-ml/fmt/fmt-0.9.0.ebuild
+++ b/dev-ml/fmt/fmt-0.9.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://erratique.ch/software/fmt/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/gen/Manifest b/dev-ml/gen/Manifest
index 633b48ec0a05..1330940695f7 100644
--- a/dev-ml/gen/Manifest
+++ b/dev-ml/gen/Manifest
@@ -1,3 +1,3 @@
 DIST gen-0.5.3.tar.gz 30905 BLAKE2B a6b8351ec4a75dd986cc0b4e9ed60dbfa78c3b8e3625c1e294f8bc0253d92be1f5d27cc7162e1cfc4f6397bbe272df22d9b7b0d1dd410d7760f30cf4c36c4745 SHA512 192178de106d2ae5f936caead8b21b4b9ec1b8fe35ba56296825900ea15a4ea702caf8824ac34d4478d107b954e22c3dffd81f12d4c08fbd6d9760f49a0deb14
-EBUILD gen-0.5.3.ebuild 486 BLAKE2B f633a6607d20998f16c61a524b8bbc488c12068a0ed4e12def88e9a7d11fd7778296ed430635d0b667ae23ab92434a5f1c4d470cfbf73a4c6373cb1086096eda SHA512 f43facab3346972680475c211605207894f61cafc02d926262a7baccc09b9c9e1b5a0058f9b6c9fee0f34a67ab8e01c325992f35af67e8c5e20b2e944fca855b
+EBUILD gen-0.5.3-r1.ebuild 521 BLAKE2B a43478ee91922336be346c0d92d5e10df60949dec21c7f855374dae0684a43105d23281a61270947edf427f457c3eaad4bb2aea632a72517cd6cc1da6e473f64 SHA512 16c468c31b00592d7d69acf10c0d257609a79dda916f7111a049da2e4e672a576e261f45e53b275ea41f8e29299db2a4b81503ff9c0a6aa56db6451bb3777a99
 MISC metadata.xml 379 BLAKE2B b8484591837a3a2a9b22b03ec119ce46fba6f2293fdc272ae9f0b9145dcf88a4a586e83f454c0e85949e93fd08724a62c0f5d0217372fd87f3b3088c0673f12c SHA512 64284135ea4a1d025b56d7bd35c37686329e0a7bfd1dedfccf252a7fe13df833e36437ed9ebd5599d3e34b9a69958421007873b3b93a8209e303f220f1014360
diff --git a/dev-ml/gen/gen-0.5.3.ebuild b/dev-ml/gen/gen-0.5.3-r1.ebuild
index c4b73e0808a3..7f2516150314 100644
--- a/dev-ml/gen/gen-0.5.3.ebuild
+++ b/dev-ml/gen/gen-0.5.3-r1.ebuild
@@ -10,10 +10,11 @@ HOMEPAGE="https://github.com/c-cube/gen/"
 SRC_URI="https://github.com/c-cube/gen/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
-SLOT="0"
+SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE="+ocamlopt"
-RESTRICT="test"  # qcheck & qtest not yet packaged
+RESTRICT="test"  # tests fail  > unused-open
 
 DEPEND="dev-ml/dune-configurator:="
 RDEPEND="${DEPEND}"
+# BDEPEND="test? ( dev-ml/qtest )"
diff --git a/dev-ml/lambda-term/Manifest b/dev-ml/lambda-term/Manifest
new file mode 100644
index 000000000000..2b458689c29d
--- /dev/null
+++ b/dev-ml/lambda-term/Manifest
@@ -0,0 +1,3 @@
+DIST lambda-term-3.1.0.tar.gz 144714 BLAKE2B a84af472834f33ce0a88b0e21f13db66e5b28576a959c0c2e173da045d4c408c183c9eb9664678de7574b840bd129284e406af3d7392ceb0b8be3e53973214bd SHA512 b1601749214747504a248392ec81ce20f4cd44bddbf14424e40725e6d506d925320fc7ef7f4ce58e876769d858c5e3882664e27ca33a9dc74d29a4a22ed0d705
+EBUILD lambda-term-3.1.0.ebuild 527 BLAKE2B 3aadced723cdbcd444ccc779680cd897df77663981fd3b4f3421ed779d8c6fe86ba7e7d5feba5ef935b8e5d6c75504463012c48437d0a43d43e22dc4a345b8b4 SHA512 2a7946f7b32c4f6732d33cd9df1e3cd3c1dc87646a1321046d6503f229a3d4cc14850899c7383442be0268ee0b2887e67686b3d2c04a001ffad4dbd22e603b51
+MISC metadata.xml 978 BLAKE2B 68f77e4e4516eafac115722941a17c6e0db0441467e81c8e1d652a7727574c4cd5ca20baff3a8da00218209d83a8bd12dfe9a097ea6b6228ca01709c7f98681c SHA512 fdbb682a5a3807b84a9fe49a58db67f5bba44cf2ce96645ba46983f31bf71d18b1b5b0fe9617f0275a4ca85a21d7c78108f9aa1fad3cfa974e5595f67186943e
diff --git a/dev-ml/lambda-term/lambda-term-3.1.0.ebuild b/dev-ml/lambda-term/lambda-term-3.1.0.ebuild
new file mode 100644
index 000000000000..82fa0daf8691
--- /dev/null
+++ b/dev-ml/lambda-term/lambda-term-3.1.0.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="Terminal manipulation library for OCaml"
+HOMEPAGE="https://github.com/ocaml-community/lambda-term"
+SRC_URI="https://github.com/ocaml-community/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+ocamlopt"
+
+RDEPEND="
+	dev-ml/camomile:=
+	dev-ml/lwt:=
+	dev-ml/lwt_log:=
+	dev-ml/mew_vi:=
+	dev-ml/react:=
+	dev-ml/zed:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ml/lambda-term/metadata.xml b/dev-ml/lambda-term/metadata.xml
new file mode 100644
index 000000000000..756229c7addd
--- /dev/null
+++ b/dev-ml/lambda-term/metadata.xml
@@ -0,0 +1,22 @@
+<?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>
+  <longdescription>
+    Lambda-term is a cross-platform library for manipulating the terminal.
+    It provides an abstraction for keys, mouse events, colors, as well as a set
+    of widgets to write curses-like applications. The main objective of
+    lambda-term is to provide a higher level functional interface to terminal
+    manipulation than, for example, ncurses, by providing a native OCaml
+    interface instead of bindings to a C library. Lambda-term integrates with
+    zed to provide text edition facilities in console applications.
+  </longdescription>
+  <upstream>
+    <bugs-to>https://github.com/ocaml-community/lambda-term/issues/</bugs-to>
+    <remote-id type="github">ocaml-community/lambda-term</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ml/logs/Manifest b/dev-ml/logs/Manifest
index 37ebd57d9113..954d68db560d 100644
--- a/dev-ml/logs/Manifest
+++ b/dev-ml/logs/Manifest
@@ -1,3 +1,3 @@
 DIST logs-0.7.0.tbz 18458 BLAKE2B 091d1778166af0b67e17e932a775a73e31e5d167b94b1b378063a7112c21bf1ac935c7e51fe29bcc0121cd5e60ea46ed3c7381f4db5df400b463feedfbe89663 SHA512 657f66eeaf5788947a3ff4b2a179f7e192ad4ce086fc8968286066d4b83af476523b3befce50ee58abf2d9b8c8dc65573ba8ed62f9c5e7933db29a7fb769646a
-EBUILD logs-0.7.0.ebuild 1381 BLAKE2B fd03c86410c3a372dd81e8eb98fd247ef69d48b20721a6f1444faf982b4f587372ff3d172e90394cd91171ed593f753b64a0c5d1970299a6324abf44429beb81 SHA512 9d6a5ef5aa12eddfa45e86203f4c82f79dd69e2929e506344583e775ddbb07bf88ded701ce16b72b0482024395762e77e53fca18afa4d9873b774ec120e1c212
+EBUILD logs-0.7.0-r1.ebuild 1389 BLAKE2B 6e6e9d777b186683bccc06ef41cf866d13bc2a77574490bd4d75c7d40cae13ea687b6343a8a87f8b557586c4a00d87f28969bc3a558021d256c21ce3698545bb SHA512 5d70fb38482d30f0a57c5afd50e9561248aeb2c053850d70c784878a7a3abdf5b347c284a6a52fdb616e694595aae517032089b78f84974f4f81f68f3592123f
 MISC metadata.xml 587 BLAKE2B 9280d7927d1cc4fdb3e48feda36a486cf45a8cfc4da9248d3b4908958c6a4ce01e12e76ec5c32500c8e5d7ab7f228c12d47e44fddcbbbfa6e731ee14e88314c1 SHA512 a3ef80fa82dedd15f554eb59fe0da20d004eb0e0a5ca9bc110c4c0d0e466037239bd460bc303111143ca00256f28069195f17038e5eef3d5da9cc63492c56a69
diff --git a/dev-ml/logs/logs-0.7.0.ebuild b/dev-ml/logs/logs-0.7.0-r1.ebuild
index 86e91a5d29da..e422a0867153 100644
--- a/dev-ml/logs/logs-0.7.0.ebuild
+++ b/dev-ml/logs/logs-0.7.0-r1.ebuild
@@ -22,11 +22,12 @@ RDEPEND="
 	cli? ( dev-ml/cmdliner:=[ocamlopt] )
 	lwt? ( dev-ml/lwt:= )
 "
-DEPEND="${RDEPEND}
-	dev-ml/opam
-	dev-ml/topkg
-	dev-ml/ocamlbuild
+DEPEND="${RDEPEND}"
+BDEPEND="
 	dev-ml/findlib
+	dev-ml/ocamlbuild
+	dev-ml/opam-installer
+	dev-ml/topkg
 	test? ( dev-ml/mtime )
 "
 
@@ -62,5 +63,6 @@ src_install() {
 		--libdir="${D}/$(ocamlc -where)" \
 		--docdir="${ED}/usr/share/doc/${PF}" \
 		${PN}.install || die
-	dodoc CHANGES.md README.md
+
+	einstalldocs
 }
diff --git a/dev-ml/luv/Manifest b/dev-ml/luv/Manifest
index acb5799d22fc..4ff62ff83739 100644
--- a/dev-ml/luv/Manifest
+++ b/dev-ml/luv/Manifest
@@ -1,3 +1,3 @@
 DIST luv-0.5.10.tar.gz 805333 BLAKE2B 23edd2bc870a2886e560d330d9a20b205a77ea7bc8ed631e00e43819474eeb75246b407113b59ed9c5f74462ad5f721338ac5a157a1fe0e443abf9ff88771089 SHA512 c50a0def366944b4ef6038503ecefe75d8e45f542311198531f01a355675c08b00370480141b455616429a883c3232d34628e6a67846db5864a1b0eabfe6311f
-EBUILD luv-0.5.10.ebuild 468 BLAKE2B eba994630e59c473cd1436242e9d18356589068c78b768b486a2a42747b1befd0e84bd7dfc2d2a37f5f416803bc4a4cfe27cc4f2378cce8880897dde9760a5a7 SHA512 b93a123e1235e6359e0f2017de3da4c3373ee790f7a33916f7a5fe0a3698c67beabf4bbca13dce48e2b0f363720f7a20ea761f97fd3a1b870c3b611b3b2ebacf
+EBUILD luv-0.5.10-r1.ebuild 565 BLAKE2B 9a2d6049ae875f05b0df5371459ad4529e713df331a3f8180ca3a51899957127d8f1effcbac42b34d77efc944392b472680500f8f2e5247e123687dac19a730a SHA512 1448ee4b892851965a40ef36e6019306dca3faf83c0fd08cc6835c25bb7bb6f815f8533618d40d4a44d60dbd5c2157448fd0a3a7ceac2602d3f44c2fd63c2550
 MISC metadata.xml 309 BLAKE2B 2571e139ee75123b88f05751d493805433dd5f22ac3f06e82adf97017f53fa54c1870ee947b4e98ed55d4f134b837e1850d86fb10e6db43f0c37f1d54a2a07db SHA512 a917d2ea07601ed6c8d9386ce92deb19dfa0a37e3cf42b7808cb9e6e47ad57b1a9495f4b5f43695bd13d1a09837e40ae265bcb1b6bac30e62fec39bee1728456
diff --git a/dev-ml/luv/luv-0.5.10.ebuild b/dev-ml/luv/luv-0.5.10-r1.ebuild
index 0fa9ce2c59a1..a50ac52098a3 100644
--- a/dev-ml/luv/luv-0.5.10.ebuild
+++ b/dev-ml/luv/luv-0.5.10-r1.ebuild
@@ -6,14 +6,19 @@ EAPI=7
 inherit dune
 
 DESCRIPTION="Binding to libuv: cross-platform asynchronous I/O"
-SRC_URI="https://github.com/aantron/${PN}/releases/download/${PV}/${P}.tar.gz"
 HOMEPAGE="https://github.com/aantron/luv"
+SRC_URI="https://github.com/aantron/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 SLOT="0/${PV}"
 LICENSE="MIT"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="+ocamlopt"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
 
-RDEPEND="dev-ml/ocaml-ctypes"
+RDEPEND="
+	dev-libs/libuv:=
+	dev-ml/ocaml-ctypes:=
+	dev-ml/result:=
+"
 DEPEND="${RDEPEND}"
-BDEPEND=""
+BDEPEND="test? ( dev-ml/alcotest )"
diff --git a/dev-ml/lwt/Manifest b/dev-ml/lwt/Manifest
index 22b10b421ead..119c52dd8196 100644
--- a/dev-ml/lwt/Manifest
+++ b/dev-ml/lwt/Manifest
@@ -3,5 +3,5 @@ AUX lwt-5.3.0-ppxlib-0.18.0.patch 13548 BLAKE2B fa89411ea65421eb8f8b7f7f782817c2
 DIST lwt-5.3.0.tar.gz 298152 BLAKE2B a39494bf98fcca07bf4601a742f4bfdc1ea2a67e2babbab650c41d2df58296a859520509ddc080af9c4d55be76439b401174720765fb942586d7c866f80cc538 SHA512 9922c19944595b0c07da8e1bbdecb2cc7c5a7edcdc2224215efb819d9c735da8986388a2446bd0762e28533f5d9d386970f07a4f1b0d14255c6743f3a1d16cb6
 DIST lwt-5.4.2.tar.gz 304541 BLAKE2B d474b20538af382c6f64072da2caa25e285f431c9b161c9796a44d1c84475f72e50d81baccb22ae908f82594c9dcaac6a874f54fe6332de2550128774d1280fc SHA512 9f46fb2e56dc7bd57a12d5ab4dc68719947a1462f336087a95e991d087bb9b5b8dee2592d0f7d35abc507d9a641dd221c44c949c81d00e26c673a067d94ba3f4
 EBUILD lwt-5.3.0-r1.ebuild 808 BLAKE2B 517a171d8329a4ed2667afd775d02af21b37f49b9aa47d280ceda33fd36ba3d609e9d8a3ac9ae885bcafcb340957964f35f2ff1ebab4a9efe4c24ae7f159f702 SHA512 e0795a4c11cb8e83cf5b25eb0c2c6c62c8ca847dfadb9e8d4e9c61d9ae4b16332d55b41960b789d0c2061d7cdbf277a90b55274c0b8605b4f3bc3c1feafb5e57
-EBUILD lwt-5.4.2.ebuild 614 BLAKE2B 0a17833e794034a782cab696d6166350894fefde100a3681ee060bdca8da0ca2ebea05ce5d425f3410966d341640dc3de2a7c1bfb22e0b1115c7b8ac4f0555ab SHA512 b5a038fbe2af7a48e3a206a7496537cee3a67470f66bf43e7c1648ae3ee69ef3198251b2913195de3763214fc995c9fd48dc77ffc9724f17ec998f00967f75b2
+EBUILD lwt-5.4.2-r1.ebuild 732 BLAKE2B 7f10ab7433c9fbbaf941f844c1e58f30b3c7843df4c58c48f7aa0391274cd3e0405ddd0d5c51e99eb78f053ec32994a5cb8b98d52bb2220cadb40070dab7156a SHA512 61c2f2a730047e6a89d714aec2e8a70eaf6183e7633194c64ec5ee591f7379024b7f31833f2b47cf9f15013d3dfe55e11377e7ef1c944f78c3d6658004616445
 MISC metadata.xml 414 BLAKE2B 34a1192334c52a4dfe3746119293c05cccc14f6a4b7b5faad4834ad33996a98be8c7854096eebe870a4a0bdc675d796f55788334503423a99632b1625d84b8d9 SHA512 09660f044d6132779e8e63fe6dbca02109317f70af905181b8b344348c72257df804022fedf884c84ddbfe2d60dbcb965e3cc273c30c593f70a083d80c2f92aa
diff --git a/dev-ml/lwt/lwt-5.4.2.ebuild b/dev-ml/lwt/lwt-5.4.2-r1.ebuild
index ebe53baa350d..9fd078bdb572 100644
--- a/dev-ml/lwt/lwt-5.4.2.ebuild
+++ b/dev-ml/lwt/lwt-5.4.2-r1.ebuild
@@ -26,3 +26,12 @@ RDEPEND="${DEPEND}"
 BDEPEND="
 	dev-ml/cppo
 	dev-ml/findlib"
+
+src_install() {
+	local i
+	for i in lwt lwt_luv lwt_ppx lwt_react ; do
+		dune_src_install ${i}
+	done
+
+	einstalldocs
+}
diff --git a/dev-ml/lwt_log/Manifest b/dev-ml/lwt_log/Manifest
new file mode 100644
index 000000000000..a06f219ec132
--- /dev/null
+++ b/dev-ml/lwt_log/Manifest
@@ -0,0 +1,3 @@
+DIST lwt_log-1.1.1.tar.gz 24569 BLAKE2B c205382dcb17f9ce6f8037bb19f817138081c61b60f5253913d9346c009694c0a6f67228293fa1d63ea405c94950141ea2f383f1483fcf674771f8a9252f9eff SHA512 df3d171a7c72f37e96b756d252ab586767df9c13e01500faf13d4b2cee936b0602fd7c725c03db488d3737d8d92300af103d395a926dc654a2c44a5d6068f24a
+EBUILD lwt_log-1.1.1-r1.ebuild 433 BLAKE2B 2128c252d800b1c15045a47d226b86f203dd622dd366ad1c230aa1ac226ada79131be854f70843f577b464a453bb49767d9a970eed929f3d8c31890a1840590a SHA512 14953d46894a0475119e17f0c9d51600c98a80bf1914b3f157e65fa69cd1975e42a8799e08ac3d187bb0442c60a684b5b0606079eb2afe3d108e4d76116c470c
+MISC metadata.xml 390 BLAKE2B 64faf9b6d25505a3334ef5711ae1de81ba2962f7d4d7107563e822e96f22b777593bc1b165f5829d4583972fed7b04c4f244a5b6b0260949114d8a3431cce99d SHA512 03db68029330ced1c8f109c15d164e99f7f65238740a65d9402dc6519d03c8c91ef3c6b7695df2bc9faca24c052660fb334eb6286a0fff6442b4cf0e1961feb6
diff --git a/dev-ml/lwt_log/lwt_log-1.1.1-r1.ebuild b/dev-ml/lwt_log/lwt_log-1.1.1-r1.ebuild
new file mode 100644
index 000000000000..65e0d086940d
--- /dev/null
+++ b/dev-ml/lwt_log/lwt_log-1.1.1-r1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Cooperative light-weight thread library for OCaml"
+HOMEPAGE="https://github.com/ocsigen/lwt_log"
+SRC_URI="https://github.com/ocsigen/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0/${PV}"
+LICENSE="LGPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="+ocamlopt"
+
+RDEPEND="dev-ml/lwt:="
+DEPEND="${RDEPEND}"
diff --git a/dev-ml/lwt_log/metadata.xml b/dev-ml/lwt_log/metadata.xml
new file mode 100644
index 000000000000..f49c7a0cb39f
--- /dev/null
+++ b/dev-ml/lwt_log/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ml@gentoo.org</email>
+    <name>ML</name>
+  </maintainer>
+  <upstream>
+    <bugs-to>https://github.com/ocsigen/lwt_log/issues/</bugs-to>
+    <remote-id type="github">ocsigen/lwt_log</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ml/merlin-extend/Manifest b/dev-ml/merlin-extend/Manifest
index 5dd4ecfbe226..1ecc6cd2f126 100644
--- a/dev-ml/merlin-extend/Manifest
+++ b/dev-ml/merlin-extend/Manifest
@@ -1,5 +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 468 BLAKE2B 4c2a223fab1b140888113d1a8bfcf08993f8d2d83706fd9ad6dfba63371d7e5783f983f5698b2a08324a5bc5f2ec602338ae8489066c74bd9dacb17f6e3e8b87 SHA512 3abe591dfb6460a42815ba8a04a44ff8078515efb36518d7067ea644aca99457953aa896e1b748f364a78056b157b773e56c513dafc11f7ccc7c586e29f090b9
-EBUILD merlin-extend-0.6.ebuild 463 BLAKE2B 5eea33928354fca00a371511af2d0316a176b78944cb476e833c41281d4ca83036e28720b50b97ee98dd03aeb758854c347ed6ec5314b4ff3326d249bb6f3574 SHA512 8f59bf539f5d1dab272bdf40013dad07fd521409f5f4d44ace2407ae5de1f662980315e26480bf276681b900c2eda6a5c96d76c8de092f63faf7037ec111fe42
+EBUILD merlin-extend-0.6-r1.ebuild 428 BLAKE2B 5259b9ce048865f65cc97d3c93f30d45a013a7944f9c31c04a4f8bf5ed23c4f4c0d74fb80fe1c558ac88418d9723038e7290eed1e2574e806b671114ceddb480 SHA512 2fe6855da027d1dc5ce32ab61ec7068799ce193455a228fdd104797f0fbc10e9310c2991e375cd1e47015966118037731eca124cf7428bb326129a98b7989b5e
 MISC metadata.xml 319 BLAKE2B 1a5504443802ca145e62b7a0a93d0db800a0723d8ccb18945d407d43f45b1631b9887d83a66062fba544fe3822b6193c0709615380baff74d2be0d60e764409d SHA512 cd5db8c1f6db80a9179cfb785c9405825285846a1bf307dea9a8bc4b1a3e21d7008ad7be8acf827abf7458690b20a41731fb3ec0a10a31350dbdb8dbd3427118
diff --git a/dev-ml/merlin-extend/merlin-extend-0.6.ebuild b/dev-ml/merlin-extend/merlin-extend-0.6-r1.ebuild
index 8643e7059fd7..89458b370bfa 100644
--- a/dev-ml/merlin-extend/merlin-extend-0.6.ebuild
+++ b/dev-ml/merlin-extend/merlin-extend-0.6-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit findlib
+inherit dune
 
 DESCRIPTION="SDK to extend Merlin"
 HOMEPAGE="https://github.com/let-def/merlin-extend"
@@ -12,12 +12,8 @@ SRC_URI="https://github.com/let-def/merlin-extend/archive/v${PV}.tar.gz -> ${P}.
 LICENSE="MIT"
 SLOT="0/${PV}"
 KEYWORDS="~amd64"
+IUSE="+ocamlopt"
 
 RDEPEND="dev-lang/ocaml:="
 DEPEND="${RDEPEND}
 	dev-ml/cppo"
-
-src_install() {
-	findlib_src_preinst
-	default
-}
diff --git a/dev-ml/mew/Manifest b/dev-ml/mew/Manifest
new file mode 100644
index 000000000000..4116935697fe
--- /dev/null
+++ b/dev-ml/mew/Manifest
@@ -0,0 +1,3 @@
+DIST mew-0.1.0.tar.gz 4309 BLAKE2B 7280369eb4d8d940c5f30b8d3485020b088bdca918e3c2992c54e9785ac4fcbd99a0552285c68742704d845b3764b0bd741592963095254cb744b621c2b1eb6d SHA512 77a68f6dc9f3edc729384d59247a29f32f969dc6d987ed2e6c88b9a64b655822dafa9c3cb424bf40e6cf9ed20cddf9c708738872db245f14a711770e8e938db3
+EBUILD mew-0.1.0-r1.ebuild 500 BLAKE2B dd2bd5528bbf8df244e7f6bcb2c6c6c5f364fc6f75a8684ccd3ec4a4250ec2f52fd35a798a6d769cb54e9274c993ec3ca6736ffd9fde957fe14fdcdaca7d2297 SHA512 84e1a872eb2c879e742db47935e4043aff58c5d8fe551ae0b8db68e385d68b919e198f94560e02f9743776565c17f15d4197b31e195c36998e3e188e488dca79
+MISC metadata.xml 377 BLAKE2B 00a5f2e321b4a00ad3a58fc4b4ba4d95e86fa827bf3dabda50cf34586e01274c18489bb0a4370e30f6208aa79ca659c4a891295b922cd45967ff47caf0b59f0d SHA512 1ad4cc8b94381de5ce1f05ad0ae854c02de4a5a3a4eb6e40bd6ae2fa1281d6df1d568092bbfd7d4ff2e9a26d678ca29bba80a0ed3c14175d36566083e2bb4b56
diff --git a/dev-ml/mew/metadata.xml b/dev-ml/mew/metadata.xml
new file mode 100644
index 000000000000..186d4b4452c8
--- /dev/null
+++ b/dev-ml/mew/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ml@gentoo.org</email>
+    <name>ML</name>
+  </maintainer>
+  <upstream>
+    <bugs-to>https://github.com/kandu/mew/issues/</bugs-to>
+    <remote-id type="github">kandu/mew</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ml/mew/mew-0.1.0-r1.ebuild b/dev-ml/mew/mew-0.1.0-r1.ebuild
new file mode 100644
index 000000000000..6298b8d0a721
--- /dev/null
+++ b/dev-ml/mew/mew-0.1.0-r1.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="General modal editing engine generator"
+HOMEPAGE="https://github.com/kandu/mew"
+SRC_URI="https://github.com/kandu/mew/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-ml/result:=
+	dev-ml/trie:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="test? ( dev-ml/ppx_expect )"
diff --git a/dev-ml/mew_vi/Manifest b/dev-ml/mew_vi/Manifest
new file mode 100644
index 000000000000..08172364c358
--- /dev/null
+++ b/dev-ml/mew_vi/Manifest
@@ -0,0 +1,3 @@
+DIST mew_vi-0.5.0.tar.gz 8605 BLAKE2B 30953927947b80391ccff3a7378bfc7d4edcff7164226225c5c1f0fc835312aa31220eedc2e29de663027dd32e316f4ac365494da0893f6d91094f35c036b0db SHA512 f6ee1375ceee60ccae1799d07a8bc55684fdbffc2275147ef19cf3c7d242663764e6630b9423287a78efacba17f410971e3fc397d202effb331f94dc00797eb0
+EBUILD mew_vi-0.5.0.ebuild 435 BLAKE2B 432c243df9d844b2ff0bba4c033ddce9380437f20a9a437eca609fdcd9c1a952d747e741cfc9eb6fa033f2b11c7a7061188839cb85f37016519d98e0dc8bfccc SHA512 cbac9aab921ed631616299301be62e8de05f9d2551c3cf55b781213c1aeb65ade645d5737e40b41a502cba6c4a8e3c397bdc022c4ae147d68d953d5824a011c7
+MISC metadata.xml 383 BLAKE2B 5fd3f39c72d2c26711d9808b1da52b4bc3ba19955c251d13351949ec568339fad97080cede0bbf2eb228858b6bd0a4189f869f1fcaac0e9077e140d5501a5b87 SHA512 e06c7dad8cacf195ae675d8516d657628408037c4c4d374460a760c36d5a9879ac1f3214323489c5b0f857969ea421391843d4357750b8e6fa2186c561494dc6
diff --git a/dev-ml/mew_vi/metadata.xml b/dev-ml/mew_vi/metadata.xml
new file mode 100644
index 000000000000..884aca09d88a
--- /dev/null
+++ b/dev-ml/mew_vi/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ml@gentoo.org</email>
+    <name>ML</name>
+  </maintainer>
+  <upstream>
+    <bugs-to>https://github.com/kandu/mew_vi/issues/</bugs-to>
+    <remote-id type="github">kandu/mew_vi</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ml/mew_vi/mew_vi-0.5.0.ebuild b/dev-ml/mew_vi/mew_vi-0.5.0.ebuild
new file mode 100644
index 000000000000..7070943c97e6
--- /dev/null
+++ b/dev-ml/mew_vi/mew_vi-0.5.0.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="A vi-like modal editing engine generator"
+HOMEPAGE="https://github.com/kandu/mew_vi"
+SRC_URI="https://github.com/kandu/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+ocamlopt"
+
+RDEPEND="
+	dev-ml/mew:=
+	dev-ml/react:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ml/mtime/Manifest b/dev-ml/mtime/Manifest
index 522b052b493a..1b72b3bf9df5 100644
--- a/dev-ml/mtime/Manifest
+++ b/dev-ml/mtime/Manifest
@@ -1,5 +1,7 @@
 DIST mtime-1.1.0.tbz 15467 BLAKE2B 975fdb01c6a4806035a5fbc256d192d6c2f45bdfb750045293b10a732c5613108d9bce897d3c1be660af60d6e9bafbf299dedbc0d872d1c09f65f47b11c9a6b6 SHA512 8ed5dae589dd27fc6e748218a9d9fb9d7d954d231fc2100d61c1b336e0ed38a215bc608cdea9965547729177c78c868c1de6a5ceac6735686a3de1c4a791746c
 DIST mtime-1.2.0.tbz 16272 BLAKE2B 317201f8d5e7a55636e58748ffd269db5e88aed012e8dd7ed269d1f128f8d21ed0e707679b030b9c822bac98c9b76033e8d2402171c4ee758d8c936fbeee7ee9 SHA512 0f0ed220cd0f899643930814010f8592e1f47b6dc6c4dce8eebfb17a81b0abed093a3dbf9c02490af99bf81ea640372f73b4ab88fd8ef0e0c7c66920692a8778
+DIST mtime-1.3.0.tbz 17308 BLAKE2B f943ccb5d4c9ae28ae4620d1dbe897434d4d828091c8d0f17060a0fa40dde7fdcb73c6f85f7dd6fac8099d9608d6246613e2fc954bedb3d5b05b26149bd24260 SHA512 5b998ef803020de4771525adaa448623d348fa079800e72ba2ba78ff2d76a7d89da6200fe8bbc435d1355ad2c571c029398150d618912e58b5765fcf2210a5d0
 EBUILD mtime-1.1.0.ebuild 717 BLAKE2B d49774f2eb6d262680e3f0bd929ad61a91a16913864361d374188004c2ebd5c52ebefaae73d1b5a38c588a258fbd317f612f83392a32bce10b618ccd5c00d40b SHA512 03b1bcd56fa44c53c2e10967fa29a5211057dded1de5554db54cbed83a0dd8d3c9202d8dcddc157f1cdfaf494c9043e628e3777023ffd866b2151948ab12fd10
 EBUILD mtime-1.2.0.ebuild 717 BLAKE2B d49774f2eb6d262680e3f0bd929ad61a91a16913864361d374188004c2ebd5c52ebefaae73d1b5a38c588a258fbd317f612f83392a32bce10b618ccd5c00d40b SHA512 03b1bcd56fa44c53c2e10967fa29a5211057dded1de5554db54cbed83a0dd8d3c9202d8dcddc157f1cdfaf494c9043e628e3777023ffd866b2151948ab12fd10
+EBUILD mtime-1.3.0.ebuild 723 BLAKE2B 3da03fa3bd6a6ddc6621e6ed26cc9cc54e55488ad504b81d5c38b38f68e991631b95aeb8dcd2b60892c729a849fa4a1e0e3fb349d8eaa0e2cafe2a231cac88a0 SHA512 22c755c8c00adac4711d1fecfeb3410688d2ecc022f46f696fc2c711e1f84a0558bb73683116a99f62d880f684895bf33a7d0389bc1260dce2fdbb880bfd7a65
 MISC metadata.xml 312 BLAKE2B aad4e2756300a7fdc494215d874c8a754ddee0f94fb24788b8b7ba17d0062f266790d8bc74954c7c21ed481782ed9ddb2b007284266f92f707078a7466f961dd SHA512 aabba72b993e6d70b4d1d1ef3eba7d8adb37ace4afc51c4f9a067f6176bd525716118d225518b00ddc28aa31150b4c558b64d1a43b3a3db2319e02f03afef338
diff --git a/dev-ml/mtime/mtime-1.3.0.ebuild b/dev-ml/mtime/mtime-1.3.0.ebuild
new file mode 100644
index 000000000000..a6d491ea6add
--- /dev/null
+++ b/dev-ml/mtime/mtime-1.3.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit opam
+
+DESCRIPTION="OCaml module to access monotonic wall-clock time"
+HOMEPAGE="https://erratique.ch/software/mtime https://github.com/dbuenzli/mtime"
+SRC_URI="https://erratique.ch/software/mtime/releases/${P}.tbz"
+
+LICENSE="ISC"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-lang/ocaml:=[ocamlopt]"
+DEPEND="${RDEPEND}
+	dev-ml/topkg
+	dev-ml/ocamlbuild
+	dev-ml/findlib"
+
+src_compile() {
+	ocaml pkg/pkg.ml build \
+		--with-js_of_ocaml false \
+		--tests $(usex test true false) \
+		|| die
+}
+
+src_test() {
+	ocaml pkg/pkg.ml test || die
+}
diff --git a/dev-ml/ocaml-doc/Manifest b/dev-ml/ocaml-doc/Manifest
index a92bd0a137b5..8f7a998334a4 100644
--- a/dev-ml/ocaml-doc/Manifest
+++ b/dev-ml/ocaml-doc/Manifest
@@ -1,5 +1,5 @@
 DIST ocaml-4.04-refman-html.tar.gz 833166 BLAKE2B 556534193cf23c3648c69465c139956695b68474a523ef6ca2bbfe9a40cdde86ab62a8077ab16759d3db4aa2b7e6f2bb615fc769ab0bf3aa46dc4c23231994aa SHA512 027ad5ea08488beb5ce65ec97a8aaf04197317d7d3194de771a4170dea9f8b90fc4309fd917b4176cd930dd0835c84448771b84fa92a735cfc60668ef0a6a413
 DIST ocaml-4.05-refman-html.tar.gz 882419 BLAKE2B 01ecd83c4d517a98c11564303bd31806fdd75c71f4492e25a71568941b3fb0b527944399fdd375a690557cf718c98f522577de37a946a5dfebf363d88962c944 SHA512 84688b06e61904345bc961d7244a74427025879c8e7365073887d76a560e5a373227d75c9f645f7bc16adbd05ea6a58918738beb13b5001cedc6b8289ed70bde
 EBUILD ocaml-doc-4.04.ebuild 528 BLAKE2B 6177d8904e9436651b5b480051ba4c2c223e74206a5707a8febde4543c42091ac18e2dcea6da32187d24b2367c2c7b8a63d0ebb2399c5c9041e25aa65c152177 SHA512 d015934039ba53691ef4885c6249029f06f81bfb2d84bcbb98da245bf3ac37840936133cedb95567feda9d256093ee07bd1571a6eb4585887d39dff03f72e636
-EBUILD ocaml-doc-4.05.ebuild 530 BLAKE2B d5493b004fa05145d9828968e98694b74c574cd03838af0dc6155da4a0ba2391826382961261f109a78778e1050d1630bfda3eecb9f3396cf77d3c1b12e078b3 SHA512 18896d50b15530ce1d0f5a2467ade2b080c53ad08d9e2e08ee99ea35ea808dbd936bc9d663862a9580a1259c8365e30385893787b19e559d9315d8ad58ad030f
+EBUILD ocaml-doc-4.05.ebuild 528 BLAKE2B 6177d8904e9436651b5b480051ba4c2c223e74206a5707a8febde4543c42091ac18e2dcea6da32187d24b2367c2c7b8a63d0ebb2399c5c9041e25aa65c152177 SHA512 d015934039ba53691ef4885c6249029f06f81bfb2d84bcbb98da245bf3ac37840936133cedb95567feda9d256093ee07bd1571a6eb4585887d39dff03f72e636
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/dev-ml/ocaml-doc/ocaml-doc-4.05.ebuild b/dev-ml/ocaml-doc/ocaml-doc-4.05.ebuild
index 0cd8b61b87c8..b15602118ee4 100644
--- a/dev-ml/ocaml-doc/ocaml-doc-4.05.ebuild
+++ b/dev-ml/ocaml-doc/ocaml-doc-4.05.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}"/htmlman
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 
 src_install() {
 	docinto html
diff --git a/dev-ml/ocaml-inifiles/Manifest b/dev-ml/ocaml-inifiles/Manifest
new file mode 100644
index 000000000000..110af9989ae1
--- /dev/null
+++ b/dev-ml/ocaml-inifiles/Manifest
@@ -0,0 +1,4 @@
+AUX ocaml-inifiles-1.2-inifiles.ml.patch 210 BLAKE2B add08bffd9afb4a4d6046b24ca18115c4ed295069088018cb77aebb20597973852459697def9d7e8261933471486fc2c89f26ea39f9e6d47083ed5dd12b25556 SHA512 c9e5b2226ee497fe2e9633532f9d7df05da52c73bddf3351913f0f037422170068296e5a6b6e40fced3c03eef3702affe9386d928c955ed268c570d16610a91c
+DIST ocaml-inifiles_1.2.orig.tar.gz 11642 BLAKE2B 9970a5df9290c0532ad54eb8df6737f2e22385d5de6defd9681f115e2c0c62217e56dbf3bde91424e3a75f56d6e00daa698e2029ae457cb55a3495a8b2144490 SHA512 d57016e338caade7ceff416b698ad320da7e5ef376430d5bca9115ca0abc219a8072c9fddc8c8388c0b7ed404801e5158827d86577be49658611bd830e8814ef
+EBUILD ocaml-inifiles-1.2.ebuild 644 BLAKE2B d5c0f87c3951b3781d5a465f69d906fcb92f28b76740f90de94722442959544eb1ce01ce10e78abd7d409581a5f7be0db605f3017dcfe7e8d526d384c315f965 SHA512 847bfa37c55a11cc3367c761ffc592b4b67df07c24ba6f02e1580c38b113e2016c52705cc4cdb25d6a9e0f9c754db16ffc48e8d943e9a471ac8635f04c93f575
+MISC metadata.xml 239 BLAKE2B 0d4d408425414c16590fb3398ae893ab574451eb5831872be0fcc33f2de6ea7c839eb1857a3fa05062eaf7e7384ee7527f035cfeaacbfc896f1d7319663708e6 SHA512 d74bde3f33ed3b510b6507a43e64cd9f1d682a4e3849e9d8e1bf0a0eccfe47e1257f28260e2456ae64e9050ac44eb2f846bcbe6b83f927f1a71f8c054c0a937f
diff --git a/dev-ml/ocaml-inifiles/files/ocaml-inifiles-1.2-inifiles.ml.patch b/dev-ml/ocaml-inifiles/files/ocaml-inifiles-1.2-inifiles.ml.patch
new file mode 100644
index 000000000000..17c060c8a208
--- /dev/null
+++ b/dev-ml/ocaml-inifiles/files/ocaml-inifiles-1.2-inifiles.ml.patch
@@ -0,0 +1,11 @@
+--- a/inifiles.ml
++++ b/inifiles.ml
+@@ -257,7 +257,7 @@
+        func
+        initial
+        (List.rev_map
+-	  (new inifile)
++	  (fun x -> new inifile x)
+ 	  (List.filter
+ 	     check_file
+ 	     (List.rev_map
diff --git a/dev-ml/ocaml-inifiles/metadata.xml b/dev-ml/ocaml-inifiles/metadata.xml
new file mode 100644
index 000000000000..39ab33fa4ce0
--- /dev/null
+++ b/dev-ml/ocaml-inifiles/metadata.xml
@@ -0,0 +1,9 @@
+<?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>
+</pkgmetadata>
diff --git a/dev-ml/ocaml-inifiles/ocaml-inifiles-1.2.ebuild b/dev-ml/ocaml-inifiles/ocaml-inifiles-1.2.ebuild
new file mode 100644
index 000000000000..bf249ff1364b
--- /dev/null
+++ b/dev-ml/ocaml-inifiles/ocaml-inifiles-1.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit findlib
+
+DESCRIPTION="A small OCaml library to read and write .ini files"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="http://archive.ubuntu.com/ubuntu/pool/universe/o/${PN}/${PN}_${PV}.orig.tar.gz"
+S="${WORKDIR}/inifiles-${PV}"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+ocamlopt"
+
+RDEPEND="dev-ml/pcre-ocaml:="
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-inifiles.ml.patch )
+
+src_compile() {
+	emake -j1
+	use ocamlopt && emake -j1 opt
+}
+
+src_install() {
+	findlib_src_install
+}
diff --git a/dev-ml/ocaml-process/Manifest b/dev-ml/ocaml-process/Manifest
new file mode 100644
index 000000000000..dbd83c7f3a3f
--- /dev/null
+++ b/dev-ml/ocaml-process/Manifest
@@ -0,0 +1,3 @@
+DIST ocaml-process-0.2.1.tar.gz 5904 BLAKE2B 90a03e53e79adae559bbdcf4717db53d5e79cf22a22e7d6daad4c123a8b275f7b984ed40b7132653c31bb9b1d7c39c1918e0455597f70103ddb18b89ecf00d9a SHA512 0ca352a273797218e1785e1f6ed024448461cefeb54f143574230c844747a81355b97dd19fe9ddfe31d1a69c03dccf895fadc086f61a3d7a9f5397538432db92
+EBUILD ocaml-process-0.2.1.ebuild 539 BLAKE2B 65f551d933a76c321388ce6cf24892108ae03b5eaa6a8bae899611e46156008edb2bc898b592c5afa9c65b93c0339d77c5cbd81c2366e28c2f82e777cba7544a SHA512 e65ee6fe3bdf701b2267ab3ec61dfb8784ff31af599fdbe73f4096b6431cf9927fd66cdd9ee85e7f8906c2e7878296432f2e16343ae2ad589bcdc5eef09b6f72
+MISC metadata.xml 401 BLAKE2B 70dda25c5e65d40a76bfa0cadf35bc380852a23091a2e91b8f503cb88b4990442eea710063a10baff999088b9aaf74e84afec8835a1dc734fced5169a5fd1013 SHA512 7feae0e5d4fec207c7439ec70ba44d0990af4de07b231f868a51c0c0cb879fdeaf8ac60a7c8a672653e26e747c021ffafb733afead06ecb04960d6e7b028898b
diff --git a/dev-ml/ocaml-process/metadata.xml b/dev-ml/ocaml-process/metadata.xml
new file mode 100644
index 000000000000..0f616a0514e6
--- /dev/null
+++ b/dev-ml/ocaml-process/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ml@gentoo.org</email>
+    <name>ML</name>
+  </maintainer>
+  <upstream>
+    <bugs-to>https://github.com/dsheets/ocaml-process/issues/</bugs-to>
+    <remote-id type="github">dsheets/ocaml-process</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ml/ocaml-process/ocaml-process-0.2.1.ebuild b/dev-ml/ocaml-process/ocaml-process-0.2.1.ebuild
new file mode 100644
index 000000000000..66969b86741b
--- /dev/null
+++ b/dev-ml/ocaml-process/ocaml-process-0.2.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit findlib
+
+DESCRIPTION="Easy process control for OCaml"
+HOMEPAGE="https://github.com/dsheets/ocaml-process"
+SRC_URI="https://github.com/dsheets/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	dev-ml/ocamlbuild
+	test? ( dev-ml/alcotest )
+"
+
+src_install() {
+	findlib_src_install
+}
+
+src_test() {
+	emake -j1 test
+}
diff --git a/dev-ml/ocaml-sha/Manifest b/dev-ml/ocaml-sha/Manifest
new file mode 100644
index 000000000000..ba81ae9c79b6
--- /dev/null
+++ b/dev-ml/ocaml-sha/Manifest
@@ -0,0 +1,3 @@
+DIST ocaml-sha-1.15.1.tar.gz 15972 BLAKE2B c80fe4ba9a216fb88b0ca4cdf4f467450ad7225c9aa8fbb7389c85b8372de0a965683dc4a674c82ae4c2801b9f6a83777fbd3bfe5deb68af3d5e9193c058c9d9 SHA512 25af4f3fff6d5126e5e3b5f4dff4d6cc48396ffea48da186450236825bbb79110c7918a2bfa1c77dfaee9570965f9052d87c513d9f9da01208d95962b12cfd1c
+EBUILD ocaml-sha-1.15.1.ebuild 518 BLAKE2B ae29ba7ce2e8e29bfdc689eb099f2db08c5b52044a319813df1bba676b12fee193b422669eb554c9d5d4a499c6d75fa1934dd0fa63b4568fa22d42a5fecd5fbc SHA512 ec054f2cfa156b9b910bb45eb11d7db42a82ec01d9196c9eb35a39bab495b74cf926f1b184b6d440dcdfa89a4d26ec1a62abcaf27c4d13d889a023aba38ab325
+MISC metadata.xml 648 BLAKE2B 4f14d64187eeb7bff8fd8c67242b0f6b5ee0779312522e3c7f5041d629861015923fe15b49fd1f4474f6a38558c176aa9fafb2bbbfc93c82f515705670660fd0 SHA512 c56c4732c21229b543af6313a2150fb5351ada4d85a8ff2071952e734338d59ed4432813f841e49982f8cbbf84d3ba69c7886109dd13051b5c5a5f9f1f22c3ba
diff --git a/dev-ml/ocaml-sha/metadata.xml b/dev-ml/ocaml-sha/metadata.xml
new file mode 100644
index 000000000000..34e9bead1fc0
--- /dev/null
+++ b/dev-ml/ocaml-sha/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ml@gentoo.org</email>
+    <name>ML</name>
+  </maintainer>
+  <longdescription>
+    This is the binding for SHA interface code in OCaml. Offering the same
+    interface than the MD5 digest included in the OCaml standard library.
+    It's currently providing SHA1, SHA256 and SHA512 hash functions.
+  </longdescription>
+  <upstream>
+    <bugs-to>https://github.com/djs55/ocaml-sha/issues/</bugs-to>
+    <remote-id type="github">djs55/ocaml-sha</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ml/ocaml-sha/ocaml-sha-1.15.1.ebuild b/dev-ml/ocaml-sha/ocaml-sha-1.15.1.ebuild
new file mode 100644
index 000000000000..d6ab5623b0f4
--- /dev/null
+++ b/dev-ml/ocaml-sha/ocaml-sha-1.15.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DUNE_PKG_NAME="sha"
+
+inherit dune
+
+DESCRIPTION="Binding to the SHA cryptographic functions"
+HOMEPAGE="https://github.com/djs55/ocaml-sha"
+SRC_URI="https://github.com/djs55/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-ml/stdlib-shims:="
+DEPEND="${RDEPEND}"
+BDEPEND="test? ( dev-ml/ounit2 )"
diff --git a/dev-ml/ocaml-stdint/Manifest b/dev-ml/ocaml-stdint/Manifest
new file mode 100644
index 000000000000..8b64f6d4d776
--- /dev/null
+++ b/dev-ml/ocaml-stdint/Manifest
@@ -0,0 +1,3 @@
+DIST ocaml-stdint-0.7.0.tar.gz 34507 BLAKE2B d06768911798a6a3736b68395fc5ca2d53288fe0056953ed189938b10aeeb9469511fc1ece39e49c403954f4bd88034d63ec53d7e8b63d8e8c41ff0761ccb2e6 SHA512 5e0c4164cb1f55a63f0928f5c1868cc2bba61d356b63cc20cb6b066fd09824eb99d6d1fd577f52678155d6744a591fdd8377b4c44bbe015918462f4576b43529
+EBUILD ocaml-stdint-0.7.0.ebuild 461 BLAKE2B 8d20e15537afdc453dbbeedc8084a2fec5cd1392f24afa1bee35c8fbe83f73f1abfb428b6d89be667232e4a24227bca959c9e3916c37c3a4896f4ef7fb740ef8 SHA512 eefd3a5e34b11c552042fe0f3e725fcfabc9c2b61661b5ee50792edccc61b72ad075550b1d2ecf2c9ceb8b5bfba425177d91bc1e61da2b745ee411d83a411163
+MISC metadata.xml 1070 BLAKE2B ac1387773e133410d8a579534ea42dbad6d9b349d31f9108c11d0969bce0c31a5bdc6fa7aca0323203106ca96ccfe8e118fd83385e335bb758b0aef8f34b769b SHA512 56e8bec1232bd152b041dfaee90c70424c5c9aacfdca4ec7cfa0d54527dbf620f2d5b525cbf64c5f8c7cc89fdf91e03044217ffdb003da484e983e70bb0b9cfe
diff --git a/dev-ml/ocaml-stdint/metadata.xml b/dev-ml/ocaml-stdint/metadata.xml
new file mode 100644
index 000000000000..a4c37e9a3e5a
--- /dev/null
+++ b/dev-ml/ocaml-stdint/metadata.xml
@@ -0,0 +1,24 @@
+<?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>
+  <longdescription>
+    The stdint library provides signed and unsigned integer types of various
+    fixed widths: 8, 16, 24, 32, 40, 48, 56, 64 and 128 bit.
+    This interface is similar to Int32 and Int64 from the base library but
+    provides more functions and constants like arithmetic and bit-wise
+    operations, constants like maximum and minimum values, infix operators
+    conversion to and from every other integer type (including int, float and
+    nativeint), parsing from and conversion to readable strings (binary, octal,
+    decimal, hexademical), conversion to and from buffers in both big endian
+    and little endian byte order.
+  </longdescription>
+  <upstream>
+    <bugs-to>https://github.com/andrenth/ocaml-stdint/issues/</bugs-to>
+    <remote-id type="github">andrenth/ocaml-stdint</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ml/ocaml-stdint/ocaml-stdint-0.7.0.ebuild b/dev-ml/ocaml-stdint/ocaml-stdint-0.7.0.ebuild
new file mode 100644
index 000000000000..1dcb81d9a5d7
--- /dev/null
+++ b/dev-ml/ocaml-stdint/ocaml-stdint-0.7.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DUNE_PKG_NAME="stdint"
+
+inherit dune
+
+DESCRIPTION="Signed and unsigned integer types having specified widths"
+HOMEPAGE="https://github.com/andrenth/ocaml-stdint"
+SRC_URI="https://github.com/andrenth/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+ocamlopt"
+RESTRICT="test"  # some tests fails
diff --git a/dev-ml/opam-client/Manifest b/dev-ml/opam-client/Manifest
index abeb995a15ae..bae3d66fffa8 100644
--- a/dev-ml/opam-client/Manifest
+++ b/dev-ml/opam-client/Manifest
@@ -6,7 +6,7 @@ DIST opam-2.1.0-dose3-6.patch.xz 5896 BLAKE2B f605064ebae7d327895729962a345a3c67
 DIST opam-2.1.0.tar.gz 825966 BLAKE2B 42ab8ad2825e4e167618ece7bd2ce77ff055d584039fe2f644fa1c3e99d175cc7047f32bda53599af4fb177d844970883125cebca823024d1bc43a34857f20c5 SHA512 c0060e609c49a12dc8f64accef990aa593db818b72df3984fb9b4b22d8678b46c515916c84134a62dab614c716b61788eadc954d295f32c1f27d38aec22b3edf
 DIST opam-2.1.1.tar.gz 818555 BLAKE2B 0f3e94c723774c38a5ad553f58fa796836eb8ef80add977a0e677df026225b5cd737409717026cfbc95388094a0434eb9ff865043c1781eba228f1499c9ab996 SHA512 fb46bc8f12e49c2da95c5f8669f55fb93710ee826827538852c3091ec2c714c082137373fa9e1ad3f53f107b1fae6c2abd0b6e5f84f7756bd3b38e57978f080e
 EBUILD opam-client-2.0.10.ebuild 959 BLAKE2B 0c49373bc78678c7fc11fc5cb9d33a5495d83dc5d5de67e7219f1dba81fc448b9038a41ed01bfd05f33a48a0d70f9edf1f10bc87e5c2958863f7b4c90dc47a6d SHA512 5cc5ceeaa8b0c3c3a1ae5897a49b7d1643652010c2aa610a6a0cf4c4c18101e26c2c4bc65e0de858ba5e472ba411d76261af8f3dac506a30d205480a115ba491
-EBUILD opam-client-2.0.8-r1.ebuild 954 BLAKE2B 4d721cbecd897c0c8f6cea1868c783b543184f2e5f339e6900f9d4a99fe87e1bab120ecf40d4f3656d29dd8412cc15e95f472f478f962efaed77d72e03860ded SHA512 f5311b956917468aba3dbb84b7ce736c6f2a6fc84da1d6f31da99a481c41456e143cbe6bbe7ab7727ab01a4bdd60344efe51aaa37f613943ed3006b225f4061f
+EBUILD opam-client-2.0.8-r1.ebuild 953 BLAKE2B 624189392e8593d9d03020c3c7e92cce3b5ecf774f30a8b14130f37f43d56222588edaf33df1f20bb51541f748d13a8aac0065bca1b3c3bbe0268ae746a41339 SHA512 a21de850b2e3c33366017b871474909584e52ded599322fd1290dd7d3b221d53a66bbbdb01a80e2937be98b1bd6229b2edc4132c0cb7c1b353977a009f37414b
 EBUILD opam-client-2.0.8.ebuild 820 BLAKE2B 7c899f93e3c1f5f52ea56506976ae5deeed672887983777c67624e5caf535aff241bb1e1615e4545cd5e2c194a92b7dc8348d4530ec2a0233836f3a4cb4913b3 SHA512 e7d1d9b430710f102c8b7df90befc6cbc915e8b92b8702f03d2903a6944e3c6eeb85288169add272bca90df197ecac0a856080fd1323e644d135e45a824ce370
 EBUILD opam-client-2.0.9.ebuild 959 BLAKE2B 0c49373bc78678c7fc11fc5cb9d33a5495d83dc5d5de67e7219f1dba81fc448b9038a41ed01bfd05f33a48a0d70f9edf1f10bc87e5c2958863f7b4c90dc47a6d SHA512 5cc5ceeaa8b0c3c3a1ae5897a49b7d1643652010c2aa610a6a0cf4c4c18101e26c2c4bc65e0de858ba5e472ba411d76261af8f3dac506a30d205480a115ba491
 EBUILD opam-client-2.1.0.ebuild 945 BLAKE2B e8932dd197dfd2ef3122a879898610f38c39417ed60bc23d54a65fdc013229056da482bdca95f11cbb7d3366e45b654edc5c91f203e10a72602e75b3a1341ea2 SHA512 8ef8778daaccdc3311caaca0602318292d6e02acb587b8d538f0b8c1349addb5c1a1ab6088a9442f6700102c284c998965503ce60219f07d7261aa7fec6b7b38
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 03972111ac0f..4598fcdb54ca 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-format/Manifest b/dev-ml/opam-format/Manifest
index 7fd6d399cdec..452d3ab05f6e 100644
--- a/dev-ml/opam-format/Manifest
+++ b/dev-ml/opam-format/Manifest
@@ -7,7 +7,7 @@ DIST opam-2.1.0.tar.gz 825966 BLAKE2B 42ab8ad2825e4e167618ece7bd2ce77ff055d58403
 DIST opam-2.1.1.tar.gz 818555 BLAKE2B 0f3e94c723774c38a5ad553f58fa796836eb8ef80add977a0e677df026225b5cd737409717026cfbc95388094a0434eb9ff865043c1781eba228f1499c9ab996 SHA512 fb46bc8f12e49c2da95c5f8669f55fb93710ee826827538852c3091ec2c714c082137373fa9e1ad3f53f107b1fae6c2abd0b6e5f84f7756bd3b38e57978f080e
 EBUILD opam-format-2.0.10.ebuild 984 BLAKE2B 2d0ac08a3955b84ada2dfdcbca6c6fa86e23ef3f5a6c268d8fd775a48d50b6fdf4c6e29d24468ab28ff0c64eb07da59b9dae1ea0673482401230b4171662fabd SHA512 3c0a3534f139b29de193c253c58d8e2693945121af29dfb92a3c69f2e81685187efc5cb610c3208b88ee4b5333681dc70dfaf081e4fb304f9b290c0d52d50e29
 EBUILD opam-format-2.0.8-r2.ebuild 839 BLAKE2B 9bd5bc8b71da0ecb840f1f5cb14f78052d4d0f1ce8a2beeafa8f7afac25dc1840f48dfb84087fc964d0e72ea8748c48a3df250eb3d29e7197ef949c532faadf2 SHA512 8f78d05582ada892d34954cca1265737a83932bda148890c2ce954a8909cac035f9c5c6c73ec693e7edc193750ee28e5664c26b4d4097fee194a54b7c351cf96
-EBUILD opam-format-2.0.8-r3.ebuild 979 BLAKE2B 15c0e4f3273766012695f6efdbf0281398b24da93059f532add6d5d3207a043ed9a1b7ef2d789683290a9f94da6b880797414adc87aa9547dec7a9712e1b7839 SHA512 6f71d129bdc4eb31ff84afe02901ec0cc7991e31c93275fe72b8205763546c7e4cc084d17399259f1bfef5770661c391c8214012163a5023c335555babfa2d90
+EBUILD opam-format-2.0.8-r3.ebuild 978 BLAKE2B 0479608ccf96e920397e6796cf472dfe4203f21385ff2ab6d17ad26ec20b136a2e6cdd1bb9b9384a13137427d65721305145d0bc3703d5226b2bd415dc3f4f5e SHA512 81d9f62c38fbd96d2bd80d3863a2ffffca64f303e1d73b0521078c0ff3848424581801e263a95eadc6366ef7d00639b7b28698605c4dd5f230aac3d6ac2d48db
 EBUILD opam-format-2.0.9.ebuild 984 BLAKE2B 2d0ac08a3955b84ada2dfdcbca6c6fa86e23ef3f5a6c268d8fd775a48d50b6fdf4c6e29d24468ab28ff0c64eb07da59b9dae1ea0673482401230b4171662fabd SHA512 3c0a3534f139b29de193c253c58d8e2693945121af29dfb92a3c69f2e81685187efc5cb610c3208b88ee4b5333681dc70dfaf081e4fb304f9b290c0d52d50e29
 EBUILD opam-format-2.1.0.ebuild 970 BLAKE2B 7463ddab831f848e84822238445c88bbfedfc2264f837f585416285ce3fb92945963a4c881329948bf416820779f5d18c51526833a086588ab35c45e4f7b90ae SHA512 2f02b5fec36acb49976bc479c6489335a02266cca8552e8e32bb1105ed50d5b0de6031f6db58fc29768a876f79d2caff63098445b427e1e2b6b972bfe0478f64
 EBUILD opam-format-2.1.1.ebuild 970 BLAKE2B 7463ddab831f848e84822238445c88bbfedfc2264f837f585416285ce3fb92945963a4c881329948bf416820779f5d18c51526833a086588ab35c45e4f7b90ae SHA512 2f02b5fec36acb49976bc479c6489335a02266cca8552e8e32bb1105ed50d5b0de6031f6db58fc29768a876f79d2caff63098445b427e1e2b6b972bfe0478f64
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 a58e8467aae8..32abb96a8b97 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-repository/Manifest b/dev-ml/opam-repository/Manifest
index e5b565c4a2f2..eb78f66fbcd5 100644
--- a/dev-ml/opam-repository/Manifest
+++ b/dev-ml/opam-repository/Manifest
@@ -6,7 +6,7 @@ DIST opam-2.1.0-dose3-6.patch.xz 5896 BLAKE2B f605064ebae7d327895729962a345a3c67
 DIST opam-2.1.0.tar.gz 825966 BLAKE2B 42ab8ad2825e4e167618ece7bd2ce77ff055d584039fe2f644fa1c3e99d175cc7047f32bda53599af4fb177d844970883125cebca823024d1bc43a34857f20c5 SHA512 c0060e609c49a12dc8f64accef990aa593db818b72df3984fb9b4b22d8678b46c515916c84134a62dab614c716b61788eadc954d295f32c1f27d38aec22b3edf
 DIST opam-2.1.1.tar.gz 818555 BLAKE2B 0f3e94c723774c38a5ad553f58fa796836eb8ef80add977a0e677df026225b5cd737409717026cfbc95388094a0434eb9ff865043c1781eba228f1499c9ab996 SHA512 fb46bc8f12e49c2da95c5f8669f55fb93710ee826827538852c3091ec2c714c082137373fa9e1ad3f53f107b1fae6c2abd0b6e5f84f7756bd3b38e57978f080e
 EBUILD opam-repository-2.0.10.ebuild 921 BLAKE2B 1e39fbd674834241eb5eb27768cbe829951cfd15d17811b92134d4f3b97ec2fcdc8a2bf86e5eaee696e175ca1ca23d5f73f2752e53754b73ba8147cb7d044d9f SHA512 071d1c33e57180cbb182eb05e7b044862bc5af3736a904a15e029488cb017cb85249b936d4e2c4f739818d996c02791dc50eeddfac2f43aaac4e3c1e8883a4ac
-EBUILD opam-repository-2.0.8-r1.ebuild 916 BLAKE2B 8eb5b7673361f0e555bf1d4852d8c2d580fd015a7306f2d32628d92cd947087bb91757c7448fcd5e0f4717ad90a93b65925cbb906de2923018e64ccec89530df SHA512 433c65791a8e225a9a3491968b833acb7348361991c4a08acb8da9a229301b7f98cc1e383e8dfb7fcca75469a36dae0d86e413c6dfae173f90256d761f986859
+EBUILD opam-repository-2.0.8-r1.ebuild 915 BLAKE2B d4be9123a2e53a35e33d698fc8ba3b15b609609065515607170aa8f4a2c245cf6d83006e533b914165c65991618fddeb37c822b49516cdef9261dbcf6a692d09 SHA512 f861fa6d9bf66a8d393ecb9cd39fd81b65b3b0ba051c26e4863e1fea4563a403a605f171eb14d6b1bc1b4c83c6bf5726f05b189f5bf83391b3da26fcf4b513e7
 EBUILD opam-repository-2.0.8.ebuild 776 BLAKE2B 4d63d9ee36f06e82b59510c92c3d5923a17ecb9626427681358d340780e98e1490b1e87366120f9c5429f75a1943aa47aeffbed9a50abed72cd3e76fe12c816a SHA512 1bbfe111bc3e9682205f549dcb7b298ccebd92e268ebb585aa68f98255b87b01ac2aa25535e04d0220b16fd6955dfdfa1d4fc0f17d9a60ab361348e92942a7b6
 EBUILD opam-repository-2.0.9.ebuild 921 BLAKE2B 1e39fbd674834241eb5eb27768cbe829951cfd15d17811b92134d4f3b97ec2fcdc8a2bf86e5eaee696e175ca1ca23d5f73f2752e53754b73ba8147cb7d044d9f SHA512 071d1c33e57180cbb182eb05e7b044862bc5af3736a904a15e029488cb017cb85249b936d4e2c4f739818d996c02791dc50eeddfac2f43aaac4e3c1e8883a4ac
 EBUILD opam-repository-2.1.0.ebuild 907 BLAKE2B a5ea29777911bbdd1f19661edc4bad8e104ab69f937aa0bed110fcf25383d2c204aa72531f4e2e6e0737d0f93d0acaaef4598f073e3bc682b2ca9d49e5d5c536 SHA512 07b96a5df895d6420e37af1ca2d73dc020feeb034e361e048dc0f607ac95ddb53d3b57833621295c4f527794e101c9431398af6934e7bfe2660cbe5b08ebcd8d
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 aab9a3c1727e..add7710aa55a 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-solver/Manifest b/dev-ml/opam-solver/Manifest
index ff8392066c92..fc5db4ee80c1 100644
--- a/dev-ml/opam-solver/Manifest
+++ b/dev-ml/opam-solver/Manifest
@@ -6,7 +6,7 @@ DIST opam-2.1.0-dose3-6.patch.xz 5896 BLAKE2B f605064ebae7d327895729962a345a3c67
 DIST opam-2.1.0.tar.gz 825966 BLAKE2B 42ab8ad2825e4e167618ece7bd2ce77ff055d584039fe2f644fa1c3e99d175cc7047f32bda53599af4fb177d844970883125cebca823024d1bc43a34857f20c5 SHA512 c0060e609c49a12dc8f64accef990aa593db818b72df3984fb9b4b22d8678b46c515916c84134a62dab614c716b61788eadc954d295f32c1f27d38aec22b3edf
 DIST opam-2.1.1.tar.gz 818555 BLAKE2B 0f3e94c723774c38a5ad553f58fa796836eb8ef80add977a0e677df026225b5cd737409717026cfbc95388094a0434eb9ff865043c1781eba228f1499c9ab996 SHA512 fb46bc8f12e49c2da95c5f8669f55fb93710ee826827538852c3091ec2c714c082137373fa9e1ad3f53f107b1fae6c2abd0b6e5f84f7756bd3b38e57978f080e
 EBUILD opam-solver-2.0.10.ebuild 991 BLAKE2B b3b86e67c53021a8da65d5ab28a3f4d7129c288755e59a3f127c3c6c20cd6c2eeb96bef19c6a700fc43616c58e357e276558020545954eedbaa80c9f4670cc25 SHA512 34917ade63f11472c468b91e290f2a929df49b56d0096e827076f7c05df8867644df6fcdcdc4884e7493eb5c636103e3a282a46501cba2b0cca6b62460bd452f
-EBUILD opam-solver-2.0.8-r1.ebuild 986 BLAKE2B cc4c6852582d9a59a1fdca64cf2e7242bce41ea10813a2ab8c1a2a52569fbd6e574b693f60cbc1545e129a5fb648c616639b069d422b4d3de62bc5ad2a79af69 SHA512 1ab657ca63f6cb00c88e47934525c201af6520586f453033201340697374bf4c85a885882a279c20fb35581478cf2144c3204d3e9752b0ef30ed2620eba49998
+EBUILD opam-solver-2.0.8-r1.ebuild 985 BLAKE2B b215b32656aa0f54599cbdfde1f462ee3ae3eedf66fba8e8f34703a03775f9c1337169a6b4d4444f1a64e254a5cdbb4377baeabbd484793c40a6a79950090221 SHA512 43c266184cece4831e1c0cf3378b3e47c02d1aab9e8421630f5f1fa8fb5d3d2671d0979d3c9c5dc9cca22217616c7cd635a88a8d470325b2b933a7cd83e288a5
 EBUILD opam-solver-2.0.8.ebuild 824 BLAKE2B 9a7a5ebb741dec25ff0a3d3c6e0e1c74f7574b70ff352b7c4e602e085a5a1f3f1ca03d1e9c7f062722529b9b49e1fad83960b8d33223354430ea4d072c4fc19d SHA512 6fb412d1581e2f1ad34d988e4bb6e3e427cc8963924a0ac6b1a235287b4c3e2fa3d4a55e99f7bb7c6bde7a130b919b5cf1191c61e576a5d79e70d3813276f732
 EBUILD opam-solver-2.0.9.ebuild 991 BLAKE2B b3b86e67c53021a8da65d5ab28a3f4d7129c288755e59a3f127c3c6c20cd6c2eeb96bef19c6a700fc43616c58e357e276558020545954eedbaa80c9f4670cc25 SHA512 34917ade63f11472c468b91e290f2a929df49b56d0096e827076f7c05df8867644df6fcdcdc4884e7493eb5c636103e3a282a46501cba2b0cca6b62460bd452f
 EBUILD opam-solver-2.1.0.ebuild 977 BLAKE2B 9b13e4b2e12320e53e0d4e2ea0df78e0dc83b1b02b97c97ef0eafa9b66bf0bd00c1dc125f5380b2e2f5e0053fd20f49ac0c74248b67abc5650a608d6d59189c0 SHA512 3c5e0ac05b7fdc3f63df240814a562d9a0b83a398442ad965cf5058124d1a5eef58ba39952e55b028acb9094f9bec00040519af430c14dfa68c0e8961ea3ab49
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 5a8e924ec8fa..3d5ec893df9e 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-state/Manifest b/dev-ml/opam-state/Manifest
index f14a32c1e01a..f09dc8b1cdb4 100644
--- a/dev-ml/opam-state/Manifest
+++ b/dev-ml/opam-state/Manifest
@@ -6,7 +6,7 @@ DIST opam-2.1.0-dose3-6.patch.xz 5896 BLAKE2B f605064ebae7d327895729962a345a3c67
 DIST opam-2.1.0.tar.gz 825966 BLAKE2B 42ab8ad2825e4e167618ece7bd2ce77ff055d584039fe2f644fa1c3e99d175cc7047f32bda53599af4fb177d844970883125cebca823024d1bc43a34857f20c5 SHA512 c0060e609c49a12dc8f64accef990aa593db818b72df3984fb9b4b22d8678b46c515916c84134a62dab614c716b61788eadc954d295f32c1f27d38aec22b3edf
 DIST opam-2.1.1.tar.gz 818555 BLAKE2B 0f3e94c723774c38a5ad553f58fa796836eb8ef80add977a0e677df026225b5cd737409717026cfbc95388094a0434eb9ff865043c1781eba228f1499c9ab996 SHA512 fb46bc8f12e49c2da95c5f8669f55fb93710ee826827538852c3091ec2c714c082137373fa9e1ad3f53f107b1fae6c2abd0b6e5f84f7756bd3b38e57978f080e
 EBUILD opam-state-2.0.10.ebuild 898 BLAKE2B 19479c7ced8afbbf74644e642a026385a4104bc22e6c231a63fc14292a486d66442de41adb764f718d213a6dfede2d0c7f286f428b35b90335869ee743b66e8e SHA512 cbe5c717e72d38a6c482abb47a0ab25f9f77801266312c7e971165a17c8203e1630a9548010106e52bd3cc2275f7e29b6bf11eb2c1a0f121684fa0c0f636c4ba
-EBUILD opam-state-2.0.8-r1.ebuild 893 BLAKE2B e0571da86d9165e7fa673e253b8f6215ff495e1bcabba5d230f1a7e3dfe84a44d6c4c1d32ee9d7c0c06ce14aa32aceef893416e5d83aa015adb6c1e80c1efefc SHA512 768db1a52197a7f437e848c06ad1ff019973c1df5d3671bb11cf0aea5d8895648ea820ee51ac4d81c24e2cf9167aafa92b4d3352cb6be66a947a93259622511e
+EBUILD opam-state-2.0.8-r1.ebuild 892 BLAKE2B aeafe2814aae5386ffcfece6c5a8ee56ee17fa61962135aa164e5253185b84e0c2f4a4e271e6fe6920f3ae3205c849c83b48834a6e6a60c364ea9eb0cf4f7629 SHA512 4c52036d0b0bec5b508f92a7e3d2772ae4d975d69d1acfbe2b850535d7d27d7f2404241fe655d03d641eab838f079bd42137a02426baa4d6ca81f11e005196bb
 EBUILD opam-state-2.0.8.ebuild 759 BLAKE2B dfbb268b17a66de025f6bf66d76fa7da257cd88646aa6faebe2b35f882d2b5cea6a896f16f640db633d70d0f50054251e6e3e7be3a8c4e5fceae1595bbddaeca SHA512 dcffb7e14d61ab1c584bfe249b03c53d000ccbef2c9f9c60e879b9de94c803df425802675abd27c1e91590b7ea493623ae9c8a03753fe08798ca1483196eaa8c
 EBUILD opam-state-2.0.9.ebuild 898 BLAKE2B 19479c7ced8afbbf74644e642a026385a4104bc22e6c231a63fc14292a486d66442de41adb764f718d213a6dfede2d0c7f286f428b35b90335869ee743b66e8e SHA512 cbe5c717e72d38a6c482abb47a0ab25f9f77801266312c7e971165a17c8203e1630a9548010106e52bd3cc2275f7e29b6bf11eb2c1a0f121684fa0c0f636c4ba
 EBUILD opam-state-2.1.0.ebuild 884 BLAKE2B ba2f2c0c46f36a7da0d2717cc10e548994947482efd9e7de2a3758f956b074384be391db9b6f204c3217e3e0b66314df71edf07222c05e8d81f5d3d6bb3d1a49 SHA512 b550a358e9ac408057271648f7433c96d04d5b8a0d1854ba953b1c37202e97d2132847f4637b1990ef2f3c50afa3b9685a265d9ab8412c738a6ea5abbc2466e4
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 ce874e2ac46b..710da02ab418 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/Manifest b/dev-ml/opam/Manifest
index db9edf8fd23e..08030cabbf2d 100644
--- a/dev-ml/opam/Manifest
+++ b/dev-ml/opam/Manifest
@@ -7,7 +7,7 @@ DIST opam-2.1.0.tar.gz 825966 BLAKE2B 42ab8ad2825e4e167618ece7bd2ce77ff055d58403
 DIST opam-2.1.1.tar.gz 818555 BLAKE2B 0f3e94c723774c38a5ad553f58fa796836eb8ef80add977a0e677df026225b5cd737409717026cfbc95388094a0434eb9ff865043c1781eba228f1499c9ab996 SHA512 fb46bc8f12e49c2da95c5f8669f55fb93710ee826827538852c3091ec2c714c082137373fa9e1ad3f53f107b1fae6c2abd0b6e5f84f7756bd3b38e57978f080e
 EBUILD opam-2.0.10.ebuild 963 BLAKE2B 3ba5f51f310eaa23515c561525215b2e21ce836d77aae765829a30b79c440d4910870171176e5460a8c6075e1c0f9e3bf699d5f9eefb2a80757a13ad18b5f6c1 SHA512 3b3e82b207f16807d1e266b5e1284622c5a8c58aad21dcd56664f053a84c4cae3029286c8ddf5c0082be13b8ba6bb43d6f7775d475be9c01b0002ea566a43e95
 EBUILD opam-2.0.8-r1.ebuild 818 BLAKE2B 2cdef3169d4c660daa501a449c0f204ae3bd12e8bd1a66cb4bde94ea4e523457fe952a61330cecbd1a59d14754d0e167efe453589387f9fe666b7804caa370f4 SHA512 7ebd4e81e160649198b792911d5f16bd4a7c001b60b2b4db3b8509caeb0d537c4114618d25b1ffbbd66c96f32373a7824b6530587ad8f9f4d1249de9400cf7d2
-EBUILD opam-2.0.8-r2.ebuild 958 BLAKE2B a29b001a98117c644dce3c731db62520631662fa9dc5b73ca247e1234dc2c7d95c0b2535fc2d4c186fadb0461cce62423fd1d434843527cf0b6f7a4ce4f79a96 SHA512 c8b808a8bee1947f8aaff9cb7204013c8686302ffa43e6390ed8096b515019b869aa14d86591117dff7f09896229996c544ce5abb8bccc03580b3b54b104de3f
+EBUILD opam-2.0.8-r2.ebuild 957 BLAKE2B 70c77656cc85045f056848f07ab5d914b1564f1cc4505a8ffcc01b93262c52b56d0d3a1e87ca4a8be6f496a1b15bce17d795262aa4cc3985a318aea65ba1b7fd SHA512 f7745c7df1bb6c862bd54cc57376df0046279d3961e22cab77ee0b43239e15471d8c6b28dff44ced28c4c18b1eeac4a7aa656c6e1ee6a8d3869fc24e30a457fc
 EBUILD opam-2.0.9.ebuild 963 BLAKE2B 3ba5f51f310eaa23515c561525215b2e21ce836d77aae765829a30b79c440d4910870171176e5460a8c6075e1c0f9e3bf699d5f9eefb2a80757a13ad18b5f6c1 SHA512 3b3e82b207f16807d1e266b5e1284622c5a8c58aad21dcd56664f053a84c4cae3029286c8ddf5c0082be13b8ba6bb43d6f7775d475be9c01b0002ea566a43e95
 EBUILD opam-2.1.0.ebuild 949 BLAKE2B c3db9b32322ae6acb0dc76e22fd67eea01d2e03016b6bf8aa41223065dd18d5f00eeeb26b57f45d83f9836fe8da960db4177f244ea6b032b80f6353843125914 SHA512 0189369c5a3daf3f596cac822437c6edf71fa0c6a7257ef78f5ceb16a293902962d44cb51462550302b36aa64a94f2bf5a96905ef532296244f8c82931befe0e
 EBUILD opam-2.1.1.ebuild 949 BLAKE2B c3db9b32322ae6acb0dc76e22fd67eea01d2e03016b6bf8aa41223065dd18d5f00eeeb26b57f45d83f9836fe8da960db4177f244ea6b032b80f6353843125914 SHA512 0189369c5a3daf3f596cac822437c6edf71fa0c6a7257ef78f5ceb16a293902962d44cb51462550302b36aa64a94f2bf5a96905ef532296244f8c82931befe0e
diff --git a/dev-ml/opam/opam-2.0.8-r2.ebuild b/dev-ml/opam/opam-2.0.8-r2.ebuild
index 405deff7d89a..87dd46d6b4bb 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/ppxlib/Manifest b/dev-ml/ppxlib/Manifest
index 0c20f250f661..f293c8e692e0 100644
--- a/dev-ml/ppxlib/Manifest
+++ b/dev-ml/ppxlib/Manifest
@@ -5,10 +5,12 @@ DIST ppxlib-0.21.0.tar.gz 201905 BLAKE2B f7a7b69ab07b2a5dce542877989fb4ca820acdd
 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
+DIST ppxlib-0.24.0.tar.gz 390297 BLAKE2B 7d8972b766cc8104a4d43aebc79e927e51cba114ad678837bfa1b8f009e2437df948c6cd3461db58ef247145e629d3bb11dff58dc5feadefce8152c77b056dfa SHA512 2f6a94c90fd17cea00f3294fde5742637d4758b9f43a021d667f2b09be326954efe22bb188ccf6a7205338ffc75fe096cbe2a075b125e3ced9f829a06ad2f496
 EBUILD ppxlib-0.18.0.ebuild 926 BLAKE2B f8affb8c0961a039d9e560db8ef47c435c0aec44b2a2a349bc40404486245b8ee0b303946646f8116b49d0e568cb8e63a699dc5c4e8c110a87b12e7c781ce742 SHA512 8d901792835259e0a32a3972d7cb9aee21a733131eec117fe9522f56cb8d6fee9674f4f08a5cbd9e0114ea82d7165b81122337b3973aa1c2fc021dd76c5243ea
 EBUILD ppxlib-0.20.0-r1.ebuild 902 BLAKE2B 168d53ba94211b5436c5b880b58031e3f3efb50ba29f0772b1c3d6f340649b2a3e0d7551ed47340fe8a2232d0743f8b15b2fcb7b265bfa0223c8936d88f86c1b SHA512 1a8a91b842fbd7dfaed8962b7f052126a5fd8c56fa23347c6f6f6c30edc89345a88e9fe7828737c643f69bbafe89bc1bdf58574019651e355eeb33d4d15dcee7
 EBUILD ppxlib-0.21.0-r3.ebuild 1113 BLAKE2B 864aab6473c4a64d8728216359aaeef62a992bcb018554b67c0d4b3533d7944b25747b9c5b9fc0acaa01b94e9eda886fe086284026068f5762ba60b7afff8704 SHA512 af7c307191efe5f632439867159caabfa3639450cdb7e7861d1bead2d3c6d14278b28118e47e8332a4d56cb78a0839969aa8f68c05d976e1ac164797e29fa017
 EBUILD ppxlib-0.22.0-r3.ebuild 1144 BLAKE2B 8bb514b1d67bf4e2275c398829643eb39b7acfef826920250b0b315fe3b2faef582a8b200e97bffedd5250791d013db002b3400ee25a12f14308e271b1c8fa42 SHA512 ffba32287c1b504d3b556a4c88be356e3371f7bed11b2ba5eca7667f3d8cad22229e2226d791de0422db974411520f7e75cfc4682b831359b91b1b402e63026b
 EBUILD ppxlib-0.22.2-r2.ebuild 1138 BLAKE2B b399fa35a8087991fb73a518f7e5738e4f31bcc4c590e2ab6d8f41878ee643ef814b123814378f78d8bc4f40a2ec2ff1199d13292e4ecbb4e13953de97404dc3 SHA512 cda5f8ddb5e345e790fe04829e2fbd8026898a71ea3a4ba618a0bcbc4ee6558435970801278d9863975798234b8a094e59969c703573adaf9af5b318fe320d95
 EBUILD ppxlib-0.23.0-r1.ebuild 1011 BLAKE2B 3bfcb9e6ce7f21b2e6dc784dcbcfc297f372232c40c8513460d29306d6976243eebd797a710452ef6c33be71d707b23891126e4275430d26787a8f726a8b1884 SHA512 cc2e0ac82fd5c545f550c1b515ca4a040bf964637d98ee64fae22b405683080e60d9890f193ee8799fea0a9a5098c0ed0671aeb7a31df4c77b65abac84770dd2
+EBUILD ppxlib-0.24.0.ebuild 957 BLAKE2B 29b15d42fbe9243a668a74109e79a293e599a7ea9541f2b1d0a246f140aa00e962abaeac5ce2a3d9c9f072e5e40684c0064d33cf36a8e485e5019d30785bc5dd SHA512 85374f30f360bf7ec9006ac118f3704a56216520d7914836f3ad2de78f25098d2f1d517eb906be9de6418a2bc1d04b64c007d067a1e1c8c1ed1538f05dc402c7
 MISC metadata.xml 419 BLAKE2B 97371846a88fb0008519bfb72fff654aa18401b2066073c09099b1987efbb9ad49012c0ab7624218894130a2cda3d5fba6056522eacd30712d08b7784801d9cf SHA512 8dc94b1dd499f7caa3696de963e69063193892dc939609c581fec3b2d93eca4f266e9360cb5144978ba36864d9143b6fb0a1eb0e0ac5061e04b84a68e787a8f7
diff --git a/dev-ml/ppxlib/ppxlib-0.24.0.ebuild b/dev-ml/ppxlib/ppxlib-0.24.0.ebuild
new file mode 100644
index 000000000000..8da85415c3f6
--- /dev/null
+++ b/dev-ml/ppxlib/ppxlib-0.24.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
+
+# 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"
diff --git a/dev-ml/ptmap/Manifest b/dev-ml/ptmap/Manifest
new file mode 100644
index 000000000000..3f3496ddc916
--- /dev/null
+++ b/dev-ml/ptmap/Manifest
@@ -0,0 +1,3 @@
+DIST ptmap-2.0.5.tar.gz 15121 BLAKE2B a81d205df6d0d276b4919577eb0fcfe9c33ad9a188c462df74b72722f43153bda84fd23880945d16e0f332041f67869ab708f5a925a689cf1ddb22dc0b9a6d28 SHA512 6815ee977cb9a4c5088af8dfb7d8055c8d35870ceb4e95f658fbdc50405495bea75a8755442dc6f7345d2e9021c3b96d14883603759baf267feced9cd5ba5202
+EBUILD ptmap-2.0.5-r1.ebuild 466 BLAKE2B aa8a0034c492cf33ef0e3872df004e38accf7802180c291a95c1c155ca0b924406d3f1991c81c4172f063d12c3349cc4ac0acb29ff76c860680337fc8fe3eb2d SHA512 80cf6e0064a931cb5cb8288b0384d1eecca57431029f80e9cd6272d81bcdc275ce839afe4b2b5e4aa51e7e6d1233468c3dae7bb2c8ef7636808ab3c6b50dc900
+MISC metadata.xml 395 BLAKE2B 96285d149cc7baed80c71ec0b684a152351aaa481e4b704339c7795a3143a1c807a37b48ff1980e7ba02d41b6bccd33bb47b14a70d78683ac2a444679c51567c SHA512 b45db782d259fa9e279092c621c697f5467699f7dd94f988285cda8554d852b3c9bd11ce9f8209e8f6c102ccf71241b6ab4d39fa36c24e24d3c8bef6f6b33a1d
diff --git a/dev-ml/ptmap/metadata.xml b/dev-ml/ptmap/metadata.xml
new file mode 100644
index 000000000000..920f0e534e8d
--- /dev/null
+++ b/dev-ml/ptmap/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ml@gentoo.org</email>
+    <name>ML</name>
+  </maintainer>
+  <upstream>
+    <bugs-to>https://github.com/backtracking/ptmap/issues/</bugs-to>
+    <remote-id type="github">backtracking/ptmap</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ml/ptmap/ptmap-2.0.5-r1.ebuild b/dev-ml/ptmap/ptmap-2.0.5-r1.ebuild
new file mode 100644
index 000000000000..161912516ff7
--- /dev/null
+++ b/dev-ml/ptmap/ptmap-2.0.5-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="Maps of integers implemented as Patricia trees"
+HOMEPAGE="https://github.com/backtracking/ptmap"
+SRC_URI="https://github.com/backtracking/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+ocamlopt"
+
+RDEPEND="
+	dev-ml/seq:=
+	dev-ml/stdlib-shims:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ml/qcheck/Manifest b/dev-ml/qcheck/Manifest
new file mode 100644
index 000000000000..bc2f2b2dab3f
--- /dev/null
+++ b/dev-ml/qcheck/Manifest
@@ -0,0 +1,3 @@
+DIST qcheck-0.18.tar.gz 105588 BLAKE2B 1c785815ed2d016852ebea3cdbfd1002bcc1054dba95db9290185d1283c9af9a3461fa66f24d43437789b7f361050a227ceed5c45327c694ae3a2846688f195e SHA512 08da783ca991dcee26f88b8d6db2fcf2589d3e753ce355d5e3c8944b58ce43b444c6cde054971a557d7d345b4386e6e976111d4c537840a1269c7e361340fcfe
+EBUILD qcheck-0.18.ebuild 727 BLAKE2B ca4ed46b96c98ff1908a51456e4a54c6adb3b57cb2922d07258f51c4f99d5fc8cb1f619d867363652ce55193c38bd990b9cf3e5e60dac4b839d4727b2c053699 SHA512 224e8c127acfa7e4247fa96485637687afd0e5680de79f84a0c097508894edee809e762a2632c2d747b5d114b770abc7be758afe168daeaf8b22665a4ec62e0f
+MISC metadata.xml 385 BLAKE2B 983f241d0a0625a80c71abfde9fd8a18fb3639da17b8ae16e1c695520ec4df991743a354a89fbd663ee28d3c9962254c84f1273f53877655bd5666259a00a79d SHA512 b55436e7e1e299b96ba9b10471eb327639017b535d4cfcf2645b6e430e95b610e7dcc5144452ae9a84943adc1e52e1718d438a7ab0a7d8dbda087fa02f3188b3
diff --git a/dev-ml/qcheck/metadata.xml b/dev-ml/qcheck/metadata.xml
new file mode 100644
index 000000000000..03e91c67d610
--- /dev/null
+++ b/dev-ml/qcheck/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ml@gentoo.org</email>
+    <name>ML</name>
+  </maintainer>
+  <upstream>
+    <bugs-to>https://github.com/c-cube/qcheck/issues/</bugs-to>
+    <remote-id type="github">c-cube/qcheck</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ml/qcheck/qcheck-0.18.ebuild b/dev-ml/qcheck/qcheck-0.18.ebuild
new file mode 100644
index 000000000000..5732be261e72
--- /dev/null
+++ b/dev-ml/qcheck/qcheck-0.18.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="QuickCheck inspired property-based testing for OCaml"
+HOMEPAGE="https://github.com/c-cube/qcheck"
+SRC_URI="https://github.com/c-cube/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+ocamlopt"
+RESTRICT="test"  # tests fail
+
+RDEPEND="
+	dev-ml/alcotest:=
+	dev-ml/ounit2:=
+"
+DEPEND="${RDEPEND}"
+
+src_install() {
+	# "ppx_deriving_qcheck" does not install but only "ppx_pbt" depends on it
+	local i
+	for i in qcheck qcheck-alcotest qcheck-core qcheck-ounit ; do
+		dune_src_install ${i}
+	done
+
+	einstalldocs
+}
+
+src_test() {
+	emake test
+}
diff --git a/dev-ml/qtest/Manifest b/dev-ml/qtest/Manifest
new file mode 100644
index 000000000000..c069d8408973
--- /dev/null
+++ b/dev-ml/qtest/Manifest
@@ -0,0 +1,3 @@
+DIST qtest-2.11.2.tar.gz 46386 BLAKE2B e11008531e23313caf461a48573f734dcfa7670538f74ef4406e35b2f1f1d620fdd7cefcca1470e0b911cec5d00da43d8a97fe76bd47bf6fc05d5a207788a607 SHA512 3edb8471b29c9eb2f6ba11b157abf7ca43ef965d4b1500aaaf1acaeb261972a61c9b104887ada6ca63dc85e06b1d27e34f391885b2fbeb7ea5646323d3be08d0
+EBUILD qtest-2.11.2.ebuild 446 BLAKE2B 8681d708a44b9e7d10ef90806164562629c50f1cf6d1c7c0d35cb2427568a43de296d7d10053f785b716695b76c7e30f484f73cc7af249d0b3fc3d068dab6b2d SHA512 c45b77314387ce2a6e4382a17d5446d75fa332e3a0a515343f7baa8f44b95bede9207f6ec93d7d7333a043cfe7efc59d20d918ee241da9a95ec43a02f3ae8f14
+MISC metadata.xml 397 BLAKE2B 54366260c873a1682d8c401a09da7ced8e818aa76f7c56b05f85f4670a697077effd2d9bc0cbe823f144ec2d307c567031fb14a6f67fb835140a210e28d91c52 SHA512 8dc3169fbbcc7f8fae460af93b68b841f73ce086dd9ca7bb9e98eda2c6ea5069943b005a74bae40afbaeb3fdbcdaf44f8830924f40e43328ade5f4ab0fc6ff77
diff --git a/dev-ml/qtest/metadata.xml b/dev-ml/qtest/metadata.xml
new file mode 100644
index 000000000000..578dc93b2403
--- /dev/null
+++ b/dev-ml/qtest/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ml@gentoo.org</email>
+    <name>ML</name>
+  </maintainer>
+  <upstream>
+    <bugs-to>https://github.com/vincent-hugot/qtest/issues/</bugs-to>
+    <remote-id type="github">vincent-hugot/qtest</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ml/qtest/qtest-2.11.2.ebuild b/dev-ml/qtest/qtest-2.11.2.ebuild
new file mode 100644
index 000000000000..dea2722d2d36
--- /dev/null
+++ b/dev-ml/qtest/qtest-2.11.2.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="Inline (Unit) Tests for OCaml"
+HOMEPAGE="https://github.com/vincent-hugot/qtest"
+SRC_URI="https://github.com/vincent-hugot/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+ocamlopt"
+
+RDEPEND="
+	dev-ml/ounit2:=
+	dev-ml/qcheck:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ml/reason/Manifest b/dev-ml/reason/Manifest
new file mode 100644
index 000000000000..abbde7d57787
--- /dev/null
+++ b/dev-ml/reason/Manifest
@@ -0,0 +1,3 @@
+DIST reason-3.7.0.tgz 1188558 BLAKE2B e5d9cebf98f95824b78d440fa9f91460eae1a1ed44a38e74be4f9404a0bdec046578d25febdf55c266466bffc16b4449e982f157b6d5aabfa1d507fdc3eb5aaf SHA512 263059970c88e105f09e8e47b3967add11fda31a79942f573c90a0ccb04149a5baaf3c3bbd1dd5a085ccdd3e63505f84855dd0fb888d34a9e9eda3248f300e24
+EBUILD reason-3.7.0-r1.ebuild 636 BLAKE2B 25d52a46afe573ecf766f65266946ca1bdd31de020bd430d0f796f3fda702c39c7c13750db9d19ff76c345908a2502a3069a75b483069bfdbe29dd9da28b7a24 SHA512 95d96c88df44e4a0ed0b9c5deb9b2872211c905b0b94bd9a7053d338c091ee087f07f9355e7f9e0f95ab0a440ce6091b4ec9d174019afa3a388a81596c329bd2
+MISC metadata.xml 582 BLAKE2B a339a232ca259236ae8583cacc17e45b262d7553156d0c7583cf1ca2ad94c73ebc3c20f0d806f29f1de2d064ad08f28d61cfce49fba70498084ffe4b017defdd SHA512 cfb0605806b04afa3b701c24ffa8e3177646b8d7999f8abc4530dce3f7f9ae99c8abeccf67a0089b8293660298421ce89ff8e1dad4f300c53ae6d259f9dd62e4
diff --git a/dev-ml/reason/metadata.xml b/dev-ml/reason/metadata.xml
new file mode 100644
index 000000000000..4fc59b478a35
--- /dev/null
+++ b/dev-ml/reason/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ml@gentoo.org</email>
+    <name>ML</name>
+  </maintainer>
+  <longdescription>
+    Reason provides a new ES6-inspired syntax for OCaml. It's also the umbrella
+    project for a set of tools for the OCaml and JavaScript ecosystems.
+  </longdescription>
+  <upstream>
+    <bugs-to>https://github.com/reasonml/reason/issues/</bugs-to>
+    <remote-id type="github">reasonml/reason</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ml/reason/reason-3.7.0-r1.ebuild b/dev-ml/reason/reason-3.7.0-r1.ebuild
new file mode 100644
index 000000000000..c5b7bcec869d
--- /dev/null
+++ b/dev-ml/reason/reason-3.7.0-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Simple, fast & type safe language that leverages JavaScript and OCaml"
+HOMEPAGE="https://reasonml.github.io"
+SRC_URI="https://registry.npmjs.org/@esy-ocaml/${PN}/-/${P}.tgz"
+S="${WORKDIR}/package"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="+ocamlopt"
+
+RDEPEND="
+	dev-ml/fix:=
+	dev-ml/menhir:=
+	dev-ml/merlin-extend:=
+	dev-ml/ocaml-migrate-parsetree:=
+	dev-ml/result:=
+	dev-ml/utop:=
+"
+DEPEND="${RDEPEND}"
+
+src_install() {
+	dune_src_install reason
+	dune_src_install rtop
+
+	dodoc *.md
+}
diff --git a/dev-ml/sedlex/Manifest b/dev-ml/sedlex/Manifest
index 5c9bf423eadd..dde6f17b3dfc 100644
--- a/dev-ml/sedlex/Manifest
+++ b/dev-ml/sedlex/Manifest
@@ -2,5 +2,5 @@ DIST sedlex-2.3-DerivedCoreProperties.txt 993782 BLAKE2B 185f76580a496781524e191
 DIST sedlex-2.3-DerivedGeneralCategory.txt 255731 BLAKE2B 4cc70d21872e6c8d4a26dddaf204531533b79bd58b7238395ca25db7346bc916bd85aa0343abc194b4aab499d481f40a6fe1d8ea287e873ff1199a1bdd195be7 SHA512 b45324cb2791be1d1cf10862ca1ca4008fed2f482aa20042cac7190d4a8d46f840cc65b7367379343d209c06fdf37cd677f887a99bfbf3aa7022fcb3d4212c2d
 DIST sedlex-2.3-PropList.txt 123554 BLAKE2B 3b0a0e12315acfa67e51e48133652b12b45473a22a90f7d2cad91e149cf861f59daf02f8a15aa1138a879be4645d0d6bd48d6a2b39e61584d45f4e763b635ee0 SHA512 1979d14eaa43512ad681f8ebffd93b6bf5b0edacb72d01d7814aa293083e4834840223848c492d96f75a3cc8b219a6671e85158ccde4d283b37be3f9e2f071e4
 DIST sedlex-2.3.tar.gz 114507 BLAKE2B ba777d90ceba41136ac552a2aea860b2932dc2c27d02a5875e8533d6740bcababe444d27427fbae59739a42901b3fb85f7b2ed8fd318f984734e7283ecd7e69e SHA512 f91bbda9e79417e0a7c723a8efd9644404ffc91c60898b8fa07a514c38bc8472eae34419405354ae80966feb8d3203943f78776ad395a16132c7c890e3dbd7d8
-EBUILD sedlex-2.3.ebuild 1026 BLAKE2B 80a30be764206be3ddece22d9280b06d151669e0c95d1e7feb1b366275ad0216f957bfe1dcca063a97900bbfe36ae15654afbfaac14307934e34fb4ad4ce068e SHA512 ccfaaf84e0c3cade170d41a8f827c5dffcc3066c08ae3b2d56a9444b2fb10f47e832bf3e4f51ebda8069736da91c2e7f6c00e8dd19f4c668883cd0744fa15fa6
+EBUILD sedlex-2.3-r1.ebuild 1032 BLAKE2B 8f270fd378c861c23ed396408e3b2bcbec55f463a51680bf617b673afb06db9a4d570b14987f90fc7b6e4b37eef016d99c101301ec10f4022548cffdefaacdfc SHA512 a865b7adc9af6b6302570555808864df07ebc1a6738b2946c7c83a56217e993dc291650f99c79559b8c1591eb2adcd35d5de754011005b32ec70041e68946ecf
 MISC metadata.xml 703 BLAKE2B 5eab9e0d06727add48e1a431614a2256086516cae0faf15576aefe95e3e0bb47b6822cad9827e9f9417956daa6380c576255dd5b50d7e0f451357c2c9dd01721 SHA512 7d07803ee15260bc820bee77ae89def0f3273d3074cd57e19bca9ed8b7871c1087d1e2e68df73633959829c67ea6c37457d0bcf1728c975573648159485d5e5a
diff --git a/dev-ml/sedlex/sedlex-2.3.ebuild b/dev-ml/sedlex/sedlex-2.3-r1.ebuild
index ebd20d7914db..ea65dfca6321 100644
--- a/dev-ml/sedlex/sedlex-2.3.ebuild
+++ b/dev-ml/sedlex/sedlex-2.3-r1.ebuild
@@ -17,7 +17,7 @@ for file in ${FILES[@]} ; do
 done
 
 LICENSE="MIT"
-SLOT="0"
+SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE="+ocamlopt"
 
diff --git a/dev-ml/trie/Manifest b/dev-ml/trie/Manifest
new file mode 100644
index 000000000000..09fb0781f53f
--- /dev/null
+++ b/dev-ml/trie/Manifest
@@ -0,0 +1,3 @@
+DIST trie-1.0.0.tar.gz 2399 BLAKE2B 3f58dbe33686baca2290a413b7d069b8d97ec69546217cefbb6404877b1fec129824da66fbbd6774e069285960ad9dc12380ecd828135ea50d86caa951e0df8b SHA512 1921a42486a0a221e546507287cbf28ccae5462abe55817269517b7b92e19f35031f2d0fba2b1890b97236d6fff11be9d76ade317ae1dfa1089bd4740a46786f
+EBUILD trie-1.0.0.ebuild 352 BLAKE2B ce4426c346c39d578b3f6120df2aa708f1b635f9799b82b66c143d1ff3e244526c3a251aba5191a07925471ad041274eeff7a5a7a6a7e862fab7e94cf83dfcf8 SHA512 86c43b75e60b29892f3a6484c775187d29a523fc69413fb621cb5baef556eb9aee3b1648d3575052dd48a382d5956303ba944201d999ea5192773872670961db
+MISC metadata.xml 379 BLAKE2B fb6bf43bcb3055bf1916ecfbe47bcd34ad2d20a5b3a7d39c71e2d84f4818839b84e8801b9f575a70ae80664aaca20a8b93f28a48e560cc5177bcd8e26caaa074 SHA512 1b87d0f3549c6c9eef190d6a03359431fd110a7256d984afb5967f9a7599c99bebe163d294911a800de3c12728ee7ea4e4bcba0bc23ed48d4482239aff0569d8
diff --git a/dev-ml/trie/metadata.xml b/dev-ml/trie/metadata.xml
new file mode 100644
index 000000000000..387e4466f6c3
--- /dev/null
+++ b/dev-ml/trie/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ml@gentoo.org</email>
+    <name>ML</name>
+  </maintainer>
+  <upstream>
+    <bugs-to>https://github.com/kandu/trie/issues/</bugs-to>
+    <remote-id type="github">kandu/trie</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ml/trie/trie-1.0.0.ebuild b/dev-ml/trie/trie-1.0.0.ebuild
new file mode 100644
index 000000000000..d8539a79670d
--- /dev/null
+++ b/dev-ml/trie/trie-1.0.0.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="Strict impure trie tree"
+HOMEPAGE="https://github.com/kandu/trie"
+SRC_URI="https://github.com/kandu/trie/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+ocamlopt"
diff --git a/dev-ml/utop/Manifest b/dev-ml/utop/Manifest
new file mode 100644
index 000000000000..8cfc76f30e03
--- /dev/null
+++ b/dev-ml/utop/Manifest
@@ -0,0 +1,5 @@
+DIST utop-2.8.0.tar.gz 414059 BLAKE2B f94cc9a2e87d5341b1d7231574b1e0d8b179e600640281529ecfd2ce8827b9145d73030ea1ec59b20430d34155087f6d910c698c75d7566145c9db3a3ecbf872 SHA512 cf323249aa9a747081b3e39e8e8b99b69557082beb244dd0a28d64c6d11e3c03427c22da4fd364e9ae7f5d83d12ca3d2d48b9f4b6697ec704d486f3c23163dba
+DIST utop-2.9.0.tar.gz 414953 BLAKE2B 96fbf38d4a638137b73264bc523b8a81e47ddd609a7987073313f4b1d628e4e84c31f98195105911dd0930b8d27007cf5cc1633771bc6d2e975bd169e1e3ba9c SHA512 dd3f52fb915493cb32b5ee722361e884a481d04ef175d5bdf58f4032b70826c38b2f5279b7c64b78961170a86bc80fbd59f03026fac99bb5da2b46a8f341aa45
+EBUILD utop-2.8.0.ebuild 522 BLAKE2B 60492098157329523c0925fb648af6966a1f73495cd65baff95cec5e7fb13698ab3f81160a89a5be0971a0ead75fdc22e91ba72b1214eafe3032bcd891f12d98 SHA512 ae402dd577415dd451477efa25c8098ed83f502055e8e380cf19e3383b14bc503173f4f49e5c9580d4fc13b8e234b6d98bc02c080c0c8e310e2b3ac1070eaf98
+EBUILD utop-2.9.0.ebuild 522 BLAKE2B 60492098157329523c0925fb648af6966a1f73495cd65baff95cec5e7fb13698ab3f81160a89a5be0971a0ead75fdc22e91ba72b1214eafe3032bcd891f12d98 SHA512 ae402dd577415dd451477efa25c8098ed83f502055e8e380cf19e3383b14bc503173f4f49e5c9580d4fc13b8e234b6d98bc02c080c0c8e310e2b3ac1070eaf98
+MISC metadata.xml 713 BLAKE2B 0d4431b068fd0cddd59703eb1deaac0a09ff987cdf97c551712e4465cd2322de0d615f28346213219effad5618db768ec389c14872ec0beaacf5f335594555e4 SHA512 f3b1cc264cdfb60d77321fcdb4d66c8aa9599e7ccfb78261e4209d5cceb617ddc8a3beec6224c3544ea71debf2efdfa5db9b18bfc990aa7f129ed54e49f46166
diff --git a/dev-ml/utop/metadata.xml b/dev-ml/utop/metadata.xml
new file mode 100644
index 000000000000..575a666b2394
--- /dev/null
+++ b/dev-ml/utop/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ml@gentoo.org</email>
+    <name>ML</name>
+  </maintainer>
+  <longdescription>
+    utop is an improved toplevel (i.e., Read-Eval-Print Loop or REPL) for
+    OCaml. It can run in a terminal or in Emacs. It supports line edition,
+    history, real-time and context sensitive completion, colors, and more.
+    It integrates with the Tuareg mode in Emacs.
+  </longdescription>
+  <upstream>
+    <bugs-to>https://github.com/ocaml-community/utop/issues/</bugs-to>
+    <remote-id type="github">ocaml-community/utop</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ml/utop/utop-2.8.0.ebuild b/dev-ml/utop/utop-2.8.0.ebuild
new file mode 100644
index 000000000000..d5b493a8c2cf
--- /dev/null
+++ b/dev-ml/utop/utop-2.8.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Universal toplevel for OCaml"
+HOMEPAGE="https://github.com/ocaml-community/utop"
+SRC_URI="https://github.com/ocaml-community/utop/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+ocamlopt"
+
+RDEPEND="
+	dev-ml/camomile:=
+	dev-ml/lambda-term:=
+	dev-ml/lwt:=
+	dev-ml/react:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-ml/cppo
+	dev-ml/findlib
+"
diff --git a/dev-ml/utop/utop-2.9.0.ebuild b/dev-ml/utop/utop-2.9.0.ebuild
new file mode 100644
index 000000000000..d5b493a8c2cf
--- /dev/null
+++ b/dev-ml/utop/utop-2.9.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Universal toplevel for OCaml"
+HOMEPAGE="https://github.com/ocaml-community/utop"
+SRC_URI="https://github.com/ocaml-community/utop/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+ocamlopt"
+
+RDEPEND="
+	dev-ml/camomile:=
+	dev-ml/lambda-term:=
+	dev-ml/lwt:=
+	dev-ml/react:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-ml/cppo
+	dev-ml/findlib
+"
diff --git a/dev-ml/yojson/Manifest b/dev-ml/yojson/Manifest
index 9e134ad6f3ce..65ad53972348 100644
--- a/dev-ml/yojson/Manifest
+++ b/dev-ml/yojson/Manifest
@@ -1,3 +1,3 @@
 DIST yojson-1.7.0.tar.gz 29704 BLAKE2B edbd7f66d69a85880fc8ee9bb25a993744a310887024f7af63665ba8f5067f1b9383ec4d6dd5f4ca3376d698665a8f605c078f7597ddd4e71857c1a20143c2e5 SHA512 25eedb64e4bf7c7e8d5a5a115812cd502540afbdeb7c947da3a14e5968aa0a7db8ab402425662571d8935b9cd6a19796ce81dd80a65dc614f156626c60e7036e
 EBUILD yojson-1.7.0.ebuild 768 BLAKE2B d7fc71d5d6c18f70f172fa3d3bf39e16d9b206d17ebff4bda65a9a1779a2b32e454e6912d2aa62db5b8bb29b263bab32503c3ded92526951cad7b9bfa732675b SHA512 6ff1bd5e9122cb8e312b29376efa45bd052900b7639a747674a0bc823644cfdd350e82fdf80956b37d73ab1add4975c59ce8943844a52642d6471fb8bf63640e
-MISC metadata.xml 503 BLAKE2B d8cd6d366fc775740b7d21ed020487c8c76e31426db94686b897a06f5b5e8b13c51e5b8b982050cbf6125d9aab2982d02d441530b8f302c1fe631e1f17815d6f SHA512 4c336a8c2b26cd8e04c44a5658325a00a988f477033eb3095e3ed81749312418ab737cd1734af18b6cbc697f3b8b21be0359a3379d5454dbc4e8824b26c13821
+MISC metadata.xml 529 BLAKE2B 4cfc5392ca4b4402f01251818c776c63d607c2e1b8d216930db594ffe2e1146ac52f9492823e5ef97ba7b6f89b2ee8eaf367e785120ca5fcabdb36549ffb6ebd SHA512 7c415ac7330d8d3397911ddd213da9a6cd5dfe76fa2530ab22cbd70cd8f411fbfdb9d40aa8ca66dc202227799fe0b8ff81c81e57815f5e206c7f424b6218baf1
diff --git a/dev-ml/yojson/metadata.xml b/dev-ml/yojson/metadata.xml
index 0bff28c27b11..b835609e4c54 100644
--- a/dev-ml/yojson/metadata.xml
+++ b/dev-ml/yojson/metadata.xml
@@ -1,15 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
 <pkgmetadata>
   <maintainer type="person" proxied="yes">
     <name>François-Xavier Carton</name>
     <email>fx.carton91@gmail.com</email>
   </maintainer>
-  <maintainer type="project" proxied="proxy">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
+  <maintainer type="project">
+    <email>ml@gentoo.org</email>
+    <name>ML</name>
   </maintainer>
   <upstream>
+    <bugs-to>https://github.com/mjambon/yojson/issues/</bugs-to>
     <remote-id type="github">mjambon/yojson</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ml/zed/Manifest b/dev-ml/zed/Manifest
new file mode 100644
index 000000000000..7f13764fe6c3
--- /dev/null
+++ b/dev-ml/zed/Manifest
@@ -0,0 +1,3 @@
+DIST zed-3.1.0.tar.gz 45535 BLAKE2B 8c8898f01add91807fa282baae1c5ee34e77c5234e87e4c79c17a9f55756d3b4c2af5f0b01deb9414a657f63ea6cf6db44af7249adb0f2b147e923b4112a7dd7 SHA512 d4457af15f970adb7b1ed543017e590fa0ecc47171d6dd520a1397f21ce0219caa30a9db7bedb76c0602d4f6d0f0684012cc33feafe18b848d3261a460dea10a
+EBUILD zed-3.1.0.ebuild 481 BLAKE2B 601461c875758a110f37dbae328bbd1d60bd83aa3716c367bb5cfb293b41f643f684c1ad2d6575a550986befca0c77aa7e1de33b4ff7cf843bb2507ced796588 SHA512 50b8d34ecfab53c921fc4c03afade28de347d77adc074c6cf6de757894cb7f9aeb21b7123b20904dcfda4fc744bdf190bdbfcecdc11b8ed7a494125f7101f1fa
+MISC metadata.xml 953 BLAKE2B b42ea3dc0d87de0ba997cbc0a6247dfd420abdd4d2b391a1b5c67c7e694e21039cd46dd2d16e9ab92446b48d8162bc6c14d270d95ae825cab1c2f9b98d0d288a SHA512 6605ba134ef795ff99bac001071fd239a91f0e170c3343fd77a42d7e9850665820aba5770e328a90d653c2bef6df53e804a5a1a1564fc530c9e705fe4d16b4ab
diff --git a/dev-ml/zed/metadata.xml b/dev-ml/zed/metadata.xml
new file mode 100644
index 000000000000..b2be3f06ce46
--- /dev/null
+++ b/dev-ml/zed/metadata.xml
@@ -0,0 +1,22 @@
+<?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>
+  <longdescription>
+    Zed is an abstract engine for text edition. It can be used to write text
+    editors, edition widgets, readlines, ... Zed uses Camomile to fully
+    support the Unicode specification, and implements an UTF-8 encoded string
+    type with validation, and a rope datastructure to achieve efficient
+    operations on large Unicode buffers. Zed also features a regular expression
+    search on ropes. To support efficient text edition capabilities,
+    Zed provides macro recording and cursor management facilities.
+  </longdescription>
+  <upstream>
+    <bugs-to>https://github.com/ocaml-community/zed/issues/</bugs-to>
+    <remote-id type="github">ocaml-community/zed</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ml/zed/zed-3.1.0.ebuild b/dev-ml/zed/zed-3.1.0.ebuild
new file mode 100644
index 000000000000..64634262c7c0
--- /dev/null
+++ b/dev-ml/zed/zed-3.1.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Abstract engine for text edition in OCaml"
+HOMEPAGE="https://github.com/ocaml-community/zed"
+SRC_URI="https://github.com/ocaml-community/zed/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+ocamlopt"
+
+RDEPEND="
+	dev-ml/camomile:=
+	dev-ml/charinfo_width:=
+	dev-ml/react:=
+"
+DEPEND="${RDEPEND}"
author	V3n3RiX <venerix@koprulu.sector>	2021-12-22 14:08:05 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2021-12-22 14:08:05 +0000
commit	93a93e9a3b53c1a73142a305ea1f8136846942ee (patch)
tree	b9791a06ab3284e27b568412c59316c66240c682 /dev-ml
parent	2771f79232c273bc2a57d23bf335dd81ccf6af28 (diff)