gentoo resync : 17.02.2020

20 files changed, 147 insertions, 22 deletions

diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index ebf4bb51671e..c004f1de56ed 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/camlp5/Manifest b/dev-ml/camlp5/Manifest
index 75dcd1060d4c..2637aaa4f23e 100644
--- a/dev-ml/camlp5/Manifest
+++ b/dev-ml/camlp5/Manifest
@@ -4,7 +4,7 @@ DIST camlp5-7.01.tar.gz 757118 BLAKE2B 5d7c6f39f24bfee545552aae5c126305d2c767d06
 DIST camlp5-7.03.tar.gz 758136 BLAKE2B 4e1169adf7e119f1f659fe684a8b06c4730db3bcd7807169552de0e3fc115f8d45bc11961f3aee0a9c2d86e1130ec776a1bb7753d7d4e95f661d65d1f841406c SHA512 0c76d469c5f8c727088f3136107b6690349b50791ef8baefffdaa90141230907f977a7a886a9e8d88d39d8fa315637d882d0205c57d752e16575c888a8a1f54d
 DIST camlp5-7.10.tar.gz 849559 BLAKE2B b05624156e914c2657d76afbf3dfacd295fe5985ae3809959a40029a8052669be6ae8a6ff889fbf2c602d3f19c9995f013b388c140738f4bb4f4da9970911ed5 SHA512 faa9e88f56477162038fc80429d5839c93b3e38aec90366730babe737e2e6bb260dc39975947a6601212cc0c68f465bdbccb6337da23c07181909dfb11cf8640
 DIST camlp5-7.11.tar.gz 878224 BLAKE2B f384764da43653a2f75664681a4f202ec84497720470a0a33f99fc61a1ce7b4a9d494ffe6b523c74906c122ee04ae25a08bf1fcd356145e85a11e3e3095bbf7d SHA512 109a43f0a3aaa7a3ba9bd51b1fc1273b054d32787e189b138d69b39c42642b480c13abb9e91f15e6b6e889eaf4dc422ad3ff51e4dee298fb9d8cd9a2db99c159
-EBUILD camlp5-6.17.ebuild 1667 BLAKE2B b069ffd12b596cfd8f3b8cb329e96067d3ff54ad8a21917aeb9eaded7cab6d876698262ffe44d20b06cd9b22c6c43666236482e9803e4b8f5056ffaab8b2d8ff SHA512 d49d8cb457301a3334df1b94a1f435c7fb85ff24de08cbdbe6aa53caa541f0a1d1f6583184d45e1b423b59cae58d539b09387f2d0cfaabfe19030afb51995e6e
+EBUILD camlp5-6.17.ebuild 1667 BLAKE2B 1a697733022a5ba44310108cad0418de1b856575f2ba2e18cb449c026507b796e737a0b3988936231271de307fb61ebcd655d930afd739191989c8a346cf6874 SHA512 adbe95ff3504175b62a65bc609d0dbefa2a1f8755ca33aa61465b3b7e0be50355e916c94ca406d4223027c0e5e624518f8144af1ea4d944c6de95899f954bd8f
 EBUILD camlp5-7.00.ebuild 1473 BLAKE2B 903f983282688ac736fb814e32d39b8a7dc4dccf103ebaaad573528a5f93f4fa77dc25189b7aa2d95c53529f7055012772f27217d77fa523c49666036f74ea0a SHA512 4b8e2cc30fcec4941ad38ddd5555bdc81610e8267ff7551178b68110b4fd1ddbac1333bac01ebcbaab168412f84c1579203ee1476f9e4caf9861e3cf25303c4b
 EBUILD camlp5-7.01.ebuild 1473 BLAKE2B 903f983282688ac736fb814e32d39b8a7dc4dccf103ebaaad573528a5f93f4fa77dc25189b7aa2d95c53529f7055012772f27217d77fa523c49666036f74ea0a SHA512 4b8e2cc30fcec4941ad38ddd5555bdc81610e8267ff7551178b68110b4fd1ddbac1333bac01ebcbaab168412f84c1579203ee1476f9e4caf9861e3cf25303c4b
 EBUILD camlp5-7.03.ebuild 1473 BLAKE2B 903f983282688ac736fb814e32d39b8a7dc4dccf103ebaaad573528a5f93f4fa77dc25189b7aa2d95c53529f7055012772f27217d77fa523c49666036f74ea0a SHA512 4b8e2cc30fcec4941ad38ddd5555bdc81610e8267ff7551178b68110b4fd1ddbac1333bac01ebcbaab168412f84c1579203ee1476f9e4caf9861e3cf25303c4b
