gentoo resync : 29.01.2021

159 files changed, 1729 insertions, 183 deletions

diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 10f16f3fc15f..16b087e07dd5 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/async/Manifest b/dev-ml/async/Manifest
index d3f06e0bde62..46005c06eada 100644
--- a/dev-ml/async/Manifest
+++ b/dev-ml/async/Manifest
@@ -1,3 +1,5 @@
+DIST async-0.14.0.tar.gz 65025 BLAKE2B 39e2bef8df12a9733b9ff11ce1bba22b095f79532ff27999e617db5c145e57ab2e1f7f9435a5952312a84dd75b24d76fd4279c524be933e8ded5be7b00d6729a SHA512 3e57ea742ab28d008e1c0b39a6fc6d0ac3ca78b644f678f79b9ceb8d9acb23fcd45fed52f744906ab6d9b87955a27a8e4512043db45a7c836323d96433124b5c
 DIST async-0.9.0.tar.gz 17856 BLAKE2B b7206641936aa430ddc35091b89c465fe0abd98883c9206f3a978372dc016a35f41a228adf906def56f894eafabdb223463a77fc690e373bbd5284c590871924 SHA512 93c0fa4d6e7d1c4dff1f460db8ec95b3eea1d7c19fda117bb9efc8711f4908d2922467c33f66659395169ead9b37931da16a85a031d6073fc9296c218f2c55bb
+EBUILD async-0.14.0.ebuild 637 BLAKE2B 5b28fcc9099e9da787e8c6c739aa0c422842f28c83222853948453f4baf661a99b38cd0e994c852d260a546572cfbd6431721b363f46e97e2f74a31d86b762ef SHA512 eb985440aa530ce493edd474486713e331017ab88642fe05795b917f7acbdb843534472e2a5488c793b922cbc858b45edfcdfe0d111b8fbe29fb4ba3df13cac9
 EBUILD async-0.9.0.ebuild 594 BLAKE2B a01140a79815f8b0df4503144d34df5e575f3339a984498dc7c68f72925d7c695af573bb6ed2a260985c520408c0d72f085e3c426e2630b132c4434494313273 SHA512 dc3565459af17982efc881302b328897f98af5933f1e5521cf41fbc45b230bff82cac8c114a8e56686c9cc9dd4178e2e7bbc48c6381cb2d89439360ebc4e0ad7
 MISC metadata.xml 248 BLAKE2B 995325879c39dbf5b15f4d575c77e00e0ede8174aaf3c4e50e85e46d87c9eca52ba19c98217e4eadbc21901ba4f47f16556b81498166b4f935c8fde80a5200e5 SHA512 0662b3545c569e4f00196f8bde2ea876d3b0ea1366c37b6bb5963a4af1116e7c92ad326d8c9b0f51a7d5108fa25a5a046da988ad4c9f94c4cc882522f0fd325e
diff --git a/dev-ml/async/async-0.14.0.ebuild b/dev-ml/async/async-0.14.0.ebuild
new file mode 100644
index 000000000000..5f2a17b7ce82
--- /dev/null
+++ b/dev-ml/async/async-0.14.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Jane Street Capital's asynchronous execution library"
+HOMEPAGE="https://github.com/janestreet/async"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="+ocamlopt"
+
+# Need qtest_lib, netkit_sockets
+# Unpackaged test deps
+RESTRICT="test"
+
+RDEPEND="
+	dev-ml/async_extra:=
+	dev-ml/async_kernel:=
+	dev-ml/async_unix:=
+	dev-ml/core:=
+	dev-ml/core_kernel:=
+	dev-ml/ppx_jane:=
+	dev-ml/textutils:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ml/async_extra/Manifest b/dev-ml/async_extra/Manifest
index 744ae185a0a5..de25c3d3ae69 100644
--- a/dev-ml/async_extra/Manifest
+++ b/dev-ml/async_extra/Manifest
@@ -1,3 +1,5 @@
+DIST async_extra-0.14.0.tar.gz 17746 BLAKE2B 46367dfb909ea02100be7718edbee8deac1c9019232723af6d80cf2567b2d17b316ae2355ffd9c9cd7897c3409c50cd4a7105a44a153eac02fa6326c195f237d SHA512 c646d9f69dac06aba973a837e295502b45bcda3ffbf3971f283035f2f60b5f92777fa105a08827971e8eae563b12b019341b29f30703b6490fec38d276a74199
 DIST async_extra-0.9.0.tar.gz 105722 BLAKE2B 5c371478b1507ddd63bbafb26858752f483a970cbdad174d62032a102fc8ded517ed87581a81b265cce82c9c27a85e09ca6df3209dbe86a35e71cbf35e027d39 SHA512 6f0d69a389e66e47cd0a3cf288c2b0242299e5c3befa77f7a656bc30dfb63f78e5287c4de5e80473c1ce2ee5fed038bf0b4d2b94eb73f045b20f40b14868fa1a
+EBUILD async_extra-0.14.0.ebuild 548 BLAKE2B 9f0ea528fd6867159ea0a847addbfb1ef1b94bcf86777991f543c321b6f4b20fd7cc925f473d8b5e93817ea7f255c27d9843c5a9f3fa542012568fd44158539e SHA512 696e32f40df338facb6b490c0f0cc6ba9c43865350a07e1aa1d43372ee0a210c84658e8057dc840777e6a203879163300c6208edb32f4f67cf1aa795f1f515ac
 EBUILD async_extra-0.9.0.ebuild 802 BLAKE2B 5c2f86ee837874fb71acb782b30edf55567bb56ef8168a2a76e2d87d1015c5e873260db071b60a4bee5262b04a3a761bb83e09a9a94ad206db3ebb78884ad171 SHA512 b2df0ced7bd04f55835703ed1e3b57c8b6163677eb2b5670213f5e321434d5d78c463798be41b99be9eb3fc80500bdc149398c2a4f518177a4f1194af3a9d571
 MISC metadata.xml 254 BLAKE2B 00cb785a7008721fd62e78c2015eefb9db7e30475c8d53d7d95b4441d0a18125d0f1c5eefe5de2951bbaec1e740291f06f2c09a6f53ca39e97c5c25f3730fb74 SHA512 7623f79b7fdbdf02e3e07fa4e9f8221d57de65c6ac630876019a18a8003a2f25d6d15a3bc6f36607068ca702debfc7a12cabc41ead3e98f4055afbc39b8afa4a
diff --git a/dev-ml/async_extra/async_extra-0.14.0.ebuild b/dev-ml/async_extra/async_extra-0.14.0.ebuild
new file mode 100644
index 000000000000..c053cf2c1f9f
--- /dev/null
+++ b/dev-ml/async_extra/async_extra-0.14.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Jane Street Capital's asynchronous execution library (extra)"
+HOMEPAGE="https://github.com/janestreet/async_extra"
+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-ml/async_kernel:=
+	dev-ml/async_rpc_kernel:=
+	dev-ml/async_unix:=
+	dev-ml/core_kernel:=
+	dev-ml/ppx_jane:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ml/async_kernel/Manifest b/dev-ml/async_kernel/Manifest
index aa9079643bb7..432e732b03fc 100644
--- a/dev-ml/async_kernel/Manifest
+++ b/dev-ml/async_kernel/Manifest
@@ -1,3 +1,5 @@
+DIST async_kernel-0.14.0.tar.gz 138191 BLAKE2B 0f8096eb1cfabcdb4b3148f8d2cb3d5f8c858da74986ac107e7592195dab6e6563c0adb8f39f22a8d3b279b994c937e345b6c56d03a5767672913c7316ecd1fb SHA512 9324f17527311e3c112203b7caa2b0b7dfea15bdb30d02d7218c7b8d8c930d4893d83043016ad064265cedc191985400dbaf2d0af448f840c98ef98326aac8ff
 DIST async_kernel-0.9.0.tar.gz 132837 BLAKE2B cbd1748459bca8691a6051b54beb177858707e166350c9f431d48cab1379adc557a4240f66efa0557cfef9c9ffa00fb458cb8d83a5466651ac40d01228524ed7 SHA512 a2aaa28cce736509bd77041694cbce482f698274144acebabd5db9f3186e0c0bab32196634f5fb19e3921141e0a2b849df8bc0d67e843292cbe3fd301848e519
+EBUILD async_kernel-0.14.0.ebuild 477 BLAKE2B 06ffcd7f8522614e4a73fc2117786da28f8894b5e05cf43aab8d8d4189860cb293a509126221c0b6f62966e0958e2295ed05ad30505eeacac34898e39bbf4ea6 SHA512 13748c7440481fbc32e92352967fb50c49e9443f2aa1f4d5be3952a8eecf7a2d04370b232daf750c4b004eeb4394cd00773cf952fe86a387e6c8273d98d794d9
 EBUILD async_kernel-0.9.0.ebuild 738 BLAKE2B 977aa63b6d9126e6cedd2089749a3f45d5289207ba326e706f39ac5644afc9e43e9a7886b5ee54d78648fe1775b7c86b88095b0714065c635ba2080197f4ceb7 SHA512 2fd2cc015d0814feefb2303bc3a6683f686a7ad76a9a5697bd6cd60f236520e06b544a86435d2c1aacd5e98bfdcd3b212eebd2bbb2227948a965c383eff5229d
 MISC metadata.xml 255 BLAKE2B a46c62417f85a5b501427db310d8b72515be3555082ca620c9ad5c3779138e4bb791787dbcb5d0a24aa839b5d41fa8b227a31f99fad760c9902d0dfd3ad93162 SHA512 be2ed408adedd7f6505032ed11073d13b07e404d19c44c1acb10da5d3fab716c2245d7a55ab7a1461ecdf7bc22bb7de96cd32ae9508ddced925c76406c6db6ef
diff --git a/dev-ml/async_kernel/async_kernel-0.14.0.ebuild b/dev-ml/async_kernel/async_kernel-0.14.0.ebuild
new file mode 100644
index 000000000000..bf67c37dab1b
--- /dev/null
+++ b/dev-ml/async_kernel/async_kernel-0.14.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="Jane Street Capital's asynchronous execution library (core)"
+HOMEPAGE="https://github.com/janestreet/async_kernel"
+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-ml/core_kernel:=
+	dev-ml/ppx_jane:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ml/async_rpc_kernel/Manifest b/dev-ml/async_rpc_kernel/Manifest
index 74ef26fd3725..60e1a040408d 100644
--- a/dev-ml/async_rpc_kernel/Manifest
+++ b/dev-ml/async_rpc_kernel/Manifest
@@ -1,3 +1,5 @@
+DIST async_rpc_kernel-0.14.0.tar.gz 61643 BLAKE2B d80159c598470718196fe33893a3346d4ac3f7a781ef453e9eaa90cbeede83c97b9333625cd3d0552ea5b14ae039f98c204c4f658dd7810ea4ae449b967f755f SHA512 991b7cdb71b0363355a93fca009cd5d982de4d749c356b208987d1ae9c9b48fce5c59c4b4697042034135ad4c1a9467eb1a5d1f43237c5b081ab3aba2d72bb10
 DIST async_rpc_kernel-0.9.0.tar.gz 57411 BLAKE2B 43d07ed0d8e529daf63bf7ee9ff109d765bba0aa2c849e72eb2b60e27d1d1f465fe41ee39b8bc883c6eb63c83c43dde8abc7d7734737bc9819a870d91de18e9e SHA512 4c93165f78a92ae4904503b18072a775ea3ab0f49e460404741bd4daf3f6c483da3dfa987f7013a41dce348a8e95664b4784d175256ccd52a2d8df8e89d3c136
+EBUILD async_rpc_kernel-0.14.0-r1.ebuild 525 BLAKE2B 20730fb7fb510515328b2654de55bf66cbc707e156c4eba7dd18ef11d02f11ae7b06d8e378e06320b2c87b6bdf13a7752b073de3a7f4f68bf20dac6960f6ec61 SHA512 192f3d74c4cf1ef7b0df514b02f4ab96a8c088163f12e9cbe89020506d5336f840488344c03d635dc55759edc056cb53831d0c626f42c77e36b4bd229ef75801
 EBUILD async_rpc_kernel-0.9.0.ebuild 745 BLAKE2B 9a4d46febcd649a65b52423f83ce8263992b39156e2e6f67c70ee1ae02ddc39d245d6f9f322cbb36c35b18bbd8854270f68b0097025e14a60681d2fb5514850d SHA512 57d180c957953c8228d02d983f26f07e04fa39a0265195f794c1e81bcd664db3260f3ddfd453b532853372f758ef6ba9d749e69c7df59196145f642f58bda18e
 MISC metadata.xml 327 BLAKE2B cdf67e00aaaf1c924370f8ae3a5805c4bdd6ea9160a0fad911aa3ae5ff1595fe7e7b3e7613842522ab1879898d9f4f1ecc13186e34d61702dec5f2324c7944f5 SHA512 2af8da212a71d7e6bad9f4949373813b1fa368973749907f41a29a9226a9167fea3926b1981c631e16e0e5ab260a946bcf54eb4c61a93387f41df712619bb9a7
diff --git a/dev-ml/async_rpc_kernel/async_rpc_kernel-0.14.0-r1.ebuild b/dev-ml/async_rpc_kernel/async_rpc_kernel-0.14.0-r1.ebuild
new file mode 100644
index 000000000000..bbaa645aa090
--- /dev/null
+++ b/dev-ml/async_rpc_kernel/async_rpc_kernel-0.14.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="Platform-independent core of Async RPC library"
+HOMEPAGE="https://github.com/janestreet/async_rpc_kernel"
+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-ml/async_kernel:=
+	dev-ml/core_kernel:=
+	dev-ml/ppx_jane:=
+	dev-ml/protocol_version_header:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ml/async_ssl/Manifest b/dev-ml/async_ssl/Manifest
index 46fd9ca45879..7f30d4d5ca67 100644
--- a/dev-ml/async_ssl/Manifest
+++ b/dev-ml/async_ssl/Manifest
@@ -1,5 +1,7 @@
+DIST async_ssl-0.14.0.tar.gz 40338 BLAKE2B eb673f30d7374b539b37c84ba88e0daf8eeeacc93b278a44177a433cb8b336a843cc05e6033ec8ee831ec1c28fc243c8019a82bd495e96a1e54dfd47a3d10b13 SHA512 89397d0066444cbfdd3d4d27942ff04b3adbe2a9cf11427795fcf59127908c94f88c1575f395aa74eee49abb5be2e86940a88945dda6435fb81165bd58b789a7
 DIST async_ssl-0.9.0.tar.gz 28227 BLAKE2B e916e196964d085312836d773e290ac52c950c5ceb084347557d72776c7b6b9548ad2bd01c5fc6fa701d18c55fff62e48af5459bf5897478252f8d27dd6687fc SHA512 bb023e0c60f9f04368f2e2a4aea80700a60853a03fe1550fe48a9defe42ec66736a6cc0cf40c6a472cd3f8b5b30d79711e4fd714b53ebd4ba7f3f3c22eb7a15e
 DIST async_ssl-0.9.1.tar.gz 28162 BLAKE2B 74987fcad26dcb641687e044ef76531cfa88e2bb62524d0eddf5ce3fe4f4dc9c7b07f13de63e9cdddd4a5db2e7e20f2a7f3a8543b17678a342e2890ed816189a SHA512 5e20d3c2a46e81d725076a80347047de90d00d6a0956457656ffd629d80b7a65958fd8a831d407dd11e3a3583662ed1e04242e71580ab7e982dc579ee69bface
+EBUILD async_ssl-0.14.0.ebuild 588 BLAKE2B 596a3fa7f433eb9756e6020cbf1c595481fbb13d25a1288a2a280a4b9516d0d4fd583538593b81b66f45d167cb60836a89c92ce5d09e9767926c32e2dc5a1de1 SHA512 433c90470106b95671aef48e056b0a1f26085b1e813199010965f22ff5db36faffa44cc537be4a91751961381da6d15aec1efc7766393a1e987dbdce789d6b83
 EBUILD async_ssl-0.9.0.ebuild 822 BLAKE2B 692e29784084f17383eb728ea5d3eab3bacaf353397bfaacdddf5115d70b1ef68ef2678d905f0b6ea18fd5d4881b36033a6f2230f654d4dbf044d24259743981 SHA512 1b3f7d070cc0d6b09c139e4c467f6dc5c748c5ccc1b756c9590fc7ffe3237e4a35623f462e2767178dabf504471d1511e71e44478927a58e9c663a6e69b45459
 EBUILD async_ssl-0.9.1.ebuild 819 BLAKE2B be275f56a8a2308d3495668bc661f27bc3aa90c1fddb48559bc71594b946a133c2810112085e87d7187e99228bb3cdc711dc41b99f9fb760a36e5270da1952ed SHA512 0f3d4d34c7d954fcae46cc88d9e24f0b7d0cc2cec58196ff723f486b83956e24e4240035f90aab320dc2288c4f464e0fd32ea9f845634b1c71d26abebec40348
 MISC metadata.xml 252 BLAKE2B 0fa209c4f7b152efc47b79b6abd97b10c15961029372a4c09969985ff4de68c9da39a8a30c36372794f3c7527b14b13e027500c52086a97fe91aedc7f62f2f24 SHA512 ed6a0be88f18026f93ee4a95ad38afa748d23203941229d7a8eb7bd6cdf77cb803bf3055567729503560f80fbb5dfd4d02294d35e483d77e192325fcd5857b4d
diff --git a/dev-ml/async_ssl/async_ssl-0.14.0.ebuild b/dev-ml/async_ssl/async_ssl-0.14.0.ebuild
new file mode 100644
index 000000000000..ab39d4d77063
--- /dev/null
+++ b/dev-ml/async_ssl/async_ssl-0.14.0.ebuild
@@ -0,0 +1,28 @@
+# 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_unix/Manifest b/dev-ml/async_unix/Manifest
index d98a95cd2d7f..c8753a7d85ed 100644
--- a/dev-ml/async_unix/Manifest
+++ b/dev-ml/async_unix/Manifest
@@ -1,3 +1,5 @@
+DIST async_unix-0.14.0.tar.gz 171624 BLAKE2B 4c55b6c8ba8cd59ede4b214ec84d8689700e46b918a96e145f94ebd011c32de6c2ab40c35a4c821ac58872259740b752e045eb2ac7954ecb0b988ceaf1b75ff2 SHA512 d90713d1d35445a648392e9104eedd25d4c7e6a10a46d0442539c1521349dcbee4118e852cc8335c8c03ba4d1050f199eb91a6e3c3c827dca8eee59501f379be
 DIST async_unix-0.9.0.tar.gz 156717 BLAKE2B cce40cb1074ae7a6f38fa8df80dc4787be24a500ed9576bd737fc5db8d1d3f31ccc14cad9b134bccc8257004e421201c410b7c3b19373a282b50817b3ccebd7c SHA512 cd3fb43ffcde8fe01386a0460beb52e2530786dc0abce318c5241243e123ebd57fbf4cff8c91300483f33ae5dc1c0cc591992dc55286dc6ec550be62afb33b42
+EBUILD async_unix-0.14.0.ebuild 513 BLAKE2B 38715f67905da03abedc707e8becfdc47d40e37f4d9c2b707eadf36da93684881657808182860e89c3876dce5035983a4a646a5be704631bce00c314d3aa237e SHA512 ce17041b2c8c49d38a2b1ca1df2bba582ba46cd28ce23e0bc5ea2e4c3d07108744c0fd353714bf5ded5116bb3cdc2d1716b3deac5ead16457ea4383de12ab693
 EBUILD async_unix-0.9.0.ebuild 800 BLAKE2B a0f78110c010fddf08e02a0961912bb5aec0f3b1cd5fef4d6074766ac39da197393f9ac8754c0f6b8a8dabe25fa47491b13afacc29da864cae78409f927b43ba SHA512 d6b9b39bfc40f3d1578885442eb7a60bbc78c9588836d4ad3e39ccf2033d85da2ecabb2f4aab7eef37a0b50c20b08f3232b002c0219d23b3b9d2f1ca43651172
 MISC metadata.xml 253 BLAKE2B 0119814797fa3c3d05048b625f47beb2588cefc93f90594e1fa0fa1f70858f3a84d5e71e912025cd0db1556ff22bd12ba8fe19951e0bcda22c7e11e9ac5b739b SHA512 9ae29fd2c07040726fac076a79e59a91d83db3aa6a01ccf0b2832d9dde07008a45e2272dc18a5b8683cb6dcb9ce120762e8561fe43329782dedf730f27cdeb68
diff --git a/dev-ml/async_unix/async_unix-0.14.0.ebuild b/dev-ml/async_unix/async_unix-0.14.0.ebuild
new file mode 100644
index 000000000000..e57bd57ede02
--- /dev/null
+++ b/dev-ml/async_unix/async_unix-0.14.0.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="Jane Street Capital's asynchronous execution library (unix)"
+HOMEPAGE="https://github.com/janestreet/async_unix"
+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-ml/async_kernel:=
+	dev-ml/core:=
+	dev-ml/core_kernel:=
+	dev-ml/ppx_jane:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ml/base/Manifest b/dev-ml/base/Manifest
index 96e393a1818a..52e2db37489f 100644
--- a/dev-ml/base/Manifest
+++ b/dev-ml/base/Manifest
@@ -1,9 +1,11 @@
 DIST base-0.14.0.tar.gz 385265 BLAKE2B f3a49b22bb63919bcdc522fbce14a24fd6eaddf39b921ba956cb82eb664ccc6919c9a9feb799dea318f1d8bdf1bd1983180b7ce38d9a43e118794057a9fec6a3 SHA512 c713c9aaf369bc042afb1ead53dc5a34a6eb3c97abc7fef99868e3be8e976adc6297f34d13cfc314adf2182fc64b0cde9c9a05aeeb0f51380255aa1f8e0edf16
+DIST base-0.14.1.tar.gz 385381 BLAKE2B 619c5c437237bb3ea9f428b450085eff2cb4639bf11803bcb2ae9f147b3ae39af72cfcfa10aaa5e74446bff4ba5f553815ff790190845f12e5e5b5080b197237 SHA512 5675a8b6b1ee5b7bd992ac9fbb036239f11b8a8c7cac9059ca38581d91f42e35d7bfa5839a90ed227344dd4c7b1bbacf0e7871d958c81f6ccf7e072b64ceff2e
 DIST base-0.9.1.tar.gz 286498 BLAKE2B fc2b8b3894af1ee142e5f46f89fbc508aa0a57dd50624598137364f6e6c7bda33864d8131f84838840a86ed8b3dd0d14f3833484c29e6fe3a2ffabefc89cd9e9 SHA512 e1eb26eb07ee3489c8f42a886e2131bcc5eb5e965727eb29910e3aa37cdab6d23bfbf71421e16b77d9fe20a69392f9313ad6189c9618013794f0ed7df8c76c52
 DIST base-0.9.2.tar.gz 286533 BLAKE2B 851472c23c5a79436ee02cf45c0f797de21efbe52b7ca0a9dd8a4244b1808ff9f14b8e364654ebbbfb6d21bd7532f9ee1df0d2728a23154601d4abf69f916dd8 SHA512 9eae093c18e4fcbc02eb970b73bb7e49a94e0ccdd3fd6509d0668035b454ad8b5894bdbd10027a83681e993b4e1dec97db213b7fdfc293cb9737bae303002e11
 DIST base-0.9.3.tar.gz 286655 BLAKE2B 05a53a528a321fb627a2aba1521028b59741ce2de5e24a87cc4a448dedeb788bace907a6d7d49521ff90d56e1c302135dacfa32ff8ab4525e9f0c476fc376bd2 SHA512 7c7ca4439479230a6d338ce51b14c93225b71fd98242f47d82e06c08cbec092a33faa7385db8d21ce0302e7f4f3cf5d659a704e2d85ab3391e046c7d7ea3b62b
 DIST base-0.9.4.tar.gz 286689 BLAKE2B adf0da9f82aaa8884a99db2d307e72a40a232dbc2517b371af65671966d488f9f77e86c32425077cd513075b8a3546727f3f596eac7c46876b25198a46ac373b SHA512 9e25caee46ec09c835aa74857f415ac61adeb1ae8d6773334fa1b28699b9ebbac9ef95a698b1f324d0ad59c27ea52fea0e0df86bf4908b6ba3e5121eb8e26076
 EBUILD base-0.14.0.ebuild 486 BLAKE2B 9507d4d6643e2140c3a28a0fdd6c344714b268868cdff0277a88c01e4ea2b51fb172ee1fb0601cfa4e3c7173d7656e84323b76184040b809350c4d7de7a8e35a SHA512 ed3cad0fcc5ce0f6eee73c41da6a93caeca5be427193f9d8f015312f1f505fb80e6587d3a1e7cef72ed6027ce42e90151ff7ef0155b8aae78c4c998075b9ef30
+EBUILD base-0.14.1.ebuild 486 BLAKE2B f45d23ba7ec9690f78a4cfbab8ccfeccee98fc1bd08e3965ce6d9960d84bacc141485d4f7782e2e6464fe5d35c7183cb046fbd195f14d55f688cf50d1779d9cc SHA512 e0c83936ab8e766ba976fbd4d57bc77d549b291f8585a80caf2761868b7b3688c01275165f1987f3bde830c8a4d93c8d4d335b3778551395907fa76a55052776
 EBUILD base-0.9.1.ebuild 702 BLAKE2B 604ee169030bb7aa3d81024da3ee846947a5dd891879d4f06b8eedc996aa145362a2af8194fb25e564551d9ca3879919b6d62d90741c39246d014485ef30d88b SHA512 fec860167885783b655536a434bb3472b949f95416cdb01ba3ce89482459c9248598e73edb09000567abbb48ce57ceb6006b8b7a96770bcd79bb18fb116bf2f6
 EBUILD base-0.9.2.ebuild 702 BLAKE2B 604ee169030bb7aa3d81024da3ee846947a5dd891879d4f06b8eedc996aa145362a2af8194fb25e564551d9ca3879919b6d62d90741c39246d014485ef30d88b SHA512 fec860167885783b655536a434bb3472b949f95416cdb01ba3ce89482459c9248598e73edb09000567abbb48ce57ceb6006b8b7a96770bcd79bb18fb116bf2f6
 EBUILD base-0.9.3.ebuild 712 BLAKE2B 26c21c6921e51c2314327587db47ffc7552615c5de04286e3d1461e86d96a364d90af24667b7fe69a0d3f50b21fa1c7563acc11c0061589629bad01f5418d729 SHA512 7eae087098b129eef8d7d3fc2b825b476e2b8c361f4e43d13f9276acdc412f7ee09c80627790ea4d79daea773194a0f8526074c05db5e49d506e6eb44b9dbad8
diff --git a/dev-ml/base/base-0.14.1.ebuild b/dev-ml/base/base-0.14.1.ebuild
new file mode 100644
index 000000000000..c589ee8a7b19
--- /dev/null
+++ b/dev-ml/base/base-0.14.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Standard library for OCaml"
+HOMEPAGE="https://github.com/janestreet/base"
+SRC_URI="https://github.com/janestreet/base/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+RDEPEND="
+	>=dev-ml/sexplib0-0.14.0:=
+	dev-ml/dune-configurator:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ml/base_bigstring/Manifest b/dev-ml/base_bigstring/Manifest
new file mode 100644
index 000000000000..292c53415068
--- /dev/null
+++ b/dev-ml/base_bigstring/Manifest
@@ -0,0 +1,3 @@
+DIST base_bigstring-0.14.0.tar.gz 16579 BLAKE2B 4708fc425b9a4fb534b10b3536eca11bfd4ed8374319f9be09aa981d1a2a24433a25b62cb3faae459a0a633a2ebe6c15a28c2c15251f2ec9505c35528715de16 SHA512 d60bfd1989a29e4c1359722d4c0e2ec382c6d4f3c763b9b80980f38b51419bdf9d30bd9f8ca9cfbc33064458415e227c9f4077d9746ffc13cb4cd5ec8e221fc4
+EBUILD base_bigstring-0.14.0.ebuild 527 BLAKE2B 13e7c0aa334325ad3e8d2e0c9b31664d4a98936412fd3adc2f80d76069382efdd763531e225193a02d4fc306225d2304636e1ec1211e63f4cfd3628c94ccf128 SHA512 7dcff1fe171c3265c58a6b91a059b2721d0e39efa6ed7f695a5c89c3bb336f7f46cf33a0508606d6d1437be4d95586137afd1c737cfb6f4aca17f5b4381c97e1
+MISC metadata.xml 322 BLAKE2B 6f3b69019ca3e0a854cdf57efa6e27f66dabdf01fca2323c3bb96d876a96b172f1b99c681b5428581bf51308b70dd82fe8604ffa36de6595d0c2d81306fca8a3 SHA512 1503d91c3e848bfbf4f7833c3459f8286f8794aa71c4df227cc3ab820fd9d13c06ad5b57327b2cf0cfd88bb255035dbe9c7da29f580ad7e93b2575f7094e18e8
diff --git a/dev-ml/base_bigstring/base_bigstring-0.14.0.ebuild b/dev-ml/base_bigstring/base_bigstring-0.14.0.ebuild
new file mode 100644
index 000000000000..8dc431eb8abd
--- /dev/null
+++ b/dev-ml/base_bigstring/base_bigstring-0.14.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="String type based on Bigarray, for use in I/O and C-bindings"
+HOMEPAGE="https://github.com/janestreet/base_bigstring"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+ocamlopt"
+
+DEPEND="
+	>=dev-lang/ocaml-4.08.0:=[ocamlopt=]
+	dev-ml/base:=
+	dev-ml/ppx_jane:=
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-ml/base_bigstring/metadata.xml b/dev-ml/base_bigstring/metadata.xml
new file mode 100644
index 000000000000..70e661420ebd
--- /dev/null
+++ b/dev-ml/base_bigstring/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>ml@gentoo.org</email>
+		<name>ML</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">janestreet/base_bigstring</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ml/cairo2/Manifest b/dev-ml/cairo2/Manifest
index 060d1efd8a1b..a5957793d271 100644
--- a/dev-ml/cairo2/Manifest
+++ b/dev-ml/cairo2/Manifest
@@ -3,4 +3,4 @@ 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
 EBUILD cairo2-0.6.1.ebuild 1142 BLAKE2B df968dbc173504e455cff04f29846e9fa108a3348dee3661d4e650dbb90d38c76f4b9b67272f70bd5d2feb29f416b614bd9594033678a754fed06ccaa2ba7ed0 SHA512 288e613137cf60be1da2851ac355479d1157d87e57b13e1ae3301411c8faee3acc7b42191708f77ccfd97934a1522a5601281c6c88fb3c36658353c692ced799
-MISC metadata.xml 328 BLAKE2B b0bd0dcd9ee412736d22a1d0390433ff61b851cbd7a9fa6e62dd59b3c6d70fcd5d85f13202c1308ce46d2e610edc9a4bc3e86518f0f1e2490ee4e70bf732da84 SHA512 49a293f3cd7d644237aef8cd9efd7b4d37fdbaf8fc9191e275426e25c1ced5b7eb87167deaad09c675b3797706747af5f32f6cb153891e2d27bd4ace85effcc3
+MISC metadata.xml 421 BLAKE2B 1d5f355f758d0e814ffd6451555ab71d2608d2cbfa17ecd81dff76c3f3a667340d81808c7781125454dad9ecdb93a8be65391be7d112a914f3255719bc162ca6 SHA512 234e022cc29260c94598c369f3f0c0c9d960bd824dba6c09eb7e6b66cd395e920c74a6a0ec2f3ba2132ddeb84420867f7bb125bf174ef5a33e05d41725276e45
diff --git a/dev-ml/cairo2/metadata.xml b/dev-ml/cairo2/metadata.xml
index f3c04171cc2c..1474195572d8 100644
--- a/dev-ml/cairo2/metadata.xml
+++ b/dev-ml/cairo2/metadata.xml
@@ -1,6 +1,10 @@
 <?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>
 	<maintainer type="person">
 		<email>gienah@gentoo.org</email>
 		<name>Mark Wright</name>
diff --git a/dev-ml/camlbz2/Manifest b/dev-ml/camlbz2/Manifest
index 2ba1725137d9..22e74dc98697 100644
--- a/dev-ml/camlbz2/Manifest
+++ b/dev-ml/camlbz2/Manifest
@@ -1,3 +1,5 @@
 DIST camlbz2-0.6.0.tar.gz 57771 BLAKE2B 5b4337ca547c37f6982c29c9b70f00ca3100983541a80bf16e8d549c2eabf64ef917ea3ba445c8bb5bbcdb1a652cc5cd586c95299d194a7abe8e68ea9f1a0599 SHA512 1052536bb08c9d9f9bdf4a063a5a01389445b55117ce423dd1732de00cd79db5e4befb4ce5c81c5db8a6d40b28a2ac4b897bb00598fdccf76ea92a2966592680
+DIST camlbz2-0.7.0.tar.gz 22769 BLAKE2B 4bfd1c4e7e4b47e666dc3053bf1536ce71b9d32fa0dff2a11642176431af89f83007bae23c61335eb1153e21300a91193f86a40af7ff0c133d491b6e6a3ec4f6 SHA512 570901199df4b5ef79e158f5309ff69d2b85babe002a0324244868f4201f0e9d6aeec377b2ec9a6bf657a29857dc13a0f63e05d162f76c7d412fa6c5f3c0e0f6
 EBUILD camlbz2-0.6.0-r1.ebuild 672 BLAKE2B f6e9ada40d80104798f1fb8cfa32341924472adaf3d5d0c4f122c43241f217fda1ff2e7bf295dca476454c204f8b4c01af8b0909132b8d29ab65c549d6f1f00b SHA512 d6616b2fb9af683e1942d028c636ecac5bc26ab96f4553527c8a6fec0442b2b562e3a6c2ed9b386a34f315fc3643d3fe6b2c6009e79cd106f9a1c0e9a017ddba
+EBUILD camlbz2-0.7.0.ebuild 785 BLAKE2B 4097ad298a6e1663054e183ecf40fc20eece79f429234d599565c0932af54f4e2686a4a1957f1ea19f4c2b06342e9a72d172bbda1cbb8040bd76cdf72b620e3f SHA512 98f0fc255dfc38e9b16cf466c0ad352a8baa937bd97ae6ed47c6c6b5863fe149cf336d8229dfdd1ea71981093d4aaf662f1a5787f1965b6c19773ede7ec4e8d2
 MISC metadata.xml 244 BLAKE2B c82f45966666e095a27d4d8b14f01f93e202177ea8222c5fc806f4e243b8ca653a61232533a6dd10ed36a35f765dc94cfc651f9fade565b8eedfe1129b5c2d23 SHA512 756b8d091c29b6c4c621ba30588da62cf99e777243fbdd88cc668f3ec071353beea675c853f8c58752fbc6c01c795760cb10428d3a7fd087967a88b885d91149
