gentoo resync : 29.06.2020

15 files changed, 118 insertions, 58 deletions

diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 102cb4e1404b..e2a202697e78 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/lablgtk/Manifest b/dev-ml/lablgtk/Manifest
index 999bb389c3ea..9c2d4396c95d 100644
--- a/dev-ml/lablgtk/Manifest
+++ b/dev-ml/lablgtk/Manifest
@@ -2,7 +2,7 @@ AUX lablgtk-2.18.10-cflags.patch 2852 BLAKE2B 9460dc7e50572f006eca3858b485d99b39
 DIST lablgtk-2.18.10.tar.gz 1068504 BLAKE2B 8f82cd8b31c136420bfbbeaf78ec2d7913b7c5fc16abd485c508f8de3ab587173b0b5c798cdbe851254b48754929c1f0063cfc9e3c5e0663b7cdebc380ec0e8a SHA512 73705aaa80db433d11a28df5f6f5d10bd282e477e90916152a87e71865ccfcd7dfbdbe77350ecadf61ba2ccc7a188de1c68f1e6385e20c75f167969001e8418d
 DIST lablgtk-2.18.5.tar.gz 808005 BLAKE2B 279fd9f018948438b616a12ab60fca3019330504a79d8b76c58fa0a99a7b36df9bf78f57f0e60c4eea6f0bad60f94c06b26490518ec25a5a72c342e4b7c42501 SHA512 7b6ba1a4dfa82cc3bbc502082ff4fccc23cc06ee4f30d01a2e423f3f99e945a4befe450d230b5aa19c5b810e9f46f2838655099d49da2db7c8a2e52eac213024
 DIST lablgtk-2.18.8.tar.gz 855263 BLAKE2B 92aeadcfac666756e50ea573c7a2119cc13eab5c2f2e033fcdf92d5c33d597d64bf2e860ff181d958b4d8e9a3d4002b3eaabbd1da7580444fee91dafaba26289 SHA512 1510b8886dd55b82fbc96f333d84779f51a4794d13b0934569d13b1975ded9ec684855b9856f636fb302fd8ff2f118d0d5f3ffb2b8086d22cdad442e963868ae
-EBUILD lablgtk-2.18.10.ebuild 1968 BLAKE2B 3b337ec377bf85ca60cb18197b5d702f3942056e45dd3ed5d8ea4b6dda727b4418fb5e6a759235955b8b31f86aab39cbac72705a9366a428bec1c281d4e9e50c SHA512 fcc1dd98df79f3416e0641a3a4f8cda052172822802fd41461dc6701c1e83f6a6b56ef289676c6fe41df2eb99667cf462ab10ba04cb1be3e761f064ae54c1c23
+EBUILD lablgtk-2.18.10.ebuild 1967 BLAKE2B 3676617c6432f73e7963e17d237dc0bfb1777f39837d9d8b9e2e6c0ad15325ed71d752c56ca3190b0b83c23012b41acd8b09c12837311835e9b8b105213f0135 SHA512 9efee6210973f352c5a2a9ac58a0ace0b550b6c6149bae88245b076716ffe1eb01f81ae907984058ebe16ae0059865127f7ef820c0c91a7fd5d4c28452330d0a
 EBUILD lablgtk-2.18.5.ebuild 2327 BLAKE2B debd856df94beb8f43f803b38f3a07c9b30e2636152be3af9e39defb3a78551c08e748e2096c4014ee22046a7cb121650271caee10ed6db7119bb140b5db7300 SHA512 e2b0225484f28971d02c02dde960095a60a0ef2db2b25263ad678a3f7a33473bdeafd96e100d671a11da5fe331d0c69f092fc23d64ffcf07e0d1d2ddfe60b268
 EBUILD lablgtk-2.18.8-r1.ebuild 1717 BLAKE2B 0f951f152a005cbe10ba78e829215087f3d32f27fcddba88af0ab943f23e30d053f3fbd364900f689aacce7896800a31731c87489109b6612b1eacb8fe802036 SHA512 db05d897d25054b497a16a531e7d13fb19de2e5f74aa3faf162cfc2d960e61b106511bec89a332586cc96633a1a92820bf9c03da91edbe0b7073424335177c32
 MISC metadata.xml 463 BLAKE2B 79b09024eeae81c18bf584e6341773512c569e348cea23294fd1354bbc6f5ac4da24ffa2a00cf89c44fe7b3af4b8214d6c53f2b36e7c2aca0fedbe2a7d944c97 SHA512 c4dc8d0ea137fa1d8694702fec3dc42eec83967f061c72097b77032ccfe8e6f47450d7a7486647acdf0387ac3d2cf8c028b772d71943d402bec5a7bd976a0ce1
