gentoo Easter resync : 12.04.2020

37 files changed, 55 insertions, 345 deletions

diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 86b95fd58817..ea364aabadbd 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/camlp4/Manifest b/dev-ml/camlp4/Manifest
index 043b10ae3fc6..7fe3128ca693 100644
--- a/dev-ml/camlp4/Manifest
+++ b/dev-ml/camlp4/Manifest
@@ -3,7 +3,7 @@ AUX reload.patch 595 BLAKE2B 61d89b27f1e192d160160f14a3a58a57ea77e9ac6dd214a8fed
 DIST camlp4-4.04_p1.tar.gz 648320 BLAKE2B d383a366facaaa440b24184bb54a8e1c3bb22ae02387a0bc4f9ee4331ecdc60e5bf22715c1022c987041fb081eb448794a74026736df9f70e05c7213e08bfa44 SHA512 7db8eebcf3d230f60650ba62d9cb630c069394237e97b678a40b61d3dcaded752a2b7e089a50ff528f1ea0740d0291b722df123a072f2cee489cadc5201c6776
 DIST camlp4-4.05_p1.tar.gz 647566 BLAKE2B 068c1016a75616811787eb480b61349a32960997f03e0bc99d63e15357a8932a6019d9e7195541fd942ef99fc1d71c067fb5fcb0fd0c2c3efb77aac494589854 SHA512 0ee9720286d0d832fb7d2d21a8877856e0e47c94c86b1b58d28f8e757a18472eecb56a16e3a04ce815f240dd5048f5d597515461d084fd1cf4da1b121f97a3fe
 DIST camlp4-4.08_p1.tar.gz 649830 BLAKE2B 8dff6f82618d0f61a56acfa71ae679d4ba5ed4aea272019da7b19ea64960c80e50c55482ff9782748dad5042aa1bcd8728ff0825f8f900ff27239db0e0db3515 SHA512 1f8d6df42935ecdbed96a7b02d05564665b4bf0cbe4f5fd1800a1f292d8b3864d973df1e9e8c566c0fd00b5a55ba47ecd9bd07f134a9be83601e010b0246e075
-EBUILD camlp4-4.04_p1.ebuild 992 BLAKE2B a7566cfe06d27538c32404860930e75fe100ac056d9e23bea97b823a2920fbe62cbc3bc9d5921ddfcbc2c049a6fc925b88334975a2148cc923c94b6a4e2ce2bd SHA512 bf281703d13af3bb9e2bfc526921c43999f1908631f6933d5469604ba9e10f56330baf840ba2d43fc60105db3815f9e81dac4a1994990afcbe9f9dd01b1a3991
+EBUILD camlp4-4.04_p1.ebuild 994 BLAKE2B cc8b49bd3ea9c88fcb9d1137ab87c308ba3b838ac2f0402f6c27b55f483715c1d7ae59137828b9521c6304ed821b3f12f8f3a576d1312aaf43493833284aea99 SHA512 369fce3e12f7acdc06e177996ec0c23a953e87192106dd34c4a0aabc9348cff68c0ad401c71437be87b596ff140157d8df13ee4079ebc8156ce1bfb26d3fc365
 EBUILD camlp4-4.05_p1.ebuild 1000 BLAKE2B e126792fbc0ef5143229a32a18abf2f466b0798dad8512b22e3b7e574db59954e298395381015fa1db719d88bae2baa4c58976584f1c01ff28ee2936f726635f SHA512 3f4fea0691f5a9ec920cb2ba98d9533705c8166dfa3b08a45698b6712198db20d84c5e0a5fb9a13d98baedef4cb0f0c78fff546c6fba734f351bed16f8c8db26
 EBUILD camlp4-4.08_p1.ebuild 1067 BLAKE2B 56e9c5db487fd3f5b8595ad47bcf5430858598aa63b4941ca51483a338070cf23cb730791cab2a5c314276635fe7b0e9509c90634945d9643742f4bd6550d8b4 SHA512 39b6c74489265a611e8a4ca743b6e4405c10bde4480e0c34ad1129a85010778260a5f9a688c41b5faf603c69a032469d20d6bffe7e2e978b4008025e64a98429
 MISC metadata.xml 249 BLAKE2B 45b57687d81fa0ecbd307726eb7c570094d29952c8467b0ffe429870019fd852caa725924d6f2ee457b04a194d61c902f6abf948776fbb812a786e1058a031a2 SHA512 46286ee2dd275a5b7c8f941214c71f89396fd0d012564a368a205381ae2ffd28857245ffcae06b2416d73d071857005f3c7756fbcf546ebe0fadfc90a85db1e6
diff --git a/dev-ml/camlp4/camlp4-4.04_p1.ebuild b/dev-ml/camlp4/camlp4-4.04_p1.ebuild
index c19c5780ccad..8bf8d05f279c 100644
--- a/dev-ml/camlp4/camlp4-4.04_p1.ebuild
+++ b/dev-ml/camlp4/camlp4-4.04_p1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/ocaml/camlp4/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2-with-linking-exception"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+ocamlopt"
 
 DEPEND="=dev-lang/ocaml-4.04*:=[ocamlopt?]"
diff --git a/dev-ml/camlzip/Manifest b/dev-ml/camlzip/Manifest
index e6a3543e3202..5bec6ba0e91a 100644
--- a/dev-ml/camlzip/Manifest
+++ b/dev-ml/camlzip/Manifest
@@ -1,7 +1,7 @@
 DIST camlzip-1.06.tar.gz 26499 BLAKE2B a7a1dbe157c0dcb9847bcd6324bbb7cbaf39342d0fdbaed51d2c004ae7b03f8d655fb15da50dae6190b976675e405e28fa2d4fa35a2f4372c50519564d58f981 SHA512 5ef0172927106589620678897f12f054533503a5cf13df71bf4deda43f223d0cd6acce118977e87bce53afe289f367b851f192a8e693274c2bd13549121019dd
 DIST camlzip-1.07.tar.gz 26652 BLAKE2B f373ac0427faa9b6a846e9db8f3e48c00ec6885b8a11cc09fae96b5a7656908f172fda73dbea8ddd1b3dbfd98bcfa3e2e67ce9faf2942d1e260fc0a804813a05 SHA512 b92e9db002b9b398fd132c6ecd8098fac4cc7ddb3f770cc412990dcdf4bd62ba358c762d31fb0b5cd6b32f20d3bf4b3410ca6e86c511a438b92ece940f9831bd
 DIST camlzip-1.10.tar.gz 27335 BLAKE2B bbf24953634278589395dd9fcedf1e3becce8dad1f380393dc3ac59589143e1685dc14085ef566e12fb751c6f1a333dd368795a5083b94a43b71e058e86489f3 SHA512 5c42e0d808230e3820b2e7ef34b544ca51a7bf0a484ce4e1c8b1e4966133196bb3ff7c3ca85b9c50050aca389316eb52f0335f6e2ad60c000594a33171b9a9a9
-EBUILD camlzip-1.06.ebuild 678 BLAKE2B 1cf4d95499422bce82abc437c7548137cddfe93c96144c943d958b65695a358733f0018e2f60df0726947e09d462ef76ef2889e314461ecc601727bfaf30dc69 SHA512 f33b4b3cb0d158f0514482d67592c357ecda300bcfa5637018fa335b537e05016e4b908f9e3112c6c9c3aa94e829b2ef03d8f071e8931d295354a171bc0c62c1
-EBUILD camlzip-1.07.ebuild 809 BLAKE2B 774b993515003a89142706a1c3580bff6e2b1508cccd67b986ef0a521aeb45a9f25a13043db071d0224a5c758a9bf9f2b250421d422eafce943ac14830f1c689 SHA512 1ced2107bda8135e57ed6ef58313332461cc1b001e049ffecbee1e066b7bce1c02e3dcb868a8126445b41c60d867bb381e553e380f55e750ce46ddd215ceac66
-EBUILD camlzip-1.10.ebuild 805 BLAKE2B a4177543efa93743e5d4bc70fc46a4a7af981a20ea72562df8e22774bd31184da4de1922c88a8d10cddc16748e62fa27928c8a33b1f799e376812f76aa4630bb SHA512 f0e9a6a31980cf67cf6bc002152b188b5aa528f6999bbec1c1f5961d2300203452ef6595f826371eb8901c94c5ebdb93ab658fea16c1087b977615643fd27412
+EBUILD camlzip-1.06.ebuild 675 BLAKE2B 62844ec59c1659ac216dcca4c53de6dc8a7ae8f9e94e6fca181d4ff5da535548cfb829d86825cc7b6fb55da278eb4e93d1335ff937ef8eb024b3030b14a236db SHA512 936a8828d5ccec18df84be21f2e95cbb8061001d94389fc557b27ce697436b5dbf961b73032b9a416230201b341f48ae5e6b3fe04f172f013a4c60dd449e1375
+EBUILD camlzip-1.07.ebuild 809 BLAKE2B 1862fa6b059b2f557127137998cd7c5c4932240e08c3b7dc961fd7f47520d5fe03a7c65ff9275f8f004aa323828f4539cac35229cafb89f62a6330e9f7f7c266 SHA512 c5ede699cbc018186b9747bc6e24915ce0984a489b38f3fc3e58b001078e5d00ea85689fb231b79b2781de54fd64b8e72692db582651411efb6df989bdace7c3
+EBUILD camlzip-1.10.ebuild 805 BLAKE2B 6fca13fc67464ee6e44c61b4158d7ebedcce7ef0167958ee8c482e7c49b41038cc3c68cceb85e09ff9cbbea891d9e3e383d0b87e77119899714884174a4b9b9a SHA512 a7e5f92f3681182c574482df1e04593602eaecdda8f4ac7c1cd5120ad490e8ec07deb0f6483118b7ac330a8841fcc68d0917b8c45703b1510bceeec6824ec306
 MISC metadata.xml 331 BLAKE2B 0d8f433e2cede398f8cfcf629db7a0f6440766bf9d822e65529135ff915632c578ee0fda0ced5fcec0259aa568b391bda7f2ae070f4c351051b7e68113e17363 SHA512 93244e380436e9779580d7e6a9d8175f00bdac042935ffb0312d6a794af01c88fb4c4f6da42650c121bd7912adb1da0ea6fdf9fa02c367f82c9a8b8ad221f35e
