gentoo resync : 05.02.2020

25 files changed, 222 insertions, 107 deletions

diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index b746194fd3f2..d8ff1d035179 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/camlp4/Manifest b/dev-ml/camlp4/Manifest
index 88bf4564bbd5..cd41b1170dfa 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 999 BLAKE2B 38be80f4cb516af862b23520a7d2517a57773014d75beaada0aa39a2a7a53a6a08e993844b5132a922a740b2d0094d955499ecaa8dd844d8d19a77d27ec7e9d0 SHA512 562a728a200be45b866bc6087dca57263327ceb8b7f39528a66916039163dc6b14bb213a0987a7c6891d22026c0abe21cdb8fc80c03bcaf48923118d00d681e0
+EBUILD camlp4-4.04_p1.ebuild 1000 BLAKE2B 8bb79168e90765e864d1d61706edf0193eb4ea26c17fc382376f3e70810a0ac88711a763f912dcf62c884dc85d4e0b6017fddeee3b9ce5a675b20ff78bea3e07 SHA512 be8dd7edf71cd3cd584a27055272bd3a8d7e34173061c6d3ee40712be810c8aa2fd49c1e04519358d6926f02c3a2f38986a6df86b812fedddae29eff4863b069
 EBUILD camlp4-4.05_p1.ebuild 1008 BLAKE2B 530cdc2283fdce7c532e5fc3a9580ab3e30087cfc32d7cf93b8712dc5589fa3ff7c6c3f68544298b1f51ccab5967470212eb1b0ea406d0f3c3730b9bc011a5fa SHA512 da1caacafe852a6fd93a0c351acb961e525af1f02b77e16b6ff66ffe5dc6310116d8251eb358d7a08ed22eab7c1826eee10a78e853cea34b3d341e06cbf78ce6
 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 812b45c6ae8f..20df6f9f34f5 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_beta:=[ocamlopt?]"
diff --git a/dev-ml/camlp5/Manifest b/dev-ml/camlp5/Manifest
index 7ed604f4f40c..d7b86b274965 100644
--- a/dev-ml/camlp5/Manifest
+++ b/dev-ml/camlp5/Manifest
@@ -3,7 +3,7 @@ DIST camlp5-7.00.tar.gz 755750 BLAKE2B b047422ff34c4d15c21b65bd7473ccdad8bfc1f48
 DIST camlp5-7.01.tar.gz 757118 BLAKE2B 5d7c6f39f24bfee545552aae5c126305d2c767d06762aa516c21bcc5b327b312b7c38d742717eb507b92ae1e27de9c0fcde4d616754a7ce616b5f56689c8dc5a SHA512 9930957f707d9d2c8903f87f5f3444f71bad3d84c944436c7abc6de19209595c974098cd60a6a391f8ae87c4fb53b5122cba8e42e34fcf46d798dbdc28840008
 DIST camlp5-7.03.tar.gz 758136 BLAKE2B 4e1169adf7e119f1f659fe684a8b06c4730db3bcd7807169552de0e3fc115f8d45bc11961f3aee0a9c2d86e1130ec776a1bb7753d7d4e95f661d65d1f841406c SHA512 0c76d469c5f8c727088f3136107b6690349b50791ef8baefffdaa90141230907f977a7a886a9e8d88d39d8fa315637d882d0205c57d752e16575c888a8a1f54d
 DIST camlp5-7.10.tar.gz 849559 BLAKE2B b05624156e914c2657d76afbf3dfacd295fe5985ae3809959a40029a8052669be6ae8a6ff889fbf2c602d3f19c9995f013b388c140738f4bb4f4da9970911ed5 SHA512 faa9e88f56477162038fc80429d5839c93b3e38aec90366730babe737e2e6bb260dc39975947a6601212cc0c68f465bdbccb6337da23c07181909dfb11cf8640