diff --git a/dev-ml/camlp5/camlp5-6.17.ebuild b/dev-ml/camlp5/camlp5-6.17.ebuild
index 22bc152e87ba..f8ae1a8ac72c 100644
--- a/dev-ml/camlp5/camlp5-6.17.ebuild
+++ b/dev-ml/camlp5/camlp5-6.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
diff --git a/dev-ml/facile/Manifest b/dev-ml/facile/Manifest
index d7c8a80600fc..fe62ef878568 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 1376 BLAKE2B 93766ce5d98e7b6bc746644fd105fba02cfddb58ad3322b29470f1e53eb5d8de26807c468e6fedac4399c536928ff761ea4461660835da9ba48c9c86320a00be SHA512 ed13dd12be41fd3d348cd9402e1f2829d9d78a41072890cc1d91a506aca05e7a5e081a0832aed4f50c64e3ed0409871a52c0f7a8a6f409aa359daf14ce86ba72
+EBUILD facile-1.1.3.ebuild 1376 BLAKE2B e17ef392ca1bf37d7bd0b103a6172e63f638f11d9bdc38a7ef151eb9d583a239d2b9730d6181527cd0223e6e8f26226db1d4a9527077e649d1e889bcaf37f43e SHA512 842e16de591184e92d9c6dccc56b6868ad81f75aa5f94ccb00f73633e75273b0864338edb3ad2c79d74ab68cf0dc5a65a87a248b4a2721f5aa135abd927864b3
 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 9146cb1c392a..1f3ed1639553 100644
--- a/dev-ml/facile/facile-1.1.3.ebuild
+++ b/dev-ml/facile/facile-1.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/dev-ml/findlib/Manifest b/dev-ml/findlib/Manifest
index d3d88b68c127..6b46b5427a88 100644
--- a/dev-ml/findlib/Manifest
+++ b/dev-ml/findlib/Manifest
@@ -8,5 +8,5 @@ DIST findlib-1.8.1.tar.gz 261544 BLAKE2B acfa9d4e0d118ebbc0dd7b03da1fe5eaa994e5f
 EBUILD findlib-1.7.1.ebuild 1668 BLAKE2B 60d7a6dbe8afa310b009c83484fff3764214d936462006c0ee173440dc9ed55af26caa161dfa56dfa0d2f92d79d5b7f6d64276102a84609905a03479b0c35723 SHA512 5ebe6823f278c34ede6bf7aedd842c74a8eebe51c34d730d54cc08546a4345e14a799487d45456ec75749d4415ecf6673db6a473ef8c81149efe2845df3f320c
 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 1693 BLAKE2B 2430f1c69b891352735c739932f681149aa46af23ac22626e2d7085f11050d0a965508a84f0b7b9ff05c480b2954659a269d072e39b1ed92f66163d135ea728c SHA512 5e05a353475eade1dbaa4f2e9aae0473e19ef79f355369608af6d219193a6067903b6a00dd80b76ccf21213511e688e6a8d0b37b5cbb49a8bce2f77155dce2c8
