gentoo resync : 10.02.2020

26 files changed, 128 insertions, 42 deletions

diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index d8ff1d035179..ebf4bb51671e 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/camlp4/Manifest b/dev-ml/camlp4/Manifest
index cd41b1170dfa..043b10ae3fc6 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 1000 BLAKE2B 8bb79168e90765e864d1d61706edf0193eb4ea26c17fc382376f3e70810a0ac88711a763f912dcf62c884dc85d4e0b6017fddeee3b9ce5a675b20ff78bea3e07 SHA512 be8dd7edf71cd3cd584a27055272bd3a8d7e34173061c6d3ee40712be810c8aa2fd49c1e04519358d6926f02c3a2f38986a6df86b812fedddae29eff4863b069
-EBUILD camlp4-4.05_p1.ebuild 1008 BLAKE2B 530cdc2283fdce7c532e5fc3a9580ab3e30087cfc32d7cf93b8712dc5589fa3ff7c6c3f68544298b1f51ccab5967470212eb1b0ea406d0f3c3730b9bc011a5fa SHA512 da1caacafe852a6fd93a0c351acb961e525af1f02b77e16b6ff66ffe5dc6310116d8251eb358d7a08ed22eab7c1826eee10a78e853cea34b3d341e06cbf78ce6
+EBUILD camlp4-4.04_p1.ebuild 992 BLAKE2B a7566cfe06d27538c32404860930e75fe100ac056d9e23bea97b823a2920fbe62cbc3bc9d5921ddfcbc2c049a6fc925b88334975a2148cc923c94b6a4e2ce2bd SHA512 bf281703d13af3bb9e2bfc526921c43999f1908631f6933d5469604ba9e10f56330baf840ba2d43fc60105db3815f9e81dac4a1994990afcbe9f9dd01b1a3991
+EBUILD camlp4-4.05_p1.ebuild 1000 BLAKE2B e126792fbc0ef5143229a32a18abf2f466b0798dad8512b22e3b7e574db59954e298395381015fa1db719d88bae2baa4c58976584f1c01ff28ee2936f726635f SHA512 3f4fea0691f5a9ec920cb2ba98d9533705c8166dfa3b08a45698b6712198db20d84c5e0a5fb9a13d98baedef4cb0f0c78fff546c6fba734f351bed16f8c8db26
 EBUILD camlp4-4.08_p1.ebuild 1067 BLAKE2B 56e9c5db487fd3f5b8595ad47bcf5430858598aa63b4941ca51483a338070cf23cb730791cab2a5c314276635fe7b0e9509c90634945d9643742f4bd6550d8b4 SHA512 39b6c74489265a611e8a4ca743b6e4405c10bde4480e0c34ad1129a85010778260a5f9a688c41b5faf603c69a032469d20d6bffe7e2e978b4008025e64a98429
 MISC metadata.xml 249 BLAKE2B 45b57687d81fa0ecbd307726eb7c570094d29952c8467b0ffe429870019fd852caa725924d6f2ee457b04a194d61c902f6abf948776fbb812a786e1058a031a2 SHA512 46286ee2dd275a5b7c8f941214c71f89396fd0d012564a368a205381ae2ffd28857245ffcae06b2416d73d071857005f3c7756fbcf546ebe0fadfc90a85db1e6
diff --git a/dev-ml/camlp4/camlp4-4.04_p1.ebuild b/dev-ml/camlp4/camlp4-4.04_p1.ebuild
index 20df6f9f34f5..c19c5780ccad 100644
--- a/dev-ml/camlp4/camlp4-4.04_p1.ebuild
+++ b/dev-ml/camlp4/camlp4-4.04_p1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,7 @@ SLOT="0/${PV}"
 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?]"
+DEPEND="=dev-lang/ocaml-4.04*:=[ocamlopt?]"
 RDEPEND="${DEPEND}
 	!<dev-lang/ocaml-4.02
 	!<dev-ml/findlib-1.5.5-r1"
diff --git a/dev-ml/camlp4/camlp4-4.05_p1.ebuild b/dev-ml/camlp4/camlp4-4.05_p1.ebuild
index 80a764a62593..fe6e0dc150a5 100644
--- a/dev-ml/camlp4/camlp4-4.05_p1.ebuild
+++ b/dev-ml/camlp4/camlp4-4.05_p1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,7 @@ SLOT="0/${PV}"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="+ocamlopt"
 