-EBUILD camlp5-6.17.ebuild 1666 BLAKE2B 46d98c785c4bdde62ed08a2b1e68215f3bd01337124d3eb225e6f219217ae83b7f5862c75e3fceaae67572ee3823653cc8045e0b1c7d89ba2e3ad96ca1c4afe7 SHA512 602455cf941e3d996d3402c7e6d0645974f687ba3378651e0ebe9fe1db3e61b1468b0400cd76078fdb79c70a98e0d63ee81a301862a3effd8294c7b1745772d8
+EBUILD camlp5-6.17.ebuild 1667 BLAKE2B b069ffd12b596cfd8f3b8cb329e96067d3ff54ad8a21917aeb9eaded7cab6d876698262ffe44d20b06cd9b22c6c43666236482e9803e4b8f5056ffaab8b2d8ff SHA512 d49d8cb457301a3334df1b94a1f435c7fb85ff24de08cbdbe6aa53caa541f0a1d1f6583184d45e1b423b59cae58d539b09387f2d0cfaabfe19030afb51995e6e
 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 96b44eda9170..22bc152e87ba 100644
--- a/dev-ml/camlp5/camlp5-6.17.ebuild
+++ b/dev-ml/camlp5/camlp5-6.17.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}-rel$(replace_all_version_separators '')"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ppc x86"
+KEYWORDS="~alpha amd64 ppc x86"
 IUSE="doc +ocamlopt"
 
 DEPEND="
diff --git a/dev-ml/facile/Manifest b/dev-ml/facile/Manifest
index 888cdc34e8db..d7c8a80600fc 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 1375 BLAKE2B 1b8bf2db662f315a2476afdb3a3d940ff453e86dea4841c011cda514a26d29d43a76acf8d723c79e10c762174e624404ee2ce54f78fa6b53d72f2738b64fddff SHA512 a148bf76478dcd3aecef20abc9b1b4289bdf585cb7a8027828252c125dc55341b03fab0c22beb62c0ec402e532b8be678afad4fc19d163ad7d6b6cfd1f020ca1
+EBUILD facile-1.1.3.ebuild 1376 BLAKE2B 93766ce5d98e7b6bc746644fd105fba02cfddb58ad3322b29470f1e53eb5d8de26807c468e6fedac4399c536928ff761ea4461660835da9ba48c9c86320a00be SHA512 ed13dd12be41fd3d348cd9402e1f2829d9d78a41072890cc1d91a506aca05e7a5e081a0832aed4f50c64e3ed0409871a52c0f7a8a6f409aa359daf14ce86ba72
 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 eb9a99366326..9146cb1c392a 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 8d3e6c096f4e..2decc43f11c6 100644
--- a/dev-ml/findlib/Manifest
+++ b/dev-ml/findlib/Manifest
@@ -5,7 +5,7 @@ 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 1624 BLAKE2B f3717993b9faf6f698b3a04be49842982e4b449255762dc0892de4a99cb89d5480f23e3e40399a9c194c8a16cf4913a16bbcf8726b461d9acec592e1ef2177f9 SHA512 43e039f0884d02e67d5514dd9d64f1cc1dbf2440ffbe86f1ee0f0ccf33ff0d8dc3b09c2a1d37ac882db3abc1b1254cc0c061ec31e9b2a456ab62e852347dcdcc
+EBUILD findlib-1.7.1.ebuild 1625 BLAKE2B d9b27475d4ecd7657261ec0780f8b85976ca349fe5ff6ae0a1bafe9843932435b142d59cc9412ce0daf3339d8e3a5b4149f8b832eb33f726ae3edf1fd33ba519 SHA512 3b4056ba56f86afc1cf942d7c2ea2652b7b7b05b8a4ab96805bc8cf97b97cbc15f2a30147c8c173917f420c576e1a006493509ac26b448b04814d9cbfe9601bc
 EBUILD findlib-1.7.2.ebuild 1633 BLAKE2B 53a3707037ac924c4fb6028af71c1197e27eb5a935ae49d4da4c4753d42dfdb4f004b32a22b9888a3612453536e06eb2624048af58a8d6c32886389ef7078cb0 SHA512 3bd5ffc13a77e485728633c6a3505cf34bf818be2f979a19a5225edd93939d825a8b14f62626e339f3b4776dbbeddb7d908a28c9086e381a087ecb852d7d7f01
 EBUILD findlib-1.7.3.ebuild 1646 BLAKE2B f03a39014effdfc32f0ed37f0218d988db2582bcc300d2af924b510cbf6d54dd90921ce06e095ded6dd368a50e46845afa616c13abb50f2fb74a5cbeaa79b63a SHA512 0d3146cf06181812b02010e6d32201f5c888f5186fd2a748352a157b3d7a96e016d56ffde7bb7c8af9729abb024aa0f88e4905c129278ab002ba32397ae8d77a
 EBUILD findlib-1.8.1.ebuild 1694 BLAKE2B a18e8bcfb91e765708053d00264866b1414604eb54a6a20a02a7f49672af621033e702bae837ebb1d880aaee4c52dbd120c0ea21e5cee61de5be125662bf2517 SHA512 8500c3dff3026ba1c5d94ae698b6eba34cee1a6f8c8349546b028d1f1e4e8fd4099c1e64ddf64fb1ae08021959e363c7f1e572fc6201b614efa8cbf23ced5279