diff --git a/dev-ml/camlzip/camlzip-1.06.ebuild b/dev-ml/camlzip/camlzip-1.06.ebuild
index 8a4ec3d9cb79..4fed4a00664c 100644
--- a/dev-ml/camlzip/camlzip-1.06.ebuild
+++ b/dev-ml/camlzip/camlzip-1.06.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -15,7 +15,7 @@ SLOT="1/${PV}"
 LICENSE="LGPL-2.1"
 KEYWORDS="amd64 ppc x86"
 
-RDEPEND=">=dev-lang/ocaml-4.02:=[ocamlopt?]
+RDEPEND=">=dev-lang/ocaml-4.05:=[ocamlopt?]
 		>=sys-libs/zlib-1.1.3"
 DEPEND="${RDEPEND}"
 
diff --git a/dev-ml/camlzip/camlzip-1.07.ebuild b/dev-ml/camlzip/camlzip-1.07.ebuild
index b2c4551b079b..547fe00d0c83 100644
--- a/dev-ml/camlzip/camlzip-1.07.ebuild
+++ b/dev-ml/camlzip/camlzip-1.07.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -15,7 +15,7 @@ SLOT="1/${PV}"
 LICENSE="LGPL-2.1"
 KEYWORDS="amd64 ~arm ~arm64 ~ppc ~x86"
 
-RDEPEND=">=dev-lang/ocaml-4.02:=[ocamlopt?]
+RDEPEND=">=dev-lang/ocaml-4.05:=[ocamlopt?]
 		>=sys-libs/zlib-1.1.3"
 DEPEND="${RDEPEND}"
 
diff --git a/dev-ml/camlzip/camlzip-1.10.ebuild b/dev-ml/camlzip/camlzip-1.10.ebuild
index 3c6a128e841c..8158861f6091 100644
--- a/dev-ml/camlzip/camlzip-1.10.ebuild
+++ b/dev-ml/camlzip/camlzip-1.10.ebuild
@@ -15,7 +15,7 @@ SLOT="1/${PV}"
 LICENSE="LGPL-2.1"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
 
-RDEPEND=">=dev-lang/ocaml-4.02:=[ocamlopt?]
+RDEPEND=">=dev-lang/ocaml-4.05:=[ocamlopt?]
 		>=sys-libs/zlib-1.1.3"
 DEPEND="${RDEPEND}"
 
diff --git a/dev-ml/dune/Manifest b/dev-ml/dune/Manifest
index 2b31c758ebd8..8c44c20be93e 100644
--- a/dev-ml/dune/Manifest
+++ b/dev-ml/dune/Manifest
@@ -1,3 +1,3 @@
 DIST dune-2.1.0.tar.gz 1170295 BLAKE2B 16ee2c34e0183bd255d23410f70001ca008b8e82815f93ad727079da00b8592d219e7664c93bed7b97b3a1e997306d60672b7d6c45fe6dae7371b4025df06722 SHA512 24afb44e458f819dfde3775b76c3ccf43f3fa5d8ce9a14ee9bf6658c1c116f95659c21a9ea208e5711c844fabc661cc434070bce6c9307154d506b6599ffb57f
-EBUILD dune-2.1.0.ebuild 685 BLAKE2B 55bc20cb2a57b17db2654f6d915733e5220b867972d5479b123a0c07923728a326b057e1a8a5c513887f87df996e06ada81c1f62eba2dd4f7ba9f63870e84645 SHA512 92a310d9b51fb842e2547dda2fc816fa4556e8bc7f6f2fd088fa3a9f6abe6016de27f2ba9182628b9ceedfb472d0ee0fe74dfe44686c622e62e8512c6047e7cd
+EBUILD dune-2.1.0.ebuild 684 BLAKE2B 4b50322912687fb84f6636dddde7a61b89c4147a9a92c8bb03619adab13a23098473380076e84c2e1e5ed5c8f7c8250ee21c4ffc749433847216c272270a5756 SHA512 e9543ae6e8e26cea642dd709242076b6860ac584df7fdd005bc73fa441b551f566f64611008bad1d9875b2c09c5e941c71eb08df158d8e0a0359d8e7cb889b4c
 MISC metadata.xml 242 BLAKE2B cf769ef02b6c4a44259c41bd7d8a6ff26667ab728d194a15597388e9d7c651c0564b04e464dee09aea2a15e0086375444d2227171b6f7a0c5e62d85e7a27282c SHA512 8293ffa247118ebab6925fec47f3d66bfebde1d25b101c57458d11ffaead3a70cf1fe9f1ed6e028b6ff2c769047966fdd673aee0296fa8ccf91c02e005dfb41e
diff --git a/dev-ml/dune/dune-2.1.0.ebuild b/dev-ml/dune/dune-2.1.0.ebuild
index ca1534e877f3..ab02564875e1 100644
--- a/dev-ml/dune/dune-2.1.0.ebuild
+++ b/dev-ml/dune/dune-2.1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="amd64 arm ~arm64 x86"
+KEYWORDS="amd64 arm arm64 x86"
 IUSE="test"
 
 DEPEND="dev-lang/ocaml"
diff --git a/dev-ml/facile/Manifest b/dev-ml/facile/Manifest
index 1c5aa16e7bbe..a600f68ebbf6 100644
--- a/dev-ml/facile/Manifest
+++ b/dev-ml/facile/Manifest
@@ -1,4 +1,4 @@
 AUX facile-1.1-make.patch 1613 BLAKE2B e469aa4820358b9d197251c6b3c6150c0aeaca8362d104441fc35e975e401776e1d23804a160cd6b37c545c769c0c856ff871d0428bbde47828fc9cc79125d20 SHA512 024132dfacce666c1f52f331fe5ec9f927dbabc1742b44aa11be7ae8851c25943afea5f2f99b3e544127b5c49af7d7337d4b59c60165a777990402855100ebc0
 DIST facile-1.1.3.tar.gz 99656 BLAKE2B 19d81c48c39b96083628cc40eb9aca7e8ad7dea4ae81c884bfb22daa56135ac411698d57b68f3112829a1fc53d29612627809901c6e30eb4672776508eee57b2 SHA512 78d315188e661245eb7306b645e9baaca94db0b9511112b57dbc8597bf2f75cab5604c8f4cf850209464e802c636f592552c8b492730cb28896d2acd7f413346
-EBUILD facile-1.1.3.ebuild 1378 BLAKE2B 79aa9d8bc8471e72cad08b688d311da71fcf0a8160817c696c7881bb3c3507562c8f00099b1c831405321abc89b2379e3ecc82fdc57fd6aae3e995eabc5d3fd1 SHA512 ed81eaa0a138cc9df3837fee57707369e828dc567561664f7c0045d1480e06a28479a1615cf8aa0eee7ee3a13b33830c482d3bc91fc6192d2f51192518e05c4e
+EBUILD facile-1.1.3.ebuild 1380 BLAKE2B 33e99c9b8f21810db2e0fa034d27fef3dbcf55a6bb23d6c9bc6e77e48ffad04aba4f28e902b96ba41cc39c0cb12d4b6e6873f2b6326461b5753d9d1fceccec94 SHA512 dc79d2ed0e115512dff6d31724438f86c44d47278655314f79821c2a6c9b910f87857242344239403b713950a67d2b6b1ea69d8338d2be67dcd893deabb74fd6
 MISC metadata.xml 250 BLAKE2B e32e25cd925d2f9f725dd425ca1730abb222f72111492ce8236afbb1175b96598c6d7c4bb50b85c881f194dcc90c53e2d728aef8f469b3b2de9d50bd40fa2413 SHA512 5bac93ad70caeae856a1f45913ee9817f8c50a0714711c62d34d471128b0598da1117be37d63d8a7b11bd5be2b244e4a48dec9cbd4b8c792a94834c40247ff29
diff --git a/dev-ml/facile/facile-1.1.3.ebuild b/dev-ml/facile/facile-1.1.3.ebuild
index ee8d7e1d75be..9752526dbde3 100644
--- a/dev-ml/facile/facile-1.1.3.ebuild
+++ b/dev-ml/facile/facile-1.1.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://opti.recherche.enac.fr/facile/distrib/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
 
