gentoo resync : 22.05.2021

37 files changed, 30 insertions, 354 deletions

diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index a46f1a7d6104..0f305909b026 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/alcotest/Manifest b/dev-ml/alcotest/Manifest
index 3f2ef1a6b935..f4f1ac3cad11 100644
--- a/dev-ml/alcotest/Manifest
+++ b/dev-ml/alcotest/Manifest
@@ -1,3 +1,3 @@
 DIST alcotest-1.2.3.tar.gz 274177 BLAKE2B 1c38baf8932fe16ec3899cd1dd747099065cf93677271aad5ec33706ed7b6fd82dac84f9ed7518c56d178bf1f98a0b131d5e0f4745d47b07021f0fef932fde28 SHA512 0f3e2a5f56a17b6ddf5173d490b8a1aa2b23382bd0535d9d8be09fb8d4dd02dd1b92f9d00b957b11843d671262469e28b3be4f987538e373eb5e1f30c3a406a3
-EBUILD alcotest-1.2.3-r3.ebuild 673 BLAKE2B 102e2d43e76ce945e9c45418df855f7bf9f8fc3a67690aefc63a566492f30c0d1e517e4819d5534e750396cdd0644c677ae7d60b69066f1cf0b2b2a570bf21bf SHA512 ebe3014ca69d92ba4c94e588861347e23d1445d09c4dcd3cb553e57f6bf1fd7e369a8c87fbdc36c7fc9340cb26c0469be68d51c1882dfc446f032e910da332a1
+EBUILD alcotest-1.2.3-r3.ebuild 669 BLAKE2B e04f6c3d76dcfe293b5df9b8ba5ac728ddd68859c1f88ebe0000751909651ca3175d2d78c7bda13c91fa20677280c3ba12d24387c383a4c8a2b1192d4dad1ea9 SHA512 cc461a10f57b09e40dbe968ed6c96523462900eaba000a444c43f4077c90fb80845bb2cda3d3e74e7fc386d34aeffba29a70a90a29ae0b551859f41b361518a1
 MISC metadata.xml 312 BLAKE2B 5beaeb2d3788d842e87db7d42004617c222e706451ef5370be5c053b5e2e45524941d8c70c4b95e07d688683489919e6125181ec7a7d5dcf54a8a05093c93026 SHA512 d16ec08946503a4e8027aef8c59b7d973b98ef0f001d9967857d660ceab7f609d28a24fe6a24c3be5db5137ce22d31ef6535f87cfa8c2533873f278054fb3183
diff --git a/dev-ml/alcotest/alcotest-1.2.3-r3.ebuild b/dev-ml/alcotest/alcotest-1.2.3-r3.ebuild
index cf09b59a6db4..bbfd3a1925e0 100644
--- a/dev-ml/alcotest/alcotest-1.2.3-r3.ebuild
+++ b/dev-ml/alcotest/alcotest-1.2.3-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mirage/alcotest/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~x86"
 IUSE="+ocamlopt"
 
 RDEPEND="
diff --git a/dev-ml/astring/Manifest b/dev-ml/astring/Manifest
index a5208c933e43..7bfdb850976d 100644
--- a/dev-ml/astring/Manifest
+++ b/dev-ml/astring/Manifest
@@ -1,3 +1,3 @@
 DIST astring-0.8.5.tbz 37499 BLAKE2B bff0b9a295da9e33e0cc4bf1a5a0c3cec4010f477d67a39650bbb8e61f12e517cd5734f1e869d35448e4e555a04d0223b76181f29ee299ef9f19359c7d59e69a SHA512 b40634cc2053d651bce5c1974996b352ffa48ecac429919113840b2a807efb34387d950f12accb346afd5e40514cb90219d70b00109c30e1450c4e99f65c9856
-EBUILD astring-0.8.5.ebuild 591 BLAKE2B 47c1ed208fe84b3a7638fccdcea6e2b394d837d1be5949c70967ddda9e89e5043b32d1551515fc9a1aac2aa40fe15dbbf242755a00a596196078d893d05c1be6 SHA512 fa8e2c5c3d100a5fdbc4fc1f3ae4cf983c478634fdb190dad30dca5b1510d84907622c249768ef57dd04400e00bcf7a3e259db0728b16efbf164104376d928d6
+EBUILD astring-0.8.5.ebuild 587 BLAKE2B df9b7963f804273b550d7e7a253a8d2db16f369d127b178fb10130077e9cbc6f632fff13aa62875ec128bf615d59ca2333aa847690a7de1a4d7c53d76028fbc1 SHA512 62e5287372da4818ebb370bcd127f941e473d3a86f5474995113c87d8e1f10096c13cd372654a3a6f8903fa57a2a7905710e25ac30bd0d881428a2916c00f576
 MISC metadata.xml 332 BLAKE2B bb0dcf9efae54d3c1f2708df73254af5e5f0a87a1c6651809e78e975a1d05f42c83db5a1f0c7bd4ec345695bfefd81de2ff201d917f8a8c15cb70855b890fe65 SHA512 b45554a47abc646388c8daa8b7e79f4bcbcddb9f4699b5c91b93eaf2acaddfe2838c179256473dab11d2dfce9ee626f68494629d1801e8ed199b4c391a8fe34c
diff --git a/dev-ml/astring/astring-0.8.5.ebuild b/dev-ml/astring/astring-0.8.5.ebuild
index 73866cc6120a..9496ce793096 100644
--- a/dev-ml/astring/astring-0.8.5.ebuild
+++ b/dev-ml/astring/astring-0.8.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://erratique.ch/software/astring/releases/${P}.tbz"
 
 LICENSE="ISC"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~x86"
 
 OCAML_DEP=">=dev-lang/ocaml-4.05.0:="
 BDEPEND="
diff --git a/dev-ml/async_kernel/Manifest b/dev-ml/async_kernel/Manifest
index 673174339d18..c2a3d29e6d74 100644
--- a/dev-ml/async_kernel/Manifest
+++ b/dev-ml/async_kernel/Manifest
@@ -1,3 +1,3 @@
 DIST async_kernel-0.14.0.tar.gz 138191 BLAKE2B 0f8096eb1cfabcdb4b3148f8d2cb3d5f8c858da74986ac107e7592195dab6e6563c0adb8f39f22a8d3b279b994c937e345b6c56d03a5767672913c7316ecd1fb SHA512 9324f17527311e3c112203b7caa2b0b7dfea15bdb30d02d7218c7b8d8c930d4893d83043016ad064265cedc191985400dbaf2d0af448f840c98ef98326aac8ff
-EBUILD async_kernel-0.14.0.ebuild 505 BLAKE2B 46271c595db66c6592895d6b81ae553023c1bab8a8e7ef2359a3a4856203acf7be17ad8e285724905e1130a5e0b47b94bdb49659677c7daaf9ee7bfa63fd1fd3 SHA512 a7d8b6fc53757df94142a3ea74c1698a5c1988e4d871fce11763b8e483dfd761413d3515b3b26b7c66c8d463f00ced4bee789a8fd61d3b6b42ef0e24545be949
+EBUILD async_kernel-0.14.0.ebuild 501 BLAKE2B 2d330d4b4c06ef729d9d2b4f31e0cb15391cd267261b54947e870ff14c8ca884fc508fd30ddcfd08143a20381a9ee77e465da5202166eed330080b5b3707b766 SHA512 83002a9c0b50e8d215b2a10b2662054e6db4d7ac2718dcb4fcb7c60860c6e88b9dc47ad5b36c58e4154aa529354b219c5084bd73acdacb31a5a773ed75628138
 MISC metadata.xml 255 BLAKE2B a46c62417f85a5b501427db310d8b72515be3555082ca620c9ad5c3779138e4bb791787dbcb5d0a24aa839b5d41fa8b227a31f99fad760c9902d0dfd3ad93162 SHA512 be2ed408adedd7f6505032ed11073d13b07e404d19c44c1acb10da5d3fab716c2245d7a55ab7a1461ecdf7bc22bb7de96cd32ae9508ddced925c76406c6db6ef