diff --git a/dev-ml/camlbz2/camlbz2-0.7.0.ebuild b/dev-ml/camlbz2/camlbz2-0.7.0.ebuild
new file mode 100644
index 000000000000..735cd9dab6d2
--- /dev/null
+++ b/dev-ml/camlbz2/camlbz2-0.7.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+AT_M4DIR="m4"
+inherit autotools findlib
+
+DESCRIPTION="OCaml bindings for libbz (AKA, bzip2)"
+HOMEPAGE="https://gitlab.com/irill/camlbz2"
+SRC_URI="https://gitlab.com/irill/camlbz2/-/archive/${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="doc"
+
+DEPEND="
+	app-arch/bzip2
+	>=dev-lang/ocaml-3.12:=[ocamlopt]
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( ChangeLog README ROADMAP BUGS )
+HTML_DOCS=( doc/. )
+
+src_prepare() {
+	default
+
+	mkdir m4 || die
+	mv ocaml.m4 m4 || die
+
+	eautoreconf
+}
+
+src_compile() {
+	emake -j1 all
+}
+
+src_install() {
+	findlib_src_preinst
+	emake DESTDIR="${OCAMLFIND_DESTDIR}" install
+	use doc && einstalldocs
+}
diff --git a/dev-ml/camldbm/Manifest b/dev-ml/camldbm/Manifest
index b814f6d1c99f..5bc4f3ea080d 100644
--- a/dev-ml/camldbm/Manifest
+++ b/dev-ml/camldbm/Manifest
@@ -3,5 +3,5 @@ AUX include_fix.patch 512 BLAKE2B e99ff15b037c2db639f14ff234c51c2a34c7dc2a5c3395
 DIST camldbm-1.0.tgz 14397 BLAKE2B 9b6971e30815ad6984254591af793819beb3859ddbf7bbd95ee744a2b09ce04968ecad9c7ff954e1606776d82988b3499f2569154586a937a61eb6d5c7b9465b SHA512 d0b752754650efb400f13f957e83fddccf1fc9ac9e1d11f453af94e9aa599546a316eb110685b3728b593c99cbf859cdc7bcf924c878cf8b6dead3dc413ccfbf
 DIST camldbm-1.2.tar.gz 14823 BLAKE2B b9eda65c56440b1d13562e0d184474e585b13826038e77901961df475cbd73df39c9923e4f73c891252f17416e78acb3c3b42accf01dc5d6f51a72bafa930084 SHA512 56d317db420179f96a0f6a453f8a34ea16942f3ca5ed09dd6955517348dad281ad105b861378f1ebd01ec5c8a1c07d5e5db1ab4d255f9572ece64a86559705f0
 EBUILD camldbm-1.0.ebuild 723 BLAKE2B bdf2c174ea1dd59f20976b4e5efe6050d7bd28aac4b0324c4e79b02e6c1ef31f4437ce19b5f1cb3409b371ea197effc92ad7d6400e70682dae98715e736c2a0f SHA512 daeda32929c10a8b39d84a46d1d64bbd9fad534b065710a34cae0a19d06d8388dde5bf67d577507938ef65a5f73dcf0e64e4eaacd8d1ddd150b34521ea848d5f
-EBUILD camldbm-1.2.ebuild 626 BLAKE2B e2856633e8be67abb1e8b6e4e193d55039944ae0b5f2355e7977a194562a800015185286bf6fdc00f599f7faa2c08da276d3ea87406bc2b6e45d25cc3cc3749c SHA512 99052fba71d6c59948764409d80169458ea748bc43acc00cc68927590f22e76cec1584435251de9101a3aad8f3e8c464dfbfdcf7f295c7d20e943bba34d0f0ab
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+EBUILD camldbm-1.2.ebuild 720 BLAKE2B 02a8f38992abed19e2d6a7caf830f6376957bb86ee40779e512b1ecf2e8633b88feac21015963c6f3256ae29714c80ec6a73b42317722e9b66d07825846b4a29 SHA512 075eebcd51301d2bb36b900b48a4b76b00768e8a786fb15d8c09ccaf58c4b2082827b1ba9bbd9aed27d6a7f99b29f0ca2e191eaeb78920945ba4fd4f5f4b1e97
+MISC metadata.xml 232 BLAKE2B 502ab2778b7b5d1ac9441b71cab7ff412fbb5663747f4abfc59fb45559185dda510683f1e8ffea5db8f6b31874ca209fde5c524e3526cb125931ee1feb7ee68d SHA512 7ac25a89f6b48a8e858fd1e9f4d3e938a82a4591f21249d81e8d9f1d028c5f427a3669933a932c0e8a1dc7455106696e3bfba3573976edcd8c7ec89368dacde2
diff --git a/dev-ml/camldbm/camldbm-1.2.ebuild b/dev-ml/camldbm/camldbm-1.2.ebuild
index 4bae2351d3f3..4b6ad3aee3d6 100644
--- a/dev-ml/camldbm/camldbm-1.2.ebuild
+++ b/dev-ml/camldbm/camldbm-1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,6 +16,11 @@ DEPEND=">=sys-libs/gdbm-1.9.1-r2[berkdb]
 	>=dev-lang/ocaml-3.12:=[ocamlopt]"
 RDEPEND="${DEPEND}"
 
