gentoo resync : 05.12.2021

43 files changed, 370 insertions, 94 deletions

diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 58e6b3f0d6a4..c8bdcd1c67a6 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/async_ssl/Manifest b/dev-ml/async_ssl/Manifest
deleted file mode 100644
index 1d37df55b901..000000000000
--- a/dev-ml/async_ssl/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST async_ssl-0.14.0.tar.gz 40338 BLAKE2B eb673f30d7374b539b37c84ba88e0daf8eeeacc93b278a44177a433cb8b336a843cc05e6033ec8ee831ec1c28fc243c8019a82bd495e96a1e54dfd47a3d10b13 SHA512 89397d0066444cbfdd3d4d27942ff04b3adbe2a9cf11427795fcf59127908c94f88c1575f395aa74eee49abb5be2e86940a88945dda6435fb81165bd58b789a7
-EBUILD async_ssl-0.14.0.ebuild 588 BLAKE2B 596a3fa7f433eb9756e6020cbf1c595481fbb13d25a1288a2a280a4b9516d0d4fd583538593b81b66f45d167cb60836a89c92ce5d09e9767926c32e2dc5a1de1 SHA512 433c90470106b95671aef48e056b0a1f26085b1e813199010965f22ff5db36faffa44cc537be4a91751961381da6d15aec1efc7766393a1e987dbdce789d6b83
-MISC metadata.xml 253 BLAKE2B 519b26dc38af67c949fb27facf437d55db973727a699f0bb01397f8a9d501c2b643e74e8f2e28358177191337bdc67dc0d826965ab74c0feb8e4fe81f4a65973 SHA512 cdaa59e22ba844c34f32c50c0a48610036da7dec61e263f389e2e15ae8f800be7fe85f6a0cef2090e0c1a1249643a2c9dc047375ab06688deea19a0a3cd0b1e2
diff --git a/dev-ml/async_ssl/async_ssl-0.14.0.ebuild b/dev-ml/async_ssl/async_ssl-0.14.0.ebuild
deleted file mode 100644
index ab39d4d77063..000000000000
--- a/dev-ml/async_ssl/async_ssl-0.14.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit dune
-
-DESCRIPTION="An Async-pipe-based interface with OpenSSL."
-HOMEPAGE="https://github.com/janestreet/async_ssl"
-SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE="+ocamlopt"
-
-RDEPEND="
-	dev-lang/ocaml:=
-	dev-ml/async:=
-	dev-ml/base:=
-	dev-ml/core:=
-	dev-ml/dune-configurator:=
-	dev-ml/ppx_jane:=
-	dev-ml/stdio:=
-	dev-ml/ocaml-ctypes:=
-	dev-libs/openssl:0=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ml/async_ssl/metadata.xml b/dev-ml/async_ssl/metadata.xml
deleted file mode 100644
index 536c9f583769..000000000000
--- a/dev-ml/async_ssl/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">janestreet/async_ssl</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ml/batteries/Manifest b/dev-ml/batteries/Manifest
new file mode 100644
index 000000000000..50fe02999c2b
--- /dev/null
+++ b/dev-ml/batteries/Manifest
@@ -0,0 +1,3 @@
+DIST batteries-3.3.0.tar.gz 821749 BLAKE2B 2caf5076e1ad859075bfda6b846483e8d8d926f3dc4393cf83e59c15fd7e6bda5697a602fd8151f5438ab304b7ef2e4c313488561636cbacc13eede6924af2c5 SHA512 9e5f12d26b229a0d880d79695bbff32de5bc9ddf4faa3a421ebc5b0a20a9f3823f681200d9e7c03a22766d271e1e7ec4fa5721b91a3ed051ae9cf145829596f2
+EBUILD batteries-3.3.0.ebuild 611 BLAKE2B 16e9e7e6a93afceedd38063ee23c29cb23439cd74880f7087d50bfa2f997d86680f7049035bf87fe23cd40349e1c52581f9a0e6d07d985c0964c7db401b1d74d SHA512 e67a8bbab8d98d24f42f24e4ff5e0c3d7ecb9cd3c4f9d4da7b465b126e8925ee28d63bd107bcf8002df57f281dba81caf2efb45878c70ce8a5660a1bac926545
+MISC metadata.xml 337 BLAKE2B 2cb7f9b54ec498c0b25f3f6cb2011046c38c0103341f22dea799e2fe501c46336950040fcfb8fe3fd4723aa5f499e00e6b0dae364a8fc06b84aa348ddebea0c2 SHA512 88a13f02eead4f3c06bdfa1850ee53ee6d309181d89a0625a89dfa3e421f3f7cb3d896cc2f69f4ddf6cef05f1bff932b6c2d79b791d69b65a21afed822637ded
diff --git a/dev-ml/batteries/batteries-3.3.0.ebuild b/dev-ml/batteries/batteries-3.3.0.ebuild
new file mode 100644
index 000000000000..c7cf1cfb3d3b
--- /dev/null
+++ b/dev-ml/batteries/batteries-3.3.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit findlib
+
+DESCRIPTION="A community-maintained standard library extension"
+HOMEPAGE="https://github.com/ocaml-batteries-team/batteries-included"
+SRC_URI="https://github.com/ocaml-batteries-team/batteries-included/archive/v${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="test"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	dev-ml/num:="
+BDEPEND="dev-ml/ocamlbuild"
+
+S="${WORKDIR}"/batteries-included-${PV}
+
+src_install() {
+	findlib_src_install
+}
diff --git a/dev-ml/batteries/metadata.xml b/dev-ml/batteries/metadata.xml
new file mode 100644
index 000000000000..30d375ad112a
--- /dev/null
+++ b/dev-ml/batteries/metadata.xml
@@ -0,0 +1,11 @@
+<?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>
+		<remote-id type="github">ocaml-batteries-team/batteries-included</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ml/bigarray-compat/Manifest b/dev-ml/bigarray-compat/Manifest
index 0aed8c79f243..c3a7d6a86476 100644
--- a/dev-ml/bigarray-compat/Manifest
+++ b/dev-ml/bigarray-compat/Manifest
@@ -1,3 +1,3 @@
 DIST bigarray-compat-1.0.0.tar.gz 1385 BLAKE2B afa38fd206de8738db51742467b95df4aec3e4e713c946c2c1d041da7e19483bdb53dca440b50c9c1b3c3a5fd7ac71a63ccfe74a14a5743f10f35429838a1c14 SHA512 c365fee15582aca35d7b05268cde29e54774ad7df7be56762b4aad78ca1409d4326ad3b34af0f1cc2c7b872837290a9cd9ff43b47987c03bba7bba32fe8a030f