diff --git a/dev-ml/async_kernel/async_kernel-0.14.0.ebuild b/dev-ml/async_kernel/async_kernel-0.14.0.ebuild
index 85e8c100d70e..5292c680c149 100644
--- a/dev-ml/async_kernel/async_kernel-0.14.0.ebuild
+++ b/dev-ml/async_kernel/async_kernel-0.14.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~x86"
 IUSE="+ocamlopt"
 
 RDEPEND="
diff --git a/dev-ml/async_unix/Manifest b/dev-ml/async_unix/Manifest
index 6476e3c596ff..df0f992d4f8d 100644
--- a/dev-ml/async_unix/Manifest
+++ b/dev-ml/async_unix/Manifest
@@ -1,3 +1,3 @@
 DIST async_unix-0.14.0.tar.gz 171624 BLAKE2B 4c55b6c8ba8cd59ede4b214ec84d8689700e46b918a96e145f94ebd011c32de6c2ab40c35a4c821ac58872259740b752e045eb2ac7954ecb0b988ceaf1b75ff2 SHA512 d90713d1d35445a648392e9104eedd25d4c7e6a10a46d0442539c1521349dcbee4118e852cc8335c8c03ba4d1050f199eb91a6e3c3c827dca8eee59501f379be
-EBUILD async_unix-0.14.0.ebuild 541 BLAKE2B 32821a01d36a4248da642575fdd21c9b05eb50bdff8644abd13bf3efd1e23d917f71b562e386ec9ce0bcaf6c9947c2b50ca7d4c91fe4b83402722fc991e1b9e4 SHA512 e7103fdd3bd9a1c39aba29b00d14792708c230bed49970483c259b4fb55103d5ed8d044104e20ce7e23520c8270c9336ff3d7fe89dac5d2a2aed0cdd763c866b
+EBUILD async_unix-0.14.0.ebuild 537 BLAKE2B 7342201fda486a6e20bfe8e26e328a61e97ea8fcbdabc7d837e762860ff40312eaeb885e9c8f89ce08ad74f05f979d1b558a41f1b9d76451e568dac884c1952e SHA512 466c2e74a10fe1ceb0bd36ffdf9eb43797b4448a20fd96f226847cd14aef12885921197f668af78cce9ec20eb65d4c2f7cf8c6b7c31189e75c1a2d990073231a
 MISC metadata.xml 253 BLAKE2B 0119814797fa3c3d05048b625f47beb2588cefc93f90594e1fa0fa1f70858f3a84d5e71e912025cd0db1556ff22bd12ba8fe19951e0bcda22c7e11e9ac5b739b SHA512 9ae29fd2c07040726fac076a79e59a91d83db3aa6a01ccf0b2832d9dde07008a45e2272dc18a5b8683cb6dcb9ce120762e8561fe43329782dedf730f27cdeb68
diff --git a/dev-ml/async_unix/async_unix-0.14.0.ebuild b/dev-ml/async_unix/async_unix-0.14.0.ebuild
index 54baa5fdc8af..2e8590dfcf96 100644
--- a/dev-ml/async_unix/async_unix-0.14.0.ebuild
+++ b/dev-ml/async_unix/async_unix-0.14.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~x86"
 IUSE="+ocamlopt"
 
 RDEPEND="
diff --git a/dev-ml/bos/Manifest b/dev-ml/bos/Manifest
index eea7f9fe9029..448fe4b3b016 100644
--- a/dev-ml/bos/Manifest
+++ b/dev-ml/bos/Manifest
@@ -1,3 +1,3 @@
 DIST bos-0.1.6.tbz 39822 BLAKE2B 0e10eb14fb5d429b81c67659c936e8b700c4cd417d1f5be000c8bdb0304de8ad9130e597f6e2e7771380c29c148f4339817bacc458e72a8efa894be3b85965bf SHA512 f1f10a97a32da936a7d5a0c70632e723723ee523c79f9dfd23bc42c039a194e8d69658483e6e856c7911332b799a92bf8cabfe96cc387522d7450b8f3f8f8343
-EBUILD bos-0.1.6.ebuild 896 BLAKE2B b2d3bddcf15170e265fe5cf0e2a2a313be867f5fc0b5ec742d2daf965851a3203b66c4502adf87ad7fb0fc8776369a8ad9cc85bbc7d026ad0b34b03c74ba12b9 SHA512 00fcb04ac30ea8e2ab76a7f221e7f19868d48b036d6db20a078d6f426a0b274197717fffd9dfb5535e7583a4716ce42fc3d67039d6c17acae80a2a75e6612a8b
+EBUILD bos-0.1.6.ebuild 908 BLAKE2B 69e09f2bd6396583199d493a784e4d13700e8099b73ce077a435d768f5e99d88dbb70051682d1482681979d2a379c9bb1c06b6656b884bbd8384411ac7085210 SHA512 9293a745d50c277b3918405119363a43260ce9982ef998210d401ce83da240ac8d4aae29aa5cefe9f193ad0df419fe555639bfeab21751b45d69aad58704de4c
 MISC metadata.xml 244 BLAKE2B 9e12f673e76e7b3faa5cd1c5e0c93aefcadb32fe5392de8774fc54061813b6c92b984d318323f6ab16e65c85f97dc4431566b51c6328dee64366180c0e3f29d4 SHA512 0a7454e598ba26bfcabdf5b4284903e17ce33dafd9d8b84603eba1425e37f3deaf8cffdf5656875b6c596b3fb75a2265f25556b5be2042dac71b82e956039b4b
diff --git a/dev-ml/bos/bos-0.1.6.ebuild b/dev-ml/bos/bos-0.1.6.ebuild
index 84de3bee6286..44b13d84de7a 100644
--- a/dev-ml/bos/bos-0.1.6.ebuild
+++ b/dev-ml/bos/bos-0.1.6.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://erratique.ch/software/bos/releases/${P}.tbz"
 
 LICENSE="ISC"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~ppc64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ml/duration/Manifest b/dev-ml/duration/Manifest
index 1ef1328cdd70..627256811f7f 100644
--- a/dev-ml/duration/Manifest
+++ b/dev-ml/duration/Manifest
@@ -1,3 +1,3 @@
 DIST duration-0.1.3.tar.gz 4295 BLAKE2B 1bcf0d457e76c6dfe05308dbbdcd02e534abecb621d30d4d031e2218da48515e1086c0c71c3c91ea84350143dc3255ae368d66ba43ec9fb763932efbb3654128 SHA512 eeb219821e65d5cdee0b1038afd856b58f21633498e8cae37a7195d2a045cd0b11c4c817a6518d20c5a6c5f8c7ebfa9b84dae16bb847a658a8dc1aae5a9be5ab