-DEPEND=">=dev-lang/ocaml-4.05_beta:=[ocamlopt?]"
+DEPEND="=dev-lang/ocaml-4.05*:=[ocamlopt?]"
 RDEPEND="${DEPEND}
 	!<dev-lang/ocaml-4.02
 	!<dev-ml/findlib-1.5.5-r1"
diff --git a/dev-ml/camlp5/Manifest b/dev-ml/camlp5/Manifest
index d7b86b274965..75dcd1060d4c 100644
--- a/dev-ml/camlp5/Manifest
+++ b/dev-ml/camlp5/Manifest
@@ -3,9 +3,11 @@ 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
+DIST camlp5-7.11.tar.gz 878224 BLAKE2B f384764da43653a2f75664681a4f202ec84497720470a0a33f99fc61a1ce7b4a9d494ffe6b523c74906c122ee04ae25a08bf1fcd356145e85a11e3e3095bbf7d SHA512 109a43f0a3aaa7a3ba9bd51b1fc1273b054d32787e189b138d69b39c42642b480c13abb9e91f15e6b6e889eaf4dc422ad3ff51e4dee298fb9d8cd9a2db99c159
 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
-EBUILD camlp5-7.10.ebuild 943 BLAKE2B 402d36749069983687d813ccdfeffc13b6ad90813db363d85024d8d68b2606cafdcb74ced4ddd526ae8cb0fc3f266572efe01d33f071a402e15ec57f050169d1 SHA512 5ee48affda4c799567189842f8278864a29b90f0b6187e4e4233f36bd76e5376181cd149674bd3e19ff532a4b13ce198dfef86cec78175d9dd994e84015f96c9
+EBUILD camlp5-7.10.ebuild 949 BLAKE2B 810503c75e88dc9f3977b9a0abc792550da30c35c75f4e12e8db6e9a90a1d3e3633de5d5b5ad0a44f94ec6483b40ee3306bdf5ffcfb699d82f5bb2d9d0f1a3fe SHA512 79e382b13c34f552875ae9bc5e6c8ccdcc5724c37702b95b5e9af7b900e6766188946861031f95a7183e4d758e45b3dcd5ec9db5fcd3e06440d4c48b59be9d26
+EBUILD camlp5-7.11.ebuild 943 BLAKE2B 402d36749069983687d813ccdfeffc13b6ad90813db363d85024d8d68b2606cafdcb74ced4ddd526ae8cb0fc3f266572efe01d33f071a402e15ec57f050169d1 SHA512 5ee48affda4c799567189842f8278864a29b90f0b6187e4e4233f36bd76e5376181cd149674bd3e19ff532a4b13ce198dfef86cec78175d9dd994e84015f96c9
 MISC metadata.xml 325 BLAKE2B e1e22f9260b70f58e523e16ba3f5a9fd8b58050ed7ba2107af06db261129f190620aee89c824557af3f5724b4f78ee5b4899addeee6fc9572315a2640f9d666d SHA512 52021194baa57054aaaad66864a51fd2bdf9c161e32fe78dcb1541480cfa03780645e3c1bb64271ce21015af26f2362fcb620c44c80253db82e06e1d38ed95b9
diff --git a/dev-ml/camlp5/camlp5-7.10.ebuild b/dev-ml/camlp5/camlp5-7.10.ebuild
index 542b744b42f5..5d5237a3aebf 100644
--- a/dev-ml/camlp5/camlp5-7.10.ebuild
+++ b/dev-ml/camlp5/camlp5-7.10.ebuild
@@ -15,7 +15,7 @@ SLOT="0/${PV}"
 KEYWORDS="~alpha ~amd64 ~ppc ~x86"
 IUSE="doc +ocamlopt"
 
-DEPEND="dev-lang/ocaml"
+DEPEND="<dev-lang/ocaml-4.09"
 RDEPEND="${DEPEND}"
 
 DOCS="CHANGES DEVEL ICHANGES README.md UPGRADING MODE"