-EBUILD bigarray-compat-1.0.0.ebuild 445 BLAKE2B 7b3d454aaa9ecf49e8f754c605f58d66e51444689689785b32d51ce6bc66721e98a9b45732cc58f5b821a4e6bd0f40245b4c838f6b3da36f006a52816f283ee5 SHA512 03b5728f663eab1fa8d1cf882289db513a4168a11dd589bbf672df4679b1782b8adc41003fee445d51395f11a5b9f8cbecc056142b60e41d509f6dce36a21f5a
+EBUILD bigarray-compat-1.0.0.ebuild 457 BLAKE2B d425d797c1bda0b8dfcfc9e3f0877e0d97872bb6b0c861f5ac17ca8bcecfa62247524074d3eccaf1f400c9783765857fe57bed3a53f2c489838f17cdffbb4cf8 SHA512 5f1cd104e80347fc53f7ea3c9c7928b07b6ee038d7cdc8b97cd96926f839d62538ec49be7592eabd446fc522112a2568fffeda631ff4aa029adcfcbb84b8bc99
 MISC metadata.xml 320 BLAKE2B 01aff5c109d72cdbeea68a7170d2ddc0dbac8b02e667df569c4a1111ba7fc8f73114f1d32dc3883e5bcf07b85bc9d2c5bc6940c65b8ce4d316f2eb7eb9f620a3 SHA512 f4512e72cde3192cd47c1083077ae9d8520cc7067c8249966fd5522d7113b4d4d390897b0abd7fb5c5e292fe490c57e689312ff47b509af3709faf3a27440b3f
diff --git a/dev-ml/bigarray-compat/bigarray-compat-1.0.0.ebuild b/dev-ml/bigarray-compat/bigarray-compat-1.0.0.ebuild
index fbf62fa457b2..71f7c94bf942 100644
--- a/dev-ml/bigarray-compat/bigarray-compat-1.0.0.ebuild
+++ b/dev-ml/bigarray-compat/bigarray-compat-1.0.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mirage/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="+ocamlopt"
 
 DEPEND=""
diff --git a/dev-ml/cairo2/Manifest b/dev-ml/cairo2/Manifest
index 7efe2e24b276..8b417d1d1cae 100644
--- a/dev-ml/cairo2/Manifest
+++ b/dev-ml/cairo2/Manifest
@@ -3,6 +3,6 @@ AUX cairo2-0.6.1-handle-safe-string.patch 1743 BLAKE2B 75c805c3db2b0ea7eb9a5fe8b
 AUX cairo2-0.6.1-ignore-gtk-and-pango.patch 2168 BLAKE2B f444c6056af8708bd4dd838fab54390b12ae6f00002ea885111eca37d3f0469acb8fac38bffe235436f2b20020178a6310cf5baa9bc27cbca6d4f29e1ac463d9 SHA512 6443a64189113add46c5a1ec9eebd13c513d314b512db31ee4d025e3653711e4295a0819d31d5ed7f793921f8a6d53a3576982bb422e331745877265dce828bb
 DIST cairo2-0.6.1.tbz 90006 BLAKE2B 78f1a998f821aad9b2a1d2deacffd9290920e6d351e0c66b6cc2a6f4f6140fef67c0dde9c1c317e743b5930e09d68d6c1830beb554d23ac9bcc95738a4091850 SHA512 d09274624854a45cf914ffbe984f1bcdd30db6283e7a0fd73aeec2a19226ff8f68d3f7139bbab72ca5698b58b840d6fd8a35570efc228391a7c5d031421f5c1f
 DIST cairo2-0.6.2.tbz 90428 BLAKE2B a8c03e6ea8d4dcfc34a744f48b9a55a5e84b964602358f1c90aadcc5fdaed8eebecba2c851e71ef60066d42088d0baf9f4b90824541af93426e47f2539d6f41b SHA512 789b65428855c3b8fb71836ee6e607870c3140a6152fb01b8ba6e7d2e2f4842a62412061a5eff99023234d305587b605d0cbbacd29456c86a52e9df6466bd302
-EBUILD cairo2-0.6.1.ebuild 1138 BLAKE2B a708b4bb1c159ddd8a0eb71b07c575aeeaf6c942041099d89789e7b1fef9d0d5ab8570aceb7de424f7be39972b1b1268cc89b7323da045df129c4a9b72b0b69f SHA512 cce637e651b75d953334a71e1dd1ad31590180dd7e17d2fbc90e643d184d380ea6b1e82252225ad9ebfb7585dfa22f90e33ca86fbe16356d7a24eae2dab9bc67
-EBUILD cairo2-0.6.2.ebuild 1015 BLAKE2B 32cf7f22398b353a5c3b9727e1c0e6c2d707e82c5fcd22fbb3f2897c907023cb98ed7f05804c127f722e283775be1a7b4b8c184cce26485fa7ef9bf9295432cb SHA512 1bd5b2c89a387f8b88c55d10fde7de6046617bd376013a97a99d102b8efa432ccf7df469a652a143ca429f1a884abd37edd6cebcdfe38d403e0893228c6c8b03
+EBUILD cairo2-0.6.1-r1.ebuild 1143 BLAKE2B 3b41c7c9c9b4619e09a128db25039de687c6a185e614f126106447a7aa84c60eab3c845feea03fdf762be5c7797cb5d4c6431d55417d68b3293b9958f8d6c095 SHA512 a95bbb135c121e857884a4f6641fd1c3d3fa6a63beaee20f2009f477142781d80fd68d9b6fb0f22962c62b4582a03e1bf5dbca1d29c35fbdbd2991e7f848f98a
+EBUILD cairo2-0.6.2-r1.ebuild 1020 BLAKE2B ee619e7974c559b7ff4bcffb3e4c7adaf06d83526374f37d0a0ef4d9831d4dce55dc87ceba8f8bbea8e11927392ec995b3c269c6bf1e94ed4abd2a00db2cd6b3 SHA512 5ec8a7612a92e0c0e04e6cc18f63644904c16522a7a3a395fc374e5f7f99bed08c3c7b7aa3dda9a5bf04d77975d7290a207a66fba4598f69da06eec6494466bb
 MISC metadata.xml 422 BLAKE2B 247d46b642a4b11443adef6724b00fcf6fd9e8dc09ae1a8bbef9a6069d79efa29a24e24b8ead3231006dae4368da0ed94bcc29b208cb1e0db387754bfffe40e9 SHA512 138f87c890e35c7e3627bc1206927a1cbe7347cbcfe9861f249580dd4ca348c82dad8411c78711d63b70097753bad50a67a1f05dafd9b1349b13a1cd7ff44439
diff --git a/dev-ml/cairo2/cairo2-0.6.1.ebuild b/dev-ml/cairo2/cairo2-0.6.1-r1.ebuild
index 16f59503c1c0..c52a75937f29 100644
--- a/dev-ml/cairo2/cairo2-0.6.1.ebuild
+++ b/dev-ml/cairo2/cairo2-0.6.1-r1.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
 IUSE="+ocamlopt"
 
 DEPEND="
-	x11-libs/cairo:=
+	x11-libs/cairo:=[svg]
 	dev-ml/dune-configurator:=
 "
 RDEPEND="${DEPEND}
diff --git a/dev-ml/cairo2/cairo2-0.6.2.ebuild b/dev-ml/cairo2/cairo2-0.6.2-r1.ebuild
index a24437297856..5cd7078e915c 100644
--- a/dev-ml/cairo2/cairo2-0.6.2.ebuild
+++ b/dev-ml/cairo2/cairo2-0.6.2-r1.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
 IUSE="+ocamlopt"
 
 DEPEND="