-KEYWORDS="~alpha amd64 arm64 hppa ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
 IUSE="+ocamlopt"
 
 RDEPEND=">=dev-lang/ocaml-4:=[ocamlopt?]"
diff --git a/dev-ml/findlib/Manifest b/dev-ml/findlib/Manifest
index 6b46b5427a88..be95e86aa9d6 100644
--- a/dev-ml/findlib/Manifest
+++ b/dev-ml/findlib/Manifest
@@ -5,8 +5,8 @@ DIST findlib-1.7.1.tar.gz 256883 BLAKE2B 7459082dee3cd04045e8dbf59bc82075eb1c24b
 DIST findlib-1.7.2.tar.gz 257747 BLAKE2B 826993e9d3e5a9dab9084b006347a0324c848aa50a42ba1daa0d76010a0cdbf6e1ae9f0754dd3bef84f043ee43c3bd9775284a73ee5b130b678834d14d4ddb1c SHA512 f2aadaf8630482785ebfe6788bfea6716defdd6ba94e7f4e3b743c3415fa5b169e31301d605857823e9c74f7bd2f774399ee32a8acb35e64ce0cba5e98e4dd2c
 DIST findlib-1.7.3.tar.gz 257703 BLAKE2B d69687ee4b75bd7ba514c5507bd474764cfb76f0502ef613c3dd8d8e9e92b5f12704c101b9228d71f2d9f151ab5e63b4352b759a2c7a2694f23b10b6c4e724d2 SHA512 5fc8250c123e2f019406be487134523f964668d615b51b216551d74f6ec1999de43aa7babc9c2c75ebb87293b4b8c640548d562a98a6e5a6d7f663432869c886
 DIST findlib-1.8.1.tar.gz 261544 BLAKE2B acfa9d4e0d118ebbc0dd7b03da1fe5eaa994e5fec13dc54e60ba42f643d93968469a1a43fe4f832433dca6c3902e8846616fcf460c748bf037fe16cb2f93a847 SHA512 0d8e1ff21217fcc6823aab3ac71282789691e4ae8c3607703d0393468247f93e2d084bd4e2a8795b523f2c7f193521d3aae4b8122c934ebf8b58c3185a5bc9c1
-EBUILD findlib-1.7.1.ebuild 1668 BLAKE2B 60d7a6dbe8afa310b009c83484fff3764214d936462006c0ee173440dc9ed55af26caa161dfa56dfa0d2f92d79d5b7f6d64276102a84609905a03479b0c35723 SHA512 5ebe6823f278c34ede6bf7aedd842c74a8eebe51c34d730d54cc08546a4345e14a799487d45456ec75749d4415ecf6673db6a473ef8c81149efe2845df3f320c
+EBUILD findlib-1.7.1.ebuild 1670 BLAKE2B d30d66c27d7b02378054d97678821a97c5db08548e7cf69772e2ef4a0a0db6a7a44f02277c25ca567bb8c3ffcea01e30bff845c6b5c8f6c189f53b0de7880748 SHA512 f15620a54877c0482d8a4737f4d4cf9ee04c0c04372781a45b13225b4e2ce585758439bb5e320a6ccb47258101f76878dceb556cd360789046e8a0560c7c0223
 EBUILD findlib-1.7.2.ebuild 1676 BLAKE2B 1f26f700fa8f120eb504d441f6abe0a3e42d70c09df8325f78b68721e2115140d834b1fbc51d105f39d372dc4d23a6164b735f6fb504e7ad438e4cbe57db1d64 SHA512 188b4b931a3ba8e6eb456bcf97ea5f521466f9650ae2567ad4e9104e1270ec62ec4e8b727d4dba5eb0cf19572cf04aba4740aabcbedd81d5afa29f80caa78692
 EBUILD findlib-1.7.3.ebuild 1689 BLAKE2B a78e7e68a97122107362c376017c106462c30dd6c8754702c0b24f22478dcb7ad75cc9da78b2832922402182d1037c085d37b1d401b8126735438faa5e3cdcd3 SHA512 0d107354f562ef62313afdda4f8eda424dcaaff565ae17b9e2b0b1dcee2a8a44761830c021160deb6f688fbb2d28aa8adeb287744eb89f34f3639d0a2d8ab548
-EBUILD findlib-1.8.1.ebuild 1688 BLAKE2B 073d2fb7ce9fd825b51105ebaf89a93c70aa79fc361ac9f00b07728a38c010fc013e9bb910aa40c63533c26d1555f27a7b338b46aab1d70170edc002bfca102f SHA512 fb027473b86f76b8703e4577c63cba24c3d319a65eed119412423fd85d0420e4af5a69a2d774d8ea2ed842d12ab5dfb062de98076c565154a9ebe6cdcfe50b75
+EBUILD findlib-1.8.1.ebuild 1688 BLAKE2B 42324ddabfcf8ddba5edcbdc5561a9094e71b792b995b2bdc371a6d3d9b647b4390fd973b83f3e331e9d3546cb8c05a8b2bbd65adaa732920c5b8687d61f6460 SHA512 cce3570787eb02d29190c2b900391c4166b9123838bddc4e054f13cf26fe604b68287b58a569984ce4aba184d221b2b8660e498d91c51fa66d4d8bd644e9a3a9
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-ml/findlib/findlib-1.7.1.ebuild b/dev-ml/findlib/findlib-1.7.1.ebuild
index 52d717f9e354..c12ada7153a3 100644
--- a/dev-ml/findlib/findlib-1.7.1.ebuild
+++ b/dev-ml/findlib/findlib-1.7.1.ebuild
@@ -13,7 +13,7 @@ IUSE="doc +ocamlopt tk"
 LICENSE="MIT"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 # it does not compile with ocaml-4.09 (bug #708696)
 DEPEND="<dev-lang/ocaml-4.09:=[ocamlopt?]
diff --git a/dev-ml/findlib/findlib-1.8.1.ebuild b/dev-ml/findlib/findlib-1.8.1.ebuild
index 4af952aa9830..50ebe38db17e 100644
--- a/dev-ml/findlib/findlib-1.8.1.ebuild
+++ b/dev-ml/findlib/findlib-1.8.1.ebuild
@@ -13,7 +13,7 @@ IUSE="doc +ocamlopt tk"
 LICENSE="MIT"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 DEPEND=">=dev-lang/ocaml-4.02.3-r1:=[ocamlopt?]
 	tk? ( dev-ml/labltk:= )"
diff --git a/dev-ml/lablgl/Manifest b/dev-ml/lablgl/Manifest
index 7169214b53b0..9539cb91007d 100644
--- a/dev-ml/lablgl/Manifest
+++ b/dev-ml/lablgl/Manifest
@@ -1,3 +1,3 @@
 DIST lablgl-1.05.tar.gz 296597 BLAKE2B 01fff39607f0b4e965737c6fec53cbd3b154bb2df3528fd37626ac87c6cb46a29f97881a242206310b1bd576fb9dfc72ede1eb24cf287ddfc55194b8d55eb83d SHA512 e8bf7d993610912d50ec3a6c18a24d2ff7d0727a41fe102e745050bb83ee02a9995e8b1b8c7dbd94f6b2a8363145f22e9772e36253dced762a63ec3c6c54379d
-EBUILD lablgl-1.05-r1.ebuild 2053 BLAKE2B 0d243578337f978eefd8bac65f155b71c3272b525e64e4d8ce143e7bcd0a2bbb02474a848e8d1f6145dfb5944842995804ff705908c11cb2f529212044470476 SHA512 b7c765d959377ae137d03ffdf7f50c0cbd0f7f761033f1d7a867a3a75e59f2d61fe5ff3d4da3ab77de56909d903d90fb2694dfde9cdad5d62e691e16938df8f8
+EBUILD lablgl-1.05-r1.ebuild 2055 BLAKE2B 5b4b614a17bfb48151e284543d4ac3ef9161a6f8a02de20e9ee39fc9b3641e3192d4f273f69e9f474db391d74ad47018970eec1c64d495e26ecafd2ecde2c602 SHA512 3e3d6770eaf4f6de39439ea5395d2f8920c35e5c32bd37505ba753466a80f1645d6c51be8dde9a4c650ed37e609259259eaeebacacf27c5214064de153882b65
 MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
