From 2fd57282f0262ca084e05b0f2c63fbada395d02b Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Sun, 16 Jan 2022 20:27:28 +0000
Subject: gentoo resync : 16.01.2021

---
 dev-ml/Manifest.gz                                 | Bin 32489 -> 32463 bytes
 dev-ml/bos/Manifest                                |   6 +-
 dev-ml/bos/bos-0.1.6.ebuild                        |   4 +-
 dev-ml/bos/bos-0.2.0-r1.ebuild                     |   4 +-
 dev-ml/bos/bos-0.2.1.ebuild                        |   7 +-
 dev-ml/camlp4/Manifest                             |  12 +--
 dev-ml/camlp4/camlp4-4.05_p1-r1.ebuild             |  10 +-
 dev-ml/camlp4/camlp4-4.09_p1-r1.ebuild             |   6 +-
 dev-ml/camlp4/camlp4-4.10_p1-r2.ebuild             |   6 +-
 dev-ml/camlp4/camlp4-4.11_p1-r2.ebuild             |   4 +-
 dev-ml/camlp4/camlp4-4.12-r1.ebuild                |   4 +-
 dev-ml/camlp4/camlp4-4.13-r1.ebuild                |   4 +-
 dev-ml/camlp5/Manifest                             |  10 +-
 dev-ml/camlp5/camlp5-7.12.ebuild                   |   4 +-
 dev-ml/camlp5/camlp5-7.13.ebuild                   |   4 +-
 dev-ml/camlp5/camlp5-7.14.ebuild                   |   4 +-
 dev-ml/camlp5/camlp5-8.00.01.ebuild                |   4 +-
 dev-ml/camlp5/camlp5-8.00.ebuild                   |   4 +-
 dev-ml/camlzip/Manifest                            |   2 +-
 dev-ml/camlzip/camlzip-1.11.ebuild                 |   4 +-
 dev-ml/dose3/Manifest                              |   8 +-
 dev-ml/dose3/dose3-5.0.1_p16-r4.ebuild             |   8 +-
 dev-ml/dose3/dose3-6.0.1_p2-r1.ebuild              |   8 +-
 dev-ml/dose3/dose3-6.1-r1.ebuild                   |   8 +-
 dev-ml/dose3/dose3-7.0.0.ebuild                    |   8 +-
 dev-ml/dune/Manifest                               |   6 +-
 dev-ml/dune/dune-2.7.1.ebuild                      |   5 +-
 dev-ml/dune/dune-2.8.2.ebuild                      |   3 +-
 dev-ml/dune/dune-2.8.4.ebuild                      |   3 +-
 dev-ml/labltk/Manifest                             |   4 +-
 dev-ml/labltk/labltk-8.06.10.ebuild                |   3 +-
 dev-ml/labltk/labltk-8.06.9.ebuild                 |   3 +-
 dev-ml/llvm-ocaml/Manifest                         |   2 +
 dev-ml/llvm-ocaml/llvm-ocaml-13.0.1_rc2.ebuild     | 112 +++++++++++++++++++++
 dev-ml/logs/Manifest                               |   2 +-
 dev-ml/logs/logs-0.7.0-r1.ebuild                   |   4 +-
 dev-ml/luv/Manifest                                |   2 +-
 dev-ml/luv/luv-0.5.10-r2.ebuild                    |  25 -----
 dev-ml/luv/luv-0.5.10-r3.ebuild                    |  32 ++++++
 dev-ml/merlin/Manifest                             |   2 -
 dev-ml/merlin/merlin-4.1-r2.ebuild                 |  75 --------------
 dev-ml/num/Manifest                                |   3 +-
 dev-ml/num/files/num-1.4-ocamlopt.patch            |  15 +++
 dev-ml/num/num-1.4-r3.ebuild                       |   2 +
 dev-ml/ocamlbuild/Manifest                         |   2 +-
 dev-ml/ocamlbuild/ocamlbuild-0.14.0-r1.ebuild      |   5 +-
 dev-ml/ocurl/Manifest                              |   2 +
 dev-ml/ocurl/ocurl-0.9.2.ebuild                    |  37 +++++++
 dev-ml/opam-client/Manifest                        |  10 +-
 dev-ml/opam-client/opam-client-2.0.8-r1.ebuild     |   6 +-
 dev-ml/opam-client/opam-client-2.0.8.ebuild        |   6 +-
 dev-ml/opam-client/opam-client-2.0.9.ebuild        |   8 +-
 dev-ml/opam-client/opam-client-2.1.0.ebuild        |   6 +-
 dev-ml/opam-client/opam-client-2.1.1.ebuild        |   6 +-
 dev-ml/opam-core/Manifest                          |   2 +-
 dev-ml/opam-core/opam-core-2.0.9.ebuild            |   4 +-
 dev-ml/opam-format/Manifest                        |  12 +--
 dev-ml/opam-format/opam-format-2.0.10.ebuild       |   9 +-
 dev-ml/opam-format/opam-format-2.0.8-r2.ebuild     |   9 +-
 dev-ml/opam-format/opam-format-2.0.8-r3.ebuild     |   9 +-
 dev-ml/opam-format/opam-format-2.0.9.ebuild        |  11 +-
 dev-ml/opam-format/opam-format-2.1.0.ebuild        |  15 ++-
 dev-ml/opam-format/opam-format-2.1.1.ebuild        |  15 ++-
 dev-ml/opam-installer/Manifest                     |   2 +-
 dev-ml/opam-installer/opam-installer-2.0.9.ebuild  |   4 +-
 dev-ml/opam-repository/Manifest                    |   2 +-
 .../opam-repository/opam-repository-2.0.9.ebuild   |   4 +-
 dev-ml/opam-solver/Manifest                        |   2 +-
 dev-ml/opam-solver/opam-solver-2.0.9.ebuild        |   4 +-
 dev-ml/opam-state/Manifest                         |   2 +-
 dev-ml/opam-state/opam-state-2.0.9.ebuild          |   4 +-
 dev-ml/opam/Manifest                               |   2 +-
 dev-ml/opam/opam-2.0.9.ebuild                      |   4 +-
 73 files changed, 407 insertions(+), 243 deletions(-)
 create mode 100644 dev-ml/llvm-ocaml/llvm-ocaml-13.0.1_rc2.ebuild
 delete mode 100644 dev-ml/luv/luv-0.5.10-r2.ebuild
 create mode 100644 dev-ml/luv/luv-0.5.10-r3.ebuild
 delete mode 100644 dev-ml/merlin/merlin-4.1-r2.ebuild
 create mode 100644 dev-ml/num/files/num-1.4-ocamlopt.patch
 create mode 100644 dev-ml/ocurl/ocurl-0.9.2.ebuild

(limited to 'dev-ml')

diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 7d74082c205b..a2fc7f02698e 100644
Binary files a/dev-ml/Manifest.gz and b/dev-ml/Manifest.gz differ
diff --git a/dev-ml/bos/Manifest b/dev-ml/bos/Manifest
index 58762a71fa0f..78ac9be4fe72 100644
--- a/dev-ml/bos/Manifest
+++ b/dev-ml/bos/Manifest
@@ -1,7 +1,7 @@
 DIST bos-0.1.6.tbz 39822 BLAKE2B 0e10eb14fb5d429b81c67659c936e8b700c4cd417d1f5be000c8bdb0304de8ad9130e597f6e2e7771380c29c148f4339817bacc458e72a8efa894be3b85965bf SHA512 f1f10a97a32da936a7d5a0c70632e723723ee523c79f9dfd23bc42c039a194e8d69658483e6e856c7911332b799a92bf8cabfe96cc387522d7450b8f3f8f8343
 DIST bos-0.2.0.tbz 41008 BLAKE2B badc344e561ba9335a4ded0c8100da91fe2bc882698c94daa42d9db2f1e2c8c627b81eebb5a7067778c332384504391ea402f7363ec552e8517cb048c8e384fe SHA512 f9120f8108c6da5647c9fbcc78736a5f87bf5627fad01035fdab1af6322c93e75df670d7d2910fe474c92c48ffffcf15955a84e698cfc7bfb7c1ac4fe27d472f
 DIST bos-0.2.1.tbz 42330 BLAKE2B c376428ef055555f09e4af24391b7bbcc388af955ac5192bd4c3999325757812a87b54e518fa2d5a3a81d1e8d0d65f2cb3b69d5f186129136855af7766e9ac13 SHA512 8daeb8a4c2dd1f2460f6274ada19f4f1b6ebe875ff83a938c93418ce0e6bdb74b8afc5c9a7d410c1c9df2dad030e4fa276b6ed2da580639484e8b5bc92610b1d
-EBUILD bos-0.1.6.ebuild 907 BLAKE2B 5f456180ba9fb42674936229c6b06ea4c3961d2805bf5e05f734822cb3071a17528aed8826c8a14b635ed69508f8ae809d07f1c9acea88092d643deaf825a24f SHA512 12ce7f43ec3435493c849956657661268fb4d7a3f3bbd2cbb6ef12f276438e51c028b4d01f635aa970368f6ee1a970bd57afc92e63a1b59d6491f44a169f2e02
-EBUILD bos-0.2.0-r1.ebuild 918 BLAKE2B 64a84ef0f75fd365295ba90e4655fa4258de7c5ae3f89f9cb92af5da6bc30c275a8118da1a68186b1b7f7a94d26e72882f39980404029e760461b10f8981f629 SHA512 3402f4c4135a6b0de83137c12cdb70814f6cdd742b75c0c69dd4efdefa82cc3729c43e5d0dc492def7b7e191f0912083fd3fdc5f8e7e75a544237e9d9f5c10bf
-EBUILD bos-0.2.1.ebuild 937 BLAKE2B e064e858eea7a4f726ccfe3cffee3b5790d4cbe4657182e7caca4afae6c63ad6136b18d5cfa6d0f0d0e076f2e3adf7a1ef0a8873f9bc8be201f09f8822698eef SHA512 238b065c90dca7b99eb27fec8c633212c1495b0b2aebb468d98541c2273192e925d3d2385eceaf52e9d0a43191b30eb731f5d5eb8a33eabac152588f1436cbe9
+EBUILD bos-0.1.6.ebuild 930 BLAKE2B e4cf162d174643c3a4646e43762af9cc5629fbe4ceb0bcf11b6c60c769a49247cf8706b11a8ed457a255884e1db135764d47523be5cc264f923f2d3a8b7523f2 SHA512 773ba3f3c96a0f0a9ae251da80764a476a4914064db8683194d119f448fe6ba1fc5608e180714c9d426d1f86f47caf371a4b7acfd02300437bace72c52838b3a
+EBUILD bos-0.2.0-r1.ebuild 941 BLAKE2B 2ff3fee06a6a0e89fc460b0c2bbea7bfec8d9d2860ded6e8111cfcd9ec71e982be1857bef7f2018963fdd7b3ba8c2ec9e26f78491b050619100cade858f31934 SHA512 898f4a65945115a0f8dac7e35d7f28e914de576e5ad178bd406e0c7fe03adff63ecfa9af88461f9f46863119a438ae400cc346ce4198018ec6f9ae9f2b841b80
+EBUILD bos-0.2.1.ebuild 936 BLAKE2B 2dde60234e3ce905cb74dc04df8e6332e8b235eff48c32ab20ac05f8e2469a40214d87807a4f616b98840c70cc1c09c7503149d7798ae5fd9419d9bf3095086c SHA512 8e925f647665d3727f017ea3b5ed4034339cb798ca3fbf6dfedee05922ba1b05694763d7b10a1da5090f20f0055ceca4f4473a308069f0e29a915ee004bff30f
 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 1c8791ab0f6b..5f7598f42cb0 100644
--- a/dev-ml/bos/bos-0.1.6.ebuild
+++ b/dev-ml/bos/bos-0.1.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -28,6 +28,8 @@ DEPEND="${RDEPEND}
 	test? ( dev-ml/mtime )
 "
 
+QA_FLAGS_IGNORED='.*'
+
 src_compile() {
 	ocaml pkg/pkg.ml build --tests $(usex test true false) || die
 }
diff --git a/dev-ml/bos/bos-0.2.0-r1.ebuild b/dev-ml/bos/bos-0.2.0-r1.ebuild
index b4f383fa7696..f855848aa0a6 100644
--- a/dev-ml/bos/bos-0.2.0-r1.ebuild
+++ b/dev-ml/bos/bos-0.2.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -25,6 +25,8 @@ BDEPEND="dev-ml/findlib
 	dev-ml/topkg
 	test? ( dev-ml/mtime )"
 
+QA_FLAGS_IGNORED='.*'
+
 src_compile() {
 	ocaml pkg/pkg.ml build --tests $(usex test true false) || die
 }
diff --git a/dev-ml/bos/bos-0.2.1.ebuild b/dev-ml/bos/bos-0.2.1.ebuild
index c994f58f5094..0d5451288a35 100644
--- a/dev-ml/bos/bos-0.2.1.ebuild
+++ b/dev-ml/bos/bos-0.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -23,8 +23,9 @@ RDEPEND="dev-lang/ocaml:=
 DEPEND="${RDEPEND}"
 BDEPEND="dev-ml/findlib
 	dev-ml/ocamlbuild