-EBUILD duration-0.1.3.ebuild 476 BLAKE2B a30214a387dcc7ee82a05718dba857a33ab34c0d599b0a865196eb1514eea2be593df1177cf5e27aba6e4cd30680480d3b64f3d92a9a0b5df87d62c59ea7c729 SHA512 f4dc90ec31fcfbd50a666f865996a0781eee56ce57c1337e2d2f8f1986833f442cf11b6d411350597960fe5296e36caf7e33c129e22250c9c53b8502f4316547
+EBUILD duration-0.1.3.ebuild 472 BLAKE2B dbe30fc03b0c014265d2f725d5f9d00b7aca5b7638d4f1d06b6275e9f1784b9f41f7bddf99253470b9a7b996d2c99868bebcb9ea43a99abd83bdb80b2c7ee1e4 SHA512 69e8f9d7ed6517e68a9fc1ce42b9679f5a259e65ebbec3ba918a919482628353dcd2a676b62f60ce4cd840b0bac5f9543732f19f27a0005e08f8284915bd8e42
 MISC metadata.xml 247 BLAKE2B ddda0ea2f5068bed824871d1b734188ba122a58d22ab67fb491beb7d48349ded25fb96d6c95f0efa4c756d44a7e30d8a78b0a2b8020fb35b2715c4ea3b41c02a SHA512 4fda15644be2ad3faf61b9a05fad67cdb8ac023dd63de9e0fb034396a38c512d51721d299e07881521fac159d18ba7561fa614980b7ccb60b741fec24e1ef609
diff --git a/dev-ml/duration/duration-0.1.3.ebuild b/dev-ml/duration/duration-0.1.3.ebuild
index 26d3f3bd34ff..29908b04a4fd 100644
--- a/dev-ml/duration/duration-0.1.3.ebuild
+++ b/dev-ml/duration/duration-0.1.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/hannesm/duration/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="ISC"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~x86"
 IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ml/fmt/Manifest b/dev-ml/fmt/Manifest
index 72d7e4c068b5..fc17981930bd 100644
--- a/dev-ml/fmt/Manifest
+++ b/dev-ml/fmt/Manifest
@@ -1,3 +1,3 @@
 DIST fmt-0.8.9.tbz 21469 BLAKE2B 4cddf626118c9bdea435f9db4e6a3c0b92b49b2c07d1b0f708ae7b82963453be666ad49df196d98b466236509d3fa5a519e191da6b2385a308d1019f1583f0b5 SHA512 19b97caf5d2dbe86cd75bec478707b8f4e4b899b2a11ce04790dc5acb5c9ed6ea98047de52ee50c6480231a16307af2541eabaa94d18d7d008f7a67496f5f626
-EBUILD fmt-0.8.9-r1.ebuild 839 BLAKE2B af56476cb9d4827da81e3c67dca75523e0fc9cfa48f0d88f31342f0f7fbf52ee800b7450349bc19ee3da4b18edb85337ee6b377506b4165e83ad6ce9108de91b SHA512 27b294c967bbaadcc460897f9ff894c74ce1e9ee2b8fc95dec6d94e201657f3304f3a5c22c8261a96bb98ce08ce7646e473249bb9da29bfebe19215fe1a049f3
+EBUILD fmt-0.8.9-r1.ebuild 835 BLAKE2B 8ae3edafa085066f3855d1573f1d306558e01047e291a5c4ceed3c2bec218abfe11ce40460805d5611b4ccb308f8b4860b937de8de1d3a5cd499902441d7acd2 SHA512 fd3723b0a69c16764fdf0b9aa7fa6d79f8c3ac5da8f3049dabce5c1d4cb601727fc6ca96eccad27bf38a5dd9a0cda2527f2be68bfe51c2ecd29367c7c45a15de
 MISC metadata.xml 244 BLAKE2B 7bad0b6c3b4ef28ccc919f1cbd297434f930aee5575e6135e78409a31f2e8e6406201c3dd81992cf89f808a0f3af6aac46165395ec7cda6b4af91274696a9eb7 SHA512 319d9b69276e64a092b5c35b50894347712a625e6af1773fe2b2e988428f7cfae19fcbeadea0152c3c02969f4dd5b5e2e369a6a2f29579d037d819b314461705
diff --git a/dev-ml/fmt/fmt-0.8.9-r1.ebuild b/dev-ml/fmt/fmt-0.8.9-r1.ebuild
index f150f307cc73..3fa332cf935d 100644
--- a/dev-ml/fmt/fmt-0.8.9-r1.ebuild
+++ b/dev-ml/fmt/fmt-0.8.9-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://erratique.ch/software/fmt/releases/${P}.tbz"
 
 LICENSE="ISC"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ml/fpath/Manifest b/dev-ml/fpath/Manifest
index 1ffa029dbe09..40e0f87c5f7b 100644
--- a/dev-ml/fpath/Manifest
+++ b/dev-ml/fpath/Manifest
@@ -1,3 +1,3 @@
 DIST fpath-0.7.2.tbz 24142 BLAKE2B 5aa22a33d0155c2a446c3622d6feef0748be3eaa72f07e7e2770fda1993794864072a5f50a052537b9724e39935064967c87f82d860a2da17fbc86279a1930ab SHA512 d8ab8d6f183a1742d74a3a3220cc1d62e7df38a6f3ca1c04fad18426a0897152255382305ad14d058b5b85ab55a27536c39a62deffac8d46984a730a2a18405d
-EBUILD fpath-0.7.2.ebuild 550 BLAKE2B fadf12fb58ba99c2e181b8e9be980fc68ce22b57f582518b98f913a8280e8cff555640cac66e3cce09ac5985a9f10586f0bdf5d354a2826ce03e3f324540ff9a SHA512 9e91fb2e35b5d112db7702c079b2c2525446f71e1125df8149f296afd740b73acff494e0e42aff331cbe48823f4f293b6c96d98f88b7f247c06092832eed797f
+EBUILD fpath-0.7.2.ebuild 562 BLAKE2B 8cb8c2a0a99c854a76d15e449009f820c1a58763dbb3bb9798bf26a3b8fbb39616790ba0d83e24a2e1e1e78783ecae18b24050fe36274f20e1169463b5cd32bf SHA512 5bd8331599a77b64ef38f40f88f167008f0405487747f17abb6a2b46bfc951fda98efc84651a8c6b102f581a7a2171de56eb5113bc1686beb146083ceeb1445d
 MISC metadata.xml 246 BLAKE2B 17b71e35ed0f5d8753cb7f826e2367bb9a9a929f025bf19a294d5e31b813eb935debf8a72f1ff238cef3dcbbaef31acadad3e6ceea7a8e4caf11d865bae696ab SHA512 0edbfb4b267356db598a79479d2019c397d73fb7a976b2f4fc1a0d53f35ee17e4f5976deecef10607c2e50ce7a15677c0d2f61fdacf89be7efdc151922722c6c
diff --git a/dev-ml/fpath/fpath-0.7.2.ebuild b/dev-ml/fpath/fpath-0.7.2.ebuild
index 180f39a36ea6..41000274f67e 100644
--- a/dev-ml/fpath/fpath-0.7.2.ebuild
+++ b/dev-ml/fpath/fpath-0.7.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://erratique.ch/software/fpath/releases/${P}.tbz"
 
 LICENSE="ISC"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~ppc64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-ml/llvm-ocaml/Manifest b/dev-ml/llvm-ocaml/Manifest