+EBUILD findlib-1.8.1.ebuild 1688 BLAKE2B 073d2fb7ce9fd825b51105ebaf89a93c70aa79fc361ac9f00b07728a38c010fc013e9bb910aa40c63533c26d1555f27a7b338b46aab1d70170edc002bfca102f SHA512 fb027473b86f76b8703e4577c63cba24c3d319a65eed119412423fd85d0420e4af5a69a2d774d8ea2ed842d12ab5dfb062de98076c565154a9ebe6cdcfe50b75
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-ml/findlib/findlib-1.8.1.ebuild b/dev-ml/findlib/findlib-1.8.1.ebuild
index 9ab65f642ccf..4af952aa9830 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 b3e5aabb3b52..5ea9a531d613 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 2057 BLAKE2B 74b15bb984db8fdf857faf646a2fd24fee7e44cd20a2876eddea0649d2e5d2133dc740befbae365b609cfcf536d49c96354a0f003caf71a68c82444fd0edec5f SHA512 e65c58b56ad8ab8740615f29e7f3add72aa7135a94f492e8b47478ef77e1c1c6527e25945580af04b9b422f390e94568e95d09133fa2e9773202af825b193287
+EBUILD lablgl-1.05-r1.ebuild 2054 BLAKE2B d384f5ad7ea4d0f481116472889ab902f46e6e73402d2b32983c44aaebeedef3461deb90553496166156f14b794fd40f876819715a4060eb00777ba6ae21652c SHA512 8ead7f77bf00fbfe1744b9620eba2e4e72fae31b03bed96b2b26c943ff04c9ccebcffbfb43701695a6bf5465cf84bddb34c8e56170c22ee45f190cd6ffe728d7
 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 4e305358ae47..cd31010997bd 100644
--- a/dev-ml/lablgl/lablgl-1.05-r1.ebuild
+++ b/dev-ml/lablgl/lablgl-1.05-r1.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"
diff --git a/dev-ml/lablgtk/Manifest b/dev-ml/lablgtk/Manifest
index 23e3ac9901ae..ea0e4c067107 100644
--- a/dev-ml/lablgtk/Manifest
+++ b/dev-ml/lablgtk/Manifest
@@ -1,5 +1,5 @@
 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.5.ebuild 2494 BLAKE2B 0cce16ca4d04aa6c39721f708bd7844f62b609d1933dc045b19d802390c8a862faeb8deb8294a4660a02cc277000ba6ed2e739e7e57758248937edd8e6dd1ca4 SHA512 23887d3bda10dc05e461c52cc920fccf11ad2d4f3ed1cad336655ce206d49f1716009e958ae118fcf4c276e7ed5fc253f4c42074274c6623076d25a3285d5448
+EBUILD lablgtk-2.18.5.ebuild 2491 BLAKE2B 2f53117e6de9aa3900f1086013861d98c60ae50a3b27265335aaca24bc4ee4533e70b51d66138f1e552d9bba2f708f660db5ff2f45bf63d9e59dfc764a201348 SHA512 16f5c0ca8b432e285e59ed69e7bd2c080bb1aa1bd080753c9ff77c74547f740e285f221d30c5cbf8507dcf74eaa49c1f8b853881693e1bbd08b2b1639bdb7165
 EBUILD lablgtk-2.18.8-r1.ebuild 1761 BLAKE2B a14d6732ebb0cd9103ce42fc55e97ecb779ab4d31dfe70c1b0b08ce086fd0348cb99497fbb5647f6f00183923c35892d688e2a76d5ae52065ee028ac01eaf31c SHA512 6030d3ae0ecb9c971f13919202db320304a5b90f5e3668ba2bc5e3bd6a943a9854149f2d16b116030e9ee8bc8715f3ead23b17877f8a9d8ed30a932f0295a55b
 MISC metadata.xml 383 BLAKE2B f59b6011af9733a217dad8be7234433c96e54f61ada270a01b2aa2195184b0d65f5358ade54d71a082029f02b6b902254781bc19bdaf94742f2a74620059ce68 SHA512 4f9bc70bee361fe4ab68962b8c1cf5423153247253e8d4f4b4f08eacbd5bbff6cb3928baa28d458eb2c6161fdd16bee3858a94ab35d8e77232b6571d88dea337