diff --git a/dev-ml/findlib/findlib-1.7.1.ebuild b/dev-ml/findlib/findlib-1.7.1.ebuild
index 66a5b46000f6..2db445777513 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"
 
 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 4134a8edadee..b3e5aabb3b52 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 2056 BLAKE2B fb2ea35b4a0461d78d7a8d10971c64c12b9409d4f59567cce6fccc001c7803c81ea1e35b4de849d294cda78a8c709e2a155393eb7ce186869c0b9ed4d044a129 SHA512 cadbb98cda195cf825989a0cdda16e5e2e79ec39e30c6094183899fd6c2231c7d46403b33d74c1937897b5bc70c1680820b3aca0e99dc9ab66d8b64674589b59
+EBUILD lablgl-1.05-r1.ebuild 2057 BLAKE2B 74b15bb984db8fdf857faf646a2fd24fee7e44cd20a2876eddea0649d2e5d2133dc740befbae365b609cfcf536d49c96354a0f003caf71a68c82444fd0edec5f SHA512 e65c58b56ad8ab8740615f29e7f3add72aa7135a94f492e8b47478ef77e1c1c6527e25945580af04b9b422f390e94568e95d09133fa2e9773202af825b193287
 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 de9178593372..4e305358ae47 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 3ea1f7987ff5..23e3ac9901ae 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 2493 BLAKE2B f24b0391939d27c8937f2f4eef36153817f26bd1428b8cd70b13ec8585c3b75d4032f95748719214cb10d07bcb880352d52d89cf933cf82320380f66c633ee94 SHA512 dec074d84bf5bfd3f1e52ac6699a7322bc7edea7577b0de6c9641abd95a150cebdeaef893552242f83bef2d2323486cd00e99ece2ffe82c7c607261f553e9511
