gentoo resync : 20.10.2021

author: V3n3RiX <venerix@koprulu.sector> 2021-10-20 10:22:14 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2021-10-20 10:22:14 +0100
commit: 46eedbedafdb0040c37884982d4c775ce277fb7b (patch)
tree: db33a91259730be84999e13a8d8168c799f50ac0 /dev-ml
parent: e23a08d0c97a0cc415aaa165da840b056f93c997 (diff)
118 files changed, 473 insertions, 212 deletions
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index f8a916db82ed..9d306c4a56f0 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/alcotest/Manifest b/dev-ml/alcotest/Manifest
index ebfa23a45a63..1b7511daa09f 100644
--- a/dev-ml/alcotest/Manifest
+++ b/dev-ml/alcotest/Manifest
@@ -1,5 +1,5 @@
 DIST alcotest-1.2.3.tar.gz 274177 BLAKE2B 1c38baf8932fe16ec3899cd1dd747099065cf93677271aad5ec33706ed7b6fd82dac84f9ed7518c56d178bf1f98a0b131d5e0f4745d47b07021f0fef932fde28 SHA512 0f3e2a5f56a17b6ddf5173d490b8a1aa2b23382bd0535d9d8be09fb8d4dd02dd1b92f9d00b957b11843d671262469e28b3be4f987538e373eb5e1f30c3a406a3
 DIST alcotest-1.4.0.tar.gz 279675 BLAKE2B 3cc50ab37a16948ceca9b5e6aa885fa50bbe0722c6132ed4991fb64c568253d9913287d1b9e5547f59a210d6803e2a83565f02950fb12cb91ed9f8e24d7864c1 SHA512 adb73c8b2be6f47cb406bbc49dba7dc86e990a60e2e68302592a24dcc24e11e76e2aa6fc2f003c1e4fdbb79744df6ab601daff9540cd7b0096ac9f9bff18098c
 EBUILD alcotest-1.2.3-r3.ebuild 668 BLAKE2B 6147c5b6a4f40d3ee6b04f57939751098d0558135534e523585c69aafc2c4b6074a66d65d7a5b8df01d419123d0fc68585a0f5315c66d8d9199c6c1ffb6ca51e SHA512 6b5ddbe10503affb3ed5149f05b4dfe5385d0c5a40ce110f7bf0efa13297c3c807003c13af2fea8b25474e9113a7b0853787ebf8112a60bbe99893302460b009
-EBUILD alcotest-1.4.0.ebuild 674 BLAKE2B 04400310ad7b3cd2650e348cfa5ac85b7b8d1ac351d2cf674f9443b45e8332e398ff9e159f06cb624da3f7d4dd58eea7fef2ae977774003f1916450f8e161011 SHA512 438d310049747a102cf14b06d5d1b5a14b752fc236f8bcc5e2942632d772e5e9913ab035b9d2b3f0de86dd1c9df0c40a61ad8491269a56fbe9b8c7aa9ea94d84
+EBUILD alcotest-1.4.0.ebuild 668 BLAKE2B 6147c5b6a4f40d3ee6b04f57939751098d0558135534e523585c69aafc2c4b6074a66d65d7a5b8df01d419123d0fc68585a0f5315c66d8d9199c6c1ffb6ca51e SHA512 6b5ddbe10503affb3ed5149f05b4dfe5385d0c5a40ce110f7bf0efa13297c3c807003c13af2fea8b25474e9113a7b0853787ebf8112a60bbe99893302460b009
 MISC metadata.xml 313 BLAKE2B 8f2a0fe29ed0694a9f3b13a3c093cec830ed9bdfc482cfcb78019fa7621f5982f4f158fd8d1505dc7972a9fd4386629433f679ed216a006176444bca75313911 SHA512 72de033c1529758f63f093c39f71336490bf8628cdd51f3c0d40fcafa4602d2a877601bd316851db15097747bf1342840f150d390cd093c843767f6785cdb3f2
diff --git a/dev-ml/alcotest/alcotest-1.4.0.ebuild b/dev-ml/alcotest/alcotest-1.4.0.ebuild
index 0ca71621477e..5b7a4817580f 100644
--- a/dev-ml/alcotest/alcotest-1.4.0.ebuild
+++ b/dev-ml/alcotest/alcotest-1.4.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mirage/alcotest/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt"
 
 RDEPEND="
diff --git a/dev-ml/base_quickcheck/Manifest b/dev-ml/base_quickcheck/Manifest
index 8dc5fdadb5ea..1529b65e33bb 100644
--- a/dev-ml/base_quickcheck/Manifest
+++ b/dev-ml/base_quickcheck/Manifest
@@ -1,5 +1,5 @@
 DIST base_quickcheck-0.14.0.tar.gz 66736 BLAKE2B eeaa92ec0eec4736be911128f46b8e4698034b2cb8afa131b31ee96a6edb5db0f28cfd611c101e4417305ee5a1babc2f869f4690b266218562a8fc50f5830acf SHA512 52333bee2591531665b8f8ad0fac1cdaa607b448d0a33b9b905cf98e00df5a700bf0a4ee3cdf3c06d7fcb2b5190363dd5908cc743b2854af9ce5c8d743e3fd58
 DIST base_quickcheck-0.14.1.tar.gz 66827 BLAKE2B 2a274fc0edab3daf7e3d671f7ea24912ecf273cf2b4cb4ab2bd74171a8848163526f97ed860b44aeaa9f3f3faabb22f4598bf604b33c8401733faa22ca7a3c93 SHA512 5d5a3a070a6903ffdd1e13754721d48a9df164f78bd569d3a18b3fd808354550e4603b76d5e48eaa6a4c4d3433f18bb29888478d640fde9ea004619448c3d7d0
-EBUILD base_quickcheck-0.14.0.ebuild 765 BLAKE2B 08d36c59b4f8fcf6bb43ed9e319dfe9e1a175eda8447b41435c257f34f42eb35c26d7e5a95a28f27060983911ee22ee36f08ec67d7ecc2760979c08019f3b6c2 SHA512 30c91a1b596cd0652c2f2084ccfd9b5e3dca9ef4227a14ab2d5d3aeb413311b8846911edc0830c6190841b5290693797dcd36015f83ae4f274f4405231d740e2
-EBUILD base_quickcheck-0.14.1.ebuild 771 BLAKE2B 1311571b056ff6dcf769bac74f8faaecda3cdfc3a3151e5634a4f6d11e107a6da651641be84589a2388deebf1a34592c49a7b2945ad7913a9f0c749428c620d1 SHA512 dcba6c81e7b31b531ecdffc1c06be95bd68023c30fe7b3d02e8252589d0a2af9de1ebb3bcc5a2d2805a5bb4da55b880abdc3b119a85d577b02f095be7367829b
+EBUILD base_quickcheck-0.14.0-r1.ebuild 790 BLAKE2B 4d37037084c2eab51d1704a61029fb7a764080b907bc4fb60e3ff9306293bdbdace802230cda8b306ee84c4c205ccddbb96dabb143a26d5eb9345e685a9fbb15 SHA512 8a831c31d1c909db60868f682bb8178ff1a1e13ac7f589ef5a004d47ad89ef8fe829fe1747ff8cb9aeb565ed3a97cf41cc0c560e9653c51d9ddf451088f832d1
+EBUILD base_quickcheck-0.14.1-r1.ebuild 771 BLAKE2B 78e8ba66b0d538d90c67768570be78944e304400d5b29ec564e5f0c9d5616c15fb5c21a4231cf0cfec292388dcdaba1cb0dd9f75020078d88e219d6fa954b81e SHA512 a55e364752125ff8e902684f4395ae72283999599d8b6eb70d8a75ce0980990022520a3740d5c882d9991aeea8712894a0296573710d26cf2604a3d854c3f50d
 MISC metadata.xml 336 BLAKE2B 6e0fd85af8abd5f25bcaadbeb62f0971f6ed38780d6b045431cb258cb47bb41c958c596b01d6b5b8ba569a55976f15113c1655125c8b0d11a3b73597069e1ca1 SHA512 9cfe316d1df1581c39124da69fb2ea008e7c517eaf4bd2f46d4ef7b8d68b9c150425b878ec132f19bc8574b3ff41bffcf0d2f8a04955573b1deaf26391b53ee6
diff --git a/dev-ml/base_quickcheck/base_quickcheck-0.14.0.ebuild b/dev-ml/base_quickcheck/base_quickcheck-0.14.0-r1.ebuild
index da316d2b46e8..22f5dc4817f2 100644
--- a/dev-ml/base_quickcheck/base_quickcheck-0.14.0.ebuild
+++ b/dev-ml/base_quickcheck/base_quickcheck-0.14.0-r1.ebuild
@@ -23,6 +23,7 @@ DEPEND="
 	>=dev-ml/ppx_sexp_value-0.14.0:=
 	dev-ml/splittable_random:=
 	>=dev-ml/ppxlib-0.18.0:=
+	<dev-ml/ppxlib-0.22.0:=
 	>=dev-ml/ocaml-migrate-parsetree-2.0.0:=
 	dev-ml/cinaps:=
 "
diff --git a/dev-ml/base_quickcheck/base_quickcheck-0.14.1.ebuild b/dev-ml/base_quickcheck/base_quickcheck-0.14.1-r1.ebuild
index 3f8f641d04a3..7b0d4c531b9f 100644
--- a/dev-ml/base_quickcheck/base_quickcheck-0.14.1.ebuild
+++ b/dev-ml/base_quickcheck/base_quickcheck-0.14.1-r1.ebuild
@@ -22,7 +22,7 @@ DEPEND="
 	>=dev-ml/ppx_sexp_message-0.14.0:=
 	>=dev-ml/ppx_sexp_value-0.14.0:=
 	dev-ml/splittable_random:=
-	>=dev-ml/ppxlib-0.18.0:=
+	>=dev-ml/ppxlib-0.22.0:=
 	>=dev-ml/ocaml-migrate-parsetree-2.0.0:=
 	dev-ml/cinaps:=
 "
diff --git a/dev-ml/bigarray-compat/Manifest b/dev-ml/bigarray-compat/Manifest
index 7e2520f131b1..0aed8c79f243 100644
--- a/dev-ml/bigarray-compat/Manifest
+++ b/dev-ml/bigarray-compat/Manifest
@@ -1,3 +1,3 @@
 DIST bigarray-compat-1.0.0.tar.gz 1385 BLAKE2B afa38fd206de8738db51742467b95df4aec3e4e713c946c2c1d041da7e19483bdb53dca440b50c9c1b3c3a5fd7ac71a63ccfe74a14a5743f10f35429838a1c14 SHA512 c365fee15582aca35d7b05268cde29e54774ad7df7be56762b4aad78ca1409d4326ad3b34af0f1cc2c7b872837290a9cd9ff43b47987c03bba7bba32fe8a030f
-EBUILD bigarray-compat-1.0.0.ebuild 438 BLAKE2B a4f5050a4abd86b62895718ba5b48d784ea0ed104511db597ac3ffb1ac3edfebcd43a2e3b23056f327c34a1eaeabc75dae0cf007c0116acebff0d4ac295bbf89 SHA512 f4aebdc53cc7297b18043b3e5866092b31038a974d47c5a3c8b19e02ed11b9355ad18f5b2bf149cd462d18b24a5fa81a3426eac667eb66fa1a90b41df07b942d
+EBUILD bigarray-compat-1.0.0.ebuild 445 BLAKE2B 7b3d454aaa9ecf49e8f754c605f58d66e51444689689785b32d51ce6bc66721e98a9b45732cc58f5b821a4e6bd0f40245b4c838f6b3da36f006a52816f283ee5 SHA512 03b5728f663eab1fa8d1cf882289db513a4168a11dd589bbf672df4679b1782b8adc41003fee445d51395f11a5b9f8cbecc056142b60e41d509f6dce36a21f5a
 MISC metadata.xml 320 BLAKE2B 01aff5c109d72cdbeea68a7170d2ddc0dbac8b02e667df569c4a1111ba7fc8f73114f1d32dc3883e5bcf07b85bc9d2c5bc6940c65b8ce4d316f2eb7eb9f620a3 SHA512 f4512e72cde3192cd47c1083077ae9d8520cc7067c8249966fd5522d7113b4d4d390897b0abd7fb5c5e292fe490c57e689312ff47b509af3709faf3a27440b3f
diff --git a/dev-ml/bigarray-compat/bigarray-compat-1.0.0.ebuild b/dev-ml/bigarray-compat/bigarray-compat-1.0.0.ebuild
index bfeb0770b6b3..fbf62fa457b2 100644
--- a/dev-ml/bigarray-compat/bigarray-compat-1.0.0.ebuild
+++ b/dev-ml/bigarray-compat/bigarray-compat-1.0.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mirage/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="+ocamlopt"
 
 DEPEND=""
diff --git a/dev-ml/bos/Manifest b/dev-ml/bos/Manifest
index 36f78b03e0ab..43f203dd508a 100644
--- a/dev-ml/bos/Manifest
+++ b/dev-ml/bos/Manifest
@@ -1,5 +1,5 @@
 DIST bos-0.1.6.tbz 39822 BLAKE2B 0e10eb14fb5d429b81c67659c936e8b700c4cd417d1f5be000c8bdb0304de8ad9130e597f6e2e7771380c29c148f4339817bacc458e72a8efa894be3b85965bf SHA512 f1f10a97a32da936a7d5a0c70632e723723ee523c79f9dfd23bc42c039a194e8d69658483e6e856c7911332b799a92bf8cabfe96cc387522d7450b8f3f8f8343
 DIST bos-0.2.0.tbz 41008 BLAKE2B badc344e561ba9335a4ded0c8100da91fe2bc882698c94daa42d9db2f1e2c8c627b81eebb5a7067778c332384504391ea402f7363ec552e8517cb048c8e384fe SHA512 f9120f8108c6da5647c9fbcc78736a5f87bf5627fad01035fdab1af6322c93e75df670d7d2910fe474c92c48ffffcf15955a84e698cfc7bfb7c1ac4fe27d472f
-EBUILD bos-0.1.6.ebuild 908 BLAKE2B c3dd6cd8b24a3e1cf999190ca5879604fbe54e1a3a8499b02b1272d86c37674b2411688b36c02dfb7e0902048f8ea983a5a51b4a2968caf5fcfe8b1cd5a3d9ba SHA512 1321689a587cea31d91f79c8638d4d95b65ab3db3341b0df61959577aa094ba31b26670f402e08949b9fc99ddc8c2c62f230875d2ba4b348170133454f21e174
-EBUILD bos-0.2.0.ebuild 918 BLAKE2B 6fee708d89ca615a5574745791753ccc1ecfa888b29cd9ff345a934cdbf04e31d9937376be181529a0450617615d3f67ad6a53f79d0f94d5787521f5420adf97 SHA512 fa4742dcff0daff633ace9e5370f57e6cf1864750aeafce22cfcafd1209b85970683907dc3f4c90698b22a1ae13784748f6f8490a0ab7b29e82a4806d9a9b53f
+EBUILD bos-0.1.6.ebuild 907 BLAKE2B 5f456180ba9fb42674936229c6b06ea4c3961d2805bf5e05f734822cb3071a17528aed8826c8a14b635ed69508f8ae809d07f1c9acea88092d643deaf825a24f SHA512 12ce7f43ec3435493c849956657661268fb4d7a3f3bbd2cbb6ef12f276438e51c028b4d01f635aa970368f6ee1a970bd57afc92e63a1b59d6491f44a169f2e02
+EBUILD bos-0.2.0.ebuild 913 BLAKE2B 3be255c90118706a0ce266fac420b78156ab2e318314fee0127087f0de2ce17598768e4ab26188a444928ca0f4b6bad9a252a2b73daa2cc5e8a458f9d6f05515 SHA512 79041ab8028199fc08a844ea0af85aa47cb3e3211e14fb0ed55315ef8030af9c0125e0b763d1d17837e046d993ba76a932386ffb91235c871f0f711cf1339cae
 MISC metadata.xml 310 BLAKE2B 451869df8c70299f88448015fc68cb0b72768885c18fc66abc5ccd1c08e3ac0be865c64538536572d02de0515187c21e3af7ed44ba66593598d9327252408629 SHA512 ecd83848005eb7e6351cd793c12e43eb23a1e01c9f740c91bcff14c310c47f764a7ab55a0225be6fc17c2cc56fb1e972ab4ac21f53f532548ba744e0ef950309
diff --git a/dev-ml/bos/bos-0.1.6.ebuild b/dev-ml/bos/bos-0.1.6.ebuild
index db3fc9fd2725..1c8791ab0f6b 100644
--- a/dev-ml/bos/bos-0.1.6.ebuild
+++ b/dev-ml/bos/bos-0.1.6.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://erratique.ch/software/bos/releases/${P}.tbz"
 
 LICENSE="ISC"
 SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ml/bos/bos-0.2.0.ebuild b/dev-ml/bos/bos-0.2.0.ebuild
index f1bcc15aeb1a..d2de94db0e18 100644
--- a/dev-ml/bos/bos-0.2.0.ebuild
+++ b/dev-ml/bos/bos-0.2.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://erratique.ch/software/bos/releases/${P}.tbz"
 
 LICENSE="ISC"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ml/cairo2/Manifest b/dev-ml/cairo2/Manifest
index 2521ca3dda76..7efe2e24b276 100644
--- a/dev-ml/cairo2/Manifest
+++ b/dev-ml/cairo2/Manifest
@@ -4,5 +4,5 @@ AUX cairo2-0.6.1-ignore-gtk-and-pango.patch 2168 BLAKE2B f444c6056af8708bd4dd838
 DIST cairo2-0.6.1.tbz 90006 BLAKE2B 78f1a998f821aad9b2a1d2deacffd9290920e6d351e0c66b6cc2a6f4f6140fef67c0dde9c1c317e743b5930e09d68d6c1830beb554d23ac9bcc95738a4091850 SHA512 d09274624854a45cf914ffbe984f1bcdd30db6283e7a0fd73aeec2a19226ff8f68d3f7139bbab72ca5698b58b840d6fd8a35570efc228391a7c5d031421f5c1f
 DIST cairo2-0.6.2.tbz 90428 BLAKE2B a8c03e6ea8d4dcfc34a744f48b9a55a5e84b964602358f1c90aadcc5fdaed8eebecba2c851e71ef60066d42088d0baf9f4b90824541af93426e47f2539d6f41b SHA512 789b65428855c3b8fb71836ee6e607870c3140a6152fb01b8ba6e7d2e2f4842a62412061a5eff99023234d305587b605d0cbbacd29456c86a52e9df6466bd302
 EBUILD cairo2-0.6.1.ebuild 1138 BLAKE2B a708b4bb1c159ddd8a0eb71b07c575aeeaf6c942041099d89789e7b1fef9d0d5ab8570aceb7de424f7be39972b1b1268cc89b7323da045df129c4a9b72b0b69f SHA512 cce637e651b75d953334a71e1dd1ad31590180dd7e17d2fbc90e643d184d380ea6b1e82252225ad9ebfb7585dfa22f90e33ca86fbe16356d7a24eae2dab9bc67
-EBUILD cairo2-0.6.2.ebuild 1019 BLAKE2B a55ddf93f0dd72b02abb13307b8428dd84878cd4ded26096ae6e4174f15241d1a0834d306b58b03279e2eb5ffa60126e68d6ee56edf4913e6a5c8a0f0c7449bd SHA512 4f919ad9a56c473cde92e50651f4e31c476c6da8f430dcf5afac3b24193df6d35da2df39df25f816e57bf8266c555dd6e20aaf765490beefc78e4383deaf8ef1
+EBUILD cairo2-0.6.2.ebuild 1015 BLAKE2B 32cf7f22398b353a5c3b9727e1c0e6c2d707e82c5fcd22fbb3f2897c907023cb98ed7f05804c127f722e283775be1a7b4b8c184cce26485fa7ef9bf9295432cb SHA512 1bd5b2c89a387f8b88c55d10fde7de6046617bd376013a97a99d102b8efa432ccf7df469a652a143ca429f1a884abd37edd6cebcdfe38d403e0893228c6c8b03
 MISC metadata.xml 422 BLAKE2B 247d46b642a4b11443adef6724b00fcf6fd9e8dc09ae1a8bbef9a6069d79efa29a24e24b8ead3231006dae4368da0ed94bcc29b208cb1e0db387754bfffe40e9 SHA512 138f87c890e35c7e3627bc1206927a1cbe7347cbcfe9861f249580dd4ca348c82dad8411c78711d63b70097753bad50a67a1f05dafd9b1349b13a1cd7ff44439
diff --git a/dev-ml/cairo2/cairo2-0.6.2.ebuild b/dev-ml/cairo2/cairo2-0.6.2.ebuild
index 812ac046545e..a24437297856 100644
--- a/dev-ml/cairo2/cairo2-0.6.2.ebuild
+++ b/dev-ml/cairo2/cairo2-0.6.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Chris00/ocaml-cairo/releases/download/${PV}/cairo2-$
 
 LICENSE="LGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
 IUSE="+ocamlopt"
 
 DEPEND="
diff --git a/dev-ml/camlbz2/Manifest b/dev-ml/camlbz2/Manifest
index 276ba8d85dd1..0d7209368467 100644
--- a/dev-ml/camlbz2/Manifest
+++ b/dev-ml/camlbz2/Manifest
@@ -1,3 +1,3 @@
 DIST camlbz2-0.7.0.tar.gz 22769 BLAKE2B 4bfd1c4e7e4b47e666dc3053bf1536ce71b9d32fa0dff2a11642176431af89f83007bae23c61335eb1153e21300a91193f86a40af7ff0c133d491b6e6a3ec4f6 SHA512 570901199df4b5ef79e158f5309ff69d2b85babe002a0324244868f4201f0e9d6aeec377b2ec9a6bf657a29857dc13a0f63e05d162f76c7d412fa6c5f3c0e0f6
-EBUILD camlbz2-0.7.0.ebuild 779 BLAKE2B 0d6226027d927665e16931304b00b851e595fb7a75d3d4ff39255f6800f06183334a3fcfafb870430d2d3d9a207291fc5a3fa163687759e0ae9010e28473d8c7 SHA512 1aaa0b126416f66a63ce1e45500ad9eae5aa0e4b1ed477e944e70236cf6e56b5772ac48681dc2a3d9f8ca34f583a2a713aaed7feb16ef3cade654a208973840a
+EBUILD camlbz2-0.7.0.ebuild 683 BLAKE2B 107279edafc0597f355e00b5cd61cab783eabace7a0f9c8a728772d2f7bc232b730bf1cb7613a68040e1dfac0cba0269682121e8e5b1e8b5ba6b5a74985beb91 SHA512 02db2953337b75db9518422aa0872c741054e2ee969a7457f794217372ce2ad1c5669dea28a20d5402eb3ec80bb226146c9b2838671539b0971d729531d2c267
 MISC metadata.xml 245 BLAKE2B a7cadf465163ca1df604d88e904902634f1559b696dd48e5a57ebf2b7d27917f6ebbef65492ffdf5b620df01825f242d9311161f5624adaa709eaf7eebe0f5fa SHA512 27160785fd59931535cbc1c56f34e2f7e79f477bc9157eff9a07bd7b3f49f1c8c1c20106c9a7148123dcdc3b64411b9f706d49b544eca4415d8d13152fd05c9d
diff --git a/dev-ml/camlbz2/camlbz2-0.7.0.ebuild b/dev-ml/camlbz2/camlbz2-0.7.0.ebuild
index 774e2b6b2f7f..a406153daeb5 100644
--- a/dev-ml/camlbz2/camlbz2-0.7.0.ebuild
+++ b/dev-ml/camlbz2/camlbz2-0.7.0.ebuild
@@ -13,7 +13,6 @@ SRC_URI="https://gitlab.com/irill/camlbz2/-/archive/${PV}/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
 KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
-IUSE="doc"
 
 DEPEND="
 	app-arch/bzip2