-	x11-libs/cairo:=
+	x11-libs/cairo:=[svg]
 	dev-ml/dune-configurator:=
 "
 RDEPEND="${DEPEND}
diff --git a/dev-ml/gen/Manifest b/dev-ml/gen/Manifest
new file mode 100644
index 000000000000..633b48ec0a05
--- /dev/null
+++ b/dev-ml/gen/Manifest
@@ -0,0 +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
+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.ebuild
new file mode 100644
index 000000000000..c4b73e0808a3
--- /dev/null
+++ b/dev-ml/gen/gen-0.5.3.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Iterators for OCaml, both restartable and consumable"
+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"
+KEYWORDS="~amd64 ~x86"
+IUSE="+ocamlopt"
+RESTRICT="test"  # qcheck & qtest not yet packaged
+
+DEPEND="dev-ml/dune-configurator:="
+RDEPEND="${DEPEND}"
diff --git a/dev-ml/gen/metadata.xml b/dev-ml/gen/metadata.xml
new file mode 100644
index 000000000000..6d080f9427ae
--- /dev/null
+++ b/dev-ml/gen/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/gen/issues/</bugs-to>
+    <remote-id type="github">c-cube/gen</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ml/integers/Manifest b/dev-ml/integers/Manifest
index 49de0d371067..cd8ec1b97f05 100644
--- a/dev-ml/integers/Manifest
+++ b/dev-ml/integers/Manifest
@@ -1,5 +1,5 @@
 DIST integers-0.4.0.tar.gz 9980 BLAKE2B ee67c39024d77f4ce20e9ba7e1564b3418397f1e98b9a5f30e238f5c161d7572701e3d824871b46d15b90887d5f3983a9ab440f46e22c4de8cbc68912daea5eb SHA512 73af64654579b27db18c612229044dba094064dc7d36a73f42ffd4ba7040ed326f859f588e7a764bce3b2fd6e9365f9e9f99330ef29bafbe77ca6dcb53d5ed79
 DIST integers-0.5.1.tar.gz 12687 BLAKE2B 37807cf0642ff4b85c91b82d7fa6ee46a242750970123b0d9d3bec7c532d0d6ceceb4b2365cc71e0664068b3fcb99e61e5c6621363cd527237cf3051da813791 SHA512 25d90c41d66a73ca18f2cfb5e13e9b3af57d1712dab108e45cb8e9eeb88f4a2f822e03f05e08832080d4764d46c7e5f116fe48bdf060c6ebd80c3e558de41983
 EBUILD integers-0.4.0.ebuild 443 BLAKE2B 2825cc12c8d0ece3c63802e946ff57445bb02b2dd7b702a808bac7331e341bf5b729175f90266db6cfa99341f08925665d904e03324d5e9b44e5a165bab6be13 SHA512 c25a789f367e1080897a3ea998eac8304932968c6ca130580ec3232d2fad98a2b0b479b7bdbffbd46290611baa82e6c6688349c10bfa8d5ef14e564b7155ae4f
-EBUILD integers-0.5.1.ebuild 446 BLAKE2B 36ce2864b3cba715fe6cc119e059d243c5d54563e8d240a870eb3094adf7eac814743b4d3ecff1d6826b55efb53f62a5f28af20e8117aa4f2fdefb8d528a1fc6 SHA512 e6cad0e0071d73709558b705147982c5b6aec5dbbec7597b65589623a92c4f05d5dee23436ff526c5a9321acd9951189a1ea3a7d01f23d51c939506bc3aa97b8
+EBUILD integers-0.5.1.ebuild 458 BLAKE2B ccd76594264ffecfbc84ca345d0c3e3440b2b937da95f4bf277eb76144367c823768d1041aebe32041d1ca7b6fc8ce8eb1b8ca8a5218922d4c5a0ef9601ebf3c SHA512 d74b1a14fe621d63e9997e963d48d0d585feb6d54f18130bfbed5ef061d4fb8215171250aaa1a718abb6ff4e4396f9e9faac61364164f41ef9ea6a69b9ce3706
 MISC metadata.xml 427 BLAKE2B 230565ed0daa87fa10797f03b258e23bac9a01166ee589598b5b240c0b7833b7c73a1b32da7c43c8df6e3767876d0d54b289b74a9e062357bbd05e1164ff10dc SHA512 0d29cb64bb76f1c2443a2dd37aec0db81b5af18d902282dbabca9938d5618dcaddabd22cf083bbf3386b8994563c2e33130353e26054aeccb39e51702b136123
diff --git a/dev-ml/integers/integers-0.5.1.ebuild b/dev-ml/integers/integers-0.5.1.ebuild
index fd39106e8921..da2638bb6740 100644
--- a/dev-ml/integers/integers-0.5.1.ebuild
+++ b/dev-ml/integers/integers-0.5.1.ebuild
@@ -12,5 +12,5 @@ S="${WORKDIR}/ocaml-${P}"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="+ocamlopt"
diff --git a/dev-ml/llvm-ocaml/Manifest b/dev-ml/llvm-ocaml/Manifest
index 453dc1b1b90d..81e336854a54 100644
--- a/dev-ml/llvm-ocaml/Manifest
+++ b/dev-ml/llvm-ocaml/Manifest
@@ -1,9 +1,11 @@
 DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
 DIST llvmorg-13.0.0.tar.gz 147270176 BLAKE2B 628f316b580e1edf3a58d4825b724df759e6ed2a4116802470c04562caefc392fa325c91f388036365a2e45a9595cca6d3557fab12984fc8bcfef29c9116d822 SHA512 8004c05d32b9720fb3391783621690c1df9bd1e97e72cbff9192ed88a84b0acd303b61432145fa917b5b5e548c8cee29b24ef8547dcc8677adf4816e7a8a0eb2
+DIST llvmorg-13.0.1-rc1.tar.gz 147284646 BLAKE2B 3a1d8d382de633b7f8fc998f8ad1e03c24b733aefc591615cbd34115d1d6d74962ae33bbf2224527b521a76930ffee425527225563a558a04173e9aa9487c781 SHA512 d487bfc9b898ad0046e0c94338d7757d8a05a1a84d683abfbc9ed4994c6d12caf88fd18575225e284070fc67b3ac0970ca6639e61b1a7cc2948b216a5364a22d
 EBUILD llvm-ocaml-11.1.0.ebuild 3054 BLAKE2B 0498a14f644a956cf1a495c4b10687328cdd7044b4cf90e09d51c3c93c3f8e7eae29e93b605e7079975cf9b585e14e0c50c85f6b210d6516395f3278f0c2cace SHA512 28ac245ce6fb5caafec11a501e4a8e7a39bf15bad171b445f9b6faf82b8c3a4416925c42ac022bddf262332ca275de3969735b99e642df8c3b64ab3b7d04f85a
 EBUILD llvm-ocaml-12.0.1.ebuild 3060 BLAKE2B ed1223c503df5487c666642a02df41095eb724b46a79c1204f8ce2ff6b9eb650fbb46907d00e721c1ecb5df6648afdefeca6dabca456ab54656fc45871beff80 SHA512 57cdf97cf5a401a5ec33f15f8fb1c83998a7503b4ebcab1c2e35c2b35519d9b30f4b25598ddc2f8e6757f6de42a6a5878ab43e50fd45f1df0db6549a204b1680
