gentoo resync : 25.08.2020

24 files changed, 217 insertions, 86 deletions

diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 37213f21e10b..1e7cdff80cd6 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/camlp4/Manifest b/dev-ml/camlp4/Manifest
index a2341aa49466..525b6f28ff44 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 1078 BLAKE2B 742780d182b3d09d7421c5fa2dc538868b4963756b5e9864292504ed252321167ae56e8a321542cbcebcb6116e6c8829571c7eb80ad44c2bbefdac7cce647c5c SHA512 592e02264f8dfc5087e64315dc58f299ab8dc4fa8cc27d4ad5e280ec2d3f4a6b68f61876ba67c46b36f52e1e5941d33080d4db85ac1504be07097e4cd96f7bc9
-EBUILD camlp4-4.05_p1.ebuild 1084 BLAKE2B 53b1f2322e4f05da21c845e6fedd64d6c6ac69e661c2f1339d95c42754b5d62fc73f78a265a8533d6216e10da44758af0f4d84563c08ffc90c805f95a28bae26 SHA512 bb11bdee23134c275382ea4d853ffec94aa8f4dd66d8d19ef0084bfd66acca99ef23bb26318a6739d94425cc90711372b6873982a7db422be7fed448cdf15b78
-EBUILD camlp4-4.08_p1.ebuild 1151 BLAKE2B d166a7f023c2fee5dfc5310faebb087594d891cff633ac0a5b6529935034ccf8447733a4e591c61cd08f33c220b1016cbc6e54890e4ae200d145e445d1adfc5d SHA512 b3f4e287e4f62848f03aef8fb87e4601a4ebe426098fc3ed7752e99411c7a83e521023b942dcbc7a7e7db4477ddda16791671d3b1892eafe4bcf821adcc82f24
-MISC metadata.xml 249 BLAKE2B 45b57687d81fa0ecbd307726eb7c570094d29952c8467b0ffe429870019fd852caa725924d6f2ee457b04a194d61c902f6abf948776fbb812a786e1058a031a2 SHA512 46286ee2dd275a5b7c8f941214c71f89396fd0d012564a368a205381ae2ffd28857245ffcae06b2416d73d071857005f3c7756fbcf546ebe0fadfc90a85db1e6
+EBUILD camlp4-4.04_p1.ebuild 1080 BLAKE2B a82e0f1ef9b7ad40793b6d084e1bade7a161d5cadc60b2813cacff2e85b4334691297bf4583bdbe9de66a3bf5f9704041b32429e7856eb4ce7374fb835a98472 SHA512 d0bb1de5714a47bce471366a3237d07a292a10a7609e6503a154e71c4a58a900ee023e0089241a5f156ee74525eee434f5d6489677ebd58a59a0ec0d769ac306
+EBUILD camlp4-4.05_p1.ebuild 1086 BLAKE2B f35abade6648a491050fdf6167c24d6e95db7236ecf95cce33ece643fd27c8022b132b290d56d41eb4e6a836f9b92c8974bcee6e4db139f8381574ecbbdf8d7b SHA512 87c5d9df79146013a030411b0adbd0524c7ae6984d42ef5f30e007d8c979f82f1870f18659993ae598064ace7f0b1ea27b87e7b7c60426836a8871349e2a6e4a
+EBUILD camlp4-4.08_p1.ebuild 1153 BLAKE2B 2514769dcef713620dc1c153222324993f3c8b8d84506815299671314f997e18eeece1e57029758905b087a91498a66b37451f30542eadd381cfa002d743ac0a SHA512 e1104e89faeba2ce0ca187f55c619a67267aeb5cde0db1ea0b6258848d0597634f4142046253d1250c5e2c2e13a391fbf599ef0e181a5342d4cd2ccd3d9b0ef5
+MISC metadata.xml 250 BLAKE2B 6e80f75f919556451e33d44238de1d3f78f80356deeee40c8ba8ffeae46cd00cf1ffcc9cd5bcc2795f91cd7e2bcdab31dc7cb815a28a48a7b1746cef356395fb SHA512 e4a2f011f87a8a3442fd64fd97e19a6b74f9fc4a5f0da4ad49ac023258461633e6b12fcc8fd68900b57c1ec7db48b29733e264642c6bbe3a8dcc62e51c86a458
diff --git a/dev-ml/camlp4/camlp4-4.04_p1.ebuild b/dev-ml/camlp4/camlp4-4.04_p1.ebuild
index af8352a49da7..bb89a08912a8 100644
--- a/dev-ml/camlp4/camlp4-4.04_p1.ebuild
+++ b/dev-ml/camlp4/camlp4-4.04_p1.ebuild
@@ -7,8 +7,8 @@ MY_PV=${PV/_p/+}
 MY_P=${PN}-${MY_PV}
 
 DESCRIPTION="System for writing extensible parsers for programming languages"
-HOMEPAGE="https://github.com/ocaml/camlp4"
-SRC_URI="https://github.com/ocaml/camlp4/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/camlp4/camlp4"
+SRC_URI="https://github.com/camlp4/camlp4/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2-with-linking-exception"
 SLOT="0/${PV}"
diff --git a/dev-ml/camlp4/camlp4-4.05_p1.ebuild b/dev-ml/camlp4/camlp4-4.05_p1.ebuild
index c7ad55154b10..232dd749ff9a 100644
--- a/dev-ml/camlp4/camlp4-4.05_p1.ebuild
+++ b/dev-ml/camlp4/camlp4-4.05_p1.ebuild
@@ -7,8 +7,8 @@ MY_PV=${PV/_p/+}
 MY_P=${PN}-${MY_PV}
 
 DESCRIPTION="System for writing extensible parsers for programming languages"
-HOMEPAGE="https://github.com/ocaml/camlp4"
-SRC_URI="https://github.com/ocaml/camlp4/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/camlp4/camlp4"
+SRC_URI="https://github.com/camlp4/camlp4/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2-with-linking-exception"
 SLOT="0/${PV}"