@@ -21,9 +20,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-DOCS=( ChangeLog README ROADMAP BUGS )
-HTML_DOCS=( doc/. )
-
 src_prepare() {
 	default
 
@@ -40,5 +36,4 @@ src_compile() {
 src_install() {
 	findlib_src_preinst
 	emake DESTDIR="${OCAMLFIND_DESTDIR}" install
-	use doc && einstalldocs
 }
diff --git a/dev-ml/camlp4/Manifest b/dev-ml/camlp4/Manifest
index 1b1fefb3dc24..c29acb1690d6 100644
--- a/dev-ml/camlp4/Manifest
+++ b/dev-ml/camlp4/Manifest
@@ -5,10 +5,10 @@ DIST camlp4-4.10_p1.tar.gz 650092 BLAKE2B d7a6221dba5f6ec6963fe35236c29f39b8ae8f
 DIST camlp4-4.11_p1.tar.gz 650280 BLAKE2B 6fe46b49c1f2b2e5fc87fbbbdba3ccae795c555737495c298456b84f0dca79c750aa6e4ab2c23bbc7ba4724defdfb739e370f468a78658035474d2f3ad255995 SHA512 8e572602c1c465017a234565efa2249c935ba1ad3d399a6b264bfbec345958130a96311c79e437ac995e3ead9ff7b4f2d3fe6aa4a3a82431ae0cc6257a300f4c
 DIST camlp4-4.12.tar.gz 650428 BLAKE2B 4957d3db73ec82fbac58dd95fa13c48f9f8480a70cd6bded43a00df0a182f9b9e31a43acef8264f9d940776667d10b0a5c46bded59ebf4a645719264628428fc SHA512 0a19bb596e47076a28a6bea62007f1d3b59c4d688075f6b723abaa205c555707feb4ea0624259994a4ba5251fdea9dc61cdc936dc13611b36937e755a4bc9b7b
 DIST camlp4-4.13.tar.gz 650642 BLAKE2B 5bf70b21f47eefe4631227d0d30fdd08ab965020026d0183fc94b9dbfd1eee45626afbe62bf9507b1a887217cf9245901d40f25cce9430155eb9ec1ddc577554 SHA512 d3307bd11b813540d126719c0afe7e75a7740d0851b272be9bd1a28e8b1ab1ed9a7576109000c8d6cee7ece7f777122aa83917a48147d42ed8f4d72994397819
-EBUILD camlp4-4.05_p1-r1.ebuild 1182 BLAKE2B c7f79908b6e5bb7a64ad6a63a472e44c6fbbb07447623e4fa67a5020ee8770f20558dcfb6f6107dcb0eaea12ff83181ee0785cb658d2a154972d8f4c7af20b0e SHA512 19a429da37b07fce0a5a03068eb6a182788d455692d6d585c2da4fc3e9b7e585ee5e93d0dd71d7f142cf0e44a6b18d325b3a533f265f88a2f2b39e6e5ec65db0
-EBUILD camlp4-4.09_p1-r1.ebuild 1205 BLAKE2B 20c353735915b452053f7b939bbf307dacc09eda5da67075bf30d5bc7f2abdfdbb1534fd8c2166006aab869126ada91a643c3fe8eedadc4c8b4146caa513ba65 SHA512 4ef84ebbd16d74949021fe6bbd98efbb495fe1c246faa2a07180452620c2fa2bdc1dc33fce6342ab4a6f2a19c2995cedb5394cd837913d37126f4caabf75f028
-EBUILD camlp4-4.10_p1-r2.ebuild 1221 BLAKE2B 39586e51ff36e0bb3756776eed91a1cebe90d7be9c3adce8a3c583cfa9f2cded3aa5239e0dab84e9cc9c8079d19a7bc314b875814150566bf2dfefe02bf3d5cf SHA512 24a597fc8be6e52f5b61d4cf33600175461bbc03f3126a0d660c40316ca9073b654fb583bcaa6065455c878bb80beb75e0f2b4b1331906aadd2a60e4260d7465
-EBUILD camlp4-4.11_p1-r2.ebuild 1244 BLAKE2B 994b91a58fc981cb5e85694b65494cf3c503732404dbbbbf5d944313f12bd3a901854b8e4fb345d48dc3510d0abe2a0291348e71659d560887094bc8c35e50a8 SHA512 11863063ffac5d8b9d7cd10a4c7f396a3ca35913bc767db2806f203dff287d7c45ff1054df4c93bb9c2fcaaf8b4d79761c8d588253f72e403136a313dc90583c
-EBUILD camlp4-4.12-r1.ebuild 1244 BLAKE2B 994b91a58fc981cb5e85694b65494cf3c503732404dbbbbf5d944313f12bd3a901854b8e4fb345d48dc3510d0abe2a0291348e71659d560887094bc8c35e50a8 SHA512 11863063ffac5d8b9d7cd10a4c7f396a3ca35913bc767db2806f203dff287d7c45ff1054df4c93bb9c2fcaaf8b4d79761c8d588253f72e403136a313dc90583c
-EBUILD camlp4-4.13-r1.ebuild 1244 BLAKE2B 994b91a58fc981cb5e85694b65494cf3c503732404dbbbbf5d944313f12bd3a901854b8e4fb345d48dc3510d0abe2a0291348e71659d560887094bc8c35e50a8 SHA512 11863063ffac5d8b9d7cd10a4c7f396a3ca35913bc767db2806f203dff287d7c45ff1054df4c93bb9c2fcaaf8b4d79761c8d588253f72e403136a313dc90583c
+EBUILD camlp4-4.05_p1-r1.ebuild 1164 BLAKE2B dc7d5851ab7af7f86914045ff027f72579dad2feb4c4a54861a3a5ab024bdeb6698c311b455746c1c8a9167e90f8551a904327675aaed88f16452817ac841c40 SHA512 7b6c9890ee22dbb117a83935decea9b9dcf58c6db0a0f2a8e974b9bb9c232755161a066339695a33425487f5da041b085a2c2c2fb60a622eeddb93b5fde0b663
+EBUILD camlp4-4.09_p1-r1.ebuild 1187 BLAKE2B 10819597a5cd44b5feba7a6a301e08e277d3bee9343744ed15f8e5aeea791938b3961c13574a1db34c19019afc70b6533a0c02b93e061dc4c23b53b20fb94aa7 SHA512 3a395692a7bccc8bcf5388f6ccc613cb616580f3c36518c134d158b4769067a6364cb0d62f239a3de9967e49b36d394e115defa68d4e8ad5f0e6fb9de2cd8175
+EBUILD camlp4-4.10_p1-r2.ebuild 1203 BLAKE2B 5db74bdf68a0aad49fdfd91f1a0dbb2be000b32f20851e5a252263a18d0b79af859b99d80bff2d3591ae3677650dabcaca8ea6d96b2934438d842fd19254a7e7 SHA512 f0aedb50993288f85e154d862d66ec61f39908571a6723eb5fde32f0e6d9f859b6e35da37702fea4282d742a71fabfcc7f85532037cd8099ad54cdaf635b2610
+EBUILD camlp4-4.11_p1-r2.ebuild 1220 BLAKE2B 078b7899c5dc77d03786c8d18c6365bf48bcb1d43bc44795ae9d0236b44cc17b45434f34796e65b733c7bb4eef29559d4c09b9e6ddd078501af3946a30ad49c6 SHA512 1b0725a99136faad1de580612b6e7673ada360d813dc53389fa684afc3f8dc14fe16f23d5f5b950e9d3968a93754489cdc1462d8bec5268b344fdbfe7fad69f9
+EBUILD camlp4-4.12-r1.ebuild 1226 BLAKE2B b45edf72bbe4d817b354414fa04da81527ca3d0d2c8d08ca65a24243a1127b02ed7e71f389c28337b65d8512ceebbb72f6d6a10a8292c8529f956831b58a118d SHA512 5651b20b5e15852508430028b84466a4c55a5708b1d025dae004eb52242bb464071ed11fe06258ffa556e082b4c856f590dc08d4e30ef0a36c19414595d599ee
+EBUILD camlp4-4.13-r1.ebuild 1226 BLAKE2B b45edf72bbe4d817b354414fa04da81527ca3d0d2c8d08ca65a24243a1127b02ed7e71f389c28337b65d8512ceebbb72f6d6a10a8292c8529f956831b58a118d SHA512 5651b20b5e15852508430028b84466a4c55a5708b1d025dae004eb52242bb464071ed11fe06258ffa556e082b4c856f590dc08d4e30ef0a36c19414595d599ee
 MISC metadata.xml 416 BLAKE2B 560e2116bb064decbc8d5e5391966be20ecdfa18ffc362c947b3d5f9aeae1bb2e5d3f391f765e9485075e05a90db69c4f9283b028bd15211e6979621b50d4428 SHA512 db6518378e93c20fd831ab4d2b6ac2168dcb456cf8c6e203f4c2d5a121404e530a8646f1346f34bb4db776cc9caf5f39f0749a6f46b7cc087ad38e7512e9872e
diff --git a/dev-ml/camlp4/camlp4-4.05_p1-r1.ebuild b/dev-ml/camlp4/camlp4-4.05_p1-r1.ebuild
index e55cdec3ea78..7c3455031b75 100644
--- a/dev-ml/camlp4/camlp4-4.05_p1-r1.ebuild
+++ b/dev-ml/camlp4/camlp4-4.05_p1-r1.ebuild
@@ -15,9 +15,8 @@ SLOT="0/${PV}"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="+ocamlopt"
 
-DEPEND="dev-lang/ocaml:0/$(ver_cut 1-2)[ocamlopt?]"
-RDEPEND="${DEPEND}"
-DEPEND="${DEPEND}
+RDEPEND="dev-lang/ocaml:0/$(ver_cut 1-2)[ocamlopt?]"
+DEPEND="${RDEPEND}
 	dev-ml/ocamlbuild
 	dev-ml/findlib:="
 
diff --git a/dev-ml/camlp4/camlp4-4.09_p1-r1.ebuild b/dev-ml/camlp4/camlp4-4.09_p1-r1.ebuild
index 4489b5085c96..4df4e6606fe2 100644
--- a/dev-ml/camlp4/camlp4-4.09_p1-r1.ebuild
+++ b/dev-ml/camlp4/camlp4-4.09_p1-r1.ebuild
@@ -15,9 +15,8 @@ SLOT="0/${PV}"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="+ocamlopt"
 
-DEPEND="dev-lang/ocaml:0/4.09[ocamlopt?]"
-RDEPEND="${DEPEND}"
-DEPEND="${DEPEND}
+RDEPEND="dev-lang/ocaml:0/4.09[ocamlopt?]"
+DEPEND="${RDEPEND}
 	dev-ml/ocamlbuild
 	dev-ml/findlib:="
 
diff --git a/dev-ml/camlp4/camlp4-4.10_p1-r2.ebuild b/dev-ml/camlp4/camlp4-4.10_p1-r2.ebuild
index 0d165e7722af..539fe3cd8554 100644
--- a/dev-ml/camlp4/camlp4-4.10_p1-r2.ebuild
+++ b/dev-ml/camlp4/camlp4-4.10_p1-r2.ebuild
@@ -15,9 +15,8 @@ SLOT="0/${PV}"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="+ocamlopt"
 
-DEPEND="dev-lang/ocaml:0/$(ver_cut 1-2)[ocamlopt?]"
-RDEPEND="${DEPEND}"
-DEPEND="${DEPEND}
+RDEPEND="dev-lang/ocaml:0/$(ver_cut 1-2)[ocamlopt?]"
+DEPEND="${RDEPEND}
 	dev-ml/ocamlbuild
 	dev-ml/findlib:="
 
diff --git a/dev-ml/camlp4/camlp4-4.11_p1-r2.ebuild b/dev-ml/camlp4/camlp4-4.11_p1-r2.ebuild
index ff2914c91084..24d6b91a79bb 100644
--- a/dev-ml/camlp4/camlp4-4.11_p1-r2.ebuild
+++ b/dev-ml/camlp4/camlp4-4.11_p1-r2.ebuild
@@ -12,12 +12,11 @@ SRC_URI="https://github.com/camlp4/camlp4/archive/${MY_PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="LGPL-2-with-linking-exception"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="+ocamlopt"
 
-DEPEND="dev-lang/ocaml:0/$(ver_cut 1-2)[ocamlopt?]"
-RDEPEND="${DEPEND}"
-DEPEND="${DEPEND}
+RDEPEND="dev-lang/ocaml:0/$(ver_cut 1-2)[ocamlopt?]"
+DEPEND="${RDEPEND}
 	dev-ml/ocamlbuild
 	dev-ml/findlib:="
 
diff --git a/dev-ml/camlp4/camlp4-4.12-r1.ebuild b/dev-ml/camlp4/camlp4-4.12-r1.ebuild
index ff2914c91084..e159ddff977f 100644
--- a/dev-ml/camlp4/camlp4-4.12-r1.ebuild
+++ b/dev-ml/camlp4/camlp4-4.12-r1.ebuild
@@ -15,9 +15,8 @@ SLOT="0/${PV}"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="+ocamlopt"
 
-DEPEND="dev-lang/ocaml:0/$(ver_cut 1-2)[ocamlopt?]"
-RDEPEND="${DEPEND}"
-DEPEND="${DEPEND}
+RDEPEND="dev-lang/ocaml:0/$(ver_cut 1-2)[ocamlopt?]"
+DEPEND="${RDEPEND}
 	dev-ml/ocamlbuild
 	dev-ml/findlib:="
 
diff --git a/dev-ml/camlp4/camlp4-4.13-r1.ebuild b/dev-ml/camlp4/camlp4-4.13-r1.ebuild
index ff2914c91084..e159ddff977f 100644
--- a/dev-ml/camlp4/camlp4-4.13-r1.ebuild
+++ b/dev-ml/camlp4/camlp4-4.13-r1.ebuild
@@ -15,9 +15,8 @@ SLOT="0/${PV}"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="+ocamlopt"
 
-DEPEND="dev-lang/ocaml:0/$(ver_cut 1-2)[ocamlopt?]"
-RDEPEND="${DEPEND}"
-DEPEND="${DEPEND}
+RDEPEND="dev-lang/ocaml:0/$(ver_cut 1-2)[ocamlopt?]"
+DEPEND="${RDEPEND}
 	dev-ml/ocamlbuild
 	dev-ml/findlib:="
 
diff --git a/dev-ml/cinaps/Manifest b/dev-ml/cinaps/Manifest
index 6af314471ac9..e2b08c03c671 100644
--- a/dev-ml/cinaps/Manifest
+++ b/dev-ml/cinaps/Manifest
@@ -1,7 +1,7 @@
 DIST cinaps-0.14.0.tar.gz 9602 BLAKE2B 01d71b199dc966ac7653aca31d8a2e238102a5a29c4b6a1cf2ddd3f4624b41a4fd3e433025217951e7bd49b5eba21b6e4462217ef65a8755e6a4075683a55c5e SHA512 03f94ce7ab16d034edfc1976dd8fb83d533a1e5bc7f89dde3ea661553e05d6d8098c62c7e154013ef7814a283bb8cf535df0256891bcc6e0fdc847f6bf62aaf9
 DIST cinaps-0.15.0.tar.gz 9697 BLAKE2B b3c28b54269b7c35070b1a61b99087986aa5fead2792558597964a55d935544f09167aed269d6d68be65c1f588b7c0d645aabeed303885929a2f41628f6fabd9 SHA512 e69018c1b8ffc8895a5280c592bfbb0ac074b5a0367dc79392198819e751bf77dcbb67cf56e5f722e57939538a54b584bdb998cd8baedf6d01014a1f7d18a0c5
 DIST cinaps-0.15.1.tar.gz 9752 BLAKE2B 56b0a8fda6e0e420b3062001f853e187c78ca9adfba7a2204845f61f6480fc9984578db00a9aaba7cefa2bc41234d710a2079300b2dcdf6791d6e037d0a82f3d SHA512 ca53a9da8aa71ce7cddf7e24778e9c4d3f3e5784209da85a5a6b2d5af83cd8ad769fbe3009d2757ebf4a25ca39d76af00ebc693b1b01c3b53c8775ea479123a5
-EBUILD cinaps-0.14.0.ebuild 545 BLAKE2B 48b581375ac583904e5e91d7f8bf1b696ba77f9b67b434d107178eb56c2095168b99be2dd830d32a7dd42e2ec3e27d87afce1be8315a719fa8ae4a8571df3cf5 SHA512 2e79d9a29b94e1bb74c0988be7bd6320b4181d8607f8f9af2a2725b44b110a4e9968f32f2237c78c21a00fa2b72d7bd096118ca8faf8d21d4e8065ed01082ba5
+EBUILD cinaps-0.14.0.ebuild 515 BLAKE2B bc2cf74213305448c62496770daceecc7d8c87c654c0ff65da9b4cc8b3921a170bacf3d6ebf93d42db004cfaa62698462e831a5fbd451dce491ca91f9c883567 SHA512 8892f1b6875f77628e20e045eee93667af23e6be61ba10abcd324924ec0fa22803c9c933062a0b63f0bb6fe91931163041256ed4473e2d381b9ffb737544104d
 EBUILD cinaps-0.15.0.ebuild 504 BLAKE2B 36834a92bb2b3d9ae4326dc0b88d28b701b47f461e6ca35b2034feba17c717bc8e8477ee946965d9b8f2b940148d378cac40891bf1c21572dcdd780d25b3e11f SHA512 61682db11933dd1a8409c5894f89613e3958a283da5d0c157f133182fc52d0784c0bba340c2599af1a36d2f33cb7154cde20666c84abfa69de5085287b7d5de3
-EBUILD cinaps-0.15.1.ebuild 510 BLAKE2B f85fb27821b015fa56a6264d629eff6641f91e4a6c6df27a6491f070a25dfdc5ce3e12d6304a72148ce96451f35514e7bcc8d8a1033b5f32208d44f3819ac158 SHA512 d9a6e88526dd9460c560c58a60aed0679d7d2e27875bad42eb269772fc78fc6d64eb5f3785b9f5fb30619f2510c5ec50910248ec372da6e38ab956523c403ecf
+EBUILD cinaps-0.15.1.ebuild 504 BLAKE2B 36834a92bb2b3d9ae4326dc0b88d28b701b47f461e6ca35b2034feba17c717bc8e8477ee946965d9b8f2b940148d378cac40891bf1c21572dcdd780d25b3e11f SHA512 61682db11933dd1a8409c5894f89613e3958a283da5d0c157f133182fc52d0784c0bba340c2599af1a36d2f33cb7154cde20666c84abfa69de5085287b7d5de3
 MISC metadata.xml 419 BLAKE2B 6bf5394549a11a1113867c019e509098de6b532bf028e22241ca20159219380a3fe34f34ffed0e54cd25d1348d8c9ccec163c5dbc2dee581f59b7a64e93dd995 SHA512 352c5c0c3bde9e8a2bf2db9e3c94baec858d7216087020dd9e4dd69bc61257876ae586e364a9ff01714b2b84008b2b413b5238c1b7c5b78be4eeb10c5bdf596e
diff --git a/dev-ml/cinaps/cinaps-0.14.0.ebuild b/dev-ml/cinaps/cinaps-0.14.0.ebuild
index 300f13b069f1..891d83ba04c5 100644
--- a/dev-ml/cinaps/cinaps-0.14.0.ebuild
+++ b/dev-ml/cinaps/cinaps-0.14.0.ebuild
@@ -15,14 +15,12 @@ KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
-DEPEND="
+RDEPEND="
 	dev-ml/findlib:=
 	dev-ml/re:=
 "
-RDEPEND="${DEPEND}"
-BDEPEND=""
-DEPEND="${DEPEND}
+DEPEND="${RDEPEND}
 	test? (
 		dev-ml/ppx_jane
-		)
+	)
 "
diff --git a/dev-ml/cinaps/cinaps-0.15.1.ebuild b/dev-ml/cinaps/cinaps-0.15.1.ebuild
index beef48458589..52c200249b97 100644
--- a/dev-ml/cinaps/cinaps-0.15.1.ebuild
+++ b/dev-ml/cinaps/cinaps-0.15.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ocaml-ppx/cinaps/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ml/csexp/Manifest b/dev-ml/csexp/Manifest
index 217f9c16e56b..6529a74c792d 100644
--- a/dev-ml/csexp/Manifest
+++ b/dev-ml/csexp/Manifest
@@ -1,5 +1,5 @@
 DIST csexp-1.3.2.tbz 9775 BLAKE2B b1afea15558a5520abab214874653e9768ebbb22e064b51dab2f5bd5543460e357f9e1cba964341bcb24c5d53d8477de5458186e4d83db21d99a8ca45009d818 SHA512 ff1bd6a7c6bb3a73ca9ab0506c9ec1f357657deaa9ecc7eb32955817d9b0f266d976af3e2b8fc34c621cb0caf1fde55f9a609dd184e2054f500bf09afeb83026
 DIST csexp-1.5.1.tbz 10082 BLAKE2B 71d6844d5ae37d64c4b29ed8e2479869bda23bc8b352acc17a83a061acb6bb2dc223e3e9aba444c87949137123a716450a0c665c2c109bd98dcd702931e4a2be SHA512 d785bbabaff9f6bf601399149ef0a42e5e99647b54e27f97ef1625907793dda22a45bf83e0e8a1eba2c63634c5484b54739ff0904ef556f5fc592efa38af7505
-EBUILD csexp-1.3.2-r1.ebuild 569 BLAKE2B 6c394f1fd9093fc1f1f2603a84d6fe804a829fc2a48d65a8eb11b33b179906baf6fa8624737aaf42eb6bcf87be3589df9fd5fe190ed2da9d1d2288104873caf4 SHA512 5d33595266645f3dec19e40a18aba9c68f6148ec06dfcc575475d934e423e1a342de2f549035013cb189c843c49b617e661ec53aa2f1347e1da4d2e78f65a1a9
-EBUILD csexp-1.5.1.ebuild 575 BLAKE2B 091ea82ee13267bbacc63ef8469dc1817c02eb1864e37c93b75813981eae93c855b4b81c3bfa27d3ca04ac7e7f4f4f49f93f57555ec83407a186796324259e98 SHA512 ebc738b190fac8cdf34b9603d6b17feb5a54853bcd3d45dc6da28a29fe3bb06e01381ebbf2cdc353511cf3e4060361aa2e186fe3787ccd832418ba9aae8fa548
+EBUILD csexp-1.3.2-r1.ebuild 536 BLAKE2B ea864346923d2cc20dc26914b34f2ff8c09ed70b8f02b687ad3cfad79e526dc2b8d0a921c201d590aca08d5f90bff4eb048e0de0d27b1ac647c25bee9764d92f SHA512 297ea3a572d7afa052bb43a29ecb19e43f0d2321b92a7742dadcc7cb5492531322f0b133c4c431c26faac40cdcbc6fcdbcb4a01a51e15c70a3bb009737b63170
+EBUILD csexp-1.5.1.ebuild 536 BLAKE2B ea864346923d2cc20dc26914b34f2ff8c09ed70b8f02b687ad3cfad79e526dc2b8d0a921c201d590aca08d5f90bff4eb048e0de0d27b1ac647c25bee9764d92f SHA512 297ea3a572d7afa052bb43a29ecb19e43f0d2321b92a7742dadcc7cb5492531322f0b133c4c431c26faac40cdcbc6fcdbcb4a01a51e15c70a3bb009737b63170
 MISC metadata.xml 419 BLAKE2B 393ddafadd2d367c70b559c8da57b48db180b80c2a27d8d2ee9e311684034596edd12bf48b061cddae4b6718f1f4f536e8aec8d5698db58f6f9a933cfa0c0f8b SHA512 4a4cf3230718991dd88e5e1ecc6fe99bc4b5c3983f27bd61d804b57090673f27da642530845266c275bd658be1e2c18b3cdcfeb7bb43860eecc05129f5383214
diff --git a/dev-ml/csexp/csexp-1.3.2-r1.ebuild b/dev-ml/csexp/csexp-1.3.2-r1.ebuild
index 3299c8a7c789..824799a6c309 100644
--- a/dev-ml/csexp/csexp-1.3.2-r1.ebuild
+++ b/dev-ml/csexp/csexp-1.3.2-r1.ebuild
@@ -15,11 +15,6 @@ KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
-DEPEND="
-	>=dev-ml/result-1.5:=[ocamlopt=]
-"
-RDEPEND="${DEPEND}"
-BDEPEND=""
-DEPEND="${DEPEND}
-	test? ( dev-ml/ppx_expect )
-"
+RDEPEND=">=dev-ml/result-1.5:=[ocamlopt=]"
+DEPEND="${RDEPEND}
+	test? ( dev-ml/ppx_expect )"
diff --git a/dev-ml/csexp/csexp-1.5.1.ebuild b/dev-ml/csexp/csexp-1.5.1.ebuild
index 471655dd5cf4..824799a6c309 100644
--- a/dev-ml/csexp/csexp-1.5.1.ebuild
+++ b/dev-ml/csexp/csexp-1.5.1.ebuild
@@ -11,15 +11,10 @@ SRC_URI="https://github.com/ocaml-dune/csexp/releases/download/${PV}/${P}.tbz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
-DEPEND="
-	>=dev-ml/result-1.5:=[ocamlopt=]
-"
-RDEPEND="${DEPEND}"
-BDEPEND=""
-DEPEND="${DEPEND}
-	test? ( dev-ml/ppx_expect )
-"
+RDEPEND=">=dev-ml/result-1.5:=[ocamlopt=]"
+DEPEND="${RDEPEND}
+	test? ( dev-ml/ppx_expect )"
diff --git a/dev-ml/cudf/Manifest b/dev-ml/cudf/Manifest
index b86a564fd21b..1c45e12666e7 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-r1.ebuild 1721 BLAKE2B b332911014c9d395ecbbf61cd411ebad8f23e3bf422640039105f8fd01ad5a44d17ce8ca4dc33adf338d7f2111dbe687e388e18246cd544a309e9c53aabd4eb0 SHA512 086107cc8479ddee9b596e987fe525ff17a6176a187c0f6614078da7c3b232f35630fcfe2e8fd479f4352a4348bab1edaa14fe684e0bd92d8c35eca7aa0dc1a5
+EBUILD cudf-0.9-r2.ebuild 1802 BLAKE2B 7f83d5026dd7dc06c1bdde67fb2065e204f3a135339f8938675e6673c0ac42f9edbf9c367a199da933a3de0bbbd519ca95e7dbd832ac832983544e08177ab184 SHA512 6f601e703129bed82fa8f698a8b03eeb8f92a7f4fb31516f4ee8771a149ff28e5d0b1d7532d7f4e5fce17935863d34b5845e3e3dc1956b70634ec099bd21120b
 MISC metadata.xml 338 BLAKE2B f947fa0825c1a3fd959515164da36ffc9694c570ed6eb6eef8686fc24b4582ee88ecb7304507c79cf2733fb77ae3570468ec8da886367d79721c81f148931833 SHA512 9d052ada92f441fa4908f4ec9a2561f7276872281ffa65f0ad92c8d0f7c15aeea11d6c887d4af7535d7d72bce3dec8f12622aee5eb9a79e510e8baaa208a54cd
diff --git a/dev-ml/cudf/cudf-0.9-r1.ebuild b/dev-ml/cudf/cudf-0.9-r2.ebuild
index 769436a427c4..dcde53347192 100644
--- a/dev-ml/cudf/cudf-0.9-r1.ebuild
+++ b/dev-ml/cudf/cudf-0.9-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://gforge.inria.fr/frs/download.php/file/36602/${P}.tar.gz"
 LICENSE="LGPL-3"
 SLOT="0/${PV}"
 KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
-IUSE="+ocamlopt test"
+IUSE="+ocamlopt llvm-libunwind test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -20,7 +20,8 @@ RDEPEND="
 	dev-ml/extlib:=
 	dev-ml/findlib:=
 	dev-libs/glib:2
-	sys-libs/libunwind:=
+	llvm-libunwind? ( sys-libs/llvm-libunwind:= )
+	!llvm-libunwind? ( sys-libs/libunwind:= )
 	sys-libs/ncurses:=
 "
 DEPEND="${RDEPEND}
@@ -41,10 +42,10 @@ src_prepare() {
 		-e 's|make|$(MAKE)|g' \
 		Makefile || die
 	sed -i \
-		-e 's|-lncurses|$(shell ${PKG_CONFIG} --libs ncurses glib-2.0 libunwind)|g' \
+		-e 's|-lncurses|$(shell ${PKG_CONFIG} --libs ncurses glib-2.0) -lunwind|g' \
 		c-lib/Makefile || die
 	sed -i \
-		-e 's|-lcurses|$(shell ${PKG_CONFIG} --libs ncurses glib-2.0 libunwind)|g' \
+		-e 's|-lcurses|$(shell ${PKG_CONFIG} --libs ncurses glib-2.0) -lunwind|g' \
 		c-lib/Makefile.variants || die
 
 	tc-export CC PKG_CONFIG
diff --git a/dev-ml/dose3/Manifest b/dev-ml/dose3/Manifest
index 51880c7e0ae7..b55d0ad088a3 100644
--- a/dev-ml/dose3/Manifest
+++ b/dev-ml/dose3/Manifest
@@ -3,7 +3,7 @@ DIST dose3_5.0.1-16.debian.tar.xz 39448 BLAKE2B a5ae8c74ee1a5a89bf3594cbaf0b3770
 DIST dose3_5.0.1.orig.tar.gz 297433 BLAKE2B 74ae954604f26398f091b4f14d2a633132ae62102f52af13284af27e41cd7c47afb1b533b0821a8921ba33fa6658e94b3bb6bf5f104f48881a50e14517cd65e2 SHA512 e66526319446054041f138ee2633043d0832089f6a554cf566a28de899d10383acfb1aa6bf1a368811602939676510933a7d2404fd34dbeba15045b458f5af84
 DIST dose3_6.0.1-2.debian.tar.xz 23320 BLAKE2B 0351a715756b76c1f81fdf5599d10373ce85554f1d63b4dcbaa647dcf81b099e59c68f93413ca391bdf17b52831b085a7d2b86bc64d86676763bbabd7804a6a4 SHA512 219bb7614d1200adb5d22032cb3d7442c16cdce785088f58b3fcc188856b93817f0157ea6ed1bd72e1f565b9a98df145c188e0fa5d7f538d616b7eccc20ab706
 DIST dose3_6.0.1.orig.tar.gz 1417354 BLAKE2B c5fb08c853d2d3589416237addf767912fffab5ef74b7f3332799ae350a371307bd06a24abe6565d2d00aedc01f58d0a2583db6d2d76fc2ebee634b05405ab86 SHA512 cb9dad4ae296b85317f60133bb9dcc63dad8560486e2bd83139205810643e701de5e9834d8d2de34d8237d0abfd394970088c73eeab08956fc9c4178411303ea
-EBUILD dose3-5.0.1_p16-r3.ebuild 2256 BLAKE2B 04d27714676035014da0ff4dc1b062f4d790629f6aa2487f6afa05e4d95088148a1d7822910833c906b7bf0d9f88003e487582ce46802400291164a7c3bb1716 SHA512 c453ec3a3a63f761e58d0d0d48ab83570eaf9530a17855806e27240b87f1379aead72f528ab907bb33e4c8eae9bdd8b94d53b1b52eda1926b0ab5c07116b3fd7
-EBUILD dose3-6.0.1_p2.ebuild 1290 BLAKE2B df43efc990783797735461cf0f17430a6565508b8b03dc9f90531963021626b15eddaad531a9c549993abbab17d58d0b09160b25a4b0b596e2b09fdb16c752a9 SHA512 71195ada929102fb6230e8f3ad8e12fe78a789c383b303513066befbf69855cb4b236e1911b26e6d1e522f38eb951dc23d6563cf543f6f3c77718828b8e5c92e
-EBUILD dose3-6.1.ebuild 1040 BLAKE2B e0225b471809cf25b3b11079ba1755c3f894a83ce536d38d6dba27dea8172b98ec2489cbe56a991a3ce6f5efd7dd1b3c57d3cb0c06f009001489bb65bacc0a47 SHA512 30d2a470ce0f164a8f661e2cdd2ef8ac88e9ee41399d89a24e3ca56053c19c4e1312f9953dd2074e0eee2806bc23be0b46a122c5fda0939846a82a55c98fe81d
+EBUILD dose3-5.0.1_p16-r4.ebuild 2259 BLAKE2B b016b7b7c8bf9cbe9d1e7e6f0a93d5eb732eb990cce85843d31b9c647858a47b6b5cd051335dbd5308e771cd8551b48f95378d23f877aceacb7d992aba775039 SHA512 8240f18ae018888fba3227d8f40b2c5cb778f2d429fa56c8fde276a52b751277d0d44d23424045d73ee7b229e3a58a34a07c3206c8c3aeb715212b70c2716723
+EBUILD dose3-6.0.1_p2-r1.ebuild 1292 BLAKE2B 00fa53f6f9f3b2d87469231a275ded2eb16a40a01fad6662074397d60ff30a3bb3002ebc868b088b160dc3c2cbb648ad2b52f61dda7e0504c8760a363a6ced6e SHA512 fdc2ec0def4a90a22d581700e88192751448aa90239dbc835cd3769cf332d83f9e75d514a4797f1e24bab9ac52cac9dbd7e2e428d149f6888e0f384fad0fad08
+EBUILD dose3-6.1-r1.ebuild 1038 BLAKE2B d5db83477cab9226d44a8b41424d36690f5d97417be179b9f826c750dea653d0c8ddd614c7d8b234b820088547c3a91fde527071f93fead3d546a99f4cfb317b SHA512 cad5d9167d5a2bcc4a05aa061ea38a1386932d7d31759dda6c95df2d43f0a205feade88a7baae5cabab6c717f705d1d007cb7ed3fcc8fc558c8439249b39afc1
 MISC metadata.xml 568 BLAKE2B 3ded228894bc51a457d66de967eb5b1a47fd4a1239709f4573e7746198eccbea27db34cb6dface497e38f14b0c3e9405d85241d7757984961c2169f1699cc3b0 SHA512 8fdbf1f9e6fd6719ff88deb8ea5c705be2d35831713c2fbc4d55d9cc6277d1822ede3af006b1e818ed0bca18e84e8b2a1f10b26593a525132a4d40a8e5844e05
diff --git a/dev-ml/dose3/dose3-5.0.1_p16-r3.ebuild b/dev-ml/dose3/dose3-5.0.1_p16-r4.ebuild
index 8a2d9bb0eca3..fd0e74c8c652 100644
--- a/dev-ml/dose3/dose3-5.0.1_p16-r3.ebuild
+++ b/dev-ml/dose3/dose3-5.0.1_p16-r4.ebuild
@@ -39,7 +39,7 @@ RDEPEND="
 	rpm4? ( app-arch/rpm )
 "
 DEPEND="${RDEPEND}
-	test? ( dev-python/pyyaml[libyaml] )
+	test? ( dev-python/pyyaml[libyaml(+)] )
 "
 
 # missing test data
diff --git a/dev-ml/dose3/dose3-6.0.1_p2.ebuild b/dev-ml/dose3/dose3-6.0.1_p2-r1.ebuild
index c2656b5b378b..481f80ee4a29 100644
--- a/dev-ml/dose3/dose3-6.0.1_p2.ebuild
+++ b/dev-ml/dose3/dose3-6.0.1_p2-r1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}-$(ver_cut 1-3)"
 
 LICENSE="LGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt test"
 
 BDEPEND="
@@ -35,7 +35,7 @@ RDEPEND="
 	app-arch/rpm
 "
 DEPEND="${RDEPEND}
-	test? ( dev-python/pyyaml[libyaml] )
+	test? ( dev-python/pyyaml[libyaml(+)] )
 "
 
 # missing test data
diff --git a/dev-ml/dose3/dose3-6.1.ebuild b/dev-ml/dose3/dose3-6.1-r1.ebuild
index 4cb33909265c..bbef234541cc 100644
--- a/dev-ml/dose3/dose3-6.1.ebuild
+++ b/dev-ml/dose3/dose3-6.1-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}-$(ver_cut 1-3)"
 
 LICENSE="LGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ~ppc64 x86"
 IUSE="+ocamlopt test"
 
 BDEPEND="