diff --git a/dev-ml/camlp5/camlp5-7.11.ebuild b/dev-ml/camlp5/camlp5-7.11.ebuild
new file mode 100644
index 000000000000..542b744b42f5
--- /dev/null
+++ b/dev-ml/camlp5/camlp5-7.11.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit findlib
+
+DESCRIPTION="A preprocessor-pretty-printer of ocaml"
+HOMEPAGE="https://camlp5.github.io/"
+SRC_URI="https://github.com/camlp5/camlp5/archive/rel$(ver_rs 1- '').tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-rel$(ver_rs 1- '')"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+IUSE="doc +ocamlopt"
+
+DEPEND="dev-lang/ocaml"
+RDEPEND="${DEPEND}"
+
+DOCS="CHANGES DEVEL ICHANGES README.md UPGRADING MODE"
+
+src_configure() {
+	./configure \
+		--strict \
+		-prefix /usr \
+		-bindir /usr/bin \
+		-libdir /usr/$(get_libdir)/ocaml \
+		-mandir /usr/share/man || die "configure failed"
+}
+
+src_compile(){
+	emake out
+	if use ocamlopt; then
+		emake  opt
+		emake  opt.opt
+	fi
+}
+
+src_install() {
+	use doc && HTML_DOCS="doc/*"
+
+	default
+
+	# findlib support
+	insinto "$(ocamlfind printconf destdir)/${PN}"
+	doins etc/META
+}
diff --git a/dev-ml/findlib/Manifest b/dev-ml/findlib/Manifest
index 2decc43f11c6..d3d88b68c127 100644
--- a/dev-ml/findlib/Manifest
+++ b/dev-ml/findlib/Manifest
@@ -5,8 +5,8 @@ DIST findlib-1.7.1.tar.gz 256883 BLAKE2B 7459082dee3cd04045e8dbf59bc82075eb1c24b
 DIST findlib-1.7.2.tar.gz 257747 BLAKE2B 826993e9d3e5a9dab9084b006347a0324c848aa50a42ba1daa0d76010a0cdbf6e1ae9f0754dd3bef84f043ee43c3bd9775284a73ee5b130b678834d14d4ddb1c SHA512 f2aadaf8630482785ebfe6788bfea6716defdd6ba94e7f4e3b743c3415fa5b169e31301d605857823e9c74f7bd2f774399ee32a8acb35e64ce0cba5e98e4dd2c
 DIST findlib-1.7.3.tar.gz 257703 BLAKE2B d69687ee4b75bd7ba514c5507bd474764cfb76f0502ef613c3dd8d8e9e92b5f12704c101b9228d71f2d9f151ab5e63b4352b759a2c7a2694f23b10b6c4e724d2 SHA512 5fc8250c123e2f019406be487134523f964668d615b51b216551d74f6ec1999de43aa7babc9c2c75ebb87293b4b8c640548d562a98a6e5a6d7f663432869c886
 DIST findlib-1.8.1.tar.gz 261544 BLAKE2B acfa9d4e0d118ebbc0dd7b03da1fe5eaa994e5fec13dc54e60ba42f643d93968469a1a43fe4f832433dca6c3902e8846616fcf460c748bf037fe16cb2f93a847 SHA512 0d8e1ff21217fcc6823aab3ac71282789691e4ae8c3607703d0393468247f93e2d084bd4e2a8795b523f2c7f193521d3aae4b8122c934ebf8b58c3185a5bc9c1
-EBUILD findlib-1.7.1.ebuild 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
+EBUILD findlib-1.7.1.ebuild 1668 BLAKE2B 60d7a6dbe8afa310b009c83484fff3764214d936462006c0ee173440dc9ed55af26caa161dfa56dfa0d2f92d79d5b7f6d64276102a84609905a03479b0c35723 SHA512 5ebe6823f278c34ede6bf7aedd842c74a8eebe51c34d730d54cc08546a4345e14a799487d45456ec75749d4415ecf6673db6a473ef8c81149efe2845df3f320c
+EBUILD findlib-1.7.2.ebuild 1676 BLAKE2B 1f26f700fa8f120eb504d441f6abe0a3e42d70c09df8325f78b68721e2115140d834b1fbc51d105f39d372dc4d23a6164b735f6fb504e7ad438e4cbe57db1d64 SHA512 188b4b931a3ba8e6eb456bcf97ea5f521466f9650ae2567ad4e9104e1270ec62ec4e8b727d4dba5eb0cf19572cf04aba4740aabcbedd81d5afa29f80caa78692
+EBUILD findlib-1.7.3.ebuild 1689 BLAKE2B a78e7e68a97122107362c376017c106462c30dd6c8754702c0b24f22478dcb7ad75cc9da78b2832922402182d1037c085d37b1d401b8126735438faa5e3cdcd3 SHA512 0d107354f562ef62313afdda4f8eda424dcaaff565ae17b9e2b0b1dcee2a8a44761830c021160deb6f688fbb2d28aa8adeb287744eb89f34f3639d0a2d8ab548
+EBUILD findlib-1.8.1.ebuild 1693 BLAKE2B 2430f1c69b891352735c739932f681149aa46af23ac22626e2d7085f11050d0a965508a84f0b7b9ff05c480b2954659a269d072e39b1ed92f66163d135ea728c SHA512 5e05a353475eade1dbaa4f2e9aae0473e19ef79f355369608af6d219193a6067903b6a00dd80b76ccf21213511e688e6a8d0b37b5cbb49a8bce2f77155dce2c8
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-ml/findlib/findlib-1.7.1.ebuild b/dev-ml/findlib/findlib-1.7.1.ebuild
index 2db445777513..52d717f9e354 100644
--- a/dev-ml/findlib/findlib-1.7.1.ebuild
+++ b/dev-ml/findlib/findlib-1.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,8 @@ LICENSE="MIT"
 SLOT="0"
 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?]