diff --git a/dev-ml/camlp4/camlp4-4.08_p1.ebuild b/dev-ml/camlp4/camlp4-4.08_p1.ebuild
index 731b5432fd93..4607c05c4255 100644
--- a/dev-ml/camlp4/camlp4-4.08_p1.ebuild
+++ b/dev-ml/camlp4/camlp4-4.08_p1.ebuild
@@ -7,8 +7,8 @@ MY_PV=${PV/_p/+}
 MY_P=${PN}-${MY_PV}
 
 DESCRIPTION="System for writing extensible parsers for programming languages"
-HOMEPAGE="https://github.com/ocaml/camlp4"
-SRC_URI="https://github.com/ocaml/camlp4/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/camlp4/camlp4"
+SRC_URI="https://github.com/camlp4/camlp4/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2-with-linking-exception"
 SLOT="0/${PV}"
diff --git a/dev-ml/camlp4/metadata.xml b/dev-ml/camlp4/metadata.xml
index 84b75ed6cfb0..33d51779cb3d 100644
--- a/dev-ml/camlp4/metadata.xml
+++ b/dev-ml/camlp4/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
   <!-- maintainer-needed -->
   <upstream>
-    <remote-id type="github">ocaml/camlp4</remote-id>
+    <remote-id type="github">camlp4/camlp4</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ml/camomile/Manifest b/dev-ml/camomile/Manifest
index 049c01f6e4cf..aba3a8f639d1 100644
--- a/dev-ml/camomile/Manifest
+++ b/dev-ml/camomile/Manifest
@@ -1,4 +1,6 @@
-AUX ocaml405.patch 1469 BLAKE2B 06ef619b7dd82b584e192eea1818de0b95e5005a9c5492bd2c8ee4430728a6577b0f125e63ba483d40593f08ec7e885e279bbf815896d1b36d4177910a95f9bf SHA512 b8951a401ee8b4c4e49e4a144c6ea5e0cc3c50ab62c95f34a4766fd46a4a93d9eea13c5d30b00eabaee00d70a3cc82a8251d110e622e00c623c8467867cc95ba
+AUX ocaml-unsafe-string.patch 374 BLAKE2B ad6bb3eb9e34b567809b153e1c20f4fb9f6fd87d72f7d42ef423193a213740fe4805cf4e27ab4e8eebda17d6d768ab4768fc5cfde50c0356ac5c2ed07553d7d0 SHA512 8e8efeccc3568cf28ca5caf4a8f77ec34875202efdf536ed8f9ed6dcd1eb6aeb7f88ab20f3c37afcd9b564cac961b8c5b68753eba127222ad2aab5a08495b574
+AUX ocaml405.patch 1397 BLAKE2B 027d67a10f57c205c46fb443f2e6a8e1fa6790d9452b70bc09f74d26826aa4acbe99b91841db69900146041450ffc5d2aa3850e10ccedce6e8203b3ceed96f2d SHA512 e4b2bbd651c151d4822a72d8cf9d272493df450fbace1c693accec575ac810402fe15a39d7e579b421b4b42723840236e54d5e092e91108a6da8c7a8e5ebfc0e
 DIST camomile-0.8.5.tar.bz2 2607084 BLAKE2B 5e0ff51cdd6d7ce41ee024189a793f3d3e4bec1bd9849e7c01d2722ff22ca2cb5f0d5bd5f95820e741469ebda2996edf3611827535df5fe095d3f6617ecfdd42 SHA512 ef4da32f955e69e0b2958b4b2bf12ae94e210d8aa7cee5a9030607b79ac43a884758549f3164c223fb07d987a4a50b15f0bc5083ff67120270409f7fb9928014
 EBUILD camomile-0.8.5-r1.ebuild 888 BLAKE2B 3b08a60d1798ce21950e2ded5212d28f39792710024e8cb3a2fd882639ae1cff6f1eee635cabe5cafeea018f59ee5e65468597303075a0a0e7f7966a4784ea56 SHA512 8adaa7baea01f24cec23a0ef28efd92a33d910a2b9eb3b3920fe2f180ef397198b9055f4f8880c5dab793295a59238fa13488e8c5f50b0fabfbabda97166f2c6
+EBUILD camomile-0.8.5-r2.ebuild 963 BLAKE2B 34dee01403fb2c0071019d5620c60454f54f03c64eeacc2f5efb1eb0f8175cc8c9ac771fb515e95e0dbdc567f063270d51bcdd00a07b50ea85f9d7a00fb1dc5d SHA512 96f90c0a557f46c81f6006b25765c2a5faea757f4e6ba08a0269accf92334c8b745fb57b1f8aced766bd4c3ff3f76ec77d4b4990198fd0bafeacbce6cf76d7ba
 MISC metadata.xml 254 BLAKE2B 659f90317098f9ca6081145d61e53c8f7848dd0ef86b61b73f1c4c9362495a0704e02dacaaf53533dd92ace5ad0974c39abf0fb9d45dca258f4f58476931d43e SHA512 287ad112c67330f5f9f3c6e534b1d4f46d446c5b0469bddd58f9da886d02a243b8dd215ab36af9e2b1a100186d6f7ac61e988dbe62defc5cd31450ae38c24d40