diff --git a/dev-ml/lablgtk/lablgtk-2.18.5.ebuild b/dev-ml/lablgtk/lablgtk-2.18.5.ebuild
index 2c5a03c7f115..e582427e9c8a 100644
--- a/dev-ml/lablgtk/lablgtk-2.18.5.ebuild
+++ b/dev-ml/lablgtk/lablgtk-2.18.5.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
diff --git a/dev-ml/labltk/Manifest b/dev-ml/labltk/Manifest
index 76365900ccaf..e5429a512458 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 34c0447f2a43f865a39eb62acb8be2ac4878f8f74f9962cc85267c08ec95fd93e8d387ae236240910f9d6af7c9b986552f0d8a8ae45586a84b122e516ae2b4d6 SHA512 da67d5e1df7df73928074ba436e72c3fc16de63e14cf74a8f33e2ee1137f55356ce45ba31cea96417a9498ce07069add05ac8ead498a7f040d9685a442258ea4
-EBUILD labltk-8.06.7.ebuild 1011 BLAKE2B 089ecb297d56da267bab8de314b1792be5648de9b3556bc3000f3ceec615742652e5cc1d769ad7742d2d998cec098fccc2f12664c8f666c99970c927be2993a8 SHA512 916ec3206e6afb62ae1324de7576591dab4e9536cc53f2dcb60d600efba6485f98445058f79a4b292036f7574d25dab8c5a4eaa0d529fe779ee5ad3b9a166d74
+EBUILD labltk-8.06.2.ebuild 1097 BLAKE2B 37d58905c5270af5fa442b554d1679e1ec58bb1c171cfbb297fdb95b3616b298a943f98422ce060424e1d9c64d29d700f39cc10a474f923625bb0300a6069490 SHA512 09ac22573144b888f38cb728be20b5673d8535c7dc9b8163b57cf47547520d1938526a21b248d1245f42caa2dd29785371e27b2c3bc72db0b200f24fe29c152c
+EBUILD labltk-8.06.7.ebuild 1005 BLAKE2B 2928784be693a2dafe9f5ddb38885a195e85c0c5801c8e9a3a4e92cace964de425332b2cc52d9c3022383328b3518c8425b3faec96a2ac57f92edecf316cc87d SHA512 e8ebf572938c60e135122a723508409bfe58811925731930b0454a9f1391474a803f89ed476468cc3bd1ed96ccfa548c9c975ed20c1e454d708903733227f872
 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 3b958ff2fd33..5e78861eac40 100644
--- a/dev-ml/labltk/labltk-8.06.2.ebuild
+++ b/dev-ml/labltk/labltk-8.06.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
diff --git a/dev-ml/labltk/labltk-8.06.7.ebuild b/dev-ml/labltk/labltk-8.06.7.ebuild
index fbf50f8dcb47..c6afe79a34fa 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 409f8d5c22f1..4cd8e1e5bd0a 100644
--- a/dev-ml/llvm-ocaml/Manifest
+++ b/dev-ml/llvm-ocaml/Manifest
@@ -1,10 +1,12 @@
 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-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
-EBUILD llvm-ocaml-10.0.0.9999.ebuild 3223 BLAKE2B 493402ac8d79b1e7532aae120957aec11276f0c652532af4e6f84642e734c42ab5214b13a43af788b57d7fcbfa3494bff28ff9862129a419cafe8a042dd21d14 SHA512 ce647a88d2f8fb034c6ef1fae428d5d288e92fb893d5515cb9eb0f3f1c231978b15ded5da5181ea5e313ee1059c82f9b7f1ad6f4a5f170749b37056f2eaafa72
+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-11.0.0.9999.ebuild 3223 BLAKE2B 493402ac8d79b1e7532aae120957aec11276f0c652532af4e6f84642e734c42ab5214b13a43af788b57d7fcbfa3494bff28ff9862129a419cafe8a042dd21d14 SHA512 ce647a88d2f8fb034c6ef1fae428d5d288e92fb893d5515cb9eb0f3f1c231978b15ded5da5181ea5e313ee1059c82f9b7f1ad6f4a5f170749b37056f2eaafa72
+EBUILD llvm-ocaml-10.0.0_rc2.ebuild 3203 BLAKE2B 0704301a50ed440809470c0753a7c59ba2118dac3cc284f4bdaed07ff9080d2ac09cc624aa7001526f900c7ffa27dc2f04a42ed964f6759d313d7c5281591311 SHA512 86c415b7cda21fac1137f4af120bf6df3e65afbf0c08a3afba60854383306faec4bd4b32fa1be3d7cafdcdbe3faa3efe2f482142d49d01c5cebc0a7f1515fa53
+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
 EBUILD llvm-ocaml-9.0.1.ebuild 2922 BLAKE2B d7ae97c680d9f223a0fbaf2989ee60c4ae2baebf73664c9909485fea6c99f5c4c817ff522bee6175a741a5632687d1d0ea5b7b961587a258ca0737ac419390ac SHA512 dc30f078950d944a5c9d18d8804db82300845564afc05878cc7b157d37ad32259c528b358b9cd12684da3b9885b62e92cc6a32b46b8c4cbf48269839bd4cfa02
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-10.0.0.9999.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-10.0.0.9999.ebuild
index 0f9b2f61d747..52e3836cb57f 100644
--- a/dev-ml/llvm-ocaml/llvm-ocaml-10.0.0.9999.ebuild
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-10.0.0.9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit cmake-utils llvm llvm.org multiprocessing python-any-r1
 
 DESCRIPTION="OCaml bindings for LLVM"