+# it does not compile with ocaml-4.09 (bug #708696)
+DEPEND="<dev-lang/ocaml-4.09:=[ocamlopt?]
 	tk? ( dev-ml/labltk:= )"
 RDEPEND="${DEPEND}"
 
diff --git a/dev-ml/findlib/findlib-1.7.2.ebuild b/dev-ml/findlib/findlib-1.7.2.ebuild
index afff28f8195e..895452b724a4 100644
--- a/dev-ml/findlib/findlib-1.7.2.ebuild
+++ b/dev-ml/findlib/findlib-1.7.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
@@ -15,7 +15,8 @@ LICENSE="MIT"
 SLOT="0"
 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?]
+# it does not compile with ocaml-4.09 (bug #708696)
+DEPEND="<dev-lang/ocaml-4.09:=[ocamlopt?]
 	tk? ( dev-ml/labltk:= )"
 RDEPEND="${DEPEND}"
 
diff --git a/dev-ml/findlib/findlib-1.7.3.ebuild b/dev-ml/findlib/findlib-1.7.3.ebuild
index 170528bfb1ff..691a2c9519aa 100644
--- a/dev-ml/findlib/findlib-1.7.3.ebuild
+++ b/dev-ml/findlib/findlib-1.7.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,8 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
-DEPEND=">=dev-lang/ocaml-4.02.3-r1:=[ocamlopt?]
+# it does not compile with ocaml-4.09 (bug #708696)
+DEPEND="<dev-lang/ocaml-4.09:=[ocamlopt?]
 	tk? ( dev-ml/labltk:= )"
 RDEPEND="${DEPEND}"
 
diff --git a/dev-ml/findlib/findlib-1.8.1.ebuild b/dev-ml/findlib/findlib-1.8.1.ebuild
index 235cc886cff2..9ab65f642ccf 100644
--- a/dev-ml/findlib/findlib-1.8.1.ebuild
+++ b/dev-ml/findlib/findlib-1.8.1.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
@@ -13,7 +13,7 @@ IUSE="doc +ocamlopt tk"
 LICENSE="MIT"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 DEPEND=">=dev-lang/ocaml-4.02.3-r1:=[ocamlopt?]
 	tk? ( dev-ml/labltk:= )"
diff --git a/dev-ml/llvm-ocaml/Manifest b/dev-ml/llvm-ocaml/Manifest
index 14f4a28cddd9..409f8d5c22f1 100644
--- a/dev-ml/llvm-ocaml/Manifest
+++ b/dev-ml/llvm-ocaml/Manifest
@@ -2,10 +2,10 @@ DIST llvm-7.1.0.src.tar.xz 28313784 BLAKE2B b78d9a7fc5ef6e352e77d339e5c4eef5cced
 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 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-10.0.0.9999.ebuild 3223 BLAKE2B 493402ac8d79b1e7532aae120957aec11276f0c652532af4e6f84642e734c42ab5214b13a43af788b57d7fcbfa3494bff28ff9862129a419cafe8a042dd21d14 SHA512 ce647a88d2f8fb034c6ef1fae428d5d288e92fb893d5515cb9eb0f3f1c231978b15ded5da5181ea5e313ee1059c82f9b7f1ad6f4a5f170749b37056f2eaafa72
+EBUILD llvm-ocaml-10.0.0_rc1.ebuild 3223 BLAKE2B 493402ac8d79b1e7532aae120957aec11276f0c652532af4e6f84642e734c42ab5214b13a43af788b57d7fcbfa3494bff28ff9862129a419cafe8a042dd21d14 SHA512 ce647a88d2f8fb034c6ef1fae428d5d288e92fb893d5515cb9eb0f3f1c231978b15ded5da5181ea5e313ee1059c82f9b7f1ad6f4a5f170749b37056f2eaafa72
+EBUILD llvm-ocaml-11.0.0.9999.ebuild 3223 BLAKE2B 493402ac8d79b1e7532aae120957aec11276f0c652532af4e6f84642e734c42ab5214b13a43af788b57d7fcbfa3494bff28ff9862129a419cafe8a042dd21d14 SHA512 ce647a88d2f8fb034c6ef1fae428d5d288e92fb893d5515cb9eb0f3f1c231978b15ded5da5181ea5e313ee1059c82f9b7f1ad6f4a5f170749b37056f2eaafa72
 EBUILD llvm-ocaml-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