diff --git a/dev-ml/lablgtk/lablgtk-2.18.10.ebuild b/dev-ml/lablgtk/lablgtk-2.18.10.ebuild
index 780d515a5e01..4fcf676df352 100644
--- a/dev-ml/lablgtk/lablgtk-2.18.10.ebuild
+++ b/dev-ml/lablgtk/lablgtk-2.18.10.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/garrigue/lablgtk/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="LGPL-2.1-with-linking-exception examples? ( lablgtk-examples )"
 SLOT="2/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="debug examples glade gnomecanvas +ocamlopt sourceview spell svg"
 
 DEPEND=">=dev-lang/ocaml-4.05:=[ocamlopt?]
diff --git a/dev-ml/llvm-ocaml/Manifest b/dev-ml/llvm-ocaml/Manifest
index 165725d33958..c9020c6afefb 100644
--- a/dev-ml/llvm-ocaml/Manifest
+++ b/dev-ml/llvm-ocaml/Manifest
@@ -3,9 +3,9 @@ DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff21988870
 DIST llvmorg-10.0.1-rc1.tar.gz 120834583 BLAKE2B 64244ebcb6f2c171c9f606e5eb0adff2794f06c9312a0ca627fb79c107c0c898ac242cf4e92523c3265fa717322601d7e3f4d178515fac95d03ee92312082b06 SHA512 f877f66046969a4055b166ad50ef876a9c8ecaf03e2cdd7c8e1a3348eb5f5180f222fa457b1f090a6660282a0d9f7a1d39cf09a04abe0dde0a6e1e10ccf15597
 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 3288 BLAKE2B 7d5b7a5dd2c3a78eb9a5e57ce60bd4c1149d34c4b7c348c535a0999c04aa713df12710cd30dca54f0d76218e92c0e1e490bae7e662613c231f7600e88688dee7 SHA512 3d5c358dcbb34f39894a2c19d0ecd235b47dd8476e2699cce199f7517ef1ed12c06f881ac18a51f7f658c6b131c77fca16bd92fbc1cd604520c8a2cf653426a2
-EBUILD llvm-ocaml-10.0.1_rc1.ebuild 3245 BLAKE2B d97a0aec60d364da29f24529fb3f759c1a58539b7462d225849c4ef69de37b6a0f0043bdcb0cb1244505b202484116430c9f25c054b6c68be2637c9537a91547 SHA512 a68284736cd4b2f418cf19a3eef30f78bead858bd449da510e6b523b96365f42de2997abc27ffa6487398374e95be49465557cf779fd9603faaebba3d8d027e9
-EBUILD llvm-ocaml-11.0.0.9999.ebuild 3288 BLAKE2B ce014ec9c876645defb9484f374579aa69767cfbab0dc2ac96729ff91cde86be7090c3aa8fc58b9907aea0fff835c1141021e21c74cdd254893c3c9b0ebe522f SHA512 0593a39a81f0528bd6cc4a57d6c46c163c06cc19aa33915bccaa21ae17f5f3e33b26d7c9f8219e539246facc87f00da9ec561df13bc468acd6405b89b4aaf001
+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-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-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.9999.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-10.0.1.9999.ebuild
index c87d9f13cf31..c7b4967353fd 100644
--- a/dev-ml/llvm-ocaml/llvm-ocaml-10.0.1.9999.ebuild
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-10.0.1.9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8} )
-inherit cmake-utils llvm llvm.org multiprocessing python-any-r1
+inherit cmake-utils llvm llvm.org python-any-r1
 
 DESCRIPTION="OCaml bindings for LLVM"
 HOMEPAGE="https://llvm.org/"
@@ -38,24 +38,11 @@ BDEPEND="
 	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 eclasses suck by forcing ${S} here
-	CMAKE_USE_DIR=${S} \
-	S=${WORKDIR} \
-	cmake-utils_src_prepare
-}
-
 src_configure() {
 	local libdir=$(get_libdir)
 	local mycmakeargs=(
@@ -89,7 +76,7 @@ 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
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-10.0.1_rc1.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-10.0.1_rc1.ebuild
index ff77167a7661..7cff2bc42841 100644
--- a/dev-ml/llvm-ocaml/llvm-ocaml-10.0.1_rc1.ebuild
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-10.0.1_rc1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6..9} )
-inherit cmake llvm llvm.org multiprocessing python-any-r1
+inherit cmake llvm llvm.org python-any-r1
 
 DESCRIPTION="OCaml bindings for LLVM"
 HOMEPAGE="https://llvm.org/"