@@ -73,7 +73,6 @@ src_configure() {
 		-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
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-10.0.0_rc2.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-10.0.0_rc2.ebuild
new file mode 100644
index 000000000000..8a7efe8fca43
--- /dev/null
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-10.0.0_rc2.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+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 )
+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
+		-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/llvm-ocaml/llvm-ocaml-11.0.0.9999.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-11.0.0.9999.ebuild
index 0f9b2f61d747..52e3836cb57f 100644
--- a/dev-ml/llvm-ocaml/llvm-ocaml-11.0.0.9999.ebuild
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-11.0.0.9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit cmake-utils llvm llvm.org multiprocessing python-any-r1
 
 DESCRIPTION="OCaml bindings for LLVM"
@@ -73,7 +73,6 @@ src_configure() {
 		-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
diff --git a/dev-ml/patience_diff/Manifest b/dev-ml/patience_diff/Manifest
index 859993a98ae2..9d040c67dffe 100644
--- a/dev-ml/patience_diff/Manifest
+++ b/dev-ml/patience_diff/Manifest
@@ -1,3 +1,3 @@
 DIST patience_diff-0.9.0.tar.gz 16520 BLAKE2B af7f93906c1f4ab70649bc41726aff21f9f099fe49b0d3a3e8bea01d85e9f01cac4bd103179e9877d79dbc997d37318382321dacd67be57a9e031fd95e0263e5 SHA512 62cc0950edd8d46d5a11cd612dbdb8dc531a9a2c71403f30e6022e20d9ee21cb2e7a531362fa8b350075003eec929f1f70481b8e160b253831966d80a8becd83
-EBUILD patience_diff-0.9.0.ebuild 534 BLAKE2B 4b0e16608fa40c71c896a814fac9fb68ed2cfa9fb10f24bee2221ad6187bf0fd89c967102fbe5c352b4ed947bb6963fda620cc74ca4472a7ed2b37fb1e29602e SHA512 8cca726e81552de98a1771fe9115836bafbb4b16d2dfc5bd34fa5565654c6a32450eb9662e5232f6c3c0e5e21ecc5286e835c19926c17b54e997a4dda2f2b121
+EBUILD patience_diff-0.9.0.ebuild 531 BLAKE2B 9358c8ddc1e20b3de59ce5e7f9cd383f1cee5ab1848942fa2de7f9d07a26214575dd1977a5cd863e79a15fd25dabeee60523a0fa3abc940e5e6311fab9da9b8a SHA512 f3048b6eea0268785ff09df56fcb7b07ca91e393ab9a41d4fadc70bf527d130e8b2c0909cc46616f4872d9453d609b6994d8d4a62756be369ba5975687d37292
 MISC metadata.xml 256 BLAKE2B b85b78e50bb089fb6f5ec8f062457473d8a64b4b1b9442df43b08df04a0d4bbca6d0b6b1368025fc5eef79ada7f1e835189883d38fd364328e264454cc5d3ddd SHA512 ed2cac543371b73c9a0a9b0e0cec36fdf53cd35f79644243466f7dddd8225b9351126d93ad87cddfc2fa567b8905fa0c4c6b6ed8ffec87bf4707662dcf3ed9ca
diff --git a/dev-ml/patience_diff/patience_diff-0.9.0.ebuild b/dev-ml/patience_diff/patience_diff-0.9.0.ebuild
index 1a27643bcde4..75cd3ec4d124 100644
--- a/dev-ml/patience_diff/patience_diff-0.9.0.ebuild
+++ b/dev-ml/patience_diff/patience_diff-0.9.0.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=6