+QA_FLAGS_IGNORED=(
+	/usr/'lib.*'/ocaml/dbm.cmxs
+	/usr/'lib.*'/ocaml/stublibs/dllcamldbm.so
+)
+
 src_install() {
 	dodir "$(ocamlc -where)/stublibs" # required and makefile does not create it
 	emake LIBDIR="${D}/$(ocamlc -where)" install
diff --git a/dev-ml/camldbm/metadata.xml b/dev-ml/camldbm/metadata.xml
index 6f49eba8f496..9f27ba42c7de 100644
--- a/dev-ml/camldbm/metadata.xml
+++ b/dev-ml/camldbm/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="project">
+		<email>ml@gentoo.org</email>
+		<name>ML</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-ml/camlp4/Manifest b/dev-ml/camlp4/Manifest
index ca88074573c4..d7ed4bb8a625 100644
--- a/dev-ml/camlp4/Manifest
+++ b/dev-ml/camlp4/Manifest
@@ -5,7 +5,7 @@ DIST camlp4-4.08_p1.tar.gz 649830 BLAKE2B 8dff6f82618d0f61a56acfa71ae679d4ba5ed4
 DIST camlp4-4.10_p1.tar.gz 650092 BLAKE2B d7a6221dba5f6ec6963fe35236c29f39b8ae8f928618b5a58f72e7b1cc1f50d716b110f9684150716b56784cf703c0d8fcbc1aad32aeab638faca9c1bf2d5b9e SHA512 7ae0e20053a43399daa4ee9b93b6f4dbebc3e17c5ee79d069c4903cdfb2bf1cfc7d6badecf92fcf62e97a5f85f3be6ed82a62eb2a311bf6398b2792eacf763d8
 DIST camlp4-4.11_p1.tar.gz 650280 BLAKE2B 6fe46b49c1f2b2e5fc87fbbbdba3ccae795c555737495c298456b84f0dca79c750aa6e4ab2c23bbc7ba4724defdfb739e370f468a78658035474d2f3ad255995 SHA512 8e572602c1c465017a234565efa2249c935ba1ad3d399a6b264bfbec345958130a96311c79e437ac995e3ead9ff7b4f2d3fe6aa4a3a82431ae0cc6257a300f4c
 EBUILD camlp4-4.05_p1.ebuild 1029 BLAKE2B 9c6ded1579caaa21eb8b9ef4a58fcfff773e622ada30606c786948ff48d8188ea291d570cd5aafe420cade8f42c2df04fdfc257393d6abb65cf1a617eab41f93 SHA512 1d11caf10debd97be5b34655f8f0ecd8b167ff86ce0ebe891000bf35fdb2c95c13472dc98bb943332637e3312a3a0fcda1cca6c12220b2415cc6e0f0d08bd2b1
-EBUILD camlp4-4.08_p1.ebuild 1091 BLAKE2B 4c0e75a3906c6778050b313cdfd97e87054ef38564a5ccfb0ef7d1993461cd82bf46b692cd6e7bf75530b38b1475a54026bc73d9ea93cff592d31df28206a3e9 SHA512 5061c2c1498b94ee14c78512ddbc8671d50f19031931dfbae61501c88fc6fb43302806a5da815e4a14249525d277586713093cf23257d8f1260eca237f9fb795
+EBUILD camlp4-4.08_p1.ebuild 1090 BLAKE2B ec64b3d3d505b267e7fe253c2cf0d6e6fd86e16de8ce6de312e20431f9e05ae79b7af525c23531c0232fdc353a9df6d9f570c845aa9713b48f50d38e0c9164fd SHA512 59d9e4b0d1e612fad7129ff12d15ee61fba147205baa49ba97a7055ae246c37054a5e8f625e66a8d80e926572f4df36b74f9d9ad121fe0cb714d40f7d7235439
 EBUILD camlp4-4.10_p1.ebuild 1070 BLAKE2B 657cb82026e41f73108b3e17b037c5db39940327bab6a0b3c1ce2e21c995d77ceb6679bdb6fc05ee15a18f1daf6a9f0f4f1f15c46a6b718163628ff14a855ecf SHA512 c559a97688601ad409049f0a1a069a8aec654d37ae065f7f4adeb5e997ac4289bd6170c3209c35ec29451f75110c17c9b57751f13d19459145989b55bfbfcb72
-EBUILD camlp4-4.11_p1.ebuild 1070 BLAKE2B ccd8d0e94a8e4cac98cc1065531d92540e5ac51899cc5a27dabb46e84e40618a083c9b56ee3c2c056bed2a6a679a63fa91d253f8b2a1ed51d18857a05e750bc9 SHA512 9a953260137eaa8d1da68b3b9d9a6ab56536d2fce751cf644c39bf362e94f306adbafcc2afadba0262835e6e08774aca707db31431c3a47b96e9566033da3ad0
-MISC metadata.xml 322 BLAKE2B 1b38d06aa74d4aaeebb436d63bfafe60c010fc6b7154cee62854b1d16803da20d0c1396f1be3ea65c72af8314e27b63abf5d7921b923734c9f515786c7674b2f SHA512 e021e98e1c18b7c36d4c890f012ab4b9425cd784acd4ea87e998dcf89d4efa3505413d07f6bf5df6c065e608ee5c1f8a5f7daa45326ae80d0085ecfc04abb2ab
+EBUILD camlp4-4.11_p1.ebuild 1093 BLAKE2B ea53b00b9f901e448470a0e805dc7959f466998eb267150a4cf96f971e5cd903d91e88410ad65ca9c287b8d4604b28bbab6c4d7ccfc1d688ab689797d2329b97 SHA512 e1aa33105784007697f7eae883a55b2388cbb86bb9e38f38ac7876c4e7c4f29ac2d3f11a1257f5d2af485c51e361df68edc3fe88ec2121402e9357289650261c
+MISC metadata.xml 415 BLAKE2B 71ebce898009219ae77c1cd07c0103aaf322a742fa4012fb0bad0c7cd9fe07a15563a594af1c8c31e09459ecdd0af58d2d5f44d6ece7edc0ce53042b5430c326 SHA512 27f7a2c68e7eef2278eaf51e1cea93646c1281726cdacf881e9e3aa3e4ac0b4806294651a00392b62d730264b3bded358b4f25b203bcd9c92055aefb34beb085
diff --git a/dev-ml/camlp4/camlp4-4.08_p1.ebuild b/dev-ml/camlp4/camlp4-4.08_p1.ebuild
index 001a6776ec7a..2b583e112ed6 100644
--- a/dev-ml/camlp4/camlp4-4.08_p1.ebuild
+++ b/dev-ml/camlp4/camlp4-4.08_p1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SLOT="0/${PV}"
 KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="+ocamlopt"
 
-DEPEND=">=dev-lang/ocaml-4.09.0:=[ocamlopt?]"
+DEPEND="~dev-lang/ocaml-4.09.0:=[ocamlopt?]"
 RDEPEND="${DEPEND}"
 DEPEND="${DEPEND}
 	dev-ml/ocamlbuild"
diff --git a/dev-ml/camlp4/camlp4-4.11_p1.ebuild b/dev-ml/camlp4/camlp4-4.11_p1.ebuild
index dea97b226afc..f50ced55ac78 100644
--- a/dev-ml/camlp4/camlp4-4.11_p1.ebuild
+++ b/dev-ml/camlp4/camlp4-4.11_p1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,6 +20,8 @@ RDEPEND="${DEPEND}"
 DEPEND="${DEPEND}
 	dev-ml/ocamlbuild"
 
+QA_FLAGS_IGNORED='.*'
+
 S=${WORKDIR}/${P/_p/-}
 PATCHES=( "${FILESDIR}/reload.patch" )
 
diff --git a/dev-ml/camlp4/metadata.xml b/dev-ml/camlp4/metadata.xml
index 2578754c2469..110b0d3f8c84 100644
--- a/dev-ml/camlp4/metadata.xml
+++ b/dev-ml/camlp4/metadata.xml
@@ -1,6 +1,10 @@
 <?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>
 	<maintainer type="person">
 		<email>gienah@gentoo.org</email>
 		<name>Mark Wright</name>
diff --git a/dev-ml/camlp5/Manifest b/dev-ml/camlp5/Manifest
index 50e5fdfbb764..15cb6f31e973 100644
--- a/dev-ml/camlp5/Manifest
+++ b/dev-ml/camlp5/Manifest
@@ -3,8 +3,10 @@ DIST camlp5-7.11.tar.gz 878224 BLAKE2B f384764da43653a2f75664681a4f202ec84497720
 DIST camlp5-7.12.tar.gz 1008350 BLAKE2B 8f390f6d617a6ef029462aa74ca4d80c0e2eb267bb6957aac43fdecc425aae34dfc7f3e572c8a1f4ee6b032dd90b3b8262094f80a19ea0bb19b80a88d22d3f28 SHA512 233d973b0a968a7812b977e8a37da8e8daa0f3ef81ca7c473d83c1602380dae6c14f94daffb6bb799f8d90fab121238a46e89a233202cd6f622b0da2f728c0c0
 DIST camlp5-7.13.tar.gz 1031832 BLAKE2B 2afd7e269092d9c40f263e9ce92b3b9f66b0b3f0ae01da43e2094c6a919aa9f26790030f835b630547d51e7bb4a08e74ac8522e7f308864896fa0414370f8f2f SHA512 8ab94b951e6791be895c70e32b930e498229c9ba7bccc505a3e7c2a91ca12fe038b979b9d5822b43e9c74ee2bf552efa1af7a61f1d287100803efb540d5db8b2
 DIST camlp5-7.14.tar.gz 1044110 BLAKE2B c9aa5be80df8d2c376fc41c157b2cd86658dbb90e1babd346b7681afd7453649c7f3682f95f238e51b74b3b3a7a2c5b5a854be892b30a7d1e3b62c3272f5442e SHA512 1b39949c532ca622b01a8e800aa1dcad34f1c944ffe580003642bd742dedc158f3ee54602f3b05f89c0e259525d7feed101b971ebd589449b6d56046389a5bf6
-EBUILD camlp5-7.11-r1.ebuild 1028 BLAKE2B 1fe3e0ddcc521d416bc5f5b917178775a5f14ec45a46645dfa3ab9ddb02d3b034f75a815c9046a24dab1322a4cb878cde93cde4d9523834c4708bc245e8ec10d SHA512 54e1608ad6f238c65699c172ac78dd558b3e2038224fd11cb68a7df60b97ee06d149a598f15b6439a729aa1f30a10025849d04862af08a8f07febe3b4867a401
+DIST camlp5-8.00.tar.gz 1321320 BLAKE2B 14957ea83e40f3e2f68c7cbbec1ab84325eba1057f38905a37f9516a99a009024ee0b463cf588880d23d94e710b027b835dd51153a429c8bda22be7fe95dc911 SHA512 6a0d19ced4d94cd3afebfbc373d344229c5faf088e8910dea32ed4dfa841dd9844c72849f8a6281e2bce55295665eae90391cf29d062a44b083761a9e04bce93
+EBUILD camlp5-7.11-r1.ebuild 1048 BLAKE2B c4d7f8810c781ea2959cadeb4cc57dda53527107a77786cafdba1ac5c502d6a948cbf3537464c580ae1e2612338194e2898f4e6c28d9b271244d892fa15a05bf SHA512 043468662e78deeeadc4d04a0cb315be163c451af61c1cbc145cc81a473ed7351f3410ce67976e2337a616ef2a2b8e3e0d8f78236a278c3100b3a029ccc6e0fc
 EBUILD camlp5-7.12.ebuild 1278 BLAKE2B 7bc87a12ff2dcfc4ec043d78479d03745c98d01ec8540d6fba3128bd58caf1b7eed137535b86f8f5a0dffde50c90a58b5d398fa2ab0d1a1361fadb805976b5b6 SHA512 cb2c7464bd37fe71efd94e7b604e68454480384cfb68f1b409a8f57e98504aecf0b03120dd8569f08b964995f94cd5bda4ad5a322605a92b8ad3393a4aac0d87
 EBUILD camlp5-7.13.ebuild 1091 BLAKE2B e96813ca2ec1c8e2d1f49b1ff541467aa3801fd2bb0ee036588a9440916562a7a8bd184d8cd1f730e5c9aab70ebbf85ceb9be37ce551959985f71a57ce7f5004 SHA512 05477b46f85711d1a8bff84f44a75dc8346a87e84fb357a349297666f73cbf8d54b36d91c9111cc5991c7cad15bbd10fd1a478eb9ef2920b1e5a1fab90260ef4
-EBUILD camlp5-7.14.ebuild 1125 BLAKE2B 272eea9e08214d9d56cb9d899d710c4dc9403f14d83d175e7e26563cb82b932f213e17b048542843b9f199a852c8370209b3135600323f72ea19e490ec867c21 SHA512 de0b49d7a13e2f6040fed43c8d5ccdbb0fca75dcf1bb8a6d48ba7e7b0ce53bc70307d9f06de0557a80864dbe619052cdcb6034846e746c578d13ca2f2a36b3ce
+EBUILD camlp5-7.14.ebuild 1145 BLAKE2B ba361b7fb65b28b734c6e5914934ce8f808466e4d00472f947bcce87996557c3cc8ce49637498631919567ce023f407a12c3317021031d5a6af439a438337970 SHA512 243e0b3925ed78faaeb290c2cddaf98a758082e462ad11ee640c475deb3b1359c4ba722675f68cc1d8aab71557340bdc3ea915f3d5d48d5788a1373daa98f54f
+EBUILD camlp5-8.00.ebuild 1073 BLAKE2B 3dbaf6c7694f1a52ebfc7b67b34fdec0256a4f4a6b6fd711672756a5d789e78888b96e15f789bbf11af10bd2b4d5e7574248701597efcfe45d8b0f9d10a45c71 SHA512 02f0ee65b774f7ac70953f9b9ed41354de6a95748ee6ecc8b19a7067a4adf07438201f0e204a0d011e18134ef1cdb1b6147d185cfd29789179479ce0765ad79e
 MISC metadata.xml 415 BLAKE2B cba4109b6961dba8c767674cc6633812ed76c99e8091ae2b0ca0c285ead9e730d575cc96c448fce7873375a0aa8d16acbb2f80f85d8e26a174ca8945976580b0 SHA512 4e2255d7af948851ca86e708c01be5d61e46235078b6e5606687ca3975ae7d7618d8e531c5b9ca6f1eac893f065258d7191e544f5bb6331fb6e3a9c5ac274f93
diff --git a/dev-ml/camlp5/camlp5-7.11-r1.ebuild b/dev-ml/camlp5/camlp5-7.11-r1.ebuild
index 5f91a735d0e7..6be6bcfd624a 100644
--- a/dev-ml/camlp5/camlp5-7.11-r1.ebuild
+++ b/dev-ml/camlp5/camlp5-7.11-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -35,6 +35,7 @@ src_configure() {
 }
 
 src_compile() {
+	ulimit -s 11530000
 	emake out
 	if use ocamlopt; then
 		emake  opt
diff --git a/dev-ml/camlp5/camlp5-7.14.ebuild b/dev-ml/camlp5/camlp5-7.14.ebuild
index cd630ba25bd9..6bc2cca9ade9 100644
--- a/dev-ml/camlp5/camlp5-7.14.ebuild
+++ b/dev-ml/camlp5/camlp5-7.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -37,6 +37,7 @@ src_configure() {
 }
 
 src_compile() {
+	ulimit -s 11530000
 	emake out
 	if use ocamlopt; then
 		emake opt
diff --git a/dev-ml/camlp5/camlp5-8.00.ebuild b/dev-ml/camlp5/camlp5-8.00.ebuild
new file mode 100644
index 000000000000..fe4e5ebe5766
--- /dev/null
+++ b/dev-ml/camlp5/camlp5-8.00.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit findlib vcs-clean
+
+DESCRIPTION="A preprocessor-pretty-printer of ocaml"
+HOMEPAGE="https://camlp5.github.io/"
+SRC_URI="https://github.com/camlp5/camlp5/archive/rel${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-rel${PV}"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="doc +ocamlopt"
+
+DEPEND="
+	>=dev-lang/ocaml-3.10:=[ocamlopt?]
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	egit_clean
+	default
+}
+
+src_configure() {
+	./configure \
+		--strict \
+		-prefix /usr \
+		-bindir /usr/bin \
+		-libdir /usr/$(get_libdir)/ocaml \
+		-mandir /usr/share/man || die "configure failed"
+}
+
+src_compile() {
+	ulimit -s 11530000
+	emake out
+	if use ocamlopt; then
+		emake opt
+		emake opt.opt
+	fi
+}
+
+src_test() {
+	emake bootstrap
+}
+
+src_install() {
+	emake DESTDIR="${ED}" install
+	# findlib support
+	insinto "$(ocamlfind printconf destdir)/${PN}"
+	doins etc/META
+
+	dodoc -r doc/*
+	dodoc CHANGES DEVEL ICHANGES README.md UPGRADING MODE
+}
diff --git a/dev-ml/camlzip/Manifest b/dev-ml/camlzip/Manifest
index ca3f36339b2d..688c36547ea9 100644
--- a/dev-ml/camlzip/Manifest
+++ b/dev-ml/camlzip/Manifest
@@ -1,7 +1,7 @@
 DIST camlzip-1.06.tar.gz 26499 BLAKE2B a7a1dbe157c0dcb9847bcd6324bbb7cbaf39342d0fdbaed51d2c004ae7b03f8d655fb15da50dae6190b976675e405e28fa2d4fa35a2f4372c50519564d58f981 SHA512 5ef0172927106589620678897f12f054533503a5cf13df71bf4deda43f223d0cd6acce118977e87bce53afe289f367b851f192a8e693274c2bd13549121019dd
 DIST camlzip-1.07.tar.gz 26652 BLAKE2B f373ac0427faa9b6a846e9db8f3e48c00ec6885b8a11cc09fae96b5a7656908f172fda73dbea8ddd1b3dbfd98bcfa3e2e67ce9faf2942d1e260fc0a804813a05 SHA512 b92e9db002b9b398fd132c6ecd8098fac4cc7ddb3f770cc412990dcdf4bd62ba358c762d31fb0b5cd6b32f20d3bf4b3410ca6e86c511a438b92ece940f9831bd
 DIST camlzip-1.10.tar.gz 27335 BLAKE2B bbf24953634278589395dd9fcedf1e3becce8dad1f380393dc3ac59589143e1685dc14085ef566e12fb751c6f1a333dd368795a5083b94a43b71e058e86489f3 SHA512 5c42e0d808230e3820b2e7ef34b544ca51a7bf0a484ce4e1c8b1e4966133196bb3ff7c3ca85b9c50050aca389316eb52f0335f6e2ad60c000594a33171b9a9a9
-EBUILD camlzip-1.06.ebuild 675 BLAKE2B 62844ec59c1659ac216dcca4c53de6dc8a7ae8f9e94e6fca181d4ff5da535548cfb829d86825cc7b6fb55da278eb4e93d1335ff937ef8eb024b3030b14a236db SHA512 936a8828d5ccec18df84be21f2e95cbb8061001d94389fc557b27ce697436b5dbf961b73032b9a416230201b341f48ae5e6b3fe04f172f013a4c60dd449e1375
-EBUILD camlzip-1.07.ebuild 809 BLAKE2B 1862fa6b059b2f557127137998cd7c5c4932240e08c3b7dc961fd7f47520d5fe03a7c65ff9275f8f004aa323828f4539cac35229cafb89f62a6330e9f7f7c266 SHA512 c5ede699cbc018186b9747bc6e24915ce0984a489b38f3fc3e58b001078e5d00ea85689fb231b79b2781de54fd64b8e72692db582651411efb6df989bdace7c3
-EBUILD camlzip-1.10.ebuild 907 BLAKE2B 012df253e5f38bb840c76950f76de430493ae1d2ba91d013ecc7deccda1396844ef453cbd2c013e7718b1e096880f8ac28203bc1d42128f3eaacd94f8b3547dc SHA512 4d349781e882ff21d795f3d676c36b83c5d3667dc4b945f66c5fbcf027b8902c39b9c4c058704ff111076ba170be04eb8af043c43227c37619c465ec9e500748
+EBUILD camlzip-1.06.ebuild 668 BLAKE2B 82f6287580288f3cdeceb91afb7229e150e440d17e78b92ced16f1d8ae26a55c1ed7bcd6d1eb233755104cb26f21b6adfb95c07bec1dbf1dd394f0c3ff208abb SHA512 103fb9d9fd567a07700204489fea658e24f7142b6ba3d497d77623bacfc8b8b388a43f3658a548dcaee781d9218638c0302e0ab06597b15797c8e56fecc735cf
+EBUILD camlzip-1.07.ebuild 740 BLAKE2B b3825484a64ec0e62218ca81723050f0992d6e02683dbced3ba11a5dd5289f74e715a22d62fb440b6da6495de7d5fbd1a21ca8811b07f3925b0c2c75a7ee1928 SHA512 42e72e3edd739f86367f9f35623944bf72a5d812ca9e7efffc94db7d5622eb69a760ba500d0700820ba411079bfe628501c6fd7791442cf69ab3acd29fbccf27
+EBUILD camlzip-1.10.ebuild 906 BLAKE2B 15987bc3e00dacd28b28e07efd38d4bf8211dfa16ddc6c73d99bd877655a3be392cfd008ffa767cfa2ea5f7d22edcc9a7515e57434c91e0f0c4a51c0f78b35e3 SHA512 f91a02f66b3437c51bdd9bdc59f522254217972448a0ea14cf71bc80a998f659b1781bdf8e5562969a4d33039372998cd6985b1f4133877c6d72efeedd8de814
 MISC metadata.xml 316 BLAKE2B 77b2aa09d7f9f4ab39f475277041c53808372951adf605dec9dac4665883c70716fcc18370535027c12581bf8fa7076899fe2d95597d5e5d6b04b5d45a1789e0 SHA512 fa95894f70cbd2fb42e0433a29e675235ed5b68e2bf0095e7fa2fc865f28043fa125c2df5db11b3d8d2998ba71ed60749d302b62917db90747dfa62022553ed2
diff --git a/dev-ml/camlzip/camlzip-1.06.ebuild b/dev-ml/camlzip/camlzip-1.06.ebuild
index 4fed4a00664c..ea2362cc8b90 100644
--- a/dev-ml/camlzip/camlzip-1.06.ebuild
+++ b/dev-ml/camlzip/camlzip-1.06.ebuild
@@ -1,11 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
-inherit findlib eutils
-
-IUSE="+ocamlopt"
+inherit findlib
 
 DESCRIPTION="Compressed file access ML library (ZIP, GZIP and JAR)"
 HOMEPAGE="http://forge.ocamlcore.org/projects/camlzip/"
@@ -14,9 +12,12 @@ SRC_URI="http://forge.ocamlcore.org/frs/download.php/1616/${P}.tar.gz"
 SLOT="1/${PV}"
 LICENSE="LGPL-2.1"
 KEYWORDS="amd64 ppc x86"
+IUSE="+ocamlopt"
 
-RDEPEND=">=dev-lang/ocaml-4.05:=[ocamlopt?]
-		>=sys-libs/zlib-1.1.3"
+RDEPEND="
+	>=dev-lang/ocaml-4.05:=[ocamlopt?]
+	>=sys-libs/zlib-1.1.3
+"
 DEPEND="${RDEPEND}"
 
 src_compile() {
@@ -28,6 +29,7 @@ src_compile() {
 
 src_install() {
 	findlib_src_preinst
+
 	emake DESTDIR="${D}" install-findlib
 
 	dodoc README Changes
diff --git a/dev-ml/camlzip/camlzip-1.07.ebuild b/dev-ml/camlzip/camlzip-1.07.ebuild
index 547fe00d0c83..448875803b1b 100644
--- a/dev-ml/camlzip/camlzip-1.07.ebuild
+++ b/dev-ml/camlzip/camlzip-1.07.ebuild
@@ -1,26 +1,24 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
-inherit findlib eutils versionator
-
-IUSE="+ocamlopt"
+inherit findlib
 
 DESCRIPTION="Compressed file access ML library (ZIP, GZIP and JAR)"
 HOMEPAGE="https://github.com/xavierleroy/camlzip"
-SRC_URI="https://github.com/xavierleroy/camlzip/archive/rel$(delete_all_version_separators ${PV}).tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/xavierleroy/camlzip/archive/rel$(ver_rs 1- '').tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-rel$(ver_rs 1- '')"
 
 SLOT="1/${PV}"
 LICENSE="LGPL-2.1"
 KEYWORDS="amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE="+ocamlopt"
 
 RDEPEND=">=dev-lang/ocaml-4.05:=[ocamlopt?]
-		>=sys-libs/zlib-1.1.3"
+	>=sys-libs/zlib-1.1.3"
 DEPEND="${RDEPEND}"
 
-S="${WORKDIR}/${PN}-rel$(delete_all_version_separators ${PV})"
-
 src_compile() {
 	emake all
 	if use ocamlopt; then
@@ -30,6 +28,7 @@ src_compile() {
 
 src_install() {
 	findlib_src_preinst
+
 	emake DESTDIR="${D}" install-findlib
 
 	dodoc README Changes
diff --git a/dev-ml/camlzip/camlzip-1.10.ebuild b/dev-ml/camlzip/camlzip-1.10.ebuild
index 181f9c64d19a..244b689e332a 100644
--- a/dev-ml/camlzip/camlzip-1.10.ebuild
+++ b/dev-ml/camlzip/camlzip-1.10.ebuild
@@ -1,19 +1,19 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 inherit findlib
 
-IUSE="+ocamlopt"
-
 DESCRIPTION="Compressed file access ML library (ZIP, GZIP and JAR)"
 HOMEPAGE="https://github.com/xavierleroy/camlzip"
 SRC_URI="https://github.com/xavierleroy/camlzip/archive/rel$(ver_rs 1- '').tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-rel$(ver_rs 1- '')"
 
 SLOT="1/${PV}"
 LICENSE="LGPL-2.1"
 KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
+IUSE="+ocamlopt"
 
 RDEPEND=">=dev-lang/ocaml-4.05:=[ocamlopt?]
 		>=sys-libs/zlib-1.1.3"
@@ -24,8 +24,6 @@ QA_FLAGS_IGNORED=(
 	"/usr/lib.*/ocaml/zip/zip.cmxs"
 )
 
-S="${WORKDIR}/${PN}-rel$(ver_rs 1- '')"
-
 src_compile() {
 	emake all
 	if use ocamlopt; then
@@ -35,6 +33,7 @@ src_compile() {
 
 src_install() {
 	findlib_src_preinst
+
 	emake DESTDIR="${D}" install-findlib
 	dosym zip/libcamlzip.a /usr/$(get_libdir)/ocaml/libcamlzip.a
 
diff --git a/dev-ml/camomile/Manifest b/dev-ml/camomile/Manifest
index 48dac99c5e2d..4901e66d917f 100644
--- a/dev-ml/camomile/Manifest
+++ b/dev-ml/camomile/Manifest
@@ -4,4 +4,4 @@ DIST camomile-0.8.5.tar.bz2 2607084 BLAKE2B 5e0ff51cdd6d7ce41ee024189a793f3d3e4b
 DIST camomile-1.0.2.tar.gz 7032339 BLAKE2B 8cd60c74821c2c8e7084e752d1e4d67428c935859e02a8630f3f5563b53b3ce444071fa26153950f6a410b2743073692c7061e4f1f902c23e5fa54c50a89383c SHA512 d62ecaa297058b52674f98e513a6d776148fe62651b2b4a2dac4bb3e05abb8b7684960e889f68c6dab60aee669fbab715a2d6a9206645e24d10d8aaaf7cedf0e
 EBUILD camomile-0.8.5-r2.ebuild 960 BLAKE2B 8200c4a38975432cc86a3f0d968b9ca6a7514793952bb07b14553373ec52c742d6ef2c0e2dfa681337b9c1d8d001752ac9a42561cd60a8d40041727fc6a0612f SHA512 c3b1b0ee8e815f315ca5021fee8193647fca36e649557f307c2d33d56ff0adbf09ad786ffd12567265331a247c79326247d65f71dd49848d4aee10e2040e4960
 EBUILD camomile-1.0.2.ebuild 756 BLAKE2B 6f41b23d1a1da5c87c7bf33845147b05f37d6f5b8df38397ed1041ba5735608d819dd6f7c09099b77b11fc36f48e7389e188b2043d37896fd9f97512e3086638 SHA512 4c04ad6e91e98fe3513ebf2980f8104c4ddf081b32ff3266ad094a910c85c916600514196775615b3510927562b1ad3f6ad5ccb4a9e8b6cd295c6bba2b120529
-MISC metadata.xml 254 BLAKE2B 659f90317098f9ca6081145d61e53c8f7848dd0ef86b61b73f1c4c9362495a0704e02dacaaf53533dd92ace5ad0974c39abf0fb9d45dca258f4f58476931d43e SHA512 287ad112c67330f5f9f3c6e534b1d4f46d446c5b0469bddd58f9da886d02a243b8dd215ab36af9e2b1a100186d6f7ac61e988dbe62defc5cd31450ae38c24d40
+MISC metadata.xml 324 BLAKE2B 2b46a676df7d41a06cbd99a35115d57faa6454a4c0294cc27d5bd6f94bccaed255a711f23ad9a64f3ce8f7e7fcf539d21c10a6a24f1c51c43c0ae6aa1979a15a SHA512 f8f74153b96f912754b959ed65319803624dae1505498e462341b751797f44996f04a665f2ed73536c1aa0f1a59e5d271c5eb5c0fedd8431ada345a69c64f291
diff --git a/dev-ml/camomile/metadata.xml b/dev-ml/camomile/metadata.xml
index e037be5013c3..6a4596bff983 100644
--- a/dev-ml/camomile/metadata.xml
+++ b/dev-ml/camomile/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
+  <maintainer type="project">
+    <email>ml@gentoo.org</email>
+    <name>ML</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">yoriyuki/Camomile</remote-id>
   </upstream>
diff --git a/dev-ml/cinaps/Manifest b/dev-ml/cinaps/Manifest
index 844897748d71..0068f38fd52c 100644
--- a/dev-ml/cinaps/Manifest
+++ b/dev-ml/cinaps/Manifest
@@ -1,3 +1,3 @@
 DIST cinaps-0.14.0.tar.gz 9602 BLAKE2B 01d71b199dc966ac7653aca31d8a2e238102a5a29c4b6a1cf2ddd3f4624b41a4fd3e433025217951e7bd49b5eba21b6e4462217ef65a8755e6a4075683a55c5e SHA512 03f94ce7ab16d034edfc1976dd8fb83d533a1e5bc7f89dde3ea661553e05d6d8098c62c7e154013ef7814a283bb8cf535df0256891bcc6e0fdc847f6bf62aaf9
 EBUILD cinaps-0.14.0.ebuild 546 BLAKE2B 812924d3337d52509f9b618686d312c0baf513f481faaa0e40a75c68f7bc0bed6b017ddd74dca139c6b203e619e63b0375bd1cf9d3691c36c37a37fdbaf2dfb5 SHA512 435dd1825877bdfec0e7561e4255de9035d079b36ac52b7b65393e7478337da3a23164d2de6debaf2fcccb6aa2bab0a20fa888f4e052fd2a13278cde483e97a6
-MISC metadata.xml 325 BLAKE2B 34f357275544fa702af2111e6323d5320d8fc9ab0b95e83775f2d0c84fdb544c3d7b685dd83e7965ec2787543eadbad25d2e1fb75110dcb89f904e079f378e83 SHA512 095aee5cf4203e63dc3f08587d9f4e2a5365e7251f644acdf6bb495a558794fc11359ff95a2393cf0109e9e106fa3dcc6c31acabe92ab6e88f2d4bd971476973
+MISC metadata.xml 418 BLAKE2B 7bc68f327917734fb8039591095334b13f77ff7be363ed2da1d82c0c67c4222f68cde887869206d9c87d78809984e5c3f59519c37c98e5feb97df87a99c5b2cc SHA512 2e0427dbaa73bebaf022cc56b96baae31017bef48615b22750f77f8fa6726158cd6d80a107c646e00a7a53a1aa74117b9c0355e0f418b5ab6a686344e2adfadf
diff --git a/dev-ml/cinaps/metadata.xml b/dev-ml/cinaps/metadata.xml
index c68adc6e3a7f..b15b69a6000e 100644
--- a/dev-ml/cinaps/metadata.xml
+++ b/dev-ml/cinaps/metadata.xml
@@ -1,6 +1,10 @@
 <?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>
 	<maintainer type="person">
 		<email>gienah@gentoo.org</email>
 		<name>Mark Wright</name>
diff --git a/dev-ml/core/Manifest b/dev-ml/core/Manifest
index d743e355063d..723ab6fe64c1 100644
--- a/dev-ml/core/Manifest
+++ b/dev-ml/core/Manifest
@@ -1,6 +1,8 @@
 AUX glibc225.patch 380 BLAKE2B e645ff6879f9a8f4cadb7514cdc8ba2ef0fb7da6db6e34ab888803db25e8db085ee185740d5b80b0c3d2dcc38a010c26379c56857807518f33d27316bf4a6025 SHA512 e41e396448dfc15fa6625bf0356a9059f70e7f013a6e158df377b6d59df1c5b6e922b3704a20e47bfa68d1062022db50d07edaaf075ae1c1163dd9187d798865
+DIST core-0.14.0.tar.gz 361607 BLAKE2B 1602857bee142c23101380e6d54b6f8df1be8bb67e8f8baf7ca65c2f248d1ff9794e33d96cc58ca1f591b69e4a16b7873043549e01d38e2fc390c884d117d0a3 SHA512 fd3202c115ccda53aa32233f2eac223dcc3fb6272fd6327ea6aa5dcd3b7295936d86102640046c961a2af45d62aa3563a2701a2e0ef54f6cd2bfcb81609639f4
 DIST core-0.9.1.tar.gz 735006 BLAKE2B a85b66c810656aca74fbe82fda37a9d73ca295534b1ea5b2a784aef90c5efb8d571fe449d8b8d1f6c7d7365ed5d20a0a04c4d43374831e358ddc1147cc51f583 SHA512 2d4a7ff753cb0415cc6a957fff53037aad65053d3c3531070663b4bcf4462982c811a586a39ea3a223aca02cae9212c300b6788266ac60213437dc99ecc0a29a
 DIST core-0.9.2.tar.gz 735027 BLAKE2B d33b91d391446d8649ccb84d72f3533e72d2cdb5aca6359049dca0466ac6d23073dc59bc38bc1c9f7bbe47537731984d41a6ac67e4bf9f59ec7be47938bdfd71 SHA512 8cef59c353ff6f98b11bb007b99a583b64ee23f960a0de6559866c8ab59a58dd3ca4dae16275c87b780494b64ced7aaa24db8f9a6e6d309662e9d9206f04e335
+EBUILD core-0.14.0-r3.ebuild 634 BLAKE2B 1915b5a4edd51b855d442fb6b20b293eb68b4e8bfbd979a073ca4274eb87fa4497a32f36280e9f5cc247aa14d7048aba92cf8b4c1a6cffea3abc5b552e42b20e SHA512 5dc46b4bca66864a30676853683fb0bd64c5effe7d327c8badc181da6cfaeeff08a633710bf726d520b12225038c1261f354d307ee114b5451051326c6980d37
 EBUILD core-0.9.1-r1.ebuild 681 BLAKE2B 73b1ba03211e57a0c87fad34c9f6c50f7eaeef7bf55ad9c3f73c60a65dcadc3f7415daa26307fe90788b2e3e9f49423bb17e1612db3233d4ac6adcd4dd2714d5 SHA512 206d1fb5e11e08ad599a73e533701db51ad3788dadb429c5de3b3ae5a76f5809fe67cd55022928dc2243979a5ff71662809f8fc00509f50925547966ea4c0759
 EBUILD core-0.9.2.ebuild 640 BLAKE2B c9d79ab6fe6f54599206c1ec6bf48ffadec856a65a61ad711be0902fbc025b25755d764a18b147235292cd2688c07e56d177909b4d8df8abc4d24cade4eb9d54 SHA512 d87ea809a90e5df898f3a19ea108d432f2f717c35b295294022a5500921412041e6ae8c7142c82d4dcacd484ba47a9c2a64f59b617a1de0188b42473f54c7837
-MISC metadata.xml 639 BLAKE2B cd0bd212de26bbb681268f7fc5893a5663a49836d79cefa4f927bec38d33b694a00d2d17b96007b75c06736c26b3e0d4ea68fb4dc55b4c5598cca097dbbc5838 SHA512 4a305daa009018a25dd86b5808b762d8f38da49b2434a2e8e8dffd12bb154dd604ddd76676d073d10d964f514c491c915c7e749f518662326826e40df80835ce
+MISC metadata.xml 709 BLAKE2B 412a46fa866c78f170aa4fe749b8748da8aa33ed1e25755d794eb7477bdc4a3fc8be8d8a09846e6ecb1c5391c22e5b137cae07668d99d361c8ff32d5803f8564 SHA512 3a145f47d4958cc417121c97029f92dc4bbd5124ad53959d3b798164a80b7001075cb5ea5b0f04d1ef5c38f9eac0d716308225ff7f6a66e604a60d4197675069
diff --git a/dev-ml/core/core-0.14.0-r3.ebuild b/dev-ml/core/core-0.14.0-r3.ebuild
new file mode 100644
index 000000000000..56ab20e0b24d
--- /dev/null
+++ b/dev-ml/core/core-0.14.0-r3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Jane Street's alternative to the standard library"
+HOMEPAGE="https://github.com/janestreet/core"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="ocamlopt"
+
+# TODO: Wants quickcheck_deprecated?
+RESTRICT="test"
+
+RDEPEND="
+	dev-ml/base:=
+	dev-ml/core_kernel:=
+	dev-ml/jst-config:=
+	dev-ml/ppx_jane:=
+	dev-ml/sexplib:=
+	dev-ml/spawn:=
+	dev-ml/stdio:=
+	dev-ml/timezone:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ml/core/metadata.xml b/dev-ml/core/metadata.xml
index 29e5e37cbcc0..8957be334536 100644
--- a/dev-ml/core/metadata.xml
+++ b/dev-ml/core/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
+  <maintainer type="project">
+    <email>ml@gentoo.org</email>
+    <name>ML</name>
+  </maintainer>
   <longdescription lang="en">
   Core is Jane Street Capital's Ocaml standard library overlay.  It
   provides tail recursive versions of non tail recursive functions in
diff --git a/dev-ml/core_bench/Manifest b/dev-ml/core_bench/Manifest
new file mode 100644
index 000000000000..71eb23f19157
--- /dev/null
+++ b/dev-ml/core_bench/Manifest
@@ -0,0 +1,3 @@
+DIST core_bench-0.14.0.tar.gz 42972 BLAKE2B a65585d2cae5080e23d9b8897d15f7ac6e42c36280a06ff21b5f46d5532f3265b672f7d6373573826b80f5f6dc93343b3e93bf8c3d5b471e6717162e9fac4025 SHA512 e86a04c12832ba281669139d74e942ab1ff8d7dc799ea1687cf57a50ef1c7b031191aa1cc44c50586fcfca8e83c3c6f1a8b1aeb40c724fbaaa0e0568c393d75a
+EBUILD core_bench-0.14.0.ebuild 551 BLAKE2B 7d93e94e22c4c0adc20367f273bd1f83464c9d979f96192c482b264ce21c7a7dc477aeb1073dea015fba88a0dac2883819e050a1398304bbab7eb4f441455d8a SHA512 7990ad13baecfc185135ee4104d4ed8ac06ab6c861ebc41e9888a235e0933b6e39223cb02690fddd0421e474a1649686116f65f7626670d5812aab264ff64193
+MISC metadata.xml 318 BLAKE2B 6c71bcfdbe90f31ce88f8fbe97c81b777382b9e0caf52b58e3feb94d8e00a150f36d99ade835a4e15c97327863f406783323e8c0b284fca646f3c0e051e44a87 SHA512 e165990bffcbbd6d96ec6d915dfb97037016755cd94934b97ca51f99a369c4eca7bac28545e8e7714e60c9dec777fdad7c9e24360560654a0d35fcabf03c548a
diff --git a/dev-ml/core_bench/core_bench-0.14.0.ebuild b/dev-ml/core_bench/core_bench-0.14.0.ebuild
new file mode 100644
index 000000000000..2f601b8f89df
--- /dev/null
+++ b/dev-ml/core_bench/core_bench-0.14.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Micro-benchmarking library for OCaml"
+HOMEPAGE="https://github.com/janestreet/core_bench"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+ocamlopt"
+
+DEPEND="
+	>=dev-ml/core-0.14.0:=
+	>=dev-ml/core_kernel-0.14.0:=
+	>=dev-ml/ppx_jane-0.14.0:=
+	dev-ml/textutils:=
+	>=dev-ml/re-1.8.0:=
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-ml/core_bench/metadata.xml b/dev-ml/core_bench/metadata.xml
new file mode 100644
index 000000000000..9a90d2fb326c
--- /dev/null
+++ b/dev-ml/core_bench/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>ml@gentoo.org</email>
+		<name>ML</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">janestreet/core_bench</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ml/core_kernel/Manifest b/dev-ml/core_kernel/Manifest
index 2ac754445dd5..9529ce5d8d87 100644
--- a/dev-ml/core_kernel/Manifest
+++ b/dev-ml/core_kernel/Manifest
@@ -1,5 +1,7 @@
+DIST core_kernel-0.14.1.tar.gz 701832 BLAKE2B 0463641f8ab663f00dff59e1ac0b9693f15b71e4f9fa001b54d2449b8a18c8f618a7d7d3149084699d12d4c9834a20fcda6882549f4c69c219e3489ee1223dba SHA512 56488260fce8a066bba06efc349b4760c55d7d2fe38ed47dd7f37d0deb9ea05838a87713ec778df83d7805da5a54513a97d9e678640bb977bfd342bb748e7a33
 DIST core_kernel-0.9.0.tar.gz 502937 BLAKE2B 88a4fdfae2dc0d45c794faf925bd97d7e59558231540a8614d548133d58c576eabf342d2af358ea792ba7e59a79317e4c66aad3a4ff0c2f4b94f012d73e98d7c SHA512 c262f25636d7a5105810c9588774a56e21e58cd156302781db3463898be0a42d9c8b1984ead739d0659d6f3eece4a305fc45c7cad4ed57149d26344affbdb668
 DIST core_kernel-0.9.1.tar.gz 502985 BLAKE2B c924b104f3e0c5bce84a01408f8ac773ec16eb37f6dddfd8261886355c08d8536af60e573ded56936a299af6d8a7a16f37147e9660d65fece5ac8aa7d42a7a95 SHA512 ec0c3f72c52b975ef3d28b89190e0de3d9a60a842cde13f9a71f2d90101af3ccced06b4640d061362b89127140fe761dc19733da3f7dfabab189faef78343b7b
+EBUILD core_kernel-0.14.1-r3.ebuild 991 BLAKE2B dff71359a636daabf3aeee363293963e27046c1afbeb78ee2d74f9b479c4b526f774d07b8a374da19d1bd1d724c5ddbe5e1805b0c7d101bc1ef3f1d13eee695a SHA512 4dab481f7239c1a486a6f486a72e18074fdfd2f9fcf507ddf9552d67a56b77b9f3eea887401b099883a9a30c74bdb5f30fa8446e9b3c34acf5d1d8ac6117ec83
 EBUILD core_kernel-0.9.0.ebuild 1021 BLAKE2B af589eef268b1f0cc51f73bb6b1c54f55a1c0d84494e891c8c02e45408cdad874e105bcbf704deb7be477757914136a7ab1de60760c5c7879975d22b61dca839 SHA512 601feb35cd75f2eb4486bcd283d8e05dae3cd9ba7affc57ae59dd9f93fdefea9c8dd8eaecd6cd822c1af19b43200e52ee5a18471dc9748ad2910d7d00a0f3e2a
 EBUILD core_kernel-0.9.1.ebuild 1021 BLAKE2B af589eef268b1f0cc51f73bb6b1c54f55a1c0d84494e891c8c02e45408cdad874e105bcbf704deb7be477757914136a7ab1de60760c5c7879975d22b61dca839 SHA512 601feb35cd75f2eb4486bcd283d8e05dae3cd9ba7affc57ae59dd9f93fdefea9c8dd8eaecd6cd822c1af19b43200e52ee5a18471dc9748ad2910d7d00a0f3e2a
-MISC metadata.xml 574 BLAKE2B e7ace0439e45c61a7edd5e55e4ffb6d2e57ad3a57c17178edbef9ce42611a1b7e8d3e020a39798c3bf00580d0254989c44a1e8e72f09d528ec9dc37a5697ae5f SHA512 98dd5469422cb6f34a10d414da0dafee80d98e068fab6b7fb53b8c1f8858894f1641338b942ff3ebe4870f6fcb557647eaf6ef5ef1d8847f76da103b497a7414
+MISC metadata.xml 639 BLAKE2B 5691a0a727a87374d34c5e2c5f73bbbde1518159da96aa5768b54b056b4ac63a6e341acaa41ee4338f91d90147803be56b26fde91922b36ca3915517774325f7 SHA512 18d78302f5f1980d5a2f75ad1289de96686b570fb90e3c788caea20aad8e7ad5b6dadb8162633e3040db9670c18b52b7d89be83c113f82cd3de1baf278cec92f
diff --git a/dev-ml/core_kernel/core_kernel-0.14.1-r3.ebuild b/dev-ml/core_kernel/core_kernel-0.14.1-r3.ebuild
new file mode 100644
index 000000000000..1bf83ba6c0fe
--- /dev/null
+++ b/dev-ml/core_kernel/core_kernel-0.14.1-r3.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="System-independent part of Core"
+HOMEPAGE="https://github.com/janestreet/core_kernel"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+ocamlopt"
+
+# Wants quickcheck_deprecated for now
+RESTRICT="test"
+
+RDEPEND="
+	dev-lang/ocaml:=
+	dev-ml/base:=
+	dev-ml/base_bigstring:=
+	dev-ml/base_quickcheck:=
+	dev-ml/bin_prot:=
+	dev-ml/fieldslib:=
+	dev-ml/jane-street-headers:=
+	dev-ml/jst-config:=
+	dev-ml/ppx_assert:=
+	dev-ml/ppx_base:=
+	dev-ml/ppx_hash:=
+	dev-ml/ppx_inline_test:=
+	dev-ml/ppx_jane:=
+	dev-ml/ppx_sexp_conv:=
+	dev-ml/ppx_sexp_message:=
+	dev-ml/splittable_random:=
+	dev-ml/sexplib:=
+	dev-ml/stdio:=
+	dev-ml/time_now:=
+	dev-ml/typerep:=
+	dev-ml/variantslib:=
+	dev-ml/ocaml-migrate-parsetree:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ml/core_kernel/metadata.xml b/dev-ml/core_kernel/metadata.xml
index 4480feeb3ae8..04ce58761077 100644
--- a/dev-ml/core_kernel/metadata.xml
+++ b/dev-ml/core_kernel/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="project">
+		<email>ml@gentoo.org</email>
+		<name>ML</name>
+	</maintainer>
 	<longdescription lang="en">
 		Core_kernel is the system-independent part of Core.  It is aimed for
 		cases when the full Core is not available, such as in Javascript.  It
diff --git a/dev-ml/cppo/Manifest b/dev-ml/cppo/Manifest
index b5f193dc9065..c4281150804b 100644
--- a/dev-ml/cppo/Manifest
+++ b/dev-ml/cppo/Manifest
@@ -1,7 +1,9 @@
 DIST cppo-1.4.1.tar.gz 26547 BLAKE2B a93802fb36cfb622de32a00f6ad6d0fbc7c1022a65ab70558273654b817ca16a988fb8ce8c5dd0751e80eef066f3fcb82f25fc572edb312f346cd20830c08f5a SHA512 efbc82d2eb31b9e16c43ffbd7a2a56a5356934c32bee62205f55295a9342e4747ce13b9ad6572f3180e656b215a9255d402712ff7bae1ef9e8eccdabb2d00c16
 DIST cppo-1.5.0.tar.gz 26963 BLAKE2B 4118637bd8bcfc2edae4c7bf0d839b82ba3402c2f4df9de81bcb28685e4112ff364cb607dc9dcdc3512cc4fdf8dfb4cb85ceca945230bd7cd5d04e525d4e6587 SHA512 2cc144815b818242b6bb1dee213aa65345620eaf1afe59b25d118399d9a02d577aa9dc61dd5756661e44411acccdb2fc0320a8984e5f0d2a7390fcc816bac7e0
 DIST cppo-1.6.6.tar.gz 28667 BLAKE2B 57510ff824265065d4c4ba7d3da4b9aea389e005de4f2e73c1b43b230082872be0118e0b40d6c2951d4017210522a06eb089ab5cbb18fb48d29b87736fa59055 SHA512 80b0d7a5f0f5b7d9d62ddfb204ebf5e3216c2926ba7f667b9ef10981de6a51cd6d670b7062769bf6fbdd163c1c8fb5426a74c31234ddc03ec94a75645bf469da
-EBUILD cppo-1.4.1.ebuild 695 BLAKE2B c7dc10a7114ce9b7ada88cca2e5364c7cee6e045001ce27c7c1dc0c0b9bb7ed1bbff96e17125d20d12da189b819f01bb0e6e35f996cb404d2ec51e294c9ea5ff SHA512 2848f76920077d4ebd0ea45fcb12328357d01ff1e4cfd96a2f748a996b940e4b31b910b4f76aed984db211592e19b5ef642fb9f1246d7041197e6b7eeec23bd5
-EBUILD cppo-1.5.0.ebuild 999 BLAKE2B 00c8f29088141900ed6606151fd1bfad75ad0ba17511fce651bcb24f8b7db5922554b40ecc7c9c96642e07532680511628aab81949de3ddd480b7942ec0521b6 SHA512 58870cc7de903b2951df2ca9535775c7b3c021880997f57f50dbc0104c1086de872f4cf86e008c104379b672d7893ee626c8891efffccaa43ab75ad61042b504
+DIST cppo-1.6.7.tar.gz 29032 BLAKE2B cc02666ca5fbc903cf6a749ee08f7fe34bad4604635084bbf964afdde66783c01e3d48d515eb42a5188189fef67ebe7cf79c0205c60537c9d1a8b14f453fd248 SHA512 fb2865b4004fe3f17d5893659fca90c01557cf6be789500c54b06ac8e0d097181c9f6437f178aae6d786b3f6b639859bc68400f4a7c59e7acd4f296cf8271a9d
+EBUILD cppo-1.4.1.ebuild 692 BLAKE2B ccea873890aaf90d4d24e513accd74bb1670c5c337ec1748055c38b6d43257e8c1109ff9f3a028689a7894dc038689045e4165c950bac0711fbd17cbac43b5a1 SHA512 05e75dbd8db776093944ec83d84a827d04b02587edc0aa6d09e6a9faa2672f7a0700d893bf28085ba051138f465cb8e1556d6b9402e9d9ca088c5e359df4467d
+EBUILD cppo-1.5.0.ebuild 996 BLAKE2B 8cfb359c9d1d6750f7abb9b62f9d0518ccdf46b3a543f609c94346a8e938888ef77208dc783cff8e5a35c75510d4088cfc6f40b2d89a1eb3c796145954f3bed2 SHA512 e7a5d48dbb9476968c88ac9582bf60c2c39db5450f7971644ba84cdc7171b1f20e013a882c6e6a4893a9b3918479da9aecc80f4f06f14e60d1d11f058a6779d9
 EBUILD cppo-1.6.6.ebuild 494 BLAKE2B 46d27c808928cce0b416d174a675b4662821c5da078e4e501733adddcdb91df702c97f829de8bb8a09b1e18cffcf8f790d2cb129bef0b55d4ff8f23bfb783b4c SHA512 fd55f02cb284c211de1f39d4c98baf866ab5eb8df5653816bdc94ba19072cc75d64c8e2d50a678172b5689915d8e605bf3dd032a7c4e12dc53004edd4f5e241a
-MISC metadata.xml 329 BLAKE2B db38b8af799a1c79d09897a4b45d36bd7924ceb8d9d1875e2ebc91b293d9cb03bef31992be9eef9cdef96d543b78fd3410da4cea94e32767888120a8da4e6bcf SHA512 5ac7d5d1a4e3c856de0b3ffe653fab70e88fbacdf3925ce1a357d77e84d30d627632b5266093dc79b548cc4aa507b58ef22311c36403fa6f4a11bb83b8a3935a
+EBUILD cppo-1.6.7.ebuild 496 BLAKE2B f385f3a6b2b6e03f3ae36365cee9eb665b8d5ec65681ca83e852b0e69ae21b091ad57ea0d81e304d7eaa4f10be803af6d470485eaa7c5cf5df5fc9da109a5a96 SHA512 31bd1b2c5f8e212f0c9229ef2bcab04c69bfd044c42186dcf2c0636202debd693e33dd2f7a942f5f9363c44aaeb22af97e03d78e842691becce876bd44be612a
+MISC metadata.xml 422 BLAKE2B f14a59f4442289cb9c1c27922dbfa4049fb62c8c2aec05919bf0c8de749f2d18ee1e66d57cf9933c257ea009763bcdfec165af49161ba47e3bfa1afac4b474c8 SHA512 ac7300da07e509ef7c350f9c9ede10426a9d9b2f14c6346c8d7649d020da41ed40b0893b8c1e689b977596cf10d2990ca6c9578a8175153ef4d4d856d1a62f5c
diff --git a/dev-ml/cppo/cppo-1.4.1.ebuild b/dev-ml/cppo/cppo-1.4.1.ebuild
index e9730dd44aa4..c01764452e40 100644
--- a/dev-ml/cppo/cppo-1.4.1.ebuild
+++ b/dev-ml/cppo/cppo-1.4.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
 inherit findlib
 
@@ -21,9 +21,11 @@ DEPEND="${RDEPEND}"
 
 src_install() {
 	findlib_src_preinst
+
 	mkdir -p "${ED}"/usr/bin
 	emake PREFIX="${ED}"/usr install
 	dodoc README.md Changes
+
 	if use examples ; then
 		dodoc -r examples
 		docompress -x /usr/share/doc/${PF}/examples
diff --git a/dev-ml/cppo/cppo-1.5.0.ebuild b/dev-ml/cppo/cppo-1.5.0.ebuild
index edc62efc16d9..f6525a761bd7 100644
--- a/dev-ml/cppo/cppo-1.5.0.ebuild
+++ b/dev-ml/cppo/cppo-1.5.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
 inherit findlib
 
@@ -27,9 +27,11 @@ src_compile() {
 
 src_install() {
 	findlib_src_preinst
+
 	mkdir -p "${ED}"/usr/bin
 	emake PREFIX="${ED}"/usr BEST="$(usex ocamlopt '.native' '.byte')" install
 	dodoc README.md Changes
+
 	if use examples ; then
 		dodoc -r examples
 		docompress -x /usr/share/doc/${PF}/examples
diff --git a/dev-ml/cppo/cppo-1.6.7.ebuild b/dev-ml/cppo/cppo-1.6.7.ebuild
new file mode 100644
index 000000000000..2ceba92466f3
--- /dev/null
+++ b/dev-ml/cppo/cppo-1.6.7.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="An equivalent of the C preprocessor for OCaml programs"
+HOMEPAGE="https://github.com/ocaml-community/cppo/"
+SRC_URI="https://github.com/ocaml-community/cppo/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0/${PV}"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+RDEPEND="dev-ml/ocamlbuild
+	dev-ml/findlib:="
+DEPEND="${RDEPEND}"
diff --git a/dev-ml/cppo/metadata.xml b/dev-ml/cppo/metadata.xml
index 7ef499b5a200..afdbbf102335 100644
--- a/dev-ml/cppo/metadata.xml
+++ b/dev-ml/cppo/metadata.xml
@@ -1,6 +1,10 @@
 <?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>
 	<maintainer type="person">
 		<email>gienah@gentoo.org</email>
 		<name>Mark Wright</name>
diff --git a/dev-ml/csexp/Manifest b/dev-ml/csexp/Manifest
index d4c652c9b9fd..19f8eaa413f9 100644
--- a/dev-ml/csexp/Manifest
+++ b/dev-ml/csexp/Manifest
@@ -1,3 +1,3 @@
 DIST csexp-1.3.2.tbz 9775 BLAKE2B b1afea15558a5520abab214874653e9768ebbb22e064b51dab2f5bd5543460e357f9e1cba964341bcb24c5d53d8477de5458186e4d83db21d99a8ca45009d818 SHA512 ff1bd6a7c6bb3a73ca9ab0506c9ec1f357657deaa9ecc7eb32955817d9b0f266d976af3e2b8fc34c621cb0caf1fde55f9a609dd184e2054f500bf09afeb83026
-EBUILD csexp-1.3.2.ebuild 553 BLAKE2B ed1f0b0cb433e9d834452114a856aec71b5a0c22ee73adbf75b7b42d7e08b0cdd78d6ddef43caaeb89bb0bb882b0524b4c91bcd6a93f6eb34a5ae831a9795d8e SHA512 810d21e8a3cb5d8c053d8e52ee55f30a807b07fd3cfafa564e7db3b0728b29e50a9b0b6219a90f636f6cb71b9cc8df6cb6afca7a056f94ab1e5fc47ccba86ca8
+EBUILD csexp-1.3.2-r1.ebuild 569 BLAKE2B a1b3d56c1e8669a761aaf30579dbf2394a4daf56a08fef618998c8272c128a43cb2d92f016e282cff99937f7d5af03d07d7667b8c81862ab7dbaa1b38319729e SHA512 84a3cccd74eec24a1c72fb2804741754a46f538a01ccfc9a4a841d8df144450be132e00d6db5f148f4f7c080de002a0084650fba3185971163ef012aabcadeae
 MISC metadata.xml 325 BLAKE2B 84a7e8c2b5f618037eb78e8775da0e29de6e713e90e9c3b4db850db9b018107491ad972eacc433657e6498af4c30854844a6a6eaa0ec09e5689cd13ef1620157 SHA512 9de595bf191ff77f5b33213a8cfe4e2225666f88fa69fbb6c19703261ed12c546ed237b62a615edaefdd05fcc62b2e55b0822dcedf9dd78ced8f547188c2b9a7
diff --git a/dev-ml/csexp/csexp-1.3.2.ebuild b/dev-ml/csexp/csexp-1.3.2-r1.ebuild
index ce2e15d3f7e2..0516d13d6a6f 100644
--- a/dev-ml/csexp/csexp-1.3.2.ebuild
+++ b/dev-ml/csexp/csexp-1.3.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
 DEPEND="
-	dev-ml/result:=
+	dev-ml/result:=[ocamlopt=]
 "
 RDEPEND="${DEPEND}"
 BDEPEND=""
diff --git a/dev-ml/cudf/Manifest b/dev-ml/cudf/Manifest
index adc5f61c37f4..8f6cfe202111 100644
--- a/dev-ml/cudf/Manifest
+++ b/dev-ml/cudf/Manifest
@@ -1,4 +1,4 @@
 AUX ounit2.patch 380 BLAKE2B 20d0c2f0b719715fc5f111bfbd81e814a4ae8229a7365ed2073d0ecc3ad1eafa4377bc3c0e497d4bf0ab73af986255ac48e179d34dfb2ded3fd7b55c22f339ba SHA512 d53ac28ba8b8eeda612d7f323bb658f272dcc785596eb47b4148ed7954a6ca0204e42b5e3cb6a55211fc1117432f3088fdc215930c26238dc2d34f063f21b062
 DIST cudf-0.9.tar.gz 55124 BLAKE2B 013f97d13b732674a7d0f9188590bbb8150ae9dc32ce26b56fb04848629fb27a3c850aa327e687d6aa80eb62ba6f67af2fcf86a647520e73d7f76748871a79cc SHA512 4abdd1a5a3d616273abe9dda87450a922ecd69b64d32f34d8fa3086bbd07fd23ffb01c24b128bf4d1c0c817cfa1da8029e743d33b3ad6a04e7a8f706b098c427
-EBUILD cudf-0.9.ebuild 1642 BLAKE2B 0bac926cdaba47d0a1204245191cb84c243ebe001bf4d272905832896739e3228939e2eaa9735b0a5fea049b946c5ab6b1dae77ff51c6ef249fa545de3da2e98 SHA512 8f9c6ddac87ed93c18ad19c08057424e0c004d1283debbdbd67ad57af1c5cce6da62dcba62cfae04fc4fe10bb9de392c9ad096c0108ac7a15094ac454d8dbd87
-MISC metadata.xml 244 BLAKE2B c82f45966666e095a27d4d8b14f01f93e202177ea8222c5fc806f4e243b8ca653a61232533a6dd10ed36a35f765dc94cfc651f9fade565b8eedfe1129b5c2d23 SHA512 756b8d091c29b6c4c621ba30588da62cf99e777243fbdd88cc668f3ec071353beea675c853f8c58752fbc6c01c795760cb10428d3a7fd087967a88b885d91149
+EBUILD cudf-0.9.ebuild 1665 BLAKE2B 654c6928528fa77cde4e6a232d7f9dc42d0f72d46e625c1e874e73872bca64a1a0512bf563debc8a4e7233410a2bdfa681acdb8f5fe936a15edaee6d89557641 SHA512 12aab362367dab9fc93ac02c07ba25f493c26b7229fdb70be7e87d9c3eb7e02d8e430928288aa4c4e5d4f2cc208858789d67d9d1fc557441050b90bb6381a0bf
+MISC metadata.xml 337 BLAKE2B a5226f08e396ac186d438cd68a253580cc27d9bb0748e8afc49b7f2eafc3eda15d6add9c16bac268b75fd7cbb0ab160a1be8fe56e0ed3d902184157d581ab1c1 SHA512 5b913612f28ef5235ce57b6ec586f1b20d0ccaadfc760fe7cf8e186aeb4be261f8cd17f045de61edfda6c31f347ed965653c917b23523e3fd8d0071a3e845b4b
diff --git a/dev-ml/cudf/cudf-0.9.ebuild b/dev-ml/cudf/cudf-0.9.ebuild
index 9877b5c886cd..13002a67f912 100644
--- a/dev-ml/cudf/cudf-0.9.ebuild
+++ b/dev-ml/cudf/cudf-0.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -28,6 +28,8 @@ DEPEND="${RDEPEND}
 "
 PATCHES=( "${FILESDIR}/ounit2.patch" )
 
+QA_FLAGS_IGNORED='.*'
+
 src_prepare() {
 	default
 
diff --git a/dev-ml/cudf/metadata.xml b/dev-ml/cudf/metadata.xml
index a4f6be63adba..e24f3283a006 100644
--- a/dev-ml/cudf/metadata.xml
+++ b/dev-ml/cudf/metadata.xml
@@ -1,6 +1,10 @@
 <?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>
 	<maintainer type="person">
 		<email>gienah@gentoo.org</email>
 		<name>Mark Wright</name>
diff --git a/dev-ml/dose3/Manifest b/dev-ml/dose3/Manifest
index c5d3ba1faaba..d406f07c80ae 100644
--- a/dev-ml/dose3/Manifest
+++ b/dev-ml/dose3/Manifest
@@ -1,5 +1,8 @@
 AUX ocaml406.patch 1623 BLAKE2B 741d94b936ed59aa3b158cca587ee2aaddb72e06703cbeee13c7aadb1c062d38bdb7a8e06805a7dc4cc6a19cab829702e55797f7434b3aea402c8d8023e36783 SHA512 1ccc378bb32a7ced3b643590a5ebd3b4b5b31f256ba4067f64a1611abb74cba48f0e0da42fb498aa66ee17e3d2446b9683ff5eca64749360af7a147fbf36385b
 AUX unix.patch 406 BLAKE2B 270b1e747ab9f270c49ea2ccfee0734600160f1db2f6ee912467989e1c59b31a0840d3a83fa857000b50a5a61d29422629bc9eb2334c7b08db93ef43d12229f7 SHA512 f6d7a3d100c425767ce304c620376cf815b8de59b04aea7ee439e79159cb7aa96cf1903498173d341fcf8d61391edf0b183ab4cda17ce91f41db9aa25ae8aff5
 DIST dose3-5.0.1.tar.gz 297433 BLAKE2B 74ae954604f26398f091b4f14d2a633132ae62102f52af13284af27e41cd7c47afb1b533b0821a8921ba33fa6658e94b3bb6bf5f104f48881a50e14517cd65e2 SHA512 e66526319446054041f138ee2633043d0832089f6a554cf566a28de899d10383acfb1aa6bf1a368811602939676510933a7d2404fd34dbeba15045b458f5af84
-EBUILD dose3-5.0.1-r1.ebuild 1678 BLAKE2B 4d9ee4f7be0f91bdbbd92d256202e0a7f4f93ada147e95d4b8df002d0583636d87a81e9d59b060b13b51560786099c42451f6c5a1f31f2766c994878fcd39308 SHA512 ab0fceac967da108330269bb6b8a845e9a6406ffd3aaf83fb2ca16fa5d1bdedf31c05ab1986823e2c9b39ed1ec83409b1c2e369ad556dadb03e85d518e059ba2
-MISC metadata.xml 474 BLAKE2B 51884c8074342dbbe0e961495b12b69460ba0429134c50a75c68008fe54a8ea89dce28e114553b433f7c8dca503daee89b858c92995fd0aa4651bd1335e87a62 SHA512 245deea20a81b03063b19e4146982bd6a6d64b363153cdcdde811800c64f8d72861f749eac232f6530889ceb2fa84828db83376039868d3a097b488ba6331ee2
+DIST dose3_5.0.1-16.debian.tar.xz 39448 BLAKE2B a5ae8c74ee1a5a89bf3594cbaf0b37703fcf03a03e336c6b91626fcb6767518c517bf28ec4a24f6cbeb40e1544b34e95855507f39aacca110e8daa6e6e5d3994 SHA512 52d14a45bc0b0a66c4cf3acc05b479b1456c78fa8cb0e453a01dd2f0d849dfcf959bd9e8ff8d505272ad7ad542ff402013746816ead3ccd2dbd0bed572ee2930
+DIST dose3_5.0.1.orig.tar.gz 297433 BLAKE2B 74ae954604f26398f091b4f14d2a633132ae62102f52af13284af27e41cd7c47afb1b533b0821a8921ba33fa6658e94b3bb6bf5f104f48881a50e14517cd65e2 SHA512 e66526319446054041f138ee2633043d0832089f6a554cf566a28de899d10383acfb1aa6bf1a368811602939676510933a7d2404fd34dbeba15045b458f5af84
+EBUILD dose3-5.0.1-r1.ebuild 1701 BLAKE2B 634cbd813b0f1ab00051bdd0a673a271310ea4cd5e725f03119bf9f032f397cec1b22f79c770bfc4543c19b4169af6e573a501528870af08a304d8962d736b30 SHA512 847481213a6ba8b54348a67c7fffacc8bdf055570a5a21c6723bce6c8226f3e06e15e096ef5e537c30dffa2fafa24089823747a6f1cd6e0fc12656f6676f8c95
+EBUILD dose3-5.0.1_p16.ebuild 2185 BLAKE2B 37706f2e4eb4e2b1dbaf10dd703fe5380dc317ca0d7646d3fc82a4b54126929ccf077be431c348f463cc1f43c6d5c4e81c85475fba16267cb48ff9ca5b10390c SHA512 42c7869a91eaa1d2d9bd2ffb34bb61bcd614442d7f8f97d959d5a1d263912bdcd4b179a1a71fc4b307b129d60aec93a8416a10b0b9e422a47329755d0fd701c9
+MISC metadata.xml 567 BLAKE2B edf392175ce748915b9584ba1bb3885338c52f2c85f0beaa7695ecc556319af95d3485ab8bf94d97975e4cea2b30ddd47e31fe5df8a97911ddca0e720903c760 SHA512 254fd968a79b76a7ee792091a1106d20e76d168f57afa415aace3d150c793613c73d3bbd9d8a150d99595445ade1966da0dc059cb61dfae084478a5aeddb7fc8
diff --git a/dev-ml/dose3/dose3-5.0.1-r1.ebuild b/dev-ml/dose3/dose3-5.0.1-r1.ebuild
index c08cc798c4d6..76e47f4749fd 100644
--- a/dev-ml/dose3/dose3-5.0.1-r1.ebuild
+++ b/dev-ml/dose3/dose3-5.0.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -35,6 +35,8 @@ DEPEND="${RDEPEND}
 # missing test data
 RESTRICT="test"
 
+QA_FLAGS_IGNORED='.*'
+
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
diff --git a/dev-ml/dose3/dose3-5.0.1_p16.ebuild b/dev-ml/dose3/dose3-5.0.1_p16.ebuild
new file mode 100644
index 000000000000..a407b1aeddfe
--- /dev/null
+++ b/dev-ml/dose3/dose3-5.0.1_p16.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Library to perform analysis on package repositories"
+HOMEPAGE="http://www.mancoosi.org/software/ https://gforge.inria.fr/projects/dose"
+SRC_URI="http://deb.debian.org/debian/pool/main/d/dose3/${PN}_$(ver_cut 1-3).orig.tar.gz"
+SRC_URI+=" http://deb.debian.org/debian/pool/main/d/dose3/${PN}_${PV/_p/-}.debian.tar.xz"
+#SRC_URI="https://gforge.inria.fr/frs/download.php/file/36063/${P}.tar.gz"
+S="${WORKDIR}/${PN}-$(ver_cut 1-3)"
+
+LICENSE="LGPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt parmap zip bzip2 xml curl rpm4 test"
+
+BDEPEND="
+	dev-ml/cppo
+	dev-ml/findlib
+	dev-ml/ocamlbuild
+"
+RDEPEND="
+	>=dev-lang/ocaml-3.12:=[ocamlopt=]
+	dev-ml/cudf:=[ocamlopt=]
+	>=dev-ml/extlib-1.7.0:=[ocamlopt=]
+	>=dev-ml/ocamlgraph-1.8.6:=[ocamlopt=]
+	dev-ml/re:=[ocamlopt=]
+	parmap? ( dev-ml/parmap:=[ocamlopt=] )
+	zip? ( dev-ml/camlzip:=[ocamlopt=] )
+	bzip2? ( dev-ml/camlbz2:= )
+	xml? (
+		dev-ml/ocaml-expat:=[ocamlopt=]
+		dev-ml/xml-light:=[ocamlopt=]
+	)
+	curl? ( dev-ml/ocurl:= )
+	rpm4? ( app-arch/rpm )
+"
+DEPEND="${RDEPEND}
+	test? ( dev-python/pyyaml[libyaml] )
+"
+
+# missing test data
+RESTRICT="test"
+
+QA_FLAGS_IGNORED='.*'
+
+src_prepare() {
+	default
+	sed -e 's/INSTALLOPTS=-s/INSTALLOPTS=/' -i Makefile.config.in || die
+
+	# Not relevant to us, Debian specific adjustments
+	rm "${WORKDIR}"/debian/patches/0009-Fix-and-constraints-against-virtual-packages.patch || die
+	rm "${WORKDIR}"/debian/patches/binaries-prefix-edos || die
+
+	elog "Applying Debian patchset..."
+	for file in "${WORKDIR}"/debian/patches/*.patch ; do
+		eapply "${file}"
+	done
+}
+
+src_configure() {
+	econf \
+		$(use ocamlopt || echo "--with-bytecodeonly") \
+		$(use parmap && echo "--with-parmap") \
+		$(use zip && echo "--with-zip") \
+		$(use bzip2 && echo "--with-bz2") \
+		$(use xml && echo "--with-xml") \
+		$(use curl && echo "--with-curl") \
+		$(use rpm4 && echo "--with-rpm4")
+}
+
+src_compile() {
+	emake -j1 VERBOSE="-classic-display"
+}
+
+src_install() {
+	emake DESTDIR="${D}" BINDIR="${ED}/usr/bin" install || die
+	dodoc CHANGES CREDITS README.architecture TODO
+}
diff --git a/dev-ml/dose3/metadata.xml b/dev-ml/dose3/metadata.xml
index 99daf30cfd99..6a93d78a32ca 100644
--- a/dev-ml/dose3/metadata.xml
+++ b/dev-ml/dose3/metadata.xml
@@ -1,6 +1,10 @@
 <?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>
 	<maintainer type="person">
 		<email>gienah@gentoo.org</email>
 		<name>Mark Wright</name>
diff --git a/dev-ml/dune-configurator/Manifest b/dev-ml/dune-configurator/Manifest
index 8b69cbe8dbd9..507e77b8362a 100644
--- a/dev-ml/dune-configurator/Manifest
+++ b/dev-ml/dune-configurator/Manifest
@@ -1,3 +1,5 @@
 DIST dune-2.7.1.tar.gz 1290915 BLAKE2B 85a2dee92d1ead03b43b80742c291f4470dd9e1d843fdb257754c567e2329c101d11b42573da19de537f0d8591ebdacfcaab1099e0f46bdeebcd8421eb1bbcb2 SHA512 b77d0e207263107365e5a6e94423e8ab4ddbab1f920872d915e4014b7cc69915274b53fe946bb4b29dfe3de2bf5573ab3b2bffb4db8eb50b472e7dfb6cab88b7
-EBUILD dune-configurator-2.7.1.ebuild 608 BLAKE2B aab48888c87b6a842174432cae439cad8e9ae83585b644d7c4235e4b18cd1c828c48aa352036cd3f520911042ffb48cc8cf152c8ebba2dbcc3bd79803fa834b7 SHA512 f6fc52ddac772985feb0313e87bc147ed7c2d3b457bf515312343b2c8903025ce379525e82bb92d2c1ef9058cb67e303e4293f2f4243bc22a962f8a33a7c83f7
+DIST dune-2.8.2.tar.gz 1369417 BLAKE2B d846d35675a18abc3ccc57a52574d81a8fb4f082d9935912f035061c1107b47be8752daeb9c49bb2af4877e419a6c8bc30f846db6d773cf5267d3d761272a872 SHA512 fcbe45ea59492517e0868bf1f801c2bd2f3b1b30234e36d789c33e7ee48bd724726beb211697f3820609bbc27923c8c37d7be89dcbd059558014743360f2d0b7
+EBUILD dune-configurator-2.7.1.ebuild 616 BLAKE2B 7a73d59968781b649ac01eb206abe2ebbe6d395cb0aa2eeff29818f2be30a91d80727b5bdbb550aa8049103b48d089fc5c978da45f1f7e634ef86727073ca9f9 SHA512 26ff9e8ae6471ad1913547eb8afd31ed58a69959b4ed951bd2a8425d9a07c929240cafd7da3e3a913d2e0e8070e21fac1c677aba47d55790cae6106b4c3d7f25
+EBUILD dune-configurator-2.8.2-r1.ebuild 3684 BLAKE2B 87873ccfba0856089c00318aff2672dae8664713e6d4133496f2c3b96d1f2b3f5d707c4d9f81b2a002cc60a60dd8a0cb644fc4236bc8f8d65c856a1a307edb1f SHA512 deae15900de5d9218f843c90938badc0e91e62d975d8dacf7f0a1296165020acccf1b0bb819e3a24aae93a0d6bd18bf7215cca10cb19fe00dbcf9ca7b245989a
 MISC metadata.xml 319 BLAKE2B 65741bb0181ac6f6fb28019dc60386a5d47a2071131d8496adb14af1eff40000b59b2410acdf8ffa14fd4ad1d0bd6efacc1c67f68c162ed10e847a00db457aaf SHA512 8178e2c48fdd360ab7860dde1666bd2d0d0223f51275c58005aaab2d14946d4bb1e1e6be55a74d98afd6ef0acac515e2ebd0f7f44adbc9d2d7efbfcde641bd65
diff --git a/dev-ml/dune-configurator/dune-configurator-2.7.1.ebuild b/dev-ml/dune-configurator/dune-configurator-2.7.1.ebuild
index 3da9571b6f3e..933a27b61f8f 100644
--- a/dev-ml/dune-configurator/dune-configurator-2.7.1.ebuild
+++ b/dev-ml/dune-configurator/dune-configurator-2.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,6 +8,7 @@ inherit dune
 DESCRIPTION="A composable build system for OCaml"
 HOMEPAGE="https://github.com/ocaml/dune"
 SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz -> dune-${PV}.tar.gz"
+S="${WORKDIR}/dune-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
@@ -16,15 +17,14 @@ IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
 DEPEND="
-	dev-ml/dune-private-libs:=
+	~dev-ml/dune-private-libs-${PV}:=
 	dev-ml/csexp:=
 "
 RDEPEND="${DEPEND}"
 DEPEND="${DEPEND}
 	test? (
 		dev-ml/ppx_expect
-		)"
-S=${WORKDIR}/dune-${PV}
+	)"
 
 src_configure(){
 	:
diff --git a/dev-ml/dune-configurator/dune-configurator-2.8.2-r1.ebuild b/dev-ml/dune-configurator/dune-configurator-2.8.2-r1.ebuild
new file mode 100644
index 000000000000..c07c721c08b8
--- /dev/null
+++ b/dev-ml/dune-configurator/dune-configurator-2.8.2-r1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="A composable build system for OCaml"
+HOMEPAGE="https://github.com/ocaml/dune"
+SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz -> dune-${PV}.tar.gz"
+S="${WORKDIR}/dune-${PV}"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	~dev-ml/dune-private-libs-${PV}:=[ocamlopt=]
+	dev-ml/csexp:=[ocamlopt=]
+	dev-ml/result:=[ocamlopt=]
+"
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND}
+	test? (
+		dev-ml/core_bench
+		dev-ml/menhir
+		dev-ml/opam
+		dev-ml/ppx_expect
+	)
+"
+# TODO for test deps:
+# Add cram?
+# Add dev-ml/js_of_ocaml once dev-ml/ocaml-base64 is ported to Dune
+# Add coq?
+
+src_prepare() {
+	default
+
+	# Keep this list in sync with dev-ml/dune-private-libs
+	local bad_tests=(
+		# List of tests calling git, mercurial, etc
+		test/blackbox-tests/test-cases/dune-project-meta/main.t
+		test/blackbox-tests/test-cases/meta-template-version-bug.t
+		test/blackbox-tests/test-cases/subst/project-name-restriction.t
+		test/blackbox-tests/test-cases/subst/with-opam-file.t
+		test/blackbox-tests/test-cases/subst.t
+		test/blackbox-tests/test-cases/subst/unicode.t
+		test/blackbox-tests/test-cases/subst/from-project-file.t
+		test/blackbox-tests/test-cases/trace-file.t
+		otherlibs/build-info/test/run.t
+		test/expect-tests/vcs_tests.ml
+
+		# Strange failures, seemingly from newer versions of deps
+		test/blackbox-tests/test-cases/merlin/allow_approximate_merlin_warn.t
+		test/blackbox-tests/test-cases/merlin/merlin-tests.t
+		test/blackbox-tests/test-cases/merlin/github4125.t
+		test/blackbox-tests/test-cases/install-dry-run.t
+		test/blackbox-tests/test-cases/c-flags.t
+		test/blackbox-tests/test-cases/install-libdir.t
+		test/blackbox-tests/test-cases/dune-cache/trim.t
+
+		# Wants nodejs!
+		test/blackbox-tests/test-cases/jsoo/simple.t
+		test/blackbox-tests/test-cases/jsoo/inline-tests.t
+		test/blackbox-tests/test-cases/jsoo/github3622.t
+		# Wants js_of_ocaml (can't include yet b/c of ocaml-base64 porting)
+		test/blackbox-tests/test-cases/jsoo/explicit-js-mode-specified.t
+
+		# Wants coq which doesn't build for me right now
+		test/blackbox-tests/test-cases/coq/rec-module.t
+		test/blackbox-tests/test-cases/coq/compose-sub-theory.t
+		test/blackbox-tests/test-cases/coq/native-compose.t
+		test/blackbox-tests/test-cases/coq/base-unsound.t
+		test/blackbox-tests/test-cases/coq/base.t
+		test/blackbox-tests/test-cases/coq/native-single.t
+		test/blackbox-tests/test-cases/coq/compose-simple.t
+		test/blackbox-tests/test-cases/coq/ml-lib.t
+		test/blackbox-tests/test-cases/coq/extract.t
+		test/blackbox-tests/test-cases/coq/compose-plugin.t
+
+		# Unpackaged dependencies (a rabbit hole for now)
+		# utop -> lambda-term, zed
+		test/blackbox-tests/test-cases/utop/github3188.t
+		test/blackbox-tests/test-cases/utop/utop-simple.t
+		test/blackbox-tests/test-cases/utop/utop-default.t
+		test/blackbox-tests/test-cases/utop/utop-default-implementation.t
+		test/blackbox-tests/test-cases/utop/utop-ppx-rewriters.t
+		# ocamlformat
+		test/blackbox-tests/test-cases/formatting.t
+		# mdx
+		test/blackbox-tests/test-cases/mdx-stanza.t
+		# odoc
+		test/blackbox-tests/test-cases/odoc/odoc-simple.t
+		test/blackbox-tests/test-cases/odoc/odoc-package-mld-link.t
+		test/blackbox-tests/test-cases/odoc/multiple-private-libs.t
+		test/blackbox-tests/test-cases/odoc/odoc-unique-mlds.t
+		test/blackbox-tests/test-cases/odoc/github717-odoc-index.t
+		test/blackbox-tests/test-cases/odoc/warnings.t
+	)
+
+	rm -r ${bad_tests[@]} || die "Failed to remove broken/inappropriate tests"
+}
+
+src_configure(){
+	:
+}
diff --git a/dev-ml/dune-private-libs/Manifest b/dev-ml/dune-private-libs/Manifest
index 9af4d889ab85..4270363761b9 100644
--- a/dev-ml/dune-private-libs/Manifest
+++ b/dev-ml/dune-private-libs/Manifest
@@ -1,3 +1,5 @@
 DIST dune-2.7.1.tar.gz 1290915 BLAKE2B 85a2dee92d1ead03b43b80742c291f4470dd9e1d843fdb257754c567e2329c101d11b42573da19de537f0d8591ebdacfcaab1099e0f46bdeebcd8421eb1bbcb2 SHA512 b77d0e207263107365e5a6e94423e8ab4ddbab1f920872d915e4014b7cc69915274b53fe946bb4b29dfe3de2bf5573ab3b2bffb4db8eb50b472e7dfb6cab88b7
-EBUILD dune-private-libs-2.7.1.ebuild 900 BLAKE2B 175aefff20978b07dbf58d82f724a2dc5b3751de43994f433161e1148ef8dad307519ccb6136ee255623fdd501ff31f3cc62f4d1165af7c160cb0162b2a38385 SHA512 16b9ec86e3310e985517ce53813787f5d7c2a4a2c4273c5697e6703fec3be4057df6bb894526dc680c520efa83d33f9daf7b55793eadb03139301a3a4ae87216
+DIST dune-2.8.2.tar.gz 1369417 BLAKE2B d846d35675a18abc3ccc57a52574d81a8fb4f082d9935912f035061c1107b47be8752daeb9c49bb2af4877e419a6c8bc30f846db6d773cf5267d3d761272a872 SHA512 fcbe45ea59492517e0868bf1f801c2bd2f3b1b30234e36d789c33e7ee48bd724726beb211697f3820609bbc27923c8c37d7be89dcbd059558014743360f2d0b7
+EBUILD dune-private-libs-2.7.1.ebuild 900 BLAKE2B b3e7d5f8a27eb33f9b4043ed5da7ef126b512b6269fce527b8d2679b2b4638fbd26a6a0b736e5deee6df82fcf6fcf6e22aff2646be4c459f8933ffe6afef52e8 SHA512 2a084b0eb6c6b24c54d6ce50a47aa134e996c9198d308ba5852166c111a1329136ff22d375592b4d3212597303ac84548f5f013bf5353de984395a9f205d6049
+EBUILD dune-private-libs-2.8.2-r1.ebuild 3660 BLAKE2B 5d7bb728bedf2273474605c149b806692dbdf1ddc70fa81cd1c2e2916b4f3f49506446b3c80b86c3e6e525154679828930600690e1c36db764835783204ca5b2 SHA512 d161cc7efc8bb6f0043d1b4405e7fa0c4d27a7b1d94e57d97c0354502954fb0a3bcf82d21109c7fb40d8e1fb9343d0c6ecf27048c62cf98980466bedfb7951f6
 MISC metadata.xml 319 BLAKE2B 65741bb0181ac6f6fb28019dc60386a5d47a2071131d8496adb14af1eff40000b59b2410acdf8ffa14fd4ad1d0bd6efacc1c67f68c162ed10e847a00db457aaf SHA512 8178e2c48fdd360ab7860dde1666bd2d0d0223f51275c58005aaab2d14946d4bb1e1e6be55a74d98afd6ef0acac515e2ebd0f7f44adbc9d2d7efbfcde641bd65
diff --git a/dev-ml/dune-private-libs/dune-private-libs-2.7.1.ebuild b/dev-ml/dune-private-libs/dune-private-libs-2.7.1.ebuild
index 605aee40ddff..2c70da8f045b 100644
--- a/dev-ml/dune-private-libs/dune-private-libs-2.7.1.ebuild
+++ b/dev-ml/dune-private-libs/dune-private-libs-2.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
 BDEPEND="
-	~dev-ml/dune-2.7.1
+	~dev-ml/dune-${PV}
 	test? (
 		dev-ml/ppx_expect
 	)"
diff --git a/dev-ml/dune-private-libs/dune-private-libs-2.8.2-r1.ebuild b/dev-ml/dune-private-libs/dune-private-libs-2.8.2-r1.ebuild
new file mode 100644
index 000000000000..3ae039e8db0d
--- /dev/null
+++ b/dev-ml/dune-private-libs/dune-private-libs-2.8.2-r1.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="A composable build system for OCaml"
+HOMEPAGE="https://github.com/ocaml/dune"
+SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz -> dune-${PV}.tar.gz"
+S="${WORKDIR}/dune-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	~dev-ml/dune-${PV}
+	test? (
+		dev-ml/core_bench
+		dev-ml/menhir
+		dev-ml/opam
+		dev-ml/ppx_expect
+	)
+"
+DEPEND="
+	dev-ml/csexp:=[ocamlopt=]
+	dev-ml/findlib:=[ocamlopt=]
+"
+RDEPEND="${DEPEND}"
+
+# TODO for test deps:
+# Add cram?
+# Add dev-ml/js_of_ocaml once dev-ml/ocaml-base64 is ported to Dune
+# Add coq?
+
+src_prepare() {
+	default
+
+	# Keep this list in sync with dev-ml/dune-configurator
+	local bad_tests=(
+		# List of tests calling git, mercurial, etc
+		test/blackbox-tests/test-cases/dune-project-meta/main.t
+		test/blackbox-tests/test-cases/meta-template-version-bug.t
+		test/blackbox-tests/test-cases/subst/project-name-restriction.t
+		test/blackbox-tests/test-cases/subst/with-opam-file.t
+		test/blackbox-tests/test-cases/subst.t
+		test/blackbox-tests/test-cases/subst/unicode.t
+		test/blackbox-tests/test-cases/subst/from-project-file.t
+		test/blackbox-tests/test-cases/trace-file.t
+		otherlibs/build-info/test/run.t
+		test/expect-tests/vcs_tests.ml
+
+		# Strange failures, seemingly from newer versions of deps
+		test/blackbox-tests/test-cases/merlin/allow_approximate_merlin_warn.t
+		test/blackbox-tests/test-cases/merlin/merlin-tests.t
+		test/blackbox-tests/test-cases/merlin/github4125.t
+		test/blackbox-tests/test-cases/install-dry-run.t
+		test/blackbox-tests/test-cases/c-flags.t
+		test/blackbox-tests/test-cases/install-libdir.t
+		test/blackbox-tests/test-cases/dune-cache/trim.t
+
+		# Wants nodejs!
+		test/blackbox-tests/test-cases/jsoo/simple.t
+		test/blackbox-tests/test-cases/jsoo/inline-tests.t
+		test/blackbox-tests/test-cases/jsoo/github3622.t
+		# Wants js_of_ocaml (can't include yet b/c of ocaml-base64 porting)
+		test/blackbox-tests/test-cases/jsoo/explicit-js-mode-specified.t
+
+		# Wants coq which doesn't build for me right now
+		test/blackbox-tests/test-cases/coq/rec-module.t
+		test/blackbox-tests/test-cases/coq/compose-sub-theory.t
+		test/blackbox-tests/test-cases/coq/native-compose.t
+		test/blackbox-tests/test-cases/coq/base-unsound.t
+		test/blackbox-tests/test-cases/coq/base.t
+		test/blackbox-tests/test-cases/coq/native-single.t
+		test/blackbox-tests/test-cases/coq/compose-simple.t
+		test/blackbox-tests/test-cases/coq/ml-lib.t
+		test/blackbox-tests/test-cases/coq/extract.t
+		test/blackbox-tests/test-cases/coq/compose-plugin.t
+
+		# Unpackaged dependencies (a rabbit hole for now)
+		# utop -> lambda-term, zed
+		test/blackbox-tests/test-cases/utop/github3188.t
+		test/blackbox-tests/test-cases/utop/utop-simple.t
+		test/blackbox-tests/test-cases/utop/utop-default.t
+		test/blackbox-tests/test-cases/utop/utop-default-implementation.t
+		test/blackbox-tests/test-cases/utop/utop-ppx-rewriters.t
+		# ocamlformat
+		test/blackbox-tests/test-cases/formatting.t
+		# mdx
+		test/blackbox-tests/test-cases/mdx-stanza.t
+		# odoc
+		test/blackbox-tests/test-cases/odoc/odoc-simple.t
+		test/blackbox-tests/test-cases/odoc/odoc-package-mld-link.t
+		test/blackbox-tests/test-cases/odoc/multiple-private-libs.t
+		test/blackbox-tests/test-cases/odoc/odoc-unique-mlds.t
+		test/blackbox-tests/test-cases/odoc/github717-odoc-index.t
+		test/blackbox-tests/test-cases/odoc/warnings.t
+	)
+
+	rm -r ${bad_tests[@]} || die "Failed to remove broken/inappropriate tests"
+}
+
+src_configure() {
+	:
+}
diff --git a/dev-ml/dune/Manifest b/dev-ml/dune/Manifest
index 7fa6c9fa0181..3d8abcf3ceeb 100644
--- a/dev-ml/dune/Manifest
+++ b/dev-ml/dune/Manifest
@@ -1,5 +1,7 @@
 DIST dune-2.1.0.tar.gz 1170295 BLAKE2B 16ee2c34e0183bd255d23410f70001ca008b8e82815f93ad727079da00b8592d219e7664c93bed7b97b3a1e997306d60672b7d6c45fe6dae7371b4025df06722 SHA512 24afb44e458f819dfde3775b76c3ccf43f3fa5d8ce9a14ee9bf6658c1c116f95659c21a9ea208e5711c844fabc661cc434070bce6c9307154d506b6599ffb57f
 DIST dune-2.7.1.tar.gz 1290915 BLAKE2B 85a2dee92d1ead03b43b80742c291f4470dd9e1d843fdb257754c567e2329c101d11b42573da19de537f0d8591ebdacfcaab1099e0f46bdeebcd8421eb1bbcb2 SHA512 b77d0e207263107365e5a6e94423e8ab4ddbab1f920872d915e4014b7cc69915274b53fe946bb4b29dfe3de2bf5573ab3b2bffb4db8eb50b472e7dfb6cab88b7
+DIST dune-2.8.2.tar.gz 1369417 BLAKE2B d846d35675a18abc3ccc57a52574d81a8fb4f082d9935912f035061c1107b47be8752daeb9c49bb2af4877e419a6c8bc30f846db6d773cf5267d3d761272a872 SHA512 fcbe45ea59492517e0868bf1f801c2bd2f3b1b30234e36d789c33e7ee48bd724726beb211697f3820609bbc27923c8c37d7be89dcbd059558014743360f2d0b7
 EBUILD dune-2.1.0.ebuild 684 BLAKE2B 4b50322912687fb84f6636dddde7a61b89c4147a9a92c8bb03619adab13a23098473380076e84c2e1e5ed5c8f7c8250ee21c4ffc749433847216c272270a5756 SHA512 e9543ae6e8e26cea642dd709242076b6860ac584df7fdd005bc73fa441b551f566f64611008bad1d9875b2c09c5e941c71eb08df158d8e0a0359d8e7cb889b4c
 EBUILD dune-2.7.1.ebuild 754 BLAKE2B 9ce38f0520e2d851dba0949ab45b45764e76d9c1b1c50a75850e715deb4ef4aa7d2ba4774eae55eb3227b19d5ab0ad04a6ae23eb1bb044b17f0d895bb404110d SHA512 99826621d5b4d2be503e7c21f16382f31abd3de0c71dcc0d9edd5fd6e5c425a2de6f6be01fdd5b251efe3c5aadb500b03a1e989f91ae7cb560bba6345c4fae0c
+EBUILD dune-2.8.2.ebuild 760 BLAKE2B d041a466b7c3ad4ff20b2863e0c2fcb9a26dfe7b366438b321d2119984394264a3f425b8918fc757ac735761b9b1480f383b260368b3bedf2769c71309606e63 SHA512 d48d9f3cf170d5522a2093fdbe9f3b4b39c1e0b8223431c6d437ed4f1353c3f6ddfaa27eee4747607e7b9c035a18879be9f3b498d1749dabf4c86b6208b3f732
 MISC metadata.xml 412 BLAKE2B 1ac46aa4fe2b5f531debe5c283c36db66a98d2120ceaa389bb2fe5c9c989a8185d0c66df879bfcd65f89e6e304359beadd632e445220a633887237bc9159ad8d SHA512 74df6c8368d4283dbda004fba147e5fa5c82165dc6a7553bf61f49d93ef7283160f6c193505d42f4043e2d3ac3227d4d29ee99827845726f146603088a61d76a
diff --git a/dev-ml/dune/dune-2.8.2.ebuild b/dev-ml/dune/dune-2.8.2.ebuild
new file mode 100644
index 000000000000..2a7afe515103
--- /dev/null
+++ b/dev-ml/dune/dune-2.8.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multiprocessing
+
+DESCRIPTION="A composable build system for OCaml"
+HOMEPAGE="https://github.com/ocaml/dune"
+SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+DEPEND="dev-lang/ocaml"
+RDEPEND="${DEPEND}
+	!dev-ml/jbuilder"
+
+QA_FLAGS_IGNORED=/usr/bin/dune
+
+src_configure() {
+	:
+}
+
+src_compile() {
+	ocaml bootstrap.ml || die
+	./dune.exe build -p "${PN}" --profile dune-bootstrap -j $(makeopts_jobs) || die
+}
+
+src_install() {
+	default
+	mv "${ED}"/usr/doc "${ED}"/usr/share/doc/${PF} || die
+	mv "${ED}"/usr/man "${ED}"/usr/share/man || die
+}
diff --git a/dev-ml/extlib/Manifest b/dev-ml/extlib/Manifest
index 2e1fe7419b31..c8b0b529a979 100644
--- a/dev-ml/extlib/Manifest
+++ b/dev-ml/extlib/Manifest
@@ -1,5 +1,7 @@
 AUX extlib-1.7.7-no-git.patch 283 BLAKE2B 2cfc23016472905c9dfb28615bce04d607a70b99da69f1ed198c8cfdd677c1dd3d8b8a6756328bf35dbd59f81c7be143a5f5864110adca56cbc2dce8384d597d SHA512 b0b04d0fb6af94d7f54751fd00ab48101fb45d47e2230358edc956fd4d6fe04ce59b8aa6857fc1b07bb544fdade01eca6213de064c7d54b59f02e8265aebfb05
 AUX ocaml405.patch 1539 BLAKE2B d61c8398986a66664810684870351856ca94318a82d07194908c570aefc9b2b3196b95f651717b058e95b853e1862c3a27218afa71a809f766b908cde3e9cece SHA512 664c9b840b77d08095e03dbd398f6af3118237fbffe73499bc2b0ee0dc8e40311337e65f3e0e95b2f87dddb9e75b18d27d2b712b314f725d97fd537f2ca23e52
 DIST extlib-1.7.7.tar.gz 88870 BLAKE2B fff84524ef227718d3908c5b65f4b781360cebc0dca3a8862aa11ea671499b45192c5106769e104d396118e3cdcd904ddce06df784f8fd0eadb7a2372ca3df94 SHA512 088a6c5bbe6530cd60e2276dc02592b69ad7ad685b752f0544c54b6246b8131238c6423ce7bfc81fe3ad1766f605ecf52fd3888d55cca63e22c947afedf610c5
+DIST extlib-1.7.8.tar.gz 90213 BLAKE2B cf78d819c542e84825bea3422d1b9afb46a3f72274ac40c704ae872a5889cbe0793f1e27f2dd8f38dee118590300d3bc6a336bfd29a16dfad00008a63ceeb17c SHA512 4a0d5d82da068c34286a1547e173f2634372d01c201823edfda2b8f72d3ff58fa26da29dde9a8b2fda28989cdb655d5a9cfd71310660e5c593026a75a833e6c6
 EBUILD extlib-1.7.7.ebuild 974 BLAKE2B 088462e2f36d5f72718565c76e6c757192edfb0676328ffdffb025d7584af021f65e9ea5316720c5eab2ef559c99748e2f3433b77ead7e733bb3b85b89e6f153 SHA512 a8a764739942c825d62f05386ecc7b3a355890215133d9084f4bdb0e2b66fec6edae32e7d549926c10986114ef84c72c8baa35a85ff42adda2cd716af072f439
+EBUILD extlib-1.7.8.ebuild 923 BLAKE2B 91b5fe6195d9a19cec8b83a630f8feeb8be9d7c5cd4740d7e298e613816865710641aa6c6037e8dc5cc398898b6c878358c9e363d0484c059bc3e13cb9beee2a SHA512 df218e69c6b1b6afda5260ff79f8a0e9f5e66f431134c3b49061e556c6cc16ffb4fefb05640c1af858f3dae8014928c2d6ff6a7f9628c45c1118d6df4ae46cb7
 MISC metadata.xml 384 BLAKE2B 5cf5e456304e88b37a2a9635fecaa5536bb2bd58eda884676f93545969a3361eee4a0c94750352eef6fc7c63117391f58fb4a8bb9eec18ea8eb3dfb3c2f017de SHA512 88ad9b420b173c120be33305275c08becbce8c8490421cafffc1ba64131b27ebd88cfb8b1951d2e780c9eb93b45c38f9de83f2a134812edc38103e28f05f5f05
diff --git a/dev-ml/extlib/extlib-1.7.8.ebuild b/dev-ml/extlib/extlib-1.7.8.ebuild
new file mode 100644
index 000000000000..7061582188c4
--- /dev/null
+++ b/dev-ml/extlib/extlib-1.7.8.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit findlib vcs-clean
+
+DESCRIPTION="Standard library extensions for O'Caml"
+HOMEPAGE="https://github.com/ygrek/ocaml-extlib"
+SRC_URI="https://github.com/ygrek/ocaml-extlib/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/ocaml-${P}"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="doc +ocamlopt"
+
+# See bug #704146
+BDEPEND=">=dev-ml/cppo-1.6.6"
+RDEPEND="dev-lang/ocaml:=[ocamlopt?]"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	egit_clean
+}
+
+src_compile() {
+	cd src || die
+	emake -j1 all
+	if use ocamlopt; then
+		emake opt cmxs
+	fi
+
+	if use doc; then
+		emake doc
+	fi
+}
+
+src_test() {
+	emake -j1 test
+}
+
+src_install() {
+	findlib_src_install
+
+	# install documentation
+	dodoc README.md
+
+	if use doc; then
+		dodoc -r src/doc/
+	fi
+}
diff --git a/dev-ml/findlib/Manifest b/dev-ml/findlib/Manifest
index ceee55f4a3a1..2cb957b50feb 100644
--- a/dev-ml/findlib/Manifest
+++ b/dev-ml/findlib/Manifest
@@ -3,5 +3,5 @@ AUX externalmeta5.patch 562 BLAKE2B 0618a1691472c3248f63f157f2ba36d886a7b34b1813
 AUX externalmeta6.patch 546 BLAKE2B d0d5f75c46704b280ae4480ffe2ebca097adbc457c845615721888b45612da1a8e71b41bd6d8d9dadb16cdffa35108fc87a3dfd32313fa96d92f0021817e0112 SHA512 c112b7d44101e483d408c56dcd0d2524208b6e95b65a09dfe01f8ad6d09a20617020f9174cb4631473bab2550fec151329fb5e8d0e2e3378991f1ab88cce0301
 AUX externalmeta7.patch 527 BLAKE2B bf4a4aec02096766f9741705fbf99201c742abc992ddb05c143378d7bb6d0b79f3c3541199eb5a81142fa1b317980646c3fe12528f792cbfaa7762f024bd88d1 SHA512 61c1e03e5b0d021f2cd7d013bed54edd610edb48cf9f6c063d3542abea2d2fc811c1cf7284b54a584491064dee8dd4e72656ba90a63c144586f40705b8443a1d
 DIST findlib-1.8.1.tar.gz 261544 BLAKE2B acfa9d4e0d118ebbc0dd7b03da1fe5eaa994e5fec13dc54e60ba42f643d93968469a1a43fe4f832433dca6c3902e8846616fcf460c748bf037fe16cb2f93a847 SHA512 0d8e1ff21217fcc6823aab3ac71282789691e4ae8c3607703d0393468247f93e2d084bd4e2a8795b523f2c7f193521d3aae4b8122c934ebf8b58c3185a5bc9c1
-EBUILD findlib-1.8.1-r2.ebuild 1647 BLAKE2B e87f9ec61c280cbd09dbcfb9d18240d99b6ba6b044af9b0c5496278769b31ebc50fd9e4168bf9916dd6da5e1b3991a492a9c05f2bfd9e6c1c3af38c57a3ee545 SHA512 77a42202efbcc1b430464b660ba1e8b7cd01620f19453a8ef4cd4837fcc59c9f6a109b6b0b9a54b9390e18e63d43e29299c6cac8dfb4d7ed4500e0543688e7b6
+EBUILD findlib-1.8.1-r2.ebuild 1670 BLAKE2B f64382277a45d1cbe278e6eb389cafd2fb255363694b36483b8eef0c33af4f08db95f2ab14b13a02f985c3e8b04940a39cb175616ad9e224893175342ff4be38 SHA512 9c51f008f2a9ee6189ee1a541f8187a149195dd114694ef35cd0c7774bdb128bf32df8a4f8f28dccec656eb8d5540590f24fb458aec84cadb1b04bbededd03fa
 MISC metadata.xml 417 BLAKE2B 2ea51d563846cf4b4a6826678f68a32db60cd0c5174524701e6d91c59c8be896f26b6a7f7ce458b9466424d7325542219c7fb2b59d2114cf2a29a0d8772fe92f SHA512 d4243498f26d7517fd55467382b8968e75e3593f1d3ba76c87cc0a53746e6e500c2bab475e51c9490abccf4ca5044637f681f5b50ad090d72e580eff9358ca6e
diff --git a/dev-ml/findlib/findlib-1.8.1-r2.ebuild b/dev-ml/findlib/findlib-1.8.1-r2.ebuild
index fa1af8f3e840..bcbb3f9c90c2 100644
--- a/dev-ml/findlib/findlib-1.8.1-r2.ebuild
+++ b/dev-ml/findlib/findlib-1.8.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,6 +16,8 @@ DEPEND=">=dev-lang/ocaml-4.02.3-r1:=[ocamlopt?]
 	tk? ( dev-ml/labltk:= )"
 RDEPEND="${DEPEND}"
 
+QA_FLAGS_IGNORED='.*'
+
 PATCHES=( "${FILESDIR}"/externalmeta7.patch )
 
 src_prepare() {
diff --git a/dev-ml/lablgtk-sourceview/Manifest b/dev-ml/lablgtk-sourceview/Manifest
index e13c4b390ac4..27379c8d7d7b 100644
--- a/dev-ml/lablgtk-sourceview/Manifest
+++ b/dev-ml/lablgtk-sourceview/Manifest
@@ -1,3 +1,3 @@
 DIST lablgtk3-3.1.1.tbz 854720 BLAKE2B e6a916151fe1ca0746c14c2a66cd178f3b0c051976815a1d13daf801002f16bc76d9f4cb15625353f0cfbdc16b0a218857d72c4e57125050bbcffe67f7096ad0 SHA512 193c340d9941680869eb90bc89f5b27cc5bdf294f4635081a9ba56a99fa2982266c4ee2eb5fd04d3a3f6150082800de5df786def8c72a276a779d843d914e9e3
 EBUILD lablgtk-sourceview-3.1.1.ebuild 629 BLAKE2B d657d231acd61d13bba43ebdb668822af064bda7a703c21d8b0126f61842e9a6a0841b3a3868deb2d164b31e9768c73c1566ee8a1bf958ef627ac7efe33eae1c SHA512 0bedc3af016bec204d3740bdccb0301489582e006695bb6c2a95fc22de59ceb964d1c9af246b85bb6b22f939c29e44d597c533d30391d26c5949e3276e47c1c5
-MISC metadata.xml 319 BLAKE2B f3a6de363afedd8ecf6d5cd898b0ecc0c7da67070f8929f39f6e5395303505e9b2679cd32ba4445f155aa522bc09f5c6bdb09a3941f679c5eb1ff757040f0d40 SHA512 c251d0c83e251b9f20f83be5d67381c562400dc1567a4d3a32b396c309dc669b03f1d7e25e4d953c155d41aeaad07d47a67a2c602855cd45d5c9bb749dfa3b3f
+MISC metadata.xml 412 BLAKE2B 3cd375059a5716aba5f14f8004970adb55bbec02cf911cc5739475a80789c86ab6d27f192e4757191be8e914e61db531b330695eba224e81273e351d507bd57b SHA512 6119e7d8b9cf779ac2070b8cbe9820849fa80542e86b353d0cab9c60bca6e5d122a1e4f57a75f3189058587e9e8c7d8c5f37e5d4a22395506c437f411df1c4e4
diff --git a/dev-ml/lablgtk-sourceview/metadata.xml b/dev-ml/lablgtk-sourceview/metadata.xml
index 970e090f0dfd..856df00497e6 100644
--- a/dev-ml/lablgtk-sourceview/metadata.xml
+++ b/dev-ml/lablgtk-sourceview/metadata.xml
@@ -1,6 +1,10 @@
 <?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>
 	<maintainer type="person">
 		<email>gienah@gentoo.org</email>
 		<name>Mark Wright</name>
diff --git a/dev-ml/lablgtk/Manifest b/dev-ml/lablgtk/Manifest
index 71edbffeb3bd..b636ab08c531 100644
--- a/dev-ml/lablgtk/Manifest
+++ b/dev-ml/lablgtk/Manifest
@@ -6,5 +6,5 @@ DIST lablgtk3-3.1.1.tbz 854720 BLAKE2B e6a916151fe1ca0746c14c2a66cd178f3b0c05197
 EBUILD lablgtk-2.18.10.ebuild 1979 BLAKE2B fc3f2212c9629121a9c219783e525fa5a3ddc2aa61acc52ed03f5a4568d89e962b17151681e45d67f7a6438de86d82e28993631164ae68fecc5fda88f538a8b4 SHA512 89ec5fc71bfe6e07060c0830f07664cb2746471f6af527a1e517353fa2c467c8aae5fdc4699c7c459ec02a65b89b90bbcbd654fb0c2961e298e122391cdc280f
 EBUILD lablgtk-2.18.5.ebuild 2321 BLAKE2B 70d8ce75121c45fa78897e7217612e2cf135f70bda1950bc040c75e92db86ea704c383c65e98922824f372496f060bcc665c6b22b3e7f61518841be19c09a098 SHA512 ac8e9e5e6041d5c31563ad21d69c57c59ae70a19e8958d9f633e964dcf482e4f471d8695101fbbefcb2c3b709f7cbc651bf1bef2903d137fc77ddabb8011435a
 EBUILD lablgtk-2.18.8-r1.ebuild 1710 BLAKE2B e404ccdcd1b0329abbe678f23533243ecd31b2f6192ff3ce379c23e794a6eb25a70ec55c1a9783850f89961a4de18a2ac092ef7f2c828eb82078ca1ef7625315 SHA512 986b606bc6eeb8803852754790c5775f9666c6a9b14cea8a6f10382c789f22427c2c04c97586a6026273e9ef0d2de61703a58607786cbcf74fc130aa97eaa5ba
-EBUILD lablgtk-3.1.1.ebuild 677 BLAKE2B 76e30cc1a4488369c0ff545b615c609cd707ac60c8d5197e2817b3d064a69ccd64e60bee3cdb63bc2857bb0ed77509a849fe4bb63acfdc1a991ae1768e06eff5 SHA512 9e16aba68d8ce1b74508ee153f5eef04d7150080df95b6ac8effef9a17fbf5230a3e3f5a92f10419317c1ca9bcfa05949cf639232dd77b85a86e669b58d0ad54
+EBUILD lablgtk-3.1.1.ebuild 706 BLAKE2B 547a451dc152791fa1b083769e32a3342921e76eb082d654dd8d4919143225a8a1ee3b65e7be63cbb806c8ed55b4b374e5f19f26edcf09b942ea2061b6dece34 SHA512 416d7394291e715664668c8f6cec0834af47be303c2b68502a8efa0446f4f5a36678d7bbf0dcb07c6682bc607a4a87611ae2fe27bed21befa7b0fd8d0403263a
 MISC metadata.xml 553 BLAKE2B 90a0c974eeb82ca8d6c6634fa4c277ce2aa1352629462377178bfcab4928df5cf1cce9242b32c30447f006cab1297622c0f5ae16cab7030b23373f9bd67fd926 SHA512 dde726bb31037d7fe2490b2f578bae878c4f08a350ea732ed036ff2497c3bbf445953ff22f011a2e6e4fdf8295509fd3ef3f979c90157f35bb48c04efbde8302
diff --git a/dev-ml/lablgtk/lablgtk-3.1.1.ebuild b/dev-ml/lablgtk/lablgtk-3.1.1.ebuild
index 0f0e6f4670a1..0e6ba0790d0e 100644
--- a/dev-ml/lablgtk/lablgtk-3.1.1.ebuild
+++ b/dev-ml/lablgtk/lablgtk-3.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2020 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,6 +20,7 @@ DEPEND="
 	app-text/gtkspell:3=
 	x11-libs/gtk+:3=
 	dev-ml/cairo2:=
+	x11-libs/gtksourceview:3.0=
 "
 RDEPEND="${DEPEND}"
 PDEPEND="sourceview? ( dev-ml/lablgtk-sourceview:${SLOT} )"
diff --git a/dev-ml/llvm-ocaml/Manifest b/dev-ml/llvm-ocaml/Manifest
index 992590b65a10..f4d08c35a303 100644
--- a/dev-ml/llvm-ocaml/Manifest
+++ b/dev-ml/llvm-ocaml/Manifest
@@ -2,11 +2,16 @@ DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3
 DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc9da40911bbe9ee3531c15ada9165e5002b1c2f778cf8735858485ea05a8754e3d3a5f4b15bdd6cb33d64a14692984 SHA512 b6d38871ccce0e086e27d35e42887618d68e57d8274735c59e3eabc42dee352412489296293f8d5169fe0044936345915ee7da61ebdc64ec10f7737f6ecd90f2
 DIST llvmorg-11.0.1.tar.gz 122790338 BLAKE2B 0130996b4a8c4d9f757136fd7fb318068c9bfdc565060dec0d4336480c4ab66c4ae3185a7fdb05f13cf9ee8fd4123b09df938881b75d6e5d3689595114b7e32a SHA512 f5e6ef0b3111aae08a89cd01adb2ff4abfa9ef779c68b9190421d0447efd25c2cc00e5aae9f4764805f5fa31434866043d1510ae7389817e28ae53a5442e2fdf
 DIST llvmorg-11.1.0-rc1.tar.gz 122793491 BLAKE2B f4777455f5903cffea284eaffd872be6c287c6c1ebbd0c4b5b5473f146d7f5476f3551998a58d3e976ab90cde7b0d05db2b3be97f4e8e2c3474755ff38739268 SHA512 44e281486c44fa1611042ab658b9833a75f9613b7f896863613cfb99de66d13607fb1e9064f42ea3d89ca7951113465a90fd96ca4544262f165f78bd5261f5a8
+DIST llvmorg-11.1.0-rc2.tar.gz 122794772 BLAKE2B ab533f078d9d6c37e27c578866a07896344a0b4cf4ebf6402f4fa490213e017310d1c882bf63e552e99a5b4f6d1d8c01413420713b200bfa6732eff64f3c47a9 SHA512 88d8f1d938f0ba7ec39478d03a35c09a30bea51735276205494265b1061621b3ebcda8ee4211e896783b1b99a377c9fa68046118b0d6cb7fcb7bea1e960f95b7
+DIST llvmorg-12.0.0-rc1.tar.gz 134164708 BLAKE2B d4261ff7d9586b47f4cfda3d2cda4b76534f9e17fbd5cdb8861895b8eb466021962f4608bfcdeb52f8fce78850a994fd5eda0560f7211e5c8d1ac9330a738a36 SHA512 3d07d013d0705bb99f56898cc55d054d0d95aeb53b3c756cfab80b4c9097cc4935bcea89b9efde2e503a899b9fccf0dacc0073c9991c8ea352755c5ec68a757a
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD llvm-ocaml-10.0.1.ebuild 2990 BLAKE2B 3993630867acb739d621fa701f83e4c8ddbc44cb9b77e9c9ff1cbd173c18c894836a9eeb2aa2d9182fbed3e05af2d3cf180a535d27c74de4dd2f87afdadc8f99 SHA512 a6444d4877fc671390b0396f04a770363a5be803afa4f657c61bfb0449fa0aa8b68960f4be1ab6061d9c44f69d4130a64c6a4dff1d76e1896919ae2e59ec30d6
 EBUILD llvm-ocaml-11.0.0.ebuild 3052 BLAKE2B 9697dc5b6c2365415dd405b00c913606055d56366ef7710e559611c1bcd1b955777ae4d7836b75a49635bf5132feaf423af9ec7b033e34eb40864a6ecbed3c28 SHA512 855bcfbb8198e815c7d89dfed959fe95d78221eec20a6512c9190eb9e3d9c7b3ebada04a85ccf4653cf9e8e89e318b5339113b92afc1f99d8cd19ffd17c22dd5
 EBUILD llvm-ocaml-11.0.1.ebuild 3053 BLAKE2B cc4118d6db256fc34e0ec28a9baa2ffe4aaefbb622b236d86fabb482a27eb3a1e54c7dec13284d6a7b6e9a362dd67be18be73e462f7dfa2c0d459794a19c8db3 SHA512 a0c48923514eef7c205225cee0a0eb15fd0a65248f80a706e2db24731e279707fdd971a0f0ba71d106d3a871d746c98e9fe7bef33b051ffe40bccc007241be62
 EBUILD llvm-ocaml-11.1.0_rc1.ebuild 3037 BLAKE2B 04762e5e843d8d60f5482c3025bdd0c7de2d5b85e3d7eb51a1c0cf8133255406f5f3b4ae61892260bccc6b29825a06317bd06e8195d15a12ba7f8e081e53dcf3 SHA512 216a4d5586912c3d4f47aedc88aea2ddc066f24cb85d0949b89f7536d3bc3a998129abcdb556dcee72ad11ec9d67196031745d4235168430d9be7fa6ccfcd6f8
+EBUILD llvm-ocaml-11.1.0_rc2.ebuild 3037 BLAKE2B 04762e5e843d8d60f5482c3025bdd0c7de2d5b85e3d7eb51a1c0cf8133255406f5f3b4ae61892260bccc6b29825a06317bd06e8195d15a12ba7f8e081e53dcf3 SHA512 216a4d5586912c3d4f47aedc88aea2ddc066f24cb85d0949b89f7536d3bc3a998129abcdb556dcee72ad11ec9d67196031745d4235168430d9be7fa6ccfcd6f8
 EBUILD llvm-ocaml-12.0.0.9999.ebuild 3042 BLAKE2B bd3be02016d1136e2f87dd8da51ff1815f9edc633c1c109ddf108f53d1aaa68ad9af967261ffab5836eb96911071525f20741841e45fada95b6edeb1ce1adc54 SHA512 7610604754b5cd6be108c532b211532a30fb3320216ac7f9042673b50c2411058532d01166610f049f7ecbda6ea45fb495841ce0b4d1b58d14690473d347d206
+EBUILD llvm-ocaml-12.0.0_rc1.ebuild 3042 BLAKE2B 92c9c9929a39a703443c8b7cb36a0d6378b34240d26eb3c85dea90395f194e67ae21f27574e6fe9651cbfea8eb6b5f4ee1d103a4e2e991ea40eebe119131fc35 SHA512 a488d7e65fa77e42e45463f657c2c865b3502dc5d83c73a9b32e2dbca75a4379fdb30cab3b486c3a3b5353b260458c86f2a663197952dc35a7ae226996f0aeb2
+EBUILD llvm-ocaml-13.0.0.9999.ebuild 3042 BLAKE2B 92c9c9929a39a703443c8b7cb36a0d6378b34240d26eb3c85dea90395f194e67ae21f27574e6fe9651cbfea8eb6b5f4ee1d103a4e2e991ea40eebe119131fc35 SHA512 a488d7e65fa77e42e45463f657c2c865b3502dc5d83c73a9b32e2dbca75a4379fdb30cab3b486c3a3b5353b260458c86f2a663197952dc35a7ae226996f0aeb2
 EBUILD llvm-ocaml-9.0.1.ebuild 2952 BLAKE2B d0a7879b89bddff51521378d5cf96626b2bad80f35bae6b0026a51806fdc47139049b23a6ded6f64ce9161b1951341ec71e496a9b094e4b3aa1ca8c44e626cbb SHA512 f1937a057dd79a8fcb5ff587520199941d22e5d4ef18be5f5cc7c854e9d42e32beac3101f37897dd1ea32ef6a38a232685a11bee4b2cc83dfedbec3b5e08c75d
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-11.1.0_rc2.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-11.1.0_rc2.ebuild
new file mode 100644
index 000000000000..f3cecbcfbfae
--- /dev/null
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-11.1.0_rc2.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit cmake llvm llvm.org python-any-r1
+
+DESCRIPTION="OCaml bindings for LLVM"
+HOMEPAGE="https://llvm.org/"
+
+# Keep in sync with sys-devel/llvm
+ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC VE )
+ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430
+	NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore
+	"${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}" )
+ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0/${PV}"
+KEYWORDS=""
+IUSE="debug test ${ALL_LLVM_TARGETS[*]}"
+REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-lang/ocaml-4.00.0:0=
+	dev-ml/ocaml-ctypes:=
+	~sys-devel/llvm-${PV}:=[debug?]
+	!sys-devel/llvm[ocaml(-)]"
+for x in "${ALL_LLVM_TARGETS[@]}"; do
+	RDEPEND+="
+		${x}? ( ~sys-devel/llvm-${PV}[${x}] )"
+done
+unset x
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-lang/perl
+	dev-ml/findlib
+	>=dev-util/cmake-3.16
+	test? ( dev-ml/ounit )
+	${PYTHON_DEPS}"
+
+LLVM_COMPONENTS=( 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/llvm-ocaml/llvm-ocaml-12.0.0_rc1.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-12.0.0_rc1.ebuild
new file mode 100644
index 000000000000..1e25f7546b82
--- /dev/null
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-12.0.0_rc1.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit cmake llvm llvm.org python-any-r1
+
+DESCRIPTION="OCaml bindings for LLVM"
+HOMEPAGE="https://llvm.org/"
+
+# Keep in sync with sys-devel/llvm
+ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC CSKY VE )
+ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430
+	NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore
+	"${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}" )
+ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0/${PV}"
+KEYWORDS=""
+IUSE="debug test ${ALL_LLVM_TARGETS[*]}"
+REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-lang/ocaml-4.00.0:0=
+	dev-ml/ocaml-ctypes:=
+	~sys-devel/llvm-${PV}:=[debug?]
+	!sys-devel/llvm[ocaml(-)]"
+for x in "${ALL_LLVM_TARGETS[@]}"; do
+	RDEPEND+="
+		${x}? ( ~sys-devel/llvm-${PV}[${x}] )"
+done
+unset x
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-lang/perl
+	dev-ml/findlib
+	>=dev-util/cmake-3.16
+	test? ( dev-ml/ounit )
+	${PYTHON_DEPS}"
+
+LLVM_COMPONENTS=( 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/llvm-ocaml/llvm-ocaml-13.0.0.9999.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-13.0.0.9999.ebuild
new file mode 100644
index 000000000000..1e25f7546b82
--- /dev/null
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-13.0.0.9999.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit cmake llvm llvm.org python-any-r1
+
+DESCRIPTION="OCaml bindings for LLVM"
+HOMEPAGE="https://llvm.org/"
+
+# Keep in sync with sys-devel/llvm
+ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC CSKY VE )
+ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430
+	NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore
+	"${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}" )
+ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0/${PV}"
+KEYWORDS=""
+IUSE="debug test ${ALL_LLVM_TARGETS[*]}"
+REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-lang/ocaml-4.00.0:0=
+	dev-ml/ocaml-ctypes:=
+	~sys-devel/llvm-${PV}:=[debug?]
+	!sys-devel/llvm[ocaml(-)]"
+for x in "${ALL_LLVM_TARGETS[@]}"; do
+	RDEPEND+="
+		${x}? ( ~sys-devel/llvm-${PV}[${x}] )"
+done
+unset x
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-lang/perl
+	dev-ml/findlib
+	>=dev-util/cmake-3.16
+	test? ( dev-ml/ounit )
+	${PYTHON_DEPS}"
+
+LLVM_COMPONENTS=( 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/oasis/Manifest b/dev-ml/oasis/Manifest
index 0b13d2c77f95..e4b615f082bb 100644
--- a/dev-ml/oasis/Manifest
+++ b/dev-ml/oasis/Manifest
@@ -1,3 +1,3 @@
 DIST oasis-0.4.10.tar.gz 394732 BLAKE2B 6347e532d595e33a3a62f63669625d6de0081e8be90568a0e9f334b9745a40ec2593e7c79d21174f3119728c4831393efff0a3ab6d1aeadc594a0f96e5112a72 SHA512 c173a3a774d13a7cb21ddb44f89dadef210d331ab5f3a1e7ff1705e815572f70e22815736cc3f3788b6d8f784c21a309b45c5bf5e984e583b31931847bf107fd
-EBUILD oasis-0.4.10.ebuild 929 BLAKE2B 209e79c20f72fa4d77d16902238f73ea21fde215ed6cfa5119db83f4f4e672487f7236fee789ed571eeec9ec2c1acc30659741c3a38d065d21edd3a6e5d588de SHA512 f365a3a72680932b46e8bd3a571ffadb3514695a4ee8cfd7eada809517ee5d0f90a9faee90a1fd229413bfe505b7e5d285213253a14ad12c62ba10caa4bfe585
+EBUILD oasis-0.4.10.ebuild 892 BLAKE2B 68e49b5c33b3b3caa045f332a4cb9316998a6f6376a32c41535765a9d154be382b63b7129277c0c62df313d1d42888cfae796c30bdd5b256cd9cccbc24a18a50 SHA512 41db14a5b6612fe2c31b76ff0d80014aa77c66ac2f905c45e3ca5f04f6428cda080a05af0e44a7f8445c5ec5ba23b0964730d1596920a9a1b32c89c4916e213b
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-ml/oasis/oasis-0.4.10.ebuild b/dev-ml/oasis/oasis-0.4.10.ebuild
index 86cf986a25a6..9319826b935e 100644
--- a/dev-ml/oasis/oasis-0.4.10.ebuild
+++ b/dev-ml/oasis/oasis-0.4.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -18,7 +18,7 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND=">=dev-ml/ocaml-data-notation-0.0.11:=
+RDEPEND="
 	dev-ml/ocamlbuild:=[ocamlopt]
 	dev-ml/camlp4:=
 "
diff --git a/dev-ml/ocaml-data-notation/Manifest b/dev-ml/ocaml-data-notation/Manifest
index b92f266495f3..04bbcdff4221 100644
--- a/dev-ml/ocaml-data-notation/Manifest
+++ b/dev-ml/ocaml-data-notation/Manifest
@@ -1,3 +1,3 @@
 DIST ocaml-data-notation-0.0.11.tar.gz 63968 BLAKE2B bc01d71c6d98b5fa9aa2bbc5889e203f23b08e1e7b0c5bb5cd94170ad1be962aefb847ff6c263a52f93ec938a6ab2d2ebe7877b0c27e8018d8f05b170b13b67d SHA512 010c6105b0745c4dbf426186915078cd71d02d56e19ca01089a37f803c9d81c02a22e64184b9b4a42d44450834527a050ff20430f8c2d8a972610717f4c653d7
-EBUILD ocaml-data-notation-0.0.11-r1.ebuild 632 BLAKE2B c9bf8f64127beb3a815d17482f8e242bec5d9e037cf5da3bc22506b4170c4e4f65bf037c3a20d51d55c996c1c0865fcc0342b2dd2f5fb62cb44ba1e25ca1bf17 SHA512 4dc93949590437e5c85c6c0ec934589ed71ddfb94c5e21a5d1145a4a68d63631fd4ce16844eb74595d8e94aa97f211b2d5815c50a973e56aed79dc72d9f3d4f5
+EBUILD ocaml-data-notation-0.0.11-r1.ebuild 653 BLAKE2B bc223542c78d0b3adc90bfed9dcd0fc36149c9042fb3ee8aea11f43ce5d68ef7528db87e99b14a156472feaaf49447ab0575028958e875436deb00522ea1b538 SHA512 4ec36b77a921f77a7da3fd349c7162d19224385b9b3d613fca5e5f4aa50b75037bc0806f1f620c5e44f76eb62c836388116426a7305cf6022c3629a6c3c082bf
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-ml/ocaml-data-notation/ocaml-data-notation-0.0.11-r1.ebuild b/dev-ml/ocaml-data-notation/ocaml-data-notation-0.0.11-r1.ebuild
index 625122a633ef..61b555e00086 100644
--- a/dev-ml/ocaml-data-notation/ocaml-data-notation-0.0.11-r1.ebuild
+++ b/dev-ml/ocaml-data-notation/ocaml-data-notation-0.0.11-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -18,6 +18,7 @@ IUSE=""
 
 RDEPEND=">=dev-ml/type-conv-108.07.01:=
 	dev-ml/camlp4:=
+	~dev-lang/ocaml-4.05.0
 	"
 DEPEND="${RDEPEND}
 	test? ( >=dev-ml/ounit-2.0.0[ocamlopt?] dev-ml/ocaml-fileutils[ocamlopt?] )"
diff --git a/dev-ml/ocaml-gettext-camomile/Manifest b/dev-ml/ocaml-gettext-camomile/Manifest
index 778a734640c2..aaac2b9f7abd 100644
--- a/dev-ml/ocaml-gettext-camomile/Manifest
+++ b/dev-ml/ocaml-gettext-camomile/Manifest
@@ -1,3 +1,3 @@
 DIST ocaml-gettext-0.4.2.tar.gz 110249 BLAKE2B 54a25ba9f8fb20194fdfaf651586222fab68f927ebfa711812f7c9a387ff40c19e1bf3f63124127356b32b0ca0be2c5ff4e1cdfaf5f3afe690b90c0ca96c470d SHA512 fb89be8d8d9e0ed9327b81a0c81c884ff3f1a97e46b475ef8084abded5c84a256de05d5aa0f42be94f43ab438276a4506af726b6950e4161359a9616fb5832ec
-EBUILD ocaml-gettext-camomile-0.4.2.ebuild 856 BLAKE2B 1bbe74b8d4f85c0514c8d209cedbafc66986bf960eb743a1341acc5d93e0f03b1afba1332a268f96a8fce6adbd4d8537eb53bc457346a26f9a1dfc511564f039 SHA512 31524050e56a3117b204750f19f49865667eb28699cb16c4a0e171afe46ab4d077ea69747dad35518b85330ca5c0294b451cfafd227379036cf3b191bbbd1314
+EBUILD ocaml-gettext-camomile-0.4.2.ebuild 824 BLAKE2B 4ef48617501eb0c404a411c8cadf25b972700eff02a70e7520cc04d79cb0b7a82d93006ac474f4ebaacf8a62c349f4939c5d778d33438594e523354d485d9699 SHA512 1b0a43435dd49b20ab6943836bb7dd723b9505fc0c30c85f63f05f07678bfe1c012f1816d3708780a09ec0a6c38cf1aeafd05f2464b9a63364642cc7b383b883
 MISC metadata.xml 632 BLAKE2B d683f2b55fe66ac0ccae90494f7485042652afc9a1c01d583cef1fb9181b15d9a9d66c44eee51fb380318946288e9a05320896f376cc91992115349987ec8466 SHA512 70332af42127e51035802cf05ed4fff1d2ca363ecfe7c43a6db70277e6625de026091f2fc0b98158c283f7e3d9107d898708443121d935f6618ed0d822883610
diff --git a/dev-ml/ocaml-gettext-camomile/ocaml-gettext-camomile-0.4.2.ebuild b/dev-ml/ocaml-gettext-camomile/ocaml-gettext-camomile-0.4.2.ebuild
index 6a130e648f32..372ea5df6256 100644
--- a/dev-ml/ocaml-gettext-camomile/ocaml-gettext-camomile-0.4.2.ebuild
+++ b/dev-ml/ocaml-gettext-camomile/ocaml-gettext-camomile-0.4.2.ebuild
@@ -24,14 +24,14 @@ BDEPEND="
 	dev-ml/dune-configurator
 "
 RDEPEND="
-	dev-ml/base:=[ocamlopt]
+	dev-ml/base:=
 	dev-ml/camomile:=[ocamlopt]
-	dev-ml/ocaml-gettext:=[ocamlopt=]
+	dev-ml/ocaml-gettext:=
 "
 DEPEND="
 	${RDEPEND}
 	test? (
 		dev-ml/ounit[ocamlopt=]
-		dev-ml/ocaml-fileutils[ocamlopt=]
+		dev-ml/ocaml-fileutils
 	)
 "
diff --git a/dev-ml/ocaml-gettext-stub/Manifest b/dev-ml/ocaml-gettext-stub/Manifest
index fbc975bfc0e4..370db917e985 100644
--- a/dev-ml/ocaml-gettext-stub/Manifest
+++ b/dev-ml/ocaml-gettext-stub/Manifest
@@ -1,3 +1,3 @@
 DIST ocaml-gettext-0.4.2.tar.gz 110249 BLAKE2B 54a25ba9f8fb20194fdfaf651586222fab68f927ebfa711812f7c9a387ff40c19e1bf3f63124127356b32b0ca0be2c5ff4e1cdfaf5f3afe690b90c0ca96c470d SHA512 fb89be8d8d9e0ed9327b81a0c81c884ff3f1a97e46b475ef8084abded5c84a256de05d5aa0f42be94f43ab438276a4506af726b6950e4161359a9616fb5832ec
-EBUILD ocaml-gettext-stub-0.4.2.ebuild 848 BLAKE2B 83bb6bb6de2f3965bac79c0a759fcb23821c9d936c9793a65ff25e96b057104edd6396878083a5cc0cff80516f51f7d348a1fc9aa01f35d211a6aefd5b423747 SHA512 26127ddbbbda6cae9af889d6026915a64f80cf89ffe1e8913dbc463534b3b8ba0ed2c94630afff1dbda7deb7e1886eb46dddad263d39031fe3ff54f9d9194e27
+EBUILD ocaml-gettext-stub-0.4.2.ebuild 815 BLAKE2B 9026c3dcc230132991967252a9901e22435e51c84bf60677df7e277083e9926cec7a222cd1f6f02cf62aee468b49c3d82265b88b47597541e82a0b02ec681892 SHA512 eaf98bdc19abcc78506a09b5e406ec8927e350a37e55753162639583297900a5d8284f49a6e0a4e25bcae5f61b40181267ead3d665499d04a4e1b364df2dc16a
 MISC metadata.xml 632 BLAKE2B d683f2b55fe66ac0ccae90494f7485042652afc9a1c01d583cef1fb9181b15d9a9d66c44eee51fb380318946288e9a05320896f376cc91992115349987ec8466 SHA512 70332af42127e51035802cf05ed4fff1d2ca363ecfe7c43a6db70277e6625de026091f2fc0b98158c283f7e3d9107d898708443121d935f6618ed0d822883610
diff --git a/dev-ml/ocaml-gettext-stub/ocaml-gettext-stub-0.4.2.ebuild b/dev-ml/ocaml-gettext-stub/ocaml-gettext-stub-0.4.2.ebuild
index b44afdf69321..187b3fc10c97 100644
--- a/dev-ml/ocaml-gettext-stub/ocaml-gettext-stub-0.4.2.ebuild
+++ b/dev-ml/ocaml-gettext-stub/ocaml-gettext-stub-0.4.2.ebuild
@@ -24,14 +24,14 @@ BDEPEND="
 	dev-ml/dune-configurator
 "
 RDEPEND="
-	dev-ml/base:=[ocamlopt=]
+	dev-ml/base:=
 	dev-ml/camomile:=[ocamlopt=]
-	dev-ml/ocaml-gettext:=[ocamlopt=]
+	dev-ml/ocaml-gettext:=
 "
 DEPEND="
 	${RDEPEND}
 	test? (
-		dev-ml/ocaml-fileutils[ocamlopt=]
+		dev-ml/ocaml-fileutils
 		dev-ml/ounit[ocamlopt=]
 	)
 "
diff --git a/dev-ml/ocaml-gettext/Manifest b/dev-ml/ocaml-gettext/Manifest
index d9b1073b1ae0..7c64f71cb8e3 100644
--- a/dev-ml/ocaml-gettext/Manifest
+++ b/dev-ml/ocaml-gettext/Manifest
@@ -2,5 +2,5 @@ AUX ocaml-unsafe-string.patch 599 BLAKE2B 22e49acb160c01cfc9eed25bfbfbf45b281ca0
 DIST ocaml-gettext-0.3.7.tar.gz 134316 BLAKE2B 9de6ef9e04afbb6001ddc5ef145a687ad88a20eef1c27d3a3e6136f81ad46100cc6496cb66e3edfbf0f7eacfa8abbccb44d846d2f676862c96b8ceb860d8f424 SHA512 1358320359b9d2f3fd97a47d69b2a619942a65605c1e5cbf25e33ef42a10273167b526bca15e6c9523b87d8ea9dfd3215334050ad8eb84a8c41d4feef880a27a
 DIST ocaml-gettext-0.4.2.tar.gz 110249 BLAKE2B 54a25ba9f8fb20194fdfaf651586222fab68f927ebfa711812f7c9a387ff40c19e1bf3f63124127356b32b0ca0be2c5ff4e1cdfaf5f3afe690b90c0ca96c470d SHA512 fb89be8d8d9e0ed9327b81a0c81c884ff3f1a97e46b475ef8084abded5c84a256de05d5aa0f42be94f43ab438276a4506af726b6950e4161359a9616fb5832ec
 EBUILD ocaml-gettext-0.3.7-r2.ebuild 1359 BLAKE2B 7ec1b27566f101a7e71cef5f63bf498dacc1f5f1452ab00f96b7cc7061964a1e60d4c7ea9e285f1991a8168675ff537ba99f6fbc7f2e65d9bfd185e8cf62fca7 SHA512 1aff6ac57461fe13814c0c905657bdce746f40813c4f0980bc25e98a805dd7007ca9fac5d7856b098c862c55794949702630668078642b871bdbeda88fa622e4
-EBUILD ocaml-gettext-0.4.2.ebuild 793 BLAKE2B c04f15b0b6826c96c187eb2654167d3619b8cae6b26789e6005fbbe3017a751249912654a2481034fd8fd7728c2f2a08a99b62bcd9bc1791cefabd7a6b0c4970 SHA512 1dd366e4bb3b6ee09eddb2842fdda209618b117ff85aa03e58384758ccb18f8270cc23907aa3e52a6f8c2394d4051be19ec7b7755f609c7b286dbdc7dabdbcfc
+EBUILD ocaml-gettext-0.4.2.ebuild 782 BLAKE2B caaa2993e3b8aed055be1a07e6d339332d79f84550f34abc6bb13303d70ba6112613e47bef0136f992589010aa0b2b2b2b4e42701389038777665ed45e679cf8 SHA512 64442e7b6fd4218bfccbcbb1494138ab6e4fac7723b14f8e3cfdafc54498c87803d5d95be0355f22a71329c435a065692d9761b386c0011978307d53240c3ed8
 MISC metadata.xml 632 BLAKE2B d683f2b55fe66ac0ccae90494f7485042652afc9a1c01d583cef1fb9181b15d9a9d66c44eee51fb380318946288e9a05320896f376cc91992115349987ec8466 SHA512 70332af42127e51035802cf05ed4fff1d2ca363ecfe7c43a6db70277e6625de026091f2fc0b98158c283f7e3d9107d898708443121d935f6618ed0d822883610
diff --git a/dev-ml/ocaml-gettext/ocaml-gettext-0.4.2.ebuild b/dev-ml/ocaml-gettext/ocaml-gettext-0.4.2.ebuild
index 9a2746a6bbd2..62186a50ccd8 100644
--- a/dev-ml/ocaml-gettext/ocaml-gettext-0.4.2.ebuild
+++ b/dev-ml/ocaml-gettext/ocaml-gettext-0.4.2.ebuild
@@ -21,7 +21,7 @@ BDEPEND="
 	dev-ml/dune-configurator
 "
 RDEPEND="
-	dev-ml/base:=[ocamlopt=]
+	dev-ml/base:=
 	>=dev-ml/camomile-0.8.3:=[ocamlopt=]
 	>=dev-ml/ocaml-fileutils-0.4.0:=[ocamlopt=]
 	sys-devel/gettext
diff --git a/dev-ml/ocaml-sqlite3/Manifest b/dev-ml/ocaml-sqlite3/Manifest
index 7f2839644286..26e959bd809c 100644
--- a/dev-ml/ocaml-sqlite3/Manifest
+++ b/dev-ml/ocaml-sqlite3/Manifest
@@ -1,3 +1,5 @@
+DIST ocaml-sqlite3-5.0.2.tar.gz 33077 BLAKE2B 3f34a930477880326179a3014575db49bd9d614d90bdea98fc14af83287b889c6e02b8375dd5817c5139fe51706d83b332e148ccc084e46abf6b06ec9015a7c8 SHA512 330ac34490cbe004e9b950d7bbded2728b6a938179f3a19fb0043075c6d9a4e14fd82acea6c5787c84f2634d80017644bf988fd00b7dbd1374142771485cffd0
 DIST sqlite3-4.3.0.tbz 22498 BLAKE2B c57d8edbc0897229cb415d48efb02ae41dff1d87fabc667a40b984807c5c5885201dca3d7f523872435b7e18b450c15707212eeeafc0a75f1ad28d7e7671b4c7 SHA512 f09d425830ac24ea835a403bc51d257c265b6e77b1dce01367c715545cbd98f3ad2694e6dfdbc7491d590aa809c0313329e81c9614228170f90197f2a94200c9
-EBUILD ocaml-sqlite3-4.3.0.ebuild 706 BLAKE2B dcf608ec1e70b6ec84cdbc6c9666abf1b43c65bfa1c284ad1847431c5f9209d956654850b899772da3590e793e4e422a35011027bdc624573ce89d95e0ab4cb2 SHA512 04bd680d44d56e05eed62dd38a1a12c6400fd5cb88b200e5cb2308a24cc784fc892d89cf6402db3ce770f2e77c9ece22bc681afaef1a4c825a982e01d1ab3ca0
+EBUILD ocaml-sqlite3-4.3.0-r1.ebuild 705 BLAKE2B 2b3585e90674970e76263bdeb47d60bcbb682ca448eb56424da462c8cb87c4a484d7dc52165b5d9cf6b578354468ecfc9722e722144e34222512b618b6ff00d6 SHA512 d661ce041c0de98c65dda32942cf90a45e3acf3867af8856f45f6ff7b004bee3ce4a36afbfdd35ce0d36289fe439cf20c8a7433b85a0b9dfe642d30756cd8432
+EBUILD ocaml-sqlite3-5.0.2.ebuild 707 BLAKE2B 620442370bf3fbd264860ef9d8488897fa62275e80662c07971d15d8d495ce9bd256c852e2a2d6d0dd73560e84166e4f6aa2a3f31ffbc5bc03fee0242b397f10 SHA512 7f4490eb4eaea73e0c68e6beb1f1e0279e20056a84532b1d7584e07c66a9db056dfba2cc45ecd3aec741b6dfa8eca280f81de52a25d528276e20231996feedbe
 MISC metadata.xml 322 BLAKE2B 943cead5c3010411a8507ac09a05d88a413db06c3fac3967ecb6bde0bdddaa4bb9a7ea081e31e6382c805e3c437f64d26b254b0a630a963021c0507ec51e8526 SHA512 c3844393c1910c1982d20a00e04727028be2cf63a33daa48fba4ea13068cfd6b1d3d175446185e82ba3753880c0559d4b4ed0542243e55908569f603e2524c10
diff --git a/dev-ml/ocaml-sqlite3/ocaml-sqlite3-4.3.0.ebuild b/dev-ml/ocaml-sqlite3/ocaml-sqlite3-4.3.0-r1.ebuild
index f93d515733bf..646881f93fd5 100644
--- a/dev-ml/ocaml-sqlite3/ocaml-sqlite3-4.3.0.ebuild
+++ b/dev-ml/ocaml-sqlite3/ocaml-sqlite3-4.3.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,22 +11,20 @@ MY_P="${MY_PN}-${PV}"
 DESCRIPTION="A package for ocaml that provides access to SQLite databases"
 HOMEPAGE="http://mmottl.github.io/sqlite3-ocaml/"
 SRC_URI="https://github.com/mmottl/sqlite3-ocaml/releases/download/${PV}/${MY_P}.tbz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
 
 RDEPEND=">=dev-db/sqlite-3.3.3"
 DEPEND="${RDEPEND}
 	dev-ml/jbuilder
-	dev-ml/base
-	dev-ml/stdio
-	dev-ml/configurator
+	dev-ml/base:=
+	dev-ml/stdio:=
+	dev-ml/configurator:=
 	>=dev-ml/findlib-1.3.2"
 
-S=${WORKDIR}/${MY_P}
-
 src_compile() {
 	jbuilder build @install || die
 }
diff --git a/dev-ml/ocaml-sqlite3/ocaml-sqlite3-5.0.2.ebuild b/dev-ml/ocaml-sqlite3/ocaml-sqlite3-5.0.2.ebuild
new file mode 100644
index 000000000000..c27dbb6c239d
--- /dev/null
+++ b/dev-ml/ocaml-sqlite3/ocaml-sqlite3-5.0.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DUNE_PKG_NAME="sqlite3"
+inherit dune
+
+DESCRIPTION="A package for ocaml that provides access to SQLite databases"
+HOMEPAGE="http://mmottl.github.io/sqlite3-ocaml/"
+SRC_URI="https://github.com/mmottl/sqlite3-ocaml/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/sqlite3-ocaml-${PV}"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=dev-db/sqlite-3.3.3"
+BDEPEND="
+	>=dev-lang/ocaml-4.05
+	dev-ml/dune-configurator
+"
+DEPEND="${RDEPEND}
+	dev-ml/base:=
+	dev-ml/stdio:=
+	dev-ml/configurator:=
+	test? ( dev-ml/ppx_inline_test )
+"
diff --git a/dev-ml/ocaml-ssl/Manifest b/dev-ml/ocaml-ssl/Manifest
index fe4869fd1e2d..d472b159e63d 100644
--- a/dev-ml/ocaml-ssl/Manifest
+++ b/dev-ml/ocaml-ssl/Manifest
@@ -2,4 +2,4 @@ DIST ocaml-ssl-0.5.3.tar.gz 125431 BLAKE2B e95b6757f27fcac16dda1087880bb49ad8541
 DIST ocaml-ssl-0.5.9.tar.gz 32721 BLAKE2B c6b1ec659fddf384005f2cb045c0b0c059daaa93bd782904354e12e1ce63432c04c9bdc823dbfd0cd903ce872c91f0a750975cc69a56c9384ef6d09ed46c22cd SHA512 6826e5a6ab9f51013e8d097900f443d091e085e3d2d232a315a0e3a90ca334c9b9779d20dcae267f9ed961bc4a08fcb80372e669389c59a22d5c7706d37fcd5f
 EBUILD ocaml-ssl-0.5.3-r1.ebuild 619 BLAKE2B 183a3abfc50c321e29ad653cbe2055ba45873e621ffbed38d42008cf311ea3575de8209413b5dc91ed1eef8c2f1be9dfc9036b913e6f759293447dc91333183e SHA512 d6421c2302377ceed8b932b3f1e788ec77a53b6bdc9703f90a494b5cdba3a2f26e9eae81661a245a3cc395e5ffff5b0ae03aa78dad0de96597b5ce039b57c045
 EBUILD ocaml-ssl-0.5.9.ebuild 596 BLAKE2B c59b1a6b280d3506168a501dc5bb1162a276c9ea01873ba8a55351a4a9b769617b30f7918cee802370eee91b0bbad11fc1613df3f9da151146425ad8ece6f332 SHA512 e7f6faed62f89d48d15843779a0746f42d3c5b4dd27320695de4c7dc36a2e884bf693784dca6d4f2fccd3f412e2b5fe81f46941282b0a4b13ded5baaa1c62f33
-MISC metadata.xml 301 BLAKE2B e06adb641ac1eec98b9d60d7b7c8f01bf5d495133b91dd1c6a586a7a212d7f5c1dd27efb42d6807d5e16eea5281379c8dd5abe0b0955ca0552b20bb714909a38 SHA512 1ec6a683ca7f9f8dad10cad74ae7a43770751ebaf4bac889b373285ba8ff4f151a746ca8973c9de0008254596d519f919f1d06beebf813f757f2971c816c0add
+MISC metadata.xml 366 BLAKE2B 3500b88cfc5c67cc1cea168548db25e3c38b0e821dc9140b68472da7b8f11bedbcd9f9cf1c3bed002e4ce6848e83b2cf2a0531f0f60cd92a605596d5ed8ae8b4 SHA512 0d755921669d45da244c75aea1fdeadc05fca6c98256ba5b2afb8a524b8db705a91127a5e726cbd0f5be329a779a46578c941a93fc801a5ac373a6e8b0bc3e27
diff --git a/dev-ml/ocaml-ssl/metadata.xml b/dev-ml/ocaml-ssl/metadata.xml
index 6adf5ec8563f..35f7fc885090 100644
--- a/dev-ml/ocaml-ssl/metadata.xml
+++ b/dev-ml/ocaml-ssl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="project">
+		<email>ml@gentoo.org</email>
+		<name>ML</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">savonet</remote-id>
 		<remote-id type="github">savonet/ocaml-ssl</remote-id>
diff --git a/dev-ml/ocamlbuild/Manifest b/dev-ml/ocamlbuild/Manifest
index 61b3b7bebf7c..824e42cd4f02 100644
--- a/dev-ml/ocamlbuild/Manifest
+++ b/dev-ml/ocamlbuild/Manifest
@@ -2,8 +2,8 @@ AUX ocamlbuild-0.14.0-Disable-tests-failing-with-OCaml-4.08.0.patch 1259 BLAKE2B
 DIST ocamlbuild-0.10.1.tar.gz 193263 BLAKE2B cee82997a6b691b3df9b92055b74f05af57d7663f5dbb84701e66dffefcfe6ec00c9721e1872d546f2aea9237068e37ba7d94463d0002a8356dd4d84bc1865c0 SHA512 6d74bdce7fe147bf1a5fd570b569925b36b5f443c7251d1c13a0525e3086417b393a768722bf7d4b23a7e3178b0b3c2511499725c5a755d69783b8d555663e3b
 DIST ocamlbuild-0.11.0.tar.gz 195297 BLAKE2B 2d653c402edf58035fa6efb65c99c956fe78efc4759f29c8ddab8263310a5d243d25d37d4c1a4f0699f151afb6d4c6df4c1550f95d6e915963b3d86923877225 SHA512 14bc44cc63b6c99e711658a1145247bad8263632fbb4550238cef15e226a76b83e51b83575a7a96f16b96ec321dedd0ef23f36166c354838aec1922f58179efd
 DIST ocamlbuild-0.14.0.tar.gz 198267 BLAKE2B 355d61ba68e61b9ee18a9fc0fbb9062405f44707b180ca7ad4bfec727ca3d3d2cc08f17be118ca3a4161c7789d975e7f431812e9139d4fde85a1a27ab68c8ac3 SHA512 ae60247396399dfd35644c8c1986ef7679e5a9964df82e3388bfc6dd4c5b88a13d6869a698d14a9ac70dc48e4ce1c003f543c85426d8c862ca31dea37a554b07
-EBUILD ocamlbuild-0.10.1.ebuild 1031 BLAKE2B edadfe7eab8fb9bbac62d1711fb56ebb329e8fd200debca7e5a8d47faf724b42f914ab7fa7f081cc1e5a1592a1ebc354b3c3b8e70c80d3e6e5bad65bbd2951f3 SHA512 c1df06d5e700637d6727dc043d2961d780913fb331452ebf1e5a0e6238dc575037d3d732164c3f192ad82c458aa5baacec276577c5fe44e07bde7060173f1156
-EBUILD ocamlbuild-0.11.0.ebuild 1120 BLAKE2B 92d4e78b8838ebfaa40e65d6661b5bd9af4f927ca73cdb54cd16876449009749399b582f4b2027313d2007db7eef6d8687cfffb565ef6fcbc74b7f025c737381 SHA512 59f0cedc3c19c20615648a9b8b7ac985b69e15feefb6a300f8e1d31e537c1fd37c64b58d1e0560020536c8c5f53f10968b6b7aa9a481515dc73a0b46514f706f
-EBUILD ocamlbuild-0.14.0-r1.ebuild 1150 BLAKE2B 592a50d86404cc499729403e4ea98abb559561de32ef7cedd6cf1cbdfd8b3879824362a1e4a783bdf5b811dcbebff8c16a0b9a6cf195ea11c52bc2614129528e SHA512 308ea522a74c0616cc6be9b444d6e0aa1e09197d1e9e0b687b137063c790dc8a9f286e2356a81e62edf4b1723478140b50301abbcad7de99c69541d1157ccbe9
-EBUILD ocamlbuild-0.14.0.ebuild 1177 BLAKE2B 3303eaaddf96eb32aef1a71937ec85389b3108e18ad059aa7bf50f9ca6f0c6bb5d575ff735cf18ff6722b5f2250e725fbb00c48902010c8a43f6c7bde9b61699 SHA512 cc11a58163fba7984148f8cc5524229c27cc7d71f6e0628d1b0439199ab324377e9dfc0ae54d575cc24ada2ab64e9054b8fec749d05169675b8dd5d1a623a3ee
-MISC metadata.xml 325 BLAKE2B 4474d60afbe0f4d19ef042c32db7f2c5b34bdf57a2b701d5d56c332fb29cd0416085a29f929f97b19fa0a54c74884122b978e6d893e83b28414cbacee54ea8f1 SHA512 aa8a60033589617e002ee8a9b4cbc4eff318e26246365c380174a69ddc124c38a4d3e8da0227288cdcdd0d509c52ddd5011a15313c96fb029d3783ca872d69bf
+EBUILD ocamlbuild-0.10.1.ebuild 1031 BLAKE2B 36594f0b3fee9734ed55c8edab76b01fb8528283327a5756d266527814426090bfbd60d03ad5d3ab9a77054072aa3b414db32f8c7c771392ebe4439dd7805497 SHA512 9580877317e0bbc3a7eef88d30da6300c4d8674596da616941eb50973fcdcb8b4090c45aed060e8b44e433076aab280716970307fc9178b4d763915f83fb1747
+EBUILD ocamlbuild-0.11.0.ebuild 1120 BLAKE2B 0de8d511569993f8deffdafbdc45ef9f576e8fe8f5264e5778b4193d168fd0a08e1030699f1ea34b4c909b5c389f461e8a8e42457cce7968497a49d3705c4cf5 SHA512 fe109d7283802395837a2caf657f6a4b62afac50735b1782e1a92fa3ad57389bab20ba821bf8ea36e984c10d3b891911225f66f7f14ba18221581ee0d8e3ccb7
+EBUILD ocamlbuild-0.14.0-r1.ebuild 1172 BLAKE2B 19a1888d0c026c89ac028362d43fac01af74b6aa7b3c4da3014d53a8ecc2eaaaa2e63f5b550c2713ecc9385051044e7dbc19af89772cf7722064d2a7f0e3458b SHA512 35634a854926737192ab9697ed5de3f8e02c39e3e1f20eb62ae95c931f7c0e10c2bf5ea04979e6c93ff59451118b321ab58a93f815ae96242ea9f16b59f2e3d8
+EBUILD ocamlbuild-0.14.0.ebuild 1148 BLAKE2B c0a1747ce827fe7a63c62f84b3882719b2cdae53bb470d7af6b2a4ab7e0e7686055b580d6beea02cca9dd0a801fbe78cc426f853e36e0ca5f82f96aa5ca877d5 SHA512 8270b1fe39dbcd97c45e862b8f6356b8dd8d9b1b7e721e2a574c6c5ad26cbedc1e0642b14fc89b4300aa0a10c5d8895a0942a36b237e356064c0b219ff3eb67f
+MISC metadata.xml 418 BLAKE2B 7bffb3d1c5610c17816194ee3d07de5e3e1bebec3a22f065ce26e6746a1f55cc4564a3d5d6a75173eb68ba6c68715dc19fa6c888633d4886ef9e394870ec9195 SHA512 1f1cff72f8c7feb066b6946ffa15c291ead5c662d427af156e454c701d5aa13d7510b5811649882595b280b04fe5b9c2c643832cacac79360642fed0b1656d02
diff --git a/dev-ml/ocamlbuild/metadata.xml b/dev-ml/ocamlbuild/metadata.xml
index 234a45293e62..f4df6bd2b9a9 100644
--- a/dev-ml/ocamlbuild/metadata.xml
+++ b/dev-ml/ocamlbuild/metadata.xml
@@ -1,6 +1,10 @@
 <?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>
 	<maintainer type="person">
 		<email>gienah@gentoo.org</email>
 		<name>Mark Wright</name>
diff --git a/dev-ml/ocamlbuild/ocamlbuild-0.10.1.ebuild b/dev-ml/ocamlbuild/ocamlbuild-0.10.1.ebuild
index e290c9b2c3cc..ea2d235bcc93 100644
--- a/dev-ml/ocamlbuild/ocamlbuild-0.10.1.ebuild
+++ b/dev-ml/ocamlbuild/ocamlbuild-0.10.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 DESCRIPTION="Generic build tool with built-in rules for building OCaml library and programs"
 HOMEPAGE="https://github.com/ocaml/ocamlbuild"
diff --git a/dev-ml/ocamlbuild/ocamlbuild-0.11.0.ebuild b/dev-ml/ocamlbuild/ocamlbuild-0.11.0.ebuild
index 57eaf9b9882c..524c937beda6 100644
--- a/dev-ml/ocamlbuild/ocamlbuild-0.11.0.ebuild
+++ b/dev-ml/ocamlbuild/ocamlbuild-0.11.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 DESCRIPTION="Generic build tool with built-in rules for building OCaml library and programs"
 HOMEPAGE="https://github.com/ocaml/ocamlbuild"
diff --git a/dev-ml/ocamlbuild/ocamlbuild-0.14.0-r1.ebuild b/dev-ml/ocamlbuild/ocamlbuild-0.14.0-r1.ebuild
index 9f64c4e22b01..bf4f3bb4acf3 100644
--- a/dev-ml/ocamlbuild/ocamlbuild-0.14.0-r1.ebuild
+++ b/dev-ml/ocamlbuild/ocamlbuild-0.14.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -22,7 +22,9 @@ DEPEND="${DEPEND}
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.14.0-Disable-tests-failing-with-OCaml-4.08.0.patch
-	)
+)
+
+QA_FLAGS_IGNORED='.*'
 
 src_configure() {
 	emake -f configure.make Makefile.config \
diff --git a/dev-ml/ocamlbuild/ocamlbuild-0.14.0.ebuild b/dev-ml/ocamlbuild/ocamlbuild-0.14.0.ebuild
index 913b9be0fc9c..fc4760420dd5 100644
--- a/dev-ml/ocamlbuild/ocamlbuild-0.14.0.ebuild
+++ b/dev-ml/ocamlbuild/ocamlbuild-0.14.0.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-inherit eutils
+EAPI=7
 
 DESCRIPTION="Generic build tool with built-in rules for building OCaml library and programs"
 HOMEPAGE="https://github.com/ocaml/ocamlbuild"
@@ -22,9 +20,9 @@ RDEPEND="${DEPEND}
 DEPEND="${DEPEND}
 	test? ( dev-ml/findlib )"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.14.0-Disable-tests-failing-with-OCaml-4.08.0.patch
-}
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.14.0-Disable-tests-failing-with-OCaml-4.08.0.patch
+)
 
 src_configure() {
 	emake -f configure.make Makefile.config \
diff --git a/dev-ml/ocamlify/Manifest b/dev-ml/ocamlify/Manifest
index b11ea22a4258..c6cc9ec37c82 100644
--- a/dev-ml/ocamlify/Manifest
+++ b/dev-ml/ocamlify/Manifest
@@ -1,3 +1,3 @@
 DIST ocamlify-0.0.2.tar.gz 53184 BLAKE2B fff11edce964a0552f9a7f130872f393e764a9413ac526d643dd575969a47cbc6a0f9c5040c0fcd3e5beb11c42a8a3a35fe55898eab176b11c659bdd74729b90 SHA512 e36dd09de6163be1e4d1a54944bb66871a5d461b3ead9ee8393d91a624cf6f7d038be8d8b9db36b04786adff67eb830d9aa3e81475e774dc0dee73adb985079e
-EBUILD ocamlify-0.0.2.ebuild 500 BLAKE2B a4ff4a45975e46134a0854d53870b851d0603594e92a25af8cfbb9b5d3f3815f5a65e27fc36db856e7490be4e79332e871c00be7ec7949609c00dfd398e97d20 SHA512 e306f5dcb70b564b5f0925316c78aead556fcab45f93be395a88d5fbd5ee5f975c358814037f90d5dd2a5ad2f87356bedd1b16f7606ccb90433c9e178e21d92c
+EBUILD ocamlify-0.0.2.ebuild 519 BLAKE2B 3081c21b0f220a55d3ccec96c3d70129109f156be94b95b502722cb1b476097ffdc85403c06b4a64529148708e9e191ab948db27beca1777eec4c4adff4df93c SHA512 f4f9dc715ed90155817652f298473f27428b45c11985916e19b9db043d46a740664bc44f9ea6d6d39fcced87fc13f3a2bb5a3b0e66f42dba5bd274971723d927
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-ml/ocamlify/ocamlify-0.0.2.ebuild b/dev-ml/ocamlify/ocamlify-0.0.2.ebuild
index 0f54e07a5cc1..f5e146b1104b 100644
--- a/dev-ml/ocamlify/ocamlify-0.0.2.ebuild
+++ b/dev-ml/ocamlify/ocamlify-0.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-RDEPEND=""
+RDEPEND="~dev-lang/ocaml-4.05.0"
 DEPEND="${RDEPEND}"
 IUSE=""
 
diff --git a/dev-ml/ocamlnet/Manifest b/dev-ml/ocamlnet/Manifest
index df5582fd184f..70b604a23008 100644
--- a/dev-ml/ocamlnet/Manifest
+++ b/dev-ml/ocamlnet/Manifest
@@ -2,5 +2,5 @@ AUX ocaml405.patch 4761 BLAKE2B eb6a2fabcbcda0676652e4010e28edc8fd82b0d2307fb5d8
 DIST ocamlnet-4.1.2.tar.gz 4623183 BLAKE2B 7e8d5cdc823b9e924258f75f00957ba185d49555377ba2a2d960c47e2ea958059e1ab62e27be63770bb4f547e1fa0cb788a54c3e698180b2b15f0097fe84455a SHA512 69f42042a54efd662db2217224da53513fc7e72c7b2313d4a4a1128f1b4624f4f6298434f5b19f354b832119ff151abc81e85eb0108d6eb24f30f82d176e0b4d
 DIST ocamlnet-4.1.8.tar.gz 4620065 BLAKE2B 8f84ce4d79de5f4a1f26d4e45f68327042b0adc22717e56eeaca03ee6371e9251c01e8736d3afe5c00a1c65ef0286d56a04c57e80377402bb19ff87955ae98d9 SHA512 e238235968b9546c60568a38e68e354378d30e7137973332dcb10da21fa775ab7b367889fc51f5bd7cb00e51582834cafe2a0c4706b0bc77a44d4571a6f22815
 EBUILD ocamlnet-4.1.2.ebuild 1638 BLAKE2B b333c280a66e1500d2c99956c4d2bf21fc034e466fe2e777146f2477f88cf2709e22be8ffb03a1b991ffb9a5f1f28f7bc63b4f08e1fbee2217669313ccad5117 SHA512 5343d7253ae2019b0ddcda5ae1174038c3a32350b17c0b13216c9618f67101006b703e23d92b5462a15af1de250c0bc88754c55b9ea1970118d2a9253b4bfdd9
-EBUILD ocamlnet-4.1.8.ebuild 1630 BLAKE2B 36daf10d482752bcf2e84ee2cee4b5848bc0589c5ddbd402b6fbe36659f27a0669125de03a93ab224333ded36c0599009b8a26511187dd0f61d8f0643360c69e SHA512 ade6566f874f98a2fdf9843127fa0d16134d2c9b70da231e57dd6f18d80b3c79d27d8ef979b5f807f007d5b7087ffd7c035a2867a075b91da98056ec93962e82
-MISC metadata.xml 340 BLAKE2B a5d53a85c5073945cf7c9c2368fa6f6b290d617f47e4f71482ac784e969e5ac26dc7df9e6261cb892f21d285b28b8ec2cc09e4d196b1e0b137b294ed9aad79f8 SHA512 e3341232ffe5655584bf06dbe24f44909512d2f73cc2f47a67e1c0116e1b86fc410d6910f74f752adcd78fd7706ece9f20367e10a1b4b075a7064f69d6a8b490
+EBUILD ocamlnet-4.1.8.ebuild 1627 BLAKE2B 2cc9b2b01211d7ec7f7037c4acb0677a32f27ea540b77e70a2342ae3ff1c3cd748356f18ff235c899df20949d2148c4b4b36c3851d8bed2f25e3dbd4f6b797f6 SHA512 322f53cfcd5f74cdb3cedd23b20e95d87d7a2efd1aa0af14d510ec8597dd55dce40868dd67f7912dc9ecd058453c9dd1ff65cc2bdd8d4aeb1d2477181b01bb5e
+MISC metadata.xml 405 BLAKE2B 375c39f43bf129f891891710e6dc9125884f7ee0edad718664334d7fbcd612a812b019f9acacbf55868aa0d7b3f94b018f7e8b46a8a1a0228e53194fa16ac454 SHA512 102afded360029e38c9ff3a803280553c2f8d6af6756e28508ff2c2c237c62e21a3f2241d5c04b93c7d924adef2bbefe9e2696a6aa545b355fa1b98b78ef7b73
diff --git a/dev-ml/ocamlnet/metadata.xml b/dev-ml/ocamlnet/metadata.xml
index 91e25045ba2c..0923c7f5f4ff 100644
--- a/dev-ml/ocamlnet/metadata.xml
+++ b/dev-ml/ocamlnet/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="project">
+		<email>ml@gentoo.org</email>
+		<name>ML</name>
+	</maintainer>
 <use>
 	<flag name="httpd">Enables net-httpd web server component</flag>
 	<flag name="zip">Enables netzip support to read/write gzip data using object channels</flag>
diff --git a/dev-ml/ocamlnet/ocamlnet-4.1.8.ebuild b/dev-ml/ocamlnet/ocamlnet-4.1.8.ebuild
index 57417a9cbe37..88008b436c7c 100644
--- a/dev-ml/ocamlnet/ocamlnet-4.1.8.ebuild
+++ b/dev-ml/ocamlnet/ocamlnet-4.1.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -30,7 +30,7 @@ RDEPEND="
 	pcre? ( >=dev-ml/pcre-ocaml-5:= )
 	tk? ( dev-ml/labltk:= )
 	ssl? ( net-libs/gnutls:= )
-	gtk? ( >=dev-ml/lablgtk-2:= )
+	gtk? ( dev-ml/lablgtk:2= )
 	kerberos? ( virtual/krb5 )
 	zip? ( dev-ml/camlzip:= )
 "
diff --git a/dev-ml/ocamlweb/Manifest b/dev-ml/ocamlweb/Manifest
index 3a2c444cdc0b..529430d3c25a 100644
--- a/dev-ml/ocamlweb/Manifest
+++ b/dev-ml/ocamlweb/Manifest
@@ -4,5 +4,5 @@ AUX ocamlweb-1.41-strip.patch 705 BLAKE2B 207e1771412bdba7985cebcb349e5c8fca0921
 DIST ocamlweb-1.39.tar.gz 141866 BLAKE2B 14ab9c595133d34d9711da2232fdf6a89a7b134ec2537e70d6ee6ecbfdb19a8bfb6a1a7aed6207cbb1bbe1f5e7b651d33fed35d8f26129d69e29dc5995d5c342 SHA512 f4e2d330222378b632ace70efb7062c93002a85db6dc9a821706a76a1e1c00da4d4e82e618f162584003b821bc72d2d11508ae22474db61cc4367ed528d21d50
 DIST ocamlweb-1.41.tar.gz 141844 BLAKE2B b89b20bdc8b99d34069b2e32a6bd8c9684e294fba667a4b74080b34f37c6d90432c61e71e27f4f1772cda8a26891655bd99a21defa584f4a1c68ae1e0d58d454 SHA512 7a6403f8b0de3feeef9657e8aff10e6f1fe29edc400ce3f11c6435d6350314423fb74e192e4275a9ad47170019d6a960daf74f245539f0f3f2a6072cc7195442
 EBUILD ocamlweb-1.39.ebuild 669 BLAKE2B 6e16d76acdc5611f0f56dcfa5ec30b753b058200e7dc675da98c3e4b0241368fc5a831a210006f7546a1443331fafc1242455f40885c2903a514e44935b03285 SHA512 643b172a6b98ea4e790f4ea556d49733eaf4d08969046b8d8e88c429972c23f5e91bee3adef320119291510fcf68acdc05d89e07ee79e956748b44418b8b1266
-EBUILD ocamlweb-1.41.ebuild 723 BLAKE2B 03ab25140d652447c45361ef3e843d0b836436b785904ca03752157194a522f281227129e3e2361339c9d05232e0a07b6efb9738948a76fe07222f8bd5bcc2e4 SHA512 37489e88424c00029c7d4d8698bef36eb68af3fe402a5cba86bf437a6a08d071b603cda3b0695cd667f376000cf5f6b3810d9ba965351f562f60c81e5bba3142
-MISC metadata.xml 244 BLAKE2B c82f45966666e095a27d4d8b14f01f93e202177ea8222c5fc806f4e243b8ca653a61232533a6dd10ed36a35f765dc94cfc651f9fade565b8eedfe1129b5c2d23 SHA512 756b8d091c29b6c4c621ba30588da62cf99e777243fbdd88cc668f3ec071353beea675c853f8c58752fbc6c01c795760cb10428d3a7fd087967a88b885d91149
+EBUILD ocamlweb-1.41.ebuild 833 BLAKE2B 8d429855c837b246fb27d17c08175c60255ceae04ca8e5178ec0f5b754367f7ba1b5a4220c3a2880363dae2b7f0b547fc6b78e45001a9f3384cf42f776230c7f SHA512 3f6c22f28a223605d128ffe93545b66ba8478db329f695cbc628dc81501f4c194adc8a68836fce1a4d9ead6462df65c845fd80703f4542a56d9d4792957cf269
+MISC metadata.xml 337 BLAKE2B a5226f08e396ac186d438cd68a253580cc27d9bb0748e8afc49b7f2eafc3eda15d6add9c16bac268b75fd7cbb0ab160a1be8fe56e0ed3d902184157d581ab1c1 SHA512 5b913612f28ef5235ce57b6ec586f1b20d0ccaadfc760fe7cf8e186aeb4be261f8cd17f045de61edfda6c31f347ed965653c917b23523e3fd8d0071a3e845b4b
diff --git a/dev-ml/ocamlweb/metadata.xml b/dev-ml/ocamlweb/metadata.xml
index a4f6be63adba..e24f3283a006 100644
--- a/dev-ml/ocamlweb/metadata.xml
+++ b/dev-ml/ocamlweb/metadata.xml
@@ -1,6 +1,10 @@
 <?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>
 	<maintainer type="person">
 		<email>gienah@gentoo.org</email>
 		<name>Mark Wright</name>
diff --git a/dev-ml/ocamlweb/ocamlweb-1.41.ebuild b/dev-ml/ocamlweb/ocamlweb-1.41.ebuild
index 74561b53a6b0..9f050ccea33b 100644
--- a/dev-ml/ocamlweb/ocamlweb-1.41.ebuild
+++ b/dev-ml/ocamlweb/ocamlweb-1.41.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,19 +12,24 @@ SRC_URI="https://www.lri.fr/~filliatr/ftp/ocamlweb/${P}.tar.gz"
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
 
 DEPEND=">=dev-lang/ocaml-4.08.0:=
 	virtual/latex-base
-	dev-texlive/texlive-latexextra
-	"
+	dev-texlive/texlive-latexextra"
+BDEPEND="test? ( dev-tex/hevea )"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-1.41-strip.patch"
 	"${FILESDIR}/${PN}-1.41-ocaml-4.08.0.patch"
 	)
 
+QA_FLAGS_IGNORED=/usr/bin/ocamlweb
+
 src_compile() {
-	emake
+	default
 }
 
 src_install() {
diff --git a/dev-ml/opam-core/Manifest b/dev-ml/opam-core/Manifest
index 87bba10d765f..7856a8276593 100644
--- a/dev-ml/opam-core/Manifest
+++ b/dev-ml/opam-core/Manifest
@@ -1,3 +1,3 @@
 DIST opam-2.0.7.tar.gz 636708 BLAKE2B 2824a5c53f4103c267f99ae10f55df740b3afcc033321e888133817c0e53c4a8fc31738338df3d6d9ff8755987e85ade4a4726be98f77b06b81ffc1476d02c3d SHA512 2ade3998a94333a5a838b55e229ab0c707e678481cae892980b986fb86f39163070a9b7d3e0e87879cd57b91a33bf6a3e15f3786c3510a635e59383782218f1d
-EBUILD opam-core-2.0.7.ebuild 868 BLAKE2B 95450353248ac25ae9fa03c5f1f37ace1615dbe7c861011e906005835870e83a513b75b49a1bea8b48f2934439452695caea70bb9f224f75e4d28da31e3861ca SHA512 46dde7182f1ab6c0bd52368f158ec7a4038d3cc3b5b4ac7ac9486fe0f7a4bc02cf6ef5c61a855d8d17bed27e2acba6d3f0c5d463e10e6471f10c23a664c3bfe3
-MISC metadata.xml 319 BLAKE2B f3a6de363afedd8ecf6d5cd898b0ecc0c7da67070f8929f39f6e5395303505e9b2679cd32ba4445f155aa522bc09f5c6bdb09a3941f679c5eb1ff757040f0d40 SHA512 c251d0c83e251b9f20f83be5d67381c562400dc1567a4d3a32b396c309dc669b03f1d7e25e4d953c155d41aeaad07d47a67a2c602855cd45d5c9bb749dfa3b3f
+EBUILD opam-core-2.0.7.ebuild 881 BLAKE2B 5317553f7648ebd3342b41bc79df2551f1d273c3e56cc9a005389da88ab4c0c126bb33852e8c7ef28d3f67f8f4a00866b67e0baef67821ee5edf9592d38f710f SHA512 046cf40b69c68f5cc46c0a27eef99e637c4d22afbfdf55a9f274ca40673b42de50db97193239c49dfbcecc98b986fbc551df2bb6ac243fbe22435d7b4a0faf3b
+MISC metadata.xml 412 BLAKE2B 3cd375059a5716aba5f14f8004970adb55bbec02cf911cc5739475a80789c86ab6d27f192e4757191be8e914e61db531b330695eba224e81273e351d507bd57b SHA512 6119e7d8b9cf779ac2070b8cbe9820849fa80542e86b353d0cab9c60bca6e5d122a1e4f57a75f3189058587e9e8c7d8c5f37e5d4a22395506c437f411df1c4e4
diff --git a/dev-ml/opam-core/metadata.xml b/dev-ml/opam-core/metadata.xml
index 970e090f0dfd..856df00497e6 100644
--- a/dev-ml/opam-core/metadata.xml
+++ b/dev-ml/opam-core/metadata.xml
@@ -1,6 +1,10 @@
 <?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>
 	<maintainer type="person">
 		<email>gienah@gentoo.org</email>
 		<name>Mark Wright</name>
diff --git a/dev-ml/opam-core/opam-core-2.0.7.ebuild b/dev-ml/opam-core/opam-core-2.0.7.ebuild
index a6adc1400f93..4b51dfbcea38 100644
--- a/dev-ml/opam-core/opam-core-2.0.7.ebuild
+++ b/dev-ml/opam-core/opam-core-2.0.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -23,7 +23,8 @@ RDEPEND="
 	dev-ml/opam-file-format:=
 	dev-ml/cmdliner:=
 "
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	dev-ml/cppo"
 
 S="${WORKDIR}/opam-${PV/_/-}"
 OPAM_INSTALLER="${S}/opam-installer"
diff --git a/dev-ml/opam-format/Manifest b/dev-ml/opam-format/Manifest
index 3c888fff621a..01ca2a4322f3 100644
--- a/dev-ml/opam-format/Manifest
+++ b/dev-ml/opam-format/Manifest
@@ -1,3 +1,3 @@
 DIST opam-2.0.7.tar.gz 636708 BLAKE2B 2824a5c53f4103c267f99ae10f55df740b3afcc033321e888133817c0e53c4a8fc31738338df3d6d9ff8755987e85ade4a4726be98f77b06b81ffc1476d02c3d SHA512 2ade3998a94333a5a838b55e229ab0c707e678481cae892980b986fb86f39163070a9b7d3e0e87879cd57b91a33bf6a3e15f3786c3510a635e59383782218f1d
-EBUILD opam-format-2.0.7.ebuild 849 BLAKE2B 212adcdb209318c15e0bd587b2291509ea7a59d1d4589afd6b561ef436ffc6df70daa1cfed8b986a6625b95634c9a5553a5028c75dd2681eee6cac28b1b9c8d2 SHA512 637949eb0eee32363c56f4c7e33f8ad550fd2e6a02cc9781578e8e25199b3bd05016e52f46bb0ba12af387841a304de2c474b6684c1735c39170c22705cc79cb
-MISC metadata.xml 319 BLAKE2B f3a6de363afedd8ecf6d5cd898b0ecc0c7da67070f8929f39f6e5395303505e9b2679cd32ba4445f155aa522bc09f5c6bdb09a3941f679c5eb1ff757040f0d40 SHA512 c251d0c83e251b9f20f83be5d67381c562400dc1567a4d3a32b396c309dc669b03f1d7e25e4d953c155d41aeaad07d47a67a2c602855cd45d5c9bb749dfa3b3f
+EBUILD opam-format-2.0.7.ebuild 862 BLAKE2B 0316aa5785f1ff0a234f3db0caf6a6179686ad733f52e7b4f4f22f2d38fd76ceea0d2ff4e51539b97f54fb6b275054a69a30bafb5f30390d29cfaf0f7396c011 SHA512 fdd83c330936dc436d1d56131b384d2ff729c293558dcd321358bb3c9e384ae15ff545b98da81378a8acf9107155ab28e91db9a99b80fcf261f4abde78b6aeed
+MISC metadata.xml 412 BLAKE2B 3cd375059a5716aba5f14f8004970adb55bbec02cf911cc5739475a80789c86ab6d27f192e4757191be8e914e61db531b330695eba224e81273e351d507bd57b SHA512 6119e7d8b9cf779ac2070b8cbe9820849fa80542e86b353d0cab9c60bca6e5d122a1e4f57a75f3189058587e9e8c7d8c5f37e5d4a22395506c437f411df1c4e4
diff --git a/dev-ml/opam-format/metadata.xml b/dev-ml/opam-format/metadata.xml
index 970e090f0dfd..856df00497e6 100644
--- a/dev-ml/opam-format/metadata.xml
+++ b/dev-ml/opam-format/metadata.xml
@@ -1,6 +1,10 @@
 <?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>
 	<maintainer type="person">
 		<email>gienah@gentoo.org</email>
 		<name>Mark Wright</name>
diff --git a/dev-ml/opam-format/opam-format-2.0.7.ebuild b/dev-ml/opam-format/opam-format-2.0.7.ebuild
index e163f465ffa9..03f9db26f553 100644
--- a/dev-ml/opam-format/opam-format-2.0.7.ebuild
+++ b/dev-ml/opam-format/opam-format-2.0.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -22,7 +22,8 @@ RDEPEND="
 		dev-ml/re:=
 	dev-ml/opam-file-format:=
 "
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	dev-ml/cppo"
 
 S="${WORKDIR}/opam-${PV/_/-}"
 OPAM_INSTALLER="${S}/opam-installer"
diff --git a/dev-ml/opam-installer/Manifest b/dev-ml/opam-installer/Manifest
index e23f8c03696f..d36893a9b76d 100644
--- a/dev-ml/opam-installer/Manifest
+++ b/dev-ml/opam-installer/Manifest
@@ -1,3 +1,3 @@
 DIST opam-full-2.0.7.tar.gz 7929123 BLAKE2B 100acc2c31e97e47b0b584f3a153283593351d49d5e9cdaca42fdcc025b135d9538bd327927950e7e0972b20f561a0ee3d1d1b5b4b87e1e6af31761e311081e7 SHA512 670af4935bba0679c65f6592b7a52b1d429b604eb261e40b13cf72312aeb0bab0c5a76829a555fc5379a0371c352692cbabc46b460fcd9bf32b3cfebdaeceb81
-EBUILD opam-installer-2.0.7.ebuild 979 BLAKE2B 02fcbc0388aec4c5898b065b0418d65cf30903497a0b9ea676a49c1d3ae6b1f6282ab1d525a965d6ac6a5910a79033cabd8b69ccf872e92f40d8c929cc2eb59e SHA512 484bfccf97b0392792f71cffad42222a37a7ca7e351c3ec8aa7fa54fa04a2f8074fa26155c0f2619d4a48bceb9672c27c33f15621d12ac2d06a87d7dcfc6f682
-MISC metadata.xml 319 BLAKE2B f3a6de363afedd8ecf6d5cd898b0ecc0c7da67070f8929f39f6e5395303505e9b2679cd32ba4445f155aa522bc09f5c6bdb09a3941f679c5eb1ff757040f0d40 SHA512 c251d0c83e251b9f20f83be5d67381c562400dc1567a4d3a32b396c309dc669b03f1d7e25e4d953c155d41aeaad07d47a67a2c602855cd45d5c9bb749dfa3b3f
+EBUILD opam-installer-2.0.7.ebuild 996 BLAKE2B ed78f3fe94aac3691ce8506709ccf649debeb6171068644062c74a561c3642ad1fbc9dfffcfc168b2f449984b86d22baeecf5e82dd957af360c87abe29131b6f SHA512 41bb0cb0320b9518974403bca3a3dc44db6056e8e3a12d4e85245293f6a40f89aea805ab6a7e0268049adce012a460e36d970cd01cc61ea179faaa4e29775993
+MISC metadata.xml 412 BLAKE2B 3cd375059a5716aba5f14f8004970adb55bbec02cf911cc5739475a80789c86ab6d27f192e4757191be8e914e61db531b330695eba224e81273e351d507bd57b SHA512 6119e7d8b9cf779ac2070b8cbe9820849fa80542e86b353d0cab9c60bca6e5d122a1e4f57a75f3189058587e9e8c7d8c5f37e5d4a22395506c437f411df1c4e4
diff --git a/dev-ml/opam-installer/metadata.xml b/dev-ml/opam-installer/metadata.xml
index 970e090f0dfd..856df00497e6 100644
--- a/dev-ml/opam-installer/metadata.xml
+++ b/dev-ml/opam-installer/metadata.xml
@@ -1,6 +1,10 @@
 <?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>
 	<maintainer type="person">
 		<email>gienah@gentoo.org</email>
 		<name>Mark Wright</name>
diff --git a/dev-ml/opam-installer/opam-installer-2.0.7.ebuild b/dev-ml/opam-installer/opam-installer-2.0.7.ebuild
index 276428f96786..59f744994a07 100644
--- a/dev-ml/opam-installer/opam-installer-2.0.7.ebuild
+++ b/dev-ml/opam-installer/opam-installer-2.0.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,8 +18,9 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
-DEPEND=">=dev-lang/ocaml-4.02.3"
-RDEPEND="${DEPEND}"
+RDEPEND=">=dev-lang/ocaml-4.02.3"
+DEPEND="${RDEPEND}
+	dev-ml/findlib"
 
 S="${WORKDIR}/opam-full-${PV/_/-}"
 OPAM_INSTALLER="${S}/opam-installer"
diff --git a/dev-ml/parmap/Manifest b/dev-ml/parmap/Manifest
index f3d3c5f60048..4dc6e7cb01c0 100644
--- a/dev-ml/parmap/Manifest
+++ b/dev-ml/parmap/Manifest
@@ -4,4 +4,4 @@ DIST parmap-1.2.tar.gz 47083 BLAKE2B e790087273fcf749b000c7ad3a2f5b2cafea91c529e
 EBUILD parmap-1.0_rc8.ebuild 1089 BLAKE2B 0936f97f0d2464868df7ddd870b141e7689aeb612c279a1d3521f9c8c3b903dac29cc38f9b31e7e27c1b8e995e29852dec86ea92e2fc818c0ad51b3be8a9e575 SHA512 43b7b44ee2580f63037a136436bc30e4eb57544eefab41beb041424c19666ff2b063556ab2acf2c5980acaa8396ed348178e6b465afd500f810636c538428847
 EBUILD parmap-1.1.1.ebuild 608 BLAKE2B 024dd9b769c4db08d09efd56d471bf617f08b1aad57c0ba75210a35a161bcd7e2e3122f681c8fde8edcb1f2ac54df78ee0d666b5cd87ce8ddf92b0d5f43d5a7d SHA512 be0ce8c1b8ef873dd5291665649a2245cd4a92d6b804bdaf2aa89e2ccdb8cac5795a67caadf4edfef19cda92722186065ebf8e197e91d96ba304c2ec4dba3d61
 EBUILD parmap-1.2.ebuild 608 BLAKE2B 92d88cdfa1a4b8d99d84592c40953d3188669e6b5720d4bb18b5fcf27e35477244085b841968cfdb612668c7447e2e77791a83e877339f8567080738899de8a6 SHA512 ebabf3baff2fa3ebc2776e280bfb6fbead79d5f0f4f4f476fe2de10d38d7e64af6896d315e2eb77488352441a3fc0d87d4267a3cdadbfb38a8047d1899845712
-MISC metadata.xml 252 BLAKE2B f4ca811a46e4c4d8138a2d55e501d8a11cb06e5a967ace489cfb7f5dc1e995773397b42aac371c88e846f223c2fed3a1fa202250f858610b4939bcb093b7333e SHA512 aa58d5e26ea4359f6e81c4e6292ca3fc91f74326810eee7905179665efc89fe23c72860b2821d8be6f97595f84abbc30dfaa423f5f530c30640105d22b16cb19
+MISC metadata.xml 322 BLAKE2B ce1a2f61e9f4fd4fd8286835af805812ab1fddb8cba9e85401f0967ed03ef6be8507868ef292accb826332b47f800b32229a0dc2ae62c2e8f44bae20bfcd9de4 SHA512 7d752bdbddf86b905a475ba3243f4bedfb1b07ecd70fe36f73671dd197c1bba4d1abcd8c44d4ffc94301417c33bb30e15d819645f63390d3c9ffc4f9a8fb6cd6
diff --git a/dev-ml/parmap/metadata.xml b/dev-ml/parmap/metadata.xml
index 56348023cbcf..19becceff313 100644
--- a/dev-ml/parmap/metadata.xml
+++ b/dev-ml/parmap/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
+  <maintainer type="project">
+    <email>ml@gentoo.org</email>
+    <name>ML</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">rdicosmo/parmap</remote-id>
   </upstream>
diff --git a/dev-ml/pcre-ocaml/Manifest b/dev-ml/pcre-ocaml/Manifest
index 23fe40d2910f..6194a583f097 100644
--- a/dev-ml/pcre-ocaml/Manifest
+++ b/dev-ml/pcre-ocaml/Manifest
@@ -2,4 +2,4 @@ DIST pcre-ocaml-7.2.3.tar.gz 88307 BLAKE2B 1024a0d7a490fb31927f67af4c9a5e90c8d37
 DIST pcre-ocaml-7.4.6.tbz 41027 BLAKE2B 1faecd96cb6f7af248e8ace7409a49131f5c654320f8ac432fd4aff602d0c4187733419e9cc73ca52cf0a3e5b725afa9357fe9ec191bf1ca42d4dc47a36e45b7 SHA512 a356c78dc19d3b3741d1fa0277c4fb0cb545f12499165526fae80a0ff8a7b1f1e6e5e916b16f8336bcec3661de811686b814fe4afc677965fec7a63d4fc53b1f
 EBUILD pcre-ocaml-7.2.3.ebuild 709 BLAKE2B dbf57cfee3ff256ded13d85881ad747fee1802499172f20528cb30ddecd9d37f7b9adcf81419d042ab72d3924856559189b4416044b368b450b403968cd02995 SHA512 2c6e5106604be7c0f0e686fca818c618e64660c0bee5584fdc8072c9a94180c037663219d5453bf47b821c65aa3a12b7b1e0d891b79f2bf20d3c84e0f323138c
 EBUILD pcre-ocaml-7.4.6-r1.ebuild 720 BLAKE2B 66d17f763019820e0ed6a0024e1e7244b0dce99993bfdefabc10364d7ea87bc8ef768b4d63c31c4caf349292dd594cdc548629dd4056f739e2ceff536ba689b6 SHA512 69449d3d54a73122fd9f65ac519642ee77acc994eb1df83f542d01c933774ffaaef81c171482318738beb8426193c00b886a6d2d00a5d0dbcaad44619426108d
-MISC metadata.xml 316 BLAKE2B c47754948a843c41e96ff4f56536fa7f1c9cfda9e55a6d710aec847762093d99e40363fd9ec1bb8f3a6fd00701564d38a88c872d6c5d84fa0152429be8c7b371 SHA512 3bd6c5b9e74890d4bb901aab45b5c2313143606189de938157b74a453cfd768bd6a6df592ac86b00c14a6df408c87a3a97ec347aebf5333ab49b9883117d531f
+MISC metadata.xml 386 BLAKE2B 49822d22e21f6ff482bb8f1d7564ffa4450dd9d8c9f8f09865cb6ded1b9dfc90f0310afe74b6e9f21235f1b70e732e780866231c18fe82822308c9c278071dff SHA512 d5100530b8d43a6849d513e0262002e0ad610fd1cfc378245f08b88629cf3e0dbefa6dab7a94752dac9d9fd4f7994610b33e63d274cde6e9751887979bb64794
diff --git a/dev-ml/pcre-ocaml/metadata.xml b/dev-ml/pcre-ocaml/metadata.xml
index 35d8f6fb9f49..f76c701b6740 100644
--- a/dev-ml/pcre-ocaml/metadata.xml
+++ b/dev-ml/pcre-ocaml/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
+  <maintainer type="project">
+    <email>ml@gentoo.org</email>
+    <name>ML</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">mmottl/pcre-ocaml</remote-id>
     <remote-id type="bitbucket">mmottl/pcre-ocaml</remote-id>
diff --git a/dev-ml/ppx_compare/Manifest b/dev-ml/ppx_compare/Manifest
index 5f5cd5853eee..983ef8f400bc 100644
--- a/dev-ml/ppx_compare/Manifest
+++ b/dev-ml/ppx_compare/Manifest
@@ -2,4 +2,4 @@ DIST ppx_compare-0.14.0.tar.gz 13614 BLAKE2B 081e91192f987095a773964b56838b05fb1
 DIST ppx_compare-0.9.0.tar.gz 11760 BLAKE2B 8db18a56185371e56addddeac4ec94e1260f06edc7dbc835efcf2f6788f42c36746858fd96e7fc94aaaf52b118a95581388276b90d8d489a9f4707af2c157811 SHA512 4f154bb67c2241712986247f8b3ed04b4ba874424171989f0421193a15cea45dedbf1c546408421bf33839ea45b85a45ec1cb43c034373fd80198ddb5d9045fe
 EBUILD ppx_compare-0.14.0.ebuild 666 BLAKE2B 2fa6979605dce29f0479b6e03fa4820d3c2ff180eee9510ad1ca9869f551cc3991c1bb5f506179107a670f948b5f67c2ae4771812bc9577b3a2fd76a18f3d350 SHA512 a5036ffb8e76b01cd638ec60225b9e1cb075a97171d1170d95ef49c58f6826c3da02572f039dd9013178f778ae7de2875bd3fee998b10fd569223a29aafa2440
 EBUILD ppx_compare-0.9.0-r1.ebuild 603 BLAKE2B 2a649d2d33fc23a391ef4ed979e5785dc1e1e6bade572d2946d170c3ede8441e2061f543c6f01e9d068c1c83ba76d46a9827e18d03045f7ca6fe1678b94cdc75 SHA512 4c042cf01de3d80cdb34ab804d0337d1f85b00fb64e4b7b0d9d45cfa4c181758b300c1c8a85a56b8d0393f530adff8c403a0398508957bd49a3b782d6f37fa5a
-MISC metadata.xml 331 BLAKE2B 2e62d03cfab08dd1a75ab9c733f70d0b6a375c77168629014eb0d0d03df232d881cac220781f8dd833235fefbe29f07117946a65cdd33fef28fbbddfb70d9db9 SHA512 eb5cae5da9de9fa2d2c96634cb1cae94f3d37e003f860ffe93e6d99274fe0f3c3063453864f6b71ad3987b75d45386e727de674094cacb2ff8494dd4f29059ae
+MISC metadata.xml 424 BLAKE2B f7b31e63898b12c6c8ea7d16abd68730c686f0ed40d36c1ebc6127a21df00317ebfa4024f02af399eb882585474efb04cc9078bcb0df1574d3df0604f16090cc SHA512 87e2fc7c48bd1c6b86b18e2cbd35d9dd30f07b30379fd482c9b25c1a49091d438df052ad4820a366df43a7df6e3c8c9ee6c7b444dc6794fa9eeb25a456771b26
diff --git a/dev-ml/ppx_compare/metadata.xml b/dev-ml/ppx_compare/metadata.xml
index 5bc9e8d7dd51..3ab5bd7e5b35 100644
--- a/dev-ml/ppx_compare/metadata.xml
+++ b/dev-ml/ppx_compare/metadata.xml
@@ -1,6 +1,10 @@
 <?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>
 	<maintainer type="person">
 		<email>gienah@gentoo.org</email>
 		<name>Mark Wright</name>
diff --git a/dev-ml/ppx_driver/Manifest b/dev-ml/ppx_driver/Manifest
index 2e9032ae00e0..95ae1b416644 100644
--- a/dev-ml/ppx_driver/Manifest
+++ b/dev-ml/ppx_driver/Manifest
@@ -1,5 +1,5 @@
 DIST ppx_driver-0.11.0.tar.gz 9157 BLAKE2B 053e710c3d8cb6096c893bd5308fbe2b4563dfb2de3c006402ae363aed60db31a3bb1b7656f0565ce13d88368d8b6bef68658f81190dda397562d462828618f4 SHA512 d7ef318f6f0c6e4c56537584bb50b6673b294b67ac264208b7c8b4bcc9d0ca6baf1cbea752459b12d9102bb84a392047c907c65afd23760cac1cc4465ed85ea9
 DIST ppx_driver-0.9.1.tar.gz 28637 BLAKE2B d787ac91713bd750d2d2bde5830df3abb1a07be6672000d7a6de6c125a7627e7a5b94aa9f8f87e2c6c57a7a92073c44e18c7285575aad02f5db9c7b4419647d8 SHA512 1e3647e34fb9e6d44b783fae1fce21413e5591f8934c3d2ddac3d1b37019b0d95117c8d64abf14cbfe4f67147612371ec1eb76b477763b062206ffc9b46688d7
-EBUILD ppx_driver-0.11.0.ebuild 513 BLAKE2B 939eddb8517867236381098096fe9156fbe5bf4b101dc398488bfd1f7858b1581abb86e8cad9233d5a579c957c29bf5f2ba9fe1a6f05993c4d78b216a16b4c6e SHA512 ca62d132a8840d5dd93c4ba253b9f9fa1fad6ef1acac70685266ca045e93d08c4e7c764ed8ba2c2737b1c44ad348473e2a7650df163b18eea1b8e28b5970784f
+EBUILD ppx_driver-0.11.0.ebuild 562 BLAKE2B cefbb4d569843a80cf4ceeaf883abf4e327a315cae57bccadc66019851f492a360277402d58113a5ae52f6189586c32c4daeb41fadad1ef2c1ad4b56b2d444ab SHA512 4d0d99d02640f86514ee70365d94b9c0b9bca05f5102ab0c11e3ca0d9329805b771a7bc89f9dbc1b17bc78110ce7dad92472a32413cd238c4740aac2613ee429
 EBUILD ppx_driver-0.9.1-r1.ebuild 584 BLAKE2B fb729e4ae41008ce616f784cee3a81048c46df5e27050b4118937b7fe71b738cb75813c06db95e161dcd43c587b8659d43e8927c59b9b9057e51ae826925824a SHA512 13c48ae64e7d2c8f2c5e39125873eb573d2aace46ad87989e11bde24d16b3bc4ca47a340322adec8a22834f74495e2f4dd7e6e1436932bdaa45e469f7f46ef91
 MISC metadata.xml 330 BLAKE2B b26e242c2907dec64f194c92a1e3f967cfadba1966632646d2903c2d010d59d45de6ad7da3d7a54a6e380f076bb7f3a6a15fed04d16552f913b1f86a1ed8128a SHA512 754889cdf700f13e44cb022e9d2750c63145b51b792a67e8003162baf40a0f7402835d14f573db348f99137f47375f169232e85a10cd881b1882cd7da1b7253c
diff --git a/dev-ml/ppx_driver/ppx_driver-0.11.0.ebuild b/dev-ml/ppx_driver/ppx_driver-0.11.0.ebuild
index 494c07cf18ee..aa88a6f5b4d2 100644
--- a/dev-ml/ppx_driver/ppx_driver-0.11.0.ebuild
+++ b/dev-ml/ppx_driver/ppx_driver-0.11.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit dune
+inherit opam
 
 DESCRIPTION="Feature-full driver for OCaml AST transformers"
 HOMEPAGE="https://github.com/janestreet/ppx_driver"
@@ -11,11 +11,13 @@ SRC_URI="https://github.com/janestreet/ppx_driver/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="+ocamlopt"
+KEYWORDS="~amd64 ~ppc ~x86"
 
+BDEPEND="dev-ml/jbuilder"
 DEPEND="
-	dev-ml/ppxlib:=
-		dev-ml/ocaml-migrate-parsetree:=
-"
+	dev-ml/ppx_core:=
+	dev-ml/stdio:=
+	dev-ml/ppx_optcomp:=
+	dev-ml/ocaml-migrate-parsetree:=
+	dev-ml/ocamlbuild:="
 RDEPEND="${DEPEND}"
diff --git a/dev-ml/ppx_sexp_conv/Manifest b/dev-ml/ppx_sexp_conv/Manifest
index 4b645f5cd93b..e37ac4cf8b68 100644
--- a/dev-ml/ppx_sexp_conv/Manifest
+++ b/dev-ml/ppx_sexp_conv/Manifest
@@ -1,6 +1,6 @@
 AUX ppx_sexp_conv-0.14.1-ppxlib-0.18.0.patch 1548 BLAKE2B 2adef4e4a978e6a01b9f18aece888ce12c5ad0498411d9072c6ac4787e22d4053e89acff47e22d388305754304989e52c646eb93dc2652a93a0bf9b816c172f1 SHA512 92d4a04e54d290f90699d0c1f59d8805062d3949987787dfa5c033091948ededde5cc1d97d9b0be1b5a0b4168ba7e85720569f72e9de5325e6891357de800468
 DIST ppx_sexp_conv-0.14.1.tar.gz 49857 BLAKE2B ede55963d995917bd0c4a1464b58f8584ec6be4793df706fd3be96670fe685aba82459f9a1e4c6117c594953a3f23c502cc609f1069d482d24278baf7ed87ed5 SHA512 5018abe07300f67cb2c8b8cd8242403a91ac6b7fda13fe43060b3b09635082a7ad45858c7c6442a5fcae2b6d7d398a03eec16cfcbc5fd59f7f3f5c5fd1ad56f9
 DIST ppx_sexp_conv-0.9.0.tar.gz 28000 BLAKE2B 2536d3ddbd4ee83baf9eade208983ce9856318079e29da9858838c985b904a7e2e1c6e3ea06bd1360cc17e619f1e952634554e89b294dd00981934679b384c3f SHA512 af3d28a3cdb7c796549a2598c218f69a69d58da715ef2d16077c3adeb22823fa7bec6bc0d8cb6caaf2a0adb56dfcb39d667975959251fb310b69d6abe8302845
-EBUILD ppx_sexp_conv-0.14.1.ebuild 709 BLAKE2B 9b6b38db4a7dd99a00444baad524fb20a7b2cb67e0107335552245fd656421c60bcc15b9ec63763c5882856cd049e9d66fd91b8237314549e320a6dec98dc206 SHA512 491b5479ddf8108a4831592266c181b0bb8bca706c0b4a581ee200abb1d988af2fb95aeacc9e66e12a86d6ce81f8cc1ae1ac0c4c067eb18413131b382522e1cb
+EBUILD ppx_sexp_conv-0.14.1.ebuild 705 BLAKE2B 5bbafa95cab170a8271b43ed1a6a75283d3bb56c62248cb1f182a5626d59a1b0fdd9e94036bb927f4fb3b2f0958bd69c5241045c69760e1fee6ee25fee55050b SHA512 92c865ccf1189802089497ae4279a9f805ff567f8af1f9725b72c6c57443a3d2ab2a14d4bf82950dd59d92e14e464a9fd022318e85af4c2a13a1837df865ce91
 EBUILD ppx_sexp_conv-0.9.0-r1.ebuild 672 BLAKE2B b69d608e4a8ed118085afff45f91d08621b302d08a87b06f2dd6fffb75f799f58352906c3e65519aa3f3f66348f151c1fbb0c289877e24b018f35809b932da1c SHA512 e5eb7f825efaecb7d4dc53e854e3d97eab0b89cd08c2cb9640b19082cb7d2e7aadf8a27a7a3de610ad4216a642fbb908c9249dd4aa7e8f2f57f19b30bdadca83
 MISC metadata.xml 333 BLAKE2B 45f215f8e13fc5d782348eda68fe18a1975f6b1e5a7770b2d6f28429f26314c53d2b6bedbf4f195e5868123b5bf40bf208efcc83c2296399dad4d4fb3ac0b3a2 SHA512 7c1cb3a5c022fef141fe5144f122b4a11d4c4584f76998f47e0c57411ad3e64a545919ebe81939d941358760193aa062a5fe63737072f8e53afc46fae605463f
diff --git a/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.14.1.ebuild b/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.14.1.ebuild
index 238d51096eef..811bef9de5f1 100644
--- a/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.14.1.ebuild
+++ b/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.14.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,9 +18,9 @@ DEPEND="
 	>=dev-ml/base-0.14.0:=
 	dev-ml/findlib:=
 	>=dev-ml/ppxlib-0.18.0:=
-		>=dev-ml/ocaml-compiler-libs-0.11.0:=
-		>=dev-ml/ocaml-migrate-parsetree-2.0.0:=
-			dev-ml/cinaps:=
+	>=dev-ml/ocaml-compiler-libs-0.11.0:=
+	>=dev-ml/ocaml-migrate-parsetree-2.0.0:=
+	dev-ml/cinaps:=
 	dev-ml/sexplib0:=
 "
 RDEPEND="${DEPEND}"
diff --git a/dev-ml/ppx_typerep_conv/Manifest b/dev-ml/ppx_typerep_conv/Manifest
index 6b067727db3b..fb0d480e0f59 100644
--- a/dev-ml/ppx_typerep_conv/Manifest
+++ b/dev-ml/ppx_typerep_conv/Manifest
@@ -2,4 +2,4 @@ DIST ppx_typerep_conv-0.14.1.tar.gz 9453 BLAKE2B 4acafdd51df0659746697283aa3240f
 DIST ppx_typerep_conv-0.9.0.tar.gz 10844 BLAKE2B 4c21e9529c587507eef26fc53ae2c1153cbecd754d6b36b73ee6e639a13d872932a421207224c392394a52767f5fde66441cf19318499c8604c2e20b9583841a SHA512 155838bf6dce45a043624845ce882eee374df344f76a9433a1170d89cc27856a634f4ca31ad28e46b28c5103d00c3d8d7d79692872c5dfc35d0b4a7eebdb3d1d
 EBUILD ppx_typerep_conv-0.14.1.ebuild 645 BLAKE2B 535ddcc279b5afa73d2c6488f3eb19b08526321b0e0838bfd55c8099189ebb4d506f6a8ebbeeee7af0ee41e35a942f3c8de2bf778f29951438981a952823c2ce SHA512 07e3eb7997373268cf398953d8a605d8e2fb8f3fd888170734eeae61720e09f0c955b00cddba8b4a0b659afbe8570279504eee674dae8841e35f78bc93760b6b
 EBUILD ppx_typerep_conv-0.9.0.ebuild 606 BLAKE2B da77568f0ff5a883337f385f96079930e0e5bf40e60d3987779af3f047f188f18b80ecc4b9529424fe72e9952def0b558998cc81c497998672ea96eb6cd2509c SHA512 784430fd32a3c7f8fecbd9a8dbd277a81402c7a890a507fa5f59d70515fef30c32b3ec7e3f78ebb979617305ebd5e5274fd191d4fb5e92379ae2d4ba635c1188
-MISC metadata.xml 336 BLAKE2B b93b48a36cacdd36a6fb9eff83d9bd9dc83b011d60260bd52d0f14d70841e2d0b190a2b2bfd38c5f24f864c235c6eeeb798e758e54f558a5b1d41e2269c2f9bc SHA512 bdd31d24e32edbf793ebe406975633356c13f2e963f7a6b800b3573b40332fcd23d1c369431d0021d12f9398c9d3b90701617ac87979ef07f3595ee89b1382c0
+MISC metadata.xml 429 BLAKE2B 5eadb1c68571205a84395f1944c065e3792f0848953bdbcf621dc09efb6dc15dc6d6b801494f96e6a4d214f3789ace26c1d5738cab42c8572c52036e7806b067 SHA512 dcb09e7d73640b136757d18fe35c7dbcbe70bc6f4d2706e2361727e3757045c01d9bc5be6fe1577fd35f34d88c7fde70bc7b9212351b6bf6b0ce153e6a5f2468
diff --git a/dev-ml/ppx_typerep_conv/metadata.xml b/dev-ml/ppx_typerep_conv/metadata.xml
index 23f2e859b2a3..72fb97feee61 100644
--- a/dev-ml/ppx_typerep_conv/metadata.xml
+++ b/dev-ml/ppx_typerep_conv/metadata.xml
@@ -1,6 +1,10 @@
 <?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>
 	<maintainer type="person">
 		<email>gienah@gentoo.org</email>
 		<name>Mark Wright</name>
diff --git a/dev-ml/ppxlib/Manifest b/dev-ml/ppxlib/Manifest
index 7f122e34d8c4..dafbe925dcab 100644
--- a/dev-ml/ppxlib/Manifest
+++ b/dev-ml/ppxlib/Manifest
@@ -1,5 +1,7 @@
 DIST ppxlib-0.18.0.tar.gz 192929 BLAKE2B db14821aa77eac02038632ee8a9756ffd7a7b561c5852c4a5bb6882da531a6d2833737d4d1d372ff73251c168e2da57c7df0c724b1d9a6c4829632881aa4d2b3 SHA512 73b785eec34ca68451936c750ff68a4799b8c265cd973a587bd77b60cb933409eed4edfd4c9a4b0b1ada8d3a0bae5c5c719e4258d00cb0290a6842c67be1fd3d
 DIST ppxlib-0.20.0.tar.gz 193453 BLAKE2B baf5703737792f274654de489aee31c1d324011cbe7e4f5b73102ea352d10ca513ed1b04ec43324640a01c0e5d168945806f6fd4e3a60c9f70c28392a720ec61 SHA512 e19699cb09c441d0ecbda191df78e8227111f1880be4f2810228cbfbf93c9474ba6d04e0e3b4b14820ea7dbd1388fd4ac86f818a28819e7d8b0dd00200609a7d
+DIST ppxlib-0.21.0.tar.gz 201905 BLAKE2B f7a7b69ab07b2a5dce542877989fb4ca820acdda375371895072b857a44e8e7f437695f43990472dfad88261179ff07bd33f6e39881c2b28ff2650d7e2a53bdf SHA512 5760ecc8a5e0c0f49ad4f0d3ba2546185d36411f4292c4ebfbf0c9520438546a60d8fe0b265cec70793b03cc684e399401ff761cb1c369966add70118f1ecda5
 EBUILD ppxlib-0.18.0.ebuild 764 BLAKE2B dc0bf7be03916c85152c42d30a6aa83a72df8b6e2a0488e03ca59ee5318327753a3d2f930fa823918bf6b672090336bfc9ef5bd55e1989865eb098309ceac969 SHA512 0fa630d3d4573a33aef2dac989772dc1c6db23e3c676a34f8fa12521e4154a88e9c561a152c2e6f485cac3055b174d8588d8ef7bbbe331f145c38013481338e8
 EBUILD ppxlib-0.20.0.ebuild 725 BLAKE2B 62c6907c16427a05ac905ec3614b3d6ac81ed1b7e1e02e64c6659a9099e4659c26d261d9221f1104e8c0990049d0eb042cfb4ef54f957b36da2d30dbe568eafc SHA512 fcd0136e7b6ede244ff89ff53f514f3f718ef922a776f11e89c17232f681c6e913871bc4d18a7075885425b68860964e3c8fe445c9efa07c2f58e11208a71c48
-MISC metadata.xml 325 BLAKE2B 5a543664917ee3d50700a88590bd3b5f3e7c8578d438e491b3450f4ff2127359062b59e5de4c96a6d0423e96003bed9655719398aac9dc723855f73a32d652a9 SHA512 26f7aedfdf8374d63bea2450524d4a3727101c127e79fc7a28b3f06d82c9fb2ad30408c64f6d4e1cd03aa1aa239b3445b08780ec3a214a615c9ad81aa51081bb
+EBUILD ppxlib-0.21.0.ebuild 743 BLAKE2B 76218084c493f34c3336bfa48dfb44c217ed1e7a3793046a7b71076e841e74e6f424c5674367b99626362c57c357e24fc3aef211b4c2747d96b663783cbcca38 SHA512 d988b63956ec123811f75bca4d4b66ea8c4072b01e52f869a3b8a192a2b302a3af3854e586ae74a80e16464f3d23fba391dd02c822756826fcf7fe4a5cd9dd83
+MISC metadata.xml 418 BLAKE2B 4e11f61bd5b22b4ce2527e5c9910956df486f3e7d341ba6e0936731f79eb866ada1bb54a4a9113854d65683caa3640a2782a1684cf388068b0800e507eae0bf6 SHA512 e7574d67752a664b5619861e1192cafcdf5fa49fdbdf55404992edf261a48b2771e6d3177e6f70238020a8d253f6916b1971d01780724487c910b0ebe29079ef
diff --git a/dev-ml/ppxlib/metadata.xml b/dev-ml/ppxlib/metadata.xml
index c37ad7574836..196ba5d9bcbf 100644
--- a/dev-ml/ppxlib/metadata.xml
+++ b/dev-ml/ppxlib/metadata.xml
@@ -1,6 +1,10 @@
 <?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>
 	<maintainer type="person">
 		<email>gienah@gentoo.org</email>
 		<name>Mark Wright</name>
diff --git a/dev-ml/ppxlib/ppxlib-0.21.0.ebuild b/dev-ml/ppxlib/ppxlib-0.21.0.ebuild
new file mode 100644
index 000000000000..0fdd44c7b65c
--- /dev/null
+++ b/dev-ml/ppxlib/ppxlib-0.21.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 dune
+
+DESCRIPTION="Base library and tools for ppx rewriters "
+HOMEPAGE="https://github.com/ocaml-ppx/ppxlib"
+SRC_URI="https://github.com/ocaml-ppx/ppxlib/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-ml/base-0.11.0:=
+	dev-ml/findlib:=
+	>=dev-ml/ocaml-compiler-libs-0.11.0:=
+	>=dev-ml/ocaml-migrate-parsetree-2.1.0:=
+	dev-ml/sexplib0:=
+	dev-ml/stdlib-shims:=
+	>=dev-ml/ppx_derivers-1.2.1:=
+	>=dev-ml/stdio-0.11.0:=
+"
+DEPEND="${DEPEND}
+	test? (
+		dev-ml/cinaps:=
+		dev-ml/re:=
+	)
+"
diff --git a/dev-ml/protocol_version_header/Manifest b/dev-ml/protocol_version_header/Manifest
new file mode 100644
index 000000000000..f281a45bf7f7
--- /dev/null
+++ b/dev-ml/protocol_version_header/Manifest
@@ -0,0 +1,3 @@
+DIST protocol_version_header-0.14.0.tar.gz 6524 BLAKE2B 3463cfbfa2faf0573dec57e8d1eae5ed47f2210c7eb3872fcb5a9206bf65cc22f184944f4c624a17e44e267f3b0443f8e4fe33e8d40157e9f5afb68f0b7b5e4e SHA512 50f58d79a2c92a2f7b9f1cd54b548ae53649bd876f77a017b1483fda53cd1b398dbef7e992dcb283796d035fa361424c9529244b73d33d9ff2699dae70b6410a
+EBUILD protocol_version_header-0.14.0.ebuild 473 BLAKE2B eafc19470e9b6ffb5dabc7fd01336ec4efb94889b87943e6016977a5951ef9bba447b89b868a68d806ce9cf4dd94843de07a70bc655e3a77fb84ae0efaa546e4 SHA512 9259ad472c822cddd09f352e821de17fc412ea302ff2d8c5e152e28778dace239615021cc3838f833f60426aeed6f61ed71803f816c27ffd66016adf8a9abd71
+MISC metadata.xml 341 BLAKE2B a9c15b58f9e15560d13869e4e409297a70302854c063a953a185387940a46b34715b50242e7e863610b10e90668a2d5e9916c6608afb87ed31a70b3cde2eabd6 SHA512 d3dc2c3011bf28e7a32909270a837e751a16bc9982f69f77d9d739bee10671f6eb87c86c2466bc86e30b6aff8a01496ef3227360d2f6c00f2af8c3f837f445cd
diff --git a/dev-ml/protocol_version_header/metadata.xml b/dev-ml/protocol_version_header/metadata.xml
new file mode 100644
index 000000000000..90d70ef938a9
--- /dev/null
+++ b/dev-ml/protocol_version_header/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ml@gentoo.org</email>
+    <name>ML</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">janestreet/protocol_version_header</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ml/protocol_version_header/protocol_version_header-0.14.0.ebuild b/dev-ml/protocol_version_header/protocol_version_header-0.14.0.ebuild
new file mode 100644
index 000000000000..1aee6011304d
--- /dev/null
+++ b/dev-ml/protocol_version_header/protocol_version_header-0.14.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="Protocol aware version negotiation for OCaml"
+HOMEPAGE="https://github.com/janestreet/protocol_version_header"
+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-ml/core_kernel:=
+	dev-ml/ppx_jane:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ml/re/Manifest b/dev-ml/re/Manifest
index 4493673a1d71..e20ae88158bb 100644
--- a/dev-ml/re/Manifest
+++ b/dev-ml/re/Manifest
@@ -1,4 +1,4 @@
 AUX ounit2.patch 345 BLAKE2B 9db15f913a961c6aec6025ecf9c7dbf37dfed084e57246cb7e52012b548199014c8b93e0d75c6baf5b32a4cc806584bf3a50d48a50a8fa81d08690dd43aff072 SHA512 c002d4e2343931b6954828226678ec2b1e878fc36bdd031cb0e9158222e375b3595b2e58ef7de3b9ff9613b44ffdb29d8e5fe4fb8284a7ad1815712893bf9cb1
 DIST ocaml-re-1.9.0.tar.gz 83642 BLAKE2B abcabb80ffef241fc7e8ea075f49365cc64f8749db1d1f7eb654eeb52f5be8e96756f98ae7903391a26d8537f82e105878a38a15923d7f93c61abd5c08d3ff98 SHA512 3e11c6eccf573ab5d7f43accf1f1ac9eda0d7320067e142b9f76b309315c1e30d22c5bb80c7a54b05d9c92d3518d26ea82b5093de9b48f86e3c62d6073f14eda
-EBUILD re-1.9.0.ebuild 614 BLAKE2B 5d01e8d90a04696ee267d2fa0f9881a242b381e0b1f2f424ae7e040db97c057c71342b75afa591b04dc5a4887b6def63a7562313c98b7cfc7ecaba9bcb10d3b0 SHA512 1050db0064859e2a92e11b419a88253806ac7c1371573beb84818a2e9b79c07e9d3676c404c7cbc9ae6ec2da52710a2315e53bde5ec8b629ccb9f8020b2e18c3
-MISC metadata.xml 323 BLAKE2B 12cef941c01aa9109d95a6eb116cb0eb92f22b6512a515ec21e8afbb74c6c0a647a551cf137296dba04a8e1a12b2c61ecb232be64fda7037937646c55cf994f7 SHA512 50408e8915dbefe6c8a9806200510e64b6573b691aa1546aa1593c852c4ee4af8a21fac60b1e72168205dcf0ee45b06676053a09ad4915b1be188a03e1a9b892
+EBUILD re-1.9.0.ebuild 615 BLAKE2B 1ab3c4fceae334388f2084e287a39e4ce6931eb9f8a096bfcd62c96b70d3bfc30a82e0ca4db5dca79aa51d265f6c52c04a741695c10046865194e143d41f2242 SHA512 0dfd8db8c5d242ef234a2c4280d14a51bb25a553025a6a5ae9aded0686c7c08efc54639fd1b80bc714631ae70fcb9487273a839792a054fbe602cd1906a010f4
+MISC metadata.xml 416 BLAKE2B 877ee7f0c0ba969e27f1a3a92b45c10eceade5829cd4e5672fd10d49fbb897db3a0ae7d78f5521d8c79c6682179711b26ff601d19cef561de8e2b96f2e0d636c SHA512 accd0aa3847614a21c35f644ce36802938f98257d130da9efb0a2d7fbb140091feea92f8c3613520334cbd55116f16b64d1e10ff80e26dc8f97df83e22aec742
diff --git a/dev-ml/re/metadata.xml b/dev-ml/re/metadata.xml
index 5fa0f8468f55..e4f5c058dcb3 100644
--- a/dev-ml/re/metadata.xml
+++ b/dev-ml/re/metadata.xml
@@ -1,6 +1,10 @@
 <?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>
 	<maintainer type="person">
 		<email>gienah@gentoo.org</email>
 		<name>Mark Wright</name>
diff --git a/dev-ml/re/re-1.9.0.ebuild b/dev-ml/re/re-1.9.0.ebuild
index 67924252e952..9dc727449c23 100644
--- a/dev-ml/re/re-1.9.0.ebuild
+++ b/dev-ml/re/re-1.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,6 +20,6 @@ RDEPEND="!dev-ml/ocaml-re
 	dev-ml/seq:=
 "
 DEPEND="${RDEPEND}
-	test? ( dev-ml/ounit )"
+	test? ( dev-ml/ounit2 )"
 
 PATCHES=( "${FILESDIR}/ounit2.patch" )
diff --git a/dev-ml/result/Manifest b/dev-ml/result/Manifest
index cfccf59e3d04..bf63187e818f 100644
--- a/dev-ml/result/Manifest
+++ b/dev-ml/result/Manifest
@@ -1,5 +1,5 @@
 DIST result-1.2.tar.gz 2100 BLAKE2B 9c746c85200ad6af1014dbc4959347b19f48f24448fb36a33b0b50f8d3d8cf4536f7ea3e994953d29122c8dafe87289707eeab67f7a0dc44d0bc509715169e79 SHA512 b47fe24302182642c7dfb3329a9a475518fca01ed7080fb625379abbb7ada0bec4a27e666886c101ba4b0083eeb6312740d99ef764690d38ee6e6d8960fc9b87
 DIST result-1.5.tar.gz 2291 BLAKE2B 76010676aa806fac3766e9ba70b770b3bd01347b1365892beba4c33415d0942a9368f0437ee5a8339b355b939d1625b2fa9c8ad4cf774007637eb51f4b20f11b SHA512 5ca3aab3b46bff7f4fa4517b5d823de196d7a97a8b94a8e416a5e237061482f4d0030c6a339291d5aa8f68020ee11aed743b730970105a2303e6a93d26ca676a
-EBUILD result-1.2.ebuild 563 BLAKE2B a8b4d1bee26726d7b7a32c572309971d9be669bf84c82fecd42721579208c1034585e02bd9ecc510601ad1303655eb015269a627a014c374dac703a869f20b01 SHA512 f413b92901bdf028cdfea175326f331a2664a560ccd4bb0ee7dff922ec8c85fbc1d122abe06b090b29daab0bb2bd876b8f0fc327ee733317a89a0c6d6b706d69
-EBUILD result-1.5.ebuild 417 BLAKE2B d1a664a27619642eb611e74ce99320d8d2b554765bae0b413110c841e749fcab2a5d9afecbea51a73b563759339b7fdff304f4375592e80dacf77f74da88535c SHA512 763de23d3a11bd1f5bac274f5786b3615f9825b6136e9f7cf0cc44d6d23703a8b1849f93fbb51c1981a65e72c51243e6d19064d99dc63e1a6838b127d4427c47
+EBUILD result-1.2.ebuild 558 BLAKE2B 560d9bfb3c44de592e39c47d686245197856938e5252bfd48b7ecb7360ea627bd09eb238bde86a98fd9718ad9953d806018497f6e83a4fd1e197b75e827369a5 SHA512 1aed03ab8fd938812549462d050ac430a9b07833c79444d91f11cacd698308741751981b02776484600ca1a4c71387d192415ebbc423f25ed780260618bd884e
+EBUILD result-1.5.ebuild 385 BLAKE2B c232352d6b00d0f2ab607b29d17bd5580831c8732b61e4bfccecaa4213011a8afe1c5955a4a65398cbb4b04e33e404ee0a439ee7db4ac4f720e64301e832bb5b SHA512 bbde1912fc8884dcf7093bf1a3074d28101d1fcdb8969b5446d5affe00d14f5ccb7148145e0eb04fc91b9e60627be7a53ed28c9bf8b5fb9b17c28989fa8f9221
 MISC metadata.xml 326 BLAKE2B 654b7ffe8dd0fc4cb37f18afd5f9f39149e7244beb54f42688965c5b67eca7093b81d7ba4349e49d66943aef48e69e40a5df83ee2e3869cfb2513e9b836ab3dd SHA512 b667f60e0e7ce8439e7b100b99046324ee1dd2eee5379bafe48334b7bb63aec7f49df08e18a46febd8c8185fd4b0dfcdaeeeb91f11b32354e88264f2a234fb9e
diff --git a/dev-ml/result/result-1.2.ebuild b/dev-ml/result/result-1.2.ebuild
index 8c8cb8d1cd21..97acf4417036 100644
--- a/dev-ml/result/result-1.2.ebuild
+++ b/dev-ml/result/result-1.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
 inherit findlib
 
diff --git a/dev-ml/result/result-1.5.ebuild b/dev-ml/result/result-1.5.ebuild
index 5284eb6beba6..774fba5712fd 100644
--- a/dev-ml/result/result-1.5.ebuild
+++ b/dev-ml/result/result-1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,6 +13,3 @@ LICENSE="BSD"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="+ocamlopt"
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ml/spawn/Manifest b/dev-ml/spawn/Manifest
index 7b9877e28870..e316f194e917 100644
--- a/dev-ml/spawn/Manifest
+++ b/dev-ml/spawn/Manifest
@@ -1,3 +1,5 @@
+DIST spawn-0.13.0.tar.gz 13048 BLAKE2B f64815c99b3ee7a0e4a18c33012df658e57d7973101ced83aa509c2dfa6455b59b110cc61477da0750305fb8b81ed4a1436a6a7418313185644ea531745a80da SHA512 897ffec4a4c15c819e4429f6b71427005d6b40df6039e6c7f0b1ca4b4e35b24304dc56e27ce88bd81f5b61f936444f5d6e80ea14483991067aa6ee072f4a90dc
 DIST spawn-0.9.0.tar.gz 12689 BLAKE2B cc07c3be778b32465e78789638c5d46169d17882058a6c441b37b95c6a291cd5291af8ef1e9d48aa996cd35acddc343159d7da959136df5f84ffea4e1fb7d028 SHA512 29d8e3477d5f90bfa4d2ad874b870a9ea7e140507050e0d1d7e851af75fbd61e5ab64218a0ce00cae8a38ee8675e8ebca1faee009dfe57b8ca8f130a1b46e8c9
+EBUILD spawn-0.13.0.ebuild 446 BLAKE2B de585e6bd9984a080025642f2395fdab2ae8b85b98f3db932c52db5f43fdcf6da606348551efc6a3a9968e79ec2ae617b3b604f2817b7a26a5e8e16ed804d44c SHA512 e7f539bc921ff757f054c7a7ae97dc6bccaba53970b387a86dde7e0638adb3a2abe44fc9e33c5ac20088416e222f8677de5a8dfc627eba228e31c3d5b8ae022a
 EBUILD spawn-0.9.0.ebuild 426 BLAKE2B d436be6ebf00506d554f1022300bfcd1e56017097a5a3f4b27339247f266540bd7fda8e1fb9d02d2efb97f49a22c5725d80526332ddd28c4e6dc808ce7389e63 SHA512 42480483d3ed89b818ebbd7477bd28b8841a38fab4431078583ab370fd44517fe96bab76e7e8262d77b186413df58c670cb67aea2952236dcb6901ee20a5ffba
-MISC metadata.xml 248 BLAKE2B 52a7aef122a309ddd3cae2a7837f0d8c5386c745fda0e6c17d3c53477d66bf3d8759120af8229c7928471ab9d396c221335c361f24454b0ac7fc8836df516788 SHA512 9215d5fc984356e564abd14eb8d17548908b0fb2207aaf0edd8b89c805007606fee09b8645814deccf720e7e9cb18bdcaef44f3922ef98efb07b88c01fc7c74f
+MISC metadata.xml 313 BLAKE2B a8144e4da616ceb017946a2ff4cf744bfb0f935f5d87fc44e323ad101b25bdae8a5ddbfaf6a6eddabe9c378bc78aed63900ec9d331daf6305c67283c497b9726 SHA512 87762ad2b10550b2fc0722f9b3b68c6beaa0b8ee983380c202c70b239c04a1856bb992b4b4a72388776b12da064c08648f356dcc7fa0aefadaa682875b42c65c
diff --git a/dev-ml/spawn/metadata.xml b/dev-ml/spawn/metadata.xml
index cb9814190219..4d2739a06438 100644
--- a/dev-ml/spawn/metadata.xml
+++ b/dev-ml/spawn/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="project">
+		<email>ml@gentoo.org</email>
+		<name>ML</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">janestreet/spawn</remote-id>
 	</upstream>
diff --git a/dev-ml/spawn/spawn-0.13.0.ebuild b/dev-ml/spawn/spawn-0.13.0.ebuild
new file mode 100644
index 000000000000..5dd601727870
--- /dev/null
+++ b/dev-ml/spawn/spawn-0.13.0.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="Spawning sub-processes"
+HOMEPAGE="https://github.com/janestreet/spawn"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="ocamlopt test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="test? ( dev-ml/ppx_expect )"
diff --git a/dev-ml/splittable_random/Manifest b/dev-ml/splittable_random/Manifest
index aeea2f09f386..e1ac9628a639 100644
--- a/dev-ml/splittable_random/Manifest
+++ b/dev-ml/splittable_random/Manifest
@@ -1,3 +1,3 @@
 DIST splittable_random-0.14.0.tar.gz 9942 BLAKE2B 3147e290cbf7a6e2ce8994ce0f95f392a4f7f24f7c2b6fd1b5394ec537e8be7efbefebcb8f2794e026cdd30596e6defde86126646b19f6d299ee79dbaa4d4bb7 SHA512 c8c006bba0f74e53892d9fd364de4d822182ce5371deae4f5d881d59ad6b9a8a429ac6aca54ae95edf312565b87e89a2c2546a349b2e6de2a78ece0655a09b94
 EBUILD splittable_random-0.14.0.ebuild 574 BLAKE2B 2d32b4ee7d51981fef1d8de4a1c85f33fcbe970ef0e7556e948321b232d54440f872df28424b362d4b7b7306106e21c2c99d2fe6a13bc331c90066a20c490b97 SHA512 8b53aa007ee7e2edc0e8a09c5c84ddf1bf2c6f0558b3b24b89a5119a8aea8f51f7a02089064fd5c6f5f187782ff28a3691e966bf6fbe9fc3f7a276d6a290001c
-MISC metadata.xml 337 BLAKE2B c5a5577ba2d95c9deef4c031c8d3844ddc00da5f8003c204f3b7b46cc55f62cd791fc0ab4389b614dcdc8e96e2b852c108429e31031c586827365f5f1191b416 SHA512 1c95f3248d1baaa26bf1ef5080a0a5c5a433e35a6ff05aecc6f209534fa49e38407dce86f4d48490ddc20c4cd6909af35e62684a70ef50e9054347db7f14151b
+MISC metadata.xml 430 BLAKE2B 2323c7b20fffd2605de618161fe982795420edd0730d5fcc9f89c976f75437658ddb4f9c6ea3d97d886d9a80a9afed0a8d0fd5c089aa3634aea5ae1d0103290c SHA512 a50abf0618dad0f6a8cc6042351be77c33311485deda8b872224fd287f5f98555c92706ebe649162eac8cfaf5674178859f6d53261f3195257a291ca2e8f4a82
diff --git a/dev-ml/splittable_random/metadata.xml b/dev-ml/splittable_random/metadata.xml
index 22ce63f341b2..ca905a069955 100644
--- a/dev-ml/splittable_random/metadata.xml
+++ b/dev-ml/splittable_random/metadata.xml
@@ -1,6 +1,10 @@
 <?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>
 	<maintainer type="person">
 		<email>gienah@gentoo.org</email>
 		<name>Mark Wright</name>
diff --git a/dev-ml/textutils/Manifest b/dev-ml/textutils/Manifest
index 7acff6c921cd..ff3818389d42 100644
--- a/dev-ml/textutils/Manifest
+++ b/dev-ml/textutils/Manifest
@@ -1,3 +1,5 @@
+DIST textutils-0.14.0.tar.gz 13261 BLAKE2B f4e1f364e72af47d70d1b674399c923672a780aefa1a2de731e786ef6a5fe03789d5605d326e883b9b37b0ac6fd98246b243980b16c25a4cc8baed29a2142cf9 SHA512 e8dca3f0f5c096846201a4fddf06e7bd3ad721a21df054189d0a7316a8d5be73df6633b045f7027d03b8023448f017aab14dbfc13985a11b5a2b58e5498b6de3
 DIST textutils-0.9.0.tar.gz 19603 BLAKE2B 20e515b62fad7b17a0bb05c3a3ad45af81dcf3bf5c98617803186df0badecf369a684cb481786fc0074b177807049848b27272b6a4872e26d7b47a036ca7c98f SHA512 2a60b0add940f3584752f1add546716ad1e9e002d8fae460d9e62acda39e4b486c06a3fa27ceab754d2339dc46422a5a9534345c743950d6ed08683060cab759
+EBUILD textutils-0.14.0.ebuild 482 BLAKE2B db77f4d12105f80ffc030932a4477577b778a0b4807c2069f1681b2672e3be69bc114bb9c5e262d4f2a3948ee02804187a5513b418912bb1e4243921d0987dce SHA512 48e7ed14df6007c8e292d265d256b036ba9ea05ebc6cd1f9c4ea3a6e730e74ef1f832abea56b9acdcaa48954956a8154da4f7ecd1e2c23eb8473e584b91fea1b
 EBUILD textutils-0.9.0.ebuild 501 BLAKE2B 3968387f1d0792ed8ac23793103e2a846d201bc7d2311ef80c2e14448c02721b478995f01dd11bccc271873522fd7a928b660026c7288eae41729523ddf92ffa SHA512 bad67bb06b54e7a4710b7453906098b202146f3fbb66d0be335773657c2fade282c25d9cb61954f43342d8e2107ca5a0fb5df47c0c3bb7604655cdd58738d14b
-MISC metadata.xml 257 BLAKE2B abe833614ed81c468fccfdc90996a75e2f7e9358ad8391b677403c20a59b1915810a0b37a3fdf11ae61c84a8ff52a161df0ac17c1bddaecf9f42732875828047 SHA512 b520c6601e7304a78f07bb44c70b50fc877da6deae0418a38ebb1df68376194facc5ce0ee16350b3f6b886acd0c61af2eda8ddc1030aedc2f178c98ae080b508
+MISC metadata.xml 327 BLAKE2B d06cc36e2e983cc8cc69227bf433ba4b29bffe8643dd538beb6ce439641c95e05201d1f3e78d7f056d5aa1e6f7565414265f86b0f07e944b65304138214ff64d SHA512 3de39a1111c4ca8ff9bf815403d58cf022562307774efa80974372df9c97bbb6ccdcf4ed08eebc055a444b325615c807fb90975b89da3f8d46c3627300eb022e
diff --git a/dev-ml/textutils/metadata.xml b/dev-ml/textutils/metadata.xml
index d7a4e02b06b7..259c45b83ced 100644
--- a/dev-ml/textutils/metadata.xml
+++ b/dev-ml/textutils/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
+  <maintainer type="project">
+    <email>ml@gentoo.org</email>
+    <name>ML</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">janestreet/textutils</remote-id>
   </upstream>
diff --git a/dev-ml/textutils/textutils-0.14.0.ebuild b/dev-ml/textutils/textutils-0.14.0.ebuild
new file mode 100644
index 000000000000..4df5de19d434
--- /dev/null
+++ b/dev-ml/textutils/textutils-0.14.0.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="Text output utilities"
+HOMEPAGE="https://github.com/janestreet/textutils"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="ocamlopt"
+
+RDEPEND="
+	dev-ml/core:=
+	dev-ml/core_kernel:=
+	dev-ml/ppx_jane:=
+	dev-ml/uutf:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ml/timezone/Manifest b/dev-ml/timezone/Manifest
new file mode 100644
index 000000000000..973d088e60e4
--- /dev/null
+++ b/dev-ml/timezone/Manifest
@@ -0,0 +1,3 @@
+DIST timezone-0.14.0.tar.gz 9480 BLAKE2B d9f65420671d8a0607d16f91c6b10b48def78a813a87ecbbc3e036367a2084d53a256c698521f10b407dac0606208e1f5f2cd56c475e0a173cfc0a3e5a5cdede SHA512 39abb7ebc9e08520a9c969da948bd3de0dc9dc01c75d5ca324afacf231671edca3eadd6992ef3037cc23218990af8061419e5580d9ab246a43d31c5788599cc5
+EBUILD timezone-0.14.0.ebuild 458 BLAKE2B 95e7f95f8f6a64f2276b50d593ed519ce1129c4ef5d37625aa9e1f0ce85b0684228a3b931cbeb08a5d6c1ff569daa25dd4e4794592000f883202615f3ac04b06 SHA512 4f6b10c83848ff63852595e05836c02ab25b7c6d076ce20f1acda2e063bad6e3bd0fb47998ac9ab8d37e26a2efa514c84e898d6169f208d0b7d64054ee08d9ab
+MISC metadata.xml 316 BLAKE2B 0420d2ac2e256fe77d345a1d94987fb49548fbeb41253292ea9f8ea3a751af2059eadcad46e3548b8430620d5cadff55968992b703bc3e9c0b4f63d374376763 SHA512 b0c3fcadaa449d24b6b977aed28906c9af8a664829181a67566da48e17379f7df703427cc2a09b22e91eba0996bd0051e4d5a98dbc28c7ad76d87428dd334372
diff --git a/dev-ml/timezone/metadata.xml b/dev-ml/timezone/metadata.xml
new file mode 100644
index 000000000000..58b29d804a67
--- /dev/null
+++ b/dev-ml/timezone/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>ml@gentoo.org</email>
+		<name>ML</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">janestreet/timezone</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ml/timezone/timezone-0.14.0.ebuild b/dev-ml/timezone/timezone-0.14.0.ebuild
new file mode 100644
index 000000000000..8a11e068770f
--- /dev/null
+++ b/dev-ml/timezone/timezone-0.14.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="Time-zone handling for OCaml"
+HOMEPAGE="https://github.com/janestreet/timezone"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="ocamlopt"
+
+RDEPEND="
+	dev-ml/core_kernel:=
+	dev-ml/ppx_jane:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ml/typerep/Manifest b/dev-ml/typerep/Manifest
index 7542042ef00e..e49a9f50a28b 100644
--- a/dev-ml/typerep/Manifest
+++ b/dev-ml/typerep/Manifest
@@ -2,4 +2,4 @@ DIST typerep-0.14.0.tar.gz 22936 BLAKE2B 353a42f0f14bf6cbfc88670ca3d42af5873db1f
 DIST typerep-0.9.0.tar.gz 24934 BLAKE2B 83e0cd9419c11a1b8dbce6730404dbe4b00597e441943d8315ad5a583ff50376c95413695e327996b07557b1b481df8ab15db5b37c3ac4c8396b7ed51aa822ea SHA512 f71fa3968ff5e93c384a97e2d39af0de33f4889643a7e43d70a777214dc4c7f35b3fac0864ffee99334cf03866a695f7afd1a907d5c7f3cec0d472b729adf9cc
 EBUILD typerep-0.14.0.ebuild 477 BLAKE2B 9d607d7b2f510f3600829a71a1beb07d26573274eb655ca603e1919dd2136d916be826082d858aa2aba8fa0dd66cb0889495d51863ebf552e6b8b2fe58007577 SHA512 092731cd211bd9d614d1a65e9875e9b2825ba73dad36ed60d19a9453d6c45a01161f9ba11f040bc8977aae2ca5877f5afbc85c15675adb1263b2ed34fb6db371
 EBUILD typerep-0.9.0.ebuild 477 BLAKE2B b49346885d12aae201b75ebe9060b02778c61e52779c452fb378011284a349f8bbf53f34b75f081ebc302894f2d91fb9b9ac1d1acb663a8c7ffdfde87fb9ca52 SHA512 5e7bf0fe698123824f02cd7e5bf0e733bdc1e2dabad4c448644ee91ecc62951e03ee5585308038a7050275da05929455d77227470c76d2df294267867e58ecc2
-MISC metadata.xml 327 BLAKE2B 03148261c61030653269555bdd1946cbc3ba93e5529e3c1a2734af31c22ffadb5c41f4856e2fa1be7f8d18befde507795e0fa9b73f36e7e9a6a7ca7442c3ba55 SHA512 206bb81579390a8b1f21f6dd1a0383c4a4f77a900fff577ad1b1ffdeb72b940da999203f423d8576c5a10802c1e6400fa510ee1d5ff6d1718538c8a1f7977481
+MISC metadata.xml 420 BLAKE2B 46e5de2aab539049d08de2d9a076cba55f5b16e3de8162da84fa434ee2ec4f445c2c89fa0998db56d50746ebe577bf278c9a5dddf27b7625701a7a5b7508ed34 SHA512 cb92f3d9eda9bc6b99e06c68d8e5d8aad2f624da1e088a9a79a68cffb794c42c36f8498f10d29d70f49903f06b775447a544ace32dd38074479be9d50ba727b4
diff --git a/dev-ml/typerep/metadata.xml b/dev-ml/typerep/metadata.xml
index f3f7dc32a8b3..d4bd94e13be7 100644
--- a/dev-ml/typerep/metadata.xml
+++ b/dev-ml/typerep/metadata.xml
@@ -1,6 +1,10 @@
 <?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>
 	<maintainer type="person">
 		<email>gienah@gentoo.org</email>
 		<name>Mark Wright</name>