@@ -38,24 +38,11 @@ BDEPEND="
 	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 eclasses suck by forcing ${S} here
-	CMAKE_USE_DIR=${S} \
-	S=${WORKDIR} \
-	cmake_src_prepare
-}
-
 src_configure() {
 	local libdir=$(get_libdir)
 	local mycmakeargs=(
@@ -89,7 +76,7 @@ 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
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 5a10d4d1de5c..f10bf23e527d 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
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8} )
-inherit cmake-utils llvm llvm.org multiprocessing python-any-r1
+inherit cmake-utils llvm llvm.org python-any-r1
 
 DESCRIPTION="OCaml bindings for LLVM"
 HOMEPAGE="https://llvm.org/"
@@ -38,24 +38,11 @@ BDEPEND="
 	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 eclasses suck by forcing ${S} here
-	CMAKE_USE_DIR=${S} \
-	S=${WORKDIR} \
-	cmake-utils_src_prepare
-}
-
 src_configure() {
 	local libdir=$(get_libdir)
 	local mycmakeargs=(
@@ -89,7 +76,7 @@ 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
diff --git a/dev-ml/ocaml-fileutils/Manifest b/dev-ml/ocaml-fileutils/Manifest
index 76c9e9016179..c5c40c464143 100644
--- a/dev-ml/ocaml-fileutils/Manifest
+++ b/dev-ml/ocaml-fileutils/Manifest
@@ -1,5 +1,7 @@
 DIST ocaml-fileutils-0.5.1.tar.gz 129639 BLAKE2B 12f4b33eb70caf3a106e87a484411f31d6924aae68c964350080698b723b39c7bae236d5a732a0546cd6a52b4215c9ddf2b46da613c171a1ef384ef5eee3d5fe SHA512 e2f60d16d9c25f43ea6bf5fcdf5810ae1722ef30a37e9ffcb6302a87bf3aa89777f3e3d43860258fb7c284861df1eafb4e5e2b6bd3f8d78d347ef8d139e460e8
 DIST ocaml-fileutils-0.5.2.tar.gz 129676 BLAKE2B 2534c28d134b297cf9f7838c6f33f6fe4a7fde6875cf7ae15990b1d2c2fd53be425ce8b37b6836642b26722fa0042f741e91d1c32211a2618e5f80345b6c63cb SHA512 264282c54ff693686ca9e60f371038f8ea9bce219d04556297dc7b6028c9f65c5a03b7cd263c3519cb212e29665200db1c95c88874bb2cb3d7b610e3b832018d
-EBUILD ocaml-fileutils-0.5.1.ebuild 597 BLAKE2B a2ff461f89767542ac3b0a26f3bd5136e81b4073dee298bb69ed55eac666850a4da224778f3ecefa769b253356ebfae2048af112f2ed85c88265306ba81e5747 SHA512 720b4de52aeeab6f1cd74ed4109b7844b4a458ac4169f7e0787de4d463e441049eea325cbb14354cead0a5b32fff653f14fddb43ac7bccedf805d4b0dfa27253
-EBUILD ocaml-fileutils-0.5.2.ebuild 597 BLAKE2B 15afd6b65d77f0589ad5e61b6f4f3495c4ce460b68b3fb9261234fbc9dfa1bb2bcf523881ca075800ee2ba7dcd5b0f6097a32ca34279d474d6db2ded6f682a7b SHA512 7f0709bea28f184905380f2f10f4e2693805fc30f3fe004a7d44c29614e294dba8da2e11cfc7c1fc5c2f949cdff5f2107229c9707630d51bd5362278ab852681
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+DIST ocaml-fileutils-0.6.2.tar.bz2 43060 BLAKE2B 20828875a25b1a9d2a41bf495cda00b0ac753efa20111b32a9d2ca439a56e9f07bf0953d16ee9148cf065e204fa1d8d624eaa89f6f4ae7e1613fdaa7cb44fc24 SHA512 104c7389832f22ec189ce6f1596144b28dcaeea7d23d5b19d369c44e54326e97fcb7b4f4c4a8d2965523e63b35b594a1351b7e630dde590871efe512fe38853c
+EBUILD ocaml-fileutils-0.5.1.ebuild 657 BLAKE2B 28f86d8927fa4834cdba0f3fca82e24d13d955dc6981010df27adaf20e92557217aa948f95a7c8b88b23602ea937d3f7122f9ad86ad04f781aa8484fdac86777 SHA512 31e36c96107f42ffe22818e45dd370fcbc18e966634aa120cd65698dd1a4e9b099f207477532a44d973142a7feb39078c1b43479561d3768c4971686faf433c4
+EBUILD ocaml-fileutils-0.5.2.ebuild 657 BLAKE2B f20ed4dce9dbd67e30f42c9e16941fbb6f540480f08402332074e95e5ecf9cc8f87f55d7effafe9fadc4856cd82bb4540a6e44e1998a226672aba712eafdb948 SHA512 9af55239baec33eaa231aea5d70cc4a9ac9bf5154c97ac40df43c80875550f18aa0b62600bdfdf4380e11c6afc85f9f985c2c24f20189430f76e34f257e9ca88
+EBUILD ocaml-fileutils-0.6.2.ebuild 649 BLAKE2B b3203abdd1edf69d46658ee97b4f52228d872d244c2c077b62f0875a3386e7c962ff444e5fafbcbc092d70ca05040eda5add67bc4417a2ed2678809894247a16 SHA512 a5d04dd27e325283a3513d73ca112989c81004209d06a3dd68b6f374ae7c136db315dbf17496660d94a2adcc4fd0373d2652f8b4b41330d277ee0bc9fd56db8a
+MISC metadata.xml 799 BLAKE2B 412e5e86cf787c2a3a63eff243337e4f8e54abee3d8cf0491e90c4e2e0cbdd2e5c4d452ec87b63cc0ad8d23286283eb1f17b295c422100cf412fa74ce99318d3 SHA512 c22647ffa2dba7aac8d3f401e6124e0acdc02526fb53ea35995ccd22984715a09d6b558097b9385c1c2fc31ca75a20864e22b0fd9ea9a6113620b31bdde7a691
diff --git a/dev-ml/ocaml-fileutils/metadata.xml b/dev-ml/ocaml-fileutils/metadata.xml
index 6f49eba8f496..cae1d28b2b3b 100644
--- a/dev-ml/ocaml-fileutils/metadata.xml
+++ b/dev-ml/ocaml-fileutils/metadata.xml
@@ -1,5 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+  <longdescription>
+    POSIX-like file manipulation functions inspired by
+    GNU coreutils and filename manipulation functions
+    for OCaml.
+  </longdescription>
+  <maintainer type="person">
+    <email>rkitover@gmail.com</email>
+    <name>Rafael Kitover</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">gildor478/ocaml-fileutils</remote-id>
+  </upstream>
+  <use>
+    <flag name="ocamlopt">
+      Whether the OCaml native code compiler is used. Must be set globally and
+      match dev-lang/ocaml.
+    </flag>
+  </use>
 </pkgmetadata>
diff --git a/dev-ml/ocaml-fileutils/ocaml-fileutils-0.5.1.ebuild b/dev-ml/ocaml-fileutils/ocaml-fileutils-0.5.1.ebuild
index 9e105e66a76c..6b5395fafe13 100644
--- a/dev-ml/ocaml-fileutils/ocaml-fileutils-0.5.1.ebuild
+++ b/dev-ml/ocaml-fileutils/ocaml-fileutils-0.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -18,7 +18,10 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=""
-DEPEND="${RDEPEND}
+
+# Does not build on 4.09+.
+DEPEND="<dev-lang/ocaml-4.09:=[ocamlopt?]
+	${RDEPEND}
 	>=dev-ml/ounit-2.0.0"
 
 DOCS=( "AUTHORS.txt" "README.txt" "CHANGELOG.txt" "TODO.txt" )
diff --git a/dev-ml/ocaml-fileutils/ocaml-fileutils-0.5.2.ebuild b/dev-ml/ocaml-fileutils/ocaml-fileutils-0.5.2.ebuild
index 40d4d20f42d6..d0082d821707 100644
--- a/dev-ml/ocaml-fileutils/ocaml-fileutils-0.5.2.ebuild
+++ b/dev-ml/ocaml-fileutils/ocaml-fileutils-0.5.2.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
@@ -18,7 +18,10 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=""
-DEPEND="${RDEPEND}
+
+# Does not build on 4.09+.
+DEPEND="<dev-lang/ocaml-4.09:=[ocamlopt?]
+	${RDEPEND}
 	>=dev-ml/ounit-2.0.0"
 
 DOCS=( "AUTHORS.txt" "README.txt" "CHANGELOG.txt" "TODO.txt" )
diff --git a/dev-ml/ocaml-fileutils/ocaml-fileutils-0.6.2.ebuild b/dev-ml/ocaml-fileutils/ocaml-fileutils-0.6.2.ebuild
new file mode 100644
index 000000000000..1b299b6fd39d
--- /dev/null
+++ b/dev-ml/ocaml-fileutils/ocaml-fileutils-0.6.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DUNE_PKG_NAME="fileutils"
+
+inherit dune
+
+DESCRIPTION="Pure OCaml functions to manipulate real file (POSIX like) and filename"
+HOMEPAGE="https://github.com/gildor478/ocaml-fileutils"
+SRC_URI="https://github.com/gildor478/${PN}/releases/download/v${PV}/${DUNE_PKG_NAME}-v${PV}.tbz -> ${P}.tar.bz2"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ocamlopt"
+
+DEPEND=">=dev-ml/ounit-2.0.0
+	>=dev-ml/stdlib-shims-0.2.0"
+
+DOCS=( "README.md" "CHANGES.md" "LICENSE.txt" )
+
+S="${WORKDIR}/${DUNE_PKG_NAME}-v${PV}"
diff --git a/dev-ml/stdlib-shims/Manifest b/dev-ml/stdlib-shims/Manifest
new file mode 100644
index 000000000000..b81d2785c01f
--- /dev/null
+++ b/dev-ml/stdlib-shims/Manifest
@@ -0,0 +1,3 @@
+DIST stdlib-shims-0.2.0.tbz 15980 BLAKE2B 4d83b8642a4bccc9f090c0a2f23a4d2f16bbf2ec686ab41e357f5f544d659e82f10cba85f9d578c939a2a874d0006b7fd17846bb8ffe1b6fc7cb760e4aa33db1 SHA512 19e8d8e004583e94ce060d3598c886dae1c24dd79dfd177aab4bd2865846f668a83071f087d9371393f226c14c90042eb2ec76619654c655995aeff9d4765621
+EBUILD stdlib-shims-0.2.0.ebuild 476 BLAKE2B 5010e59d3380e937bac49755b67779aefb8b5de880ef2c55eaebe497a0e37a456db440a12167072a57a4fa68d317a74031c68fd3ffb85989ab9b8c36aac44fdf SHA512 dcf9251828ec56f934e3a42eb28917e5cdeb56b0ef45c9ec3a2ceeb234b9138520db88392b4c39b6dfc3f82d04cfffb1b4cac74151f3f626d4083defea1a9389
+MISC metadata.xml 864 BLAKE2B bcf80992555101e1ba8eb6ca81df5a810b7351e4ce141842082c1981988b0a8529a83971f6f90be2a03cee9ba13a83679c5bfab6ed218e997b000c996ce6a0c1 SHA512 533ee9f2bedd5163669b6e23763ed90eb3ff180465a453e2a5d87271c0f4ac112aed7f073e88acf79eedc0d7495551e4670bfc1256a19053a2c021a91442a123
diff --git a/dev-ml/stdlib-shims/metadata.xml b/dev-ml/stdlib-shims/metadata.xml
new file mode 100644
index 000000000000..bf7379a1dd2b
--- /dev/null
+++ b/dev-ml/stdlib-shims/metadata.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <longdescription>
+    Compatibility library for OCaml compilers before 4.08 to allow calling
+    Pervasives module functions on Stdlib, which is the API in newer compilers.
+    Does not add newer Stdlib functions.
+  </longdescription>
+  <maintainer type="person">
+    <email>rkitover@gmail.com</email>
+    <name>Rafael Kitover</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">ocaml/stdlib-shims</remote-id>
+  </upstream>
+  <use>
+    <flag name="ocamlopt">
+      Whether the OCaml native code compiler is used. Must be set globally and
+      match dev-lang/ocaml.
+    </flag>
+  </use>
+</pkgmetadata>
diff --git a/dev-ml/stdlib-shims/stdlib-shims-0.2.0.ebuild b/dev-ml/stdlib-shims/stdlib-shims-0.2.0.ebuild
new file mode 100644
index 000000000000..bedd6b873ecc
--- /dev/null
+++ b/dev-ml/stdlib-shims/stdlib-shims-0.2.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Pure OCaml library that allows replacing Pervasives with Stdlib before 4.08"
+HOMEPAGE="https://github.com/ocaml/stdlib-shims"
+SRC_URI="https://github.com/ocaml/${PN}/releases/download/${PV}/${P}.tbz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ocamlopt"
+
+DOCS=( "README.md" "CHANGES.md" "LICENSE" )