@@ -34,7 +34,7 @@ RDEPEND="
 	app-arch/rpm
 "
 DEPEND="${RDEPEND}
-	test? ( dev-python/pyyaml[libyaml] )
+	test? ( dev-python/pyyaml[libyaml(+)] )
 "
 
 # missing test data
diff --git a/dev-ml/dune-configurator/Manifest b/dev-ml/dune-configurator/Manifest
index 4da3fc8ac227..b63ed9665dba 100644
--- a/dev-ml/dune-configurator/Manifest
+++ b/dev-ml/dune-configurator/Manifest
@@ -2,8 +2,8 @@ DIST dune-2.8.2.tar.gz 1369417 BLAKE2B d846d35675a18abc3ccc57a52574d81a8fb4f082d
 DIST dune-2.8.4.tar.gz 1372925 BLAKE2B 5b6d6738a0dc701d852e6cc59a1998f64c006d233f43a804b0b9b677a6eadda25aa20f52799c90910d361e4bc565636a50d218ad5d0a9927239adc5be36b3889 SHA512 13b36eb6a943f9513987a23dab467b2e449cc3a4de35227f8323c3c724b27f19daac500602141ab22a04579243333c8484ce27a7f73e46a72e796d30fb1c3253
 DIST dune-2.9.0.tar.gz 1385143 BLAKE2B c973e4b2c5780a3e4902c31c030b2560fe5be313338a5188edc9b7ff97b63968baba267966d095076bed4f1527a8b8b5a0f980e74f53476d70ec53f20dc661a6 SHA512 1c3b64746b00215cd97b36c0f1c6e2416c9d15c795265634240e9da37e2c2fce02ab3c309a0cb967f9f20a5c6df14e943c3c2942c1a8f4743c3a19c699f4eb24
 DIST dune-2.9.1.tar.gz 1385381 BLAKE2B 27224f803547d02f7110dcfc486ef41f9a4586f6f862ef7f8bbf05cc1f3f6dc8ea03fca99c01842f4226ea3d08f4127daa0e5811dd46cc00f1b96ad7eaafe43d SHA512 4fcff34de4acc4429dd73864ca90e695d8ba436839fd679608f7db292e44be70c3db455a58f59477f2055f84ce497bfa8e90e485ed9536acad3c1b3be3d4be77
-EBUILD dune-configurator-2.8.2-r1.ebuild 3691 BLAKE2B 6cceed0e264b8c1a8a6bc19b4fd790426f68556bf17b0fa80d8e3ec4f129aac627301f4dc61005e9bda9706f5d60425d1576044ef4a6c14e20e1a16c4e1790e4 SHA512 2d7b330a4fa3fb4ad8ddef912aa05f2b2d83123d434189a48b1a6f5b058ac3d80541e51d7ea53d5b85316c61914d1dfe7b814f773621522f52e23481bd7d3bc2
-EBUILD dune-configurator-2.8.4.ebuild 4113 BLAKE2B a7b7a6dd0339659e6a1f7a2a1e3ca9a086d849860164c1fda0f3f605208ba2fc71226688f87ffc29a8aef0db03713b2ce135ff8ba80b1e6b555d04c7b630460b SHA512 248672c231a7c1971ee4fb15ec5bc9c73b90a470dd2c41f6e69c1e8a1aa79cf1d77a4a7fde288a6ecfa3d798ca8ea70957a8925652b527920d3f7546e1edd53d
-EBUILD dune-configurator-2.9.0.ebuild 4119 BLAKE2B 41ee9db5c9e79840dae7e1cf2489f83f154ba64a90e32260fdb0af5b738e046a0d4d9912c59301fbf9567f3beb502e0164a7a9a7abaf3a4d0fc4f87949663b2f SHA512 17f1777fbacebca4abbf2636a6b6ff46a5b58fa32d28fee2cd6b9e9168f2200ba31f1b998ff3f4fd9b59a6b1df7afb4320f82ae5197a32c5a3d15a3aaf9cdacd
-EBUILD dune-configurator-2.9.1.ebuild 4119 BLAKE2B 41ee9db5c9e79840dae7e1cf2489f83f154ba64a90e32260fdb0af5b738e046a0d4d9912c59301fbf9567f3beb502e0164a7a9a7abaf3a4d0fc4f87949663b2f SHA512 17f1777fbacebca4abbf2636a6b6ff46a5b58fa32d28fee2cd6b9e9168f2200ba31f1b998ff3f4fd9b59a6b1df7afb4320f82ae5197a32c5a3d15a3aaf9cdacd
+EBUILD dune-configurator-2.8.2-r1.ebuild 3673 BLAKE2B d31ebf45cc51b44d9adaf9492aa713f1a42c85921dfae894e8c59604126e046615236eb28b77da0da683e8cb0e758b83f4c85e16b905b56b2ed0718fc4393338 SHA512 a3bd94c56071878c025d5f384419636b1a6cdd9cf4f972ea4ea92667b8b0e47d32199a44c79206d1e9a76f96fbc8aae4b86f10792c989934ef7e66ae551265d3
+EBUILD dune-configurator-2.8.4.ebuild 4095 BLAKE2B 440ac69c0b4571560d90c39ee5f2ed6860bb1b592c7e2b3fae4c2d02bd1e953be24af97f436566d618b6ff5d0523ae25516d3f7d15b2960daa4f92eb3bae4170 SHA512 d03fcad1bd2d4679881607f5af4b7995b41492336331201fb5457e410014d0eb1c652e747b78e78385c03520748a5ca7cabd8debb4a52548ddc9cce06aea9917
+EBUILD dune-configurator-2.9.0.ebuild 4101 BLAKE2B fa84f951fac3a9e4882c3542cdbcbe0b8e0ef5ce6bc8835481a33e95dc216b29b662b4c4d995f7ad17b10a68ed53f422973c82d355a41f12c9ad00758bb5cc17 SHA512 d98dd50f8d1a1624aaf7b76d1a3827560324f0eff3e5040643794ed0f6385c8ddaefbed05f471b7119fb757b15673a6907f622891ef11ae8c71e233c45a82f6c
+EBUILD dune-configurator-2.9.1.ebuild 4101 BLAKE2B fa84f951fac3a9e4882c3542cdbcbe0b8e0ef5ce6bc8835481a33e95dc216b29b662b4c4d995f7ad17b10a68ed53f422973c82d355a41f12c9ad00758bb5cc17 SHA512 d98dd50f8d1a1624aaf7b76d1a3827560324f0eff3e5040643794ed0f6385c8ddaefbed05f471b7119fb757b15673a6907f622891ef11ae8c71e233c45a82f6c
 MISC metadata.xml 413 BLAKE2B 68bcbe6d091780d3ea48707a42b402cfcc075b1ca0c58a8e145bc8ae6e89806361325f772e9e8b05484fc258f09e33c18fa329a494881e3275f534c65b283c15 SHA512 6520ccff6f2071125a07d0e6bc365c8a919ff32791af97fc633ef68b351de8295454884126334e182da7233744d489acfeb2519c3935990ad21eb20da3f5a1f9
diff --git a/dev-ml/dune-configurator/dune-configurator-2.8.2-r1.ebuild b/dev-ml/dune-configurator/dune-configurator-2.8.2-r1.ebuild
index a4ac4db266dd..28997fac63b7 100644
--- a/dev-ml/dune-configurator/dune-configurator-2.8.2-r1.ebuild
+++ b/dev-ml/dune-configurator/dune-configurator-2.8.2-r1.ebuild
@@ -16,13 +16,12 @@ KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
-DEPEND="
+RDEPEND="
 	~dev-ml/dune-private-libs-${PV}:=[ocamlopt=]
 	dev-ml/csexp:=[ocamlopt=]
 	dev-ml/result:=[ocamlopt=]
 "