index 842c845281ac..cdc4acec09e6 100644
--- a/dev-ml/llvm-ocaml/Manifest
+++ b/dev-ml/llvm-ocaml/Manifest
@@ -1,11 +1,7 @@
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
-DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc9da40911bbe9ee3531c15ada9165e5002b1c2f778cf8735858485ea05a8754e3d3a5f4b15bdd6cb33d64a14692984 SHA512 b6d38871ccce0e086e27d35e42887618d68e57d8274735c59e3eabc42dee352412489296293f8d5169fe0044936345915ee7da61ebdc64ec10f7737f6ecd90f2
-DIST llvmorg-11.0.1.tar.gz 122790338 BLAKE2B 0130996b4a8c4d9f757136fd7fb318068c9bfdc565060dec0d4336480c4ab66c4ae3185a7fdb05f13cf9ee8fd4123b09df938881b75d6e5d3689595114b7e32a SHA512 f5e6ef0b3111aae08a89cd01adb2ff4abfa9ef779c68b9190421d0447efd25c2cc00e5aae9f4764805f5fa31434866043d1510ae7389817e28ae53a5442e2fdf
 DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
 DIST llvmorg-12.0.0.tar.gz 134226215 BLAKE2B f9c3ba8c58571855caa4f206fd285c9b5be66672fb0814cb8bc0964a051f57f5d35013aa1e27cbda502652b37df1ec23474129109e76a42066847860db441dbe SHA512 0cff02155c5ac0d6db2b72d60d9819d5b5dd859663b45f721b1c7540239c2fceb1f57d9173f6870c49de851c242ed8e85c5c6d6577a1f8092a7c5dcd12513b26
 EBUILD llvm-ocaml-10.0.1.ebuild 2991 BLAKE2B 8f6847347faf4ba2afd66e3b2f8052b27662a9db05ca3d03e5c1ba44ce77ef9731dca1632e21a5bda21ae963531d85db9633f92c33bb9713e0a4b9fdf19ea775 SHA512 2d43e10b0a15ea9b438f93a15bf32575e2d111eea1954c8c36f7ce949774055ee720d448cfd7e08a7627539ca8095d81c8f65e69de926475b8f40d5dbcc75db0