diff --git a/dev-ml/camomile/camomile-0.8.5-r2.ebuild b/dev-ml/camomile/camomile-0.8.5-r2.ebuild
new file mode 100644
index 000000000000..437035c55c9e
--- /dev/null
+++ b/dev-ml/camomile/camomile-0.8.5-r2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit findlib eutils
+
+DESCRIPTION="Camomile is a comprehensive Unicode library for ocaml"
+HOMEPAGE="https://github.com/yoriyuki/Camomile/wiki"
+SRC_URI="https://github.com/yoriyuki/Camomile/releases/download/rel-${PV}/${P}.tar.bz2"
+
+LICENSE="LGPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug +ocamlopt"
+
+PATCHES=( "${FILESDIR}"/ocaml-unsafe-string.patch )
+
+RDEPEND="
+	>=dev-lang/ocaml-3.10.2:=[ocamlopt?]
+	dev-ml/camlp4:=
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+
+	if has_version '>=dev-lang/ocaml-4.05_beta'; then
+		eapply "${FILESDIR}/ocaml405.patch"
+	fi
+}
+
+src_configure() {
+	econf $(use_enable debug)
+}
+
+src_compile() {
+	emake -j1 byte unidata unimaps charmap_data locale_data
+	if use ocamlopt; then
+		emake -j1 opt
+	fi
+}
+
+src_install() {
+	dodir /usr/bin
+	findlib_src_install DATADIR="${D}/usr/share" BINDIR="${D}/usr/bin"
+}
diff --git a/dev-ml/camomile/files/ocaml-unsafe-string.patch b/dev-ml/camomile/files/ocaml-unsafe-string.patch
new file mode 100644
index 000000000000..49139d61ada4
--- /dev/null
+++ b/dev-ml/camomile/files/ocaml-unsafe-string.patch
@@ -0,0 +1,13 @@
+--- a/Makefile.in  2013-09-15 02:48:38.000000000 -0500
++++ b/Makefile.in      2020-07-03 00:43:13.639039206 -0500
+@@ -48,8 +48,8 @@
+ OCAMLMKLIB = @OCAMLMKLIB@
+
+ # compiler options
+-BOPTIONS = @DEBUG@ @ASSERT@
+-OOPTIONS = @COPTIONS@ @PROFILE@ @ASSERT@
++BOPTIONS =@DEBUG@ @ASSERT@ -unsafe-string
++OOPTIONS =@COPTIONS@ @PROFILE@ @ASSERT@ -unsafe-string
+
+ #
+ PACKAGE = camomile
diff --git a/dev-ml/camomile/files/ocaml405.patch b/dev-ml/camomile/files/ocaml405.patch
index 3fec6955a27c..9648708f669f 100644
--- a/dev-ml/camomile/files/ocaml405.patch
+++ b/dev-ml/camomile/files/ocaml405.patch
@@ -12,10 +12,10 @@ Date:   Fri Feb 24 22:30:23 2017 -0500
     (see MPR#7414, GPR#929). This commit adds enough annotations to avoid
     such underspecified variables in functors.
 
-diff --git a/Camomile/internal/unimap.ml b/Camomile/internal/unimap.ml
+diff --git a/internal/unimap.ml b/internal/unimap.ml
 index b6fdbde..6a7cc30 100644
---- a/Camomile/internal/unimap.ml
-+++ b/Camomile/internal/unimap.ml
+--- a/internal/unimap.ml
++++ b/internal/unimap.ml
 @@ -58,7 +58,7 @@ val of_name : string -> t
  end
  
@@ -25,10 +25,10 @@ index b6fdbde..6a7cc30 100644
  
  type mapping = {no_char : int; tbl : Tbl31.Bytes.t}
  
-diff --git a/Camomile/public/uCharInfo.ml b/Camomile/public/uCharInfo.ml
+diff --git a/public/uCharInfo.ml b/public/uCharInfo.ml
 index 69bf141..6a0337a 100644
---- a/Camomile/public/uCharInfo.ml
-+++ b/Camomile/public/uCharInfo.ml
+--- a/public/uCharInfo.ml
++++ b/public/uCharInfo.ml
 @@ -298,7 +298,7 @@ val load_composition_exclusion_tbl : unit -> UCharTbl.Bool.t
  
  end
diff --git a/dev-ml/cryptokit/Manifest b/dev-ml/cryptokit/Manifest
index 226893a9a7e4..34c1e08cfdc4 100644
--- a/dev-ml/cryptokit/Manifest
+++ b/dev-ml/cryptokit/Manifest
@@ -2,6 +2,6 @@ DIST cryptokit-1.10.tar.gz 152525 BLAKE2B 51c905757ad141292be89707bdab5c83a1f3e9
 DIST cryptokit-1.11.tar.gz 156905 BLAKE2B 3fc77321c0d525a32f5733d77963b5df4e618b3168f2f00aceeb1e13b16cc202e79b50afa93c0769f016b4e43061ff19851c8ba3f40ad7f8f0c9ff78a51d68e7 SHA512 cc641a05a67cd3d2e5ec481e8d426796db625ab60e89f79bde2e360730892c62f30ea2e37c4b028df16471220847e6d7ce4984deb9528fec6647a17fc4ae1b0d
 DIST cryptokit-1.12.tar.gz 157920 BLAKE2B c26d0642f02cf19502bfce043bfb542bfb7a8e80ac2c7dfbecce48b57d44eddd5f279ceec1166fd2e81e1a8446bb52fa748d89a3f7506860fe1c545784087469 SHA512 f99c50578360c7671029a0c4603b355912899596ea7baf55cb2f94e039658646396f1307417a24b3d87a535d272bed90e79d5e027af034c2c742140c44ec61ff
 EBUILD cryptokit-1.10.ebuild 1256 BLAKE2B 1d3100602f1552065099df7b67338c27e9e85f7d06529ff0d18c7d6d2169fea9aae3c025aee34c0353226e8395535c86e592aff7764a9223ee2d40ac176c1096 SHA512 d6696043f757bd9da8966e671c2778fa217274db41c8c9730998ce372f6325ebb3f76cb3df5ea08a354adcf40076b134362f1f88023e14099b98ecaa06a8787f
-EBUILD cryptokit-1.11.ebuild 1310 BLAKE2B 4a992e84096bba7f9c27b028f754e29a5c18356779fd44cd87fb1d6bcde1a8c16ba9eb2c585fbaa743837c3d3e4ab5a892cd7a130aade61d860688741be4b6ec SHA512 60b2c9fa9129f7d513ba5e1145c6a6589dd4727392562e35aab0eee5762bc78424381c7a8b37d56f3f3f1ba4d8707d7dc5f5817a508b6bb8c663890ae1d58ca1
-EBUILD cryptokit-1.12.ebuild 1431 BLAKE2B fc6632bab91c297a677694cc62aa8264fde46a8a4052544e05d627f72370f7301f0190f75754d5187493af08e1cd5534f6fd9505d519097ac4db9f7d9e176527 SHA512 a2041fd7c79c35dda945dc5224ffb9faa5f19f8fd4ccbd165135196d0aa1b5a31b37287b3ad91e7e22ec4f13cfd8bdc71b57c3bf540ff49a409bc149da0dbf85
+EBUILD cryptokit-1.11.ebuild 1306 BLAKE2B 50af70a01746d91da2ba4217b88c14b28bb143518e91226d22e6494ce5ebbb08686ee1795ee55c28031d1fbffc7e78bb6f4392ccd1f4a0ec498f39190ee42490 SHA512 76f47cdb34f01710bc4f7023bfcffd74eb8fcf1c72196d754cc2ddaba7672eba4bcdfb8b0edb201be6616a0c9df0f837568dc746f0a79dabcd91598756cbc56d
+EBUILD cryptokit-1.12.ebuild 1433 BLAKE2B e394baad67784ca2611104cbdbfd7037eaa6c5b18721966378a748e89d8b32f56a2cfadf9cad7e4356d2da377c7d1a643baf08f05bfa63bdb4b58d3a04364e29 SHA512 e0c8187cc0de738c7fefa553c5a33ebdabbee6e2cffa83568d11d674070bae3a9d451b75a0f47211887483113e1cf48211fc070655a63d1d3a1463a0c7190dc7
 MISC metadata.xml 253 BLAKE2B 7f94398024f3ee85392671327ef194e7b5ed3336f25734f286e2bab74d4c7001dae92ed8e1b826de9be0c1176260e08b444ac44c826e52e27e940de57ead2eda SHA512 edd60a11f202c6d04c3b4879adadc8abc252eb61abfbb22043e12298f2f6f3aea53177c2b254cd113bc222dfce32687ebf8cfefd97a35fdf00504c54207ea390
diff --git a/dev-ml/cryptokit/cryptokit-1.11.ebuild b/dev-ml/cryptokit/cryptokit-1.11.ebuild
index 5fe154a01bc7..6e5371e5df0f 100644
--- a/dev-ml/cryptokit/cryptokit-1.11.ebuild
+++ b/dev-ml/cryptokit/cryptokit-1.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -13,7 +13,7 @@ HOMEPAGE="http://forge.ocamlcore.org/projects/cryptokit/"
 SRC_URI="http://forge.ocamlcore.org/frs/download.php/1618/${P}.tar.gz"
 LICENSE="LGPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="zlib"
 
 DEPEND="zlib? ( >=sys-libs/zlib-1.1 )
diff --git a/dev-ml/cryptokit/cryptokit-1.12.ebuild b/dev-ml/cryptokit/cryptokit-1.12.ebuild
index 06c3f50d846f..edc0e8846542 100644
--- a/dev-ml/cryptokit/cryptokit-1.12.ebuild
+++ b/dev-ml/cryptokit/cryptokit-1.12.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"
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/xavierleroy/cryptokit"
 SRC_URI="https://github.com/xavierleroy/cryptokit/archive/release$(replace_all_version_separators '').tar.gz -> ${P}.tar.gz"
 LICENSE="LGPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="zlib"
 
 DEPEND="zlib? ( >=sys-libs/zlib-1.1 )
diff --git a/dev-ml/llvm-ocaml/Manifest b/dev-ml/llvm-ocaml/Manifest
index e0757dd27c3b..9d9210e908c7 100644
--- a/dev-ml/llvm-ocaml/Manifest
+++ b/dev-ml/llvm-ocaml/Manifest
@@ -1,13 +1,13 @@
-DIST llvm-8.0.1.src.tar.xz 30477608 BLAKE2B 4319c837b36111401e3b0f9659b8d875c89463bcc7816df1aefe1e3ff989860bbaa92504718f8e15416cfd9f3491c13777cd5cb661877b237b342b0e515b93f5 SHA512 82e120be5cabdfd5111aebbea68a663fe229c8861d73802d6ab09a3bf48f60de333e07e61f8fb61beaa14ac2bea24fcd74fa6f761acaf62469f536b79fcb1e16
 DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
-DIST llvmorg-10.0.1-rc1.tar.gz 120834583 BLAKE2B 64244ebcb6f2c171c9f606e5eb0adff2794f06c9312a0ca627fb79c107c0c898ac242cf4e92523c3265fa717322601d7e3f4d178515fac95d03ee92312082b06 SHA512 f877f66046969a4055b166ad50ef876a9c8ecaf03e2cdd7c8e1a3348eb5f5180f222fa457b1f090a6660282a0d9f7a1d39cf09a04abe0dde0a6e1e10ccf15597
-DIST llvmorg-10.0.1-rc2.tar.gz 120883192 BLAKE2B d48f4ccb33691cd4997576a6d20b298455687515164f7d8dfa11ec32e197b58132c6bd549c1214c3b36982ef85e1018d4101e7afecee8d2ab67ad15d68c681bf SHA512 8e363d379a73e38ef570fb03d8243a21f37a48ef579a0f08118af4dac48060c0dc24e2bd8175f04241fa424e49b6c85723d2d3552bbe30dd165fe5fb43493325
+DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
+DIST llvmorg-11.0.0-rc1.tar.gz 122688246 BLAKE2B 10ff3f08ff3780abb1d86ac67942e6aac52ff5daf820a2e3d23d8b79dbade1c5b1d398d0a577028d2d7c8759ab9a8b552a0305b5750310a015585c06cdadf844 SHA512 09564ed903902a5795fffaa4679badc30bf49739889a48074b5ae2c93bd29000cfb36a650208d5cae5d74899bade066f84b4aa023fc852eec246ff67bf64a267
+DIST llvmorg-11.0.0-rc2.tar.gz 122728230 BLAKE2B 7944adf41ec7cd82489666a0a38a857de628879d59a2e3bb566b67c18500092430db66ff214d45cb324128c874a74a72c367b452df3b88ec95b33c284dd35512 SHA512 25eb2879eb22e79a1e840ef24cf3f5eec602e947101db299393e06e3d09f2d1531eef214264636e1b511eafff7f51b1834d5a03976ccd088eb680745b147e9f3
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD llvm-ocaml-10.0.0.ebuild 3219 BLAKE2B 8d2ac0dc88b865f723c527315aaabb6bbd75773660b63197c833c72d7915495e494d73144f84a451dec3793d45a2f7f44dc22beb5c60f55dfd88a23bb04aede0 SHA512 fa83b587c1170564e25c040e2809daf6dc13d1718074d22a7093f08e7444d6378dbeb2f5ddc57f681f4a93b14c95275c87027c9e9191757b1fba4c9008464d38
-EBUILD llvm-ocaml-10.0.1.9999.ebuild 2981 BLAKE2B 20e8be985a1a936e0eb43605f200d13e5d0c80d1622acce5289bb6e2558a62c3c68dbc9bc098d0d00546c582cec7d24290e945d73853fcd6183066488269b04b SHA512 d500a27f06f21979477307e42b971a9c098e784396e6964f1ae337c57d8ed2ebc464530c0b857b67b39cdb928e22d16dd46c1ee2a04e3f2d2d4a9da760fd6017
-EBUILD llvm-ocaml-10.0.1_rc1.ebuild 2944 BLAKE2B 90f05263b560f7efd2fa7ee1faa072dc53815c06539fae050d16547ca4d806041e6f4e93762a8faf74cd26a10d66f7da5f96930b6c2dc14d0857a6f329e7857e SHA512 577a51d77a5bac32c2d2f66659ea718b89691f5a0535abde10836aaafae0dddc84d6c328c85af24267a2a908956370dca902eb148e161bfd272318f1054fc73d
-EBUILD llvm-ocaml-10.0.1_rc2.ebuild 2944 BLAKE2B 90f05263b560f7efd2fa7ee1faa072dc53815c06539fae050d16547ca4d806041e6f4e93762a8faf74cd26a10d66f7da5f96930b6c2dc14d0857a6f329e7857e SHA512 577a51d77a5bac32c2d2f66659ea718b89691f5a0535abde10836aaafae0dddc84d6c328c85af24267a2a908956370dca902eb148e161bfd272318f1054fc73d
-EBUILD llvm-ocaml-11.0.0.9999.ebuild 2981 BLAKE2B 57a3eb858bd42118df84f90463f18a99e71f9c5f5c50afbb5e33dc22b9b283aa96eadb71a4a39be0d5b0dba877b77279c1a4b272ee69dde718d73b0026bd6850 SHA512 2316cc30a99d5045a2de69267e962be0cfa7d708ae919252390318504c37e3900cfa14af4887aba462d17d317588283c8f1e4b9887844ab03fcf869d48ebd4d0
-EBUILD llvm-ocaml-8.0.1.ebuild 3064 BLAKE2B 41792ef0b7764c4b7c297a05ee56d4e613cbfbcb2e2157e7b70c8ecbb71aea698079abca2324291f9e0b9565e36509e81ee313bd152bb0c15c74c6b69c5f4dd6 SHA512 042075a171609318603e93320a6080f6b75319b7a6490a85bced7138001d30a72b45a0bf348a0e7c5a80f56c8c7cf3e6f921ed5fea41b62ece3226d00dde49d3
+EBUILD llvm-ocaml-10.0.1.ebuild 2960 BLAKE2B bf67406bf61b50af82f34276f7bfa6abe0bf809656e2addcc51efb7c1be5d4137462c9108239eea5f273a0e68f26c3300b3d2cc3cfe9df0c8555926e481fe231 SHA512 05e79634eb5e5ba38e0b0638a9627b7c8b38dfc7c685eaed8571283ed7791eb5d0ae2f6333cddf9b1f0f19b47e6d0e4c10444a4bc8bcdb69ce7061b25440a1b3
+EBUILD llvm-ocaml-11.0.0.9999.ebuild 2947 BLAKE2B b457ceed658d32cafc3926b32d73b4da03fb1b2b3d26988a95b839c75a97a61e401f1249acd10ba25b380ddac1ffa65b1e07ee97d054940da8d999bbb0fbe915 SHA512 8fb8849eef370b9becb05033c1108b0858dff95cfada75a634c52e558bf551346b69e6cfcd406c4c6a0d2a0660a00d92808c99471ec0b65ff5986f4cf399a630
+EBUILD llvm-ocaml-11.0.0_rc1.ebuild 2947 BLAKE2B b457ceed658d32cafc3926b32d73b4da03fb1b2b3d26988a95b839c75a97a61e401f1249acd10ba25b380ddac1ffa65b1e07ee97d054940da8d999bbb0fbe915 SHA512 8fb8849eef370b9becb05033c1108b0858dff95cfada75a634c52e558bf551346b69e6cfcd406c4c6a0d2a0660a00d92808c99471ec0b65ff5986f4cf399a630
+EBUILD llvm-ocaml-11.0.0_rc2.ebuild 2947 BLAKE2B b457ceed658d32cafc3926b32d73b4da03fb1b2b3d26988a95b839c75a97a61e401f1249acd10ba25b380ddac1ffa65b1e07ee97d054940da8d999bbb0fbe915 SHA512 8fb8849eef370b9becb05033c1108b0858dff95cfada75a634c52e558bf551346b69e6cfcd406c4c6a0d2a0660a00d92808c99471ec0b65ff5986f4cf399a630
+EBUILD llvm-ocaml-12.0.0.9999.ebuild 2947 BLAKE2B b457ceed658d32cafc3926b32d73b4da03fb1b2b3d26988a95b839c75a97a61e401f1249acd10ba25b380ddac1ffa65b1e07ee97d054940da8d999bbb0fbe915 SHA512 8fb8849eef370b9becb05033c1108b0858dff95cfada75a634c52e558bf551346b69e6cfcd406c4c6a0d2a0660a00d92808c99471ec0b65ff5986f4cf399a630
 EBUILD llvm-ocaml-9.0.1.ebuild 2922 BLAKE2B d7ae97c680d9f223a0fbaf2989ee60c4ae2baebf73664c9909485fea6c99f5c4c817ff522bee6175a741a5632687d1d0ea5b7b961587a258ca0737ac419390ac SHA512 dc30f078950d944a5c9d18d8804db82300845564afc05878cc7b157d37ad32259c528b358b9cd12684da3b9885b62e92cc6a32b46b8c4cbf48269839bd4cfa02
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-10.0.1_rc1.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-10.0.1.ebuild
index 7cff2bc42841..f945eb117105 100644
--- a/dev-ml/llvm-ocaml/llvm-ocaml-10.0.1_rc1.ebuild
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-10.0.1.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-11.0.0.9999.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-11.0.0.9999.ebuild
index f10bf23e527d..575154be6047 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,8 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit cmake-utils llvm llvm.org python-any-r1
+PYTHON_COMPAT=( python3_{6..9} )
+inherit cmake llvm llvm.org python-any-r1
 
 DESCRIPTION="OCaml bindings for LLVM"
 HOMEPAGE="https://llvm.org/"
@@ -82,7 +82,7 @@ src_configure() {
 	# 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
+	cmake_src_configure
 
 	local llvm_libdir=$(llvm-config --libdir)
 	# an ugly hack; TODO: figure out a way to pass -L to ocaml...
@@ -98,13 +98,13 @@ src_configure() {
 }
 
 src_compile() {
-	cmake-utils_src_compile ocaml_all
+	cmake_build ocaml_all
 }
 
 src_test() {
 	# respect TMPDIR!
 	local -x LIT_PRESERVES_TMP=1
-	cmake-utils_src_make check-llvm-bindings-ocaml
+	cmake_build check-llvm-bindings-ocaml
 }
 
 src_install() {
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-10.0.1_rc2.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-11.0.0_rc1.ebuild
index 7cff2bc42841..575154be6047 100644
--- a/dev-ml/llvm-ocaml/llvm-ocaml-10.0.1_rc2.ebuild
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-11.0.0_rc1.ebuild
@@ -12,8 +12,8 @@ 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
+ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC VE )
+ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430
 	NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore
 	"${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}" )
 ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-10.0.1.9999.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-11.0.0_rc2.ebuild
index c7b4967353fd..575154be6047 100644
--- a/dev-ml/llvm-ocaml/llvm-ocaml-10.0.1.9999.ebuild
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-11.0.0_rc2.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit cmake-utils llvm llvm.org python-any-r1
+PYTHON_COMPAT=( python3_{6..9} )
+inherit cmake llvm llvm.org python-any-r1
 
 DESCRIPTION="OCaml bindings for LLVM"
 HOMEPAGE="https://llvm.org/"
@@ -12,8 +12,8 @@ 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
+ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC VE )
+ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430
 	NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore
 	"${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}" )
 ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