-	dev-ml/topkg
-	test? ( dev-ml/mtime )"
+	dev-ml/topkg"
+
+QA_FLAGS_IGNORED='.*'
 
 src_compile() {
 	ocaml pkg/pkg.ml build --tests $(usex test true false) || die
diff --git a/dev-ml/camlp4/Manifest b/dev-ml/camlp4/Manifest
index c29acb1690d6..4bb63e7c3fd6 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 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
+EBUILD camlp4-4.05_p1-r1.ebuild 1200 BLAKE2B cc2ab5ecfa8c312c7a9ae7375ff4d4ec6c8e719ef26497f95addca0ae7dcd0d403059c3d90b7a981cd9a0557e95a7d111fe0e77bdebf5927d23de01e3d1b5e36 SHA512 24c05fec94fdfe5d093d01f40f4b638ccc5f5f6f219d7aa5256347c758f6de5c6cfd4aba2cbf038e02439ab5b007fbf7d35dccd0621e32b86fb7a75b0318e7cc
+EBUILD camlp4-4.09_p1-r1.ebuild 1221 BLAKE2B 5105ec9c3bcceb46d19e53555fcd9ce82e13c99b133843d712a57ebd6e751b92322050ef300aeaa3d38517d988434c5f2950e92ee2af8cc6d24ef0f878184ca5 SHA512 2c19c3fa701313f1b2682953d670ebe0499025397f4a4b7976a50dd4f66bfef6302a898b2fb6fbd26903cc74f445fb2dfc08bfb0202b0a8677cbf15e20cf4f7d
+EBUILD camlp4-4.10_p1-r2.ebuild 1237 BLAKE2B bb7610c2a7dcf748b9b20cc9e3694e5f81d9021dbec7fe98dedc711c036d3221cdb069346cde2810e560f0c3e95d7f85ef81e20d7c653fe5846d246124590da4 SHA512 838a1344d6d3b9824233315bfc720f052ef9e081569bda5cfa8b73ebee066d3414c2370c80a5184a82f3f20eda7d6ee6b3b366e73c97261efbb88f243cf1b133
+EBUILD camlp4-4.11_p1-r2.ebuild 1231 BLAKE2B ced4260a518ae1c9d4f2e38b5a9c31958b10937c13f5a79d9ec193f7920d83ae8db76c7848e1ec4fcd1091959c44611b9d66d8ce47ae35c61a2cf0d816e07ae6 SHA512 5bf316af28102c6fd788e1b60962d85ac61fc1474e24c0856d71354a53fecfed497306add2a5bf1261b5702de1c8959361427dc4ee6de141ccf41339bdd8d558
+EBUILD camlp4-4.12-r1.ebuild 1237 BLAKE2B bb7610c2a7dcf748b9b20cc9e3694e5f81d9021dbec7fe98dedc711c036d3221cdb069346cde2810e560f0c3e95d7f85ef81e20d7c653fe5846d246124590da4 SHA512 838a1344d6d3b9824233315bfc720f052ef9e081569bda5cfa8b73ebee066d3414c2370c80a5184a82f3f20eda7d6ee6b3b366e73c97261efbb88f243cf1b133
+EBUILD camlp4-4.13-r1.ebuild 1237 BLAKE2B bb7610c2a7dcf748b9b20cc9e3694e5f81d9021dbec7fe98dedc711c036d3221cdb069346cde2810e560f0c3e95d7f85ef81e20d7c653fe5846d246124590da4 SHA512 838a1344d6d3b9824233315bfc720f052ef9e081569bda5cfa8b73ebee066d3414c2370c80a5184a82f3f20eda7d6ee6b3b366e73c97261efbb88f243cf1b133
 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 7c3455031b75..fbeee42c3a43 100644
--- a/dev-ml/camlp4/camlp4-4.05_p1-r1.ebuild
+++ b/dev-ml/camlp4/camlp4-4.05_p1-r1.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 MY_PV=${PV/_p/+}
 MY_P=${PN}-${MY_PV}
+
 DESCRIPTION="System for writing extensible parsers for programming languages"
 HOMEPAGE="https://github.com/camlp4/camlp4"
 SRC_URI="https://github.com/camlp4/camlp4/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${P/_p/-}"
 
 LICENSE="LGPL-2-with-linking-exception"
 SLOT="0/${PV}"
@@ -17,9 +17,13 @@ IUSE="+ocamlopt"
 
 RDEPEND="dev-lang/ocaml:0/$(ver_cut 1-2)[ocamlopt?]"
 DEPEND="${RDEPEND}
-	dev-ml/ocamlbuild
+	dev-ml/ocamlbuild[ocamlopt?]
 	dev-ml/findlib:="
 
+QA_FLAGS_IGNORED='.*'
+
+S="${WORKDIR}/${P/_p/-}"
+
 src_configure() {
 	./configure \
 		--bindir="${EPREFIX}/usr/bin" \
diff --git a/dev-ml/camlp4/camlp4-4.09_p1-r1.ebuild b/dev-ml/camlp4/camlp4-4.09_p1-r1.ebuild
index 4df4e6606fe2..45915fd4cf46 100644
--- a/dev-ml/camlp4/camlp4-4.09_p1-r1.ebuild
+++ b/dev-ml/camlp4/camlp4-4.09_p1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,9 +17,11 @@ IUSE="+ocamlopt"
 
 RDEPEND="dev-lang/ocaml:0/4.09[ocamlopt?]"
 DEPEND="${RDEPEND}
-	dev-ml/ocamlbuild
+	dev-ml/ocamlbuild[ocamlopt?]
 	dev-ml/findlib:="
 
+QA_FLAGS_IGNORED='.*'
+
 S=${WORKDIR}/${P/_p/-}
 PATCHES=( "${FILESDIR}/reload.patch" )
 
diff --git a/dev-ml/camlp4/camlp4-4.10_p1-r2.ebuild b/dev-ml/camlp4/camlp4-4.10_p1-r2.ebuild
index 539fe3cd8554..06d603572592 100644
--- a/dev-ml/camlp4/camlp4-4.10_p1-r2.ebuild
+++ b/dev-ml/camlp4/camlp4-4.10_p1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,9 +17,11 @@ IUSE="+ocamlopt"
 
 RDEPEND="dev-lang/ocaml:0/$(ver_cut 1-2)[ocamlopt?]"
 DEPEND="${RDEPEND}
-	dev-ml/ocamlbuild
+	dev-ml/ocamlbuild[ocamlopt?]
 	dev-ml/findlib:="
 
+QA_FLAGS_IGNORED='.*'
+
 S=${WORKDIR}/${P/_p/-}
 PATCHES=( "${FILESDIR}/reload.patch" )
 
diff --git a/dev-ml/camlp4/camlp4-4.11_p1-r2.ebuild b/dev-ml/camlp4/camlp4-4.11_p1-r2.ebuild
index 24d6b91a79bb..f3e7028826d7 100644
--- a/dev-ml/camlp4/camlp4-4.11_p1-r2.ebuild
+++ b/dev-ml/camlp4/camlp4-4.11_p1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ IUSE="+ocamlopt"
 
 RDEPEND="dev-lang/ocaml:0/$(ver_cut 1-2)[ocamlopt?]"
 DEPEND="${RDEPEND}
-	dev-ml/ocamlbuild
+	dev-ml/ocamlbuild[ocamlopt?]
 	dev-ml/findlib:="
 
 QA_FLAGS_IGNORED='.*'
diff --git a/dev-ml/camlp4/camlp4-4.12-r1.ebuild b/dev-ml/camlp4/camlp4-4.12-r1.ebuild
index e159ddff977f..06d603572592 100644
--- a/dev-ml/camlp4/camlp4-4.12-r1.ebuild
+++ b/dev-ml/camlp4/camlp4-4.12-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ IUSE="+ocamlopt"
 
 RDEPEND="dev-lang/ocaml:0/$(ver_cut 1-2)[ocamlopt?]"
 DEPEND="${RDEPEND}
-	dev-ml/ocamlbuild
+	dev-ml/ocamlbuild[ocamlopt?]
 	dev-ml/findlib:="
 
 QA_FLAGS_IGNORED='.*'
diff --git a/dev-ml/camlp4/camlp4-4.13-r1.ebuild b/dev-ml/camlp4/camlp4-4.13-r1.ebuild
index e159ddff977f..06d603572592 100644
--- a/dev-ml/camlp4/camlp4-4.13-r1.ebuild
+++ b/dev-ml/camlp4/camlp4-4.13-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ IUSE="+ocamlopt"
 
 RDEPEND="dev-lang/ocaml:0/$(ver_cut 1-2)[ocamlopt?]"
 DEPEND="${RDEPEND}
-	dev-ml/ocamlbuild
+	dev-ml/ocamlbuild[ocamlopt?]
 	dev-ml/findlib:="
 
 QA_FLAGS_IGNORED='.*'
diff --git a/dev-ml/camlp5/Manifest b/dev-ml/camlp5/Manifest
index 101f13612fdc..b126ad1df3d2 100644
--- a/dev-ml/camlp5/Manifest
+++ b/dev-ml/camlp5/Manifest
@@ -7,10 +7,10 @@ DIST camlp5-8.00.01.tar.gz 1321790 BLAKE2B df4403af56cd07f8e07745bdb73f698ddba24
 DIST camlp5-8.00.02.tar.gz 1340114 BLAKE2B a251973253a729fd568f9a8410d43e963ca4879b7298186358293869bec0eabe79e97f819cd4af3c771490fbd4a7bd8cb1d47482f4fe699720b3577bad8536f4 SHA512 b9950cac70e77d62f147dc8edac0aef2a2bb563ca7bbc709dcf030e2536a0973188414c8612f8b2441a6e05c4d09579bc474974513bf0c59ad4702a46a0cc7f6
 DIST camlp5-8.00.tar.gz 1321320 BLAKE2B 14957ea83e40f3e2f68c7cbbec1ab84325eba1057f38905a37f9516a99a009024ee0b463cf588880d23d94e710b027b835dd51153a429c8bda22be7fe95dc911 SHA512 6a0d19ced4d94cd3afebfbc373d344229c5faf088e8910dea32ed4dfa841dd9844c72849f8a6281e2bce55295665eae90391cf29d062a44b083761a9e04bce93
 EBUILD camlp5-7.11-r1.ebuild 1048 BLAKE2B c4d7f8810c781ea2959cadeb4cc57dda53527107a77786cafdba1ac5c502d6a948cbf3537464c580ae1e2612338194e2898f4e6c28d9b271244d892fa15a05bf SHA512 043468662e78deeeadc4d04a0cb315be163c451af61c1cbc145cc81a473ed7351f3410ce67976e2337a616ef2a2b8e3e0d8f78236a278c3100b3a029ccc6e0fc
-EBUILD camlp5-7.12.ebuild 1279 BLAKE2B 3f390b87e886b7a0527af8b1c6ea4f315085ed966bdfb690d856093fc898f2a878ebd900c3a59c0e9ef408d5662115e421cc899eca137e37d51a996016bf253f SHA512 fdd203a319dae490c6d23406798fc33bfa5b5218b12724c555943721231f4a2fc90e6039c0cb921b7e16a1b043c4a14f896d6b53c67674713932fd8e869d7bc7
-EBUILD camlp5-7.13.ebuild 1092 BLAKE2B 65a5d564b227635a01dd14e140193930ce7c903ca74b7a297172dc9c315c4d9b3d200a88ded86822d4f9ddf1cfb0c6ed3c492334b552d8b3a91fa7b21d064dfd SHA512 783b13558900be49813b26ca6c7f1cfd0fd7b4f93cbd4f0ecbcdcf19f371f6752032488c6cbc011be4f3bada5c3ea11f9154d0e9862e4e90c3b9608dc3d9a81a
-EBUILD camlp5-7.14.ebuild 1141 BLAKE2B 8f2d1d604a5761717a9191784540c11a2394b69f714c7ab9297742c189117b45c948a2a03268a3b9e9a5f53053a78f00ebb12da980ff16e73811b6a71a740a53 SHA512 74ecb555eb25528241136ce9b88bb2912ae3e54908b903d898bd82c441c27e4a9438e7303959309261325b3c759f782f0c206da1d6de69ef6bba53a58d93a2d0
-EBUILD camlp5-8.00.01.ebuild 1069 BLAKE2B 7f5efb45643cde63727e81f2560714d0da4425ee77792584b77c89da085b033c2db94b789e05361a0708929284997a094bd06bb225947a2cbed6186d34967c81 SHA512 6a6bd5b0314e4d1b44328ed077a3146e6c905c2d73fb5f422271624ef18f23e235e154aa7f837e6c2c1aec202ab201841f475618f3fa5013f2c2f3af98125bf2
+EBUILD camlp5-7.12.ebuild 1280 BLAKE2B 0e7c25d2192532b3cc8cef1e6e3b3fa8a5190c7d37ee6eaa7c572fc19e0d3b838bba94c23fb17c54334bcfafce0a45e19fd08569751823f94945968a99cb7b2e SHA512 5fb872b69c0973ba8d02a32529b11c7576a240a4f1d434a087e3f6feb1acbea814fc10e7b14e55de17715b3251a675f7dae82109f2d1a99beb6da6750044f2cd
+EBUILD camlp5-7.13.ebuild 1093 BLAKE2B 1239508ecf149d68dc7a2d5626741e6f3c742f0cc4fe9991bb1ef720123a5e571130d47bf668054a3bf71247fc2cd909b2da47b246df29128e34bec50811ff3d SHA512 aaf3a19867459c156ac8092260a12a0baba848a5e875ae4ad4017167d0a038e3f89638b2b4d51d64447407ada01a307503380ab3cbd0d286875216d338a0ea42
+EBUILD camlp5-7.14.ebuild 1140 BLAKE2B c83d75ec1150313f8250e575a82422dab8b5389e6d6c718c4c5775f2a107dfe97ffea39c09323a9963881dca84b085b8a703e90ce4175cdf5db4d7aff9bbaac1 SHA512 b646f392a86d5d9abf96d8e02b722c04dbcc4f2ea6873431b42823161bb0eb5301bc2b17dbb54b7aad36dcc8dc7683f3e32aa2da0defcad404c0231e7d97d581
+EBUILD camlp5-8.00.01.ebuild 1068 BLAKE2B db4884cf8c88484177192dcdd56141f33f5966b493face10b680e44196d3ace20caa49e9408a94ba9678402846804ea3784d0ad27fc300f16911215ded2be3e4 SHA512 df3ba385b0ba80794c30a233acf4590b79caa33ec71784cc9915792685a114eda1f922dc7f0bef0f5b6556f8b034192e3ad7ba422dae6016918482d19fdb1d89
 EBUILD camlp5-8.00.02.ebuild 1073 BLAKE2B 3dbaf6c7694f1a52ebfc7b67b34fdec0256a4f4a6b6fd711672756a5d789e78888b96e15f789bbf11af10bd2b4d5e7574248701597efcfe45d8b0f9d10a45c71 SHA512 02f0ee65b774f7ac70953f9b9ed41354de6a95748ee6ecc8b19a7067a4adf07438201f0e204a0d011e18134ef1cdb1b6147d185cfd29789179479ce0765ad79e
-EBUILD camlp5-8.00.ebuild 1073 BLAKE2B 3dbaf6c7694f1a52ebfc7b67b34fdec0256a4f4a6b6fd711672756a5d789e78888b96e15f789bbf11af10bd2b4d5e7574248701597efcfe45d8b0f9d10a45c71 SHA512 02f0ee65b774f7ac70953f9b9ed41354de6a95748ee6ecc8b19a7067a4adf07438201f0e204a0d011e18134ef1cdb1b6147d185cfd29789179479ce0765ad79e
+EBUILD camlp5-8.00.ebuild 1072 BLAKE2B 69f0e09bc3c90e19dc7355761f8e01583d3b973c46c09cad5055b280d377bc122c1191519061ff9688dcd94d2bb28cf47d2adfdff95a818cf192fc072c27efb9 SHA512 36850c29cdaf5da523425f47c359ad0dec494bca43184d24d7888e0cb4e8f0e160bb6c46734179467e75fd42548f7e742d0eb31bc9213239df5aaeff5675cfc3
 MISC metadata.xml 416 BLAKE2B a354d5be50f3c22d734a960b5dac99af636478ff44b6fb31758d879ab4b31be5a64993a3cdff8fdaca59c7682d4597a73883c137679ab7817cbfd70869cb2a41 SHA512 b9eb28bca32dde11e1b266526c2381ac8c4bab983d9dab5f84bfffcd684e3c0525afce1e72d0fc7b2369298679a4c859a215ccaf6b223b6fcdf6efde12975fc0
diff --git a/dev-ml/camlp5/camlp5-7.12.ebuild b/dev-ml/camlp5/camlp5-7.12.ebuild
index 57725adb301e..8b1abd386720 100644
--- a/dev-ml/camlp5/camlp5-7.12.ebuild
+++ b/dev-ml/camlp5/camlp5-7.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="doc +ocamlopt"
 
 DEPEND="
-	>=dev-lang/ocaml-3.10:=[ocamlopt?]
+	<dev-lang/ocaml-4.11.2:=[ocamlopt?]
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-ml/camlp5/camlp5-7.13.ebuild b/dev-ml/camlp5/camlp5-7.13.ebuild
index 79a35e5dfeb0..3d68c705bf6e 100644
--- a/dev-ml/camlp5/camlp5-7.13.ebuild
+++ b/dev-ml/camlp5/camlp5-7.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="doc +ocamlopt"
 
 DEPEND="
-	>=dev-lang/ocaml-3.10:=[ocamlopt?]
+	<dev-lang/ocaml-4.10.2:=[ocamlopt?]
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-ml/camlp5/camlp5-7.14.ebuild b/dev-ml/camlp5/camlp5-7.14.ebuild
index 15bdbb1dce8f..48746ddf0123 100644
--- a/dev-ml/camlp5/camlp5-7.14.ebuild
+++ b/dev-ml/camlp5/camlp5-7.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ KEYWORDS="~alpha amd64 ~arm ~arm64 ppc ppc64 x86"
 IUSE="doc +ocamlopt"
 
 DEPEND="
-	>=dev-lang/ocaml-3.10:=[ocamlopt?]
+	<dev-lang/ocaml-4.13:=[ocamlopt?]
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-ml/camlp5/camlp5-8.00.01.ebuild b/dev-ml/camlp5/camlp5-8.00.01.ebuild
index dc69d481ee55..b355b7dbcd95 100644
--- a/dev-ml/camlp5/camlp5-8.00.01.ebuild
+++ b/dev-ml/camlp5/camlp5-8.00.01.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ KEYWORDS="~alpha amd64 ~arm ~arm64 ppc ppc64 x86"
 IUSE="doc +ocamlopt"
 
 DEPEND="
-	>=dev-lang/ocaml-3.10:=[ocamlopt?]
+	<dev-lang/ocaml-4.13:=[ocamlopt?]
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-ml/camlp5/camlp5-8.00.ebuild b/dev-ml/camlp5/camlp5-8.00.ebuild
index fe4e5ebe5766..ffb5cef05c58 100644
--- a/dev-ml/camlp5/camlp5-8.00.ebuild
+++ b/dev-ml/camlp5/camlp5-8.00.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="doc +ocamlopt"
 
 DEPEND="
-	>=dev-lang/ocaml-3.10:=[ocamlopt?]
+	<dev-lang/ocaml-4.13:=[ocamlopt?]
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-ml/camlzip/Manifest b/dev-ml/camlzip/Manifest
index 78762dc13491..da3cf7dba96d 100644
--- a/dev-ml/camlzip/Manifest
+++ b/dev-ml/camlzip/Manifest
@@ -1,5 +1,5 @@
 DIST camlzip-1.10.tar.gz 27335 BLAKE2B bbf24953634278589395dd9fcedf1e3becce8dad1f380393dc3ac59589143e1685dc14085ef566e12fb751c6f1a333dd368795a5083b94a43b71e058e86489f3 SHA512 5c42e0d808230e3820b2e7ef34b544ca51a7bf0a484ce4e1c8b1e4966133196bb3ff7c3ca85b9c50050aca389316eb52f0335f6e2ad60c000594a33171b9a9a9
 DIST camlzip-1.11.tar.gz 28483 BLAKE2B b270e2a764547117d87a18f9ccca82891bc0dce182ea84f76b693acb34488ff25d8975154b843787554798bfd34c16dc6a25c431f8674c8c59eb2c195167c12b SHA512 4d69ef900437e66e00cd345497ec70f407f28cd8344ee5f2fad685d3bfe356924597d1854b752f2841b4007f96d6e0307cfae7e13cfb6f74951ae3eba5198a06
 EBUILD camlzip-1.10.ebuild 903 BLAKE2B 8c3f6b59e4efeed7418ddf85d711bb41fc3b30a0e02e6f169d5cd0d604b43412fb54ff9b16e79168c413b0cb168900d8e42e0a8dee0e3e86877e00a4572051d2 SHA512 9525f5b22a9ef4c20a518e3cc05ec820cc92c7cdf16b6a10e35ade61678d3d18e81408fadbbe1e6261f389e5e6b5c6c96dfa917e734033d68fde6741c57f9dca
-EBUILD camlzip-1.11.ebuild 910 BLAKE2B b5292983f3976f79961e77496af5c89499fa0ee28140d84dd8caf293e14844e02002507cf7e73b3ddee9210346e227313ce55d4dc887d94a1d4b282117ce7fe2 SHA512 6ecfb6c0cdc8d535bf9bc2979512e62b4c4a04b99adff6d3b4f7f22cc51dc140477fd6bab53fccd525d971e12c8e31ed17cadb99c064f5cb5e47af1572018806
+EBUILD camlzip-1.11.ebuild 913 BLAKE2B 9964a7228b99c47229a4af7b5b4fd8ff080ecae8a81d78028a481b78e5a9258551149be5c0d20b1368080fb1a86a354172042f9f9f2a456b3050fc86abb10f2d SHA512 9ef80d7cf638aff72a07de02f00437da6816726196260006ba35dacc56aed57e990a8bdf2efc993a35299bce8ec0c17e8ee7a46ddb6ea0fc23da5c23a72ed6ea
 MISC metadata.xml 317 BLAKE2B d2d9b49548ab2d8a585cb4823b37b990805229909bb3ab23596ac5d916d2e7a2fe56153b1793d5e0979159e97f28289e14ded93d943541b7ab8def4cc195874b SHA512 5b7aa5dfdc7ec25161029b2d96a2596458b5507359fe25ff82268a98038f8d66f4fc095715348990d7116877035e17b0a2ed2d5541a990dcab1bd0155cc12ba1
diff --git a/dev-ml/camlzip/camlzip-1.11.ebuild b/dev-ml/camlzip/camlzip-1.11.ebuild
index 09d1e837bb67..ea2b449e8b1a 100644
--- a/dev-ml/camlzip/camlzip-1.11.ebuild
+++ b/dev-ml/camlzip/camlzip-1.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -25,7 +25,7 @@ QA_FLAGS_IGNORED=(
 )
 
 src_compile() {
-	emake all
+	emake allbyt
 
 	if use ocamlopt; then
 		emake allopt
diff --git a/dev-ml/dose3/Manifest b/dev-ml/dose3/Manifest
index 95288098017c..950656250983 100644
--- a/dev-ml/dose3/Manifest
+++ b/dev-ml/dose3/Manifest
@@ -4,8 +4,8 @@ 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-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 1037 BLAKE2B dbfc048052bfc459023ce55e183b1ca95f5cb69fd9fbedbb90e7448a1466be70254c17c9318c7bb7d2eafa3fde9a3a7bc543afc5d0e0e24ecfe652622d387894 SHA512 96c8dafbb121d6038ca078f453901ba8c05c66880334f2bfcd4663746e52a1e002c9d958da168fa87ee2da878df5ca949d45d6ed4d3842c63305c1bad2fd43b8
-EBUILD dose3-7.0.0.ebuild 1043 BLAKE2B 986a178bfc55ba944baae87a35357306812cd8ace165aedd819a448dddd92f95475d5b45d2811161b1b61a81939aa537df2d4a0ef8f174f52777d602fd1f18cb SHA512 08531eca8fad57a66c51de82cb39be9da90f8d8cea8432872d4934db9cb9022642fc8723604217819e43b3c9f6229941b5f5d4c55cab0d3d0e511b16743eae22
+EBUILD dose3-5.0.1_p16-r4.ebuild 2212 BLAKE2B c2f8f82a5b61aa558e6bc90f2eb71d6a336141ba246f35c43f3b3bec9bd77079dbc8510e3cf90a1205d2c922b8e0b409f0232b2d632ed508f3b3437203a849cf SHA512 55995ee10a1c88ef01bebfd24a92988873fcbc9cbf9f586cad83cb798f118ce7181e6740385700970788110428591b193ec256ce12f80d076e5f3efe0610818d
+EBUILD dose3-6.0.1_p2-r1.ebuild 1245 BLAKE2B cad28ed32828cdedab246c4653749d412aafbbbe42ef417fcab6c58866ac20661c4339ebaa5eb9444f265a4bd9b07b77c2c1c0766471627c6d617f7ed897e16b SHA512 2e940bd834649f4505d1b1cc9167c7d8dd88f2320380b79f82fa8663e03412be39fcbef0ca739bfea6c5c54a224d0a1341e793aa762eedad5ccd025c7e5ad48f
+EBUILD dose3-6.1-r1.ebuild 990 BLAKE2B c5850ec9f45da35a1e513ca967d86e39196a128dcb8da9234a30324b6cec7f0497a3b7310bf9739a2a2aa43421e6736187b5d6537484fac585a76c8d2181a529 SHA512 7de242a8cd973e5a5af449cdbc7a5fb78c41bd05dc66458c4a60a723d8f87b4ea1c4b02052bdc4a2ba2e6da3f95d17cfb9fb490bbde02f1ce89ecec5591844fb
+EBUILD dose3-7.0.0.ebuild 996 BLAKE2B cd9a07a5ac89d424cc7f7f7ccf16585982957a06f9b5eb080619bd8aee24cd8901ba38f7ea5b7a2a859af81b9129efc1efccce781fe619539a0aacd249ff1184 SHA512 d2a9ea6189a8570db38cddba3f31fc11214d5d982828e71d5e8b62dbd16ceab121fe6bf1984f3c583c934c82d04120d26b8b5230fd9365d737444b3a771a61a5
 MISC metadata.xml 568 BLAKE2B 3ded228894bc51a457d66de967eb5b1a47fd4a1239709f4573e7746198eccbea27db34cb6dface497e38f14b0c3e9405d85241d7757984961c2169f1699cc3b0 SHA512 8fdbf1f9e6fd6719ff88deb8ea5c705be2d35831713c2fbc4d55d9cc6277d1822ede3af006b1e818ed0bca18e84e8b2a1f10b26593a525132a4d40a8e5844e05
diff --git a/dev-ml/dose3/dose3-5.0.1_p16-r4.ebuild b/dev-ml/dose3/dose3-5.0.1_p16-r4.ebuild
index fd0e74c8c652..a1b877c1a01a 100644
--- a/dev-ml/dose3/dose3-5.0.1_p16-r4.ebuild
+++ b/dev-ml/dose3/dose3-5.0.1_p16-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}-$(ver_cut 1-3)"
 LICENSE="LGPL-3"
 SLOT="0/${PV}"
 KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
-IUSE="+ocamlopt parmap zip bzip2 xml curl rpm4 test"
+IUSE="+ocamlopt parmap zip bzip2 xml curl rpm4"
 
 BDEPEND="
 	dev-ml/cppo
@@ -38,9 +38,7 @@ RDEPEND="
 	curl? ( dev-ml/ocurl:= )
 	rpm4? ( app-arch/rpm )
 "
-DEPEND="${RDEPEND}
-	test? ( dev-python/pyyaml[libyaml(+)] )
-"
+DEPEND="${RDEPEND}"
 
 # missing test data
 RESTRICT="test"
diff --git a/dev-ml/dose3/dose3-6.0.1_p2-r1.ebuild b/dev-ml/dose3/dose3-6.0.1_p2-r1.ebuild
index 481f80ee4a29..1067de1e94ef 100644
--- a/dev-ml/dose3/dose3-6.0.1_p2-r1.ebuild
+++ b/dev-ml/dose3/dose3-6.0.1_p2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-$(ver_cut 1-3)"
 LICENSE="LGPL-3"
 SLOT="0/${PV}"
 KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
-IUSE="+ocamlopt test"
+IUSE="+ocamlopt"
 
 BDEPEND="
 	dev-ml/findlib
@@ -34,9 +34,7 @@ RDEPEND="
 	dev-ml/xml-light:=[ocamlopt=]
 	app-arch/rpm
 "
-DEPEND="${RDEPEND}
-	test? ( dev-python/pyyaml[libyaml(+)] )
-"
+DEPEND="${RDEPEND}"
 
 # missing test data
 RESTRICT="test"
diff --git a/dev-ml/dose3/dose3-6.1-r1.ebuild b/dev-ml/dose3/dose3-6.1-r1.ebuild
index 1b4d850dfebc..133186dea4f1 100644
--- a/dev-ml/dose3/dose3-6.1-r1.ebuild
+++ b/dev-ml/dose3/dose3-6.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}-$(ver_cut 1-3)"
 LICENSE="LGPL-3"
 SLOT="0/${PV}"
 KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
-IUSE="+ocamlopt test"
+IUSE="+ocamlopt"
 
 BDEPEND="
 	dev-ml/findlib
@@ -33,9 +33,7 @@ RDEPEND="
 	dev-ml/xml-light:=[ocamlopt=]
 	app-arch/rpm
 "
-DEPEND="${RDEPEND}
-	test? ( dev-python/pyyaml[libyaml(+)] )
-"
+DEPEND="${RDEPEND}"
 
 # missing test data
 RESTRICT="test"
diff --git a/dev-ml/dose3/dose3-7.0.0.ebuild b/dev-ml/dose3/dose3-7.0.0.ebuild
index 61f021989ef4..6bc85c2157e4 100644
--- a/dev-ml/dose3/dose3-7.0.0.ebuild
+++ b/dev-ml/dose3/dose3-7.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}-$(ver_cut 1-3)"
 LICENSE="LGPL-3"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="+ocamlopt test"