diff --git a/dev-ml/lablgl/lablgl-1.05-r1.ebuild b/dev-ml/lablgl/lablgl-1.05-r1.ebuild
index c4e56182d865..f2de956777af 100644
--- a/dev-ml/lablgl/lablgl-1.05-r1.ebuild
+++ b/dev-ml/lablgl/lablgl-1.05-r1.ebuild
@@ -31,7 +31,7 @@ DEPEND="${RDEPEND}"
 
 SRC_URI="http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/${P}.tar.gz"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 src_configure() {
 	# make configuration file
diff --git a/dev-ml/lablgtk/Manifest b/dev-ml/lablgtk/Manifest
index 846132778470..b0a58bfff746 100644
--- a/dev-ml/lablgtk/Manifest
+++ b/dev-ml/lablgtk/Manifest
@@ -1,7 +1,7 @@
 DIST lablgtk-2.18.10.tar.gz 1068504 BLAKE2B 8f82cd8b31c136420bfbbeaf78ec2d7913b7c5fc16abd485c508f8de3ab587173b0b5c798cdbe851254b48754929c1f0063cfc9e3c5e0663b7cdebc380ec0e8a SHA512 73705aaa80db433d11a28df5f6f5d10bd282e477e90916152a87e71865ccfcd7dfbdbe77350ecadf61ba2ccc7a188de1c68f1e6385e20c75f167969001e8418d
 DIST lablgtk-2.18.5.tar.gz 808005 BLAKE2B 279fd9f018948438b616a12ab60fca3019330504a79d8b76c58fa0a99a7b36df9bf78f57f0e60c4eea6f0bad60f94c06b26490518ec25a5a72c342e4b7c42501 SHA512 7b6ba1a4dfa82cc3bbc502082ff4fccc23cc06ee4f30d01a2e423f3f99e945a4befe450d230b5aa19c5b810e9f46f2838655099d49da2db7c8a2e52eac213024
 DIST lablgtk-2.18.8.tar.gz 855263 BLAKE2B 92aeadcfac666756e50ea573c7a2119cc13eab5c2f2e033fcdf92d5c33d597d64bf2e860ff181d958b4d8e9a3d4002b3eaabbd1da7580444fee91dafaba26289 SHA512 1510b8886dd55b82fbc96f333d84779f51a4794d13b0934569d13b1975ded9ec684855b9856f636fb302fd8ff2f118d0d5f3ffb2b8086d22cdad442e963868ae
-EBUILD lablgtk-2.18.10.ebuild 1920 BLAKE2B 8f146c37022eea8e66190cb99218923612e81d6c9a93e986cd39e031e3d38dbcac1cf1683822dc5651286ab68e14d788c467a57a6fd13bc08fb6d258b7a76da2 SHA512 396324232a96ed20123b5c08e7f856ea7ac021f89c8069a51552d6a36ebbdb4aa8ac633ab05522701214c1dfc76ad2ffddaa2177d6e168172bf2e03dbd9202a0
-EBUILD lablgtk-2.18.5.ebuild 2489 BLAKE2B 204e53f86cab5b9ea6e9ccc8ecb07645c1e877948d8560de806e45f91ddd4236747a3e514fea6945a02cea09de3458c0d2141e8243ed8eae7d90d6ef3eb803a1 SHA512 926aeca6f295b17fa6a9af58510c59f7051bc7b6199b46e1f87e2c681fdfd65c6d67a977fdb462fc43ca617cf3a0325a3b9c0c8570677878bd1d8e8142b6ee49
-EBUILD lablgtk-2.18.8-r1.ebuild 1760 BLAKE2B 2e73fb8c471cef9fa98edcf64196a1f5a83f05a352056dd9735dd8395f60ee4d68b6af3aac17a54b4b67935414ad58bcb64fc5e90f7aa91af1ef9c4b86ab7075 SHA512 621b7b01895245a3bef9c20c6e8ea14ad0bed063b36b3b7260d4c04af96496384ad6d8f1411f1ea37fdf790e6d58f51ab720145708cbf5947bda04bab8b9462b
+EBUILD lablgtk-2.18.10.ebuild 1884 BLAKE2B e64363193707f30dc7c85c68a80aa83700a4033a1ca08c3f51e5deb685e67523ab0507cf6a9e0c10e31522783f856bcb34e7ac5feac33c222e3893ff629cd4e1 SHA512 ee518a55a66c7876464034435516192af8c91e338fbdec2dbd0575c1eb2fe68f0cbde4fcc23f8814a430296f4e59f474b275b50c4c033a92f8d19725f85c4fbc
+EBUILD lablgtk-2.18.5.ebuild 2327 BLAKE2B debd856df94beb8f43f803b38f3a07c9b30e2636152be3af9e39defb3a78551c08e748e2096c4014ee22046a7cb121650271caee10ed6db7119bb140b5db7300 SHA512 e2b0225484f28971d02c02dde960095a60a0ef2db2b25263ad678a3f7a33473bdeafd96e100d671a11da5fe331d0c69f092fc23d64ffcf07e0d1d2ddfe60b268
+EBUILD lablgtk-2.18.8-r1.ebuild 1717 BLAKE2B 0f951f152a005cbe10ba78e829215087f3d32f27fcddba88af0ab943f23e30d053f3fbd364900f689aacce7896800a31731c87489109b6612b1eacb8fe802036 SHA512 db05d897d25054b497a16a531e7d13fb19de2e5f74aa3faf162cfc2d960e61b106511bec89a332586cc96633a1a92820bf9c03da91edbe0b7073424335177c32
 MISC metadata.xml 463 BLAKE2B 79b09024eeae81c18bf584e6341773512c569e348cea23294fd1354bbc6f5ac4da24ffa2a00cf89c44fe7b3af4b8214d6c53f2b36e7c2aca0fedbe2a7d944c97 SHA512 c4dc8d0ea137fa1d8694702fec3dc42eec83967f061c72097b77032ccfe8e6f47450d7a7486647acdf0387ac3d2cf8c028b772d71943d402bec5a7bd976a0ce1
diff --git a/dev-ml/lablgtk/lablgtk-2.18.10.ebuild b/dev-ml/lablgtk/lablgtk-2.18.10.ebuild
index 4cbb3b17630c..ad3698d27a55 100644
--- a/dev-ml/lablgtk/lablgtk-2.18.10.ebuild
+++ b/dev-ml/lablgtk/lablgtk-2.18.10.ebuild
@@ -10,17 +10,13 @@ SRC_URI="https://github.com/garrigue/lablgtk/archive/${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="LGPL-2.1-with-linking-exception examples? ( lablgtk-examples )"
 SLOT="2/${PV}"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug examples glade gnomecanvas +ocamlopt opengl sourceview spell svg"
+IUSE="debug examples glade gnomecanvas +ocamlopt sourceview spell svg"
 
-DEPEND="dev-lang/ocaml:=[ocamlopt?]
+DEPEND=">=dev-lang/ocaml-4.05:=[ocamlopt?]
 	dev-ml/camlp4:=
 	x11-libs/gtk+:2
 	glade? ( gnome-base/libglade )
 	gnomecanvas? ( gnome-base/libgnomecanvas )
-	opengl? (
-		dev-ml/lablgl:=
-		x11-libs/gtkglarea:2
-	)
 	sourceview? ( x11-libs/gtksourceview:2.0 )
 	spell? ( app-text/gtkspell:2 )
 	svg? ( gnome-base/librsvg:2 )"
@@ -37,7 +33,8 @@ src_configure() {
 		$(use_with glade)
 		--without-gnomeui
 		--without-panel
-		$(use_with opengl gl)
+		# relies on EOL gtkglarea
+		--without-gl
 		$(use_with spell gtkspell)
 		--without-gtksourceview
 		$(use_with sourceview gtksourceview2)
diff --git a/dev-ml/lablgtk/lablgtk-2.18.5.ebuild b/dev-ml/lablgtk/lablgtk-2.18.5.ebuild
index 8cfdfda4cf9c..3c185b571431 100644
--- a/dev-ml/lablgtk/lablgtk-2.18.5.ebuild
+++ b/dev-ml/lablgtk/lablgtk-2.18.5.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 
 inherit multilib findlib
 
-IUSE="debug examples glade gnomecanvas sourceview +ocamlopt opengl spell svg"
+IUSE="debug examples glade gnomecanvas sourceview +ocamlopt spell svg"
 
 DESCRIPTION="Objective CAML interface for Gtk+2"
 HOMEPAGE="http://lablgtk.forge.ocamlcore.org/"
@@ -17,8 +17,6 @@ RDEPEND=">=x11-libs/gtk+-2.10:2
 	svg? ( >=gnome-base/librsvg-2.2:2 )
 	glade? ( >=gnome-base/libglade-2.0.1 )
 	gnomecanvas? ( >=gnome-base/libgnomecanvas-2.2 )
-	opengl? ( >=dev-ml/lablgl-0.98:=
-		>=x11-libs/gtkglarea-1.9:2 )
 	spell? ( app-text/gtkspell:2 )
 	sourceview? ( x11-libs/gtksourceview:2.0 )
 	dev-ml/camlp4:=
@@ -27,7 +25,7 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 SLOT="2/${PV}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 src_configure() {
 	econf $(use_enable debug) \
@@ -35,7 +33,7 @@ src_configure() {
 		$(use_with glade) \
 		--without-gnomeui \
 		--without-panel \
-		$(use_with opengl gl) \
+		--without-gl \
 		$(use_with spell gtkspell) \
 		--without-gtksourceview \
 		$(use_with sourceview gtksourceview2) \
@@ -58,7 +56,6 @@ install_examples() {
 	use svg && insinto /usr/share/doc/${PF}/examples/rsvg && doins examples/rsvg/*.ml examples/rsvg/*.svg
 	use glade && insinto /usr/share/doc/${PF}/examples/glade && doins examples/glade/*.ml examples/glade/*.glade*
 	use sourceview && insinto /usr/share/doc/${PF}/examples/sourceview && doins examples/sourceview/*.ml examples/sourceview/*.lang
-	use opengl && insinto /usr/share/doc/${PF}/examples/GL && doins examples/GL/*.ml
 
 	docompress -x /usr/share/doc/${PF}/examples
 }
diff --git a/dev-ml/lablgtk/lablgtk-2.18.8-r1.ebuild b/dev-ml/lablgtk/lablgtk-2.18.8-r1.ebuild
index d1e17c9dd1b2..92dd9af9dc69 100644
--- a/dev-ml/lablgtk/lablgtk-2.18.8-r1.ebuild
+++ b/dev-ml/lablgtk/lablgtk-2.18.8-r1.ebuild
@@ -10,17 +10,13 @@ SRC_URI="https://github.com/garrigue/lablgtk/releases/download/lablgtk2188/${P}.
 LICENSE="LGPL-2.1-with-linking-exception examples? ( lablgtk-examples )"
 SLOT="2/${PV}"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug examples glade gnomecanvas +ocamlopt opengl sourceview spell svg"
+IUSE="debug examples glade gnomecanvas +ocamlopt sourceview spell svg"
 
 DEPEND="dev-lang/ocaml:=[ocamlopt?]
 	dev-ml/camlp4:=
 	x11-libs/gtk+:2
 	glade? ( gnome-base/libglade )
 	gnomecanvas? ( gnome-base/libgnomecanvas )
-	opengl? (
-		dev-ml/lablgl:=
-		x11-libs/gtkglarea:2
-	)
 	sourceview? ( x11-libs/gtksourceview:2.0 )
 	spell? ( app-text/gtkspell:2 )
 	svg? ( gnome-base/librsvg:2 )"
@@ -37,7 +33,8 @@ src_configure() {
 		$(use_with glade)
 		--without-gnomeui
 		--without-panel
-		$(use_with opengl gl)
+		# relies on EOL gtkglarea
+		--without-gl
 		$(use_with spell gtkspell)
 		--without-gtksourceview
 		$(use_with sourceview gtksourceview2)
diff --git a/dev-ml/labltk/Manifest b/dev-ml/labltk/Manifest
index e5429a512458..40e6fd6527ac 100644
--- a/dev-ml/labltk/Manifest
+++ b/dev-ml/labltk/Manifest
@@ -2,6 +2,6 @@ AUX findlib.patch 645 BLAKE2B 63c8dc3a2b332129bf90af98b908e1ade5a15381a903ec9591
 AUX ocaml405.patch 13731 BLAKE2B 36ce4825b8e004720d966d7a7c1a769c84e4e3b044c07ce8112ee456acd819315a21625acb33a8423ad317d026bb03ddffa2b3dcba63dec1549254815c14d7e7 SHA512 a246af35b932e773e0c58b745d3885f98162892945f359dc4781489d76715c0564efa2ea985a43808e431fb8fd4225d4ad7b6a753abd54a8f12dc65ae43cfa9d
 DIST labltk-8.06.2.tar.gz 369508 BLAKE2B df0a5fb1cf352c52bf3177e83be2cadde961c2a7ba0496f45dc515141931d13715b4c253f74e5f280f9a6c310488236e6bc598c0ceffc408028ef5f524f2bcf2 SHA512 d9342d49ba8769edd7a4ed051844f6ae5d3e62a7c2c76e895bfd1162d0433c4ea54f2314b29b708551fba63daec1123553b56f0abb6412807ab00d7bb40b73d6
 DIST labltk-8.06.7.tar.gz 370870 BLAKE2B 2d836c824d9adbd4f03d0e7e81faa51669837eecb4f94f6c89c657966774fe7d6ed928459be3ccca7fd3e7cf67a54ee63f7d2d08dcc8b7e853f5ad64769b33a2 SHA512 3c7352d14bc337adfb1939e72bd2658bb5e60b463f10f3748779084d1b7a6e6225028c775b548e355d69984a8944b91580fa978ff904b20b8b762ba9046f5e7d
-EBUILD labltk-8.06.2.ebuild 1097 BLAKE2B 37d58905c5270af5fa442b554d1679e1ec58bb1c171cfbb297fdb95b3616b298a943f98422ce060424e1d9c64d29d700f39cc10a474f923625bb0300a6069490 SHA512 09ac22573144b888f38cb728be20b5673d8535c7dc9b8163b57cf47547520d1938526a21b248d1245f42caa2dd29785371e27b2c3bc72db0b200f24fe29c152c
-EBUILD labltk-8.06.7.ebuild 1005 BLAKE2B 2928784be693a2dafe9f5ddb38885a195e85c0c5801c8e9a3a4e92cace964de425332b2cc52d9c3022383328b3518c8425b3faec96a2ac57f92edecf316cc87d SHA512 e8ebf572938c60e135122a723508409bfe58811925731930b0454a9f1391474a803f89ed476468cc3bd1ed96ccfa548c9c975ed20c1e454d708903733227f872
+EBUILD labltk-8.06.2.ebuild 1099 BLAKE2B 2c8f8fb53fd60709324049406c58741f698472e1f303fb85bfc82bcdd852a44f9042ef8000fe011a88c7d5d7cca288206486824f0ca6f6220dce86fc1ade7a98 SHA512 067e7ccab8ecc52e8c3bbb7fb999366fdbbb244436043c3684ca5c79da29e1bc704ccd3c644ce790001673a56896203913c83c86d8456e7ef2d95878aa33dc73
+EBUILD labltk-8.06.7.ebuild 1006 BLAKE2B 98e91bda9b9aa2837c69d2a6e1de04e7695f9ca36918ba0efce7eed9fb324aed5602367751b383cb28d5a06546e5cba9064f2a95906e7e54e88c33efd166cf8d SHA512 4b2f4bc305e381bfb3b73030fdb11f78d57d535718d91141f1bddc562588db30f0a669a8c028af4b621681f620d0937428c11e14aa886b54efbc87d1c82caf7e
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-ml/labltk/labltk-8.06.2.ebuild b/dev-ml/labltk/labltk-8.06.2.ebuild
index 5e78861eac40..b406007112d4 100644
--- a/dev-ml/labltk/labltk-8.06.2.ebuild
+++ b/dev-ml/labltk/labltk-8.06.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://forge.ocamlcore.org/frs/download.php/1628/${P}.tar.gz"
 
 LICENSE="QPL-1.0 LGPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+ocamlopt X"
 
 RDEPEND=">=dev-lang/tk-8.0.3:=
diff --git a/dev-ml/labltk/labltk-8.06.7.ebuild b/dev-ml/labltk/labltk-8.06.7.ebuild
index c6afe79a34fa..a17fb5cabde3 100644
--- a/dev-ml/labltk/labltk-8.06.7.ebuild
+++ b/dev-ml/labltk/labltk-8.06.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/garrigue/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="QPL-1.0 LGPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+ocamlopt X"
 
 RDEPEND=">=dev-lang/tk-8.0.3:=
diff --git a/dev-ml/llvm-ocaml/Manifest b/dev-ml/llvm-ocaml/Manifest
index 4cd8e1e5bd0a..7346d6db0782 100644
--- a/dev-ml/llvm-ocaml/Manifest
+++ b/dev-ml/llvm-ocaml/Manifest
@@ -1,11 +1,9 @@
 DIST llvm-7.1.0.src.tar.xz 28313784 BLAKE2B b78d9a7fc5ef6e352e77d339e5c4eef5ccedf67c05e7abd949e72619aa8a5ed65e7e5e2008354be8e7916d75581719b99f34227838fcc86c5d0080913c2fb22c SHA512 a7dbd5693d1f2dae6b6e52893a100f9349cbfcfb25c5fdcad46364acbff0dbd3573f8fbc026c68eb9fd56335198aa94b866cc3dd7ea0cbd2cbfb5f8fe3444a7a
 DIST llvm-8.0.1.src.tar.xz 30477608 BLAKE2B 4319c837b36111401e3b0f9659b8d875c89463bcc7816df1aefe1e3ff989860bbaa92504718f8e15416cfd9f3491c13777cd5cb661877b237b342b0e515b93f5 SHA512 82e120be5cabdfd5111aebbea68a663fe229c8861d73802d6ab09a3bf48f60de333e07e61f8fb61beaa14ac2bea24fcd74fa6f761acaf62469f536b79fcb1e16
-DIST llvmorg-10.0.0-rc1.tar.gz 120755822 BLAKE2B a729d37d96ba498cb865c6f708734dccb796b2caabb69167b9aa3b0e12c788f2a5980a048b99d5603da3d26af909fb31f406b4f4743cabae56c45f829a7bf695 SHA512 27137fc700971147c00ded6787eaae9f0bcf98c938fe227a5a559b38d983736f3d086f4ff6772d802c5f48a7d97a97c293261e4af88fcb5a720693b9cb5a4f02
-DIST llvmorg-10.0.0-rc2.tar.gz 120795019 BLAKE2B 6e701eddbd2313e777c7b37dff8455a08d3c599d01055b60afc0319373d4709deb429aac6bf9e80c4d2e2ab8ade03bf5b398b6ccd8882e4bde608d10cdbf2284 SHA512 ee571c9258a2d9fc411964f56b0b92b2e7134349ed21dbe7963eb61ef65da506e0c4f7c69259a3b6cecec23f55d24636608287ee4457ee667031e141f8f09aae
+DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD llvm-ocaml-10.0.0.9999.ebuild 3206 BLAKE2B 5eebb24bcd854430172565433326f723f1707fbadc941d9a891dc42934120fa00d27f4ec8c14467b8919dd4132d9f0bb00ad84db6ac98008bf7218d7403ed34a SHA512 62d413a75c1c3eb03b1b0dd63814d25b248632fd0faaea1e9f74ad089d0a79e03503db293b0081712e4ea0d55c2b8d186d79f933a04ba50e327a56122a96c33f
-EBUILD llvm-ocaml-10.0.0_rc1.ebuild 3223 BLAKE2B 493402ac8d79b1e7532aae120957aec11276f0c652532af4e6f84642e734c42ab5214b13a43af788b57d7fcbfa3494bff28ff9862129a419cafe8a042dd21d14 SHA512 ce647a88d2f8fb034c6ef1fae428d5d288e92fb893d5515cb9eb0f3f1c231978b15ded5da5181ea5e313ee1059c82f9b7f1ad6f4a5f170749b37056f2eaafa72
-EBUILD llvm-ocaml-10.0.0_rc2.ebuild 3203 BLAKE2B 0704301a50ed440809470c0753a7c59ba2118dac3cc284f4bdaed07ff9080d2ac09cc624aa7001526f900c7ffa27dc2f04a42ed964f6759d313d7c5281591311 SHA512 86c415b7cda21fac1137f4af120bf6df3e65afbf0c08a3afba60854383306faec4bd4b32fa1be3d7cafdcdbe3faa3efe2f482142d49d01c5cebc0a7f1515fa53
+EBUILD llvm-ocaml-10.0.0.ebuild 3219 BLAKE2B 8d2ac0dc88b865f723c527315aaabb6bbd75773660b63197c833c72d7915495e494d73144f84a451dec3793d45a2f7f44dc22beb5c60f55dfd88a23bb04aede0 SHA512 fa83b587c1170564e25c040e2809daf6dc13d1718074d22a7093f08e7444d6378dbeb2f5ddc57f681f4a93b14c95275c87027c9e9191757b1fba4c9008464d38
 EBUILD llvm-ocaml-11.0.0.9999.ebuild 3206 BLAKE2B 5eebb24bcd854430172565433326f723f1707fbadc941d9a891dc42934120fa00d27f4ec8c14467b8919dd4132d9f0bb00ad84db6ac98008bf7218d7403ed34a SHA512 62d413a75c1c3eb03b1b0dd63814d25b248632fd0faaea1e9f74ad089d0a79e03503db293b0081712e4ea0d55c2b8d186d79f933a04ba50e327a56122a96c33f
 EBUILD llvm-ocaml-7.1.0.ebuild 3019 BLAKE2B 3bb0282cbc65f6a10d75c82d329265a4b9420eb13219bcc446fba957bd96bc94d0ffc8821f81b094f814758891a63c011233742edfddac6b4bed166ff42f95ea SHA512 b5d0686406132877d2e34f6eaf9476511e398d495d4f0753374c6665fcf1c986f0099be24bb434c11f9265320f34b36a0aa807569e5379a9a6c44e133ea1051c
 EBUILD llvm-ocaml-8.0.1.ebuild 3064 BLAKE2B 41792ef0b7764c4b7c297a05ee56d4e613cbfbcb2e2157e7b70c8ecbb71aea698079abca2324291f9e0b9565e36509e81ee313bd152bb0c15c74c6b69c5f4dd6 SHA512 042075a171609318603e93320a6080f6b75319b7a6490a85bced7138001d30a72b45a0bf348a0e7c5a80f56c8c7cf3e6f921ed5fea41b62ece3226d00dde49d3
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-10.0.0_rc2.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-10.0.0.ebuild
index 8a7efe8fca43..5e415032b502 100644
--- a/dev-ml/llvm-ocaml/llvm-ocaml-10.0.0_rc2.ebuild
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-10.0.0.ebuild
@@ -21,7 +21,7 @@ LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0/${PV}"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="debug test ${ALL_LLVM_TARGETS[*]}"
 REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )"
 RESTRICT="!test? ( test )"
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-10.0.0_rc1.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-10.0.0_rc1.ebuild
deleted file mode 100644
index 0f9b2f61d747..000000000000
--- a/dev-ml/llvm-ocaml/llvm-ocaml-10.0.0_rc1.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-inherit cmake-utils llvm llvm.org multiprocessing 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 AVR VE )
-ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM 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_}" )
-LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0/${PV}"
-KEYWORDS=""
-IUSE="debug test ${ALL_LLVM_TARGETS[*]}"
-REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-lang/ocaml-4.00.0:0=
-	dev-ml/ocaml-ctypes:=
-	~sys-devel/llvm-${PV}:=[${LLVM_TARGET_USEDEPS// /,},debug?]
-	!sys-devel/llvm[ocaml(-)]"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-lang/perl
-	dev-ml/findlib
-	test? ( dev-ml/ounit )
-	${PYTHON_DEPS}"
-
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# Python is needed to run tests using lit
-	python_setup
-
-	cmake-utils_src_prepare
-}
-
-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
-		-DWITH_POLLY=OFF
-		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
-		-DLLVM_ENABLE_EH=ON
-		-DLLVM_ENABLE_RTTI=ON
-
-		-DLLVM_HOST_TRIPLE="${CHOST}"
-
-		# disable go bindings
-		-DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND
-
-		# TODO: ocamldoc
-	)
-
-	use test && mycmakeargs+=(
-		-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
-	)
-
-	# 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-utils_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-utils_src_compile ocaml_all
-}
-
-src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-	cmake-utils_src_make 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/num/Manifest b/dev-ml/num/Manifest
index a685fc31bdea..fa7caef20812 100644
--- a/dev-ml/num/Manifest
+++ b/dev-ml/num/Manifest
@@ -1,3 +1,3 @@
 DIST num-1.3.tar.gz 66251 BLAKE2B d6fde246693c8aef3b881a4ebc2b601392e0f0bf561dc4f4d32a5e1f835a5186deba3ffa77c88c6c05cd6e837dc836567fcabffefae99ce1ccae94e1bdfc849a SHA512 c88310f8c45700990095e6b2e9abf24c27347711b9abfd1dde75e540fbbfc6a365e6713bd69f66009af305728fcb36dc61eb37fdd0be7d73824b0e92fbe8c031
-EBUILD num-1.3.ebuild 614 BLAKE2B 27b3a99d17ce5efe055d9f418b01a9e37379a2637f1e8dadf85665059b6ba83478bfa45d4db61eedff3452770d4c2067fca8c5a2148486506afe95a6d4d638c4 SHA512 e3e66279346c7d24c0cf0d31e7489b1fb34788008abcc6d4500a9693e26d277ecadf4edb7970c486e004133a18a6f68fd1d31082db55104bc250d8e84b1f39de
-MISC metadata.xml 170 BLAKE2B 596d3ac9dabce24bba0cde2371d477e82ca5f9200bfeda69429558c79d4b59db07d8cb368f7eac09605bd132564778c12a20934e61cfede0197b9ebf69a3b5ca SHA512 ad26626abac376b8d9cb5b3125c4361c443524ef85ec99212acd972ca75190b15fe2f701c00c5110c74efc2171db92e41d580786ae2356bf1248e7808b6c67b8
+EBUILD num-1.3.ebuild 634 BLAKE2B be8b0e904f78cbfef4f69a21a6370686a50293e682c73d96a1f7f6c5f619db37e4c6221f8bb3da7326d0dbf60e4a1ad0d3a0b61663f8f26153ee84822334bab8 SHA512 7a1a486b11c4bba28c83ca76ffacd793eee9ba144ee41bb3dd036687b019d77ba7080f5917e1e91e6a9672299921474c5280216fefdb14624d1616dff0f33a55
+MISC metadata.xml 247 BLAKE2B ca08677c4c0af66af431abe578122a2ea0278f7ffabab245eec806167a6226c65f97e9826d64fc4b82eb14b6200cd1e3a31a5b4999e18aac41a4f9af43d708d6 SHA512 fff6c25e644477aaa35b838e10c44ca8eae9824ef8f19795e31201db40c10068f0216dec38deb0ba80782155b43fd1d72fb888cb825eaabacc3bd1ec0d18f3ca
diff --git a/dev-ml/num/metadata.xml b/dev-ml/num/metadata.xml
index bca0744b282e..d0e866f244f8 100644
--- a/dev-ml/num/metadata.xml
+++ b/dev-ml/num/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>tupone@gentoo.org</email>
+		<name>Tupone Alfredo</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-ml/num/num-1.3.ebuild b/dev-ml/num/num-1.3.ebuild
index e8cffd40ddb3..0f68ec7d75bf 100644
--- a/dev-ml/num/num-1.3.ebuild
+++ b/dev-ml/num/num-1.3.ebuild
@@ -14,8 +14,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND=">=dev-lang/ocaml-4.09.0
-	>=dev-ml/findlib-1.8.1"
+DEPEND=">=dev-lang/ocaml-4.09.0[ocamlopt]
+	>=dev-ml/findlib-1.8.1[ocamlopt]"
 RDEPEND="${DEPEND}"
 BDEPEND="${DEPEND}"
 
diff --git a/dev-ml/ocamlbuild/Manifest b/dev-ml/ocamlbuild/Manifest
index 5a8b10122fe9..fc9a15ea96b2 100644
--- a/dev-ml/ocamlbuild/Manifest
+++ b/dev-ml/ocamlbuild/Manifest
@@ -1,7 +1,7 @@
 DIST ocamlbuild-0.10.1.tar.gz 193263 BLAKE2B cee82997a6b691b3df9b92055b74f05af57d7663f5dbb84701e66dffefcfe6ec00c9721e1872d546f2aea9237068e37ba7d94463d0002a8356dd4d84bc1865c0 SHA512 6d74bdce7fe147bf1a5fd570b569925b36b5f443c7251d1c13a0525e3086417b393a768722bf7d4b23a7e3178b0b3c2511499725c5a755d69783b8d555663e3b
 DIST ocamlbuild-0.11.0.tar.gz 195297 BLAKE2B 2d653c402edf58035fa6efb65c99c956fe78efc4759f29c8ddab8263310a5d243d25d37d4c1a4f0699f151afb6d4c6df4c1550f95d6e915963b3d86923877225 SHA512 14bc44cc63b6c99e711658a1145247bad8263632fbb4550238cef15e226a76b83e51b83575a7a96f16b96ec321dedd0ef23f36166c354838aec1922f58179efd
 DIST ocamlbuild-0.14.0.tar.gz 198267 BLAKE2B 355d61ba68e61b9ee18a9fc0fbb9062405f44707b180ca7ad4bfec727ca3d3d2cc08f17be118ca3a4161c7789d975e7f431812e9139d4fde85a1a27ab68c8ac3 SHA512 ae60247396399dfd35644c8c1986ef7679e5a9964df82e3388bfc6dd4c5b88a13d6869a698d14a9ac70dc48e4ce1c003f543c85426d8c862ca31dea37a554b07
-EBUILD ocamlbuild-0.10.1.ebuild 1035 BLAKE2B a373ab35a5ac7bd12342ae6f06334d0340592e017f1ec6878b98bcb15cdf6c49e25c3e29f27b43ae1075e77de11495ea8be398dea53adc89ac05a56301a798c1 SHA512 23aaf967458a40ead7cb485ecfc10c75a785ffc290c16eb768cfcd8ca0bf4340d62e8f34d5a4e8295046182eece2fae93b7ae070c5c9ccf92394e5a6c7d8f567
+EBUILD ocamlbuild-0.10.1.ebuild 1037 BLAKE2B fd534a1bde1eae3851f7109695a012017657443dd4ef95ba6959dabbae19d2013ca8453fb6eb45392f5c66fbffb180b649574a030d7f79123d2f751c8023dcb2 SHA512 ff0de8a77cd41249d3c0953342665bd7a4ef70956040039f0f91004a09f03cfe0293287929ab654b8bad38605056f7c193dd52a69aac127d85d68b9245580b5b
 EBUILD ocamlbuild-0.11.0.ebuild 1127 BLAKE2B d95b57e29d00d3411b20b57499cca09f3f06929b1e715935e598e457dc9d9557f465a5024fe5ba5d7a1ac8e998a9997c81592832df9aa784f5e037f2a32a3e15 SHA512 e94a9ff4a40e32518392106fa92dd904cb702b414af75bdac79c718bc7542392b709371c61770f67609d005a127a9d05d562a25c9ecd1d52bda8cfe3bc05a3e1
 EBUILD ocamlbuild-0.14.0.ebuild 1071 BLAKE2B 077f7e85fd47b8a5f96ef32b1bcd1f0360b096f0e8ecea4c3b35a7a542770dfd1870f5c5a9f1a746b6f8824401fe01a4d6149b6630ddaae5faac82f9bf9b48e8 SHA512 0f502336167fedc7ad50523de39291be2d9275c53a7926fcf0f35f026d1fda814b3cda2524674a8fa24f350cda15675cf28707ba34cc3254ee2b8595580fb1fc
 MISC metadata.xml 248 BLAKE2B 0baa26cc2d6bf97034a28a0eaf70c71c088f133beb6d0c23414d2cc0c6f6b80cafc427e4e3336dde77669340cd71555fe7564011250045ef038abc19508bbd3d SHA512 dee41e91c23031fba453a79a56e048558d85197d7661b773b2c966c49a381d4539c7639bd1c94726de936b16a233b92424548da67859c9fcf9884348bb48d326
diff --git a/dev-ml/ocamlbuild/ocamlbuild-0.10.1.ebuild b/dev-ml/ocamlbuild/ocamlbuild-0.10.1.ebuild
index 10847fc11e60..a1e8c0d4d690 100644
--- a/dev-ml/ocamlbuild/ocamlbuild-0.10.1.ebuild
+++ b/dev-ml/ocamlbuild/ocamlbuild-0.10.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/ocaml/ocamlbuild/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+ocamlopt"
 
 # does not compile with ocaml-4.09 (bug # 708696 and #708872)
diff --git a/dev-ml/zarith/Manifest b/dev-ml/zarith/Manifest
index d007e1f89549..12ad36152045 100644
--- a/dev-ml/zarith/Manifest
+++ b/dev-ml/zarith/Manifest
@@ -1,11 +1,5 @@
-DIST zarith-1.4.1.tgz 88831 BLAKE2B f1a434f61dfa23cdb1e41d3e84c53444832978d119aa3f169d1b0302268ba13bc9e1f4cdec8c76b14d53ad49a695f04c1077beb1619a16a89a98ac6a1ebd8361 SHA512 ef6717e3b6c19ef94fb0e02eb33b1d9f2b2103a9fe0334cb89b01b344ee953fbeeaed8a75b17daa32760faaf93d582e6778ae50e59e9cf878663f2ecba1d5659
-DIST zarith-1.5.tar.gz 89211 BLAKE2B f84127baeaf7efb61957e3657e7f2e3771df974ff6f92e3e0a04c93550ee48d5fa9adf473e423d409a2f40dba568ced30ef903c790f32b6e8bccd1032a475b84 SHA512 4e616b8cc81cd83f51696926e598be3bcda0bb5999db3cf42dd627cf537320a0216c74eb14c57e57fc21c909df8ef3fb3fa602a7ad633c115d2ee61af5a9fdcd
-DIST zarith-1.6.tar.gz 89353 BLAKE2B 4dc7dbe17426a57929632d38fae91bdfec4f54371ebb0ae55b6d88c7fffb47c229d0800125eaa2f5fca4e096bb50dceb4e0851ef88a16d3e89bc1db7b9cb32b9 SHA512 a12eacfaa809885f2b0f09ed0fc56d90ebaf9a3d8685db8a41dcaaaa2a9d2410ec96529d8bee653343ea8d51304861dbcf12daba06206a6cf07753ad3b09780d
 DIST zarith-1.7.tar.gz 89617 BLAKE2B ee8a272a7421d9e723af8aa6207da8fe046585804e669058b6dec8fb47cab80e438d0520c1b61ed6c79bc279d162a7a1043fa40e74c50342b7e4d553ca8e8f5b SHA512 812b5f9b24ce7a24d3370b8728ff6eeb56e3280fa1573e694fe54e781668c29bf8ff95e94aeff59df948adc85b8acd6b4efe117fb50a124f19b4227bee78e753
 DIST zarith-1.9.1.tar.gz 92321 BLAKE2B d61def81600cb5f3ae931eabebcdf081b6025dd24b1deae46a55f5db4f2c67d44b38b9cb9d73fc7fd9bd76c81545294373e3df5969da217209079a2912a8e285 SHA512 e77620c66a59d35811acfc45c7ef3f0d50d3042194654b1f5b652a2ed5fb9d5f88e9173222e5ced286c61854434da05a4d96668089faa66ff2917afa677fc32f
-EBUILD zarith-1.4.1.ebuild 1193 BLAKE2B 84a323166b9230e8a2a7924b31f87bdea990306161d2fb0eb8e8f3055b48e19302e1d27d4ea72ee7ae4759e710595cb740bb0076b15cf5ad601a969fbb753f94 SHA512 60bfc326aaea319952c69a3ae2b05339d743009d7c0e783355ed07b410c8b94ec5c5e4cb7b4c423929efaf41b82c21b630fb12b2ef9a2f024560054818e68f99
-EBUILD zarith-1.5.ebuild 1325 BLAKE2B 2957002ba292cd66a0493c9fcf71407d3996193430d4741ceb9bfa0efccaab91b3a0644f1458bd2fc8a573ee74d44cdee0f55c73306649346376117b9803ec5a SHA512 b83b61d3e2caf9fda5cb4abe42882d817af171ccbbdb526e161b0a62997aa37d5876626fbcba3e5df17fc1a0f07a5c0fb48943b8549b6a0351e195ac1b604385
-EBUILD zarith-1.6.ebuild 1325 BLAKE2B 2957002ba292cd66a0493c9fcf71407d3996193430d4741ceb9bfa0efccaab91b3a0644f1458bd2fc8a573ee74d44cdee0f55c73306649346376117b9803ec5a SHA512 b83b61d3e2caf9fda5cb4abe42882d817af171ccbbdb526e161b0a62997aa37d5876626fbcba3e5df17fc1a0f07a5c0fb48943b8549b6a0351e195ac1b604385
-EBUILD zarith-1.7.ebuild 1321 BLAKE2B 3af5a784eb0c7ae6318136e5ba37d98fbd0ec1494b30b0366c944418e7c315323b647f62bd1ec7aac83334fae8521ec6cef6b21e39c0a2c517f14fbbfb23de94 SHA512 c2d0508d7c4186b7775002f9015731614458eb9426d953850ac6556ebc8f0cc91fc49c0aac67f9a1dd379f38c2bdf063624644deae23fe3413af895f9f8bd11b
-EBUILD zarith-1.9.1.ebuild 1403 BLAKE2B 9fe1d01c56173a3466555a9e28fa755427c425128f466cfae6f38dd1c5ec2e547032435bfef6f9956fd21724dbbdc24ee96aa04ecda4e3f9e36f89687e6e3bf6 SHA512 f0ae8b2643a517b45cdef32649167cb6deec5f18bf9f580e743636690fe0026d948f9ed7ca75934e8483abbae0707d03eeded55cdf5172f6c05d3b2011c88f99
+EBUILD zarith-1.7.ebuild 1324 BLAKE2B 25281d39a44be1b345fab0ba5ff4bd34c1355a2f9bd5a80ffbe8d3d7685bec4ced72865c29a56f69b9db4555a35eac0c752b6752d0083c3d2a018ad50d8e47ba SHA512 33c9759c47aef05c74514d71077b2ab791f83b4d8b46bc32b12b75ddc7032dc4fe5b04ed7690e6a251f54994b5793d0c1c4a5eeb06f53f5eacb5ec5ff18267bf
+EBUILD zarith-1.9.1.ebuild 1406 BLAKE2B f83e2de18f7a854f18fec35a8160c50be586ec79bbf4f5ef82077c0698ccd839e2f89035ef381e1bd80446e18e754d6cff2d8214b71d6b7dcd82b9ea178665c6 SHA512 8e0f501911f3e6267b8ea630e1d7d8c1ff23b8e2e60eed3a7a105b0c5e49efe76f48598cdf00e891b57438d966e84ec813859c5eed1ff6948adbc25f9ef416c1
 MISC metadata.xml 399 BLAKE2B 8d0594f3da1c885b3c23bc0bd85bb499b46c1bf9e6d9ce97d03a5bbb9b3ef07be3fe71887464d0334eb5338db123a07113b40f83c4887a99041eccd77d3aed21 SHA512 a1b5ac5f460c86208b260d2adf19bcfe4e34c076be1aa4f52aef993d8e709411ecaf3fa0b6170b0fca952ae7fc1c8e70cb20f7d40ea528ec69dc32624a61faf0
diff --git a/dev-ml/zarith/zarith-1.4.1.ebuild b/dev-ml/zarith/zarith-1.4.1.ebuild
deleted file mode 100644
index 8825fc311e45..000000000000
--- a/dev-ml/zarith/zarith-1.4.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit findlib eutils toolchain-funcs
-
-DESCRIPTION="Arithmetic and logic operations over arbitrary-precision integers"
-HOMEPAGE="https://forge.ocamlcore.org/projects/zarith/"
-SRC_URI="https://forge.ocamlcore.org/frs/download.php/1574/${P}.tgz"
-
-LICENSE="LGPL-2.1-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc mpir +ocamlopt"
-
-RDEPEND="
-	>=dev-lang/ocaml-4:=[ocamlopt?]
-	!mpir? ( dev-libs/gmp:0= )
-	mpir? ( sci-libs/mpir )"
-
-DEPEND="${RDEPEND} dev-lang/perl"
-
-src_configure() {
-	tc-export CC
-	./configure -host "${CHOST}" \
-		-ocamllibdir "/usr/$(get_libdir)" \
-		-installdir "${ED}/usr/$(get_libdir)/ocaml" \
-		$(usex mpir "-mpir" "-gmp") || die
-}
-
-src_compile() {
-	emake HASOCAMLOPT=$(usex ocamlopt yes no) HASDYNLINK=$(usex ocamlopt yes no) all
-	use doc && emake doc
-}
-
-src_test() {
-	emake HASOCAMLOPT=$(usex ocamlopt yes no) HASDYNLINK=$(usex ocamlopt yes no) tests
-}
-
-src_install() {
-	findlib_src_preinst
-	emake HASOCAMLOPT=$(usex ocamlopt yes no) HASDYNLINK=$(usex ocamlopt yes no) install
-	dodoc Changes README
-	use doc && dohtml html/*
-}
diff --git a/dev-ml/zarith/zarith-1.5.ebuild b/dev-ml/zarith/zarith-1.5.ebuild
deleted file mode 100644
index 857c5026e9d6..000000000000
--- a/dev-ml/zarith/zarith-1.5.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit findlib eutils toolchain-funcs
-
-DESCRIPTION="Arithmetic and logic operations over arbitrary-precision integers"
-HOMEPAGE="https://github.com/ocaml/Zarith"
-SRC_URI="https://github.com/ocaml/Zarith/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc mpir +ocamlopt"
-
-RDEPEND="
-	>=dev-lang/ocaml-4:=[ocamlopt?]
-	!mpir? ( dev-libs/gmp:0= )
-	mpir? ( sci-libs/mpir )"
-
-DEPEND="${RDEPEND} dev-lang/perl"
-
-S="${WORKDIR}/Zarith-release-${PV}"
-
-src_configure() {
-	tc-export CC
-	./configure -host "${CHOST}" \
-		-ocamllibdir "/usr/$(get_libdir)" \
-		-installdir "${ED}/usr/$(get_libdir)/ocaml" \
-		$(usex mpir "-mpir" "-gmp") || die
-}
-
-src_compile() {
-	emake HASOCAMLOPT=$(usex ocamlopt yes no) HASDYNLINK=$(usex ocamlopt yes no) all
-	use doc && emake doc
-}
-
-src_test() {
-	if use ocamlopt ; then
-		emake HASOCAMLOPT=$(usex ocamlopt yes no) HASDYNLINK=$(usex ocamlopt yes no) tests
-	else
-		ewarn "Tests require USE=ocamlopt. Skipping them."
-	fi
-}
-
-src_install() {
-	findlib_src_preinst
-	emake HASOCAMLOPT=$(usex ocamlopt yes no) HASDYNLINK=$(usex ocamlopt yes no) install
-	dodoc Changes README.md
-	use doc && dohtml html/*
-}
diff --git a/dev-ml/zarith/zarith-1.6.ebuild b/dev-ml/zarith/zarith-1.6.ebuild
deleted file mode 100644
index 857c5026e9d6..000000000000
--- a/dev-ml/zarith/zarith-1.6.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit findlib eutils toolchain-funcs
-
-DESCRIPTION="Arithmetic and logic operations over arbitrary-precision integers"
-HOMEPAGE="https://github.com/ocaml/Zarith"
-SRC_URI="https://github.com/ocaml/Zarith/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc mpir +ocamlopt"
-
-RDEPEND="
-	>=dev-lang/ocaml-4:=[ocamlopt?]
-	!mpir? ( dev-libs/gmp:0= )
-	mpir? ( sci-libs/mpir )"
-
-DEPEND="${RDEPEND} dev-lang/perl"
-
-S="${WORKDIR}/Zarith-release-${PV}"
-
-src_configure() {
-	tc-export CC
-	./configure -host "${CHOST}" \
-		-ocamllibdir "/usr/$(get_libdir)" \
-		-installdir "${ED}/usr/$(get_libdir)/ocaml" \
-		$(usex mpir "-mpir" "-gmp") || die
-}
-
-src_compile() {
-	emake HASOCAMLOPT=$(usex ocamlopt yes no) HASDYNLINK=$(usex ocamlopt yes no) all
-	use doc && emake doc
-}
-
-src_test() {
-	if use ocamlopt ; then
-		emake HASOCAMLOPT=$(usex ocamlopt yes no) HASDYNLINK=$(usex ocamlopt yes no) tests
-	else
-		ewarn "Tests require USE=ocamlopt. Skipping them."
-	fi
-}
-
-src_install() {
-	findlib_src_preinst
-	emake HASOCAMLOPT=$(usex ocamlopt yes no) HASDYNLINK=$(usex ocamlopt yes no) install
-	dodoc Changes README.md
-	use doc && dohtml html/*
-}
diff --git a/dev-ml/zarith/zarith-1.7.ebuild b/dev-ml/zarith/zarith-1.7.ebuild
index 133092897581..21ad63c4e898 100644
--- a/dev-ml/zarith/zarith-1.7.ebuild
+++ b/dev-ml/zarith/zarith-1.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,7 @@ KEYWORDS="amd64 ~ppc ~x86"
 IUSE="doc mpir +ocamlopt"
 
 RDEPEND="
-	>=dev-lang/ocaml-4:=[ocamlopt?]
+	>=dev-lang/ocaml-4.05:=[ocamlopt?]
 	!mpir? ( dev-libs/gmp:0= )
 	mpir? ( sci-libs/mpir )"
 
diff --git a/dev-ml/zarith/zarith-1.9.1.ebuild b/dev-ml/zarith/zarith-1.9.1.ebuild
index dc83db4cb61f..85651e3b4951 100644
--- a/dev-ml/zarith/zarith-1.9.1.ebuild
+++ b/dev-ml/zarith/zarith-1.9.1.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="doc mpir +ocamlopt"
 
 RDEPEND="
-	>=dev-lang/ocaml-4:=[ocamlopt?]
+	>=dev-lang/ocaml-4.05:=[ocamlopt?]
 	!mpir? ( dev-libs/gmp:0= )
 	mpir? ( sci-libs/mpir )"