@@ -82,7 +82,7 @@ src_configure() {
 	# 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
+	cmake_src_configure
 
 	local llvm_libdir=$(llvm-config --libdir)
 	# an ugly hack; TODO: figure out a way to pass -L to ocaml...
@@ -98,13 +98,13 @@ src_configure() {
 }
 
 src_compile() {
-	cmake-utils_src_compile ocaml_all
+	cmake_build ocaml_all
 }
 
 src_test() {
 	# respect TMPDIR!
 	local -x LIT_PRESERVES_TMP=1
-	cmake-utils_src_make check-llvm-bindings-ocaml
+	cmake_build check-llvm-bindings-ocaml
 }
 
 src_install() {
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-8.0.1.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-12.0.0.9999.ebuild
index 7781bf0cb527..575154be6047 100644
--- a/dev-ml/llvm-ocaml/llvm-ocaml-8.0.1.ebuild
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-12.0.0.9999.ebuild
@@ -1,30 +1,29 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-# (needed due to CMAKE_BUILD_TYPE != Gentoo)
-CMAKE_MIN_VERSION=3.7.0-r1
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{6..9} )
+inherit cmake llvm llvm.org python-any-r1
 
-inherit cmake-utils llvm multiprocessing python-any-r1
-
-MY_P=llvm-${PV/_/}.src
 DESCRIPTION="OCaml bindings for LLVM"
 HOMEPAGE="https://llvm.org/"
-SRC_URI="https://github.com/llvm/llvm-project/releases/download/llvmorg-${PV}/${MY_P}.tar.xz"
+LLVM_COMPONENTS=( llvm )
+llvm.org_set_globals
 
 # Keep in sync with sys-devel/llvm
-ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
-	NVPTX PowerPC Sparc SystemZ WebAssembly X86 XCore )
+ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC VE )
+ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430
+	NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore
+	"${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}" )
 ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
 LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
 