+IUSE="+ocamlopt"
 
 BDEPEND="
 	dev-ml/findlib
@@ -33,9 +33,7 @@ RDEPEND="
 	dev-ml/xml-light:=[ocamlopt=]
 	app-arch/rpm
 "
-DEPEND="${RDEPEND}
-	test? ( dev-python/pyyaml[libyaml(+)] )
-"
+DEPEND="${RDEPEND}"
 
 # missing test data
 RESTRICT="test"
diff --git a/dev-ml/dune/Manifest b/dev-ml/dune/Manifest
index 7c9ee2bffbd2..882652ddbcaf 100644
--- a/dev-ml/dune/Manifest
+++ b/dev-ml/dune/Manifest
@@ -7,9 +7,9 @@ DIST dune-2.9.0.tar.gz 1385143 BLAKE2B c973e4b2c5780a3e4902c31c030b2560fe5be3133
 DIST dune-2.9.1.tar.gz 1385381 BLAKE2B 27224f803547d02f7110dcfc486ef41f9a4586f6f862ef7f8bbf05cc1f3f6dc8ea03fca99c01842f4226ea3d08f4127daa0e5811dd46cc00f1b96ad7eaafe43d SHA512 4fcff34de4acc4429dd73864ca90e695d8ba436839fd679608f7db292e44be70c3db455a58f59477f2055f84ce497bfa8e90e485ed9536acad3c1b3be3d4be77
 EBUILD dune-1.11.4.ebuild 670 BLAKE2B adc969c1d17b4012bf83eee162f575ac804a97fb73cdfe49479fc6c8c0e63a45b60b21d0e33ef335b58b8576e7efbc8298972da3d8c6d0dd1d7ee0192c77bc07 SHA512 0edaaa2853cabda0a8aae6f67b633262608592e1cbe0fa0043f8bc9a4af80fd2a7f5b10ec2156d8c384ae4cf69fbc63c41e31672c45afadae849f03bc2d01c71
 EBUILD dune-2.1.0.ebuild 675 BLAKE2B 96dd8ec1a6c065919c057a9faf06321f60aec1bf4d14db47b194ddbac137a614898331b02c45b528ded939f94576de2789a1c1b0fb7796f4e37a7b2f196dce5b SHA512 b655265fa0774f42cb9428c2d86f574b311660a88300c8e0bb9c35aa4b5d5750bb6392084614c2cdbfee6766c7a50067b0be9ff0f3e8c4ca1f8bd4e9cb918acb
-EBUILD dune-2.7.1.ebuild 767 BLAKE2B 18b22cc6407814bdef1baedfe7c325224d69fd126c301117df421e063021d16f9d8a5582e2bc6f10dab9f60c27f2fa4901514930fed56c3ec390f00697817d94 SHA512 789838c90fd024367af2cdb5b5f125b0a2d58f5afbac1af09d7b69968503e0256d4974453e1b5c958d3e73c00ec24442f34c448dc2913742ad31bd059c49379c
-EBUILD dune-2.8.2.ebuild 896 BLAKE2B 528ec447be147ccfb4a710413611572d965436af2329ca4d24ca98f8171085890d1578f6bb184a1440b1e4e071ae14b53d095606af7ab6aca322a93aeeae8338 SHA512 30d730b466910f63939417076c699235e00dcad0df4050916626aa08ffbb81cb1521d3fb8fc2234f2ab1d45d4b10b7656719f4bf63ed2d9383d2c6caa2906924
-EBUILD dune-2.8.4.ebuild 896 BLAKE2B 528ec447be147ccfb4a710413611572d965436af2329ca4d24ca98f8171085890d1578f6bb184a1440b1e4e071ae14b53d095606af7ab6aca322a93aeeae8338 SHA512 30d730b466910f63939417076c699235e00dcad0df4050916626aa08ffbb81cb1521d3fb8fc2234f2ab1d45d4b10b7656719f4bf63ed2d9383d2c6caa2906924
+EBUILD dune-2.7.1.ebuild 789 BLAKE2B f79041a98b249f36a74d8aea57f3d1ff2c6cf3fd766283b0e38551ac565c6fde00a67cb1404c3ba60a4e90f24066915a6644e439636173a54096325da652cbd6 SHA512 6affe0df1b4db6c1e1af575e17ae3b03e6ea8f43d9c9aab4aeda4bdca87232d7e5ab5b8b0ebf627465f58cc96358c41c12390416fbd761be219566b3a89c4a8e
+EBUILD dune-2.8.2.ebuild 918 BLAKE2B 8d06307c3a2adfa5f2fd329a7443e092ba020baed31ead75b29207b76afee1a6bbedbf6365871309d97b020968dd781f30441c5500c3901cdf7c8ba5f3c4097d SHA512 8124c3dc7a444f576da1b791af4ab10ca084f3aea247c67fdb6eb9dbe2903f7f7705f756dae07eb6808a1537f23a7708b5c8f6abe4498f9d44c8200875120883
+EBUILD dune-2.8.4.ebuild 918 BLAKE2B 8d06307c3a2adfa5f2fd329a7443e092ba020baed31ead75b29207b76afee1a6bbedbf6365871309d97b020968dd781f30441c5500c3901cdf7c8ba5f3c4097d SHA512 8124c3dc7a444f576da1b791af4ab10ca084f3aea247c67fdb6eb9dbe2903f7f7705f756dae07eb6808a1537f23a7708b5c8f6abe4498f9d44c8200875120883
 EBUILD dune-2.9.0.ebuild 902 BLAKE2B 56cfab513a0767ba85a2e8808e8f3a7cc687869a8c60366a42d278ee52774078690b8c4110bdbeac07fc3699cc1fb1dd4f1efd6087c3e086c9ae2da862a691ac SHA512 5c954d7e379db8aaf2eca54cdd084c2146e627bd61b0ce556fabc1d2c4de31738f98df0f07518a15257887f80db92e2cd5c7a587c8d72b9266fabe35093c6cc9
 EBUILD dune-2.9.1.ebuild 899 BLAKE2B b2c0ccba4c16e614eb4f4381955c5b615b5cbe2943e7e2c04863f00e85b580d91e56e1526af65c72e8388b3b2b6253883e9bbc1857785ed8ed4b103e8845f815 SHA512 69976a1641eca9a00b35efe8663f8a2e8073bef7b290a553730bbf180d43248e16fad5a92e3483ec9b0f19a5ce7a86659e80ac3b4e05ed76169ea4e8b4d480ca
 MISC metadata.xml 413 BLAKE2B 68bcbe6d091780d3ea48707a42b402cfcc075b1ca0c58a8e145bc8ae6e89806361325f772e9e8b05484fc258f09e33c18fa329a494881e3275f534c65b283c15 SHA512 6520ccff6f2071125a07d0e6bc365c8a919ff32791af97fc633ef68b351de8295454884126334e182da7233744d489acfeb2519c3935990ad21eb20da3f5a1f9
diff --git a/dev-ml/dune/dune-2.7.1.ebuild b/dev-ml/dune/dune-2.7.1.ebuild
index d4ddb517ae0d..c619f30adc03 100644
--- a/dev-ml/dune/dune-2.7.1.ebuild
+++ b/dev-ml/dune/dune-2.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,8 @@ SLOT="0/${PV}"
 KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="test"
 
-DEPEND=">=dev-lang/ocaml-4.08:="
+DEPEND=">=dev-lang/ocaml-4.08:=
+	<dev-lang/ocaml-4.12"
 RDEPEND="${DEPEND}
 	!dev-ml/jbuilder"
 
diff --git a/dev-ml/dune/dune-2.8.2.ebuild b/dev-ml/dune/dune-2.8.2.ebuild
index ae0c9474e80e..879ff48951d0 100644
--- a/dev-ml/dune/dune-2.8.2.ebuild
+++ b/dev-ml/dune/dune-2.8.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,6 +17,7 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-lang/ocaml-4.08:=
+	<dev-lang/ocaml-4.13
 	!dev-ml/jbuilder
 "
 DEPEND="