+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.0.9999.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-10.0.0.9999.ebuild
index 4a532d74722c..0f9b2f61d747 100644
--- a/dev-ml/llvm-ocaml/llvm-ocaml-10.0.0.9999.ebuild
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-10.0.0.9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit cmake-utils llvm llvm.org multiprocessing python-any-r1
 
 DESCRIPTION="OCaml bindings for LLVM"
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
index 4a532d74722c..0f9b2f61d747 100644
--- a/dev-ml/llvm-ocaml/llvm-ocaml-10.0.0_rc1.ebuild
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-10.0.0_rc1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit cmake-utils llvm llvm.org multiprocessing python-any-r1
 
 DESCRIPTION="OCaml bindings for LLVM"
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 4a532d74722c..0f9b2f61d747 100644
--- a/dev-ml/llvm-ocaml/llvm-ocaml-11.0.0.9999.ebuild
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-11.0.0.9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit cmake-utils llvm llvm.org multiprocessing python-any-r1
 
 DESCRIPTION="OCaml bindings for LLVM"
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-9.0.1.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-9.0.1.ebuild
index a70188ba1f0c..2d7234b60384 100644
--- a/dev-ml/llvm-ocaml/llvm-ocaml-9.0.1.ebuild
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-9.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit cmake-utils llvm llvm.org multiprocessing python-any-r1
 
 DESCRIPTION="OCaml bindings for LLVM"
diff --git a/dev-ml/ocamlbuild/Manifest b/dev-ml/ocamlbuild/Manifest
index fbf1026aaca0..5a8b10122fe9 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 982 BLAKE2B 353cf032c8a495f7243c55d6610f16e95edb50e530f1626ab0d6408c19f35a35a9692bb586b9a620e9cf3e5e09e4ca6d4f743cee2b646594e0e5a3ee593ebc7d SHA512 b4fa82e6ba935792609879b1fc9ce89b5b878426d9dcbc9db79c41cb9d357cbb1cedb392c66be17e01b3b496a37ccc33f6a4934eac64d50a47b03e872fc87a75
-EBUILD ocamlbuild-0.11.0.ebuild 1071 BLAKE2B 077f7e85fd47b8a5f96ef32b1bcd1f0360b096f0e8ecea4c3b35a7a542770dfd1870f5c5a9f1a746b6f8824401fe01a4d6149b6630ddaae5faac82f9bf9b48e8 SHA512 0f502336167fedc7ad50523de39291be2d9275c53a7926fcf0f35f026d1fda814b3cda2524674a8fa24f350cda15675cf28707ba34cc3254ee2b8595580fb1fc
+EBUILD ocamlbuild-0.10.1.ebuild 1035 BLAKE2B a373ab35a5ac7bd12342ae6f06334d0340592e017f1ec6878b98bcb15cdf6c49e25c3e29f27b43ae1075e77de11495ea8be398dea53adc89ac05a56301a798c1 SHA512 23aaf967458a40ead7cb485ecfc10c75a785ffc290c16eb768cfcd8ca0bf4340d62e8f34d5a4e8295046182eece2fae93b7ae070c5c9ccf92394e5a6c7d8f567
+EBUILD ocamlbuild-0.11.0.ebuild 1127 BLAKE2B d95b57e29d00d3411b20b57499cca09f3f06929b1e715935e598e457dc9d9557f465a5024fe5ba5d7a1ac8e998a9997c81592832df9aa784f5e037f2a32a3e15 SHA512 e94a9ff4a40e32518392106fa92dd904cb702b414af75bdac79c718bc7542392b709371c61770f67609d005a127a9d05d562a25c9ecd1d52bda8cfe3bc05a3e1
 EBUILD ocamlbuild-0.14.0.ebuild 1071 BLAKE2B 077f7e85fd47b8a5f96ef32b1bcd1f0360b096f0e8ecea4c3b35a7a542770dfd1870f5c5a9f1a746b6f8824401fe01a4d6149b6630ddaae5faac82f9bf9b48e8 SHA512 0f502336167fedc7ad50523de39291be2d9275c53a7926fcf0f35f026d1fda814b3cda2524674a8fa24f350cda15675cf28707ba34cc3254ee2b8595580fb1fc
 MISC metadata.xml 248 BLAKE2B 0baa26cc2d6bf97034a28a0eaf70c71c088f133beb6d0c23414d2cc0c6f6b80cafc427e4e3336dde77669340cd71555fe7564011250045ef038abc19508bbd3d SHA512 dee41e91c23031fba453a79a56e048558d85197d7661b773b2c966c49a381d4539c7639bd1c94726de936b16a233b92424548da67859c9fcf9884348bb48d326