-EBUILD llvm-ocaml-11.0.0.ebuild 3053 BLAKE2B 0f8b152cf350f9a7cdf3d552347b5729091b265a47bff1ce289473c4d094ba55f168b9d5c18e7754cb5f48e0eafcfa1f3b3d07b6c4bae9780ac53037e7e88d04 SHA512 75d8e6273fd3360e0df8d3dd1130f4a5dcfd3c8c93d75b3b48b173632d263341d7d235d1a5309d4e9d33ce78aea262e35ab6844a7533d8fb84ce3f758cd0e27e
-EBUILD llvm-ocaml-11.0.1.ebuild 3054 BLAKE2B 0498a14f644a956cf1a495c4b10687328cdd7044b4cf90e09d51c3c93c3f8e7eae29e93b605e7079975cf9b585e14e0c50c85f6b210d6516395f3278f0c2cace SHA512 28ac245ce6fb5caafec11a501e4a8e7a39bf15bad171b445f9b6faf82b8c3a4416925c42ac022bddf262332ca275de3969735b99e642df8c3b64ab3b7d04f85a
 EBUILD llvm-ocaml-11.1.0.ebuild 3054 BLAKE2B 0498a14f644a956cf1a495c4b10687328cdd7044b4cf90e09d51c3c93c3f8e7eae29e93b605e7079975cf9b585e14e0c50c85f6b210d6516395f3278f0c2cace SHA512 28ac245ce6fb5caafec11a501e4a8e7a39bf15bad171b445f9b6faf82b8c3a4416925c42ac022bddf262332ca275de3969735b99e642df8c3b64ab3b7d04f85a
 EBUILD llvm-ocaml-12.0.0.9999.ebuild 3043 BLAKE2B 579eeb6491b8eb85e94b5c3f1efb873d04b7aac517747661a3b34641c47e87997139dc2784e8c2c91461fe2db9f21f25ecc86695b51bbf6b81d5b325b2827df9 SHA512 ae470c4552ec701f5b32f1bc6c3efa9a0c75779dfa48b60b7c5df1bc203be7b4656048452109146fd12c8c7b3b0b8b15bf8ffd47afdb40dde42f8e4b6cda82e3
 EBUILD llvm-ocaml-12.0.0.ebuild 3059 BLAKE2B a3a9b1a45127499e7212d30ce699c7a23229895e0e4ac14fe5f9e02d1bd401350b6f419eada422cf66f9301dc180d16ad126e43267a4ef7db797eab184dc7eb5 SHA512 2208b0de0343ae1d33385226eef2e5bef2185a3799a30ea74094c5b004d7b9d7f97f73a97191f46ecc6d3be5b05d647300e0eab5ee5b4649051a98135b2bfa91
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-11.0.0.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-11.0.0.ebuild
deleted file mode 100644
index 2927a17a5ef7..000000000000
--- a/dev-ml/llvm-ocaml/llvm-ocaml-11.0.0.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit cmake llvm llvm.org python-any-r1
-
-DESCRIPTION="OCaml bindings for LLVM"
-HOMEPAGE="https://llvm.org/"
-LLVM_COMPONENTS=( llvm )
-llvm.org_set_globals
-
-# Keep in sync with sys-devel/llvm
-ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC VE )
-ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430
-	NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore
-	"${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}" )
-ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="debug test ${ALL_LLVM_TARGETS[*]}"
-REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-lang/ocaml-4.00.0:0=
-	dev-ml/ocaml-ctypes:=
-	~sys-devel/llvm-${PV}:=[debug?]
-	!sys-devel/llvm[ocaml(-)]"
-for x in "${ALL_LLVM_TARGETS[@]}"; do
-	RDEPEND+="
-		${x}? ( ~sys-devel/llvm-${PV}[${x}] )"
-done
-unset x
-
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-lang/perl
-	dev-ml/findlib
-	>=dev-util/cmake-3.16
-	test? ( dev-ml/ounit2 )
-	${PYTHON_DEPS}"
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-
-		-DBUILD_SHARED_LIBS=OFF
-		-DLLVM_BUILD_LLVM_DYLIB=ON
-		-DLLVM_LINK_LLVM_DYLIB=ON
-		-DLLVM_OCAML_OUT_OF_TREE=ON
-
-		# cheap hack: LLVM combines both anyway, and the only difference
-		# is that the former list is explicitly verified at cmake time
-		-DLLVM_TARGETS_TO_BUILD=""
-		-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
-		-DLLVM_BUILD_TESTS=$(usex test)
-
-		# disable various irrelevant deps and settings
-		-DLLVM_ENABLE_FFI=OFF
-		-DLLVM_ENABLE_TERMINFO=OFF
-		-DHAVE_HISTEDIT_H=NO
-		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
-		-DLLVM_ENABLE_EH=ON
-		-DLLVM_ENABLE_RTTI=ON
-
-		-DLLVM_HOST_TRIPLE="${CHOST}"
-
-		-DPython3_EXECUTABLE="${PYTHON}"
-
-		# disable go bindings
-		-DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND
-
-		# TODO: ocamldoc
-	)
-
-	use test && mycmakeargs+=(
-		-DLLVM_LIT_ARGS="$(get_lit_flags)"
-	)
-
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	# also: custom rules for OCaml do not work for CPPFLAGS
-	use debug || local -x CFLAGS="${CFLAGS} -DNDEBUG"
-	cmake_src_configure
-
-	local llvm_libdir=$(llvm-config --libdir)
-	# an ugly hack; TODO: figure out a way to pass -L to ocaml...
-	cd "${BUILD_DIR}/${libdir}" || die
-	ln -s "${llvm_libdir}"/*.so . || die
-
-	if use test; then
-		local llvm_bindir=$(llvm-config --bindir)
-		# Force using system-installed tools.
-		sed -i -e "/llvm_tools_dir/s@\".*\"@\"${llvm_bindir}\"@" \
-			"${BUILD_DIR}"/test/lit.site.cfg.py || die
-	fi
-}
-
-src_compile() {
-	cmake_build ocaml_all
-}
-
-src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-llvm-bindings-ocaml
-}
-
-src_install() {
-	DESTDIR="${D}" \
-	cmake -P "${BUILD_DIR}"/bindings/ocaml/cmake_install.cmake || die
-
-	dodoc bindings/ocaml/README.txt
-}
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-11.0.1.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-11.0.1.ebuild
deleted file mode 100644
index eadb980e8aa5..000000000000
--- a/dev-ml/llvm-ocaml/llvm-ocaml-11.0.1.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit cmake llvm llvm.org python-any-r1
-
-DESCRIPTION="OCaml bindings for LLVM"
-HOMEPAGE="https://llvm.org/"
-
-# Keep in sync with sys-devel/llvm
-ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC VE )
-ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430
-	NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore
-	"${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}" )
-ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="debug test ${ALL_LLVM_TARGETS[*]}"
-REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-lang/ocaml-4.00.0:0=
-	dev-ml/ocaml-ctypes:=
-	~sys-devel/llvm-${PV}:=[debug?]
-	!sys-devel/llvm[ocaml(-)]"
-for x in "${ALL_LLVM_TARGETS[@]}"; do
-	RDEPEND+="
-		${x}? ( ~sys-devel/llvm-${PV}[${x}] )"
-done
-unset x
-
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-lang/perl
-	dev-ml/findlib
-	>=dev-util/cmake-3.16
-	test? ( dev-ml/ounit2 )
-	${PYTHON_DEPS}"
-
-LLVM_COMPONENTS=( llvm )
-llvm.org_set_globals
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-
-		-DBUILD_SHARED_LIBS=OFF
-		-DLLVM_BUILD_LLVM_DYLIB=ON
-		-DLLVM_LINK_LLVM_DYLIB=ON
-		-DLLVM_OCAML_OUT_OF_TREE=ON
-
-		# cheap hack: LLVM combines both anyway, and the only difference
-		# is that the former list is explicitly verified at cmake time
-		-DLLVM_TARGETS_TO_BUILD=""
-		-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
-		-DLLVM_BUILD_TESTS=$(usex test)
-
-		# disable various irrelevant deps and settings
-		-DLLVM_ENABLE_FFI=OFF
-		-DLLVM_ENABLE_TERMINFO=OFF
-		-DHAVE_HISTEDIT_H=NO
-		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
-		-DLLVM_ENABLE_EH=ON
-		-DLLVM_ENABLE_RTTI=ON
-
-		-DLLVM_HOST_TRIPLE="${CHOST}"
-
-		-DPython3_EXECUTABLE="${PYTHON}"
-
-		# disable go bindings
-		-DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND
-
-		# TODO: ocamldoc
-	)
-
-	use test && mycmakeargs+=(
-		-DLLVM_LIT_ARGS="$(get_lit_flags)"
-	)
-
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	# also: custom rules for OCaml do not work for CPPFLAGS
-	use debug || local -x CFLAGS="${CFLAGS} -DNDEBUG"
-	cmake_src_configure
-
-	local llvm_libdir=$(llvm-config --libdir)
-	# an ugly hack; TODO: figure out a way to pass -L to ocaml...
-	cd "${BUILD_DIR}/${libdir}" || die
-	ln -s "${llvm_libdir}"/*.so . || die
-
-	if use test; then
-		local llvm_bindir=$(llvm-config --bindir)
-		# Force using system-installed tools.
-		sed -i -e "/llvm_tools_dir/s@\".*\"@\"${llvm_bindir}\"@" \
-			"${BUILD_DIR}"/test/lit.site.cfg.py || die
-	fi
-}
-
-src_compile() {
-	cmake_build ocaml_all
-}
-
-src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-llvm-bindings-ocaml
-}
-
-src_install() {
-	DESTDIR="${D}" \
-	cmake -P "${BUILD_DIR}"/bindings/ocaml/cmake_install.cmake || die
-
-	dodoc bindings/ocaml/README.txt
-}
diff --git a/dev-ml/logs/Manifest b/dev-ml/logs/Manifest
index c1b7c3ae166c..3371ef046a0d 100644
--- a/dev-ml/logs/Manifest
+++ b/dev-ml/logs/Manifest
@@ -1,3 +1,3 @@
 DIST logs-0.7.0.tbz 18458 BLAKE2B 091d1778166af0b67e17e932a775a73e31e5d167b94b1b378063a7112c21bf1ac935c7e51fe29bcc0121cd5e60ea46ed3c7381f4db5df400b463feedfbe89663 SHA512 657f66eeaf5788947a3ff4b2a179f7e192ad4ce086fc8968286066d4b83af476523b3befce50ee58abf2d9b8c8dc65573ba8ed62f9c5e7933db29a7fb769646a
-EBUILD logs-0.7.0.ebuild 1386 BLAKE2B 80072bec79015c5577b1fc4b9e5e28344a35399d970af4cfb2f7bb656ab6334f9cf8c0473db19e68511923144b6aa3bc0592474ce6b1626dab133d4afa4abae2 SHA512 6b014f53b66ab378a716b9da711127bfc30468eb7f43abe89a4cb2e84a1c57af5fd556324b39a34acfeabbeb54aee8f6dd88e0e29ff7e1171e3fbfbac3b2f882
+EBUILD logs-0.7.0.ebuild 1382 BLAKE2B 684065355180dbb38cc0be5e0619d20b7b8e4f34980eca0b70e049dd9bf03605429be97253236dbd7489ba8eb1278fc246f5f8863e0081943267da9896ec0b8d SHA512 247cb2cb23b5d77aaa027c92848036c13048900b9d7f2f07907347f3d437167f00320836ab70a44250c69d5dcdd8c9e4924f177e6050d06c214a993ef24f87bb
 MISC metadata.xml 586 BLAKE2B bd04cdf2c8e2cbf3ccb49ec1394ab882e0c104c6fbec63fe72d8497f79c91814e6df34f5e2065a4d91c6fcac2d2500a6cf4f35dd5f71dcdd0fe1c30adac042eb SHA512 ac20ca8fcaf6372f88f50ec77f6632a6d04597a8b6257e5a61ff4d66b34d74259b0ab671c840b79613213f6807c131cf6c46cf3fdb3686324548a9f23270f054
diff --git a/dev-ml/logs/logs-0.7.0.ebuild b/dev-ml/logs/logs-0.7.0.ebuild
index 1a4112303956..a6b13788d2eb 100644
--- a/dev-ml/logs/logs-0.7.0.ebuild
+++ b/dev-ml/logs/logs-0.7.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://erratique.ch/software/logs/releases/${P}.tbz"
 
 LICENSE="ISC"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~x86"
 IUSE="+fmt cli +lwt test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ml/mirage-clock/Manifest b/dev-ml/mirage-clock/Manifest
index f2f2a4b10fc4..c4bb5e1768bc 100644
--- a/dev-ml/mirage-clock/Manifest
+++ b/dev-ml/mirage-clock/Manifest
@@ -1,3 +1,3 @@
 DIST mirage-clock-3.1.0.tar.gz 8441 BLAKE2B a8cc3b1ab3f929c4c28ce5f0dfe30d316b1d9445f4fd053743d5e224e8b5630c9ae2d12804ca690488a238c6aa8cd8b197ca8ca7d9e49b902964570c78ed946b SHA512 e4518a6c47e18c7fd3fd910de2f68cacb18735d59bcfffc79b676c8526466f2134979805222c39496588ef6f16a8f6b1fb79fec478459a3ec474fb60118c5551
-EBUILD mirage-clock-3.1.0.ebuild 449 BLAKE2B 7d71a81b15d50af0d3adb0f26fb8978b6de2700a97f72faa21002b1e752fa9b31b7ba4ec1dc4a166c9e294bf9366ea4b81e372e77c764b36b3e8cc373112cd83 SHA512 1566ed93f1d74bdce88606c8d0dad185dbf45bc0474331cccecfb96bbcdd9df508a81f3383e677385b0ccf79502e9594004b2a6b34271ed991e2a05b418562c9
+EBUILD mirage-clock-3.1.0.ebuild 445 BLAKE2B 60c526b3a89e10920f76832f31b140bf1f63f56aceaa86d9850e34a2b2e7c5daa98db321289ab2c55a8f44ced67c5dd53e97e9066640015229c408e74cd68047 SHA512 94b199a26f748ad13ca2b9909b3cd1e6b0830e2072142e9bb7ea13b0c4e03c193d80b3ab4030c16cbb4f57995416d380112a97882d614ef74c17ab479d6ef3d0
 MISC metadata.xml 316 BLAKE2B 5f073f5aacc52114af298e651850326c5f32bd1378b45949a7d5c415ecc7a0ead09c1165031de08c79b6f8455cd5f93d6beac975ddaa0abad74583bdc0badbfd SHA512 4170911266033cd76d7d21b2e599afebeb2947784a6c7377107657dded1af24eb3d63dd6102b75a3823311ce059f19e00e67f7778f3ac3ec552d93f1592a3248
diff --git a/dev-ml/mirage-clock/mirage-clock-3.1.0.ebuild b/dev-ml/mirage-clock/mirage-clock-3.1.0.ebuild
index e0f7e5c6f525..6c89519d1dd3 100644
--- a/dev-ml/mirage-clock/mirage-clock-3.1.0.ebuild
+++ b/dev-ml/mirage-clock/mirage-clock-3.1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mirage/mirage-clock/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="ISC"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~x86"
 IUSE="+ocamlopt"
 
 BDEPEND="dev-ml/dune-configurator"
diff --git a/dev-ml/mtime/Manifest b/dev-ml/mtime/Manifest
index 3d59da083c8c..5f4bad190be6 100644
--- a/dev-ml/mtime/Manifest
+++ b/dev-ml/mtime/Manifest
@@ -1,3 +1,3 @@
 DIST mtime-1.1.0.tbz 15467 BLAKE2B 975fdb01c6a4806035a5fbc256d192d6c2f45bdfb750045293b10a732c5613108d9bce897d3c1be660af60d6e9bafbf299dedbc0d872d1c09f65f47b11c9a6b6 SHA512 8ed5dae589dd27fc6e748218a9d9fb9d7d954d231fc2100d61c1b336e0ed38a215bc608cdea9965547729177c78c868c1de6a5ceac6735686a3de1c4a791746c
-EBUILD mtime-1.1.0.ebuild 722 BLAKE2B 8a237838de9641f19d43fab709a40584da9932bd508c23f12e095d67f0a6571e9088c2aee4da0edd88a93d591befc9f3a6dd916e46212e1095e4b0eed1f4724a SHA512 d0eb25295465e39875e8cd0bed1b0e15161cc7bc9169897374b28250123da7393f1811891eb5a1c99f5923ac8f89be4879cfa37a8da5e534f22276762f01007b
+EBUILD mtime-1.1.0.ebuild 718 BLAKE2B c87c302f121d1f2f3bc65b9c73d8cd48ba1f046a2e4ef14404a68dfd579d6740797c5a12cbc06a713b26616bdd8c4f5490af9d36b4a2581c830a8f70be8aa6f9 SHA512 cd90f51810d4c9cf11ff66d3ffd460307f7215c346cb40fdaaece47e4b5c8bd81ce3859905b2f6033b40281e202ef7f5b946e1eae354885dd1ef3c13718bafc2
 MISC metadata.xml 311 BLAKE2B ec6d4e0813be98a7a30d4e8ca05ac9c74953bb0fa763c7d004ac76f23dfefb8d157784dab7f0d3674a81e840659d16ba4f28ffe3ab6913aa6affefe80b8786eb SHA512 ac2409cb1fcd4b9ba1760c38024a96ac3dccb7337b78e7eff636c23cf7f2aeea22fdec377eb80afedfda0738a2396d511afb1d4f0913fb6e95ab8473a850b9df
diff --git a/dev-ml/mtime/mtime-1.1.0.ebuild b/dev-ml/mtime/mtime-1.1.0.ebuild
index 14f6734434f0..fe9d3ec750b8 100644
--- a/dev-ml/mtime/mtime-1.1.0.ebuild
+++ b/dev-ml/mtime/mtime-1.1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://erratique.ch/software/mtime/releases/${P}.tbz"
 
 LICENSE="ISC"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ml/ocaml-base64/Manifest b/dev-ml/ocaml-base64/Manifest
index 29652a53caaa..91d45be4175e 100644
--- a/dev-ml/ocaml-base64/Manifest
+++ b/dev-ml/ocaml-base64/Manifest
@@ -1,3 +1,3 @@
 DIST ocaml-base64-3.5.0.tar.gz 18888 BLAKE2B e35d6331f163a066169455ea3dac304cedd7ca47fac0a2cbda26b8bd9620b4e49e144d5a06a8a2c6085501e531b2be98f6b24002880d83d6d57025ee055e0887 SHA512 a3886701943a9b165a74e45f66c3d8279b381927774217f5e042494811bc17a08f8933292335d4b76f01c6b1d3c496b4cfca650faa5848ddbf6150ac87386038
-EBUILD ocaml-base64-3.5.0.ebuild 518 BLAKE2B beec8e73135c093232545211d08acde011595aaaa6fa96a59c94d58bf63caaab9c32a690f1affd2395d9215f219b2667355279bca6c103f5faf76a1510f94ca2 SHA512 3994756d43b337f7af3767be7b9f49632134bf1a2ebc7e6625d34eb62d7a165bd61974e6e6f062a99bfb226f3f515574686777dea03a57f379e1aa0cb95ce4ef
+EBUILD ocaml-base64-3.5.0.ebuild 530 BLAKE2B bf8d99d2f0e0e2f169299adaa4afb64ad96aa44d156d7f8a87dcdc38825a7c174c32a20af07b4c099c7f5125f4ebeb75d67d5a2185dc4421765e28df1aded402 SHA512 a9b91d63b3bd812e0443ad7de25897afc6f89517990ddfbfba2f942678d7fdd06728f6dead0ad70ccea84de67ae74b4035373bd7f5cd627f7e650d911896f48e
 MISC metadata.xml 256 BLAKE2B ddfc488e2a70d6a59644fa6a5e2784cca07d8d5df2f3baaf423f6aa403b3bda45b4a04d0a0c205c0074ba0259165dba018ba9aa23d557458649f2c402437bec1 SHA512 8ef5b252f09bd9bfba680fb70d33ac887a9d2917570d190ef759afe57c52bef6e99cdc81012bfbe72d55ee359ca8ca70e64af3bc314d9eee041871a514cea508
diff --git a/dev-ml/ocaml-base64/ocaml-base64-3.5.0.ebuild b/dev-ml/ocaml-base64/ocaml-base64-3.5.0.ebuild
index 44996f98fa84..cfb62c10dd8f 100644
--- a/dev-ml/ocaml-base64/ocaml-base64-3.5.0.ebuild
+++ b/dev-ml/ocaml-base64/ocaml-base64-3.5.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mirage/ocaml-base64/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="ISC"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~ppc64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64"
 IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ml/opam-file-format/Manifest b/dev-ml/opam-file-format/Manifest
index 236b5dcf3092..970db123cf1e 100644
--- a/dev-ml/opam-file-format/Manifest
+++ b/dev-ml/opam-file-format/Manifest
@@ -1,5 +1,5 @@
 DIST opam-file-format-2.1.0.tar.gz 23233 BLAKE2B 34d832c5ee13a0db43e77f3b33e7728faa7dccccc8daed50dca89630ab11d6f307413b8fecfef5a7c3e0f7ea04ef27105c8f42d8b5227d2587bdc2c2defe59d3 SHA512 b948545497de0386457a9b5772924572249e38164aa49d5ab2ac9442d1231a56a3b8132a95197d74cbbe34336a7edc04eaca351a8763c4a009a512085ca0ab25
 DIST opam-file-format-2.1.2.tar.gz 32120 BLAKE2B 3756ae2e2ad8e60d9611f1879ee07179e5f98ce4bd9f0fa9759e723446aac60f811e282903a57803fdb1c742f7027fb3a4b0d018dee74762645f5f0ec28aaeda SHA512 24fcc8a89dd79fee4fb54cfcd3a9b392819eb8214c97f43e226d44f1bc98111effade15f21f1e13aa5d3555cb458cbe269ba78ee4a1470c554f479446012d7ee
 EBUILD opam-file-format-2.1.0.ebuild 722 BLAKE2B 3f6748e96bc9e6c19827dd03e03869e9ae1b8e95a180bdc050aa75ad7ffe27d75cbca38345455bf6899b5b5797b045a781ce276165a643d79f12e2cebcab7208 SHA512 2ef42c81d573649da5690120aad105e178d89dcb8cae95c49f99d2c3452348f110ef0bad4563ad9f05c9d168f7d19f62155afb90b8d8b99c9110b7401bedc00c
-EBUILD opam-file-format-2.1.2.ebuild 577 BLAKE2B 8b1551117b1d323c8f12d97f9a420386abf233b74d1e6db1625c996ffc8cb5892fa88d5881abe11b3d782796d69899a0d652ad30d7942232590b59e5fbaef768 SHA512 96c6090ed68adc12d41575f3ea437cc9bfa1c34029d64cb30c73b8a2c0c4cd1b126dded58ac494759c536f8e974b3e84222e8da7b94284bcbcc0c28330f75653
+EBUILD opam-file-format-2.1.2.ebuild 573 BLAKE2B bd3752908350affce41b7045ef293a12f339aaa08088523f1ce54984685827041ec7d72f468d094de309aaaa534c98f3bf54951fefe95cbdabc85c7b28f617ea SHA512 2172a5b7b840e662d366264dd84f59929cedf41cf242f8c1fe305dc9c85cd042f3836537e41eb4e6a8534b6f5d1eacd9760a334fcb6be23213c0fda4820d710d
 MISC metadata.xml 424 BLAKE2B be67fa815545cce58cd870b84438927044fdca0ff12b9498217d3d04fe1e68981409e5c8d5b040da85f7969004cad18260b3bd0e105234f9ddd55271aa12c434 SHA512 282c587f3927e29035d987cb102c4b9042081d758787831335d7ce6b009193f7058e5c5e4e1ba5db3794e9dbdc79f2203e93783304f908aa26ffc7ddcd87969b
diff --git a/dev-ml/opam-file-format/opam-file-format-2.1.2.ebuild b/dev-ml/opam-file-format/opam-file-format-2.1.2.ebuild
index 0624b95177fe..943ebfa49c02 100644
--- a/dev-ml/opam-file-format/opam-file-format-2.1.2.ebuild
+++ b/dev-ml/opam-file-format/opam-file-format-2.1.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/ocaml/opam-file-format/archive/${MY_PV}.tar.gz -> ${
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~x86"
 IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ml/opam/Manifest b/dev-ml/opam/Manifest
index 810a9af1d97b..bc88798bebea 100644
--- a/dev-ml/opam/Manifest
+++ b/dev-ml/opam/Manifest
@@ -1,6 +1,3 @@
-AUX stublibs.patch 454 BLAKE2B 18da6bb7e978d9f5cec3357f9e450d473274c1a0c4fa691691fa280ca25ac1a70a1312aaa06ed078cebc35bc0b7fa30f395de22328d3ed0ef88752a1c3a774bc SHA512 ed03ddaac89ed4edf845dce028a5acc8935439207331dd67fd8a27278a0c5466c1ac5dc97216fc4e24cfba5b5f6928d25bed825a93249383506bf3336d882d25
-DIST opam-1.3.1.tar.gz 669485 BLAKE2B e1aed54175d46f5dd9fd989e56c25657370356e26df6976c01dd089e381291fa04e25da295104f85d513010cd028276d80ebf7a4a77b38f3e089e52f4e64f43a SHA512 d075c9b2c9670d712f29bd2df34b8020da52041fa2bbef599cb54a81f63554507d78bebece45ecf668d3d1d4ed514e4ab88a1d86b64088d283bca7a8e75ae582
 DIST opam-2.0.8.tar.gz 643221 BLAKE2B 66510a18285f315fe95665e8ba2f334dd44211c716543cdc25f2951a7dfe537f115981046e5963fd08deea4c76f5672fa7cf8e7af2274a713a3165bdd0bac8c2 SHA512 14737dc994be2c54dfeaf2658d3713178033e1bc2b4b845a58b4bfc118bbbf12b502924add0ae32b4b2b6c1944462e5ee7143df3de362d9ee39573249d013bc9
-EBUILD opam-1.3.1-r2.ebuild 1086 BLAKE2B 89dd08f3b0861f6e12225cac660c7578740a6c88c0804d62617098bd4b0ef33333a55f28153362a6bad8abeed6eab4d40293dfca80841fabec83680279ee9480 SHA512 5858a2df6184919fae0afe999c92b9b67ad0f7d7234d8174c63d3b5b5a66b7bcafe469b5e1c4c769cfe60b89697e3ceaaaf6dfb71952fa97c7bdfd2016db6334
 EBUILD opam-2.0.8-r1.ebuild 796 BLAKE2B 83b7753c328cc34f0b96c2609b97e4c9ecced2e759e678adb8f4a4d9b69718b78918d258364431a47d86066db0cec6d8741344da0e0921c2c8cea34362233203 SHA512 a4e040c25560f328d8e533dc348fce084c839b5ad001dc41ea58823b64e437730e0bf2b4826f2d8d4ad0bc988f4f4328115562a5b28534f99cd9b01690a0f15f
 MISC metadata.xml 412 BLAKE2B 3cd375059a5716aba5f14f8004970adb55bbec02cf911cc5739475a80789c86ab6d27f192e4757191be8e914e61db531b330695eba224e81273e351d507bd57b SHA512 6119e7d8b9cf779ac2070b8cbe9820849fa80542e86b353d0cab9c60bca6e5d122a1e4f57a75f3189058587e9e8c7d8c5f37e5d4a22395506c437f411df1c4e4
diff --git a/dev-ml/opam/files/stublibs.patch b/dev-ml/opam/files/stublibs.patch
deleted file mode 100644
index 69fb02913b50..000000000000
--- a/dev-ml/opam/files/stublibs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/tools/opam_installer.ml
-+++ b/src/tools/opam_installer.ml
-@@ -312,7 +312,7 @@ let options =
-     let mandir = mk_dir mandir in
-     let libdir = mk_dir libdir in
-     let stubsdir = match mk_dir stubsdir, libdir with
--      | None, Some d -> Some OpamFilename.Op.(d / "stubslibs")
-+      | None, Some d -> Some OpamFilename.Op.(d / "stublibs")
-       | d, None | (Some _ as d), _ -> d
-     in
-     let topdir = match mk_dir topdir, libdir with
diff --git a/dev-ml/opam/opam-1.3.1-r2.ebuild b/dev-ml/opam/opam-1.3.1-r2.ebuild
deleted file mode 100644
index e1d225ca5e67..000000000000
--- a/dev-ml/opam/opam-1.3.1-r2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A source-based package manager for OCaml"
-HOMEPAGE="http://opam.ocaml.org/"
-if [[ ${PV} != 9999 ]] ; then
-	SRC_URI="https://github.com/ocaml/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-else
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ocaml/opam.git"
-fi
-
-LICENSE="LGPL-3-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-lang/ocaml:=
-	|| ( net-misc/wget net-misc/curl )
-	dev-ml/extlib:=
-	dev-ml/re:=
-	dev-ml/ocamlgraph:=
-	dev-ml/cmdliner:=
-	dev-ml/cudf:=
-	>=dev-ml/dose3-5:=
-	dev-ml/uutf:=
-	dev-ml/jsonm:=
-"
-DEPEND="${RDEPEND}
-	dev-ml/findlib
-	test? ( dev-vcs/git )
-"
-
-PATCHES=(
-	"${FILESDIR}"/stublibs.patch
-)
-
-src_compile() {
-	emake -j1
-
-	cd doc || die
-	emake man
-}
-
-src_test() {
-	EMAIL=foo@bar.com emake -j1 tests
-}
-
-src_install() {
-	default
-
-	emake \
-		DESTDIR="${D}" \
-		OPAMINSTALLER_FLAGS="--prefix=\"${ED}/usr\" --libdir=\"${D}/$(ocamlc -where)\"" \
-		libinstall
-}
diff --git a/dev-ml/rresult/Manifest b/dev-ml/rresult/Manifest
index 3267ebd1094b..70ebcf30cce2 100644
--- a/dev-ml/rresult/Manifest
+++ b/dev-ml/rresult/Manifest
@@ -1,3 +1,3 @@
 DIST rresult-0.5.0.tbz 9185 BLAKE2B efe8d248aa3d68b13b011dccb98cb04127dfec9d659dfe8619f658b254cfcdca833e125310553dee54ef4be239c308e762d2290386f4fd08a5f2c1835faa9ef1 SHA512 45787b61adb7daedf72e4ff632cf3d4917bccb3e83613dabf93437982887d9a0ed3b6cbefb2b17cb341a825346cb0609286df581c6ff379583dc83672ee25efc
-EBUILD rresult-0.5.0.ebuild 525 BLAKE2B 92814ec5ff65c5b1a7af77ec6e7857004c9a4c618373eef1f7e1dd98010eeb1d50dc17c3aa96277869e96d3e16d4c3bdb0debef317e66698fe845f83aeae33f5 SHA512 72c7c4a06dd062c24b963cf37ac3daa0573e4ee629d7c00e92288891500f93df303c90701b9094e36b74dab88697f7b63fc3c6c267475256f364fd044d74eabf
+EBUILD rresult-0.5.0.ebuild 537 BLAKE2B 2e030e5797a60613104d78110abf46eb7f813f3c2977bfb2a52b775f462decfaf2f92a8f447ad06d13a6663e9a7b08fb7207693668c4cee566abdbbcd7de5a93 SHA512 49e06af5731de2d3c4ed614c00b0ad8de0b30742acde57098ebaf1357d2fbd02b4dcb6bb204e91cf43593e3957e332e393bb025c46a18c3da0b651bb2e53d54a
 MISC metadata.xml 248 BLAKE2B 697636aca44c2ca561954f73b42c842e97b7e42ad63bd4e47bf2980b4adebb7a39da518c65759ef114c0853c20da975b165935e2c8c25fa97783cb251d6bee1b SHA512 7656fbee46b0d966970f89195615419d2aa5d8ba013f46c023b679161b766449b18cfd72e3d932945925054729cd121ea35d3351d469b7a2b2d25d4e85479da3
diff --git a/dev-ml/rresult/rresult-0.5.0.ebuild b/dev-ml/rresult/rresult-0.5.0.ebuild
index c6e04c85052f..43bfcd08be02 100644
--- a/dev-ml/rresult/rresult-0.5.0.ebuild
+++ b/dev-ml/rresult/rresult-0.5.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://erratique.ch/software/rresult/releases/${P}.tbz"
 
 LICENSE="ISC"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~ppc64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64"
 IUSE=""
 
 RDEPEND="dev-ml/result:="
diff --git a/dev-ml/uuidm/Manifest b/dev-ml/uuidm/Manifest
index f2dd56ce874e..8f55db9c7e19 100644
--- a/dev-ml/uuidm/Manifest
+++ b/dev-ml/uuidm/Manifest
@@ -1,3 +1,3 @@
 DIST uuidm-0.9.7.tar.gz 9258 BLAKE2B 37867ee562fcf5c44e0f40df53707a5066d74c185037049b4b4034326e1efa93543d518f6c9d5d27e9663f18d824f951d27952c844e1169d951abb7b91caeebb SHA512 7048e467bbd9eefd19ca057caadcc8f634d4eae7642665a84df88f726df3fb849085613d75a485272b0d0e19c9041c560a8c864e780dbed29ff68e3cfa8ba3d4
-EBUILD uuidm-0.9.7.ebuild 543 BLAKE2B b5b73b8564e86e33f2de8085d7f4e32989ef8180e60d0dcc11fdc20efe3ba2c5911ad2b55f26c02e0b72fba61f48fc62a8f4b93c48eea287312b943451fed307 SHA512 6fa1f826f332a5267364071cb81da1a993bf8a14def079ac93e5106339bb143e7ba75d9f3bdad45b7e156814c71f9d2c1329291f510dfe3e581ebe6f663fc8b3
+EBUILD uuidm-0.9.7.ebuild 539 BLAKE2B 7ecf4c8fac51d9736fadb476f6a02525d79168e1be229ff287397cb03528564b0a9ca86e386ee56227ad40712afafe0c6c821251c0247d2be3f3cf911c135796 SHA512 260f52476552078ccc6f312359ff8b1467bcd5a9124a5b68accd583bb77126d455569b2923fab0593e1964852bdd8e11878a9a4a773c3b2f697c38e84f01674f
 MISC metadata.xml 311 BLAKE2B 75a1f9b63ac21f0a74bc7fafcdd6917c54bb97983c39e56de05c4b07611ce2011f635376453fb8493cf5d29714defabe2d67193ab03f6a8fc5a917700e171cf3 SHA512 87a9ab7d29495118af3ad93e9a231e6f1c204a744c570fa7896a44d7982e737cb96cb6233b0fe4ac6137d34af145323fe0a5d7d86ac44c5037f003a2ae9358f8
diff --git a/dev-ml/uuidm/uuidm-0.9.7.ebuild b/dev-ml/uuidm/uuidm-0.9.7.ebuild
index fc6afa28dc90..8e3ae67156f2 100644
--- a/dev-ml/uuidm/uuidm-0.9.7.ebuild
+++ b/dev-ml/uuidm/uuidm-0.9.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/dbuenzli/uuidm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~x86"
 IUSE="+ocamlopt"
 
 BDEPEND="