-RDEPEND="${DEPEND}"
-DEPEND="${DEPEND}
+DEPEND="${RDEPEND}
 	test? (
 		dev-ml/core_bench
 		dev-ml/menhir
diff --git a/dev-ml/dune-configurator/dune-configurator-2.8.4.ebuild b/dev-ml/dune-configurator/dune-configurator-2.8.4.ebuild
index 61ca3646a68e..d47c38cb2a82 100644
--- a/dev-ml/dune-configurator/dune-configurator-2.8.4.ebuild
+++ b/dev-ml/dune-configurator/dune-configurator-2.8.4.ebuild
@@ -16,13 +16,12 @@ KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
-DEPEND="
+RDEPEND="
 	~dev-ml/dune-private-libs-${PV}:=[ocamlopt=]
 	dev-ml/csexp:=[ocamlopt=]
 	dev-ml/result:=[ocamlopt=]
 "
-RDEPEND="${DEPEND}"
-DEPEND="${DEPEND}
+DEPEND="${RDEPEND}
 	test? (
 		dev-ml/core_bench
 		dev-ml/menhir
diff --git a/dev-ml/dune-configurator/dune-configurator-2.9.0.ebuild b/dev-ml/dune-configurator/dune-configurator-2.9.0.ebuild
index 87edcf4c3a33..a8a42765fa98 100644
--- a/dev-ml/dune-configurator/dune-configurator-2.9.0.ebuild
+++ b/dev-ml/dune-configurator/dune-configurator-2.9.0.ebuild
@@ -16,13 +16,12 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
-DEPEND="
+RDEPEND="
 	~dev-ml/dune-private-libs-${PV}:=[ocamlopt=]
 	dev-ml/csexp:=[ocamlopt=]
 	dev-ml/result:=[ocamlopt=]
 "
-RDEPEND="${DEPEND}"
-DEPEND="${DEPEND}
+DEPEND="${RDEPEND}
 	test? (
 		dev-ml/core_bench
 		dev-ml/menhir
diff --git a/dev-ml/dune-configurator/dune-configurator-2.9.1.ebuild b/dev-ml/dune-configurator/dune-configurator-2.9.1.ebuild
index 87edcf4c3a33..a8a42765fa98 100644
--- a/dev-ml/dune-configurator/dune-configurator-2.9.1.ebuild
+++ b/dev-ml/dune-configurator/dune-configurator-2.9.1.ebuild
@@ -16,13 +16,12 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
-DEPEND="
+RDEPEND="
 	~dev-ml/dune-private-libs-${PV}:=[ocamlopt=]
 	dev-ml/csexp:=[ocamlopt=]
 	dev-ml/result:=[ocamlopt=]
 "
-RDEPEND="${DEPEND}"
-DEPEND="${DEPEND}
+DEPEND="${RDEPEND}
 	test? (
 		dev-ml/core_bench
 		dev-ml/menhir
diff --git a/dev-ml/extlib/Manifest b/dev-ml/extlib/Manifest
index 0fb39be4eca4..eadd8623c7e1 100644
--- a/dev-ml/extlib/Manifest
+++ b/dev-ml/extlib/Manifest
@@ -2,5 +2,5 @@ AUX extlib-1.7.7-no-git.patch 283 BLAKE2B 2cfc23016472905c9dfb28615bce04d607a70b
 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 971 BLAKE2B e6197bf35b329a9a78def6c235793a8266e4379ece7b4c58d47259d7adb96fa758ca8639eddcbbc38f8df377682f6d9d655e8929160857147040a77d82340a71 SHA512 6b5bea15b76345fe16a7015147164b291e975ccbe64d41a4ed8e23dcb21724d0dd0b0622400858f0738ddfeacfd999d1b55e060358715bb996699c7f2a780a36
-EBUILD extlib-1.7.8.ebuild 918 BLAKE2B dc4e4df094178eeb1db700c472efbe29f7f9082073a888b11b3aca67dde55ca1f5e40dead97af6e9dd3682977351c8c877fc0b59f1b72b5fcdeca9562aeb2888 SHA512 ff10d53b326235ad9c6827e6cc6fbd6c7aa53fd3aac5c2975eed6cb1bd81c13a2774d188ab21714d17ed301707b37bb5ac3d50f5ec0665eb5635da60a95bb909
+EBUILD extlib-1.7.8.ebuild 917 BLAKE2B 429e797cea05c1a14f3e23b6baaff43cb5f4d7e24819d353a8779b0299492b68977ce08a9bd3462e15d89c7c400fa479227dbda59ac361a005b0ba03c438b4d9 SHA512 b1d430a77673e4d4a853402c0ddc9f018e47f03b5c8715f9b2ade2e74c61be2fe9976a01a9522af07807c7e3920f16dbea213693769a8567e6d83bc7dca9ade5
 MISC metadata.xml 385 BLAKE2B 69ceb184f4b3add8c192dc74c7a8c588f885a125f4fdb0d2d83a1760241ea35fb6365604268ce66c9759a52c742abbcf02a6cc9738eecad5a6cdc0bc247001e5 SHA512 8157c72cfce80eb5981add6285952d2befee14a0dedf3276985d2c9f812b588d6d022178cbebf5b7bf5950ca6744bd5c8daa4a76a5863299eebdd4f90e9d4a67
diff --git a/dev-ml/extlib/extlib-1.7.8.ebuild b/dev-ml/extlib/extlib-1.7.8.ebuild
index 86f42e414812..78f973f346e5 100644
--- a/dev-ml/extlib/extlib-1.7.8.ebuild
+++ b/dev-ml/extlib/extlib-1.7.8.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/ocaml-${P}"
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc +ocamlopt"
 
 # See bug #704146
diff --git a/dev-ml/fpath/Manifest b/dev-ml/fpath/Manifest
index de062d7548e8..76b61b67a3c9 100644
--- a/dev-ml/fpath/Manifest
+++ b/dev-ml/fpath/Manifest
@@ -1,5 +1,5 @@
 DIST fpath-0.7.2.tbz 24142 BLAKE2B 5aa22a33d0155c2a446c3622d6feef0748be3eaa72f07e7e2770fda1993794864072a5f50a052537b9724e39935064967c87f82d860a2da17fbc86279a1930ab SHA512 d8ab8d6f183a1742d74a3a3220cc1d62e7df38a6f3ca1c04fad18426a0897152255382305ad14d058b5b85ab55a27536c39a62deffac8d46984a730a2a18405d
 DIST fpath-0.7.3.tbz 24345 BLAKE2B 5d4e68acebdafb6378422b31385e78decff2dfce1bedd102c7e6baac519f9843e0828629f4a15e075f506865e1af6f9cc7ece761e74fe6608d3476338cc556cb SHA512 acf4b379aee3c25305ef71d1b97b154faa6de1e8248a8e8d046cf11090a3e94f2dc048b961bb51725ca7384e784455f2893fbd51f26bf80571a9cc7e9475b945
-EBUILD fpath-0.7.2.ebuild 562 BLAKE2B 3f1fd182e9e06b250a70da7dba5912c482be621497f217dcd6faacb4de6e1dcf0e998923cf076f893a1cb201f931b9437c9a580ab307b5160d3914ce0c0389a4 SHA512 7c0087bea3e7daefbfb716fad0007a56ff73f3c81b4269865e64448c1f939c07460297a1d19ce471bd10a6a96794da3c260e7cd298758f20a70e38cba80cae4b
-EBUILD fpath-0.7.3.ebuild 565 BLAKE2B bae6063030f1d9da97f30f1ee8403502760a57f4da88c6d2284a54b887145dc28fcb5f794403090a9ce3a6d0128c5f379f769f1202ef17a78a328fe29c617ffe SHA512 eea81ad44218a70c4157b32390fa01d4ed65c50a1cf36de2dd6bb2dc9f5dcbd809ad28a4a32a7fdded311f08dd9d8e931b435d4cdd3a61b7f6ffb12512592b58
+EBUILD fpath-0.7.2.ebuild 561 BLAKE2B 6ba84c3f260f346ada51bef1e566b841011657eb118af2791beff08b1f9ea95bad8982c8e93083a898b654ae2b70c89baf91958dedbcdf6463a09b6345981bc9 SHA512 a7c7f593b72c109c1f017c432ac52f431b164a25b4f245debb9fea0cb398411c7bc9c29f09d03fed1de019599d78db60b7c3cc1eb015d86dabae0a80326c089a
+EBUILD fpath-0.7.3.ebuild 560 BLAKE2B a1d2e2ea940448bdc9de3b628cc6b9d309c7304b8ef247f8bfee07a700302079aecf8b65a3033c870748b3fcae0c55293956e305bb69f6b36d6364506995c852 SHA512 6ee9235580e857b989dd71cb2ccf716229ba0eb41a4cd5b249885efdbd240e6284a5ce7beb0545a272c4a624c7ae35589da9a010478120dd6b9c9f301f8824d5
 MISC metadata.xml 312 BLAKE2B 25e78fc547cff8e938dcd8eeaac127b31e60a758a183cd4d01258e7efac1b8a820eb241adc66169b15806fc539dbab324b85f9d50cb10f2aba61a8f64d3c7dab SHA512 b835a40c52db072c5f0bbca539437f959be01089e1aa6587cc4f8dc16150ec8be3800c9aeb00143b29c6557eba5bf952718f1cdbb96fe5f30851a165f410131d
diff --git a/dev-ml/fpath/fpath-0.7.2.ebuild b/dev-ml/fpath/fpath-0.7.2.ebuild
index cd686c223196..c2909f3c6d01 100644
--- a/dev-ml/fpath/fpath-0.7.2.ebuild
+++ b/dev-ml/fpath/fpath-0.7.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://erratique.ch/software/fpath/releases/${P}.tbz"
 
 LICENSE="ISC"
 SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-ml/fpath/fpath-0.7.3.ebuild b/dev-ml/fpath/fpath-0.7.3.ebuild
index 13e85c27b103..6882f7558f4c 100644
--- a/dev-ml/fpath/fpath-0.7.3.ebuild
+++ b/dev-ml/fpath/fpath-0.7.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://erratique.ch/software/fpath/releases/${P}.tbz"
 
 LICENSE="ISC"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~x86"
 
 RDEPEND="dev-ml/result:=
 	dev-ml/astring:=
diff --git a/dev-ml/graphics/Manifest b/dev-ml/graphics/Manifest
index 5d5b6eb1dea9..a0e4cf2c8979 100644
--- a/dev-ml/graphics/Manifest
+++ b/dev-ml/graphics/Manifest
@@ -1,5 +1,5 @@
 DIST graphics-5.1.1.tbz 58713 BLAKE2B 75f81b938be8a44f904418851ed747742ad63556ef94c533872f4b04705a0209a06f969add207bf332e1ab3d6a98a819c0ed2b0f50bdf1275f5d57ff6caa2fed SHA512 15adbe03211e7392a2fded2d9fd5e0cc2c532b4a1de3b6c90945e9e99cc4f419583a204f357f8c9fd92d1ffce48e13e1f146da1f009eb4645150b7394f799e0a
 DIST graphics-5.1.2.tbz 58863 BLAKE2B 640a288759f5c233f3ded3c0e974329b0b8a41ab60772d0d41e6f89057432215a35c0f06facc552fcacf2e1fb8d0f5c47bc5d0aad5ca89dcf4ab71732a9b1c9f SHA512 1387c1ecf5dfd62c3927f1f8ce0bcc8b162ef22f15bfd41eba47c955091f7ce5f19395beab550d31cff38d22c4ad097350975381e60936a0004271e96f65b09b
 EBUILD graphics-5.1.1-r1.ebuild 517 BLAKE2B b524e4a516d11651721d075acb1aee40581737b818ddcb98aec15334fafd0215dfb62d21e6275befb196477e4a641999e3fb6dde544f87822f8d5fe319fc7a55 SHA512 ec78284c78bdb135056c98ca415700b5de7e5f8c937c7d53855743d6d210b90e5dbf1db7e7ddb20664062f16c4971d36e0490dcc72b64852ea35f4eb9560fafa
-EBUILD graphics-5.1.2.ebuild 523 BLAKE2B 7bfec9f03f0829ca0d2d2d5e2c38dff5b7e27e05f24b14c749897d2a2ae519bf086206804f5aedc8069b19a36162030b300540e6450d79fb624a12867eaea3d0 SHA512 cb2278d0019721404922c5ebe82b316a6691fda75a6b36ee0e993268a78e317bd1f61b2300bb80284ee3e7150177da3c3e8f1b375f3951cbaa9cdf54d1de743e
+EBUILD graphics-5.1.2.ebuild 517 BLAKE2B b524e4a516d11651721d075acb1aee40581737b818ddcb98aec15334fafd0215dfb62d21e6275befb196477e4a641999e3fb6dde544f87822f8d5fe319fc7a55 SHA512 ec78284c78bdb135056c98ca415700b5de7e5f8c937c7d53855743d6d210b90e5dbf1db7e7ddb20664062f16c4971d36e0490dcc72b64852ea35f4eb9560fafa
 MISC metadata.xml 233 BLAKE2B 4654803edd576a76b70115913e26d306cc35a2356ed110fb6420e2dd48aef88ab71ee4f5b0cba71b4c2a7624ef42707d405700abf41748e532b9fe0f6cb3b778 SHA512 5158dd5a94fb8cc401825355cc3bb6f04768c6df59fc60593d99f530e27dc448223091a8af25d0e2f4ece9b8a7bf01f4f19f91321901c8f82f55cb4a190b7a70
diff --git a/dev-ml/graphics/graphics-5.1.2.ebuild b/dev-ml/graphics/graphics-5.1.2.ebuild
index 68860652dce7..7a3977c3a2ce 100644
--- a/dev-ml/graphics/graphics-5.1.2.ebuild
+++ b/dev-ml/graphics/graphics-5.1.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ocaml/${PN}/releases/download/${PV}/${P}.tbz"
 
 LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 
 RDEPEND="dev-ml/dune-configurator:=[ocamlopt?]
 	>=dev-lang/ocaml-4.09:=
diff --git a/dev-ml/jst-config/Manifest b/dev-ml/jst-config/Manifest
index a40ffa98e9e6..89de07cfb2f4 100644
--- a/dev-ml/jst-config/Manifest
+++ b/dev-ml/jst-config/Manifest
@@ -1,3 +1,5 @@
 DIST jst-config-0.14.0.tar.gz 4916 BLAKE2B e052cf9aad6e7bef737cd39643663b4577cffe9b9a8e116a8f23ce8d92ebb172d8c66eb20976c319593c217d95de253b4b7f86c05616bf665061896989f0908c SHA512 9d76f3394490762aaef36a3fd3ced4769da05e5a62176bb215379f18a29eab5089e65f599a3a3621937a5a79fcbda22cecf189e8e290acffef5b565e1b4d3b58
+DIST jst-config-0.14.1.tar.gz 4931 BLAKE2B b24aefa5f4e0b76c3cfd1ecbb9ae7789891db8ade236f6071b814dc3d4be6d94ad39b2d0808ca81a633f2b7a31db18b530c73a7a0c43c65f4ddc8abe90adddd6 SHA512 0a43ba941c2915afb30b3cdc09c3c83e05d5b1367bf89aaa4b3adb72878c8435e07838bcf345452c25482d7621d2a7277b92328a2a8842ec172d4bf73005d9c2
 EBUILD jst-config-0.14.0.ebuild 529 BLAKE2B f56c9c1f1ad30edcfa66b391be8cb0aba83761149024a84513dc460e2be540321dfee2661fee64d732c6669b9dab0b6e6a76ff024651adf1b3bdb8a334c01796 SHA512 b09832a6d2a2c5eb88fdee7920f1fb602fa4c864acd57b09a0a3b78f0ff4de7a2ded2f4b10f644e8a08c559b3748a4f8987eb417f18a3ae298c5495fc0306073
+EBUILD jst-config-0.14.1.ebuild 535 BLAKE2B ab8249dc0deac947976d356f4d883a56748b591f295f8fe99b0b34bae60dbcb1291ed49ef6255afd1cbfcfacaa242b6687680cd3d99589e008fa330b90a0fa8f SHA512 15c488168e103aff99d8d60fc2a9168d937380d7568a3629f8c7b6fa20438a2424b929aec292e96d425bd218be11a3a1432cfc889aae7239ab41210d7af54257
 MISC metadata.xml 331 BLAKE2B 8c60d8ec76cd4490f44777691314913be8ef21fe7df79c7808c8050d04325cd8209aeb801b4a816770e79f6c01a0e9746e3a70a59d8e17fc9c2095515fdfdfc7 SHA512 edd11273f875929a3c9ae1372a28a8311d7cc22f6aa92175b5964a74fc6217f43a20814c6947d87877d81a728eedfe90b3e5734099469b3de04d7e13ee6b6199
diff --git a/dev-ml/jst-config/jst-config-0.14.1.ebuild b/dev-ml/jst-config/jst-config-0.14.1.ebuild
new file mode 100644
index 000000000000..17ae2234d2b2
--- /dev/null
+++ b/dev-ml/jst-config/jst-config-0.14.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Compile-time configuration for Jane Street libraries"
+HOMEPAGE="https://github.com/janestreet/jst-config"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+DEPEND="
+	dev-ml/base:=
+	dev-ml/ppx_assert:=
+	dev-ml/stdio:=
+	dev-ml/dune-configurator:=
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-ml/labltk/Manifest b/dev-ml/labltk/Manifest
index b4b6a8bdd373..5448ff1c6490 100644
--- a/dev-ml/labltk/Manifest
+++ b/dev-ml/labltk/Manifest
@@ -3,7 +3,7 @@ AUX labltk-8.06.10-this-expression-has-type.patch 644 BLAKE2B 951ccdfa410298bb16
 DIST labltk-8.06.10.tar.gz 371871 BLAKE2B da67b13aa0a0c179c2fcefe6b03f68225b6e886a1233de77b9749be32b8efc845cac60244f9a8494241c8c77c7d6991786280c274becb70f5527ad891c3aac69 SHA512 ef797d21adac48ca5ed35d95ad05fee26f9b6c99b0510909f6087abb9580b8efd219ca65b1efddb170b5409567d83eaaac0473898f5f4db3e15ae4f39df364c8
 DIST labltk-8.06.7.tar.gz 370870 BLAKE2B 2d836c824d9adbd4f03d0e7e81faa51669837eecb4f94f6c89c657966774fe7d6ed928459be3ccca7fd3e7cf67a54ee63f7d2d08dcc8b7e853f5ad64769b33a2 SHA512 3c7352d14bc337adfb1939e72bd2658bb5e60b463f10f3748779084d1b7a6e6225028c775b548e355d69984a8944b91580fa978ff904b20b8b762ba9046f5e7d
 DIST labltk-8.06.9.tar.gz 371504 BLAKE2B 587ff01da120501f85f6d9921e46275858f1e1ce730eef205f9e7d7c64f6d3c0ea701cf832fdb8eb0746e1f0cff1151bccb077641740fb18811473b1553e2940 SHA512 fd6defa302d919f229394c486dcefab110b144534525a87082a27d2cab29c0af4ece3da821098fea25416850ad857f7af979d48790330d62dfb8d8db8f2bf6ca
-EBUILD labltk-8.06.10.ebuild 1109 BLAKE2B 43329dcce76e081ee41e741a2c8bf9e089fe835e292e97fcdd5dea84f677155c7a1f3164cce4008f7cdca39b1250328f5eac1bfc0489f49663efe36296a0f572 SHA512 b51fbe704766d898630afcf12e1cac590a610173c385b23c054a5f42a22b8a7c0236c622d60e998e72045ae3e19469d378b9abe1da9fb6c2577ac170bb4a58cb
+EBUILD labltk-8.06.10.ebuild 1103 BLAKE2B ddc3964a1fb8d9736c8eb70be8e8c9de03c1239c1bc5df3bda1cdaed7f995e3e3634fd79648809e5dc6371c30336db3328b6bb4c213d4f44eb743bd164d7d27a SHA512 dd52812e8a721b7f587492ec898e062e46f056e400904111307abf066f226569da7ad227de58e8a4308001e5c0584806d62aea8567c6cd8d6cecc94fa0d8f113
 EBUILD labltk-8.06.7.ebuild 992 BLAKE2B 67153839b68d13cfdbe8eab47a10c65d03beefbcc08b27edeb9d75c144ef563787978037e6a7a52f6c50707d0ecc52e77c29fe3de509bd19d8c670e4cc82344a SHA512 181baa5df2eada2fb0768691bdf37a2b18e91633e99b529205477310d8eed23a9fd35250aa19ae2e849a09b3ba660483911cc3a3aa60f862f3105ab7e0a1c417
 EBUILD labltk-8.06.9.ebuild 980 BLAKE2B 030b066865f536672e2f097909a622175edb0e0fe622734628cce7cd556ee602041842e99beb79009089e6a59edb450e5542f4ca873ccc732c5bcb10187aab36 SHA512 8c25f38845bc032fba61c9f7694eaf8aa82ca1b80401aad0650fc350dea967dc60bfc53cd625e9de9c6b9f4b551a9c17d1d5adab033b0bd413576e8ece9c6d22
 MISC metadata.xml 233 BLAKE2B 4654803edd576a76b70115913e26d306cc35a2356ed110fb6420e2dd48aef88ab71ee4f5b0cba71b4c2a7624ef42707d405700abf41748e532b9fe0f6cb3b778 SHA512 5158dd5a94fb8cc401825355cc3bb6f04768c6df59fc60593d99f530e27dc448223091a8af25d0e2f4ece9b8a7bf01f4f19f91321901c8f82f55cb4a190b7a70
diff --git a/dev-ml/labltk/labltk-8.06.10.ebuild b/dev-ml/labltk/labltk-8.06.10.ebuild
index 3390c7d7b988..11b2200caa2d 100644
--- a/dev-ml/labltk/labltk-8.06.10.ebuild
+++ b/dev-ml/labltk/labltk-8.06.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/garrigue/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="QPL-1.0 LGPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="+ocamlopt X"
 
 RDEPEND="dev-lang/tk:=
diff --git a/dev-ml/menhir/Manifest b/dev-ml/menhir/Manifest
index fae744a59f97..ea47efedcc06 100644
--- a/dev-ml/menhir/Manifest
+++ b/dev-ml/menhir/Manifest
@@ -1,5 +1,5 @@
 DIST menhir-20190924.tar.gz 2491000 BLAKE2B 463825aa0f3ea41e49d9c130226bc8bbfc2b96650debf8d79422a90b93338ead58e01aa0c34b2161e4383d1c9a8d77ab58bb1da78e3187ed60b02e13f7742844 SHA512 8036eb8a65f123ceadd21739d88dafca54a2338fc168922a1301a9fbe709ac5e8e7214d95d8114f3798c15f458822e64dcedb94f7fff18ab6f9ccfb6de462e46
 DIST menhir-20210419.tar.gz 1136536 BLAKE2B 9d95600221aca25983674fa736c35ac0c5f2809a8aade5f9163a7b8baaacc660c03376b52749ae1d75d0d35ad8f4710d7f43832ef5ee0283fce7f7a41f15c120 SHA512 cca9037586635a6603531629671cc1448d65deb47c66654928d34c9163c4b501901428afc95eb0efdfc7f010d2efa176385420d9296d59b840176e07b8bf0fce
 EBUILD menhir-20190924.ebuild 915 BLAKE2B c33ff204555d700ec02abc8bef23ca5e30767b409f3d226dd5fd380ce75d11fc1bb228d3446c3f7d1822530e6a556225138fa2700ea8ed99c828bdcc0dd983d4 SHA512 0ea611c2f1f32aaeee73ee407a9eae82a24bca518e006eeb66b33ab5f1f0adb3c06ff85fd2c0a99fdd865f8a3245239165617a0c3ccbe815009aa761b8ad7b21
-EBUILD menhir-20210419-r1.ebuild 543 BLAKE2B 12230575ad22528949d5388f1e57f447334f306df992328b2974b017fedc2c2d1be99978bb2c2d3ab5d9ef5097e73596127f0907a0693a3ba792c63306ea3a3c SHA512 f262ea1825b660624d8716b44aed0b6bec99ea5448dcf29e9c960d9c5b45e168fb904c14b6b724505507aa145546de13582ab207508603696c175ed08de155ec
+EBUILD menhir-20210419-r1.ebuild 537 BLAKE2B 4d094a8b25103cb2159a6a2e06ccb6c3841089649307f1aaeb6f882fb575dc7ee69713e44a802fc455c180e5ea6953d6cdf191ac346ba3512fb0cff20de185c5 SHA512 4f3544aedf425767fd627809d3f66f6dfb5123437bf7d5a420d1c77c4a48b7e1e49ab07b43b9a3914b8e152fb96bfbd4b552f61ab616f1ad52f837bc5ff1da49
 MISC metadata.xml 233 BLAKE2B 4654803edd576a76b70115913e26d306cc35a2356ed110fb6420e2dd48aef88ab71ee4f5b0cba71b4c2a7624ef42707d405700abf41748e532b9fe0f6cb3b778 SHA512 5158dd5a94fb8cc401825355cc3bb6f04768c6df59fc60593d99f530e27dc448223091a8af25d0e2f4ece9b8a7bf01f4f19f91321901c8f82f55cb4a190b7a70
diff --git a/dev-ml/menhir/menhir-20210419-r1.ebuild b/dev-ml/menhir/menhir-20210419-r1.ebuild
index eee8ab93b315..4c393d9c4ec6 100644
--- a/dev-ml/menhir/menhir-20210419-r1.ebuild
+++ b/dev-ml/menhir/menhir-20210419-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitlab.inria.fr/fpottier/${PN}/-/archive/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2-with-linking-exception"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt"
 
 src_install() {
diff --git a/dev-ml/merlin-extend/Manifest b/dev-ml/merlin-extend/Manifest
index bb582b6f062f..5dd4ecfbe226 100644
--- a/dev-ml/merlin-extend/Manifest
+++ b/dev-ml/merlin-extend/Manifest
@@ -1,5 +1,5 @@
 DIST merlin-extend-0.3.tar.gz 15422 BLAKE2B cfd658c9afa6f4500899c342c86c75399cbbef89fe5817c2a957ec93ba02c360fff66e01b81890d19c87a89380ba1cd352a2ffdc10a2dc53c7d535e8af5f720a SHA512 1e6436299b38c7fa57ae5b681a1409795545bc6f5956d6b1c37cbfdbdabfd90da476c030067fe2e016c823d60d1e5498c4536c869bf58425e1a6ff78295efba4
 DIST merlin-extend-0.6.tar.gz 8098 BLAKE2B c8adb32c03a3fe423aa1bb9e10ed9d5041cfbbdc991ae656180debbcad6ee72404bdd7c03d8ee609b809aa27e8013f14785204c759221e33405182ef6c9d1616 SHA512 5cfe4bb1fe8804dcb52eb4cebea6176b5d50fdafbdcd4f5854726c74f196ad06fe3b1b46dde7622f2e5c99ce6bfea9efd070fb81e5fd5e2b5197f40cee109ea7
-EBUILD merlin-extend-0.3-r1.ebuild 486 BLAKE2B f227cdf4269f27a1b06b23535039c85b4bbc8482e2ae752a4dc45c2abf643fa5d025d4d852c13ac3ea0b264494047fbe86411b770659f3f2e258d8ba149e01d5 SHA512 ed84872092614bb99c9a623d098d40cdbfd51d69e7ae1432d20f6b8efd81bec7cdc9b860fb274840fa73029b87ac381d0ea0fab73da863757094b32c41647024
-EBUILD merlin-extend-0.6.ebuild 481 BLAKE2B c8323e66fd99225ee36771290b137526def8d831098e944fb7e708bd8c7c22de7f50aff8c3b3097443149cc55d59acd5c40c91507354ee093c11e176e751ee7f SHA512 dabec95c8a521ff3a0a2ce2c5924d50d48baf38c94a791bd37ec85db704f2707f4c3217c0dd0d9af022d596e15055eab941e06f49d25f2b0fbbb92c2677ee127
+EBUILD merlin-extend-0.3-r1.ebuild 468 BLAKE2B 4c2a223fab1b140888113d1a8bfcf08993f8d2d83706fd9ad6dfba63371d7e5783f983f5698b2a08324a5bc5f2ec602338ae8489066c74bd9dacb17f6e3e8b87 SHA512 3abe591dfb6460a42815ba8a04a44ff8078515efb36518d7067ea644aca99457953aa896e1b748f364a78056b157b773e56c513dafc11f7ccc7c586e29f090b9
+EBUILD merlin-extend-0.6.ebuild 463 BLAKE2B 5eea33928354fca00a371511af2d0316a176b78944cb476e833c41281d4ca83036e28720b50b97ee98dd03aeb758854c347ed6ec5314b4ff3326d249bb6f3574 SHA512 8f59bf539f5d1dab272bdf40013dad07fd521409f5f4d44ace2407ae5de1f662980315e26480bf276681b900c2eda6a5c96d76c8de092f63faf7037ec111fe42
 MISC metadata.xml 319 BLAKE2B 1a5504443802ca145e62b7a0a93d0db800a0723d8ccb18945d407d43f45b1631b9887d83a66062fba544fe3822b6193c0709615380baff74d2be0d60e764409d SHA512 cd5db8c1f6db80a9179cfb785c9405825285846a1bf307dea9a8bc4b1a3e21d7008ad7be8acf827abf7458690b20a41731fb3ec0a10a31350dbdb8dbd3427118
diff --git a/dev-ml/merlin-extend/merlin-extend-0.3-r1.ebuild b/dev-ml/merlin-extend/merlin-extend-0.3-r1.ebuild
index 049701ee3106..e4f2fb196f08 100644
--- a/dev-ml/merlin-extend/merlin-extend-0.3-r1.ebuild
+++ b/dev-ml/merlin-extend/merlin-extend-0.3-r1.ebuild
@@ -13,9 +13,8 @@ LICENSE="MIT"
 SLOT="0/${PV}"
 KEYWORDS="~amd64"
 
-DEPEND="dev-lang/ocaml:0/4.05"
-RDEPEND="${DEPEND}"
-DEPEND="${DEPEND}
+RDEPEND="dev-lang/ocaml:0/4.05"
+DEPEND="${RDEPEND}
 	dev-ml/cppo"
 
 src_install() {
diff --git a/dev-ml/merlin-extend/merlin-extend-0.6.ebuild b/dev-ml/merlin-extend/merlin-extend-0.6.ebuild
index d1ed1442d2d0..8643e7059fd7 100644
--- a/dev-ml/merlin-extend/merlin-extend-0.6.ebuild
+++ b/dev-ml/merlin-extend/merlin-extend-0.6.ebuild
@@ -13,9 +13,8 @@ LICENSE="MIT"
 SLOT="0/${PV}"
 KEYWORDS="~amd64"
 
-DEPEND="dev-lang/ocaml:="
-RDEPEND="${DEPEND}"
-DEPEND="${DEPEND}
+RDEPEND="dev-lang/ocaml:="
+DEPEND="${RDEPEND}
 	dev-ml/cppo"
 
 src_install() {
diff --git a/dev-ml/merlin/Manifest b/dev-ml/merlin/Manifest
index f8016977d04f..13a5c5bd3418 100644
--- a/dev-ml/merlin/Manifest
+++ b/dev-ml/merlin/Manifest
@@ -1,6 +1,12 @@
 AUX 50merlin-gentoo.el 195 BLAKE2B a5bcca9e3af1810b18337680b4878dcfc41296b98a4b949293367935a741b0ab8dcf9f40cfbab2042fc4afd95f09b3ac9980f7daa371dab93fe39cf56245c111 SHA512 7dfbbccee288d91c010cf0bd18d490ac2fdb8c5a2f6cb5ae55697f196ba9e4965ed6c0b0140aadc0685a3bfde58a4b30ca85658876c22c9f91b456aa1753ba4b
 DIST merlin-3.4.2.tar.gz 11016272 BLAKE2B 6fa55423df7ae8f7a8056e90be630f148dd101194de1921605843caf805bd6c9694fa3fe5b8c2f8eff5d57d7d0e9d8653036b6165a49af655158925c7af87d2f SHA512 8225366ebf27ca656ca89fe00d5aec581487ae332aeab81568e7606eaf575648a7614d4d2de8e0757a4e69c6f4014fefa4574c95da13d42acb310c9dd58a468a
 DIST merlin-4.1.tar.gz 2136082 BLAKE2B 3e7e1996611f0cefb3a33b2a78cd36b6e8b84d48bc48f46c45ba340c4be1b93b4a1876f8f4192e911c1c384c416ad7502ba3c7a2abb72eff01215f9fb26bfaf0 SHA512 f0f3ada007f8214b97a8557bddca87eded48ee01a8bb88aba6476e52881ead52d9f47e2666a9292b5c6a490e4cfdc7d8bb322e8489f78eaac7b0f80b6d1e87bc
+DIST merlin-4.2-411.tar.gz 1601588 BLAKE2B 348b48ccf2b209bb511450e4ba46ceb3639b1a5facd70bec4519369907e162e95575fa101aa1b79c56719927272a4feebf981692ea2bcb2299fc2c284833b1be SHA512 9ca8d3690621019b8213abcc1a32e1d754b93849f0bbd79bcab3a14915acc295eb60a7b68e997a75e777daaef83d5ca3e81944b7baf352dc4cce8480905ea2d7
+DIST merlin-4.2-ocaml-4.12.patch.gz 816740 BLAKE2B d96ab1059683799312fc8828e8a46bccaae9279b6d711eb7ed47b6e8631d80e09f236bf6f726bafb37ae243457df3220a9948f4f6de6da20c2a6c66a1edb8f3f SHA512 4eef08ac8a7f240596395d8460a4d3195c1483fb686aa7d5231d7ea28c9c6996196890f76feae951d2539ac7abc1f16ee3c453031e6d19af554ff27d67a63229
+DIST merlin-4.3.1-411.tar.gz 1626551 BLAKE2B c4340ff9b50c72208c4cb13d13e26f36463d7c257530d183a293eaaf3d86aaa71745d8154bb5c0e2149003b3cbe5a127fb6187e7bb7fa7024924fd239f981cfc SHA512 bcbba0c1bb1c84eef7becc4a537e1c2a4bd370a33333bfba1029c82fa8b1d9cdf367f98779fe3329286e418c41b06b49bfe796f5cf8058bcd189b4f33aad1abf
+DIST merlin-4.3.1-ocaml-4.12.patch.gz 818559 BLAKE2B accf65bd5d5798bafe2be022d685da8f829aa9a9c98784420d8a62646d80ab73d1e189e3601266e09eebd4732ae241e8d11dc9663adac3b03a555db663a6d649 SHA512 8823b6e30e49ab3cf35a78063066f01aa7dcbc9174d45b0fed94a3f50e388c35e7ac810c5548c57d7bcf9304b045c483080496865b011269913120a5509a1149
 EBUILD merlin-3.4.2-r1.ebuild 1265 BLAKE2B a12e5b68da2899f57ecb73de9ff4558a2069fef7056f7a6775616801bd809d058e8c457afe7c659e16f31861786311871860ce2ef58460f50a738939ffab9750 SHA512 355c89138e3838407d9f05d1d393411307700deb38fca7f17efb6cce553f2a4d159fb2b13568704bca3c655dfb975e50afa52f314f7c8815370f3ebf1cf74188
 EBUILD merlin-4.1-r2.ebuild 1407 BLAKE2B 31dca48e94c00c377212114a39879922ff4bcd5ed5069a13a3a760f0a05fc92dc2c2d7f89fc73a9e489185cba0e4e36b4ed53f46f9f0d1a49e40f1b6339cff9c SHA512 0fcc8a797b5e2cdcffab5276d403add0cfe341cc6d9571730b74ae1d01e833c5227d7eb1a4443853d65836e6ea8e1c2ec60e23f790fbeda5c3b2a144f0f06e02
+EBUILD merlin-4.2.ebuild 1625 BLAKE2B f684cb80ec4dc21471f3e80bc526c1d7b7241ce259230318e25cdda710b50ad6f58ce6485642a867889f1d4b34f60a102bd614f548b903024cb99e58df6b4fbe SHA512 2682e471f6e59d12ca02909c15aa9855a65d8aad4d91d001b34980bcc147dc3a1a641ee91262aa577ae1ef8616ef3feda6f00c0a568f667dde47a32bf09a037f
+EBUILD merlin-4.3.1.ebuild 1644 BLAKE2B 504f8244a7f427889b8bbb1ffa3e8621762c6295f8b4e5a58a26cf762c251d3a839116dae269e47aeea3788ebfef98641f54525b469c45c596d955141347685a SHA512 ad6f2b092e00f0be513a03652371bbb58e855e084240ff2ed0d672e9f70260b921570aa4d59ad1a8289710ed05777710d4cf4c108ad3c3c592e2440b80b992a4
 MISC metadata.xml 310 BLAKE2B f1255dfdcb6984112e896735ea40f1171a8d52149fa7e8ed279efc1fe08de9b071554f5168bc3f8c0e432bd8344c69f5c5716c5c689ff4ff4edbc27569546246 SHA512 06710c33027574e4c13259e30ca5e862b7bbda0442013676020d00dd1114e92ebee92fa19d2993fc3881c10f9db7b51dd2710fcfbcf9ca7564f8f96e5065705e
diff --git a/dev-ml/merlin/merlin-4.2.ebuild b/dev-ml/merlin/merlin-4.2.ebuild
new file mode 100644
index 000000000000..ba04028ea42c
--- /dev/null
+++ b/dev-ml/merlin/merlin-4.2.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# TODO: vim-plugin, although it's not clear how to make it work here
+inherit elisp-common dune
+
+DESCRIPTION="Context sensitive completion for OCaml in Vim and Emacs"
+HOMEPAGE="https://github.com/ocaml/merlin"
+SRC_URI="https://github.com/ocaml/merlin/archive/v${PV}-411.tar.gz -> ${P}-411.tar.gz
+	https://dev.gentoo.org/~tupone/distfiles/${P}-ocaml-4.12.patch.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="emacs +ocamlopt test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-ml/csexp:=
+	dev-ml/yojson:=
+	dev-ml/menhir:=
+	|| (
+		dev-lang/ocaml:0/4.11
+		dev-lang/ocaml:0/4.12
+	)
+	emacs? (
+		>=app-editors/emacs-23.1:*
+		app-emacs/auto-complete
+		app-emacs/company-mode
+	)
+"
+DEPEND="${RDEPEND}
+	test? ( app-misc/jq )"
+
+SITEFILE="50${PN}-gentoo.el"
+
+S="${WORKDIR}"/${P}-411
+
+src_prepare() {
+	has_version "dev-lang/ocaml:0/4.12" && \
+		eapply "${WORKDIR}"/${P}-ocaml-4.12.patch
+	default
+
+	# Handle installation via the eclass
+	rm emacs/dune || die
+
+	# rm failing test
+	rm -r tests/test-dirs/locate/context-detection/cd-mod_constr.t || die
+}
+
+src_compile() {
+	dune build @install
+
+	if use emacs ; then
+		# Build the emacs integration
+		cd emacs || die
+
+		# iedit isn't packaged yet
+		rm merlin-iedit.el || die
+
+		elisp-compile *.el
+	fi
+}
+
+src_install() {
+	dune_src_install
+
+	if use emacs ; then
+		cd "${S}/emacs" || die
+		elisp-install ${PN} *.el *.elc
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-ml/merlin/merlin-4.3.1.ebuild b/dev-ml/merlin/merlin-4.3.1.ebuild
new file mode 100644
index 000000000000..d269247a3728
--- /dev/null
+++ b/dev-ml/merlin/merlin-4.3.1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# TODO: vim-plugin, although it's not clear how to make it work here
+inherit elisp-common dune
+
+DESCRIPTION="Context sensitive completion for OCaml in Vim and Emacs"
+HOMEPAGE="https://github.com/ocaml/merlin"
+SRC_URI="https://github.com/ocaml/merlin/archive/v${PV}-411.tar.gz -> ${P}-411.tar.gz
+	https://dev.gentoo.org/~tupone/distfiles/${P}-ocaml-4.12.patch.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="emacs +ocamlopt test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-ml/csexp:=
+	dev-ml/yojson:=
+	dev-ml/menhir:=
+	>=dev-ml/dune-2.9
+	|| (
+		dev-lang/ocaml:0/4.11
+		dev-lang/ocaml:0/4.12
+	)
+	emacs? (
+		>=app-editors/emacs-23.1:*
+		app-emacs/auto-complete
+		app-emacs/company-mode
+	)
+"
+DEPEND="${RDEPEND}
+	test? ( app-misc/jq )"
+
+SITEFILE="50${PN}-gentoo.el"
+
+S="${WORKDIR}"/${P}-411
+
+src_prepare() {
+	has_version "dev-lang/ocaml:0/4.12" && \
+		eapply "${WORKDIR}"/${P}-ocaml-4.12.patch
+	default
+
+	# Handle installation via the eclass
+	rm emacs/dune || die
+
+	# rm failing test
+	rm -r tests/test-dirs/locate/context-detection/cd-mod_constr.t || die
+}
+
+src_compile() {
+	dune build @install
+
+	if use emacs ; then
+		# Build the emacs integration
+		cd emacs || die
+
+		# iedit isn't packaged yet
+		rm merlin-iedit.el || die
+
+		elisp-compile *.el
+	fi
+}
+
+src_install() {
+	dune_src_install
+
+	if use emacs ; then
+		cd "${S}/emacs" || die
+		elisp-install ${PN} *.el *.elc
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-ml/mtime/Manifest b/dev-ml/mtime/Manifest
index 6a68de0ab759..522b052b493a 100644
--- a/dev-ml/mtime/Manifest
+++ b/dev-ml/mtime/Manifest
@@ -1,5 +1,5 @@
 DIST mtime-1.1.0.tbz 15467 BLAKE2B 975fdb01c6a4806035a5fbc256d192d6c2f45bdfb750045293b10a732c5613108d9bce897d3c1be660af60d6e9bafbf299dedbc0d872d1c09f65f47b11c9a6b6 SHA512 8ed5dae589dd27fc6e748218a9d9fb9d7d954d231fc2100d61c1b336e0ed38a215bc608cdea9965547729177c78c868c1de6a5ceac6735686a3de1c4a791746c
 DIST mtime-1.2.0.tbz 16272 BLAKE2B 317201f8d5e7a55636e58748ffd269db5e88aed012e8dd7ed269d1f128f8d21ed0e707679b030b9c822bac98c9b76033e8d2402171c4ee758d8c936fbeee7ee9 SHA512 0f0ed220cd0f899643930814010f8592e1f47b6dc6c4dce8eebfb17a81b0abed093a3dbf9c02490af99bf81ea640372f73b4ab88fd8ef0e0c7c66920692a8778
 EBUILD mtime-1.1.0.ebuild 717 BLAKE2B d49774f2eb6d262680e3f0bd929ad61a91a16913864361d374188004c2ebd5c52ebefaae73d1b5a38c588a258fbd317f612f83392a32bce10b618ccd5c00d40b SHA512 03b1bcd56fa44c53c2e10967fa29a5211057dded1de5554db54cbed83a0dd8d3c9202d8dcddc157f1cdfaf494c9043e628e3777023ffd866b2151948ab12fd10
-EBUILD mtime-1.2.0.ebuild 723 BLAKE2B 3da03fa3bd6a6ddc6621e6ed26cc9cc54e55488ad504b81d5c38b38f68e991631b95aeb8dcd2b60892c729a849fa4a1e0e3fb349d8eaa0e2cafe2a231cac88a0 SHA512 22c755c8c00adac4711d1fecfeb3410688d2ecc022f46f696fc2c711e1f84a0558bb73683116a99f62d880f684895bf33a7d0389bc1260dce2fdbb880bfd7a65
+EBUILD mtime-1.2.0.ebuild 717 BLAKE2B d49774f2eb6d262680e3f0bd929ad61a91a16913864361d374188004c2ebd5c52ebefaae73d1b5a38c588a258fbd317f612f83392a32bce10b618ccd5c00d40b SHA512 03b1bcd56fa44c53c2e10967fa29a5211057dded1de5554db54cbed83a0dd8d3c9202d8dcddc157f1cdfaf494c9043e628e3777023ffd866b2151948ab12fd10
 MISC metadata.xml 312 BLAKE2B aad4e2756300a7fdc494215d874c8a754ddee0f94fb24788b8b7ba17d0062f266790d8bc74954c7c21ed481782ed9ddb2b007284266f92f707078a7466f961dd SHA512 aabba72b993e6d70b4d1d1ef3eba7d8adb37ace4afc51c4f9a067f6176bd525716118d225518b00ddc28aa31150b4c558b64d1a43b3a3db2319e02f03afef338
diff --git a/dev-ml/mtime/mtime-1.2.0.ebuild b/dev-ml/mtime/mtime-1.2.0.ebuild
index a6d491ea6add..4ca1ab377ca3 100644
--- a/dev-ml/mtime/mtime-1.2.0.ebuild
+++ b/dev-ml/mtime/mtime-1.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://erratique.ch/software/mtime/releases/${P}.tbz"
 
 LICENSE="ISC"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ml/ocaml-base64/Manifest b/dev-ml/ocaml-base64/Manifest
index 6c16c6489e2f..090743a21770 100644
--- a/dev-ml/ocaml-base64/Manifest
+++ b/dev-ml/ocaml-base64/Manifest
@@ -1,3 +1,3 @@
 DIST ocaml-base64-3.5.0.tar.gz 18888 BLAKE2B e35d6331f163a066169455ea3dac304cedd7ca47fac0a2cbda26b8bd9620b4e49e144d5a06a8a2c6085501e531b2be98f6b24002880d83d6d57025ee055e0887 SHA512 a3886701943a9b165a74e45f66c3d8279b381927774217f5e042494811bc17a08f8933292335d4b76f01c6b1d3c496b4cfca650faa5848ddbf6150ac87386038
-EBUILD ocaml-base64-3.5.0.ebuild 530 BLAKE2B 70026070d451ddf36d7676eef873ec852a5ef0c762137a99ace24ded245dee8626821c936d8be56cc66bc374cba1cbe8d297dcb9a27471ef5ea564af9d35bfea SHA512 642d0c02d40dd51cd711f9c970856fef55cfb68143f326ca20c6ac21b3438ac6304529c8cd271fd92efcf4a35535d0bc223fac4fa4924b460ba25f66b0790d32
+EBUILD ocaml-base64-3.5.0.ebuild 529 BLAKE2B 20e5049fe3d970c7f335c94d5fa049520fa74f333bf3a6463f872802da7957587d4c0cfa8bff045fe592340e603047388fe6d7a6440042f432fb958a9f9275ce SHA512 2e63e3bcd4557e8aba437eeef19d90c5b1db2c82113a29dda5ffebf6954ff9eacd74ee8a407bccb37caa0d1902ced08f63609038dbb9d9beb61ef7e6e201f945
 MISC metadata.xml 327 BLAKE2B 8c6793a0aedb17700d928b0c30d92298db13be50e6b7f520a7838fd76f4331c28a1787585cbc13999c125d39dd49698a3adab5b2822e2a7fe3b7204dc5f224f6 SHA512 3c806541652650a16615df0a83510a97f82ab3eb3208b47f341842ffbbd16984660b22d99c678896eb82e0c278e8a82824d17574ed4b7cf31291793d1bbbb78b
diff --git a/dev-ml/ocaml-base64/ocaml-base64-3.5.0.ebuild b/dev-ml/ocaml-base64/ocaml-base64-3.5.0.ebuild
index 389d8b0497a3..8cd94a37b883 100644
--- a/dev-ml/ocaml-base64/ocaml-base64-3.5.0.ebuild
+++ b/dev-ml/ocaml-base64/ocaml-base64-3.5.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mirage/ocaml-base64/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="ISC"
 SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ml/ocaml-compiler-libs/Manifest b/dev-ml/ocaml-compiler-libs/Manifest
index 0d2f117680ff..67fc6e2fc9f3 100644
--- a/dev-ml/ocaml-compiler-libs/Manifest
+++ b/dev-ml/ocaml-compiler-libs/Manifest
@@ -1,3 +1,5 @@
 DIST ocaml-compiler-libs-0.12.3.tar.gz 4982 BLAKE2B 83432cbb2707964f025b294a84cdcce77137156e409d85ce8615dd6e9a26ad085cd5de178ebeb7520cd95b19a15b3cfbf7ef9567d165b55e07850a231b68371c SHA512 748ae11fe4cedb12d153ef2e712a9899f6a7ab4a35ddb7c95c0ae25af979c3edf274046745dddb2253fc06be41d5b0029f11a5a823a17d1ee680ffb29c4bdc89
-EBUILD ocaml-compiler-libs-0.12.3.ebuild 473 BLAKE2B ce4a65bac57a4ff76e7fe11e70f3262f649583a0f15bd6bef73fc4459e3f35d45e664ec0b7bd8b9511a93f5e24fb61c2f4bfa277f51b7369f40170e345ca655b SHA512 3889faea6798a6e3849747a6f2255acbc400dabb2bfb30a41cb77c9da49280ce67b1c7876102c1f7fbbb17c1959787c8184b3707f48ab1830906a74344de2616
+DIST ocaml-compiler-libs-0.12.4.tar.gz 5435 BLAKE2B 2c7b3f79315945d094dd4102da748dda55265bdd36753606ec03eef6a39eb385b84e7bfd0f43a04583271bf7c53b15481e9dcbb48c362d472bb3f740ec48853a SHA512 cf08e8d4bf25fff26a16a05036f08247176f4845d9d9ada85944c3fa89b6df9a5092d7a1025415a3b2ce00dd45b544cc82247648cf3952be2304e5d9ebab121d
+EBUILD ocaml-compiler-libs-0.12.3.ebuild 466 BLAKE2B fed250997f42d537a4be8c32f2d65e99b78c1adb30941e8917f78e49cb1245523ab0231b86f11e1e407f049fb6ece12884f6c39b4e7373bae709b39fb4aa86a9 SHA512 0591fb26e0e018b5f202b586c92c1f2274f2c57490e8dcdea34cb0d78618d44a9e1f4cf6a6588bc2bfb97cee3100e8b3e2b4e38866d953e7fa169f1d49f54529
+EBUILD ocaml-compiler-libs-0.12.4.ebuild 472 BLAKE2B 0c8b133a8ed1a6b0ebf203e5baa3e2b94e1010ff42e023a1fb421a34ea53a3331949444982a8bcb9e25d150dcb75b97d0c49df2214a0afffde34669f90f6bd20 SHA512 d5413ba80a4b9d95bf89dfb34ef69b319d763e525d75eb8dd058cdf36188c18a5e0cf125cad5865421ce3ffc12772fb58659e01db7380fb3582f553e3900d4e6
 MISC metadata.xml 340 BLAKE2B 1aa54d3afdff85b09abb144e98e91f5b87cf2cc42e915694cb61a2fe2676969b76eeaddef4f6c2821b9415f8a655e2fe30a2e68cef3460ad9b75e21311fa8ae2 SHA512 32442d765b80b2cf543decc9246fd4a2b44f4a8353e301cc958570757aa9f896edbc2ca6806e05d2c3e50893eb8570a5b4366bd2a83c5718dca79e2a3120f75e
diff --git a/dev-ml/ocaml-compiler-libs/ocaml-compiler-libs-0.12.3.ebuild b/dev-ml/ocaml-compiler-libs/ocaml-compiler-libs-0.12.3.ebuild
index ce40ed8ba22c..345396f5fa7c 100644
--- a/dev-ml/ocaml-compiler-libs/ocaml-compiler-libs-0.12.3.ebuild
+++ b/dev-ml/ocaml-compiler-libs/ocaml-compiler-libs-0.12.3.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Repackage the OCaml compiler libs so they do not expose everything
 HOMEPAGE="https://github.com/janestreet/ocaml-compiler-libs"
 SRC_URI="https://github.com/janestreet/ocaml-compiler-libs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="Apache-2.0"
+LICENSE="MIT"
 SLOT="0/${PV}"
 KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt"
diff --git a/dev-ml/ocaml-compiler-libs/ocaml-compiler-libs-0.12.4.ebuild b/dev-ml/ocaml-compiler-libs/ocaml-compiler-libs-0.12.4.ebuild
new file mode 100644
index 000000000000..e7afbbcd5579
--- /dev/null
+++ b/dev-ml/ocaml-compiler-libs/ocaml-compiler-libs-0.12.4.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Repackage the OCaml compiler libs so they do not expose everything at toplevel"
+HOMEPAGE="https://github.com/janestreet/ocaml-compiler-libs"
+SRC_URI="https://github.com/janestreet/ocaml-compiler-libs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
diff --git a/dev-ml/ocaml-ctypes/Manifest b/dev-ml/ocaml-ctypes/Manifest
index fc928cd8320d..89c34d13e36d 100644
--- a/dev-ml/ocaml-ctypes/Manifest
+++ b/dev-ml/ocaml-ctypes/Manifest
@@ -1,5 +1,5 @@
 DIST ocaml-ctypes-0.17.1.tar.gz 208101 BLAKE2B b9fe6632058a670c988ba9f1ae81b75aa5373de7231cef04d5e2ede61a44cbaa0324c04197a0a202847599a9bbe7dccd18fd3279f3f351493aaec4959caf3ada SHA512 1e197009f7e6b29b43944f757e987934337ebfa11bb2ff2ca8ba3ebc607e37cf1259d07a90d7faf4b91b49ee20d5c65357ad305f34ada0a8d336a3904233150e
 DIST ocaml-ctypes-0.19.1.tar.gz 206762 BLAKE2B 29b4636e711b9b3ecf3de5d66b796d4d8ddf1109fd7b065666577ce9412e0ef3712f704729dac3b9467ac7ace8f501b90bfc1dc82b86dbe1668e5d13be46741f SHA512 cbf422a2c457b215815a04122d0522ed0f274c5927cecd25951472de6cc6fcd1151b67f95d6bbfeeb3b5f15a9fe9bdedb8861e77bd0de9902418962065e4dfc0
 EBUILD ocaml-ctypes-0.17.1-r1.ebuild 800 BLAKE2B 4df19810dd960c6d51525dde9dc2b374e7ffed06102bdb6622c847b621e699caba711e3b1ca06ea4daeeb87fb7ec05c0c3a41c8b58120ce658633ffeacd8fd09 SHA512 2239d8cef4ce0c401be0422dd8daf73de29322228ad7764c5d0e2d558bdbfc65d77728a97ff2a7987bb502a45ba8774108ec7f18f247d8dd31d22af4068b4786
-EBUILD ocaml-ctypes-0.19.1.ebuild 822 BLAKE2B 3680401b400804b3f3cb891aaacab783643d0c3e1473de0634c29ca4330af45f14d7ba20aeeddac6f9314fd9127597c16acdd0dc4522ddafec0b1edc8f8d6abd SHA512 2e7479c1fb7808421f3823f8623e15777bb116cf6a560ac0b5db338289e456a608f843566bb5dccc61de551d73bfb8ff474840aed11853a3cc431ae2e399671f
+EBUILD ocaml-ctypes-0.19.1.ebuild 829 BLAKE2B ee4443cdae4266ec868c203cf98a9361523dbeed0dd6c1c4dc42778b62461d3f725a37209d7dac34c578a646a33e6f8c45c98e1c3b51f87468bb6b5e38d915db SHA512 8ff2dbf4a3cf2ed89b9e236169f6f61ea2b25a52ebeabc4465a2cb3de73379cae000808c29f7b9b357400cc3a2ea57a53a539ca1bf9ba44502deda8121e4861c
 MISC metadata.xml 332 BLAKE2B 96f7e364efba1f351c647a1c929d7f945badd062b9b6b85107f2df8638b21cad9ca52457e58ab7e13d203817baef5644d752e7d35703f78672cf91173abcb0bd SHA512 f982ae0f1c07b31bba3df030e972c88621521f7c5c205b9b31e5385395558f0471ad31dd612e247190df7b6663e8180ec1e525a15c24b0c2fa4d0823e4ed052e
diff --git a/dev-ml/ocaml-ctypes/ocaml-ctypes-0.19.1.ebuild b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.19.1.ebuild
index 7bdbd62f4abd..805f10af8954 100644
--- a/dev-ml/ocaml-ctypes/ocaml-ctypes-0.19.1.ebuild
+++ b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.19.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ocamllabs/ocaml-ctypes/archive/${PV}.tar.gz -> ${P}.
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ml/ocaml-migrate-parsetree/Manifest b/dev-ml/ocaml-migrate-parsetree/Manifest
index 729a08ba3edc..2e685e220340 100644
--- a/dev-ml/ocaml-migrate-parsetree/Manifest
+++ b/dev-ml/ocaml-migrate-parsetree/Manifest
@@ -3,5 +3,5 @@ DIST ocaml-migrate-parsetree-2.1.0.tar.gz 169358 BLAKE2B 072ba6e1a879d5e308e7b40
 DIST ocaml-migrate-parsetree-2.2.0.tar.gz 188265 BLAKE2B a551ab1abd9db751d5300cd6c570e2072fa8d242c6a58c9b84387b177211081f6747526ae787ad51817bd63162c3fed61cbd1e3af083a49a524c0e38c69546e1 SHA512 7c1eec4b1d66d6d7df685684b054d8e98de6d4bafb6601116affc9f05fa89fb098824005891f0002e12c2d83ade734cffde2070792db8c9bc2d79825b86b45c1
 EBUILD ocaml-migrate-parsetree-1.8.0.ebuild 559 BLAKE2B 90ed2c07d5c9aa5b3050545dbd0c2544ce622a24e50f53f3f2f6e13120767fe058bc29f283e6928b99fe615c859a43f6627e3c116a2883190053f8f688da16fd SHA512 10a4625b8238d3ee6a628bebd28386aaa3a228bf83f472062056c082d3f38e6ca884a8839deda917f8782db86a42f661a95ac9fac3f7d0d3ebb1d03f20156aa8
 EBUILD ocaml-migrate-parsetree-2.1.0.ebuild 518 BLAKE2B 9f1a41716bcc98179981cee1b9d64da9b30c2177bd9e3aaf5350918929ab853a1755ca451e53495c61f7ec58c83662642ec7dd61aa4c593f63980e7981761deb SHA512 10c31cbd85fd0e291182b42a540e5a14edfc0930f6d9615a79498c9572045871149f8eaa89d9f722529de471c17e28de7065ea4036013227179b5e311d030974
-EBUILD ocaml-migrate-parsetree-2.2.0.ebuild 524 BLAKE2B b233a05a2876dbeac640b5dab4f417937cfd08a7863eecf1153d6401828595b48ca02bc861fd990f13c1d5e1f10305cd6a594f4d850ef54d24bca526f8d4d124 SHA512 34ee9d90eb24436c56f77d800ffb177905f8184b27fc0d2b063cc32e79d2e287ce4190e78153bf6afe3a544ba2f07e7963c49b786f4e6cd2c865d3c57732327d
+EBUILD ocaml-migrate-parsetree-2.2.0.ebuild 554 BLAKE2B e8df8edd0f07020467488ea8e69a453c0a2a52fda322b1ab7435da0002d05357195bcd3d22682cfab4a741e26258584b27102b5afd4134c11487103df465f590 SHA512 23538d9bf5159eb1d0034b7c6bfa7f66536d84c6477f9ac72731f45c336dad44e7cbfbb1f3197cd91758e1124f12ad45e7a1c085d56b127d3b8a1c7622679ff6
 MISC metadata.xml 436 BLAKE2B ec12ef5053e8fd2d654d38ca5b81823eed65bde5ae354c27cb166834da0dd0e34a4e038d1912cc9d6653b14cff9cb06d6a3bec4388b6d4d3a96cdc20faec3efa SHA512 99bc47f7b568fc287370b85da88f4f57630844ad50e2085a5f6d6fe17d1707ace3843751b07c061a80076661edcfbfa3714eaa248009b9562e60a591b0047774
diff --git a/dev-ml/ocaml-migrate-parsetree/ocaml-migrate-parsetree-2.2.0.ebuild b/dev-ml/ocaml-migrate-parsetree/ocaml-migrate-parsetree-2.2.0.ebuild
index 15c2c38d9b40..ae708d50d3c2 100644
--- a/dev-ml/ocaml-migrate-parsetree/ocaml-migrate-parsetree-2.2.0.ebuild
+++ b/dev-ml/ocaml-migrate-parsetree/ocaml-migrate-parsetree-2.2.0.ebuild
@@ -11,8 +11,9 @@ SRC_URI="https://github.com/let-def/ocaml-migrate-parsetree/archive/v${PV}.tar.g
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
 IUSE="+ocamlopt test"
-RESTRICT="!test? ( test )"
+RESTRICT="!test? ( test ) strip"
 
 DEPEND="test? ( dev-ml/cinaps )"
+BDEPEND=">=dev-ml/dune-2.3"
diff --git a/dev-ml/ocamlnet/Manifest b/dev-ml/ocamlnet/Manifest
index 9449d630c6b8..ebae5b7b2e05 100644
--- a/dev-ml/ocamlnet/Manifest
+++ b/dev-ml/ocamlnet/Manifest
@@ -1,5 +1,5 @@
 DIST ocamlnet-4.1.8.tar.gz 4620065 BLAKE2B 8f84ce4d79de5f4a1f26d4e45f68327042b0adc22717e56eeaca03ee6371e9251c01e8736d3afe5c00a1c65ef0286d56a04c57e80377402bb19ff87955ae98d9 SHA512 e238235968b9546c60568a38e68e354378d30e7137973332dcb10da21fa775ab7b367889fc51f5bd7cb00e51582834cafe2a0c4706b0bc77a44d4571a6f22815
 DIST ocamlnet-4.1.9.tar.gz 4628747 BLAKE2B 40e41edee79ba5957d297506cdf1b907adc8d44a33f25f25b8b1a18487f5ec379fb328c86d6283f7da7cedd8d35b80809e1cd5224522d51afa3e5f2402ac8663 SHA512 a251724deb35e756c81d2d3ac836d413b659acdce6c0acf479a4fca48934ab62ad399a884197d00dbb7e7558132a56be1c8efd553c0a644d329418272f809a46
 EBUILD ocamlnet-4.1.8-r1.ebuild 1559 BLAKE2B 5f9a1839a3c3248f00250000d28770a2e60667a36b221b81c0fe37c8491f3089266aaad18464656ea6878965615660784f69351e6ff3f6abb0ad6dfb82494360 SHA512 3f7353bfd894c9acf9b9949fc0a2b9e153ab4c013a67c182771b914cb1750ea2f02251a184fe6ff3cdcacf8df2fb760e61982940c5877ec293b5f1307cef949c
-EBUILD ocamlnet-4.1.9.ebuild 1562 BLAKE2B 9c047b948a3b94cc6ee31d6cfa3693bdb882507c134d010e8d7a1b56e958f3eed0a20d2ef6825e7580fae87313e73f9bda17ad7b5a953ba3cd7b1f6623d43121 SHA512 d7ece3bdca5f2c7206f164020d26f1a724b01ebbc70f003cbff92cb1f1a626598bc656cb6e79ec928a81234f63e9ba74b4a234fe307a6b2680706d2172504573
+EBUILD ocamlnet-4.1.9.ebuild 1559 BLAKE2B 5f9a1839a3c3248f00250000d28770a2e60667a36b221b81c0fe37c8491f3089266aaad18464656ea6878965615660784f69351e6ff3f6abb0ad6dfb82494360 SHA512 3f7353bfd894c9acf9b9949fc0a2b9e153ab4c013a67c182771b914cb1750ea2f02251a184fe6ff3cdcacf8df2fb760e61982940c5877ec293b5f1307cef949c
 MISC metadata.xml 406 BLAKE2B 765eb184895dcb4d3769fc590facc0435ca84a33a1954b8c33b2f1f40f775fd165aa7e1d86b3f874a8c83c8020c094f73d3174d46d94c1c455d54069ff431414 SHA512 911bd8206d13c92e78ceb3ea00c71ddebc1ab83459bd2d209f2209b81e7952b69ee6ee53003806c8c674dd083c300cd0b243ccfc7449c2a8678a3d459c434879
diff --git a/dev-ml/ocamlnet/ocamlnet-4.1.9.ebuild b/dev-ml/ocamlnet/ocamlnet-4.1.9.ebuild
index c0ee784e835e..8976098b07bc 100644
--- a/dev-ml/ocamlnet/ocamlnet-4.1.9.ebuild
+++ b/dev-ml/ocamlnet/ocamlnet-4.1.9.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="ZLIB GPL-2+"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="kerberos tk httpd +ocamlopt +pcre ssl zip"
 RESTRICT="installsources strip"
 
diff --git a/dev-ml/ocamlweb/Manifest b/dev-ml/ocamlweb/Manifest
index 17c53da3e38f..023f545e54b6 100644
--- a/dev-ml/ocamlweb/Manifest
+++ b/dev-ml/ocamlweb/Manifest
@@ -1,5 +1,5 @@
 AUX ocamlweb-1.41-ocaml-4.08.0.patch 1798 BLAKE2B 3bd06439f093dd25195070b41bfc59af9f0b54ad5d6dd0a705926961a1e60f49a64b62d11ffaa56f40bcd9cb0260344a8cd66f1c9b713b7238a2a83d710e06e5 SHA512 b9019c0377e24f719c086ce3ecc1117a2a96375f608d63a5267e0e6c466e60d43db2a714659201d2c74da7c0d7499c8c8982e31f5f87d7f6229a77f7ceb3dadf
 AUX ocamlweb-1.41-strip.patch 705 BLAKE2B 207e1771412bdba7985cebcb349e5c8fca09218dcee0ec78183bcb3160dc039e7ea7f81fbbdc2ef80dda05c1130faa24a3d09f4546262c4dbb832ed2b532b982 SHA512 54c211cb3b78b04bd4212acee0065e3c8614729a841691e1e29b8c553b73df20114bfcee4191ea519597c37a3c7344651647263fe6463829b780d7cc17710491
 DIST ocamlweb-1.41.tar.gz 141844 BLAKE2B b89b20bdc8b99d34069b2e32a6bd8c9684e294fba667a4b74080b34f37c6d90432c61e71e27f4f1772cda8a26891655bd99a21defa584f4a1c68ae1e0d58d454 SHA512 7a6403f8b0de3feeef9657e8aff10e6f1fe29edc400ce3f11c6435d6350314423fb74e192e4275a9ad47170019d6a960daf74f245539f0f3f2a6072cc7195442
-EBUILD ocamlweb-1.41.ebuild 830 BLAKE2B fad80e14433e9f7310c14b5d38a9f28fa8d693965edb7f8a44b1b64d8fe9c3724ca5c28bcbd68a906b563b6fad3278bf02f3addc35fd6a3c7d16c4eefd135fda SHA512 ff57843464c013acc18c0e1d353885cfaf2ed6d2560123925085e86b8acac2e0faee8b204fac992c5c09d6e541987d9592ee378d873a779a4a0be63b58635608
+EBUILD ocamlweb-1.41-r1.ebuild 849 BLAKE2B cb2cfa0d5669fd58079fde7d8a90cd056291f39eb09567786d233a2e01228afe65de9f04add5e1147baaab657f0f60a549c97c25f0ac4aa159ccb2f2f05197c1 SHA512 b14733f9e3c1caa81373caaed50ff68281eaba02fea182f9224d36457ee7f4fef28a8d09eba71d2c2bdc33b4c438ab93c1767e4e95b65c9dae3a640bba3fc4c1
 MISC metadata.xml 338 BLAKE2B f947fa0825c1a3fd959515164da36ffc9694c570ed6eb6eef8686fc24b4582ee88ecb7304507c79cf2733fb77ae3570468ec8da886367d79721c81f148931833 SHA512 9d052ada92f441fa4908f4ec9a2561f7276872281ffa65f0ad92c8d0f7c15aeea11d6c887d4af7535d7d72bce3dec8f12622aee5eb9a79e510e8baaa208a54cd
diff --git a/dev-ml/ocamlweb/ocamlweb-1.41.ebuild b/dev-ml/ocamlweb/ocamlweb-1.41-r1.ebuild
index 1cd6b57b27bb..0e13362dc9ee 100644
--- a/dev-ml/ocamlweb/ocamlweb-1.41.ebuild
+++ b/dev-ml/ocamlweb/ocamlweb-1.41-r1.ebuild
@@ -19,12 +19,13 @@ RESTRICT="!test? ( test )"
 DEPEND=">=dev-lang/ocaml-4.08.0:=
 	virtual/latex-base
 	dev-texlive/texlive-latexextra"
+RDEPEND="${DEPEND}"
 BDEPEND="test? ( dev-tex/hevea )"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-1.41-strip.patch"
 	"${FILESDIR}/${PN}-1.41-ocaml-4.08.0.patch"
-	)
+)
 
 QA_FLAGS_IGNORED=/usr/bin/ocamlweb
 
diff --git a/dev-ml/opam-file-format/Manifest b/dev-ml/opam-file-format/Manifest
index b9e8a40c8eba..ea1cb59856e0 100644
--- a/dev-ml/opam-file-format/Manifest
+++ b/dev-ml/opam-file-format/Manifest
@@ -3,5 +3,5 @@ DIST opam-file-format-2.1.2.tar.gz 32120 BLAKE2B 3756ae2e2ad8e60d9611f1879ee0717
 DIST opam-file-format-2.1.3.tar.gz 36255 BLAKE2B eabd343d1ebb5708e57a125cf6f15105e263d0cc0885717df58249313de77cf1063efa2fc0f9b92d67a83649f3bdd8fa65c13077ca4b3814182ec750701570a1 SHA512 90da53a2b19eb97c17ec71d3ac00969863ef3458f421189413b3ec2d96f8822da9fba51ef95f55064bbb17f1729104a1fe4fed1d61d5006568b53165f0c6931f
 EBUILD opam-file-format-2.1.0.ebuild 722 BLAKE2B 3f6748e96bc9e6c19827dd03e03869e9ae1b8e95a180bdc050aa75ad7ffe27d75cbca38345455bf6899b5b5797b045a781ce276165a643d79f12e2cebcab7208 SHA512 2ef42c81d573649da5690120aad105e178d89dcb8cae95c49f99d2c3452348f110ef0bad4563ad9f05c9d168f7d19f62155afb90b8d8b99c9110b7401bedc00c
 EBUILD opam-file-format-2.1.2.ebuild 572 BLAKE2B 3e889c1cd89dee0649cfa12fe06e23a2e97c3c77ed80391d931055593d93973c848e0b258e5f24665e1e48c942c22b88ad58528da2cf87baaff84c4a11ab3eb7 SHA512 a08f520e8296b67363d6f609cb78e17193d77b7ca3febe9caae653983404d81dd3cd3197bd097a9230f4a18a524fb0f64a26dad1a773fff7ff83464e64342486
-EBUILD opam-file-format-2.1.3.ebuild 578 BLAKE2B bb952e031263e0da424399f4e7d0a2adc0db94c9715fd77f6fb635dc2467fd02c4cf24a55ee6eac8cb35c4b16513975d71c1ce6c82878fd3173c8ea55f5fbcc1 SHA512 518e0af5afbc7526d57048f553e59e5b5ee91aabb37800c218cc472c43ff7e2a2a0bd533a47c29f84335f2b57601f048d80a4cf084961c5c3c13e75919a9ba5a
+EBUILD opam-file-format-2.1.3.ebuild 573 BLAKE2B bd3752908350affce41b7045ef293a12f339aaa08088523f1ce54984685827041ec7d72f468d094de309aaaa534c98f3bf54951fefe95cbdabc85c7b28f617ea SHA512 2172a5b7b840e662d366264dd84f59929cedf41cf242f8c1fe305dc9c85cd042f3836537e41eb4e6a8534b6f5d1eacd9760a334fcb6be23213c0fda4820d710d
 MISC metadata.xml 425 BLAKE2B 25f90cb0096de48ad7397ad960e1b3ae342abeb784e62e9a878d960cb6300fef998a303d9db88a99aa435be856a25d2221dc4046ddf776f40a5c6bba29981770 SHA512 d6961adf7d8b4517b5e10a344c3a373d925c76cfca0d80c854ae00f40c812095f257c2eb55dd9ea5dcca327ecd3a2bba560f64cbc56d5b208ddda0b6fea4951f
diff --git a/dev-ml/opam-file-format/opam-file-format-2.1.3.ebuild b/dev-ml/opam-file-format/opam-file-format-2.1.3.ebuild
index fe3328205eeb..943ebfa49c02 100644
--- a/dev-ml/opam-file-format/opam-file-format-2.1.3.ebuild
+++ b/dev-ml/opam-file-format/opam-file-format-2.1.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/ocaml/opam-file-format/archive/${MY_PV}.tar.gz -> ${
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~x86"
 IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ml/opam-installer/Manifest b/dev-ml/opam-installer/Manifest
index 6feaf42b8ea2..0789464efd1a 100644
--- a/dev-ml/opam-installer/Manifest
+++ b/dev-ml/opam-installer/Manifest
@@ -5,7 +5,7 @@ DIST opam-full-2.0.9.tar.gz 8029605 BLAKE2B c2ae06bdbbdbe9db270ec0027ec8d13a228f
 DIST opam-full-2.1.0.tar.gz 9136886 BLAKE2B 3d51159568b6e85834f70a3545fe37d82470d4253bf9db6fef32b4314fd0a82182737bba6be62a9dd04b6d8fb8d7468b2e23ac39fa475f467adfdb0ec8d52181 SHA512 2c4955e450cde7211dbab507cbdc5d6e67805353e384df525d77ebf5561d6a4de91f7e5691567b2dc61146fc29df6fa5dc8aa8562330a4746db3a52b7487811a
 EBUILD opam-installer-2.0.8-r1.ebuild 1029 BLAKE2B 53066e7d4fe28f77ae2cbc1a1eb3056a60d04ada7eb72c0589498815c8ad3937ef6335b73a675bcf7060c6bf85534b3b497b55ac782c1f7a0d3e32537c1489cd SHA512 df08f41985fd16842021dc0e5c8a361a1d8376d1b716f3fb2aff8bdc007ff311ba51844894325e76657a688a03021fe7360c9522ac6f41231ef499de214d469e
 EBUILD opam-installer-2.0.8-r2.ebuild 1014 BLAKE2B d5152345b50b7475a4f19f8e34bce269a8329e85ad7ca86f89373cc20f5ffc6e5e233c8ccf5247797fb86880a8bfd37005941e753b2bf6a06d3a7194462da18b SHA512 4d91c847eca096f95654cffa6c26701e1c4e65c1bf0e28c3eba3b01da9170071449a7e335954da270764581b4bc7a7dc1b0210d50e254bd22c9eeeef22f0223d
-EBUILD opam-installer-2.0.8-r3.ebuild 1188 BLAKE2B 6116289307046edd8627abb25a9d10a34bf07dca499c853f452a1d7b3a76a06545b0c30ca8fdeb9e5fdf1384b697a2764fb42be453310ecefdf370e8a3a71405 SHA512 33d7f0bf455b6366349d60119a4f2c96ba87e6da47b775ce154ed59652d4ae002b6ac00fa23c57a7984b17ffc8f9dd614549fc756b833cefe6d56c8bda5d9c7c
+EBUILD opam-installer-2.0.8-r3.ebuild 1187 BLAKE2B d18cdb65a28ed6043ad63c818ad7dfe9552f4d128353438ce9d6bcc2af16ccd89b5b6b6432ea46eee3216eac401f6c97df56067d95ce994ae8b8d93ca52d4a59 SHA512 bb8f6fa1251c10097d06443b866d139372fd2da2b0cbd5057c673d1507d451d13ca60677e0be7b92e546149d6843a27275159ec1a23d5a5fe785937e24e4ba4e
 EBUILD opam-installer-2.0.9.ebuild 1193 BLAKE2B 2146bb8d98820a6baeffb5ee098527ca75529e4fa8302efac24e455526242db224707dced11a2bad732da18db02e680d979518fb156e28974c4dac4ca833c909 SHA512 3572227ee5a0c0b89d4ed201da95d831056d5227673a5015bb4139fd08b2b5ff0e73a22c0e2e14fec989b18303222abf38ae7d78c7b7385f8e45c4420c9db299
 EBUILD opam-installer-2.1.0.ebuild 1025 BLAKE2B 4fcb445ca539b14a30c79788fbd7350eaf242fb8dace406f043d4db4adaf8bec51a1d72c3134dfab25e615501f5ea8c2e751ee1e00502b4adbeb22ac9048b97b SHA512 f237e7f35d2567d8bba39f9a281706a8060cfb2680be1ecad78094ace4ac14a4be5d65b5715c2f213b39335df7ddbb27f1b54c8da21864474624def819f5abcf
 MISC metadata.xml 413 BLAKE2B cbdd94927312b95f2b5f76489f341f658974be49f704b81a4524879bbe780dcc5d9505b863b87da002cd98b8bb1e13967b047095dbe1eac589acd3145b66fc6c SHA512 afe675cebc52bba018a89d8f04b5c993ae8306f8d18ae2175be4c372f3219c63606b34bbb45c7daaab53be8eb7747fb7e86417bd29bbed2753458f564f3078da
diff --git a/dev-ml/opam-installer/opam-installer-2.0.8-r3.ebuild b/dev-ml/opam-installer/opam-installer-2.0.8-r3.ebuild
index 2f86f0c66750..919e02b41347 100644
--- a/dev-ml/opam-installer/opam-installer-2.0.8-r3.ebuild
+++ b/dev-ml/opam-installer/opam-installer-2.0.8-r3.ebuild
@@ -16,7 +16,7 @@ OPAM_INSTALLER="${S}/opam-installer"
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 
 # Cherry-picked from https://deb.debian.org/debian/pool/main/o/opam/opam_2.0.8-1.debian.tar.xz
 PATCHES=( "${FILESDIR}/debian-Port-to-Dose3-6.0.1.patch" )
diff --git a/dev-ml/opam/Manifest b/dev-ml/opam/Manifest
index be2c60a102e0..4d0d0121c2b2 100644
--- a/dev-ml/opam/Manifest
+++ b/dev-ml/opam/Manifest
@@ -1,7 +1,10 @@
 AUX debian-Port-to-Dose3-6.0.1.patch 5223 BLAKE2B 8fada8b358cfae3aab9f6b8f0554894f55081197760a08b544229fdcc9d74434c1408cf72a8bb1d4280d11ef94d593ebb54a8f656617d99191d3576d02556793 SHA512 969c79a0552e0ea2388f732ca266d07b4c2a5a6945bd75daa2a435340ffbd8d87d2ada39dbab9cb364b2ad918f60600a59cf1fc06290a3dcbb68568c52fc9c7d
 DIST opam-2.0.8.tar.gz 643221 BLAKE2B 66510a18285f315fe95665e8ba2f334dd44211c716543cdc25f2951a7dfe537f115981046e5963fd08deea4c76f5672fa7cf8e7af2274a713a3165bdd0bac8c2 SHA512 14737dc994be2c54dfeaf2658d3713178033e1bc2b4b845a58b4bfc118bbbf12b502924add0ae32b4b2b6c1944462e5ee7143df3de362d9ee39573249d013bc9
+DIST opam-2.0.9.tar.gz 644429 BLAKE2B d96ee79685a8ee8ff82c7570a747c80e38d86e513736a27904a4e471d1eaf432db72998251ac786cb8fbf1ad425fff42b772c5d26934e0929aae75c0946d4659 SHA512 0d8ee19ac0f3df9de4fd9cfa8daab1f7228f090f5e2e7e26bedf24d8c2ab377aade95048f2d7cd9ee9dbbe738729e26dc99f41f730fa2252df74953362464a22
+DIST opam-2.1.0-dose3-6.patch.xz 5896 BLAKE2B f605064ebae7d327895729962a345a3c679519895aa2568f0c2d199d4ba9d6ae948a4fc418cfd26cc65079eb6ef3545f24a35e08c969d215529664a80d0c9147 SHA512 e00da74d7baef62319e884e3a05112bcf86a02d887c274bd15fb0d15bb8198e9a37a421f388bec3fce198e7a1b4d37024b18609dc65978c6ee8a7889df9bd608
 DIST opam-2.1.0.tar.gz 825966 BLAKE2B 42ab8ad2825e4e167618ece7bd2ce77ff055d584039fe2f644fa1c3e99d175cc7047f32bda53599af4fb177d844970883125cebca823024d1bc43a34857f20c5 SHA512 c0060e609c49a12dc8f64accef990aa593db818b72df3984fb9b4b22d8678b46c515916c84134a62dab614c716b61788eadc954d295f32c1f27d38aec22b3edf
 EBUILD opam-2.0.8-r1.ebuild 818 BLAKE2B 2cdef3169d4c660daa501a449c0f204ae3bd12e8bd1a66cb4bde94ea4e523457fe952a61330cecbd1a59d14754d0e167efe453589387f9fe666b7804caa370f4 SHA512 7ebd4e81e160649198b792911d5f16bd4a7c001b60b2b4db3b8509caeb0d537c4114618d25b1ffbbd66c96f32373a7824b6530587ad8f9f4d1249de9400cf7d2
 EBUILD opam-2.0.8-r2.ebuild 958 BLAKE2B a29b001a98117c644dce3c731db62520631662fa9dc5b73ca247e1234dc2c7d95c0b2535fc2d4c186fadb0461cce62423fd1d434843527cf0b6f7a4ce4f79a96 SHA512 c8b808a8bee1947f8aaff9cb7204013c8686302ffa43e6390ed8096b515019b869aa14d86591117dff7f09896229996c544ce5abb8bccc03580b3b54b104de3f
-EBUILD opam-2.1.0.ebuild 963 BLAKE2B 3ba5f51f310eaa23515c561525215b2e21ce836d77aae765829a30b79c440d4910870171176e5460a8c6075e1c0f9e3bf699d5f9eefb2a80757a13ad18b5f6c1 SHA512 3b3e82b207f16807d1e266b5e1284622c5a8c58aad21dcd56664f053a84c4cae3029286c8ddf5c0082be13b8ba6bb43d6f7775d475be9c01b0002ea566a43e95
+EBUILD opam-2.0.9.ebuild 963 BLAKE2B 3ba5f51f310eaa23515c561525215b2e21ce836d77aae765829a30b79c440d4910870171176e5460a8c6075e1c0f9e3bf699d5f9eefb2a80757a13ad18b5f6c1 SHA512 3b3e82b207f16807d1e266b5e1284622c5a8c58aad21dcd56664f053a84c4cae3029286c8ddf5c0082be13b8ba6bb43d6f7775d475be9c01b0002ea566a43e95
+EBUILD opam-2.1.0.ebuild 949 BLAKE2B c3db9b32322ae6acb0dc76e22fd67eea01d2e03016b6bf8aa41223065dd18d5f00eeeb26b57f45d83f9836fe8da960db4177f244ea6b032b80f6353843125914 SHA512 0189369c5a3daf3f596cac822437c6edf71fa0c6a7257ef78f5ceb16a293902962d44cb51462550302b36aa64a94f2bf5a96905ef532296244f8c82931befe0e
 MISC metadata.xml 413 BLAKE2B cbdd94927312b95f2b5f76489f341f658974be49f704b81a4524879bbe780dcc5d9505b863b87da002cd98b8bb1e13967b047095dbe1eac589acd3145b66fc6c SHA512 afe675cebc52bba018a89d8f04b5c993ae8306f8d18ae2175be4c372f3219c63606b34bbb45c7daaab53be8eb7747fb7e86417bd29bbed2753458f564f3078da
diff --git a/dev-ml/opam/opam-2.0.9.ebuild b/dev-ml/opam/opam-2.0.9.ebuild
new file mode 100644
index 000000000000..e882aefd038f
--- /dev/null
+++ b/dev-ml/opam/opam-2.0.9.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="A source-based package manager for OCaml"
+HOMEPAGE="http://opam.ocaml.org/"
+SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz"
+S="${WORKDIR}/opam-${PV/_/-}"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+RDEPEND="
+	dev-ml/cmdliner:=
+	dev-ml/cudf:=
+	>=dev-ml/dose3-6.0:=
+	dev-ml/extlib:=
+	~dev-ml/opam-client-${PV}:=
+	dev-ml/opam-file-format:=
+	dev-ml/re:="
+DEPEND="${RDEPEND}"
+
+# Cherry-picked from https://deb.debian.org/debian/pool/main/o/opam/opam_2.0.8-1.debian.tar.xz
+PATCHES=( "${FILESDIR}/debian-Port-to-Dose3-6.0.1.patch" )
+
+src_prepare() {
+	default
+
+	cat <<- EOF >> "${S}/dune"
+		(env
+		 (dev
+		  (flags (:standard -warn-error -3-9-33)))
+		 (release
+		  (flags (:standard -warn-error -3-9-33))))
+	EOF
+}
diff --git a/dev-ml/opam/opam-2.1.0.ebuild b/dev-ml/opam/opam-2.1.0.ebuild
index e882aefd038f..c123071f54ab 100644
--- a/dev-ml/opam/opam-2.1.0.ebuild
+++ b/dev-ml/opam/opam-2.1.0.ebuild
@@ -8,6 +8,7 @@ inherit dune
 DESCRIPTION="A source-based package manager for OCaml"
 HOMEPAGE="http://opam.ocaml.org/"
 SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/dev-ml/opam/opam-2.1.0-dose3-6.patch.xz"
 S="${WORKDIR}/opam-${PV/_/-}"
 
 LICENSE="LGPL-2.1-with-linking-exception"
@@ -25,8 +26,7 @@ RDEPEND="
 	dev-ml/re:="
 DEPEND="${RDEPEND}"
 
-# Cherry-picked from https://deb.debian.org/debian/pool/main/o/opam/opam_2.0.8-1.debian.tar.xz
-PATCHES=( "${FILESDIR}/debian-Port-to-Dose3-6.0.1.patch" )
+PATCHES=( "${WORKDIR}"/opam-2.1.0-dose3-6.patch )
 
 src_prepare() {
 	default
diff --git a/dev-ml/parsexp/Manifest b/dev-ml/parsexp/Manifest
index c444e991311e..871a29b96d9c 100644
--- a/dev-ml/parsexp/Manifest
+++ b/dev-ml/parsexp/Manifest
@@ -1,3 +1,5 @@
 DIST parsexp-0.14.0.tar.gz 48617 BLAKE2B eba36c17f08b59ed7601c4f9906e80de45e377d0134fdee30b5536c3d91af0cb45a1cdab90333498da8bf3fcf5e5bea16a8f734e7f1a92c9b865cd3136a668c2 SHA512 d9e9ea936dcf23d700e6ddd4153a2a96df6819094eaebe15d949c4569fa5125ab308af2c10f4ba2161610d8673eeb3928dd19c10a21974c140e4c89537a86575
-EBUILD parsexp-0.14.0.ebuild 466 BLAKE2B dff08580ce79deafaaf7d99149a07c0f3c5d3b8e7b59596b716af6ab95e31cffad0aeacc8a5739aa8655b6de62a12ba983ece9e650a45822daeea9b4ff53340d SHA512 24858538ec6fde8f7172a7564de4027688485ff54a9eba781a7fbda5dc26693116c4292c2ddf03153336e415158dc669defcc63e3c2efd4b86c7408901b177e4
+DIST parsexp-0.14.1.tar.gz 48617 BLAKE2B d491b8c28eb0a269985df107152b6239513fb9d59dc723c9692dd436883331ce23fdd714bc467b4fcdaba81baa2adb2421110e92fb5bd3f526437856f4edaa02 SHA512 c9d6a00dbe49272fa32ba3684249d5085482fe2024795391aa3605b21962e9d426535a46d7139b487332b86e05f042226dd1a8166d2a3cb9dcee9b4b06b81ab8
+EBUILD parsexp-0.14.0.ebuild 459 BLAKE2B 5dd52c6258dbe2468c62eca0b1d772ab918b27f2c4e4006398420e1df6748c071286b3fbd6887da9ee435c127ba72d10987ed4a8fdccaeb11261d9dec3f456ce SHA512 314891a056f7a279d681464296d3984f44c69602511fb4e3b77d682f64b6e5fabac678983b706a2e3ec796efe8899feb0d9be7bd6b06015a4d207d58a38f38ce
+EBUILD parsexp-0.14.1.ebuild 465 BLAKE2B ff208ddb76738d30053b4b7630877765c403cddce3626610542bb8264c599ba4cf24f8ea1fd81b8624967163cc464c86e390dc88b560230f1b7063282137069e SHA512 c0b888ca7e41918180566bfcbaf8c7e308ca45dd5a15148e0aad3302a33ee2f3a7e7d1b6863128980309c5b518066338e3bec195e199818b96f0b7d6bc65fcd2
 MISC metadata.xml 328 BLAKE2B 2223ef57e895aa54de9a3c2f29df0c228bcfe6b10b9e9f7524ef153f459e07cd8020d0f6d42fa7ccfde38d06773567bcc8864ab8961793cad9c1f4cfb5b935f1 SHA512 fafdaf40f0fd9876d984a7d0c9fb42d434c511f4428111459cb618ba0210f84eee960b7abb1f3b36ec446e2a3703e21429027e3534937fe074b11fef8de62b94
diff --git a/dev-ml/parsexp/parsexp-0.14.0.ebuild b/dev-ml/parsexp/parsexp-0.14.0.ebuild
index fef7fd77106b..f8584c55d192 100644
--- a/dev-ml/parsexp/parsexp-0.14.0.ebuild
+++ b/dev-ml/parsexp/parsexp-0.14.0.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="S-expression parsing library"
 HOMEPAGE="https://github.com/janestreet/parsexp"
 SRC_URI="https://github.com/janestreet/parsexp/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="Apache-2.0"
+LICENSE="MIT"
 SLOT="0/${PV}"
 KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt"
diff --git a/dev-ml/parsexp/parsexp-0.14.1.ebuild b/dev-ml/parsexp/parsexp-0.14.1.ebuild
new file mode 100644
index 000000000000..810e47fb94a5
--- /dev/null
+++ b/dev-ml/parsexp/parsexp-0.14.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="S-expression parsing library"
+HOMEPAGE="https://github.com/janestreet/parsexp"
+SRC_URI="https://github.com/janestreet/parsexp/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+RDEPEND="
+	dev-ml/sexplib0:=
+	dev-ml/base:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ml/pcre-ocaml/Manifest b/dev-ml/pcre-ocaml/Manifest
index 7982e05d585d..d8e169606155 100644
--- a/dev-ml/pcre-ocaml/Manifest
+++ b/dev-ml/pcre-ocaml/Manifest
@@ -1,3 +1,3 @@
 DIST pcre-ocaml-7.4.6.tbz 41027 BLAKE2B 1faecd96cb6f7af248e8ace7409a49131f5c654320f8ac432fd4aff602d0c4187733419e9cc73ca52cf0a3e5b725afa9357fe9ec191bf1ca42d4dc47a36e45b7 SHA512 a356c78dc19d3b3741d1fa0277c4fb0cb545f12499165526fae80a0ff8a7b1f1e6e5e916b16f8336bcec3661de811686b814fe4afc677965fec7a63d4fc53b1f
-EBUILD pcre-ocaml-7.4.6-r1.ebuild 717 BLAKE2B 0bd70c8f70604015568c5a5d7a9ba819836874561b8e3d0f9574849e03b4d667f2a5aa25b233fb3958a8b317f8be91ddb200c1a5ff6bb23d23dc13ed0591073b SHA512 f8bf6b2ef96cd1c7c528cf2939cc7e4a5d6b601f5726d0f8109e71fb066a100463207ac33903fa8699b1d3103a1099155b47c1de40f82108ac4269d32623c3d2
+EBUILD pcre-ocaml-7.4.6-r2.ebuild 716 BLAKE2B 6c1dd764659a12b8c05d17de6b687123e0b64e5f11e1399b093c7f7bd32138299ae31a14452382e8810bae72d9f8139b0e5105f98e11a78028a308def17557ec SHA512 c778e403a5422152fe226add191a7be4b7fdc2e90512b79f41aa90adf4af4fac9a10d62403b909db8856056a802859624a1c04e41eb4d58fca8fc88f30a4f15e
 MISC metadata.xml 387 BLAKE2B 3cc3f72757575c7ef774afb844b7ade41a0fc8e5679e0679143f8a0e36c55b26c056962075acccd91bdf77b16a2068601d48ee21573ed9e6e9e162a1fd46cdbb SHA512 f3c7c2cbaf4fab907509c97d3638718604905da35896ffbd14772e03ffdd45b08faacb0a0efe93cef4b27875fa0c27712a6f3c1e0d75cf6cc6416d9378573c50
diff --git a/dev-ml/pcre-ocaml/pcre-ocaml-7.4.6-r1.ebuild b/dev-ml/pcre-ocaml/pcre-ocaml-7.4.6-r2.ebuild
index a5f56117f2dd..7bc4861b3f59 100644
--- a/dev-ml/pcre-ocaml/pcre-ocaml-7.4.6-r1.ebuild
+++ b/dev-ml/pcre-ocaml/pcre-ocaml-7.4.6-r2.ebuild
@@ -16,11 +16,9 @@ SLOT="0/${PV}"
 KEYWORDS="amd64 ~arm ~arm64 ppc x86"
 
 BDEPEND="dev-ml/dune-configurator"
-RDEPEND=">=dev-libs/libpcre-4.5"
-DEPEND="
-	${RDEPEND}
-	dev-ml/stdio
-"
+RDEPEND=">=dev-libs/libpcre-4.5
+	dev-ml/stdio:="
+DEPEND="${RDEPEND}"
 
 src_install() {
 	dune_src_install pcre
diff --git a/dev-ml/ppx_bin_prot/Manifest b/dev-ml/ppx_bin_prot/Manifest
index cfa5ac4a47ba..d3e73100a7da 100644
--- a/dev-ml/ppx_bin_prot/Manifest
+++ b/dev-ml/ppx_bin_prot/Manifest
@@ -1,3 +1,3 @@
 DIST ppx_bin_prot-0.14.0.tar.gz 36642 BLAKE2B 6a80f574fad5e3ba2bb1adad8e6af86a9bd463ab7ed8976901234694a56f9e17c04ccc74f0bd4a18c75f1a4ccd81848218078bb387f8ff2f5df337c5f2492226 SHA512 7d61624d18fd76daed5a5d60d16ac0a3fd658ef650ee6ae4b65346e96d1718a044deb3ca6fbb63c69176505f64d0d1b6becd8419061cfb69466d45e16964329b
-EBUILD ppx_bin_prot-0.14.0.ebuild 727 BLAKE2B 6a007fec49c085d047c40bb0f4686a3236203ab7ff6e70beb4da87989ccc3232db4dae34dc293649608f1c82fe2b0db1baf4ac5f90bd05e65154da9c6f2c2ae9 SHA512 53c68ffd99373551bcb5d5947367a485c1a0637733294c7b527a2ba9eec164b1ff46b669f2c919891d113c3289b1b5711fed44000640b0f3b289b71fe75e580c
+EBUILD ppx_bin_prot-0.14.0.ebuild 706 BLAKE2B 2e00c6cb87370d337cd8955d5dcac730feada8deb1888fb7d10c60d69f89b863ae4b779093e86c5f504d12217a5f2b2a1a2606a9942ec0159d9cee33502ef797 SHA512 cb72b71d876648ae42d64c760e2dbd9f4fa1e6427e5df69a70900197f132b60f8f9e1e9606bfbb8cc943473fc7113ef35df1048fb8eed2734e168400ba445f61
 MISC metadata.xml 333 BLAKE2B f75b4906a1255eb440784d36003b9b475a52633b442f4cd01a22f5841be1e87fcb73eee4d20d2652b2f994e572c0f0b78f05bcc5e5df425cf4e5bf67bb9620a1 SHA512 14c143cc4d5b3a11cb1acc4aedd419d2cb1e418543d4d889fdc82cbd696e7fe4e7a2402229d05602aee402eb51869b9e1d236c35a5da30e955c86598b59d0027
diff --git a/dev-ml/ppx_bin_prot/ppx_bin_prot-0.14.0.ebuild b/dev-ml/ppx_bin_prot/ppx_bin_prot-0.14.0.ebuild
index 5c074d9d55ca..d2f36bcbc01f 100644
--- a/dev-ml/ppx_bin_prot/ppx_bin_prot-0.14.0.ebuild
+++ b/dev-ml/ppx_bin_prot/ppx_bin_prot-0.14.0.ebuild
@@ -15,17 +15,16 @@ KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
-DEPEND="
+RDEPEND="
 	>=dev-ml/base-0.14.0:=
 	dev-ml/findlib:=
 	>=dev-ml/bin_prot-0.14.0:=
 	>=dev-ml/ppx_here-0.14.0:=
 	>=dev-ml/ppxlib-0.18.0:=
-		>=dev-ml/ocaml-migrate-parsetree-2.0.0:=
-			dev-ml/cinaps:=
+	>=dev-ml/ocaml-migrate-parsetree-2.0.0:=
+	dev-ml/cinaps:=
 	"
-RDEPEND="${DEPEND}"
-DEPEND="${DEPEND}
+DEPEND="${RDEPEND}
 	test? (
 		dev-ml/ppx_jane
 	)"
diff --git a/dev-ml/ppx_expect/Manifest b/dev-ml/ppx_expect/Manifest
index c070bc24994b..6505a903dece 100644
--- a/dev-ml/ppx_expect/Manifest
+++ b/dev-ml/ppx_expect/Manifest
@@ -1,6 +1,6 @@
 AUX ppx_expect-0.14.0-ppxlib-0.18.0.patch 1641 BLAKE2B ea0857a3681c6bce3a39191904a2223d899e9cfb362c9961e897c613dfa8f5879837cc80120653db88bd509c16b474079cf9c8ddfce3e6b79b12ddb284dab1e6 SHA512 11ab0e5d9a97d1a5749ba728c197c4a56905b21b7628d6a2c3594e46960b07bf6d9eb50d25ffc7bec77ea1e966d5016d8a20c5608f09817c73e06021c11ae372
 DIST ppx_expect-0.14.0.tar.gz 45661 BLAKE2B 0cba3840743d45f0f11936f090319aab3237c7a14389eb6d035a3b7cdac91e0b169c3ed84407e1bb01a00738bf97b62dba313965e93a2177388666764fe5854b SHA512 7de5d84640d16101d38140b5f621301c9935e3161a7c7d978373940be92fa7f14cad429e79eec294a20d1f379e969cf3c25d15810f1a4d3ad1bb8ba0eb7d7109
 DIST ppx_expect-0.14.1.tar.gz 45699 BLAKE2B b52d579d92156344ff44d30c88603840eb7d6a0d346de49fcbc01ef16fe3c33e664486de4cb2d09f74e853e39b9a01778e7e0f489497fdd34fc9582d895a0d3b SHA512 fd98e79d5b3bb935b2a4077a07894c159b48e142268c2e30ebff2cbfecc92266b454be69f5080b315eefa9184372e5e5248bd8a3b2b9d6cad59e2d517c94bd02
-EBUILD ppx_expect-0.14.0.ebuild 869 BLAKE2B 458e3ed359a5a9ca0bb597e03ceed5d6310713de23336b7b3537246218b5687100745aa0c3c55ff7b1b7d931b802419736ac0d93ff9216fd0d36d64bc28f6b9f SHA512 bd12f065567069707760be84f93a850098474ee979f606ee5c8feabb7c99627e409687879c725bcc14959cca602c04fadb55dbd69de9cc46d20c13d853e7c44c
-EBUILD ppx_expect-0.14.1.ebuild 819 BLAKE2B 71169c55952e0e96044296863463f225b4571a48b54f9bf69fbf19f822b6804a447d44538cd2deb8fef2a98c8535c6b0a6275514215d945ec5a528acb9a37b1e SHA512 37791ed2c19d3deb8f6749dddad265cf8da83e20646ae08ab5cc925f8eba215a787cbf4c4ea04b49f877024672379c4398fa589a4595de80223de56b6195775d
+EBUILD ppx_expect-0.14.0.ebuild 850 BLAKE2B 68be94026fc1f5e952b5cfcdd582374e241ccb76861bba8731b61135ee5972341bf9316de21bdd1b380484d570c28f72c2a46a5f7b650daa6f8d913438679283 SHA512 76dd1e4257e202793757177553c6d0cd6dd292f9c7f909d7a29480b6a480df4310f4005060402287526377cb095cf8b2867c4ad8ddeb1a979b92afde67e2847a
+EBUILD ppx_expect-0.14.1.ebuild 798 BLAKE2B 1760833220b258af77f5aa4a544770b7536c49e15815a232d566c070dbd4124d947917a015894e116b42f536a6894bd747421770e1a6c282e3e895491cd18d30 SHA512 1baca937165a63a1a1dff1b0b1085d010c292d4c07301cfa64ca46cf636edf2b8432bb269c77e2d092c3f0d29add31498a019f11b7dbf32346caea469fbb84ce
 MISC metadata.xml 424 BLAKE2B aa0469c6e2e68d01d80a467c0904f683f71612dfaa586430fc21a7dbe4284951b12f12e518491a9c14886b5d8b915573875a733f946a44b8713b82bbc05bd08b SHA512 de95b09128ed6c02327103f1ba2cf58b079e7e5be40ceaed1e199fff54a6e78a8a1c96b2cc6a4c99638f226ef942f5633c47885e005d878e0f9060e091d62109
diff --git a/dev-ml/ppx_expect/ppx_expect-0.14.0.ebuild b/dev-ml/ppx_expect/ppx_expect-0.14.0.ebuild
index b055cba214fa..6fd1fa74a288 100644
--- a/dev-ml/ppx_expect/ppx_expect-0.14.0.ebuild
+++ b/dev-ml/ppx_expect/ppx_expect-0.14.0.ebuild
@@ -15,23 +15,23 @@ KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
-DEPEND="
+RDEPEND="
 	>=dev-ml/base-0.14.0:=
 	>=dev-ml/ppx_here-0.14.0:=
 	>=dev-ml/ppx_inline_test-0.14.1:=
 	>=dev-ml/stdio-0.14.0:=
 	>=dev-ml/ppxlib-0.18.0:=
-		>=dev-ml/ocaml-compiler-libs-0.11.0:=
-		>=dev-ml/ocaml-migrate-parsetree-2.0.0:=
-			dev-ml/cinaps:=
+	>=dev-ml/ocaml-compiler-libs-0.11.0:=
+	>=dev-ml/ocaml-migrate-parsetree-2.0.0:=
+	dev-ml/cinaps:=
 	dev-ml/re:=
 "
-RDEPEND="${DEPEND}"
-DEPEND="${DEPEND}
+DEPEND="${RDEPEND}
 	test? (
 		dev-ml/ppx_jane
 	)"
+
 # https://bugs.gentoo.org/749291#c2
-RESTRICT=test
+RESTRICT="test"
 
 PATCHES=( "${FILESDIR}"/${P}-ppxlib-0.18.0.patch )
diff --git a/dev-ml/ppx_expect/ppx_expect-0.14.1.ebuild b/dev-ml/ppx_expect/ppx_expect-0.14.1.ebuild
index 9d7682d713fc..5463fa2ad199 100644
--- a/dev-ml/ppx_expect/ppx_expect-0.14.1.ebuild
+++ b/dev-ml/ppx_expect/ppx_expect-0.14.1.ebuild
@@ -11,11 +11,11 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
-DEPEND="
+RDEPEND="
 	>=dev-ml/base-0.14.0:=
 	>=dev-ml/ppx_here-0.14.0:=
 	>=dev-ml/ppx_inline_test-0.14.1:=
@@ -26,10 +26,10 @@ DEPEND="
 	dev-ml/cinaps:=
 	dev-ml/re:=
 "
-RDEPEND="${DEPEND}"
-DEPEND="${DEPEND}
+DEPEND="${RDEPEND}
 	test? (
 		dev-ml/ppx_jane
 	)"
+
 # https://bugs.gentoo.org/749291#c2
-RESTRICT=test
+RESTRICT="test"
diff --git a/dev-ml/ppx_optcomp/Manifest b/dev-ml/ppx_optcomp/Manifest
index f596387a2501..2bb89f0a919a 100644
--- a/dev-ml/ppx_optcomp/Manifest
+++ b/dev-ml/ppx_optcomp/Manifest
@@ -2,5 +2,5 @@ AUX ppx_optcomp-0.14.0-ppxlib-0.18.0.patch 2581 BLAKE2B bf7f888acc462481e03a2d09
 DIST ppx_optcomp-0.14.0.tar.gz 16583 BLAKE2B 9b139708e02501245d5440a862324fe0191c9c96772e6599ed474a734263c4d2c0fa08fff666abd2efb218ec03a2b9b47c5ef6480d53a8d0f280550b741ac39a SHA512 e86b108d805500cbd7be628f41436ec8de0e8622d4218631d01bf73b0e70da0a057b8531465206baa9b8851ce9c22c5cd53921fccfae352ee46527d69964dc44
 DIST ppx_optcomp-0.14.3.tar.gz 16749 BLAKE2B 3c6dd2b5ac0a10e3d95c6a734ee09b0bef8af6d949c9f31150f1f8ac14ec72bb06455c3bf0c025bc99b939fa86b0d730abd8aefcdbd3998bfc16eef7a6a766bd SHA512 73b53dece639aebe20a8c9eaec50f6f491ac8163d96ceab66169d99f9bb50ed9c40c38731cd6e8543dae97c3a45650733d622e5bd4a2db812000c4694c823157
 EBUILD ppx_optcomp-0.14.0.ebuild 688 BLAKE2B 433e1f96b3758e705bf0896c8b61c88a6a17d6d5b6298beba3e52ac72816374343899fed09b3dababc26f862251267455df400606917b10bd406d31b8dc00f61 SHA512 b393ee83145a552f568d8c7302dd878d02ace806fb158ff7b78aa489500641d0152919ae937f9cddc2912a87f793db7163d186efe5fb4c1a31858b273eadc642
-EBUILD ppx_optcomp-0.14.3.ebuild 638 BLAKE2B c14194aadc3ff5c85cd358a251ecac2ab3399fb6d0179eecf43347d4cb67b1802cb83452df9bccf2a71e7423c63022f1b8dd28258bbc1dbee1570825b0efbbd8 SHA512 5cfa4f219cf194985e599a021b27c31333e4f18f7aca3c705bcafe631f1af09463b81273c88b57ca585da9224e80f8523d9b4a42ca7c8f4ec1436ac9207eb042
+EBUILD ppx_optcomp-0.14.3.ebuild 632 BLAKE2B b0a51da6481715de3541e695e3ba7b8a4c4661272eb207738b3d78705a14d5a7ae0a3ae63f56de5ca7d77bb0de1761ccf94498fbfa5553049862a5caab1c999c SHA512 886dea540aedd28c92576f71a765e19ba580f1fb1a7bdc8eee84afe232db10b861bc6d995d2656ab7f3bf4f999ec350abc623bb6239fc201fc22fc1772e9d0d5
 MISC metadata.xml 332 BLAKE2B b14db5b16fb10c0e04248ce53e7506ad7bbffb9d4a41ea26821a680d7166e66d0060e3bb117304e585fc5dc6fcdc30d245a28edeeb3535d1e6ae04f2147a361b SHA512 791b64320d146e5fd0e46990e01123069243119b1229b9446d9fd7e9dbc6976c9f93cdfc63884ff22fcc35de64c944e3822ec9fccb88bac7eae97e6e0b368bb8
diff --git a/dev-ml/ppx_optcomp/ppx_optcomp-0.14.3.ebuild b/dev-ml/ppx_optcomp/ppx_optcomp-0.14.3.ebuild
index d01ce62cd244..a55939544f16 100644
--- a/dev-ml/ppx_optcomp/ppx_optcomp-0.14.3.ebuild
+++ b/dev-ml/ppx_optcomp/ppx_optcomp-0.14.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/ppx_optcomp/archive/v${PV}.tar.gz -> ${P}
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt"
 
 DEPEND="
diff --git a/dev-ml/ppx_sexp_conv/Manifest b/dev-ml/ppx_sexp_conv/Manifest
index a77fd0cbfbd6..d8341d3ec032 100644
--- a/dev-ml/ppx_sexp_conv/Manifest
+++ b/dev-ml/ppx_sexp_conv/Manifest
@@ -3,6 +3,6 @@ DIST ppx_sexp_conv-0.14.1.tar.gz 49857 BLAKE2B ede55963d995917bd0c4a1464b58f8584
 DIST ppx_sexp_conv-0.14.2.tar.gz 49876 BLAKE2B 32109eb6300894156f91721a1c74e94803106cf8a9a9326bf815d3094e166ce34b19f3d28b770d381ca3ce32227a80b15baa61e6f9c2d0082c47b87678c0f239 SHA512 d0121770030da142fd559b5f8d52d4a029d032c5ac9c79bf235190e0aaff58e5cce0a5ca5f198ca8a112e0970ca27ab18d4f201376ca6b799b91d71deb915f25
 DIST ppx_sexp_conv-0.14.3.tar.gz 49886 BLAKE2B 9fda18267995cdd8efb9dafb069df6a51106a800b263f4c94129957a3f23d2bee72f39382623a320cb09ea13c255000ecf9670c19ccf49d55627c02bb0912224 SHA512 7de81d64e7eeb4d6097134606411830dd066f94222ed320a9c32752116961806ccf807f802e07c522c32aa6f7c20bb901804612a0ffc1b14807903c92acb2f44
 EBUILD ppx_sexp_conv-0.14.1.ebuild 722 BLAKE2B 56e8596dd6063a6ff69d82c8ca862357d25034add0beb42c4d5e044b0cc95de73c5cc93ceb4c8999df1a1eb3e0f8c11f434f4d1f1cbce157a476fc4c5491bc7d SHA512 569f6c2990f5197e1298ec369aab259143be88b267a0136b3702497fb36d00bebe761f0c443a528981dfd5b2239332d066d86945c1e29307b65be83466e9087b
-EBUILD ppx_sexp_conv-0.14.2.ebuild 706 BLAKE2B 15aaae9c03b97fa49f8d8161ae9f524b21d6ecc783688362bf782a8a71d8a4962e1cfa355b1b690fe17818bca9a185c2c2f2c28a247884b8e741cbdb1338164b SHA512 78c833ca8d6c97feea80c236f01efafa9f29224a1db57411182b04b2a1f6109d4c149e32af34bed31cf6e3b3d16431af8c2c4a35f2b8de37e648e402171148b2
-EBUILD ppx_sexp_conv-0.14.3.ebuild 686 BLAKE2B 791c5c21e22e2369d8a2020131e683606edd0fec0e3e37254b2e94cbe69f3c0e344d895d1c0d04ecdf573a429a992af48ff155b0139fa6b23adf530f9904db96 SHA512 74851675ca6d1c0a691588c415a7eb6ec69f7fe9394e283f3d5c98142cb1a4b33f2b493b402ded4353ecb2b18912b797ee61ca6be03e43ec4aa489c85a45871c
+EBUILD ppx_sexp_conv-0.14.2-r1.ebuild 705 BLAKE2B 882974b6e2bdf2d7cb30f9d2a4bf4caa327a6ee160b8a84eccdf504e0c5e25117158853a0a5d0f10369636d34b7688f9b9ec6b20abaa2090d5718e66a54f6866 SHA512 9b32b1725bc3eefc70ca169cc46b6d3b9acf1365370b5a75c287e7c83b9b81acc9a886465d2483c595a28fb401688d93911f07a1d4931e6c17619c23cb903023
+EBUILD ppx_sexp_conv-0.14.3.ebuild 684 BLAKE2B 78b47f8f3c746eb69b424d1ae1a144ec8c18589cfc2773cfc409c4bbbe3287ede3a7d99c804f953f7d7d3accf25fda3186a3f33aa00386aa9635b07610f8b002 SHA512 cd86bf999fc678b9359301e6fa6245688f53a620a2fe2590553b5f856c2ab47940a58c3033f29450344f2b950e8cade4ff9fc2cad3d761d12c7095194652f394
 MISC metadata.xml 427 BLAKE2B 40cf563b5bf060e3d241038655ac6f7fa0d96e0d3aafd8bbe27cf77e5a997129dcecfb9cc907734a5fdadd720f848807aa60ae4bdf6a924cbce3b7277d605882 SHA512 e29de52e463fa9c21b92a52a6454f2cadc9bd6677d549c86ee43383a88af9ee43134ecca2379088a40f0e89aa7d98b552480e8dc2cd8042f9a8e5453e8ab1d6d
diff --git a/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.14.2.ebuild b/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.14.2-r1.ebuild
index 6f07d06be7e8..7cdc3f5e627e 100644
--- a/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.14.2.ebuild
+++ b/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.14.2-r1.ebuild
@@ -19,7 +19,7 @@ DEPEND="
 	>=dev-ml/base-0.14.0:=
 	dev-ml/findlib:=
 	>=dev-ml/ppxlib-0.18.0:=
-	<=dev-ml/ppxlib-0.20.0:=
+	<dev-ml/ppxlib-0.21.0:=
 	>=dev-ml/ocaml-compiler-libs-0.11.0:=
 	>=dev-ml/ocaml-migrate-parsetree-2.0.0:=
 	dev-ml/cinaps:=
diff --git a/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.14.3.ebuild b/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.14.3.ebuild
index 4c7a9470da50..e757ef8332b3 100644
--- a/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.14.3.ebuild
+++ b/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.14.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/ppx_sexp_conv/archive/v${PV}.tar.gz -> ${
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 IUSE="+ocamlopt"
 
 # Upper bound on ppxlib for bug #769536
diff --git a/dev-ml/ppx_tools/Manifest b/dev-ml/ppx_tools/Manifest
index c75b6917230d..5c83e42cdff3 100644
--- a/dev-ml/ppx_tools/Manifest
+++ b/dev-ml/ppx_tools/Manifest
@@ -2,6 +2,6 @@ DIST ppx_tools-6.2.tar.gz 46150 BLAKE2B f8af2a1eee81d5a1e73ac606ab79d285c8c22653
 DIST ppx_tools-6.3.tar.gz 18811 BLAKE2B b1389dbe0c6fd855cafc8d64a9db550866317172909c2731f01acd412c6f8147f07e19a82d527187d0b211fca9eb2f2ad63bb53e8f375b0b8107c4e723710000 SHA512 6a88f6f877f49ea8736aeca60673a19c52d5104ad9e2a3e56db3f71cd557d39df9c709c4e678ccf10263ff1f3e0504f4676227bd05ceba1e0294453a988a736c
 DIST ppx_tools-6.4.tar.gz 19051 BLAKE2B dcb3e5a4ca5dd6243cae013739b93c6fe100ca21ad56c46e284255977f4e6d4263ef8d937ed672939e5b31bbe0904dcb1d71105f49385ad5d43404b19a9fe2c6 SHA512 514aa283f6bee11bf257abec98a751c656db63203caa4caee5ce606bcdee75891441a794b0bac22e2ff2e5d2760cd39ffaa2fce6bb118155daf05175917e6e7c
 EBUILD ppx_tools-6.2.ebuild 505 BLAKE2B 690649eab5fc48940936171e98bcf51edb1c0dafeebfe378a88b2c646f8df488270baed8845d480dfb47523819d6bc02daec4f9fd7265c4899cdd1bb4ffb5749 SHA512 c4cab13bb3694fad4c39300d31a9a81487f873eb45e0af9b243c891f646a505a2c33641cf25ddf084ae295f6577700cec8fcf478dce3c7f1b5391dee90d50b45
-EBUILD ppx_tools-6.3.ebuild 469 BLAKE2B b0c45a83419c6dbfb95d0585be01fccaf1e1af16278f1faabe7a00ec9e0e40d31335211ffdacc062ec05c251e39b33f1754364beb538d1afed6ca8c9ef55e933 SHA512 d483bf1fe95c97d0d23677d70d348fa5490e49be5bc7819696e0ae6a47a70cbfb116c5ab08dd3e8e058285ef73793793fe0af92e400b24c0063ff299d972c0b3
-EBUILD ppx_tools-6.4.ebuild 471 BLAKE2B 8eb9d070efc1b625c6f1d5e1b80babe69018e5626e1a45d37c0233f01b526707e90fae71501a227e16f3eda16ed22010ebafbf2c6fcd75df860cd6f80190786c SHA512 0cbc257b617cfd5383fdb42b130233993dc201836ea2dd29556d60e2915456b0d84bf34c5eb26f8e433af4e9ac7bd4c34560ba76e5eacffd27a9046aafca1a31
+EBUILD ppx_tools-6.3.ebuild 492 BLAKE2B 684cd8eea3e558bc8c221580a31482ab14f64b03fbd10f4359e167f2591233b1d2f30e43ca89b9293f6fff8557f08ac35910cdd1434eab10d7adc0b3d94302fa SHA512 ef50e708fcbea8f4999bb0239c4ba1260ac5c222998629a0aea6efa248c345fd21946971d6a6e668108d9a76eeb657869727f9b4a775fe01bd81c4ddeaa1e235
+EBUILD ppx_tools-6.4.ebuild 494 BLAKE2B 4f0a7f1842f10abe06534e02edde8169d54415053881711938a22463bd0e8b9da646ff314861e9cf691bded3d1e43d89982f70fda77d9174c5a01e0a1cc08c73 SHA512 5b2032b06cd21f402f14f28991979be50045d86b75f28d93a777b970cff20c5d80e41b9bdc0f0e37ed5b9f2540ba3b54dc94424e628029dddf5dea249121874c
 MISC metadata.xml 424 BLAKE2B ef86805d6a907c1d81fa71dd3599c66bbe5f6f2275b17c8f43998276d3c99329d96754717bfe935a56ed50fdf65f9e688a01832220253bc2d5909c0717661ff9 SHA512 5dc85ce4085784bda6fe0b3b601858f784c542c26444eb92068328324898d5835eba450ef723d3eb1317f1a0eae82a1e7a430c609bf57162b1c2ac5ea142c501
diff --git a/dev-ml/ppx_tools/ppx_tools-6.3.ebuild b/dev-ml/ppx_tools/ppx_tools-6.3.ebuild
index b8a168bdfde7..fa8079b62de1 100644
--- a/dev-ml/ppx_tools/ppx_tools-6.3.ebuild
+++ b/dev-ml/ppx_tools/ppx_tools-6.3.ebuild
@@ -15,3 +15,5 @@ LICENSE="MIT"
 SLOT="0/${PV}"
 KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 IUSE="+ocamlopt"
+
+BDEPEND="dev-ml/cppo"
diff --git a/dev-ml/ppx_tools/ppx_tools-6.4.ebuild b/dev-ml/ppx_tools/ppx_tools-6.4.ebuild
index 1d025b5dacda..b8c31373448b 100644
--- a/dev-ml/ppx_tools/ppx_tools-6.4.ebuild
+++ b/dev-ml/ppx_tools/ppx_tools-6.4.ebuild
@@ -15,3 +15,5 @@ LICENSE="MIT"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="+ocamlopt"
+
+BDEPEND="dev-ml/cppo"
diff --git a/dev-ml/ppx_typerep_conv/Manifest b/dev-ml/ppx_typerep_conv/Manifest
index ea054a3668d8..71dbbd46248f 100644
--- a/dev-ml/ppx_typerep_conv/Manifest
+++ b/dev-ml/ppx_typerep_conv/Manifest
@@ -1,5 +1,5 @@
 DIST ppx_typerep_conv-0.14.1.tar.gz 9453 BLAKE2B 4acafdd51df0659746697283aa3240f1b1403e4e9f9b5fafa6c4b09f4c76f6ac645e2ccab53cba7371b5b004edba38d24198334d10b295d90c8ba5814a602a23 SHA512 6e32f6c2cf6c370fcb8d3b341dbd797c3b7c2557c8604253d744b266c9a3f4984e62ffe6ec5717044378f81e5b78e7f206a7f0f4b43c0dda97a4e7ece745d26d
 DIST ppx_typerep_conv-0.14.2.tar.gz 9474 BLAKE2B 7a7ff6669d9af2ced905e5b104058d26ffe06e3784af366a1a4ce753337eeb87c9bfe02d1a6fddaac6c387105d2583194cbd06b915eb35d16e06b1d4ab977e2f SHA512 9372f13cb3f62b3732af4f8ddc00314dd71869bab5599ae0a112d32669de300346781b7fcd2bd649ccedfde54fcd86fb6186812eeb528858048bcd9d5ad443dd
-EBUILD ppx_typerep_conv-0.14.1.ebuild 654 BLAKE2B 2bb653c4348a9f83308c62bcb518e5db1301fb08e24a88edb7d12a7e79881b514c81e14f64187cb91984e6b67fdca3c2e0c490c7ca78255ad609c5cc69f13944 SHA512 2eeaccc68a922e24e012917bce9e53db806942e9f2583789f078295acd6914e28bed2b08fb43df97de01395ac11d42244ad59d3783fd3eb75333819d6af5c923
-EBUILD ppx_typerep_conv-0.14.2.ebuild 634 BLAKE2B ec2e5787b889b7a9bf9eafe47b54224ebd6921b23b4a3099a56d965817375b478c8b54c2a55cdc96e50cb31d2e880ba26e7275ea085389472cb14b101366cb5d SHA512 68f4f58a79b0987bb492ff4336b6111a1e5bc145c7ea507744c82fcc94310c9bfb725c287f302994cfa644f2001af526f3c88a385fcf8e9eccc2dbf4822d61f7
+EBUILD ppx_typerep_conv-0.14.1-r1.ebuild 653 BLAKE2B f47242e7d5b9f18641a6a8748ec7ec12e0f716260ec4f61f7ffd841863194f554f796923b6a51e5dce674247487a764aef9f782c8132cc54c93db409d0786712 SHA512 46d2b4010e1d346c6450ee79ff49e5c9898d811909637a8b12666603622267c6b34719410216caa25356ec460377bc9547b762da60391c135b5e95936a44b9b1
+EBUILD ppx_typerep_conv-0.14.2.ebuild 632 BLAKE2B 209be5c997580b564c24db6541d4812f5c72e645dcf5cf5b10117d468dbfff899816652d66e44fc5c9111ce1623094db0e90902cb13d6c1e0bce3a4f4b6a5e77 SHA512 47f05f5127ecd667d63617a6f09e430e6902f57b1332ac6069d4e95ada3b2bb27c8f5f6d20390f7746d3a91f876cd7420df94aec0528b8d25124691224dad476
 MISC metadata.xml 430 BLAKE2B 1f8c9b9c75af8dde9e6180ce99665d6504abf4d86eda54e7104ba92c69bfd32d95ba21aa8292aa038d6827c5f73fc4e2cd6b3294ba6984b5931f5e1d29e3d2c7 SHA512 0f0f1ae7a2cecd2eb6544a8219bfd19d8e5ac638d68753ab64b34f8759e1a71d51ee9a74dc7e28b37d8ff749a131c5f701aa7ec18644aa65d99df5a3cac73d3f
diff --git a/dev-ml/ppx_typerep_conv/ppx_typerep_conv-0.14.1.ebuild b/dev-ml/ppx_typerep_conv/ppx_typerep_conv-0.14.1-r1.ebuild
index 35c02ef0a8cb..d864e10d34aa 100644
--- a/dev-ml/ppx_typerep_conv/ppx_typerep_conv-0.14.1.ebuild
+++ b/dev-ml/ppx_typerep_conv/ppx_typerep_conv-0.14.1-r1.ebuild
@@ -18,7 +18,7 @@ DEPEND="
 	>=dev-ml/base-0.14.0:=
 	>=dev-ml/typerep-0.14.0:=
 	>=dev-ml/ppxlib-0.18.0:=
-	<=dev-ml/ppxlib-0.20.0:=
+	<dev-ml/ppxlib-0.21.0:=
 	>=dev-ml/ocaml-compiler-libs-0.11.0:=
 	>=dev-ml/ocaml-migrate-parsetree-2.0.0:=
 	dev-ml/cinaps:=
diff --git a/dev-ml/ppx_typerep_conv/ppx_typerep_conv-0.14.2.ebuild b/dev-ml/ppx_typerep_conv/ppx_typerep_conv-0.14.2.ebuild
index d7592ebf551d..33347b97f969 100644
--- a/dev-ml/ppx_typerep_conv/ppx_typerep_conv-0.14.2.ebuild
+++ b/dev-ml/ppx_typerep_conv/ppx_typerep_conv-0.14.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 IUSE="+ocamlopt"
 
 DEPEND="
diff --git a/dev-ml/ppxlib/Manifest b/dev-ml/ppxlib/Manifest
index b271fcca81ce..7e3d1e4e0629 100644
--- a/dev-ml/ppxlib/Manifest
+++ b/dev-ml/ppxlib/Manifest
@@ -5,10 +5,10 @@ DIST ppxlib-0.21.0.tar.gz 201905 BLAKE2B f7a7b69ab07b2a5dce542877989fb4ca820acdd
 DIST ppxlib-0.22.0.tar.gz 202241 BLAKE2B 6b18ceb23e248eb2b4faed66ba0ea1cbee36df61cee9458fc0fd7057eff433340cb602a429c3f100ee054da06d9de20eca44e5ecc4ba98c888cfec2c83097151 SHA512 11442120c24bf60d9de90c9a325de9e5d87d87ba08d8e4cd216a3434f422c62427aa4214909b80646db638423ea35dff4280d5a70cf51bdfadc0a97745c32d41
 DIST ppxlib-0.22.2.tar.gz 202895 BLAKE2B 41d2c2e698846e5dfeb4158966b65dd29b253645b0286d0eab5a9dfb0e684b8b43f17a32b23023198d2c4e50e836705d2c965ea74ef337c5b0cf6aecd6fa4167 SHA512 3a83693551f11965b219a9caa4eaffbf358ea1311e05a38bfd531b8ad225d6571d86db7282e1d5bdc09775f2ba47791c03351402720cf5c2adefc52926d498e4
 DIST ppxlib-0.23.0.tar.gz 364308 BLAKE2B b1cc622eb5e01c455da437365053fd32a00d33007520cf28536e1f45c142aa0a9083da614110c1096fd3f8326453eb037a8c0054e00e17a813f99f3d8efde5d7 SHA512 9d6692ec4247031f26aed3bdc59808a5f929c34dbac3515a8b2a61c59ec118f0e90d12948d22aea40e9f01b1ed782e9dfa5b0263314b967217b2ac4006446c53
-EBUILD ppxlib-0.18.0.ebuild 944 BLAKE2B b99d31790fa17ba7f143859e2ec4cfdcc6a6e879c161e34f5996a5eb881d63889f69a4ac65d1412582722c4e4f1c784ee4ecdb823edc55a065bb9067787fe1ed SHA512 7455d8e04281bd708968d5f58d0d4a09032305a25db0cda77643ce4962c367a85ebaa5c48785441f842c829b0c93d858b31a9fe4e11560892f447dbdc098f263
-EBUILD ppxlib-0.20.0.ebuild 901 BLAKE2B b57d590e48284b9649369eeb22d9375df37f67731f831eccb84e7e725b8fe6089848880ff290dfde59313808528796da4738a3d5adbfebc962acd3d5c0742f4c SHA512 aa83ca0db89d6c1de32ce271e357f5d8b8a1a60feaccff566ae8528a1ec3db49bcab9204731cfe7e19ff21915565a89a8ed5bff02c81201b41912b83e0ca9815
-EBUILD ppxlib-0.21.0-r2.ebuild 1112 BLAKE2B 2483fe8e618d609243789a36723f8b4529d0838c9e4e79ae1e88fbe6852642779a6e759b4a5dafce84d00cc7e28b3505786cd40736b31c30eb8f75ea19ffea42 SHA512 678061b8c983ac71c545448a6e058d4f7ae2cb30534bc51b40bd08ee6bdc7e9fe137ca93eb26e3f2457a22c9e828693cd1fd83b80eb725c6ac2dc30eda5e0634
-EBUILD ppxlib-0.22.0-r2.ebuild 1143 BLAKE2B c71e6f6736f0e1edd8116827779a24f3ab0050e6207e5bd2cc192d5d4106a60a578d08a2de55279baeb2f0aae77fd675bc3f3818c449cb9bf72b3b727d863bed SHA512 4d56a68e5e0dac526b2e2ee8e470755af03edc6c7ddf084aa0c7718802ec4f56472eff28931840ed480feb242fb814e3f1e76163e7b684bffc29c36cf934a8ac
-EBUILD ppxlib-0.22.2-r1.ebuild 1143 BLAKE2B a6986fa8ad936d5ff6247ced664d094c818bde608a53c083f99885419a3a61e4e63a6b3bbdf2be2842f1402de2982d4e25ee1e90df1c4d39a93b607d7490035e SHA512 8f908a7b0a5fdecef965078984a4179e7c662b7572d0f00ef274568ca61cd650fb9f6f25e742433091b7595b20cc4a0dd5c277d037a4cdf50bfff8a1fa55d6ee
-EBUILD ppxlib-0.23.0.ebuild 1010 BLAKE2B 9fb76e9323c8b323536abe9cd27221e5ec4a8667365fde8f4e74e0cf0b9cc9add952c1ab8a0571ad1eb54ccbae0b577a4b1a3fe329e60b6471c29eeb347ba797 SHA512 75e482e0a387a79b263afbe51c98e97a0c4ac8a3dc8d35f10a978889355a60cae5b8caab354722748b465fc7dd0db7b4744f783df446240c01fbd35e51d44eba
+EBUILD ppxlib-0.18.0.ebuild 926 BLAKE2B f8affb8c0961a039d9e560db8ef47c435c0aec44b2a2a349bc40404486245b8ee0b303946646f8116b49d0e568cb8e63a699dc5c4e8c110a87b12e7c781ce742 SHA512 8d901792835259e0a32a3972d7cb9aee21a733131eec117fe9522f56cb8d6fee9674f4f08a5cbd9e0114ea82d7165b81122337b3973aa1c2fc021dd76c5243ea
+EBUILD ppxlib-0.20.0-r1.ebuild 902 BLAKE2B 168d53ba94211b5436c5b880b58031e3f3efb50ba29f0772b1c3d6f340649b2a3e0d7551ed47340fe8a2232d0743f8b15b2fcb7b265bfa0223c8936d88f86c1b SHA512 1a8a91b842fbd7dfaed8962b7f052126a5fd8c56fa23347c6f6f6c30edc89345a88e9fe7828737c643f69bbafe89bc1bdf58574019651e355eeb33d4d15dcee7
+EBUILD ppxlib-0.21.0-r3.ebuild 1113 BLAKE2B 864aab6473c4a64d8728216359aaeef62a992bcb018554b67c0d4b3533d7944b25747b9c5b9fc0acaa01b94e9eda886fe086284026068f5762ba60b7afff8704 SHA512 af7c307191efe5f632439867159caabfa3639450cdb7e7861d1bead2d3c6d14278b28118e47e8332a4d56cb78a0839969aa8f68c05d976e1ac164797e29fa017
+EBUILD ppxlib-0.22.0-r3.ebuild 1144 BLAKE2B 8bb514b1d67bf4e2275c398829643eb39b7acfef826920250b0b315fe3b2faef582a8b200e97bffedd5250791d013db002b3400ee25a12f14308e271b1c8fa42 SHA512 ffba32287c1b504d3b556a4c88be356e3371f7bed11b2ba5eca7667f3d8cad22229e2226d791de0422db974411520f7e75cfc4682b831359b91b1b402e63026b
+EBUILD ppxlib-0.22.2-r2.ebuild 1142 BLAKE2B b65b7676d84dadc4bad2a86f02a6c4c35a33bf51c3aa1efc483a4ea297cb7a7545024b59dc173f4e80705647a3d6d00d37320c1230dcc95b68c1a7ce82de9990 SHA512 61e564bc558651a5e040703bc89c5181c398adf6b677dc7ca9941a6baf592f43040ce6767cae87efd2e4429a8b9c52a22d5621f587b37cbd286c7a8c56f64254
+EBUILD ppxlib-0.23.0-r1.ebuild 1011 BLAKE2B 3bfcb9e6ce7f21b2e6dc784dcbcfc297f372232c40c8513460d29306d6976243eebd797a710452ef6c33be71d707b23891126e4275430d26787a8f726a8b1884 SHA512 cc2e0ac82fd5c545f550c1b515ca4a040bf964637d98ee64fae22b405683080e60d9890f193ee8799fea0a9a5098c0ed0671aeb7a31df4c77b65abac84770dd2
 MISC metadata.xml 419 BLAKE2B 97371846a88fb0008519bfb72fff654aa18401b2066073c09099b1987efbb9ad49012c0ab7624218894130a2cda3d5fba6056522eacd30712d08b7784801d9cf SHA512 8dc94b1dd499f7caa3696de963e69063193892dc939609c581fec3b2d93eca4f266e9360cb5144978ba36864d9143b6fb0a1eb0e0ac5061e04b84a68e787a8f7
diff --git a/dev-ml/ppxlib/ppxlib-0.18.0.ebuild b/dev-ml/ppxlib/ppxlib-0.18.0.ebuild
index 322bc6a963d6..2358fdf46446 100644
--- a/dev-ml/ppxlib/ppxlib-0.18.0.ebuild
+++ b/dev-ml/ppxlib/ppxlib-0.18.0.ebuild
@@ -20,7 +20,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
-DEPEND="
+RDEPEND="
 	>=dev-ml/base-0.11.0:=
 	dev-ml/findlib:=
 	>=dev-ml/ocaml-compiler-libs-0.11.0:=
@@ -31,8 +31,7 @@ DEPEND="
 	>=dev-ml/ppx_derivers-1.2.1:=
 	>=dev-ml/stdio-0.11.0:=
 "
-RDEPEND="${DEPEND}"
-DEPEND="${DEPEND}
+DEPEND="${RDEPEND}
 	test? (
 		dev-ml/cinaps
 	)"
diff --git a/dev-ml/ppxlib/ppxlib-0.20.0.ebuild b/dev-ml/ppxlib/ppxlib-0.20.0-r1.ebuild
index 8ea171116681..d1dbfa8de952 100644
--- a/dev-ml/ppxlib/ppxlib-0.20.0.ebuild
+++ b/dev-ml/ppxlib/ppxlib-0.20.0-r1.ebuild
@@ -30,5 +30,5 @@ RDEPEND="
 	>=dev-ml/ppx_derivers-1.2.1:=
 	>=dev-ml/stdio-0.11.0:=
 "
-DEPEND="${DEPEND}
+DEPEND="${RDEPEND}
 	test? ( dev-ml/cinaps:= )"
diff --git a/dev-ml/ppxlib/ppxlib-0.21.0-r2.ebuild b/dev-ml/ppxlib/ppxlib-0.21.0-r3.ebuild
index e6b9510929d3..d6be89711e15 100644
--- a/dev-ml/ppxlib/ppxlib-0.21.0-r2.ebuild
+++ b/dev-ml/ppxlib/ppxlib-0.21.0-r3.ebuild
@@ -30,7 +30,7 @@ RDEPEND="
 	>=dev-ml/ppx_derivers-1.2.1:=
 	>=dev-ml/stdio-0.11.0:=
 "
-DEPEND="${DEPEND}
+DEPEND="${RDEPEND}
 	test? (
 		dev-ml/cinaps:=
 		dev-ml/re:=
diff --git a/dev-ml/ppxlib/ppxlib-0.22.0-r2.ebuild b/dev-ml/ppxlib/ppxlib-0.22.0-r3.ebuild
index eca76b2308f1..bb3fbecbb17a 100644
--- a/dev-ml/ppxlib/ppxlib-0.22.0-r2.ebuild
+++ b/dev-ml/ppxlib/ppxlib-0.22.0-r3.ebuild
@@ -27,7 +27,7 @@ RDEPEND="
 	dev-ml/stdlib-shims:=
 	>=dev-ml/ppx_derivers-1.2.1:=
 "
-DEPEND="${DEPEND}
+DEPEND="${RDEPEND}
 	test? (
 		dev-ml/findlib:=
 		>=dev-ml/base-0.11.0:=
diff --git a/dev-ml/ppxlib/ppxlib-0.22.2-r1.ebuild b/dev-ml/ppxlib/ppxlib-0.22.2-r2.ebuild
index 0acf232740e3..33ca5ab0fb8d 100644
--- a/dev-ml/ppxlib/ppxlib-0.22.2-r1.ebuild
+++ b/dev-ml/ppxlib/ppxlib-0.22.2-r2.ebuild
@@ -16,7 +16,7 @@ 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"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
@@ -27,7 +27,7 @@ RDEPEND="
 	dev-ml/stdlib-shims:=
 	>=dev-ml/ppx_derivers-1.2.1:=
 "
-DEPEND="${DEPEND}
+DEPEND="${RDEPEND}
 	test? (
 		dev-ml/findlib:=
 		>=dev-ml/base-0.11.0:=
diff --git a/dev-ml/ppxlib/ppxlib-0.23.0.ebuild b/dev-ml/ppxlib/ppxlib-0.23.0-r1.ebuild
index c34f8878151c..5cb0b9a5899a 100644
--- a/dev-ml/ppxlib/ppxlib-0.23.0.ebuild
+++ b/dev-ml/ppxlib/ppxlib-0.23.0-r1.ebuild
@@ -27,7 +27,7 @@ RDEPEND="
 	dev-ml/stdlib-shims:=
 	>=dev-ml/ppx_derivers-1.2.1:=
 "
-DEPEND="${DEPEND}
+DEPEND="${RDEPEND}
 	test? (
 		dev-ml/findlib:=
 		>=dev-ml/base-0.11.0:=
diff --git a/dev-ml/rresult/Manifest b/dev-ml/rresult/Manifest
index ea17185f5745..31c9793fc22c 100644
--- a/dev-ml/rresult/Manifest
+++ b/dev-ml/rresult/Manifest
@@ -1,5 +1,5 @@
 DIST rresult-0.5.0.tbz 9185 BLAKE2B efe8d248aa3d68b13b011dccb98cb04127dfec9d659dfe8619f658b254cfcdca833e125310553dee54ef4be239c308e762d2290386f4fd08a5f2c1835faa9ef1 SHA512 45787b61adb7daedf72e4ff632cf3d4917bccb3e83613dabf93437982887d9a0ed3b6cbefb2b17cb341a825346cb0609286df581c6ff379583dc83672ee25efc
 DIST rresult-0.6.0.tbz 7731 BLAKE2B d93b4a3fe54541101d52e768555aa306f87d1c34b57c7eb7a92092051a047586c43dded3be9ef0c84675d935c4a91162a8ff612d540f951f2842cfdf9f709f24 SHA512 66cb7acb525c17dde4e7572fa5a0d925466f8e759b90a12d952ca076d25de49404c962e061557f2255112fbf1d731f8da696acd536cbb9433a4b1d9662095c3a
-EBUILD rresult-0.5.0.ebuild 537 BLAKE2B 268da618a4d646f5f879b2897b99b78fb5a93725a8502cb2bde5d907c78b2d3a7e9c10d47e8d6e17d8852cdbf4c6089440ec9fca0ee020df3f81e16cb6a174ed SHA512 11ae7ab67ea3d474c8f952f1f3b9400414d5dea30aa910c62f97d3942276cde5345c70dc3d0a2fc92092e379c7d373b6dd2515c2e443a6122de2ea8749fe5e17
-EBUILD rresult-0.6.0.ebuild 543 BLAKE2B 821ba47da90a028bfabd5c98a0767229d5db9a13e17b58c9744adc2d7e2b7714058f885b4702932a664ca5ec7975ca3c1d42e4620796667540a2d749420cdbaf SHA512 d31aacf899f5479bb348b2b9a23b57862d2225b5debfde2f40da977e286122c58519b77c1a94b9a5b54898148841c225111dccb03cbbcd5a57c0859c749e56e3
+EBUILD rresult-0.5.0.ebuild 536 BLAKE2B 73570cd0efb1b8808154e8a578baef8fa0e2c7c5ad273328ebf3a3e4ae013e84ce1238cf7b430869e1c57d111bbb7351e32de76c579cd73a115056e1b6577cac SHA512 7a2b488ac8d6af920705a155f582f7879ca650cfcc733cadaf809cb030336deb38626ef61def7e4c8244a5290693abd31de32b389987180f5427758a7be480b2
+EBUILD rresult-0.6.0.ebuild 538 BLAKE2B 1aec18ca9d5765e1917eebb1e7c00e5e6a85f427c47c92006794150d7acf3bbde1dccdafef05414772438a0eefc97c15d4788b2d2619a4badfd46c431594f5b7 SHA512 6dcfae504bcd8c240642d54151ba27801a151bd8237184fb7e580d39603fb7e1a581c01848195e27a8f9dca263f46d2984d8055a62995965494a7110be1f6cf5
 MISC metadata.xml 314 BLAKE2B 3ec15d97bf35ceb3f76caa4268557f4a32cff0673c4dcc20376d2cf8f41eae93f154a77b2ab56f82a9b370e1ab51eaf09bcae142cd9b0fd5cb653f78f7bd9d5d SHA512 60a95e3a7fd8c3f4dfcb5c150630f2f0df58b129de1b69a6cbf29f9aafbbe7a9b03795ee9e9448c5ff14103f631dc85fd9689e2fa3a82bb1b7953b6b1ba171f7
diff --git a/dev-ml/rresult/rresult-0.5.0.ebuild b/dev-ml/rresult/rresult-0.5.0.ebuild
index 9144c414ce88..3d12ef8d3f7a 100644
--- a/dev-ml/rresult/rresult-0.5.0.ebuild
+++ b/dev-ml/rresult/rresult-0.5.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://erratique.ch/software/rresult/releases/${P}.tbz"
 
 LICENSE="ISC"
 SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE=""
 
 RDEPEND="dev-ml/result:="
diff --git a/dev-ml/rresult/rresult-0.6.0.ebuild b/dev-ml/rresult/rresult-0.6.0.ebuild
index 0c47040813b3..cdea5cc2d55d 100644
--- a/dev-ml/rresult/rresult-0.6.0.ebuild
+++ b/dev-ml/rresult/rresult-0.6.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://erratique.ch/software/rresult/releases/${P}.tbz"
 
 LICENSE="ISC"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~x86"
 
 RDEPEND="dev-ml/result:="
 DEPEND="${RDEPEND}"
diff --git a/dev-ml/seq/Manifest b/dev-ml/seq/Manifest
index 935fd57e84dc..f59b8633e336 100644
--- a/dev-ml/seq/Manifest
+++ b/dev-ml/seq/Manifest
@@ -1,5 +1,5 @@
 DIST seq-0.2.2.tar.gz 12240 BLAKE2B 0f7c64e26593b012b60cfdcba02dc2748558c46a72789c77eaff70bcb24ab601895c429aa16dc066151323a48c312a372af5e19cebe0886e9203d55436c09cb1 SHA512 cab0eb4cb6d9788b7cbd7acbefefc15689d706c97ff7f75dd97faf3c21e466af4d0ff110541a24729db587e7172b1a30a3c2967e17ec2e49cbd923360052c07c
 DIST seq-0.2.tar.gz 12012 BLAKE2B 2321caabaefd98d4237d6ede034007ae5a4295765df4df21d4f0d475f097461992e4619f817ea7ebb20a3023e9d175237d636ed99bb8b1ca7b097c805daffbe8 SHA512 b2571225a18e624b79dad5e1aab91b22e2fda17702f2e23c438b75d2a71e24c55ee8672005f5cc4b17ae79e3b277b1918b71b5d0d674b8b12ea19b3fb2d747cb
-EBUILD seq-0.2.2.ebuild 409 BLAKE2B 63ebca61b463b5fd8eade670d9f8a2db5093979644d5e8de59042ab30a7a0ce795dece0c3f2751495ca5215d6c3d85608ec3274c1add1ebb0c42829961cc14a6 SHA512 0b4667195eb9016a46ea4ebb32014fbf8638e4eea0641a9e41b133c6c72f5c251dc54063db4caeb119c82f1b1b48ca2ecfa12baf4d4391631ae721f0aca595ea
+EBUILD seq-0.2.2.ebuild 403 BLAKE2B 8c58bed29e07e93c0515e0208748dbc147a8acbfd0607ad2af1c49fb2981916f01601691e27c0f644c980c984627758a5fa50754b8c3e9d2137cefa3376340ef SHA512 b3cc81ebfe29d816a852cf708da2a0991fc10e2c595031c700736206d80d1c78c0dff59c04f56d3ce0862c06d53fd23e8c31f1f6ad8ba63934f20d7a5e2084da
 EBUILD seq-0.2.ebuild 403 BLAKE2B 8c58bed29e07e93c0515e0208748dbc147a8acbfd0607ad2af1c49fb2981916f01601691e27c0f644c980c984627758a5fa50754b8c3e9d2137cefa3376340ef SHA512 b3cc81ebfe29d816a852cf708da2a0991fc10e2c595031c700736206d80d1c78c0dff59c04f56d3ce0862c06d53fd23e8c31f1f6ad8ba63934f20d7a5e2084da
 MISC metadata.xml 338 BLAKE2B f947fa0825c1a3fd959515164da36ffc9694c570ed6eb6eef8686fc24b4582ee88ecb7304507c79cf2733fb77ae3570468ec8da886367d79721c81f148931833 SHA512 9d052ada92f441fa4908f4ec9a2561f7276872281ffa65f0ad92c8d0f7c15aeea11d6c887d4af7535d7d72bce3dec8f12622aee5eb9a79e510e8baaa208a54cd
diff --git a/dev-ml/seq/seq-0.2.2.ebuild b/dev-ml/seq/seq-0.2.2.ebuild
index 0027a100131d..2f4f1e6fa6e4 100644
--- a/dev-ml/seq/seq-0.2.2.ebuild
+++ b/dev-ml/seq/seq-0.2.2.ebuild
@@ -11,5 +11,5 @@ SRC_URI="https://github.com/c-cube/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt"
diff --git a/dev-ml/uunf/Manifest b/dev-ml/uunf/Manifest
index 18622286313a..065385afdf47 100644
--- a/dev-ml/uunf/Manifest
+++ b/dev-ml/uunf/Manifest
@@ -1,3 +1,3 @@
 DIST uunf-13.0.0.tbz 39387 BLAKE2B fa8c46f63e2f8cf44cffe0db8c0aea73a0ffb6449f4a3c7c59baf4750db8e2364686276e6e5f284b2a528a45f02400274669c4e081533fbb25cdd36c6eb8fcb0 SHA512 ade9815b1d620a055a63dd0f8c5d5c54544eacfdcf0c6059cd20f1004a1319287f71021018fbc7e652bde738a97fae7e9d0963d5b192a4b0bb6e5b95456012a8
-EBUILD uunf-13.0.0.ebuild 536 BLAKE2B 18e88fb8b2896c905c3b1b9e0989fdb7dece056f048c10e984496aaf21a1730be3d3ddc6c3ccd0632c8ff31d9e043673a2edbfddf37bfe7fd6e0ffff6b175c1c SHA512 a9e569e49b5504d970ff88a538daa1462fb0208051ab36ceab0287d6010fc1b84ad30a97e82193167db63920e8fe27bb19a3b54345627cb6b4474fa33c45f907
+EBUILD uunf-13.0.0-r1.ebuild 642 BLAKE2B 08da265b6544b5104422cd7c8be75764813e7ff25c25b58b5f44b48982616b54a48ca836b83fec5975ca811269f91a69ef1353afebbcac692985d451551dfcd3 SHA512 d2e6b64510dbb875c2ab7cfa873552e72bdeef7eda5a666a1642e9ab967ae2f0e14730046d46ef4eecb6bc9cca3564592312534ae2152f2561b0a275e2185284
 MISC metadata.xml 311 BLAKE2B aac48b9d1bd548674249d1bf7e6bffde917939ee8a30a9975871db0ae1ac6b3649286ac2ac5f63f767d489b41894a4e02155ce77a890a06e4ad9b981edeb7af2 SHA512 acbee992f129174ff16ec565e878627096346afc0b99c4b2a2f56efb7932b069e8bbc7d8918c180ebe4753593848deb5f956a2cacdf54445529b6b68f7d238f1
diff --git a/dev-ml/uunf/uunf-13.0.0.ebuild b/dev-ml/uunf/uunf-13.0.0-r1.ebuild
index d34bf31c1772..bc1af4246d94 100644
--- a/dev-ml/uunf/uunf-13.0.0.ebuild
+++ b/dev-ml/uunf/uunf-13.0.0-r1.ebuild
@@ -14,14 +14,18 @@ SLOT="0/${PV}"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-DEPEND="dev-ml/topkg
-	dev-ml/uutf
-	dev-ml/cmdliner"
+DEPEND="dev-ml/topkg:=
+	dev-ml/uutf:=
+	dev-ml/cmdliner:="
 RDEPEND="${DEPEND}"
 BDEPEND="dev-ml/findlib"
 OPAM_FILE=opam
 
 src_compile() {
+	# Increase stack limit to 11GiB to avoid stack overflow error.
+	# bug #798270
+	ulimit -s 11530000
+
 	ocaml pkg/pkg.ml build \
 		|| die
 }
diff --git a/dev-ml/uutf/Manifest b/dev-ml/uutf/Manifest
index 49fc4d12ec38..f813845bea51 100644
--- a/dev-ml/uutf/Manifest
+++ b/dev-ml/uutf/Manifest
@@ -1,5 +1,5 @@
 DIST uutf-1.0.1.tbz 22215 BLAKE2B 58cbb8db94024ddaa02c213df4e5321ad33513370c6d1d54ac09f57821df8ac3b330c2659f9aeb0e78dfd15d2f50be714a5a5d6e6d3dcc3f81539c1a6c8c3771 SHA512 35cbee8c82a566f2fe4fcd549936d4c4dc67f5b71bfd3ea97ff25d7cf21cfb77cb5ee313c95ad26a2a61bb84aa48c300bbb79a1a7128c6161e9abe9c390a7d18
 DIST uutf-1.0.2.tbz 22420 BLAKE2B 8391f6c3cde40db3fa86b9243d8ea8fb52409aa958d1020f302d602bf7c06c44b7d93f7a6a64a1b0964c7bb5856e15178957bba48102dbd36d8efe9581db3787 SHA512 5f2dbe78eaf73a292438d84c7185c839a7ac13cee9616a7b5006990314c6a0d42b212854cc2e89d815d3c45804f94bb40af75ecb60da7092887d8dc21e968bdd
-EBUILD uutf-1.0.1.ebuild 1589 BLAKE2B 97df4d6bd39a80eaa5e1cf303b2a7ce5735cf4df7564282b6d0b98b23f6f51063c20f120eda76220aae96c80a95bdb9523bb3494149ea5cb91572b60962b465e SHA512 c56f090492fab0564607595faa7e5765ffd7e13d3bda71e0ed99841bb01183c286b7e7c552e5766626674169bcf88604a6ff9ffa720d21fdd46bd8e38cbc1f65
-EBUILD uutf-1.0.2.ebuild 1595 BLAKE2B a9958781ecb69f2e8e160ee23607ed0b6f3fe9501ec9ab3146e59e30fc475d81992976955d33a78a10f04ee895d3bf0c312dbdba97a50cc3c5c4bca40baa7afd SHA512 f233de55edd0e346bf851a824e4ce31923cf02153a874f46b46dcbf1666a1059d88170c555891e2fc52d57cb304bad6835a77a93423825e105cc8b75172187ed
+EBUILD uutf-1.0.1.ebuild 1601 BLAKE2B 68d7fd446277ba74b4551fa1ada1c93415d33fa8a95957035ba3713565f3349537965c7881b5f78445b49ce98f573d8110ecf090a934251710d242700418277b SHA512 24ffd10517018740af3c3c7ac71deee2ea509de1f23bab9e503cb687ba12168f7f5e63a10dd5430aac92faf48938144c46f31d9970a9b84b0dfb346119bd82e1
+EBUILD uutf-1.0.2.ebuild 1603 BLAKE2B 0d658aee8fa3b2923584ed7d3c5e80ab39f86c4915edaaf0b8bb9777bc61cfdb4721cb75225097d9b35d2cc7fa01e90607cdec1b8f7b434aa2752bf14b73ec97 SHA512 927d8d6f2f466cbbd6066d2225da9daccf93610f263b26c017ed0b40eceb0a54aa61076326bdeb2886f15c35ffe53532d38dec26a46824d92bb31a3405edf580
 MISC metadata.xml 391 BLAKE2B 0f8f1c945c9a92d261312c24f4f23e50eb2183ab374e7f72f3e2aadd1678b130f230f39821209ac11156a0bbf3383552ff10552a7657da7c7b76abaa916585f2 SHA512 6953d1cde6c4c779d81b451f762f7aedf2f789aecaf87ac874475003b696546918d8f894cec935bf9cfc4ecdfdc1ec816fb3aa117f90e59fceabaf90d66d5157
diff --git a/dev-ml/uutf/uutf-1.0.1.ebuild b/dev-ml/uutf/uutf-1.0.1.ebuild
index ca6cd4708b6e..d182d94e70ca 100644
--- a/dev-ml/uutf/uutf-1.0.1.ebuild
+++ b/dev-ml/uutf/uutf-1.0.1.ebuild
@@ -53,7 +53,7 @@ src_install() {
 	use ocamlopt && nativelibs="$(echo _build/src/uutf.cm{x,xa,xs} _build/src/uutf.a)"
 	ocamlfind install uutf _build/pkg/META _build/src/uutf.mli _build/src/uutf.cm{a,i} ${nativelibs} || die
 
-	use utftrip && newbin utftrip.$(usex ocamlopt native byte) utftrip
+	use utftrip && newbin _build/test/utftrip.$(usex ocamlopt native byte) utftrip
 	dodoc CHANGES.md README.md
 
 	if use doc ; then
diff --git a/dev-ml/uutf/uutf-1.0.2.ebuild b/dev-ml/uutf/uutf-1.0.2.ebuild
index 320c6dea77ec..76819981b6cc 100644
--- a/dev-ml/uutf/uutf-1.0.2.ebuild
+++ b/dev-ml/uutf/uutf-1.0.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://erratique.ch/software/uutf/releases/${P}.tbz"
 
 LICENSE="ISC"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
 IUSE="doc utftrip +ocamlopt test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="utftrip? ( ocamlopt )"
@@ -53,7 +53,7 @@ src_install() {
 	use ocamlopt && nativelibs="$(echo _build/src/uutf.cm{x,xa,xs} _build/src/uutf.a)"
 	ocamlfind install uutf _build/pkg/META _build/src/uutf.mli _build/src/uutf.cm{a,i} ${nativelibs} || die
 
-	use utftrip && newbin utftrip.$(usex ocamlopt native byte) utftrip
+	use utftrip && newbin _build/test/utftrip.$(usex ocamlopt native byte) utftrip
 	dodoc CHANGES.md README.md
 
 	if use doc ; then
author	V3n3RiX <venerix@koprulu.sector>	2021-10-20 10:22:14 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2021-10-20 10:22:14 +0100
commit	46eedbedafdb0040c37884982d4c775ce277fb7b (patch)
tree	db33a91259730be84999e13a8d8168c799f50ac0 /dev-ml
parent	e23a08d0c97a0cc415aaa165da840b056f93c997 (diff)