diff --git a/dev-ml/ocamlbuild/ocamlbuild-0.10.1.ebuild b/dev-ml/ocamlbuild/ocamlbuild-0.10.1.ebuild
index 62366767e29c..10847fc11e60 100644
--- a/dev-ml/ocamlbuild/ocamlbuild-0.10.1.ebuild
+++ b/dev-ml/ocamlbuild/ocamlbuild-0.10.1.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
@@ -12,7 +12,8 @@ SLOT="0/${PV}"
 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?]"
+# does not compile with ocaml-4.09 (bug # 708696 and #708872)
+DEPEND="<dev-lang/ocaml-4.09:=[ocamlopt?]"
 RDEPEND="${DEPEND}
 	!<dev-ml/findlib-1.6.1-r1
 "
diff --git a/dev-ml/ocamlbuild/ocamlbuild-0.11.0.ebuild b/dev-ml/ocamlbuild/ocamlbuild-0.11.0.ebuild
index 4556ac43c4db..96f238627e93 100644
--- a/dev-ml/ocamlbuild/ocamlbuild-0.11.0.ebuild
+++ b/dev-ml/ocamlbuild/ocamlbuild-0.11.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
@@ -13,7 +13,8 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~a
 IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
-DEPEND=">=dev-lang/ocaml-4.02.3-r1:=[ocamlopt?]"
+# does not compile with ocaml-4.09 (bug # 708696 and #708872)
+DEPEND="<dev-lang/ocaml-4.09:=[ocamlopt?]"
 RDEPEND="${DEPEND}
 	!<dev-ml/findlib-1.6.1-r1
 "
diff --git a/dev-ml/patience_diff/Manifest b/dev-ml/patience_diff/Manifest
index ac422b646b03..859993a98ae2 100644
--- a/dev-ml/patience_diff/Manifest
+++ b/dev-ml/patience_diff/Manifest
@@ -1,3 +1,3 @@
 DIST patience_diff-0.9.0.tar.gz 16520 BLAKE2B af7f93906c1f4ab70649bc41726aff21f9f099fe49b0d3a3e8bea01d85e9f01cac4bd103179e9877d79dbc997d37318382321dacd67be57a9e031fd95e0263e5 SHA512 62cc0950edd8d46d5a11cd612dbdb8dc531a9a2c71403f30e6022e20d9ee21cb2e7a531362fa8b350075003eec929f1f70481b8e160b253831966d80a8becd83
-EBUILD patience_diff-0.9.0.ebuild 526 BLAKE2B 45391487404730a2f788a48d978bc3aab43bef59305fc363eae6ed608cf3d032abdb7e07cdd4b35ff3c495a0808b6e1fe37569a783bffd08b59aa497a7b4e532 SHA512 407651f14c1ba623a4210a8550a957776f12c9612b434452587e075b29327978cfb349da7df71c4d79e42bd186ec5c846e0191a9a2dc13241839d0cdb116aa13
+EBUILD patience_diff-0.9.0.ebuild 534 BLAKE2B 4b0e16608fa40c71c896a814fac9fb68ed2cfa9fb10f24bee2221ad6187bf0fd89c967102fbe5c352b4ed947bb6963fda620cc74ca4472a7ed2b37fb1e29602e SHA512 8cca726e81552de98a1771fe9115836bafbb4b16d2dfc5bd34fa5565654c6a32450eb9662e5232f6c3c0e5e21ecc5286e835c19926c17b54e997a4dda2f2b121
 MISC metadata.xml 256 BLAKE2B b85b78e50bb089fb6f5ec8f062457473d8a64b4b1b9442df43b08df04a0d4bbca6d0b6b1368025fc5eef79ada7f1e835189883d38fd364328e264454cc5d3ddd SHA512 ed2cac543371b73c9a0a9b0e0cec36fdf53cd35f79644243466f7dddd8225b9351126d93ad87cddfc2fa567b8905fa0c4c6b6ed8ffec87bf4707662dcf3ed9ca