diff --git a/dev-ml/dune/dune-2.8.4.ebuild b/dev-ml/dune/dune-2.8.4.ebuild
index ae0c9474e80e..879ff48951d0 100644
--- a/dev-ml/dune/dune-2.8.4.ebuild
+++ b/dev-ml/dune/dune-2.8.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,6 +17,7 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-lang/ocaml-4.08:=
+	<dev-lang/ocaml-4.13
 	!dev-ml/jbuilder
 "
 DEPEND="
diff --git a/dev-ml/labltk/Manifest b/dev-ml/labltk/Manifest
index c70f55b29a0e..64d425efebde 100644
--- a/dev-ml/labltk/Manifest
+++ b/dev-ml/labltk/Manifest
@@ -5,8 +5,8 @@ DIST labltk-8.06.10.tar.gz 371871 BLAKE2B da67b13aa0a0c179c2fcefe6b03f68225b6e88
 DIST labltk-8.06.11.tar.gz 372194 BLAKE2B ea81662201f6166cd6fb46fe1681ffdab94703dd3e338244079ad2c67df421969618d7fb2ba2b9b5eadb732eeb927c3de03f19fb5b3621c1461924aeb2f347d5 SHA512 a4ad5fa31cbc89066445bc71a0c1c016f7e299b6bf88a5f77d559c805bc78d90651988658c8a300770ca41514ad73272691feaa84179637fcc695c96bbf25dd6
 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 1229 BLAKE2B c6d0482b1d4dcc91a4e41f3fb41a6218cbf3e3bc84ac8e136de68574121733a4648e5010195ea33f8fdfa6931dc8bc37d850502c1fe956edea6037c5c328b81f SHA512 4271998f30f5c26da6cae6bab04c5a81ea202dbed31c65e9d91e93c6af8ecf3db934dc6b3e982ded2d3aac6d02c5af4b0faf2bdc33417b00974845d6d14ef9af
+EBUILD labltk-8.06.10.ebuild 1251 BLAKE2B 35d5958f6879d83678986ade9d464156bb360625ff51e8ece402ee9ce8b43e629556684c6e50326d7e85f7dab738853681e9d335a22e4d1e7317cb23302e97e0 SHA512 940d1f8a44da7e1dba5565953e2286005751a35105bc5c39d6f68bc234899d9c00f3f74058fefed5438ff8b4ccf6e9dc6c8f57081cf632cac841578543e1b0c0
 EBUILD labltk-8.06.11.ebuild 1109 BLAKE2B 9c99933045cc64a79216ae7f883d0687b0615a4727ec35f44aad56511c4fedc44e6204e06c7192c3fff00345c703324235abf82a5d7e80536da4bd2dcb8bc56e SHA512 216c80e54775ff1abe658e1e98f84c724a816ea60fe257d204b901075f156d4abb67dfa3689d3b84bd527aa26548b420a73b4829e814a9579065b01d128e00f9
 EBUILD labltk-8.06.7.ebuild 992 BLAKE2B 67153839b68d13cfdbe8eab47a10c65d03beefbcc08b27edeb9d75c144ef563787978037e6a7a52f6c50707d0ecc52e77c29fe3de509bd19d8c670e4cc82344a SHA512 181baa5df2eada2fb0768691bdf37a2b18e91633e99b529205477310d8eed23a9fd35250aa19ae2e849a09b3ba660483911cc3a3aa60f862f3105ab7e0a1c417
-EBUILD labltk-8.06.9.ebuild 980 BLAKE2B 030b066865f536672e2f097909a622175edb0e0fe622734628cce7cd556ee602041842e99beb79009089e6a59edb450e5542f4ca873ccc732c5bcb10187aab36 SHA512 8c25f38845bc032fba61c9f7694eaf8aa82ca1b80401aad0650fc350dea967dc60bfc53cd625e9de9c6b9f4b551a9c17d1d5adab033b0bd413576e8ece9c6d22
+EBUILD labltk-8.06.9.ebuild 1002 BLAKE2B f9a9ddd249c3d8addde9bce3c86e6ab0b1525091735d44529aceac3914472abee7b2f878c4d7fabe17b86cf578893a2fdd64a870408e0b0ebc9eab338c5b8a8c SHA512 0be6baeecc9c8b074594f10fbe245eed572118f60342d532ba5d3c5b2d5102b6cbbbe6f6ad104d94d599e6b5136b2d486cf376d85ec3543ad1e66ddd24c118d5
 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 df062570447a..8c4ae9062615 100644
--- a/dev-ml/labltk/labltk-8.06.10.ebuild
+++ b/dev-ml/labltk/labltk-8.06.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,6 +16,7 @@ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 x86 ~amd64-linux ~x
 IUSE="+ocamlopt X"
 
 RDEPEND="dev-lang/tk:=
+	<dev-lang/ocaml-4.13
 	>=dev-lang/ocaml-4.11:=[ocamlopt?,X(+)?]"
 DEPEND="${RDEPEND}
 	dev-ml/findlib
diff --git a/dev-ml/labltk/labltk-8.06.9.ebuild b/dev-ml/labltk/labltk-8.06.9.ebuild
index 10d78bc548ad..dabb658293ef 100644
--- a/dev-ml/labltk/labltk-8.06.9.ebuild
+++ b/dev-ml/labltk/labltk-8.06.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,6 +15,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-li
 IUSE="+ocamlopt X"
 
 RDEPEND="dev-lang/tk:=
+	<dev-lang/ocaml-4.13
 	>=dev-lang/ocaml-4.11:=[ocamlopt?,X(+)?]"
 DEPEND="${RDEPEND}
 	dev-ml/findlib
diff --git a/dev-ml/llvm-ocaml/Manifest b/dev-ml/llvm-ocaml/Manifest
index 81e336854a54..6af5c567525d 100644
--- a/dev-ml/llvm-ocaml/Manifest
+++ b/dev-ml/llvm-ocaml/Manifest
@@ -2,10 +2,12 @@ DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45c
 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
 DIST llvmorg-13.0.0.tar.gz 147270176 BLAKE2B 628f316b580e1edf3a58d4825b724df759e6ed2a4116802470c04562caefc392fa325c91f388036365a2e45a9595cca6d3557fab12984fc8bcfef29c9116d822 SHA512 8004c05d32b9720fb3391783621690c1df9bd1e97e72cbff9192ed88a84b0acd303b61432145fa917b5b5e548c8cee29b24ef8547dcc8677adf4816e7a8a0eb2
 DIST llvmorg-13.0.1-rc1.tar.gz 147284646 BLAKE2B 3a1d8d382de633b7f8fc998f8ad1e03c24b733aefc591615cbd34115d1d6d74962ae33bbf2224527b521a76930ffee425527225563a558a04173e9aa9487c781 SHA512 d487bfc9b898ad0046e0c94338d7757d8a05a1a84d683abfbc9ed4994c6d12caf88fd18575225e284070fc67b3ac0970ca6639e61b1a7cc2948b216a5364a22d
+DIST llvmorg-13.0.1-rc2.tar.gz 147304491 BLAKE2B 86b2c64e57e4aaab837229b25a95d5517ac077d22cf552d71ff6b996dbdbcd171ad51de7eb12d098b50a139beda4ace843727181a1c6978fc487215391e64a3a SHA512 0d890f3317504c8cef10e118b245e5a4c815cc19f07cbc511a66bde6c9b1f3d15c167942608a8987befe9115b24657d29f72305f9f2794385a7434b80167f40f
 EBUILD llvm-ocaml-11.1.0.ebuild 3054 BLAKE2B 0498a14f644a956cf1a495c4b10687328cdd7044b4cf90e09d51c3c93c3f8e7eae29e93b605e7079975cf9b585e14e0c50c85f6b210d6516395f3278f0c2cace SHA512 28ac245ce6fb5caafec11a501e4a8e7a39bf15bad171b445f9b6faf82b8c3a4416925c42ac022bddf262332ca275de3969735b99e642df8c3b64ab3b7d04f85a
 EBUILD llvm-ocaml-12.0.1.ebuild 3060 BLAKE2B ed1223c503df5487c666642a02df41095eb724b46a79c1204f8ce2ff6b9eb650fbb46907d00e721c1ecb5df6648afdefeca6dabca456ab54656fc45871beff80 SHA512 57cdf97cf5a401a5ec33f15f8fb1c83998a7503b4ebcab1c2e35c2b35519d9b30f4b25598ddc2f8e6757f6de42a6a5878ab43e50fd45f1df0db6549a204b1680
 EBUILD llvm-ocaml-13.0.0.ebuild 2596 BLAKE2B 4d22e0d0f89b14f338f0dde0701819d5d94f4c298bf024b06c4d13601f6a61e1ecfd7e7db50c8ab1f7c34e0bb9bbed26c5e61e2ddac80bd6766cf1b163f3626a SHA512 aaba7713d7acaff78ab9949765bd2e095bdf7c32a006653967f9a031113b3c3911b01e55c460f67e38da3574bd2dc8d81026a55cad2aea775363287e01b72684
 EBUILD llvm-ocaml-13.0.1.9999.ebuild 2580 BLAKE2B d044f3d8750bf37a1f9079a0f7659edc50f220abaeff810415062774adde9917e074ae1034da360cd4144e6f23a850b6485b83332edffc89a36282362d76f067 SHA512 2b9d1d759648d36996dcda05b872a204081247100e4cb1efe674ae3853d137ab4169115f4d0466d5b02316e1a35a302733085257bf96e22b8ba964d868e670dd
 EBUILD llvm-ocaml-13.0.1_rc1.ebuild 2580 BLAKE2B d044f3d8750bf37a1f9079a0f7659edc50f220abaeff810415062774adde9917e074ae1034da360cd4144e6f23a850b6485b83332edffc89a36282362d76f067 SHA512 2b9d1d759648d36996dcda05b872a204081247100e4cb1efe674ae3853d137ab4169115f4d0466d5b02316e1a35a302733085257bf96e22b8ba964d868e670dd