-EBUILD llvm-ocaml-13.0.0.9999.ebuild 2580 BLAKE2B d044f3d8750bf37a1f9079a0f7659edc50f220abaeff810415062774adde9917e074ae1034da360cd4144e6f23a850b6485b83332edffc89a36282362d76f067 SHA512 2b9d1d759648d36996dcda05b872a204081247100e4cb1efe674ae3853d137ab4169115f4d0466d5b02316e1a35a302733085257bf96e22b8ba964d868e670dd
 EBUILD llvm-ocaml-13.0.0.ebuild 2596 BLAKE2B 4d22e0d0f89b14f338f0dde0701819d5d94f4c298bf024b06c4d13601f6a61e1ecfd7e7db50c8ab1f7c34e0bb9bbed26c5e61e2ddac80bd6766cf1b163f3626a SHA512 aaba7713d7acaff78ab9949765bd2e095bdf7c32a006653967f9a031113b3c3911b01e55c460f67e38da3574bd2dc8d81026a55cad2aea775363287e01b72684
+EBUILD llvm-ocaml-13.0.1.9999.ebuild 2580 BLAKE2B d044f3d8750bf37a1f9079a0f7659edc50f220abaeff810415062774adde9917e074ae1034da360cd4144e6f23a850b6485b83332edffc89a36282362d76f067 SHA512 2b9d1d759648d36996dcda05b872a204081247100e4cb1efe674ae3853d137ab4169115f4d0466d5b02316e1a35a302733085257bf96e22b8ba964d868e670dd
+EBUILD llvm-ocaml-13.0.1_rc1.ebuild 2580 BLAKE2B d044f3d8750bf37a1f9079a0f7659edc50f220abaeff810415062774adde9917e074ae1034da360cd4144e6f23a850b6485b83332edffc89a36282362d76f067 SHA512 2b9d1d759648d36996dcda05b872a204081247100e4cb1efe674ae3853d137ab4169115f4d0466d5b02316e1a35a302733085257bf96e22b8ba964d868e670dd
 EBUILD llvm-ocaml-14.0.0.9999.ebuild 2580 BLAKE2B d044f3d8750bf37a1f9079a0f7659edc50f220abaeff810415062774adde9917e074ae1034da360cd4144e6f23a850b6485b83332edffc89a36282362d76f067 SHA512 2b9d1d759648d36996dcda05b872a204081247100e4cb1efe674ae3853d137ab4169115f4d0466d5b02316e1a35a302733085257bf96e22b8ba964d868e670dd
 MISC metadata.xml 217 BLAKE2B 23799663344acc2d532fc6fa7dd798813aef7293fcab616d6300b15a6e603b6d17ca63d5153eb8da1b976215d8e3775e8d3a67026bacc9693993d48ec1cb69a9 SHA512 e13d0436d3a3a449723277a37ae4c5a673139b6da818adf7ad7654d94d3948ed8607b1c27e83e963bf450bd2d5a650c985e27ff5a531db9813cb4ab10b985dd6
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-13.0.0.9999.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-13.0.1.9999.ebuild
index d0039fc6ae95..d0039fc6ae95 100644
--- a/dev-ml/llvm-ocaml/llvm-ocaml-13.0.0.9999.ebuild
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-13.0.1.9999.ebuild
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-13.0.1_rc1.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-13.0.1_rc1.ebuild
new file mode 100644
index 000000000000..d0039fc6ae95
--- /dev/null
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-13.0.1_rc1.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cmake llvm llvm.org python-any-r1
+
+DESCRIPTION="OCaml bindings for LLVM"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0/${PV}"
+KEYWORDS=""
+IUSE="debug test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-lang/ocaml-4.00.0:0=
+	dev-ml/ocaml-ctypes:=
+	~sys-devel/llvm-${PV}:=[debug?]
+	!sys-devel/llvm[ocaml(-)]"
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-lang/perl
+	dev-ml/findlib
+	>=dev-util/cmake-3.16
+	test? ( dev-ml/ounit2 )
+	${PYTHON_DEPS}"
+
+LLVM_COMPONENTS=( llvm )
+LLVM_USE_TARGETS=llvm
+llvm.org_set_globals
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+
+		-DBUILD_SHARED_LIBS=OFF
+		-DLLVM_BUILD_LLVM_DYLIB=ON
+		-DLLVM_LINK_LLVM_DYLIB=ON
+		-DLLVM_OCAML_OUT_OF_TREE=ON
+
+		# cheap hack: LLVM combines both anyway, and the only difference
+		# is that the former list is explicitly verified at cmake time
+		-DLLVM_TARGETS_TO_BUILD=""
+		-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
+		-DLLVM_BUILD_TESTS=$(usex test)
+
+		# disable various irrelevant deps and settings
+		-DLLVM_ENABLE_FFI=OFF
+		-DLLVM_ENABLE_TERMINFO=OFF
+		-DHAVE_HISTEDIT_H=NO
+		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
+		-DLLVM_ENABLE_EH=ON
+		-DLLVM_ENABLE_RTTI=ON
+
+		-DLLVM_HOST_TRIPLE="${CHOST}"
+
+		-DPython3_EXECUTABLE="${PYTHON}"
+
+		# disable go bindings
+		-DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND
+
+		# TODO: ocamldoc
+	)
+
+	use test && mycmakeargs+=(
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+	)
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	# also: custom rules for OCaml do not work for CPPFLAGS
+	use debug || local -x CFLAGS="${CFLAGS} -DNDEBUG"
+	cmake_src_configure
+
+	local llvm_libdir=$(llvm-config --libdir)
+	# an ugly hack; TODO: figure out a way to pass -L to ocaml...
+	cd "${BUILD_DIR}/${libdir}" || die
+	ln -s "${llvm_libdir}"/*.so . || die
+
+	if use test; then
+		local llvm_bindir=$(llvm-config --bindir)
+		# Force using system-installed tools.
+		sed -i -e "/llvm_tools_dir/s@\".*\"@\"${llvm_bindir}\"@" \
+			"${BUILD_DIR}"/test/lit.site.cfg.py || die
+	fi
+}
+
+src_compile() {
+	cmake_build ocaml_all
+}
+
+src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-llvm-bindings-ocaml
+}
+
+src_install() {
+	DESTDIR="${D}" \
+	cmake -P "${BUILD_DIR}"/bindings/ocaml/cmake_install.cmake || die
+
+	dodoc bindings/ocaml/README.txt
+}
diff --git a/dev-ml/luv/Manifest b/dev-ml/luv/Manifest
index fa01aa8484d9..acb5799d22fc 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 456 BLAKE2B 5f1ba1fc41094b894a7757f090badc01a6888139d7e75ae9e9e6db258eb80eb85b95f32f369c1e7438c372eb4a72464ed2c3ef4dd7ea1a1d6e6488db75bf55ba SHA512 cb50a025bf99862a3043c1aeac1bb677edd5d364c497ba1f8da5aba8d647604d0c77f842b0928f1f4232779e7a5e7d649302f3e8ea154514a60f2214cd1bccc6
+EBUILD luv-0.5.10.ebuild 468 BLAKE2B eba994630e59c473cd1436242e9d18356589068c78b768b486a2a42747b1befd0e84bd7dfc2d2a37f5f416803bc4a4cfe27cc4f2378cce8880897dde9760a5a7 SHA512 b93a123e1235e6359e0f2017de3da4c3373ee790f7a33916f7a5fe0a3698c67beabf4bbca13dce48e2b0f363720f7a20ea761f97fd3a1b870c3b611b3b2ebacf
 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.ebuild
index a30ace7876a3..0fa9ce2c59a1 100644
--- a/dev-ml/luv/luv-0.5.10.ebuild
+++ b/dev-ml/luv/luv-0.5.10.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://github.com/aantron/luv"
 
 SLOT="0/${PV}"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="+ocamlopt"
 
 RDEPEND="dev-ml/ocaml-ctypes"
diff --git a/dev-ml/lwt/Manifest b/dev-ml/lwt/Manifest
index f6a27702156c..22b10b421ead 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 602 BLAKE2B f0f045be9ad40052b6d71d1ffc9ec6f684bfca2ffed7546f369feeb2b3e808efc7673e993e1a18c2404e342669ccd7b8ee3dcebe306377e770258a5ea78e230f SHA512 c9956ec5bd659f4ea21f8eced90e495c48f158733ab903f16510258ef835052c3703c64cb3257acb8d86f46b5ab867ecfe35deea13af93bcc0a0047d9a94d224
+EBUILD lwt-5.4.2.ebuild 614 BLAKE2B 0a17833e794034a782cab696d6166350894fefde100a3681ee060bdca8da0ca2ebea05ce5d425f3410966d341640dc3de2a7c1bfb22e0b1115c7b8ac4f0555ab SHA512 b5a038fbe2af7a48e3a206a7496537cee3a67470f66bf43e7c1648ae3ee69ef3198251b2913195de3763214fc995c9fd48dc77ffc9724f17ec998f00967f75b2
 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.ebuild
index 966389447c19..ebe53baa350d 100644
--- a/dev-ml/lwt/lwt-5.4.2.ebuild
+++ b/dev-ml/lwt/lwt-5.4.2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://ocsigen.org/lwt"
 
 SLOT="0/${PV}"
 LICENSE="LGPL-2.1-with-linking-exception"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="+ocamlopt"
 
 DEPEND="
diff --git a/dev-ml/ocaml-ctypes/Manifest b/dev-ml/ocaml-ctypes/Manifest
index 706c26501205..32a4c8cae3d4 100644
--- a/dev-ml/ocaml-ctypes/Manifest
+++ b/dev-ml/ocaml-ctypes/Manifest
@@ -1,5 +1,5 @@
 DIST ocaml-ctypes-0.17.1.tar.gz 208101 BLAKE2B b9fe6632058a670c988ba9f1ae81b75aa5373de7231cef04d5e2ede61a44cbaa0324c04197a0a202847599a9bbe7dccd18fd3279f3f351493aaec4959caf3ada SHA512 1e197009f7e6b29b43944f757e987934337ebfa11bb2ff2ca8ba3ebc607e37cf1259d07a90d7faf4b91b49ee20d5c65357ad305f34ada0a8d336a3904233150e
 DIST ocaml-ctypes-0.19.1.tar.gz 206762 BLAKE2B 29b4636e711b9b3ecf3de5d66b796d4d8ddf1109fd7b065666577ce9412e0ef3712f704729dac3b9467ac7ace8f501b90bfc1dc82b86dbe1668e5d13be46741f SHA512 cbf422a2c457b215815a04122d0522ed0f274c5927cecd25951472de6cc6fcd1151b67f95d6bbfeeb3b5f15a9fe9bdedb8861e77bd0de9902418962065e4dfc0
 EBUILD ocaml-ctypes-0.17.1-r1.ebuild 800 BLAKE2B 4df19810dd960c6d51525dde9dc2b374e7ffed06102bdb6622c847b621e699caba711e3b1ca06ea4daeeb87fb7ec05c0c3a41c8b58120ce658633ffeacd8fd09 SHA512 2239d8cef4ce0c401be0422dd8daf73de29322228ad7764c5d0e2d558bdbfc65d77728a97ff2a7987bb502a45ba8774108ec7f18f247d8dd31d22af4068b4786
-EBUILD ocaml-ctypes-0.19.1.ebuild 829 BLAKE2B ee4443cdae4266ec868c203cf98a9361523dbeed0dd6c1c4dc42778b62461d3f725a37209d7dac34c578a646a33e6f8c45c98e1c3b51f87468bb6b5e38d915db SHA512 8ff2dbf4a3cf2ed89b9e236169f6f61ea2b25a52ebeabc4465a2cb3de73379cae000808c29f7b9b357400cc3a2ea57a53a539ca1bf9ba44502deda8121e4861c
+EBUILD ocaml-ctypes-0.19.1.ebuild 841 BLAKE2B a13472220bd45c00cab17a197e067a1b9861147ddb9019ca209f998eff0f77a91bd701bf391aab793c0c350fb6c5e75cda0329a9b8bfdcda30e6d8890d6544c7 SHA512 52f29832455b171d001393a03e211c98f665fb828c43c8922cb0a814620d2d2ab6d9f3e1458e7c940652e59c2c9d4fb598ea27e4db3d971883a67a007eae6db9
 MISC metadata.xml 425 BLAKE2B 3bdffed177ca8fc13a9f6428824f1a97e646449037b4fa5b8053b68edd66c7c8c6bef3c7bb1135e4d76ec42812059408195c3a9cdd45573e571576175e3c9add SHA512 6bd73ddc160b2c5ba8f0630e7aa1045992ff77ece38df06538a2b6b49206c51b14abbcd27367d1b7fe9b192ebf11736e6f0e60dce8df6d475d7a4986edd2547b
diff --git a/dev-ml/ocaml-ctypes/ocaml-ctypes-0.19.1.ebuild b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.19.1.ebuild
index 805f10af8954..80f7940123ae 100644
--- a/dev-ml/ocaml-ctypes/ocaml-ctypes-0.19.1.ebuild
+++ b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.19.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ocamllabs/ocaml-ctypes/archive/${PV}.tar.gz -> ${P}.
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ml/pprint/Manifest b/dev-ml/pprint/Manifest
new file mode 100644
index 000000000000..8ddfd928d96e
--- /dev/null
+++ b/dev-ml/pprint/Manifest
@@ -0,0 +1,3 @@
+DIST pprint-20211129.tar.gz 42778 BLAKE2B b5becf959d750e07ecf12c58cf6f41ff10f841d8034e9f89544b28e81eefdf564e2144a102fa918256736bb092de454eba13dfa38363e1ed230742eb95817e9d SHA512 12133735f558075f1ecdcec16cc11f7237dd82883c542645c479f534acd8ed6935f05a3f9aad8e330c329520852bdff6d420d632636bd9004a4d0aade762cae6
+EBUILD pprint-20211129.ebuild 429 BLAKE2B 24884f38b0a2953a4699a7950098a5145fecf7e6a50e93dbe5465022987dd6c6fabbe1e210031c2555f0f30bea5ba3f5b8a163ee4845bf0a7e6deca8a224e6f8 SHA512 26f7171e5a91d2e08b096c9e21071e3d0872ff9c6d72079f66050ba324ff8f409874c3c423e1aab37265efa6e068866a17cba07c493e0f3620168adb09ec0298
+MISC metadata.xml 616 BLAKE2B 5c4be2630875c8804828574c1fbd5380f1de6bbb2e6fdac9c150f3a7b9528cd0068a3f8c75cd89a8436b6e0b7b6295b3521422f2c12d9f5185c8b4ed9e1c67c4 SHA512 8cd871302adbe1fa2cff2e2f7993d803254c4253c2469fdd5266012d73a3ddb5c65d89fd53e529293841ae851b491302e5eeb04422582ad32f398bcb30816fce
diff --git a/dev-ml/pprint/metadata.xml b/dev-ml/pprint/metadata.xml
new file mode 100644
index 000000000000..a4f6b15e63c7
--- /dev/null
+++ b/dev-ml/pprint/metadata.xml
@@ -0,0 +1,16 @@
+<?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>
+  <longdescription>
+    This library offers a set of combinators for building so-called documents
+    as well as an efficient engine for converting documents to a textual,
+    fixed-width format. The engine takes care of indentation and line breaks,
+    while respecting the constraints imposed by the structure of the document
+    and by the text width.
+  </longdescription>
+</pkgmetadata>
diff --git a/dev-ml/pprint/pprint-20211129.ebuild b/dev-ml/pprint/pprint-20211129.ebuild
new file mode 100644
index 000000000000..97e3528ec93e
--- /dev/null
+++ b/dev-ml/pprint/pprint-20211129.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="A pretty-printing combinator library and rendering engine"
+HOMEPAGE="https://github.com/fpottier/pprint/"
+SRC_URI="https://github.com/fpottier/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2 LGPL-2-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+ocamlopt"
diff --git a/dev-ml/ppx_deriving_yojson/Manifest b/dev-ml/ppx_deriving_yojson/Manifest
new file mode 100644
index 000000000000..19c0fb93b1b6
--- /dev/null
+++ b/dev-ml/ppx_deriving_yojson/Manifest
@@ -0,0 +1,4 @@
+AUX ppx_deriving_yojson-3.6.1-src_test_dune-ounit2.patch 251 BLAKE2B eb17ca6a958d9a5e763812d93d1c51cfeeb256bb7444a0a7f4349f3e0e830d605e024b17b5165dd01fae0ed78ae225783a936f91375120c55dee6092c187f823 SHA512 d1a5233ee7dde5367644277a9995e8a2127a8b672ffb384225dca7c0d708dd53e39596a0736213435a7c5e25d7589d367542e841c446805df9fdf4a0d2d21190
+DIST ppx_deriving_yojson-3.6.1.tar.gz 19477 BLAKE2B f7b4e34e1c5ca77af6dbe6f4639c00a3b47076e2cf1f79b157a4c8f9aef34ec0e95e2c6c805fe9d0f9fa0ec72ea0672696b7e7a21d0a7d93764fad2e8d89a15a SHA512 b1bf04f77e1c1a887352b21cfd43a67d37de9f61a70f89d06828c7d9611027711a600b22e4bbc95ab128511a48fce3ae1a1c7a655f25c4bb2b6944444cea4989
+EBUILD ppx_deriving_yojson-3.6.1.ebuild 635 BLAKE2B 42c5a5ad8d4f018780173b14c1c62d4340ba3cfbeffb342a928f908a2279c716c07850e026071143eac849b8187fd987cd781b202e7fb9da266cbd4d7d9b360d SHA512 1f6b8857d2cee27a702066ac731041134bbeac131bc47dced25e376b48b70df8ee9c20f51c86d654bb1a4b0e380824fd6609f0199695da0478ba7b06d9fd992c
+MISC metadata.xml 417 BLAKE2B 13cc573ade509da2ca964fc97824fe0ab1d8d5bf44e0192eb379c3354b3736bf2dbb7d888a0053d5a8fc3c244516565d1e517ce831e50f7c99c4a7648374776e SHA512 4c2c7a85baf1e7787f7284061aa0ddb8e9307a39543315345f72b44e889c44b713d4b3400d884a678784df174384a2cb4cf8b2e461f6db7c19d5264749fd9600
diff --git a/dev-ml/ppx_deriving_yojson/files/ppx_deriving_yojson-3.6.1-src_test_dune-ounit2.patch b/dev-ml/ppx_deriving_yojson/files/ppx_deriving_yojson-3.6.1-src_test_dune-ounit2.patch
new file mode 100644
index 000000000000..fe5bcab48afc
--- /dev/null
+++ b/dev-ml/ppx_deriving_yojson/files/ppx_deriving_yojson-3.6.1-src_test_dune-ounit2.patch
@@ -0,0 +1,10 @@
+--- a/src_test/dune
++++ b/src_test/dune
+@@ -1,6 +1,6 @@
+ (executable
+  (name test_ppx_yojson)
+- (libraries oUnit result)
++ (libraries ounit2 result)
+  (preprocess (pps ppx_deriving.show ppx_deriving_yojson))
+  (flags (:standard -w -9-39-27-34-37)))
+ 
diff --git a/dev-ml/ppx_deriving_yojson/metadata.xml b/dev-ml/ppx_deriving_yojson/metadata.xml
new file mode 100644
index 000000000000..3db44a512450
--- /dev/null
+++ b/dev-ml/ppx_deriving_yojson/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-ppx/ppx_deriving_yojson/issues</bugs-to>
+    <remote-id type="github">ocaml-ppx/ppx_deriving_yojson</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ml/ppx_deriving_yojson/ppx_deriving_yojson-3.6.1.ebuild b/dev-ml/ppx_deriving_yojson/ppx_deriving_yojson-3.6.1.ebuild
new file mode 100644
index 000000000000..33642a0ef4b8
--- /dev/null
+++ b/dev-ml/ppx_deriving_yojson/ppx_deriving_yojson-3.6.1.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="JSON codec generator for OCaml"
+HOMEPAGE="https://github.com/ocaml-ppx/ppx_deriving_yojson/"
+SRC_URI="https://github.com/ocaml-ppx/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	<dev-ml/yojson-2.0.0:=
+	>=dev-ml/ppxlib-0.20.0:=
+	dev-ml/ppx_deriving:=
+	dev-ml/result:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="test? ( dev-ml/ounit2 )"
+
+PATCHES=( "${FILESDIR}"/${PN}-${PV}-src_test_dune-ounit2.patch )
diff --git a/dev-ml/ppx_sexp_conv/Manifest b/dev-ml/ppx_sexp_conv/Manifest
index 05796d71c89a..35079a7c80dd 100644
--- a/dev-ml/ppx_sexp_conv/Manifest
+++ b/dev-ml/ppx_sexp_conv/Manifest
@@ -4,5 +4,5 @@ DIST ppx_sexp_conv-0.14.2.tar.gz 49876 BLAKE2B 32109eb6300894156f91721a1c74e9480
 DIST ppx_sexp_conv-0.14.3.tar.gz 49886 BLAKE2B 9fda18267995cdd8efb9dafb069df6a51106a800b263f4c94129957a3f23d2bee72f39382623a320cb09ea13c255000ecf9670c19ccf49d55627c02bb0912224 SHA512 7de81d64e7eeb4d6097134606411830dd066f94222ed320a9c32752116961806ccf807f802e07c522c32aa6f7c20bb901804612a0ffc1b14807903c92acb2f44
 EBUILD ppx_sexp_conv-0.14.1.ebuild 722 BLAKE2B 56e8596dd6063a6ff69d82c8ca862357d25034add0beb42c4d5e044b0cc95de73c5cc93ceb4c8999df1a1eb3e0f8c11f434f4d1f1cbce157a476fc4c5491bc7d SHA512 569f6c2990f5197e1298ec369aab259143be88b267a0136b3702497fb36d00bebe761f0c443a528981dfd5b2239332d066d86945c1e29307b65be83466e9087b
 EBUILD ppx_sexp_conv-0.14.2-r1.ebuild 705 BLAKE2B 882974b6e2bdf2d7cb30f9d2a4bf4caa327a6ee160b8a84eccdf504e0c5e25117158853a0a5d0f10369636d34b7688f9b9ec6b20abaa2090d5718e66a54f6866 SHA512 9b32b1725bc3eefc70ca169cc46b6d3b9acf1365370b5a75c287e7c83b9b81acc9a886465d2483c595a28fb401688d93911f07a1d4931e6c17619c23cb903023
-EBUILD ppx_sexp_conv-0.14.3.ebuild 682 BLAKE2B 5c3a391bcc2cd70dfc0e3825d0fa5dd4cdf858b28e878aa5f3f073c14a9e4da82bbf2aea91daf920987af412bab23dfd5a384a33ac4bd865efe890d8d492458a SHA512 ddf515ab60d068a6b5f19e4aef2e9f718b154ceef4fded78da8090c978398caa6eeeca8f52573f6b79afef0ab0bcac9a93a4600dbd48b5707a066677ffb9aa79
+EBUILD ppx_sexp_conv-0.14.3.ebuild 680 BLAKE2B 3b95eac713c78f3a152c63d1ff17644d539f62a1e56b87c127d2f1a78e7dc2def2db9df4b97f2eaf376f0bf72c381f1e4882d98762f60ebffa0c53b5364c54a7 SHA512 51289d721f29616b45d52febc0f776cbfdb959bb7944ac577c6473e43671c462502dc0fb08f35b01fb73cb85cb230859654889afb5a7ce2f09771d2af50c546d
 MISC metadata.xml 427 BLAKE2B 40cf563b5bf060e3d241038655ac6f7fa0d96e0d3aafd8bbe27cf77e5a997129dcecfb9cc907734a5fdadd720f848807aa60ae4bdf6a924cbce3b7277d605882 SHA512 e29de52e463fa9c21b92a52a6454f2cadc9bd6677d549c86ee43383a88af9ee43134ecca2379088a40f0e89aa7d98b552480e8dc2cd8042f9a8e5453e8ab1d6d
diff --git a/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.14.3.ebuild b/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.14.3.ebuild
index 070c960efe14..b576f6a12b37 100644
--- a/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.14.3.ebuild
+++ b/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.14.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/ppx_sexp_conv/archive/v${PV}.tar.gz -> ${
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt"
 
 # Upper bound on ppxlib for bug #769536
diff --git a/dev-ml/ppx_tools_versioned/Manifest b/dev-ml/ppx_tools_versioned/Manifest
deleted file mode 100644
index ea3f8042a9c8..000000000000
--- a/dev-ml/ppx_tools_versioned/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ppx_tools_versioned-5.4.0.tar.gz 91817 BLAKE2B 0de64bbc0e7626306389eb350119262e1b1dbf1c643a62d4b2363f06203567e719962fc64727de65aa204a488381f8e48bbbe1243e9908823cb242222162bc88 SHA512 7f0421dbb42b43acc4f7892ac1c4c0ac13bdc188400d308688c4548b228aaf8bd80a4e2294672b50c78ac61e3c8df148c98d16b59f48292f02be40e7fd9640a9
-EBUILD ppx_tools_versioned-5.4.0.ebuild 636 BLAKE2B d26e979787d28b2bbf049ef6957d75a9539951eec305992d1478df8b168ab147936890f2c363a73cfb1cff8cb05833eeb693692924e9792f467e87c16019cf59 SHA512 2ed3d1a14db7ae726f66e9367bc092a7ea319c50aceffe901d13f4569869a878c850eff18a58e378fe573205c60f1ffe26dfcd0e71330cb39f2ef9fa2bf2ccc7
-MISC metadata.xml 260 BLAKE2B e891c17532222e53d8035efe74a919d7d738f95776d6e25eeaed76f1cf9ac21ce45e17b3e12b18edfaf695ce9e40f96b62adfe4636f816efffdc4b5621564474 SHA512 3dde8d53c20b9f430c2d07a8baef4bc67c8a132ff0b05db8c065e3c3315634a323abb8f4e222e0f9797b826b693d2eb9bbc7eccfbed257e9297700a02b9033a3
diff --git a/dev-ml/ppx_tools_versioned/metadata.xml b/dev-ml/ppx_tools_versioned/metadata.xml
deleted file mode 100644
index 4644bdd631ff..000000000000
--- a/dev-ml/ppx_tools_versioned/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">let-def/ppx_tools_versioned</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ml/ppx_tools_versioned/ppx_tools_versioned-5.4.0.ebuild b/dev-ml/ppx_tools_versioned/ppx_tools_versioned-5.4.0.ebuild
deleted file mode 100644
index 3fc8939ea917..000000000000
--- a/dev-ml/ppx_tools_versioned/ppx_tools_versioned-5.4.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit dune
-
-MY_PV=${PV/_/}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Tools for authors of ppx rewriters"
-HOMEPAGE="https://github.com/let-def/ppx_tools_versioned"
-SRC_URI="https://github.com/let-def/ppx_tools_versioned/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-IUSE="+ocamlopt"
-
-# https://github.com/ocaml-ppx/ppx_tools_versioned/issues/28#issuecomment-694146771
-DEPEND="
-	<dev-ml/ocaml-migrate-parsetree-2.0.0:=
-"
-RDEPEND="${DEPEND}"
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-ml/ppx_typerep_conv/Manifest b/dev-ml/ppx_typerep_conv/Manifest
index 7ec5e4957444..aaac9e23c533 100644
--- a/dev-ml/ppx_typerep_conv/Manifest
+++ b/dev-ml/ppx_typerep_conv/Manifest
@@ -1,5 +1,5 @@
 DIST ppx_typerep_conv-0.14.1.tar.gz 9453 BLAKE2B 4acafdd51df0659746697283aa3240f1b1403e4e9f9b5fafa6c4b09f4c76f6ac645e2ccab53cba7371b5b004edba38d24198334d10b295d90c8ba5814a602a23 SHA512 6e32f6c2cf6c370fcb8d3b341dbd797c3b7c2557c8604253d744b266c9a3f4984e62ffe6ec5717044378f81e5b78e7f206a7f0f4b43c0dda97a4e7ece745d26d
 DIST ppx_typerep_conv-0.14.2.tar.gz 9474 BLAKE2B 7a7ff6669d9af2ced905e5b104058d26ffe06e3784af366a1a4ce753337eeb87c9bfe02d1a6fddaac6c387105d2583194cbd06b915eb35d16e06b1d4ab977e2f SHA512 9372f13cb3f62b3732af4f8ddc00314dd71869bab5599ae0a112d32669de300346781b7fcd2bd649ccedfde54fcd86fb6186812eeb528858048bcd9d5ad443dd
 EBUILD ppx_typerep_conv-0.14.1-r1.ebuild 653 BLAKE2B f47242e7d5b9f18641a6a8748ec7ec12e0f716260ec4f61f7ffd841863194f554f796923b6a51e5dce674247487a764aef9f782c8132cc54c93db409d0786712 SHA512 46d2b4010e1d346c6450ee79ff49e5c9898d811909637a8b12666603622267c6b34719410216caa25356ec460377bc9547b762da60391c135b5e95936a44b9b1
-EBUILD ppx_typerep_conv-0.14.2.ebuild 630 BLAKE2B 2e8c6a8e072dddf40379f2a19be50c31b46a382326168cc654dc29842010a03ef355032ecf49a646ac6e1af3fa2916d9f88c0318c6d55709689c427a3d03c053 SHA512 75784c9362cfcf25f524a3104c43bad36e0be44c1b6aa79728b31899aed9ba2816bfeedeb20022fe35deb877c34bd781a376c3e9d556a286395805f6ee9d9075
+EBUILD ppx_typerep_conv-0.14.2.ebuild 628 BLAKE2B e91265a27173cd76ddc42412aa0224b1f537859b8eaa3a9298d338647627dba620ebb8970cfbd5db3e513dea5c36f5adcd0f9877cca5b770ca2459220146d48a SHA512 2919add98f71cc6867641522778e3f241fd4140adc53d8f369ce46c882ffee5a29044b745c1bad18d764dabeb0dc725d12b9e6991ae33ef60a837fe1607c2e10
 MISC metadata.xml 430 BLAKE2B 1f8c9b9c75af8dde9e6180ce99665d6504abf4d86eda54e7104ba92c69bfd32d95ba21aa8292aa038d6827c5f73fc4e2cd6b3294ba6984b5931f5e1d29e3d2c7 SHA512 0f0f1ae7a2cecd2eb6544a8219bfd19d8e5ac638d68753ab64b34f8759e1a71d51ee9a74dc7e28b37d8ff749a131c5f701aa7ec18644aa65d99df5a3cac73d3f
diff --git a/dev-ml/ppx_typerep_conv/ppx_typerep_conv-0.14.2.ebuild b/dev-ml/ppx_typerep_conv/ppx_typerep_conv-0.14.2.ebuild
index defa761b96e6..5f37cd6d75cb 100644
--- a/dev-ml/ppx_typerep_conv/ppx_typerep_conv-0.14.2.ebuild
+++ b/dev-ml/ppx_typerep_conv/ppx_typerep_conv-0.14.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt"
 
 DEPEND="
diff --git a/dev-ml/sedlex/Manifest b/dev-ml/sedlex/Manifest
new file mode 100644
index 000000000000..5c9bf423eadd
--- /dev/null
+++ b/dev-ml/sedlex/Manifest
@@ -0,0 +1,6 @@
+DIST sedlex-2.3-DerivedCoreProperties.txt 993782 BLAKE2B 185f76580a496781524e19124cc4d6d2f0eec6964d4dcf17c05e4a1f4a6031a821740a34e373c3be82c5f25acdb93a77f9591eafe37d026d40e027054e717c0f SHA512 e6b54579369edf361ee961171d9b4896449e16327d77749201e07a7022a4d9bd9e50ba25cc7397fb4e40c852347b1ef8599ed45bd5bb96a1b8dc5cd04ada5fda
+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
+MISC metadata.xml 703 BLAKE2B 5eab9e0d06727add48e1a431614a2256086516cae0faf15576aefe95e3e0bb47b6822cad9827e9f9417956daa6380c576255dd5b50d7e0f451357c2c9dd01721 SHA512 7d07803ee15260bc820bee77ae89def0f3273d3074cd57e19bca9ed8b7871c1087d1e2e68df73633959829c67ea6c37457d0bcf1728c975573648159485d5e5a
diff --git a/dev-ml/sedlex/metadata.xml b/dev-ml/sedlex/metadata.xml
new file mode 100644
index 000000000000..9ef5fced7dd8
--- /dev/null
+++ b/dev-ml/sedlex/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>
+    sedlex is a lexer generator for OCaml. It is similar to ocamllex, but
+    supports Unicode. Unlike ocamllex, sedlex allows lexer specifications
+    within regular OCaml source files. Lexing specific constructs are provided
+    via a ppx syntax extension.
+  </longdescription>
+  <upstream>
+    <bugs-to>https://github.com/ocaml-community/sedlex/issues/</bugs-to>
+    <remote-id type="github">ocaml-community/sedlex</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ml/sedlex/sedlex-2.3.ebuild b/dev-ml/sedlex/sedlex-2.3.ebuild
new file mode 100644
index 000000000000..ebd20d7914db
--- /dev/null
+++ b/dev-ml/sedlex/sedlex-2.3.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="An OCaml lexer generator for Unicode"
+HOMEPAGE="https://github.com/ocaml-community/sedlex"
+SRC_URI="https://github.com/ocaml-community/${PN}/archive/v${PV}.tar.gz
+			-> ${P}.tar.gz"
+
+FILES=( DerivedCoreProperties extracted/DerivedGeneralCategory PropList )
+for file in ${FILES[@]} ; do
+	SRC_URI+=" https://www.unicode.org/Public/12.1.0/ucd/${file}.txt
+				-> ${P}-${file##*/}.txt"
+done
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+ocamlopt"
+
+DEPEND="
+	dev-ml/gen:=
+	dev-ml/ppxlib:=
+	dev-ml/uchar:=
+"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	unpack "${P}.tar.gz"
+
+	local file
+	for file in ${FILES[@]} ; do
+		ebegin "Copying ${file}"
+		cp "${DISTDIR}/${P}-${file##*/}.txt"  \
+		   "${S}/src/generator/data/${file##*/}.txt"
+		eend $? || die
+	done
+}
+
+src_prepare() {
+	default
+
+	# Remove dune file with rules to download additional txt files
+	rm "${S}/src/generator/data/dune" || die
+}