diff --git a/dev-ml/patience_diff/patience_diff-0.9.0.ebuild b/dev-ml/patience_diff/patience_diff-0.9.0.ebuild
index cba06ddf9e13..1a27643bcde4 100644
--- a/dev-ml/patience_diff/patience_diff-0.9.0.ebuild
+++ b/dev-ml/patience_diff/patience_diff-0.9.0.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit opam
 
 DESCRIPTION="Tool and library implementing patience diff"
-HOMEPAGE="https://github.com/janestreet/${PN}"
+HOMEPAGE="https://github.com/janestreet/patience_diff"
 SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-ml/ppx_tools/Manifest b/dev-ml/ppx_tools/Manifest
index 43d4c0a3dc73..0c00e499c54a 100644
--- a/dev-ml/ppx_tools/Manifest
+++ b/dev-ml/ppx_tools/Manifest
@@ -1,6 +1,8 @@
 AUX ocaml404.patch 2031 BLAKE2B 02341fa3b292d713995f95d76f1b47970b9ff34d8b177212074c0a3c027aff1d0f27a0e3e7f03b8131904a28d285f9cc4b7b795e62327ad2da7c29f1b74240da SHA512 507bda106d25a92718aae1b0e95103d481cbe18624f80a59af6b3e884594c1d18b0c15b51f014b1af39b09a5264272f92ee8d18dcca37e7595964f85241c141a
 DIST ppx_tools-5.0.4.03.0.tar.gz 17209 BLAKE2B bd51e5b2482a9eab09bf9a02ac0231fa7bbc721d54a932e6cfdc1d719c106eca0fe90563b636601110e796fab439f6c6d7fccd5d2920f5bcb3c115f622d90381 SHA512 d1867b084885704757f390b6f6ca8b5d7702f0476149d99ea227f98230ab35d57f5c4aa779881231a0a77cfd1861255118fa2551a49ab85553f63e9aab9baae4
 DIST ppx_tools-5.0.4.05.0.tar.gz 17893 BLAKE2B 0902f53ef19338396cf2a2319a4c2d4b7bbbfb66bbfd0fb2290c29ecebcda02ff90d2f0d0221b08d027c41c863c2bc0a02c50363d83474864c08e619641b7ad6 SHA512 33b4420500a2b5880e770f8fdf2b37ef08e52ff84f96f955c6321492de906568979feccb1b2b477b1117619ba28edd8d3e0f178c5684f0dc43c6ed56266c4d64
-EBUILD ppx_tools-5.0.4.03.0.ebuild 813 BLAKE2B 1f5897d4905c89e741e5fca93d922e81113a5ce26e376c9eb95fc298ae77c15308af7133645e895d473ba75259760f1f509ec205a2e074fa17c710b336de703d SHA512 8cce9af5162c38603b538a91c35b82163ea96c4fa49f01eb6d71d970f80d62cee549d7abc38a367f2e7ac40b7c961f3e58d5759c318f4157580f781f49fc30b0
-EBUILD ppx_tools-5.0.4.05.0.ebuild 716 BLAKE2B dcd835e06c7349df3bb49c16c14378e5b90de9ece37c478b66b5bd35f116c66d65981aa12322505e48c60dc07ef393c5181e3609db26302850bfa5fb53cb33fa SHA512 991090e274d2897d872bb706e2295d9964a1f8182947617683d7d054ac80501586dc4e2239add6c18effce80c6f78f0022ab28f46d942b51ec975cf5188ad1df
+DIST ppx_tools-5.3.4.08.0.tar.gz 18590 BLAKE2B fac872d113ab1bf9135357dea47d468924e16a1a038b64152d5ebb27daa69a8c2d906750146157954f4d95769535f4a93c1ecc9582ca0313d601a06606196c00 SHA512 817e2688d60f013fa42ffa263cfcc15cfae820240d2e54dfedf1f4a4191f9b9fc365a190cc7eeb9082ed72fbf3c94d6ba72c38c7db3e2bcac49a17ba590d71b5
+EBUILD ppx_tools-5.0.4.03.0.ebuild 807 BLAKE2B b71640ed43baaf8afaa8d841d78461f3f66cdade8f22a93aaaac04093dda070d2b0512a8b6ebfc7eabd400b70c852155db5101bdd5c3ab6b46561f0a9db3ae99 SHA512 f231b7ad6f417b2635b7cd1dc765717398074aea040011e25caf81bc25a46e214f9e653dcb33759bcefaa8b359b08f1e37cf2b42d78c5575f3a2563e7810f287
+EBUILD ppx_tools-5.0.4.05.0.ebuild 708 BLAKE2B 58acde9589203a439a9148eb7373d32f8852efb9aa3cddc2d5b74f73e357614767893adc7ebae38b913e698181e295ca7cb8dc0b6b33f85a84422bb202ea1c01 SHA512 457523621d33361f16fe821025b90c7c29ef2b007f85c9ae7156a036d67d50b894e05c3284434e4d1495df2c0c1a4cd7f5c00434b3204644a758486ae5e3d1a4
+EBUILD ppx_tools-5.3.4.08.0.ebuild 651 BLAKE2B ea64e3cb4c471e62f145ee3e79a3554579d07eaf7b6159c37c36f9688de786076b0a056eb5c301265bf561e4e17023ee5730414b68ebd60e279b7bb687fd0e1e SHA512 1cf8e5cb010eaf775e88fc0a39648bdfffacfd3b4e21538a2d5800fb3724576b2dd31d94319f43e3302bb4c8bfdcf871418a609375732469f87bb3ae6905a278
 MISC metadata.xml 258 BLAKE2B f63381850c8356a44f5eaf677dec2b8420303db8a602b1efb7225d2c6d32efd345e3ac9cde4edee359c4e8bbdaf6c228336ee2ecb48d03335e66cf33ba9a22d0 SHA512 c873e3353f031c0cf5427e0a05c2ebf9112b50cd682193dbc73f7489d5c4996fed07c5540a3301d3c1dfb508ed27c776a2953bab2ce94c843b75d2eb8d0c68bb