+EBUILD llvm-ocaml-13.0.1_rc2.ebuild 2580 BLAKE2B d1aa0c1e454a0a2a5a5af6e525801c1eb68514f6e96d267f5383c4291535c44aebf8a7e0752bd619e685e16c9fe6e2831ecd563802a8a9707969db55d459fcff SHA512 0f2e4a039baf1bdd4fc462d8606493e673c7b538886dab32c929b3894503bd9fb19d3c9a3e7032a65efa97c18f673462d57f48fb4c503544f270763836e7535e
 EBUILD llvm-ocaml-14.0.0.9999.ebuild 2580 BLAKE2B d044f3d8750bf37a1f9079a0f7659edc50f220abaeff810415062774adde9917e074ae1034da360cd4144e6f23a850b6485b83332edffc89a36282362d76f067 SHA512 2b9d1d759648d36996dcda05b872a204081247100e4cb1efe674ae3853d137ab4169115f4d0466d5b02316e1a35a302733085257bf96e22b8ba964d868e670dd
 MISC metadata.xml 217 BLAKE2B 23799663344acc2d532fc6fa7dd798813aef7293fcab616d6300b15a6e603b6d17ca63d5153eb8da1b976215d8e3775e8d3a67026bacc9693993d48ec1cb69a9 SHA512 e13d0436d3a3a449723277a37ae4c5a673139b6da818adf7ad7654d94d3948ed8607b1c27e83e963bf450bd2d5a650c985e27ff5a531db9813cb4ab10b985dd6
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-13.0.1_rc2.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-13.0.1_rc2.ebuild
new file mode 100644
index 000000000000..5551d8610615
--- /dev/null
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-13.0.1_rc2.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cmake llvm llvm.org python-any-r1
+
+DESCRIPTION="OCaml bindings for LLVM"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0/${PV}"
+KEYWORDS=""
+IUSE="debug test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-lang/ocaml-4.00.0:0=
+	dev-ml/ocaml-ctypes:=
+	~sys-devel/llvm-${PV}:=[debug?]
+	!sys-devel/llvm[ocaml(-)]"
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-lang/perl
+	dev-ml/findlib
+	>=dev-util/cmake-3.16
+	test? ( dev-ml/ounit2 )
+	${PYTHON_DEPS}"
+
+LLVM_COMPONENTS=( llvm )
+LLVM_USE_TARGETS=llvm
+llvm.org_set_globals
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+
+		-DBUILD_SHARED_LIBS=OFF
+		-DLLVM_BUILD_LLVM_DYLIB=ON
+		-DLLVM_LINK_LLVM_DYLIB=ON
+		-DLLVM_OCAML_OUT_OF_TREE=ON
+
+		# cheap hack: LLVM combines both anyway, and the only difference
+		# is that the former list is explicitly verified at cmake time
+		-DLLVM_TARGETS_TO_BUILD=""
+		-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
+		-DLLVM_BUILD_TESTS=$(usex test)
+
+		# disable various irrelevant deps and settings
+		-DLLVM_ENABLE_FFI=OFF
+		-DLLVM_ENABLE_TERMINFO=OFF
+		-DHAVE_HISTEDIT_H=NO
+		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
+		-DLLVM_ENABLE_EH=ON
+		-DLLVM_ENABLE_RTTI=ON
+
+		-DLLVM_HOST_TRIPLE="${CHOST}"
+
+		-DPython3_EXECUTABLE="${PYTHON}"
+
+		# disable go bindings
+		-DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND
+
+		# TODO: ocamldoc
+	)
+
+	use test && mycmakeargs+=(
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+	)
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	# also: custom rules for OCaml do not work for CPPFLAGS
+	use debug || local -x CFLAGS="${CFLAGS} -DNDEBUG"
+	cmake_src_configure
+
+	local llvm_libdir=$(llvm-config --libdir)
+	# an ugly hack; TODO: figure out a way to pass -L to ocaml...
+	cd "${BUILD_DIR}/${libdir}" || die
+	ln -s "${llvm_libdir}"/*.so . || die
+
+	if use test; then
+		local llvm_bindir=$(llvm-config --bindir)
+		# Force using system-installed tools.
+		sed -i -e "/llvm_tools_dir/s@\".*\"@\"${llvm_bindir}\"@" \
+			"${BUILD_DIR}"/test/lit.site.cfg.py || die
+	fi
+}
+
+src_compile() {
+	cmake_build ocaml_all
+}
+
+src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-llvm-bindings-ocaml
+}
+
+src_install() {
+	DESTDIR="${D}" \
+	cmake -P "${BUILD_DIR}"/bindings/ocaml/cmake_install.cmake || die
+
+	dodoc bindings/ocaml/README.txt
+}
diff --git a/dev-ml/logs/Manifest b/dev-ml/logs/Manifest
index 954d68db560d..49c13453f842 100644
--- a/dev-ml/logs/Manifest
+++ b/dev-ml/logs/Manifest
@@ -1,3 +1,3 @@
 DIST logs-0.7.0.tbz 18458 BLAKE2B 091d1778166af0b67e17e932a775a73e31e5d167b94b1b378063a7112c21bf1ac935c7e51fe29bcc0121cd5e60ea46ed3c7381f4db5df400b463feedfbe89663 SHA512 657f66eeaf5788947a3ff4b2a179f7e192ad4ce086fc8968286066d4b83af476523b3befce50ee58abf2d9b8c8dc65573ba8ed62f9c5e7933db29a7fb769646a
-EBUILD logs-0.7.0-r1.ebuild 1389 BLAKE2B 6e6e9d777b186683bccc06ef41cf866d13bc2a77574490bd4d75c7d40cae13ea687b6343a8a87f8b557586c4a00d87f28969bc3a558021d256c21ce3698545bb SHA512 5d70fb38482d30f0a57c5afd50e9561248aeb2c053850d70c784878a7a3abdf5b347c284a6a52fdb616e694595aae517032089b78f84974f4f81f68f3592123f
+EBUILD logs-0.7.0-r1.ebuild 1389 BLAKE2B cc6197391eea37ff7d91c0b670c9dcc0bf7b4857ccfa41b1e821f8e3764792698b66bec8ff0dffae8deb77b8c3f1e8743770f4a60d39e04a36055bf35c78b077 SHA512 dfcf2145152fc1373e607277dfce4c18f1e37a223efb8b1c186bb12e5cc4b9766876cca353d8947ab2f6b8c96155d3fb0fed3dab252ef046bd939a6aa6ae7d87
 MISC metadata.xml 587 BLAKE2B 9280d7927d1cc4fdb3e48feda36a486cf45a8cfc4da9248d3b4908958c6a4ce01e12e76ec5c32500c8e5d7ab7f228c12d47e44fddcbbbfa6e731ee14e88314c1 SHA512 a3ef80fa82dedd15f554eb59fe0da20d004eb0e0a5ca9bc110c4c0d0e466037239bd460bc303111143ca00256f28069195f17038e5eef3d5da9cc63492c56a69
diff --git a/dev-ml/logs/logs-0.7.0-r1.ebuild b/dev-ml/logs/logs-0.7.0-r1.ebuild
index e422a0867153..7df040fc0574 100644
--- a/dev-ml/logs/logs-0.7.0-r1.ebuild
+++ b/dev-ml/logs/logs-0.7.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -47,7 +47,7 @@ src_compile() {
 		--with-js_of_ocaml false \
 		--with-fmt $(usex fmt true false) \
 		--with-cmdliner $(usex cli true false) \
-		--with-lwt $(usex fmt true false) \
+		--with-lwt $(usex lwt true false) \
 		--tests $(usex test true false) \
 		--with-base-threads true \
 		|| die
diff --git a/dev-ml/luv/Manifest b/dev-ml/luv/Manifest
index c59f9ffbfd7f..2306ba7121da 100644
--- a/dev-ml/luv/Manifest
+++ b/dev-ml/luv/Manifest
@@ -1,3 +1,3 @@
 DIST luv-0.5.10.tar.gz 805333 BLAKE2B 23edd2bc870a2886e560d330d9a20b205a77ea7bc8ed631e00e43819474eeb75246b407113b59ed9c5f74462ad5f721338ac5a157a1fe0e443abf9ff88771089 SHA512 c50a0def366944b4ef6038503ecefe75d8e45f542311198531f01a355675c08b00370480141b455616429a883c3232d34628e6a67846db5864a1b0eabfe6311f
-EBUILD luv-0.5.10-r2.ebuild 601 BLAKE2B 5e78af11122c6f843dbc6effdb3af270ec648ce4fd06cc789403fce806fdc125607173064daa8356bcbb402bbbb34b1e951d0b8f536f7eccc8dfa489224b035e SHA512 64ad9d467a4ae64d3563c128678883823ae89cdc1f39a27fdb0283f38e491d0bde7f1b875df2bed3ba0f131971ee4bbfab1cb4a606bef60a56a65d9bee30d0a1
+EBUILD luv-0.5.10-r3.ebuild 769 BLAKE2B a708d2d80c8c0e8bd6e1c2103096b77cbf72b1dfb69c0c920217adf7ff63bd6d43b7d7977cb1ad0978b1b8f775dd8833f8d81cb3e868922848465e2cadacaa0a SHA512 d00aff7e5a8bb84080ca886f004867470afe3d0c25523a3105932088551bd94f004d0f0328533c5dd2bcdd80bda03c0d57fb3b438915fed99b8d41fb16881db7
 MISC metadata.xml 309 BLAKE2B 2571e139ee75123b88f05751d493805433dd5f22ac3f06e82adf97017f53fa54c1870ee947b4e98ed55d4f134b837e1850d86fb10e6db43f0c37f1d54a2a07db SHA512 a917d2ea07601ed6c8d9386ce92deb19dfa0a37e3cf42b7808cb9e6e47ad57b1a9495f4b5f43695bd13d1a09837e40ae265bcb1b6bac30e62fec39bee1728456
diff --git a/dev-ml/luv/luv-0.5.10-r2.ebuild b/dev-ml/luv/luv-0.5.10-r2.ebuild
deleted file mode 100644
index 01d679ae6917..000000000000
--- a/dev-ml/luv/luv-0.5.10-r2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit dune
-
-DESCRIPTION="Binding to libuv: cross-platform asynchronous I/O"
-HOMEPAGE="https://github.com/aantron/luv"
-SRC_URI="https://github.com/aantron/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-SLOT="0/${PV}"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="+ocamlopt test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	<=dev-lang/ocaml-4.13:=[ocamlopt?]
-	dev-libs/libuv:=
-	dev-ml/ocaml-ctypes:=
-	dev-ml/result:=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="test? ( dev-ml/alcotest )"
diff --git a/dev-ml/luv/luv-0.5.10-r3.ebuild b/dev-ml/luv/luv-0.5.10-r3.ebuild
new file mode 100644
index 000000000000..bab7576ca5ce
--- /dev/null
+++ b/dev-ml/luv/luv-0.5.10-r3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+DESCRIPTION="Binding to libuv: cross-platform asynchronous I/O"
+HOMEPAGE="https://github.com/aantron/luv"
+SRC_URI="https://github.com/aantron/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	<=dev-lang/ocaml-4.13:=[ocamlopt?]
+	dev-libs/libuv:=
+	dev-ml/ocaml-ctypes:=[ocamlopt?]
+	dev-ml/result:=[ocamlopt?]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="sys-devel/gnuconfig
+	test? ( dev-ml/alcotest[ocamlopt?] )"
+
+src_prepare() {
+	default
+
+	cp "${BROOT}"/usr/share/gnuconfig/config.{guess,sub} src/c/vendor/configure/ || die
+}
diff --git a/dev-ml/merlin/Manifest b/dev-ml/merlin/Manifest
index 13a5c5bd3418..56167ef80232 100644
--- a/dev-ml/merlin/Manifest
+++ b/dev-ml/merlin/Manifest
@@ -1,12 +1,10 @@
 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.1-r2.ebuild b/dev-ml/merlin/merlin-4.1-r2.ebuild
deleted file mode 100644
index 1433cc088f65..000000000000
--- a/dev-ml/merlin/merlin-4.1-r2.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# 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}.tar.gz -> ${P}.tar.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-4.11*:=
-	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"
-
-src_prepare() {
-	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/num/Manifest b/dev-ml/num/Manifest
index 93d379406008..15fac644f5f3 100644
--- a/dev-ml/num/Manifest
+++ b/dev-ml/num/Manifest
@@ -1,6 +1,7 @@
 AUX num-1.3-cflags.patch 409 BLAKE2B 97db7e69d4bee7e6940386349620799d586ab7094a51995c015ddec399747381175936e523f25b2312aed434ef25dfbcc2d6ef3aaa502ade39ff14fbd0ead636 SHA512 95245b0c3738511ff6a8a43b5f4c8897a82502a751552e1f1c846f3c7bb1040a5227055a55303292c1eca18a454d0f7c038ef574f00a772db2b72611857e15b5
+AUX num-1.4-ocamlopt.patch 297 BLAKE2B 1cb58008bfd7c291b667adff68dd96a30fc1c96295a967cc61aabd1e1a501ab8a640163fedc48f3903447cbdcd5ff364eaf47325373374a2ea0976e75585787e SHA512 22fd9700acbd337bfa235c743e13ff8b258fa62312d3472040170e4f1406c8b81a9bd3c1bdb830aea7d5c890a04c40668ea31828399daaca74b061e37aa79af5
 DIST num-1.3.tar.gz 66251 BLAKE2B d6fde246693c8aef3b881a4ebc2b601392e0f0bf561dc4f4d32a5e1f835a5186deba3ffa77c88c6c05cd6e837dc836567fcabffefae99ce1ccae94e1bdfc849a SHA512 c88310f8c45700990095e6b2e9abf24c27347711b9abfd1dde75e540fbbfc6a365e6713bd69f66009af305728fcb36dc61eb37fdd0be7d73824b0e92fbe8c031
 DIST num-1.4.tar.gz 66327 BLAKE2B 59eae642e19f452dd911ef6c32b89978f2034a5fcaece4a358f3da447c8d6cb2b2581c39d032eb117edaf7ecf942583281eb6e31716b06960e768c2a985e099e SHA512 0cc9be8ad95704bb683b4bf6698bada1ee9a40dc05924b72adc7b969685c33eeb68ccf174cc09f6a228c48c18fe94af06f28bebc086a24973a066da620db8e6f
 EBUILD num-1.3-r1.ebuild 781 BLAKE2B 00e2a293bd75493d356699c154a45c4bbc82b9f35fd5167896a9ed581ac2d10405db1c60a3acd5634c02774ab3695cea2931adcc636c71fbb7c29e9a8ccef32e SHA512 83d3167348b0beb3699362207258ce9f12a4b9b9229f1f2c9c4590104f5d854f86db2b4b1dc6e137797513436e46afb2d581dc6027c8809a39ceee9daf6a5b38
-EBUILD num-1.4-r3.ebuild 977 BLAKE2B 54d2e6a119bd65bd06a6536764bc9cb566cbd4770b3c197fa2ec827b0b76c1fcd6bce29b2a4e4bb7ef6a43bd8b37187bf19d4a5f60625c0cda5e897e5f0c8df3 SHA512 64a0e82280529de9f3b79229ffc18ef1997a022c6879c010a875c972041609cff230e8c52f6a58dbfb645b4c5372ae9613266dfb06eb78d2b19b43f73c42e956
+EBUILD num-1.4-r3.ebuild 1024 BLAKE2B 1b15e5d62f35ff6bc2496674e395d5eb911f714bbee74792cd29fbd4b301f84b8ea001bca0758bf6562111d688e40ef775be6e334badb6b6b49cf9c0f354fb57 SHA512 91be000f8c2ba8aeaab19bdffa48f1e12dcd327aa207b5595f174b4717b880d724471b94d7c2666c6466066d48cd96ff0eeb4ae24c7693e25ca1986f4d9ef0c0
 MISC metadata.xml 338 BLAKE2B f947fa0825c1a3fd959515164da36ffc9694c570ed6eb6eef8686fc24b4582ee88ecb7304507c79cf2733fb77ae3570468ec8da886367d79721c81f148931833 SHA512 9d052ada92f441fa4908f4ec9a2561f7276872281ffa65f0ad92c8d0f7c15aeea11d6c887d4af7535d7d72bce3dec8f12622aee5eb9a79e510e8baaa208a54cd
diff --git a/dev-ml/num/files/num-1.4-ocamlopt.patch b/dev-ml/num/files/num-1.4-ocamlopt.patch
new file mode 100644
index 000000000000..90699b99474c
--- /dev/null
+++ b/dev-ml/num/files/num-1.4-ocamlopt.patch
@@ -0,0 +1,15 @@
+--- a/src/Makefile	2022-01-12 19:58:54.655901110 +0100
++++ b/src/Makefile	2022-01-12 19:59:25.446339664 +0100
+@@ -33,11 +33,10 @@
+ 
+ all:: libnums.$(A) nums.cma
+ 
++ifeq "$(NATDYNLINK)" "true"
+ ifneq "$(ARCH)" "none"
+ all:: nums.cmxa
+ endif
+-
+-ifeq "$(NATDYNLINK)" "true"
+ all:: nums.cmxs
+ endif
+ 
diff --git a/dev-ml/num/num-1.4-r3.ebuild b/dev-ml/num/num-1.4-r3.ebuild
index 4b0101e0e90f..6440704457e1 100644
--- a/dev-ml/num/num-1.4-r3.ebuild
+++ b/dev-ml/num/num-1.4-r3.ebuild
@@ -19,6 +19,8 @@ RDEPEND="dev-lang/ocaml:=[ocamlopt?]"
 BDEPEND="${RDEPEND}"
 DEPEND="dev-ml/findlib:=[ocamlopt?]"
 
+PATCHES=( "${FILESDIR}"/${P}-ocamlopt.patch )
+
 src_compile() {
 	emake CFLAGS="${CFLAGS}" NATDYNLINK="$(usex ocamlopt true false)"
 }
diff --git a/dev-ml/ocamlbuild/Manifest b/dev-ml/ocamlbuild/Manifest
index fa513efb7628..1d485438fa96 100644
--- a/dev-ml/ocamlbuild/Manifest
+++ b/dev-ml/ocamlbuild/Manifest
@@ -2,5 +2,5 @@ AUX ocamlbuild-0.14.0-Disable-tests-failing-with-OCaml-4.08.0.patch 1259 BLAKE2B
 DIST ocamlbuild-0.11.0.tar.gz 195297 BLAKE2B 2d653c402edf58035fa6efb65c99c956fe78efc4759f29c8ddab8263310a5d243d25d37d4c1a4f0699f151afb6d4c6df4c1550f95d6e915963b3d86923877225 SHA512 14bc44cc63b6c99e711658a1145247bad8263632fbb4550238cef15e226a76b83e51b83575a7a96f16b96ec321dedd0ef23f36166c354838aec1922f58179efd
 DIST ocamlbuild-0.14.0.tar.gz 198267 BLAKE2B 355d61ba68e61b9ee18a9fc0fbb9062405f44707b180ca7ad4bfec727ca3d3d2cc08f17be118ca3a4161c7789d975e7f431812e9139d4fde85a1a27ab68c8ac3 SHA512 ae60247396399dfd35644c8c1986ef7679e5a9964df82e3388bfc6dd4c5b88a13d6869a698d14a9ac70dc48e4ce1c003f543c85426d8c862ca31dea37a554b07
 EBUILD ocamlbuild-0.11.0.ebuild 1297 BLAKE2B 06c06922091b5e8232a0010f7d774742d6315b7df1d5fd935e2dc5159681baf8ae50721eea8054aad79a51cd4b99dfd6d8a0c986954b8d4944203a1596c43dd6 SHA512 7a89f83eb743590bd909e807f499077291960322cb21292601f1886c9ee67df531a86082a3aa9d820b7d1958e214dc04021bc5cab97c3f973742198984539532
-EBUILD ocamlbuild-0.14.0-r1.ebuild 1344 BLAKE2B 8d68d113a3e755656acbe201a6970851f74d10945154887a8dff2241f2fe2e4910d14707e627052d8c32fe87f2e7636d5ca29424bd9b31ac2a4e7c6cc345fc0a SHA512 4f08d1360a9cbd94fd18fdab0c8345c624198dac962163dda6891e5460b98d1eaa32282e21c49532ae1d5d5acc7587afc84b7c6091cd2bc7a2e1756316a56be8
+EBUILD ocamlbuild-0.14.0-r1.ebuild 1368 BLAKE2B 2d0f582e343aba4ab1b0796a94ea06f93e0d50baf0a7dc02d7cd45d923fef9f5bbab656da54f9c5ec8c46e0e963c1c7624d9ccb3ffdabe54ec90994f1a0d3b2a SHA512 3640fd2a3a8b7316633ee40032f2dfbbb3c6f7ea63835dfe34cae624f724bcf0d487b7af6cbd90b6483983212ebe8ad3e3d02d89b6c6e9bbbc7b927ed405dd10
 MISC metadata.xml 419 BLAKE2B 10c584b700f9726f803ad4a72bb6f2c3216c8550a0e373ffe03b950bf61ef04fb9eb955dcf839065eedba0917546c914f6fb8ad147e6c762898dbcd1124ce03f SHA512 b9f22d5c890c578e527e9394a79c901932c2abc148270954d43744030e39e55e3276c7ee28057353bde3301de347570aa3bdd06b758ac57e6e6ed24497a81c98
diff --git a/dev-ml/ocamlbuild/ocamlbuild-0.14.0-r1.ebuild b/dev-ml/ocamlbuild/ocamlbuild-0.14.0-r1.ebuild
index f6b0bede9b18..2e56df10a32b 100644
--- a/dev-ml/ocamlbuild/ocamlbuild-0.14.0-r1.ebuild
+++ b/dev-ml/ocamlbuild/ocamlbuild-0.14.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,10 +12,11 @@ SLOT="0/${PV}"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
+REQUIRED_USE="test? ( ocamlopt )"
 
 RDEPEND=">=dev-lang/ocaml-4.02.3-r1:=[ocamlopt?]"
 DEPEND="${RDEPEND}
-	test? ( dev-ml/findlib )"
+	dev-ml/findlib"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.14.0-Disable-tests-failing-with-OCaml-4.08.0.patch
diff --git a/dev-ml/ocurl/Manifest b/dev-ml/ocurl/Manifest
index 3e5fc68acfb3..471e19946a55 100644
--- a/dev-ml/ocurl/Manifest
+++ b/dev-ml/ocurl/Manifest
@@ -1,3 +1,5 @@
 DIST ocurl-0.9.1.tar.gz 111393 BLAKE2B 83ec8f5e2e83b5cc519683556ca97818a092a80f41305394cc04088371c1179f256dee3d8a8e80597837fb156299698450c70ca00f1ec336ace46b02b84bb51e SHA512 f4acb596f213ce57e749c9805225330b532e17718f3b228745b438cd1fe6d89b37e56d401a11c329107729dd0e6bdd4a425d547f9a83dabe32edbf18aca585b5
+DIST ocurl-0.9.2.tar.gz 116659 BLAKE2B 3947cd82343cc9246c930f8fc89f7899f41a06f41358b5a014fbd05f5c85e70eb3df8c10690e62bd76d345c5738fdab63a936deed53fde0c8a3b040c5890129f SHA512 de9b06a2a4cbf804b6c947ef1011a75f45e3effbc29db054a9b72453920a0f554baa06d06b2a36eeee33090df7f9eb35280404237e2e3be219fb2dc98fe2bc82
 EBUILD ocurl-0.9.1.ebuild 786 BLAKE2B 6e9836181c9cc3ef8a100decaab730d0622021358495eab2ddbf3ad56218a533e01dffb850d1ed021440f595babcb6f9ce4e5805cef2aba2c7b9ec3bd2c4fbbe SHA512 26caf1a73c6f5b3ee72e31718668502bb204c2b043621bc96885887371bf729e112e3ef9c93f11563b68cf846b3aa0aa9a285864a9e2219c2bc62033b71b9cce
+EBUILD ocurl-0.9.2.ebuild 794 BLAKE2B 698f16f21b121c3a135ff0955684807357b8152b5114307d04911590ca9992f1a1222ba2307750b67b79af4f65ea0d25048179f8ad68bf6b086a7b9bdf6aff31 SHA512 242659d883ceed9d754bdea86724495374afbdbadbeef9e1aedb2c69834229741f4997d89b9b86df1395e6555af1b0467d4c0a7e63e00de90d8a9796cc2c637f
 MISC metadata.xml 249 BLAKE2B bc891d69b7055dc76869f08ac74ef4a5f9d4e107a21263e1b46e5e9616c8a28b66e6924f04cfec266256eb54a93d6c00a88bf2c180b6220c4cf93ff627be1487 SHA512 a47a8f47c4add47bb718a66770f0a180e4303af427aa696928abc621d94313b8c9d68b21994f6acf6c4866ce295559244063a9e02aadee4decc273f1be8dfa2d
diff --git a/dev-ml/ocurl/ocurl-0.9.2.ebuild b/dev-ml/ocurl/ocurl-0.9.2.ebuild
new file mode 100644
index 000000000000..f60438e9964a
--- /dev/null
+++ b/dev-ml/ocurl/ocurl-0.9.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit findlib
+
+DESCRIPTION="OCaml interface to the libcurl library"
+HOMEPAGE="http://forge.ocamlcore.org/projects/ocurl/ https://github.com/ygrek/ocurl"
+SRC_URI="https://github.com/ygrek/ocurl/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="examples +ocamlopt"
+
+RDEPEND=">=net-misc/curl-7.9.8
+	dev-ml/lwt:=
+	dev-ml/camlp4:=
+	>=dev-lang/ocaml-3.12:=[ocamlopt?]"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_compile() {
+	emake -j1 all
+}
+
+src_install() {
+	findlib_src_install
+
+	dodoc CHANGES.txt README.md
+
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-ml/opam-client/Manifest b/dev-ml/opam-client/Manifest
index bae3d66fffa8..49d3f36d449a 100644
--- a/dev-ml/opam-client/Manifest
+++ b/dev-ml/opam-client/Manifest
@@ -6,9 +6,9 @@ DIST opam-2.1.0-dose3-6.patch.xz 5896 BLAKE2B f605064ebae7d327895729962a345a3c67
 DIST opam-2.1.0.tar.gz 825966 BLAKE2B 42ab8ad2825e4e167618ece7bd2ce77ff055d584039fe2f644fa1c3e99d175cc7047f32bda53599af4fb177d844970883125cebca823024d1bc43a34857f20c5 SHA512 c0060e609c49a12dc8f64accef990aa593db818b72df3984fb9b4b22d8678b46c515916c84134a62dab614c716b61788eadc954d295f32c1f27d38aec22b3edf
 DIST opam-2.1.1.tar.gz 818555 BLAKE2B 0f3e94c723774c38a5ad553f58fa796836eb8ef80add977a0e677df026225b5cd737409717026cfbc95388094a0434eb9ff865043c1781eba228f1499c9ab996 SHA512 fb46bc8f12e49c2da95c5f8669f55fb93710ee826827538852c3091ec2c714c082137373fa9e1ad3f53f107b1fae6c2abd0b6e5f84f7756bd3b38e57978f080e
 EBUILD opam-client-2.0.10.ebuild 959 BLAKE2B 0c49373bc78678c7fc11fc5cb9d33a5495d83dc5d5de67e7219f1dba81fc448b9038a41ed01bfd05f33a48a0d70f9edf1f10bc87e5c2958863f7b4c90dc47a6d SHA512 5cc5ceeaa8b0c3c3a1ae5897a49b7d1643652010c2aa610a6a0cf4c4c18101e26c2c4bc65e0de858ba5e472ba411d76261af8f3dac506a30d205480a115ba491
-EBUILD opam-client-2.0.8-r1.ebuild 953 BLAKE2B 624189392e8593d9d03020c3c7e92cce3b5ecf774f30a8b14130f37f43d56222588edaf33df1f20bb51541f748d13a8aac0065bca1b3c3bbe0268ae746a41339 SHA512 a21de850b2e3c33366017b871474909584e52ded599322fd1290dd7d3b221d53a66bbbdb01a80e2937be98b1bd6229b2edc4132c0cb7c1b353977a009f37414b
-EBUILD opam-client-2.0.8.ebuild 820 BLAKE2B 7c899f93e3c1f5f52ea56506976ae5deeed672887983777c67624e5caf535aff241bb1e1615e4545cd5e2c194a92b7dc8348d4530ec2a0233836f3a4cb4913b3 SHA512 e7d1d9b430710f102c8b7df90befc6cbc915e8b92b8702f03d2903a6944e3c6eeb85288169add272bca90df197ecac0a856080fd1323e644d135e45a824ce370
-EBUILD opam-client-2.0.9.ebuild 959 BLAKE2B 0c49373bc78678c7fc11fc5cb9d33a5495d83dc5d5de67e7219f1dba81fc448b9038a41ed01bfd05f33a48a0d70f9edf1f10bc87e5c2958863f7b4c90dc47a6d SHA512 5cc5ceeaa8b0c3c3a1ae5897a49b7d1643652010c2aa610a6a0cf4c4c18101e26c2c4bc65e0de858ba5e472ba411d76261af8f3dac506a30d205480a115ba491
-EBUILD opam-client-2.1.0.ebuild 945 BLAKE2B e8932dd197dfd2ef3122a879898610f38c39417ed60bc23d54a65fdc013229056da482bdca95f11cbb7d3366e45b654edc5c91f203e10a72602e75b3a1341ea2 SHA512 8ef8778daaccdc3311caaca0602318292d6e02acb587b8d538f0b8c1349addb5c1a1ab6088a9442f6700102c284c998965503ce60219f07d7261aa7fec6b7b38
-EBUILD opam-client-2.1.1.ebuild 945 BLAKE2B e8932dd197dfd2ef3122a879898610f38c39417ed60bc23d54a65fdc013229056da482bdca95f11cbb7d3366e45b654edc5c91f203e10a72602e75b3a1341ea2 SHA512 8ef8778daaccdc3311caaca0602318292d6e02acb587b8d538f0b8c1349addb5c1a1ab6088a9442f6700102c284c998965503ce60219f07d7261aa7fec6b7b38
+EBUILD opam-client-2.0.8-r1.ebuild 1025 BLAKE2B c39e02346e5c4384c2133532304f42c5fc8612522c82c5949707e76ae6fc76dcbe048625279086565022198cd64aa6ba2501a81da76eca2721215a24f42936bd SHA512 df0dea8f6648c064ac35704edf9852613eb15dcab11f4f665b5f34ac0a8d323642f49305fea515d4dfd6907436c7f5ab9b95dc73938ca1c6dc718df96a70cbca
+EBUILD opam-client-2.0.8.ebuild 892 BLAKE2B bacff86941659742837fd933560dc746643a11093dc1dfa26dc3e487daa723159e4e4a6beab91304541d1b6551644aed3686664ae39c8ea308890dc0fe3bab78 SHA512 599a5818166b215fc8acb0856ef79e335cf6a350d762b2ad5fb43ebf51e83d338ab4b78e2b1444906ffed16c0ee55a56fdb5734f3d3edc736691e58235f7a6a6
+EBUILD opam-client-2.0.9.ebuild 1026 BLAKE2B 9ce3f8ae2b0311a4fb8719126b06befc51cf76892614b5704b6d6ca73894a9e594f287f9b93d55e2ca706efba5805943c5a014494e4045250e8b21c5a6f7108b SHA512 33edf608bebbad13f76acb70be072f8ee386b85e860819f8cbdffd2067010045156c90fd5043e95c78aeb31b39a8405390819b678715083a77fc3facb82d6199
+EBUILD opam-client-2.1.0.ebuild 1017 BLAKE2B 5bdf29c53f616cd61f05ae492292b769e32410f3958801ff3999dda29a78e6a37d23c9295af22166fd6d75058bebb9756e17904b17e83b52b698c491a6fbd8ab SHA512 e4218a25b093bdd7ef05eb69365ec852ddde889734c322df39c53b9c84392539c90b97dad5efbc56dd637f12fe821d3b7a66bcbec5a7c356598936eef15f8fb7
+EBUILD opam-client-2.1.1.ebuild 1017 BLAKE2B 5bdf29c53f616cd61f05ae492292b769e32410f3958801ff3999dda29a78e6a37d23c9295af22166fd6d75058bebb9756e17904b17e83b52b698c491a6fbd8ab SHA512 e4218a25b093bdd7ef05eb69365ec852ddde889734c322df39c53b9c84392539c90b97dad5efbc56dd637f12fe821d3b7a66bcbec5a7c356598936eef15f8fb7
 MISC metadata.xml 413 BLAKE2B cbdd94927312b95f2b5f76489f341f658974be49f704b81a4524879bbe780dcc5d9505b863b87da002cd98b8bb1e13967b047095dbe1eac589acd3145b66fc6c SHA512 afe675cebc52bba018a89d8f04b5c993ae8306f8d18ae2175be4c372f3219c63606b34bbb45c7daaab53be8eb7747fb7e86417bd29bbed2753458f564f3078da
diff --git a/dev-ml/opam-client/opam-client-2.0.8-r1.ebuild b/dev-ml/opam-client/opam-client-2.0.8-r1.ebuild
index 4598fcdb54ca..512c9e00182b 100644
--- a/dev-ml/opam-client/opam-client-2.0.8-r1.ebuild
+++ b/dev-ml/opam-client/opam-client-2.0.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,8 @@ S="${WORKDIR}/opam-${PV/_/-}"
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
 KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
-IUSE="+ocamlopt"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-ml/cmdliner:=
@@ -24,6 +25,7 @@ RDEPEND="
 	dev-ml/re:=
 "
 DEPEND="${RDEPEND}"
+BDEPEND="test? ( sys-apps/bubblewrap )"
 
 # 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-client/opam-client-2.0.8.ebuild b/dev-ml/opam-client/opam-client-2.0.8.ebuild
index 3a2775f3db09..4139c6877486 100644
--- a/dev-ml/opam-client/opam-client-2.0.8.ebuild
+++ b/dev-ml/opam-client/opam-client-2.0.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,8 @@ S="${WORKDIR}/opam-${PV/_/-}"
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
 KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
-IUSE="+ocamlopt"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	<dev-lang/ocaml-4.12
@@ -25,6 +26,7 @@ RDEPEND="
 	dev-ml/re:=
 "
 DEPEND="${RDEPEND}"
+BDEPEND="test? ( sys-apps/bubblewrap )"
 
 src_prepare() {
 	default
diff --git a/dev-ml/opam-client/opam-client-2.0.9.ebuild b/dev-ml/opam-client/opam-client-2.0.9.ebuild
index 4b52fb7e1ef9..78a0dd5cda78 100644
--- a/dev-ml/opam-client/opam-client-2.0.9.ebuild
+++ b/dev-ml/opam-client/opam-client-2.0.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,8 +12,9 @@ S="${WORKDIR}/opam-${PV/_/-}"
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="+ocamlopt"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~x86"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-ml/cmdliner:=
@@ -24,6 +25,7 @@ RDEPEND="
 	dev-ml/re:=
 "
 DEPEND="${RDEPEND}"
+BDEPEND="test? ( sys-apps/bubblewrap )"
 
 # 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-client/opam-client-2.1.0.ebuild b/dev-ml/opam-client/opam-client-2.1.0.ebuild
index b03d1b117962..e27961dead03 100644
--- a/dev-ml/opam-client/opam-client-2.1.0.ebuild
+++ b/dev-ml/opam-client/opam-client-2.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,8 @@ S="${WORKDIR}/opam-${PV/_/-}"
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="+ocamlopt"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-ml/cmdliner:=
@@ -25,6 +26,7 @@ RDEPEND="
 	dev-ml/re:=
 "
 DEPEND="${RDEPEND}"
+BDEPEND="test? ( sys-apps/bubblewrap )"
 
 PATCHES=( "${WORKDIR}"/opam-2.1.0-dose3-6.patch )
 
diff --git a/dev-ml/opam-client/opam-client-2.1.1.ebuild b/dev-ml/opam-client/opam-client-2.1.1.ebuild
index b03d1b117962..e27961dead03 100644
--- a/dev-ml/opam-client/opam-client-2.1.1.ebuild
+++ b/dev-ml/opam-client/opam-client-2.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,8 @@ S="${WORKDIR}/opam-${PV/_/-}"
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="+ocamlopt"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-ml/cmdliner:=
@@ -25,6 +26,7 @@ RDEPEND="
 	dev-ml/re:=
 "
 DEPEND="${RDEPEND}"
+BDEPEND="test? ( sys-apps/bubblewrap )"
 
 PATCHES=( "${WORKDIR}"/opam-2.1.0-dose3-6.patch )
 
diff --git a/dev-ml/opam-core/Manifest b/dev-ml/opam-core/Manifest
index c2885f23d42c..1d427acbedca 100644
--- a/dev-ml/opam-core/Manifest
+++ b/dev-ml/opam-core/Manifest
@@ -6,7 +6,7 @@ DIST opam-2.1.0.tar.gz 825966 BLAKE2B 42ab8ad2825e4e167618ece7bd2ce77ff055d58403
 DIST opam-2.1.1.tar.gz 818555 BLAKE2B 0f3e94c723774c38a5ad553f58fa796836eb8ef80add977a0e677df026225b5cd737409717026cfbc95388094a0434eb9ff865043c1781eba228f1499c9ab996 SHA512 fb46bc8f12e49c2da95c5f8669f55fb93710ee826827538852c3091ec2c714c082137373fa9e1ad3f53f107b1fae6c2abd0b6e5f84f7756bd3b38e57978f080e
 EBUILD opam-core-2.0.10.ebuild 1008 BLAKE2B 7237cf6ac3134cd86239a99187b97026fa608046b17f78d9b2fbd066b94b7d4f4c9e2361e02dcdb53fe89a750905a868a6ad0c894dc85ddd760e881f2cc2a2be SHA512 713968464097a18b57deea518fba9136b39c7155e068854eb32fc712af19155d143d01415a99dbaf896079e6dfe9ad2613e290b600ffd650cca5bd2a4755c08f
 EBUILD opam-core-2.0.8-r1.ebuild 880 BLAKE2B 4cdae8b13b22234fc9628ba3816a5382940201bb6a416766dc0ed1bc096f79fa5ed3d4601547eb83a9655c183a5aa52703e5dc6b068558e0ab83492782c95f6a SHA512 9097d88ac2615449b25a39dde43ae0b61b67bada0f14b2e51071dee777e23b81c7db2872e814e06f44a625bc1d9dcbff27edac87b002f3496ce996dba37696a1
-EBUILD opam-core-2.0.9.ebuild 886 BLAKE2B 46d8727976c104e28523732be20be6b7befde9a3becf3be12e41fde5ff0b6e93d9dfd01cb1536245bb86a8ba2d8864f08fdb4bfb4de54523851fc6fd43366398 SHA512 be4693a07a8c5d52150a175e20ca22f2e441c782ed94dfab55d6df7fa3be78cf699cb6e66a9f9a548c33706a8fdad74047c9c109b90000a4c85fbbd74e3f0d7e
+EBUILD opam-core-2.0.9.ebuild 881 BLAKE2B 0fe3164b27a2ae0644bf5ee6c5a070fb1aa5fca64e25a4beea84c8ba34d69a5bef88b8cca9ec694e757f9b0ff6add76c6b1c16e772221f46d08ae7f29deefb34 SHA512 9e4bd6c3d1dca27b8c0f7781aae2fcdc42f44d3a5929b53f203f61dbebbe1d6c69af00601e816f025211172a67429adaa707d4b22110f907d4c8521f5c9c87c6
 EBUILD opam-core-2.1.0.ebuild 1008 BLAKE2B 7237cf6ac3134cd86239a99187b97026fa608046b17f78d9b2fbd066b94b7d4f4c9e2361e02dcdb53fe89a750905a868a6ad0c894dc85ddd760e881f2cc2a2be SHA512 713968464097a18b57deea518fba9136b39c7155e068854eb32fc712af19155d143d01415a99dbaf896079e6dfe9ad2613e290b600ffd650cca5bd2a4755c08f
 EBUILD opam-core-2.1.1.ebuild 1008 BLAKE2B 7237cf6ac3134cd86239a99187b97026fa608046b17f78d9b2fbd066b94b7d4f4c9e2361e02dcdb53fe89a750905a868a6ad0c894dc85ddd760e881f2cc2a2be SHA512 713968464097a18b57deea518fba9136b39c7155e068854eb32fc712af19155d143d01415a99dbaf896079e6dfe9ad2613e290b600ffd650cca5bd2a4755c08f
 MISC metadata.xml 413 BLAKE2B cbdd94927312b95f2b5f76489f341f658974be49f704b81a4524879bbe780dcc5d9505b863b87da002cd98b8bb1e13967b047095dbe1eac589acd3145b66fc6c SHA512 afe675cebc52bba018a89d8f04b5c993ae8306f8d18ae2175be4c372f3219c63606b34bbb45c7daaab53be8eb7747fb7e86417bd29bbed2753458f564f3078da
diff --git a/dev-ml/opam-core/opam-core-2.0.9.ebuild b/dev-ml/opam-core/opam-core-2.0.9.ebuild
index 63cab62e8277..1300667af70c 100644
--- a/dev-ml/opam-core/opam-core-2.0.9.ebuild
+++ b/dev-ml/opam-core/opam-core-2.0.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ OPAM_INSTALLER="${S}/opam-installer"
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~x86"
 
 RDEPEND="
 	dev-ml/ocamlgraph:=
diff --git a/dev-ml/opam-format/Manifest b/dev-ml/opam-format/Manifest
index 452d3ab05f6e..b121bdcb1284 100644
--- a/dev-ml/opam-format/Manifest
+++ b/dev-ml/opam-format/Manifest
@@ -5,10 +5,10 @@ DIST opam-2.0.9.tar.gz 644429 BLAKE2B d96ee79685a8ee8ff82c7570a747c80e38d86e5137
 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
 DIST opam-2.1.1.tar.gz 818555 BLAKE2B 0f3e94c723774c38a5ad553f58fa796836eb8ef80add977a0e677df026225b5cd737409717026cfbc95388094a0434eb9ff865043c1781eba228f1499c9ab996 SHA512 fb46bc8f12e49c2da95c5f8669f55fb93710ee826827538852c3091ec2c714c082137373fa9e1ad3f53f107b1fae6c2abd0b6e5f84f7756bd3b38e57978f080e
-EBUILD opam-format-2.0.10.ebuild 984 BLAKE2B 2d0ac08a3955b84ada2dfdcbca6c6fa86e23ef3f5a6c268d8fd775a48d50b6fdf4c6e29d24468ab28ff0c64eb07da59b9dae1ea0673482401230b4171662fabd SHA512 3c0a3534f139b29de193c253c58d8e2693945121af29dfb92a3c69f2e81685187efc5cb610c3208b88ee4b5333681dc70dfaf081e4fb304f9b290c0d52d50e29
-EBUILD opam-format-2.0.8-r2.ebuild 839 BLAKE2B 9bd5bc8b71da0ecb840f1f5cb14f78052d4d0f1ce8a2beeafa8f7afac25dc1840f48dfb84087fc964d0e72ea8748c48a3df250eb3d29e7197ef949c532faadf2 SHA512 8f78d05582ada892d34954cca1265737a83932bda148890c2ce954a8909cac035f9c5c6c73ec693e7edc193750ee28e5664c26b4d4097fee194a54b7c351cf96
-EBUILD opam-format-2.0.8-r3.ebuild 978 BLAKE2B 0479608ccf96e920397e6796cf472dfe4203f21385ff2ab6d17ad26ec20b136a2e6cdd1bb9b9384a13137427d65721305145d0bc3703d5226b2bd415dc3f4f5e SHA512 81d9f62c38fbd96d2bd80d3863a2ffffca64f303e1d73b0521078c0ff3848424581801e263a95eadc6366ef7d00639b7b28698605c4dd5f230aac3d6ac2d48db
-EBUILD opam-format-2.0.9.ebuild 984 BLAKE2B 2d0ac08a3955b84ada2dfdcbca6c6fa86e23ef3f5a6c268d8fd775a48d50b6fdf4c6e29d24468ab28ff0c64eb07da59b9dae1ea0673482401230b4171662fabd SHA512 3c0a3534f139b29de193c253c58d8e2693945121af29dfb92a3c69f2e81685187efc5cb610c3208b88ee4b5333681dc70dfaf081e4fb304f9b290c0d52d50e29
-EBUILD opam-format-2.1.0.ebuild 970 BLAKE2B 7463ddab831f848e84822238445c88bbfedfc2264f837f585416285ce3fb92945963a4c881329948bf416820779f5d18c51526833a086588ab35c45e4f7b90ae SHA512 2f02b5fec36acb49976bc479c6489335a02266cca8552e8e32bb1105ed50d5b0de6031f6db58fc29768a876f79d2caff63098445b427e1e2b6b972bfe0478f64
-EBUILD opam-format-2.1.1.ebuild 970 BLAKE2B 7463ddab831f848e84822238445c88bbfedfc2264f837f585416285ce3fb92945963a4c881329948bf416820779f5d18c51526833a086588ab35c45e4f7b90ae SHA512 2f02b5fec36acb49976bc479c6489335a02266cca8552e8e32bb1105ed50d5b0de6031f6db58fc29768a876f79d2caff63098445b427e1e2b6b972bfe0478f64
+EBUILD opam-format-2.0.10.ebuild 1070 BLAKE2B 776112648930bfe3aef94f0d9a21229797d0493a22ab8872cfc34767e7e50fc17445498c3f587d866eed41ebbbaa71a067bed56c854968bfa1c6bf588abedd96 SHA512 acd72a194f3183f5b0396b6324ce3a892f222ed3f282f8b38392eca2c6d3c63bda14e65ac9578b01432c1ed8279a8619bbbbc1f63ef4fc9446ca5b060718db50
+EBUILD opam-format-2.0.8-r2.ebuild 925 BLAKE2B c436e2a97dedfc183dbf7811b29a6b959a5d9a1e42f7d4cb753e24c3d43bbb1b8730509801103136248fec02ba76ce8bb86d612da6360c7f8d841d4a295cc5d8 SHA512 8170e23cd46a1c7cc1a61d07920c62f60e566d306865b62a09f171c830dde541ae3b9671457603e8c24bdbc58b9bb45ad8b8ba762aeea47c9a3ddf8dcb4d4ff4
+EBUILD opam-format-2.0.8-r3.ebuild 1064 BLAKE2B 01eb973cac448932c60293fae53445365803ca7b5005a9c2691f22c0300ed5ae36268f2628517b17bbc1de0638602eeb75ba1ec11ffa2d57af224fe3fbb97c02 SHA512 d42e9e8690af3c403d4b962e418414fcc872f9a468f2d5ebaabff96570c95421bce058375adf0914a6e626557b826f91feed8b474b0ef59b9e762a0ff348a559
+EBUILD opam-format-2.0.9.ebuild 1065 BLAKE2B 8b9bd1d140fa3674c1f119a04f3747882a0e316dc9143bc30209d17ee2f460ff25b3c4ec7a090acec769fa9a697804523a023c58a939add15797b4f1d45417a6 SHA512 e3d9d5c0a129924fbab9bf29af6eac11caf0acc5cab110fa65c983930e898909e379bd58bd645b4bb6a525cb2fff7767224d8fdd642d79cd786545b405412a17
+EBUILD opam-format-2.1.0.ebuild 1216 BLAKE2B 0e755181807e1baf84eec4417116a966c337f8604ba97387c85685abdd1c228f2618f726e82f6270620fc3d04271b3a0ca12d86b3adbed53e83b738963f9f640 SHA512 229d65c3d644d0d91a9d61b87cee0191e71d474412ee7ab9b5864391a6fd8f5c3eb3bd8c9a75013535647cd7c6fa21e361ebc3af189c8a68dcad24e5e8e1603c
+EBUILD opam-format-2.1.1.ebuild 1216 BLAKE2B 0e755181807e1baf84eec4417116a966c337f8604ba97387c85685abdd1c228f2618f726e82f6270620fc3d04271b3a0ca12d86b3adbed53e83b738963f9f640 SHA512 229d65c3d644d0d91a9d61b87cee0191e71d474412ee7ab9b5864391a6fd8f5c3eb3bd8c9a75013535647cd7c6fa21e361ebc3af189c8a68dcad24e5e8e1603c
 MISC metadata.xml 413 BLAKE2B cbdd94927312b95f2b5f76489f341f658974be49f704b81a4524879bbe780dcc5d9505b863b87da002cd98b8bb1e13967b047095dbe1eac589acd3145b66fc6c SHA512 afe675cebc52bba018a89d8f04b5c993ae8306f8d18ae2175be4c372f3219c63606b34bbb45c7daaab53be8eb7747fb7e86417bd29bbed2753458f564f3078da
diff --git a/dev-ml/opam-format/opam-format-2.0.10.ebuild b/dev-ml/opam-format/opam-format-2.0.10.ebuild
index ace83b9a6ae8..613461beb70d 100644
--- a/dev-ml/opam-format/opam-format-2.0.10.ebuild
+++ b/dev-ml/opam-format/opam-format-2.0.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,8 @@ OPAM_INSTALLER="${S}/opam-installer"
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="+ocamlopt"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	~dev-ml/opam-core-${PV}:=
@@ -26,6 +27,10 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	dev-ml/cppo"
+BDEPEND="test? (
+	sys-apps/bubblewrap
+	dev-ml/mccs
+)"
 
 # 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-format/opam-format-2.0.8-r2.ebuild b/dev-ml/opam-format/opam-format-2.0.8-r2.ebuild
index eb552240221e..d873c3e60ab6 100644
--- a/dev-ml/opam-format/opam-format-2.0.8-r2.ebuild
+++ b/dev-ml/opam-format/opam-format-2.0.8-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,8 @@ OPAM_INSTALLER="${S}/opam-installer"
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
 KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
-IUSE="+ocamlopt"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	<dev-lang/ocaml-4.12
@@ -27,6 +28,10 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	dev-ml/cppo"
+BDEPEND="test? (
+	sys-apps/bubblewrap
+	dev-ml/mccs
+)"
 
 src_prepare() {
 	default
diff --git a/dev-ml/opam-format/opam-format-2.0.8-r3.ebuild b/dev-ml/opam-format/opam-format-2.0.8-r3.ebuild
index 32abb96a8b97..6de06692f9c1 100644
--- a/dev-ml/opam-format/opam-format-2.0.8-r3.ebuild
+++ b/dev-ml/opam-format/opam-format-2.0.8-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,8 @@ OPAM_INSTALLER="${S}/opam-installer"
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
 KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
-IUSE="+ocamlopt"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	~dev-ml/opam-core-${PV}:=
@@ -26,6 +27,10 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	dev-ml/cppo"
+BDEPEND="test? (
+	sys-apps/bubblewrap
+	dev-ml/mccs
+)"
 
 # 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-format/opam-format-2.0.9.ebuild b/dev-ml/opam-format/opam-format-2.0.9.ebuild
index ace83b9a6ae8..db8f781018d3 100644
--- a/dev-ml/opam-format/opam-format-2.0.9.ebuild
+++ b/dev-ml/opam-format/opam-format-2.0.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,8 +15,9 @@ OPAM_INSTALLER="${S}/opam-installer"
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="+ocamlopt"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~x86"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	~dev-ml/opam-core-${PV}:=
@@ -26,6 +27,10 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	dev-ml/cppo"
+BDEPEND="test? (
+	sys-apps/bubblewrap
+	dev-ml/mccs
+)"
 
 # 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-format/opam-format-2.1.0.ebuild b/dev-ml/opam-format/opam-format-2.1.0.ebuild
index 027845d265fc..4c2a08d6886d 100644
--- a/dev-ml/opam-format/opam-format-2.1.0.ebuild
+++ b/dev-ml/opam-format/opam-format-2.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,8 @@ OPAM_INSTALLER="${S}/opam-installer"
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="+ocamlopt"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	~dev-ml/opam-core-${PV}:=
@@ -27,6 +28,10 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	dev-ml/cppo"
+BDEPEND="test? (
+	sys-apps/bubblewrap
+	dev-ml/mccs
+)"
 
 PATCHES=( "${WORKDIR}"/opam-2.1.0-dose3-6.patch )
 
@@ -39,4 +44,10 @@ src_prepare() {
 		 (release
 		  (flags (:standard -warn-error -3-9-33))))
 	EOF
+	sed -i \
+		-e '/wrap-build-commands/d' \
+		-e '/wrap-install-commands/d' \
+		-e '/wrap-remove-commands/d' \
+		tests/reftests/opamroot-versions.test \
+		|| die
 }
diff --git a/dev-ml/opam-format/opam-format-2.1.1.ebuild b/dev-ml/opam-format/opam-format-2.1.1.ebuild
index 027845d265fc..4c2a08d6886d 100644
--- a/dev-ml/opam-format/opam-format-2.1.1.ebuild
+++ b/dev-ml/opam-format/opam-format-2.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,8 @@ OPAM_INSTALLER="${S}/opam-installer"
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="+ocamlopt"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	~dev-ml/opam-core-${PV}:=
@@ -27,6 +28,10 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	dev-ml/cppo"
+BDEPEND="test? (
+	sys-apps/bubblewrap
+	dev-ml/mccs
+)"
 
 PATCHES=( "${WORKDIR}"/opam-2.1.0-dose3-6.patch )
 
@@ -39,4 +44,10 @@ src_prepare() {
 		 (release
 		  (flags (:standard -warn-error -3-9-33))))
 	EOF
+	sed -i \
+		-e '/wrap-build-commands/d' \
+		-e '/wrap-install-commands/d' \
+		-e '/wrap-remove-commands/d' \
+		tests/reftests/opamroot-versions.test \
+		|| die
 }
diff --git a/dev-ml/opam-installer/Manifest b/dev-ml/opam-installer/Manifest
index 773adc5199b6..6ae566803eb7 100644
--- a/dev-ml/opam-installer/Manifest
+++ b/dev-ml/opam-installer/Manifest
@@ -9,7 +9,7 @@ EBUILD opam-installer-2.0.10.ebuild 1193 BLAKE2B 2146bb8d98820a6baeffb5ee098527c
 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 1187 BLAKE2B d18cdb65a28ed6043ad63c818ad7dfe9552f4d128353438ce9d6bcc2af16ccd89b5b6b6432ea46eee3216eac401f6c97df56067d95ce994ae8b8d93ca52d4a59 SHA512 bb8f6fa1251c10097d06443b866d139372fd2da2b0cbd5057c673d1507d451d13ca60677e0be7b92e546149d6843a27275159ec1a23d5a5fe785937e24e4ba4e
-EBUILD opam-installer-2.0.9.ebuild 1193 BLAKE2B 2146bb8d98820a6baeffb5ee098527ca75529e4fa8302efac24e455526242db224707dced11a2bad732da18db02e680d979518fb156e28974c4dac4ca833c909 SHA512 3572227ee5a0c0b89d4ed201da95d831056d5227673a5015bb4139fd08b2b5ff0e73a22c0e2e14fec989b18303222abf38ae7d78c7b7385f8e45c4420c9db299
+EBUILD opam-installer-2.0.9.ebuild 1188 BLAKE2B 6ba5a6a7b1e288d22e9b0aad9c24f36a7de3ddab9f63f6cdf18703a8d629c7629ba3b12093f6f6318d45a964a26b3bdc78ab0071969e3621015af47000d5af5a SHA512 684a30687a467139b42b730efaf167a6bf0845cf4158c3bfa7d1805630b3f6a028682104541f27300f452fe2799ba7bb2a5004193090785466c331ecf75f6a3f
 EBUILD opam-installer-2.1.0.ebuild 1025 BLAKE2B 4fcb445ca539b14a30c79788fbd7350eaf242fb8dace406f043d4db4adaf8bec51a1d72c3134dfab25e615501f5ea8c2e751ee1e00502b4adbeb22ac9048b97b SHA512 f237e7f35d2567d8bba39f9a281706a8060cfb2680be1ecad78094ace4ac14a4be5d65b5715c2f213b39335df7ddbb27f1b54c8da21864474624def819f5abcf
 EBUILD opam-installer-2.1.1.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.9.ebuild b/dev-ml/opam-installer/opam-installer-2.0.9.ebuild
index a2b88905a299..0d7748530ef7 100644
--- a/dev-ml/opam-installer/opam-installer-2.0.9.ebuild
+++ b/dev-ml/opam-installer/opam-installer-2.0.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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-repository/Manifest b/dev-ml/opam-repository/Manifest
index eb78f66fbcd5..af0edf7fefa6 100644
--- a/dev-ml/opam-repository/Manifest
+++ b/dev-ml/opam-repository/Manifest
@@ -8,7 +8,7 @@ DIST opam-2.1.1.tar.gz 818555 BLAKE2B 0f3e94c723774c38a5ad553f58fa796836eb8ef80a
 EBUILD opam-repository-2.0.10.ebuild 921 BLAKE2B 1e39fbd674834241eb5eb27768cbe829951cfd15d17811b92134d4f3b97ec2fcdc8a2bf86e5eaee696e175ca1ca23d5f73f2752e53754b73ba8147cb7d044d9f SHA512 071d1c33e57180cbb182eb05e7b044862bc5af3736a904a15e029488cb017cb85249b936d4e2c4f739818d996c02791dc50eeddfac2f43aaac4e3c1e8883a4ac
 EBUILD opam-repository-2.0.8-r1.ebuild 915 BLAKE2B d4be9123a2e53a35e33d698fc8ba3b15b609609065515607170aa8f4a2c245cf6d83006e533b914165c65991618fddeb37c822b49516cdef9261dbcf6a692d09 SHA512 f861fa6d9bf66a8d393ecb9cd39fd81b65b3b0ba051c26e4863e1fea4563a403a605f171eb14d6b1bc1b4c83c6bf5726f05b189f5bf83391b3da26fcf4b513e7
 EBUILD opam-repository-2.0.8.ebuild 776 BLAKE2B 4d63d9ee36f06e82b59510c92c3d5923a17ecb9626427681358d340780e98e1490b1e87366120f9c5429f75a1943aa47aeffbed9a50abed72cd3e76fe12c816a SHA512 1bbfe111bc3e9682205f549dcb7b298ccebd92e268ebb585aa68f98255b87b01ac2aa25535e04d0220b16fd6955dfdfa1d4fc0f17d9a60ab361348e92942a7b6
-EBUILD opam-repository-2.0.9.ebuild 921 BLAKE2B 1e39fbd674834241eb5eb27768cbe829951cfd15d17811b92134d4f3b97ec2fcdc8a2bf86e5eaee696e175ca1ca23d5f73f2752e53754b73ba8147cb7d044d9f SHA512 071d1c33e57180cbb182eb05e7b044862bc5af3736a904a15e029488cb017cb85249b936d4e2c4f739818d996c02791dc50eeddfac2f43aaac4e3c1e8883a4ac
+EBUILD opam-repository-2.0.9.ebuild 916 BLAKE2B ad81efd107547afd9e6555322b4531c0b1bba19fb04c3f9a467a371c241faa42aaf0b6ec0c80dc3510b50dbb53d6cfa66875423709ea97f06bb43dd7db7d1121 SHA512 da8014aed15e002626990538e6122cdfa41982b03ae7333ececb841ae93a4e2ccbadb25254ac0fc24b1517aa414f17b9e7ea9fb9b8d140dc44e9044fe7155d0a
 EBUILD opam-repository-2.1.0.ebuild 907 BLAKE2B a5ea29777911bbdd1f19661edc4bad8e104ab69f937aa0bed110fcf25383d2c204aa72531f4e2e6e0737d0f93d0acaaef4598f073e3bc682b2ca9d49e5d5c536 SHA512 07b96a5df895d6420e37af1ca2d73dc020feeb034e361e048dc0f607ac95ddb53d3b57833621295c4f527794e101c9431398af6934e7bfe2660cbe5b08ebcd8d
 EBUILD opam-repository-2.1.1.ebuild 907 BLAKE2B a5ea29777911bbdd1f19661edc4bad8e104ab69f937aa0bed110fcf25383d2c204aa72531f4e2e6e0737d0f93d0acaaef4598f073e3bc682b2ca9d49e5d5c536 SHA512 07b96a5df895d6420e37af1ca2d73dc020feeb034e361e048dc0f607ac95ddb53d3b57833621295c4f527794e101c9431398af6934e7bfe2660cbe5b08ebcd8d
 MISC metadata.xml 413 BLAKE2B cbdd94927312b95f2b5f76489f341f658974be49f704b81a4524879bbe780dcc5d9505b863b87da002cd98b8bb1e13967b047095dbe1eac589acd3145b66fc6c SHA512 afe675cebc52bba018a89d8f04b5c993ae8306f8d18ae2175be4c372f3219c63606b34bbb45c7daaab53be8eb7747fb7e86417bd29bbed2753458f564f3078da
diff --git a/dev-ml/opam-repository/opam-repository-2.0.9.ebuild b/dev-ml/opam-repository/opam-repository-2.0.9.ebuild
index 77365ae1bced..0b9bf91626f0 100644
--- a/dev-ml/opam-repository/opam-repository-2.0.9.ebuild
+++ b/dev-ml/opam-repository/opam-repository-2.0.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ S="${WORKDIR}/opam-${PV/_/-}"
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~x86"
 IUSE="+ocamlopt"
 RESTRICT="test"
 
diff --git a/dev-ml/opam-solver/Manifest b/dev-ml/opam-solver/Manifest
index fc5db4ee80c1..2f339116c241 100644
--- a/dev-ml/opam-solver/Manifest
+++ b/dev-ml/opam-solver/Manifest
@@ -8,7 +8,7 @@ DIST opam-2.1.1.tar.gz 818555 BLAKE2B 0f3e94c723774c38a5ad553f58fa796836eb8ef80a
 EBUILD opam-solver-2.0.10.ebuild 991 BLAKE2B b3b86e67c53021a8da65d5ab28a3f4d7129c288755e59a3f127c3c6c20cd6c2eeb96bef19c6a700fc43616c58e357e276558020545954eedbaa80c9f4670cc25 SHA512 34917ade63f11472c468b91e290f2a929df49b56d0096e827076f7c05df8867644df6fcdcdc4884e7493eb5c636103e3a282a46501cba2b0cca6b62460bd452f
 EBUILD opam-solver-2.0.8-r1.ebuild 985 BLAKE2B b215b32656aa0f54599cbdfde1f462ee3ae3eedf66fba8e8f34703a03775f9c1337169a6b4d4444f1a64e254a5cdbb4377baeabbd484793c40a6a79950090221 SHA512 43c266184cece4831e1c0cf3378b3e47c02d1aab9e8421630f5f1fa8fb5d3d2671d0979d3c9c5dc9cca22217616c7cd635a88a8d470325b2b933a7cd83e288a5
 EBUILD opam-solver-2.0.8.ebuild 824 BLAKE2B 9a7a5ebb741dec25ff0a3d3c6e0e1c74f7574b70ff352b7c4e602e085a5a1f3f1ca03d1e9c7f062722529b9b49e1fad83960b8d33223354430ea4d072c4fc19d SHA512 6fb412d1581e2f1ad34d988e4bb6e3e427cc8963924a0ac6b1a235287b4c3e2fa3d4a55e99f7bb7c6bde7a130b919b5cf1191c61e576a5d79e70d3813276f732
-EBUILD opam-solver-2.0.9.ebuild 991 BLAKE2B b3b86e67c53021a8da65d5ab28a3f4d7129c288755e59a3f127c3c6c20cd6c2eeb96bef19c6a700fc43616c58e357e276558020545954eedbaa80c9f4670cc25 SHA512 34917ade63f11472c468b91e290f2a929df49b56d0096e827076f7c05df8867644df6fcdcdc4884e7493eb5c636103e3a282a46501cba2b0cca6b62460bd452f
+EBUILD opam-solver-2.0.9.ebuild 986 BLAKE2B 3b334bca5df41769e9796cd6a2d03ff482f4f6e3944873f1d3b48e8e4c5e0f3f33dedc5756ed13362aac66798e8b542611a15f0e5770c8163404e995a8bfb96f SHA512 55f000322383b7f155a24e7bfd68913a7b4cebc2f32f3920d3595742525878d3dd074a7d081e62978d60d3288b501cfe07c72582dbd3bb73ddf245961f369f94
 EBUILD opam-solver-2.1.0.ebuild 977 BLAKE2B 9b13e4b2e12320e53e0d4e2ea0df78e0dc83b1b02b97c97ef0eafa9b66bf0bd00c1dc125f5380b2e2f5e0053fd20f49ac0c74248b67abc5650a608d6d59189c0 SHA512 3c5e0ac05b7fdc3f63df240814a562d9a0b83a398442ad965cf5058124d1a5eef58ba39952e55b028acb9094f9bec00040519af430c14dfa68c0e8961ea3ab49
 EBUILD opam-solver-2.1.1.ebuild 977 BLAKE2B 9b13e4b2e12320e53e0d4e2ea0df78e0dc83b1b02b97c97ef0eafa9b66bf0bd00c1dc125f5380b2e2f5e0053fd20f49ac0c74248b67abc5650a608d6d59189c0 SHA512 3c5e0ac05b7fdc3f63df240814a562d9a0b83a398442ad965cf5058124d1a5eef58ba39952e55b028acb9094f9bec00040519af430c14dfa68c0e8961ea3ab49
 MISC metadata.xml 413 BLAKE2B cbdd94927312b95f2b5f76489f341f658974be49f704b81a4524879bbe780dcc5d9505b863b87da002cd98b8bb1e13967b047095dbe1eac589acd3145b66fc6c SHA512 afe675cebc52bba018a89d8f04b5c993ae8306f8d18ae2175be4c372f3219c63606b34bbb45c7daaab53be8eb7747fb7e86417bd29bbed2753458f564f3078da
diff --git a/dev-ml/opam-solver/opam-solver-2.0.9.ebuild b/dev-ml/opam-solver/opam-solver-2.0.9.ebuild
index aa993e87c76c..9dd373cc5af7 100644
--- a/dev-ml/opam-solver/opam-solver-2.0.9.ebuild
+++ b/dev-ml/opam-solver/opam-solver-2.0.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ S="${WORKDIR}/opam-${PV/_/-}"
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~x86"
 IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ml/opam-state/Manifest b/dev-ml/opam-state/Manifest
index f09dc8b1cdb4..7b53e3efb18a 100644
--- a/dev-ml/opam-state/Manifest
+++ b/dev-ml/opam-state/Manifest
@@ -8,7 +8,7 @@ DIST opam-2.1.1.tar.gz 818555 BLAKE2B 0f3e94c723774c38a5ad553f58fa796836eb8ef80a
 EBUILD opam-state-2.0.10.ebuild 898 BLAKE2B 19479c7ced8afbbf74644e642a026385a4104bc22e6c231a63fc14292a486d66442de41adb764f718d213a6dfede2d0c7f286f428b35b90335869ee743b66e8e SHA512 cbe5c717e72d38a6c482abb47a0ab25f9f77801266312c7e971165a17c8203e1630a9548010106e52bd3cc2275f7e29b6bf11eb2c1a0f121684fa0c0f636c4ba
 EBUILD opam-state-2.0.8-r1.ebuild 892 BLAKE2B aeafe2814aae5386ffcfece6c5a8ee56ee17fa61962135aa164e5253185b84e0c2f4a4e271e6fe6920f3ae3205c849c83b48834a6e6a60c364ea9eb0cf4f7629 SHA512 4c52036d0b0bec5b508f92a7e3d2772ae4d975d69d1acfbe2b850535d7d27d7f2404241fe655d03d641eab838f079bd42137a02426baa4d6ca81f11e005196bb
 EBUILD opam-state-2.0.8.ebuild 759 BLAKE2B dfbb268b17a66de025f6bf66d76fa7da257cd88646aa6faebe2b35f882d2b5cea6a896f16f640db633d70d0f50054251e6e3e7be3a8c4e5fceae1595bbddaeca SHA512 dcffb7e14d61ab1c584bfe249b03c53d000ccbef2c9f9c60e879b9de94c803df425802675abd27c1e91590b7ea493623ae9c8a03753fe08798ca1483196eaa8c
-EBUILD opam-state-2.0.9.ebuild 898 BLAKE2B 19479c7ced8afbbf74644e642a026385a4104bc22e6c231a63fc14292a486d66442de41adb764f718d213a6dfede2d0c7f286f428b35b90335869ee743b66e8e SHA512 cbe5c717e72d38a6c482abb47a0ab25f9f77801266312c7e971165a17c8203e1630a9548010106e52bd3cc2275f7e29b6bf11eb2c1a0f121684fa0c0f636c4ba
+EBUILD opam-state-2.0.9.ebuild 893 BLAKE2B 9a8988c397c20a3ab25424352d37d5a703c987f2afd0c6a625efcd139b1bec18195c04ff92139682d6645f584cf3744ccd4647925f297be6510275ca0a506f8c SHA512 1cd2674f47050658fc34f5606de97b51ee4502bb28d9e4d3b18277dee9842df928a2d836bb70d90acc8fd090977c331badeb0c7b83bef43783337a20f02936be
 EBUILD opam-state-2.1.0.ebuild 884 BLAKE2B ba2f2c0c46f36a7da0d2717cc10e548994947482efd9e7de2a3758f956b074384be391db9b6f204c3217e3e0b66314df71edf07222c05e8d81f5d3d6bb3d1a49 SHA512 b550a358e9ac408057271648f7433c96d04d5b8a0d1854ba953b1c37202e97d2132847f4637b1990ef2f3c50afa3b9685a265d9ab8412c738a6ea5abbc2466e4
 EBUILD opam-state-2.1.1.ebuild 884 BLAKE2B ba2f2c0c46f36a7da0d2717cc10e548994947482efd9e7de2a3758f956b074384be391db9b6f204c3217e3e0b66314df71edf07222c05e8d81f5d3d6bb3d1a49 SHA512 b550a358e9ac408057271648f7433c96d04d5b8a0d1854ba953b1c37202e97d2132847f4637b1990ef2f3c50afa3b9685a265d9ab8412c738a6ea5abbc2466e4
 MISC metadata.xml 413 BLAKE2B cbdd94927312b95f2b5f76489f341f658974be49f704b81a4524879bbe780dcc5d9505b863b87da002cd98b8bb1e13967b047095dbe1eac589acd3145b66fc6c SHA512 afe675cebc52bba018a89d8f04b5c993ae8306f8d18ae2175be4c372f3219c63606b34bbb45c7daaab53be8eb7747fb7e86417bd29bbed2753458f564f3078da
diff --git a/dev-ml/opam-state/opam-state-2.0.9.ebuild b/dev-ml/opam-state/opam-state-2.0.9.ebuild
index cf9ab72c819e..f24b0cc3aab2 100644
--- a/dev-ml/opam-state/opam-state-2.0.9.ebuild
+++ b/dev-ml/opam-state/opam-state-2.0.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ S="${WORKDIR}/opam-${PV/_/-}"
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~x86"
 IUSE="+ocamlopt"
 RESTRICT="test"
 
diff --git a/dev-ml/opam/Manifest b/dev-ml/opam/Manifest
index 08030cabbf2d..0d4f848143cc 100644
--- a/dev-ml/opam/Manifest
+++ b/dev-ml/opam/Manifest
@@ -8,7 +8,7 @@ DIST opam-2.1.1.tar.gz 818555 BLAKE2B 0f3e94c723774c38a5ad553f58fa796836eb8ef80a
 EBUILD opam-2.0.10.ebuild 963 BLAKE2B 3ba5f51f310eaa23515c561525215b2e21ce836d77aae765829a30b79c440d4910870171176e5460a8c6075e1c0f9e3bf699d5f9eefb2a80757a13ad18b5f6c1 SHA512 3b3e82b207f16807d1e266b5e1284622c5a8c58aad21dcd56664f053a84c4cae3029286c8ddf5c0082be13b8ba6bb43d6f7775d475be9c01b0002ea566a43e95
 EBUILD opam-2.0.8-r1.ebuild 818 BLAKE2B 2cdef3169d4c660daa501a449c0f204ae3bd12e8bd1a66cb4bde94ea4e523457fe952a61330cecbd1a59d14754d0e167efe453589387f9fe666b7804caa370f4 SHA512 7ebd4e81e160649198b792911d5f16bd4a7c001b60b2b4db3b8509caeb0d537c4114618d25b1ffbbd66c96f32373a7824b6530587ad8f9f4d1249de9400cf7d2
 EBUILD opam-2.0.8-r2.ebuild 957 BLAKE2B 70c77656cc85045f056848f07ab5d914b1564f1cc4505a8ffcc01b93262c52b56d0d3a1e87ca4a8be6f496a1b15bce17d795262aa4cc3985a318aea65ba1b7fd SHA512 f7745c7df1bb6c862bd54cc57376df0046279d3961e22cab77ee0b43239e15471d8c6b28dff44ced28c4c18b1eeac4a7aa656c6e1ee6a8d3869fc24e30a457fc
-EBUILD opam-2.0.9.ebuild 963 BLAKE2B 3ba5f51f310eaa23515c561525215b2e21ce836d77aae765829a30b79c440d4910870171176e5460a8c6075e1c0f9e3bf699d5f9eefb2a80757a13ad18b5f6c1 SHA512 3b3e82b207f16807d1e266b5e1284622c5a8c58aad21dcd56664f053a84c4cae3029286c8ddf5c0082be13b8ba6bb43d6f7775d475be9c01b0002ea566a43e95
+EBUILD opam-2.0.9.ebuild 958 BLAKE2B f3fc8ef8eff873ff4334aac4c716126711cf357577da604071d26413e9165ead185a5fc1b1f0c2f537a58bc547c889dba07ba61a82140067f6d6ea265ca599f4 SHA512 ab526d890a40b1d7bef781355ae5a04b7949269f295f24682f75c8eb1e7e40c9261e733b0b96fbcae96fa23843cb34aa25ad32b48850875e318d601b2bf9c113
 EBUILD opam-2.1.0.ebuild 949 BLAKE2B c3db9b32322ae6acb0dc76e22fd67eea01d2e03016b6bf8aa41223065dd18d5f00eeeb26b57f45d83f9836fe8da960db4177f244ea6b032b80f6353843125914 SHA512 0189369c5a3daf3f596cac822437c6edf71fa0c6a7257ef78f5ceb16a293902962d44cb51462550302b36aa64a94f2bf5a96905ef532296244f8c82931befe0e
 EBUILD opam-2.1.1.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
index e882aefd038f..9c6caf213221 100644
--- a/dev-ml/opam/opam-2.0.9.ebuild
+++ b/dev-ml/opam/opam-2.0.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ S="${WORKDIR}/opam-${PV/_/-}"
 
 LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~x86"
 IUSE="+ocamlopt"
 
 RDEPEND="
-- 
cgit v1.2.3