-EBUILD lablgtk-2.18.8.ebuild 2445 BLAKE2B dff73f79f1ae0a1120c2fd4d5772f18d3c79de7d23f08491f5296a60bd9e3b80289bd8b47ae17b38249d9c328673a81ce2e932071526d3984448ec59f5ffb2c5 SHA512 b7e3fc2a10e5c01881e50a0e3694f16e9fbc9121741d75208237727f094772669deb406b3a57da70337d20f422de5089a711148c58436e0f19ce50ce512ab363
+EBUILD lablgtk-2.18.5.ebuild 2494 BLAKE2B 0cce16ca4d04aa6c39721f708bd7844f62b609d1933dc045b19d802390c8a862faeb8deb8294a4660a02cc277000ba6ed2e739e7e57758248937edd8e6dd1ca4 SHA512 23887d3bda10dc05e461c52cc920fccf11ad2d4f3ed1cad336655ce206d49f1716009e958ae118fcf4c276e7ed5fc253f4c42074274c6623076d25a3285d5448
+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 21e6a5ec8e26..2c5a03c7f115 100644
--- a/dev-ml/lablgtk/lablgtk-2.18.5.ebuild
+++ b/dev-ml/lablgtk/lablgtk-2.18.5.ebuild
@@ -27,7 +27,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) \
diff --git a/dev-ml/lablgtk/lablgtk-2.18.8-r1.ebuild b/dev-ml/lablgtk/lablgtk-2.18.8-r1.ebuild
new file mode 100644
index 000000000000..bed3712e2d4b
--- /dev/null
+++ b/dev-ml/lablgtk/lablgtk-2.18.8-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Objective CAML interface for Gtk+2"
+HOMEPAGE="http://lablgtk.forge.ocamlcore.org"
+SRC_URI="https://github.com/garrigue/lablgtk/releases/download/lablgtk2188/${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"
+
+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 )"
+RDEPEND="${DEPEND}"
+BDEPEND="dev-ml/findlib
+	virtual/pkgconfig"
+
+DOCS=( CHANGES README CHANGES.API )
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable debug)
+		$(use_with svg rsvg)
+		$(use_with glade)
+		--without-gnomeui
+		--without-panel
+		$(use_with opengl gl)
+		$(use_with spell gtkspell)
+		--without-gtksourceview
+		$(use_with sourceview gtksourceview2)
+		$(use_with gnomecanvas)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	# parallel build crashes
+	emake -j1 all
+	if use ocamlopt; then
+		emake -j1 opt
+	fi
+}
+
+src_install () {
+	local destdir="$(ocamlfind printconf destdir || die)"
+	dodir "${destdir}/stublibs"
+	export OCAMLFIND_DESTDIR=${ED}"${destdir}"
+	export OCAMLPATH="${ED}${destdir}"
+	export OCAMLFIND_LDCONF=ignore
+
+	default
+	rm "${ED}/usr/$(get_libdir)/ocaml/ld.conf" || die
+
+	if use examples; then
+		dodoc -r examples/
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-ml/lablgtk/lablgtk-2.18.8.ebuild b/dev-ml/lablgtk/lablgtk-2.18.8.ebuild
deleted file mode 100644
index de5f38b12c6d..000000000000
--- a/dev-ml/lablgtk/lablgtk-2.18.8.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib findlib
-
-IUSE="debug examples glade gnomecanvas sourceview +ocamlopt opengl spell svg"
-
-DESCRIPTION="Objective CAML interface for Gtk+2"
-HOMEPAGE="http://lablgtk.forge.ocamlcore.org/"
-SRC_URI="https://github.com/garrigue/lablgtk/releases/download/lablgtk2188/${P}.tar.gz"
-LICENSE="LGPL-2.1-with-linking-exception examples? ( lablgtk-examples )"
-
-RDEPEND=">=x11-libs/gtk+-2.10:2
-	>=dev-lang/ocaml-3.10:=[ocamlopt?]
-	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:=
-	"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-SLOT="2/${PV}"
-KEYWORDS="~amd64 ~x86"
-
-src_configure() {
-	econf $(use_enable debug) \
-		$(use_with svg rsvg) \
-		$(use_with glade) \
-		--without-gnomeui \
-		--without-panel \
-		$(use_with opengl gl) \
-		$(use_with spell gtkspell) \
-		--without-gtksourceview \
-		$(use_with sourceview gtksourceview2) \
-		$(use_with gnomecanvas)
-}
-
-src_compile() {
-	emake -j1 all
-	if use ocamlopt; then
-		emake -j1 opt
-	fi
-}
-
-install_examples() {
-	insinto /usr/share/doc/${P}/examples
-	doins examples/*.ml examples/*.rgb examples/*.png examples/*.xpm
-
-	# Install examples for optional components
-	use gnomecanvas && insinto /usr/share/doc/${PF}/examples/canvas && doins examples/canvas/*.ml examples/canvas/*.png
-	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
-}
-
-src_install () {
-	findlib_src_preinst
-	export OCAMLPATH="${OCAMLFIND_DESTDIR}"
-	emake install DESTDIR="${D}"
-
-	rm -f "${ED}/usr/$(get_libdir)/ocaml/ld.conf"
-
-	dodoc CHANGES README CHANGES.API
-	use examples && install_examples
-}
-
-pkg_postinst () {
-	if use examples; then
-		elog "To run the examples you can use the lablgtk2 toplevel."
-		elog "e.g: lablgtk2 /usr/share/doc/${PF}/examples/testgtk.ml"
-	fi
-}
diff --git a/dev-ml/labltk/Manifest b/dev-ml/labltk/Manifest
index 862259d24053..76365900ccaf 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 1096 BLAKE2B 6fe0db0c0776fa0b472206de93266fbcc05b475abe48360b0063fa3160819e33d59dd481cdc9cb70712ff9dd9f14c5e6df9d41efb03f4ee1f430bba1c2d686af SHA512 e0aecfda39797c119840e1d537980a30a2704f52c16777071b9cad992b31a131c1de927e5b8afba29b731ad0e3245c46a2be3cb1da14b933c82dc0fc3b5ebfd0
+EBUILD labltk-8.06.2.ebuild 1097 BLAKE2B 34c0447f2a43f865a39eb62acb8be2ac4878f8f74f9962cc85267c08ec95fd93e8d387ae236240910f9d6af7c9b986552f0d8a8ae45586a84b122e516ae2b4d6 SHA512 da67d5e1df7df73928074ba436e72c3fc16de63e14cf74a8f33e2ee1137f55356ce45ba31cea96417a9498ce07069add05ac8ead498a7f040d9685a442258ea4
 EBUILD labltk-8.06.7.ebuild 1011 BLAKE2B 089ecb297d56da267bab8de314b1792be5648de9b3556bc3000f3ceec615742652e5cc1d769ad7742d2d998cec098fccc2f12664c8f666c99970c927be2993a8 SHA512 916ec3206e6afb62ae1324de7576591dab4e9536cc53f2dcb60d600efba6485f98445058f79a4b292036f7574d25dab8c5a4eaa0d529fe779ee5ad3b9a166d74
 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 9898bc5fa31a..3b958ff2fd33 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/llvm-ocaml/Manifest b/dev-ml/llvm-ocaml/Manifest
index 2191a46b34f4..14f4a28cddd9 100644
--- a/dev-ml/llvm-ocaml/Manifest
+++ b/dev-ml/llvm-ocaml/Manifest
@@ -1,8 +1,10 @@
 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-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
-EBUILD llvm-ocaml-10.0.0.9999.ebuild 3226 BLAKE2B c541ef2c066ea53dcc91311072147670b9f64e5d9b09b3c4f7ca9086d9526c6427e1332b7e50c17c86bf3172d520cf0845b2debb967ae66144521e332e7a1f6c SHA512 95cf7eb3d0748b09e4d588db19108654bd93e52e0d23278a64707e2cc40ae39e2d7cdd8b0568b9312f24c5cba34e3c119b51ae7e398693b4b64881b2779699f2
-EBUILD llvm-ocaml-11.0.0.9999.ebuild 3226 BLAKE2B c541ef2c066ea53dcc91311072147670b9f64e5d9b09b3c4f7ca9086d9526c6427e1332b7e50c17c86bf3172d520cf0845b2debb967ae66144521e332e7a1f6c SHA512 95cf7eb3d0748b09e4d588db19108654bd93e52e0d23278a64707e2cc40ae39e2d7cdd8b0568b9312f24c5cba34e3c119b51ae7e398693b4b64881b2779699f2
+EBUILD llvm-ocaml-10.0.0.9999.ebuild 3229 BLAKE2B 7f5da96b8e83214245955909fe9155d67a5141eb83dc509b0dbd7235df219cd6f081e92e509b27d6ec6ff6fa1a035fd0ac19c1bbd0264dc25edca4ff13de6e4c SHA512 90e2c67c2d9a49783dbf51d03a34c576e9025ebba4e348cf3ee2068a986c28616464b3108c7ea4add7bc4b1b13f44782a7d13cb1dd775930549eef438127c9e9
+EBUILD llvm-ocaml-10.0.0_rc1.ebuild 3229 BLAKE2B 7f5da96b8e83214245955909fe9155d67a5141eb83dc509b0dbd7235df219cd6f081e92e509b27d6ec6ff6fa1a035fd0ac19c1bbd0264dc25edca4ff13de6e4c SHA512 90e2c67c2d9a49783dbf51d03a34c576e9025ebba4e348cf3ee2068a986c28616464b3108c7ea4add7bc4b1b13f44782a7d13cb1dd775930549eef438127c9e9
+EBUILD llvm-ocaml-11.0.0.9999.ebuild 3229 BLAKE2B 7f5da96b8e83214245955909fe9155d67a5141eb83dc509b0dbd7235df219cd6f081e92e509b27d6ec6ff6fa1a035fd0ac19c1bbd0264dc25edca4ff13de6e4c SHA512 90e2c67c2d9a49783dbf51d03a34c576e9025ebba4e348cf3ee2068a986c28616464b3108c7ea4add7bc4b1b13f44782a7d13cb1dd775930549eef438127c9e9
 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 2928 BLAKE2B 5b0d8dafee22b55ae1fd5d9344ce10d96c3495237ffa6db6f0b429b10c99a85fcd0518942b41fc236b9654f9ae0d8ba7cad36a621c954e1900a5aede54ad8f64 SHA512 cc433c0d765e92cbf13a18b9c07f21e2369711ca98dcc71ae928e8ad49a089866b26a1426855bf555aa50f80d2de4eb4d150700f4851e157dce443c766acad86
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 b9f6124e6f0b..4a532d74722c 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
@@ -12,7 +12,7 @@ LLVM_COMPONENTS=( llvm )
 llvm.org_set_globals
 
 # Keep in sync with sys-devel/llvm
-ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC AVR )
+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[@]}" )
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
new file mode 100644
index 000000000000..4a532d74722c
--- /dev/null
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-10.0.0_rc1.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{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/llvm-ocaml/llvm-ocaml-11.0.0.9999.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-11.0.0.9999.ebuild
index b9f6124e6f0b..4a532d74722c 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
@@ -12,7 +12,7 @@ LLVM_COMPONENTS=( llvm )
 llvm.org_set_globals
 
 # Keep in sync with sys-devel/llvm
-ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC AVR )
+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[@]}" )
diff --git a/dev-ml/ocamlbuild/Manifest b/dev-ml/ocamlbuild/Manifest
index 7c63a210b16e..fbf1026aaca0 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 981 BLAKE2B 9da6fb917332e213c541ccb23f1b08a710a84b34d46c5b4ee82b11a67df40a4100ff7297935fd0f9edcb5827dbeb548689949a91e41031eb1d66a81e356d1391 SHA512 8c7b1a72ce701dde64b685e38fde16d4b115daa1d594bc69719254e82d3df193ca488c77001c15e5f572a9c00d0d915bb73e24d6e345972dda0fd38871740d3e
+EBUILD ocamlbuild-0.10.1.ebuild 982 BLAKE2B 353cf032c8a495f7243c55d6610f16e95edb50e530f1626ab0d6408c19f35a35a9692bb586b9a620e9cf3e5e09e4ca6d4f743cee2b646594e0e5a3ee593ebc7d SHA512 b4fa82e6ba935792609879b1fc9ce89b5b878426d9dcbc9db79c41cb9d357cbb1cedb392c66be17e01b3b496a37ccc33f6a4934eac64d50a47b03e872fc87a75
 EBUILD ocamlbuild-0.11.0.ebuild 1071 BLAKE2B 077f7e85fd47b8a5f96ef32b1bcd1f0360b096f0e8ecea4c3b35a7a542770dfd1870f5c5a9f1a746b6f8824401fe01a4d6149b6630ddaae5faac82f9bf9b48e8 SHA512 0f502336167fedc7ad50523de39291be2d9275c53a7926fcf0f35f026d1fda814b3cda2524674a8fa24f350cda15675cf28707ba34cc3254ee2b8595580fb1fc
 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 f53c07a0797f..62366767e29c 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"
 
 DEPEND=">=dev-lang/ocaml-4.02.3-r1:=[ocamlopt?]"
diff --git a/dev-ml/seq/Manifest b/dev-ml/seq/Manifest
index 6738331d4b2f..3a955345730f 100644
--- a/dev-ml/seq/Manifest
+++ b/dev-ml/seq/Manifest
@@ -1,4 +1,4 @@
 AUX seq-0.1-gentoo.patch 309 BLAKE2B c80895e464359e67350ee3f0a183f3dfde63d718775876acad3905446c62dac229ad173b334020f4b2d51807b37d15e526ea98fd3ce2bf27ee8fe751c77c6d11 SHA512 0f93ed7035bc7138518b99471d64cf6144cfd3d4aeb08445a7fc6b2ae631a96a242a1dceaa5014b6503149ad24a1f048c1f0ea435ff38e8c76452f0bafffe540
 DIST seq-0.1.tar.gz 2452 BLAKE2B 4f673c3909611957fc882c548c8549cbcad1e93101e1968f001609108b89f4cee13b055a7a8e75e9c36d33074863532b7d84461f036d14c468d5baadde411295 SHA512 cf0df428408efd8f593765c419007c3b181c1234fa957bd09bd96bbbbc7950dcd329429a8a22573680fdfd46847e21befae29ade967509690428ba2b90fe83f2
 EBUILD seq-0.1.ebuild 667 BLAKE2B 82238cf733ae1f75e0616f9dcf40522a2a381b37834c22467e51535ef58dc2fd4a2f586ceefd3d3c7826824ba94474b2e4047f36c3cc2e639a22ee87e52c0899 SHA512 30f5b7b5abd99b58c29c519818101f1c3587c9341f3cb093e7b9a5133d43fefa8b4f593dc30436e79c98442c233dac1b42f61c556616d409c72cadeb6538e0dc
-MISC metadata.xml 375 BLAKE2B c6d166cdc6fbcce412dd0f1d78f8d1f54635d25c89e12d762e0f967a85c1a315c4912a58cdf8075c784881dcb507594d73cec30cd09e575877696a17b616d868 SHA512 dc49b250f3706af5b0f3a589bace4bd06c900d6d5f0551ae311090985c4267592a385c007f09423be4a37793e00cbe8275aa1faeee2df7f6858f67260cbd7932
+MISC metadata.xml 247 BLAKE2B ca08677c4c0af66af431abe578122a2ea0278f7ffabab245eec806167a6226c65f97e9826d64fc4b82eb14b6200cd1e3a31a5b4999e18aac41a4f9af43d708d6 SHA512 fff6c25e644477aaa35b838e10c44ca8eae9824ef8f19795e31201db40c10068f0216dec38deb0ba80782155b43fd1d72fb888cb825eaabacc3bd1ec0d18f3ca
diff --git a/dev-ml/seq/metadata.xml b/dev-ml/seq/metadata.xml
index 4b96cb1315b7..d0e866f244f8 100644
--- a/dev-ml/seq/metadata.xml
+++ b/dev-ml/seq/metadata.xml
@@ -5,7 +5,4 @@
 		<email>tupone@gentoo.org</email>
 		<name>Tupone Alfredo</name>
 	</maintainer>
-	<longdescription lang="en">
-		Compatibility package for OCaml's standard iterator type starting from 4.07.
-	</longdescription>
 </pkgmetadata>