diff --git a/dev-ml/ppx_tools/ppx_tools-5.0.4.03.0.ebuild b/dev-ml/ppx_tools/ppx_tools-5.0.4.03.0.ebuild
index 3b440d54aeb0..d0acc2b9fac0 100644
--- a/dev-ml/ppx_tools/ppx_tools-5.0.4.03.0.ebuild
+++ b/dev-ml/ppx_tools/ppx_tools-5.0.4.03.0.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
@@ -15,7 +15,7 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
 IUSE="+ocamlopt"
 
-DEPEND=">=dev-lang/ocaml-4.03.0:=[ocamlopt?]"
+DEPEND="<dev-lang/ocaml-4.09:=[ocamlopt?]"
 RDEPEND="${DEPEND}"
 S="${WORKDIR}/${PN}-$(replace_version_separator 2 '-')"
 
diff --git a/dev-ml/ppx_tools/ppx_tools-5.0.4.05.0.ebuild b/dev-ml/ppx_tools/ppx_tools-5.0.4.05.0.ebuild
index 28e7b0d5bb50..c2a93387105c 100644
--- a/dev-ml/ppx_tools/ppx_tools-5.0.4.05.0.ebuild
+++ b/dev-ml/ppx_tools/ppx_tools-5.0.4.05.0.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
@@ -15,7 +15,7 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
 IUSE="+ocamlopt"
 
-DEPEND=">=dev-lang/ocaml-4.05_beta:=[ocamlopt?]"
+DEPEND="=dev-lang/ocaml-4.05*:=[ocamlopt?]"
 RDEPEND="${DEPEND}"
 S="${WORKDIR}/${PN}-$(replace_version_separator 2 '-')"
 
diff --git a/dev-ml/ppx_tools/ppx_tools-5.3.4.08.0.ebuild b/dev-ml/ppx_tools/ppx_tools-5.3.4.08.0.ebuild
new file mode 100644
index 000000000000..7e9d0206f344
--- /dev/null
+++ b/dev-ml/ppx_tools/ppx_tools-5.3.4.08.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit findlib eutils
+
+MY_PV=$(ver_rs 2 '+')
+DESCRIPTION="Tools for authors of ppx rewriters"
+HOMEPAGE="https://github.com/alainfrisch/ppx_tools"
+SRC_URI="https://github.com/alainfrisch/ppx_tools/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE="+ocamlopt"
+
+DEPEND="dev-lang/ocaml:=[ocamlopt?]"
+RDEPEND="${DEPEND}"
+S="${WORKDIR}/${PN}-$(ver_rs 2 '-')"
+
+src_compile() {
+	emake -j1 $(usex ocamlopt "" "ARCH=none")
+}
+
+src_install() {
+	findlib_src_install
+	dodoc README.md
+}