-LICENSE="UoI-NCSA"
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS=""
 IUSE="debug test ${ALL_LLVM_TARGETS[*]}"
+REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -32,46 +31,38 @@ RDEPEND="
 	dev-ml/ocaml-ctypes:=
 	~sys-devel/llvm-${PV}:=[${LLVM_TARGET_USEDEPS// /,},debug?]
 	!sys-devel/llvm[ocaml(-)]"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	dev-lang/perl
 	dev-ml/findlib
 	test? ( dev-ml/ounit )
 	${PYTHON_DEPS}"
 
-REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )"
-
-S=${WORKDIR}/${MY_P}
-
-# 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=ON
+		-DBUILD_SHARED_LIBS=OFF
+		-DLLVM_BUILD_LLVM_DYLIB=ON
+		-DLLVM_LINK_LLVM_DYLIB=ON
 		-DLLVM_OCAML_OUT_OF_TREE=ON
-		-DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
+
+		# 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
@@ -85,13 +76,13 @@ src_configure() {
 	)
 
 	use test && mycmakeargs+=(
-		-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
 	)
 
 	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
 	# also: custom rules for OCaml do not work for CPPFLAGS
 	use debug || local -x CFLAGS="${CFLAGS} -DNDEBUG"
-	cmake-utils_src_configure
+	cmake_src_configure
 
 	local llvm_libdir=$(llvm-config --libdir)
 	# an ugly hack; TODO: figure out a way to pass -L to ocaml...
@@ -107,13 +98,13 @@ src_configure() {
 }
 
 src_compile() {
-	cmake-utils_src_compile ocaml_all
+	cmake_build ocaml_all
 }
 
 src_test() {
 	# respect TMPDIR!
 	local -x LIT_PRESERVES_TMP=1
-	cmake-utils_src_make check-llvm-bindings-ocaml
+	cmake_build check-llvm-bindings-ocaml
 }
 
 src_install() {
diff --git a/dev-ml/ocaml-gettext/Manifest b/dev-ml/ocaml-gettext/Manifest
index 56f1984707fd..212f0d3fb89f 100644
--- a/dev-ml/ocaml-gettext/Manifest
+++ b/dev-ml/ocaml-gettext/Manifest
@@ -1,6 +1,8 @@
 AUX oc43.patch 773 BLAKE2B 8b5d3892c5cc050000a6c2512a84e890871df90d93c62f952d68309949776a6cd17dc1a38b0bdab6c4698c22198a4fcc98f595efbc28e37e3620c71d1c5297fa SHA512 99d2a01f3a7db768d5832e6527adc77e4272675b1027c96972171e5da71b29654ddf06a91b0882f957419aa19a651da92ba7b1eef5e0cde9542f812ed386cf4a
+AUX ocaml-unsafe-string.patch 599 BLAKE2B 22e49acb160c01cfc9eed25bfbfbf45b281ca049c77801a81c2d4a5191c50eea5650a2db2f34df1bd49169fa2bd49dbf957fee57e3fe181ef6c37252df04d693 SHA512 78ba4efdfb0e681c4ab77af7d957de7e56a67cd97557db991ab62ec857f8fa19d374c979b4773d2a9e146db5942ce124c1603aefab065c503ddded38eef9f6b7
 DIST ocaml-gettext-0.3.5.tar.gz 165238 BLAKE2B 3da80a80cf3e722dc2a765e005bff0e7613967a5810d13c9d3c0a5b70a919b092627d398dc777775dd2b51dfc7bbe12040b844c609027b4c60cb5d23eda47198 SHA512 a60d51c09dad3076415ef24a9bb3121f84ad649d7a9fa1b9a7da719dd385e4ed7cd9ffbabefbade7ea0daf7b0a5a5eb71b1d0ed21b369914b49f66d0d918c446
 DIST ocaml-gettext-0.3.7.tar.gz 134316 BLAKE2B 9de6ef9e04afbb6001ddc5ef145a687ad88a20eef1c27d3a3e6136f81ad46100cc6496cb66e3edfbf0f7eacfa8abbccb44d846d2f676862c96b8ceb860d8f424 SHA512 1358320359b9d2f3fd97a47d69b2a619942a65605c1e5cbf25e33ef42a10273167b526bca15e6c9523b87d8ea9dfd3215334050ad8eb84a8c41d4feef880a27a
 EBUILD ocaml-gettext-0.3.5-r1.ebuild 1232 BLAKE2B dc4ce36eda01887a0a0c2bf578145927fd05d595ce0c9abb88ae13da5db6f77186d6a9dc468b4e82696bb43c59e9309145e403be28dcc17b703d378b86875968 SHA512 3e196fb9d695413a7e2c4e7715fa575e87d40b7a54811b1583fd8f7dcdae5df90c76394eb76a5d8f514d32cd49c9025fb2dcf091fff79cd5cf0dac88a796c68f
+EBUILD ocaml-gettext-0.3.7-r1.ebuild 1261 BLAKE2B cfecfc4af8590c4192c91ed4c0018358b4056d6d3e5fd453c3f5b777d7b8e93a0f7e7724dc96b9471e2024a97510612ddcde19fcbde035aee7198fcbca595c91 SHA512 bd22e47e7a27b0b129378367b533dbd85428b153827ad29d36a618d49d3d701a8ae931cf2fa4241be93a43fa92ddb2c83afce5c3cc598b6b5a90ddaca9f2034d
 EBUILD ocaml-gettext-0.3.7.ebuild 1194 BLAKE2B 589c2f26e5752fe7267cfe2a2b327c55e98fc06240c828d4964c0f5fbefabe91b62f76622e3e84c3ef94ef430054df2a5efc2d80e068a0b7503def0adefccc23 SHA512 f0ad1b9ea7c1a2d320eb6ced4cb67638155f7f14234a3d946c2a6eaa5ba832d84fa1e6a2d525dcf36bfc938204dbb571ba25775e21c7fe77093aba10f06a2bbd
 MISC metadata.xml 255 BLAKE2B 9f20991c7f1da432327bc91492493455f3a029b147991795fe5e5eca1842a70342e85957766de7c6781a64f2fef770d1c8fcee6da23d87df6c5aed04cad21fbd SHA512 fbc3e6b159b378b12c4ba12e0dcf1dcf86aba2029af9959c244a9da1b4264dda7a1ff8c18655400b966bba88fcf26ba04ee371ede500e0c0c6bfc45350e954d5
diff --git a/dev-ml/ocaml-gettext/files/ocaml-unsafe-string.patch b/dev-ml/ocaml-gettext/files/ocaml-unsafe-string.patch
new file mode 100644
index 000000000000..8d0a12c80d0e
--- /dev/null
+++ b/dev-ml/ocaml-gettext/files/ocaml-unsafe-string.patch
@@ -0,0 +1,17 @@
+diff --git a/ConfMakefile.in b/ConfMakefile.in
+index 5a1e9ea..b562698 100644
+--- a/ConfMakefile.in
++++ b/ConfMakefile.in
+@@ -37,9 +37,9 @@ OCAMLLIB=@OCAMLLIB@
+ OCAMLFIND_COMMANDS = "ocamlc=@OCAMLC@ \
+ 	ocamlopt=@OCAMLOPT@ \
+ 	ocamldep=@OCAMLDEP@"
+-OCAMLC       = @OCAMLFIND@ ocamlc 
+-OCAMLOPT     = @OCAMLFIND@ ocamlopt
+-OCAMLDEP     = @OCAMLFIND@ ocamldep
++OCAMLC       = @OCAMLFIND@ ocamlc -unsafe-string 
++OCAMLOPT     = @OCAMLFIND@ ocamlopt -unsafe-string
++OCAMLDEP     = @OCAMLFIND@ ocamldep -unsafe-string
+ OCAMLBEST    = @OCAMLBEST@
+ OCAMLVERSION = @OCAMLVERSION@
+ OCAMLFIND    = @OCAMLFIND@
diff --git a/dev-ml/ocaml-gettext/ocaml-gettext-0.3.7-r1.ebuild b/dev-ml/ocaml-gettext/ocaml-gettext-0.3.7-r1.ebuild
new file mode 100644
index 000000000000..c4643c7c33ae
--- /dev/null
+++ b/dev-ml/ocaml-gettext/ocaml-gettext-0.3.7-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit findlib eutils autotools
+
+DESCRIPTION="Provides support for internationalization of OCaml program"
+HOMEPAGE="https://github.com/gildor478/ocaml-gettext"
+SRC_URI="https://github.com/gildor478/ocaml-gettext/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+PATCHES=( "${FILESDIR}"/ocaml-unsafe-string.patch )
+
+RDEPEND=">=dev-lang/ocaml-3.12.1:=
+	>=dev-ml/ocaml-fileutils-0.4.0:=
+	>=dev-ml/camomile-0.8.3:=
+	sys-devel/gettext
+	dev-ml/camlp4:=
+"
+DEPEND="${RDEPEND}
+	doc? (
+		app-text/docbook-xsl-stylesheets
+		dev-libs/libxslt
+	)
+	test? ( dev-ml/ounit )
+"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--with-docbook-stylesheet="${EPREFIX}/usr/share/sgml/docbook/xsl-stylesheets/" \
+		$(use_enable doc) \
+		$(use_enable test)
+}
+
+src_compile() {
+	emake -j1
+}
+
+src_install() {
+	findlib_src_preinst
+	emake -j1 DESTDIR="${D}" \
+		BINDIR="${ED}/usr/bin" \
+		PODIR="${ED}/usr/share/locale/" \
+		DOCDIR="${ED}/usr/share/doc/${PF}" \
+		MANDIR="${ED}/usr/share/man" \
+		install
+	dodoc CHANGELOG README THANKS TODO
+}
diff --git a/dev-ml/ocamlbuild/Manifest b/dev-ml/ocamlbuild/Manifest
index fc9a15ea96b2..a8a0883de7a7 100644
--- a/dev-ml/ocamlbuild/Manifest
+++ b/dev-ml/ocamlbuild/Manifest
@@ -3,5 +3,5 @@ DIST ocamlbuild-0.11.0.tar.gz 195297 BLAKE2B 2d653c402edf58035fa6efb65c99c956fe7
 DIST ocamlbuild-0.14.0.tar.gz 198267 BLAKE2B 355d61ba68e61b9ee18a9fc0fbb9062405f44707b180ca7ad4bfec727ca3d3d2cc08f17be118ca3a4161c7789d975e7f431812e9139d4fde85a1a27ab68c8ac3 SHA512 ae60247396399dfd35644c8c1986ef7679e5a9964df82e3388bfc6dd4c5b88a13d6869a698d14a9ac70dc48e4ce1c003f543c85426d8c862ca31dea37a554b07
 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
+EBUILD ocamlbuild-0.14.0.ebuild 1068 BLAKE2B f40fc6a22f2f331b459acf31eda285532339d23f1e5bf49b59bd6d77db157a82d0c71251e7ca8c5475bea7844534959fca5a5a1063714d8ebf4ee0efd91389cb SHA512 a13864a59e50a74b8f06d9c749e941ebc0c20494f06324efdf3bfa6d8030811bc30f81ef79204ab6f44c8a1d87cfebbc7baa3b11001b6a3dc9319f0ac9854110
 MISC metadata.xml 248 BLAKE2B 0baa26cc2d6bf97034a28a0eaf70c71c088f133beb6d0c23414d2cc0c6f6b80cafc427e4e3336dde77669340cd71555fe7564011250045ef038abc19508bbd3d SHA512 dee41e91c23031fba453a79a56e048558d85197d7661b773b2c966c49a381d4539c7639bd1c94726de936b16a233b92424548da67859c9fcf9884348bb48d326
diff --git a/dev-ml/ocamlbuild/ocamlbuild-0.14.0.ebuild b/dev-ml/ocamlbuild/ocamlbuild-0.14.0.ebuild
index 4556ac43c4db..9589db20dd0f 100644
--- a/dev-ml/ocamlbuild/ocamlbuild-0.14.0.ebuild
+++ b/dev-ml/ocamlbuild/ocamlbuild-0.14.0.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
@@ -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 ~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 test"
 RESTRICT="!test? ( test )"