gentoo resync : 01.10.2021

51 files changed, 224 insertions, 265 deletions

diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 0ddebea05f19..515754648b0d 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/async_kernel/Manifest b/dev-ml/async_kernel/Manifest
index 5558c356ac8a..4ebac7753771 100644
--- a/dev-ml/async_kernel/Manifest
+++ b/dev-ml/async_kernel/Manifest
@@ -1,3 +1,3 @@
 DIST async_kernel-0.14.0.tar.gz 138191 BLAKE2B 0f8096eb1cfabcdb4b3148f8d2cb3d5f8c858da74986ac107e7592195dab6e6563c0adb8f39f22a8d3b279b994c937e345b6c56d03a5767672913c7316ecd1fb SHA512 9324f17527311e3c112203b7caa2b0b7dfea15bdb30d02d7218c7b8d8c930d4893d83043016ad064265cedc191985400dbaf2d0af448f840c98ef98326aac8ff
-EBUILD async_kernel-0.14.0.ebuild 500 BLAKE2B 8d70ecdd21dc2568ea7e6a94480d79e2f563762f4309ea2136e6f4e6a78918fd25914e93599bb2f62eceb81eafaeef69acd2604b9a5e295630e8adc13e4cf35b SHA512 b80bb0f6c1bba72f13b2e9bacdb4a9693bb510c32592900d9009e20b56555ebb5a074c38b2b2ade4a2ef12474687b36e5b325ba981f247d7fe98ca04a333942b
-MISC metadata.xml 256 BLAKE2B f8f153d6840745fc0af52238d159f66b675d261c09cebe3e5d8251387703e2dd0050b9040e1a6aba5b9769cf4f000258b4885e7c1c379e71cd6d5176c6fc5434 SHA512 ac3d53bb3af15bc9c2de5b1bfab10c62b0e67eedb213230abeddf5006c833af65087fe66a8357963742f298962b49601b1ea75b0bae6bf2b6203f2dbef691be9
+EBUILD async_kernel-0.14.0.ebuild 565 BLAKE2B 9376ebda9f8880bd66e0791bea4710c09aa197ab0d39988997c4f9140a8355d280cb27efa5f195f3abfd8cc3f220af76291d47de6e0f39de8050c2958065fb35 SHA512 0f4bf1064315796f72b8d59f56e2b72698196674032d767cc7446e70788aeb20a9196c0db2785fbf8e352c0abe64094b1e0599b6946c5f7a5be68a8e07278aea
+MISC metadata.xml 321 BLAKE2B fd8db9f53c6506db9ed49966b039aa07734345b6e0983e009e6fb9bee82fd7dd4e15ecdbb791503ce7f4ec3fd9fac2751f02626dca8a86e2fdac640919918d67 SHA512 a64a7d3dcef7d139eaa027b590915e6d4171daedfb4ae2d83ebac996edfc107e2b345bbcbed096629a23ef6f6d923497e09b5a3e3004160d33160c2b7d16d658
diff --git a/dev-ml/async_kernel/async_kernel-0.14.0.ebuild b/dev-ml/async_kernel/async_kernel-0.14.0.ebuild
index eddff5633056..4f2232ed012e 100644
--- a/dev-ml/async_kernel/async_kernel-0.14.0.ebuild
+++ b/dev-ml/async_kernel/async_kernel-0.14.0.ebuild
@@ -19,3 +19,7 @@ RDEPEND="
 	dev-ml/ppx_jane:=
 "
 DEPEND="${RDEPEND}"
+
+src_compile() {
+	dune build @install --profile release || die
+}
diff --git a/dev-ml/async_kernel/metadata.xml b/dev-ml/async_kernel/metadata.xml
index 4885bbdae3a5..84b93df47b35 100644
--- a/dev-ml/async_kernel/metadata.xml
+++ b/dev-ml/async_kernel/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="project">
+		<email>ml@gentoo.org</email>
+		<name>ML</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">janestreet/async_kernel</remote-id>
 	</upstream>
diff --git a/dev-ml/async_unix/Manifest b/dev-ml/async_unix/Manifest
index caf5d9e4d188..34bd47ae0cab 100644
--- a/dev-ml/async_unix/Manifest
+++ b/dev-ml/async_unix/Manifest
@@ -1,3 +1,3 @@
 DIST async_unix-0.14.0.tar.gz 171624 BLAKE2B 4c55b6c8ba8cd59ede4b214ec84d8689700e46b918a96e145f94ebd011c32de6c2ab40c35a4c821ac58872259740b752e045eb2ac7954ecb0b988ceaf1b75ff2 SHA512 d90713d1d35445a648392e9104eedd25d4c7e6a10a46d0442539c1521349dcbee4118e852cc8335c8c03ba4d1050f199eb91a6e3c3c827dca8eee59501f379be
-EBUILD async_unix-0.14.0.ebuild 536 BLAKE2B 987e590419d042071795ad047cdda5dead8c7def791753b6ec31c946e4b78085ccb0931285374b724a20df66754548326e5fb372af35147e79c17775674175a6 SHA512 a6542b3fb14b53ee5959b13700caefa8b364649cd2a0a42caaf8884060c0f82616b273d18196546cf222ae290c36c0d0fa1f63f0d865b70329b2518ea2d0e6af
-MISC metadata.xml 254 BLAKE2B dd6dee74755d31c9fab252deefed0731672f3224b343c6bd98393114ee7acac59c5e2240fb220e2ba7e121214a84ff449f1c0c4e038a5340faf129da8bd7688f SHA512 51b639a6e376b68161eb36e430eda17edfa88f3a74e6fbf0cda4682ca8cd3812af98421e8c99fb099dca83dcecc07d2c11f9943da2cc05a5540f7d2447c9ce62
+EBUILD async_unix-0.14.0.ebuild 601 BLAKE2B 168319dec24032943c55367cde25214e08c769db30143d500f9d9a1711176959450d44868e65dddd1b75b6b3bfde07593e5aad6d87b66660f177f5db92b4d032 SHA512 b8de94d856302bdd7e376c8901650dfd0d41026865f53c8619a76e9f0dc51bee3ee887ec861a20e39fe68c1e470916107dcb735c1dc887cb22fd4f9eb1359be8
+MISC metadata.xml 319 BLAKE2B 057719c234859791c2afb0f8e286a8050ad1373cb0318c0d0fbd9ff9906e65131871ecd0cc0f01993c58abaae60eab700b2ba5fc8fe56487150de4aea9e50aad SHA512 5a813d9ff6adc78e1ef4e8dd30b670313bdd15a191ba3ca12c5f4ad2a9dd9d23d69003bcf1805a8490006c46440674db701275c51351b05bcb05902199ae7072
diff --git a/dev-ml/async_unix/async_unix-0.14.0.ebuild b/dev-ml/async_unix/async_unix-0.14.0.ebuild
index 51bdd90f7140..231d23d4ecdf 100644
--- a/dev-ml/async_unix/async_unix-0.14.0.ebuild
+++ b/dev-ml/async_unix/async_unix-0.14.0.ebuild
@@ -21,3 +21,7 @@ RDEPEND="
 	dev-ml/ppx_jane:=
 "
 DEPEND="${RDEPEND}"
+
+src_compile() {
+	dune build @install --profile release || die
+}
diff --git a/dev-ml/async_unix/metadata.xml b/dev-ml/async_unix/metadata.xml
index 9a0ff9dd7d4e..517a5e2afdfd 100644
--- a/dev-ml/async_unix/metadata.xml
+++ b/dev-ml/async_unix/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="project">
+		<email>ml@gentoo.org</email>
+		<name>ML</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">janestreet/async_unix</remote-id>
 	</upstream>
diff --git a/dev-ml/base/Manifest b/dev-ml/base/Manifest
index e54da8d9e2f9..16e8c37c1823 100644
--- a/dev-ml/base/Manifest
+++ b/dev-ml/base/Manifest
@@ -1,5 +1,5 @@
 DIST base-0.14.0.tar.gz 385265 BLAKE2B f3a49b22bb63919bcdc522fbce14a24fd6eaddf39b921ba956cb82eb664ccc6919c9a9feb799dea318f1d8bdf1bd1983180b7ce38d9a43e118794057a9fec6a3 SHA512 c713c9aaf369bc042afb1ead53dc5a34a6eb3c97abc7fef99868e3be8e976adc6297f34d13cfc314adf2182fc64b0cde9c9a05aeeb0f51380255aa1f8e0edf16
 DIST base-0.14.1.tar.gz 385381 BLAKE2B 619c5c437237bb3ea9f428b450085eff2cb4639bf11803bcb2ae9f147b3ae39af72cfcfa10aaa5e74446bff4ba5f553815ff790190845f12e5e5b5080b197237 SHA512 5675a8b6b1ee5b7bd992ac9fbb036239f11b8a8c7cac9059ca38581d91f42e35d7bfa5839a90ed227344dd4c7b1bbacf0e7871d958c81f6ccf7e072b64ceff2e
-EBUILD base-0.14.0.ebuild 480 BLAKE2B 9bf362a5511760be4d1ce2c034d1463bcbbaf454fabde6504bac3cf4f9464962f90912db47a9921d0689679df3fd04ddd0b40cfa1b3e02f52789db79953ea820 SHA512 1c0c091e87a6e3e9ae7cd7204b3d67331f07b8ba53bf8886662c950611452b9e95857f964c1125fd0b3d187402700a1887e810f7605e482b02c2e55a627b0e02
+EBUILD base-0.14.0.ebuild 502 BLAKE2B a7be7cfeb7add4d794834686cbae812939ce7653d30a0e7e0212cbad47cda1335db05d50465d7955b16472d5dddf86366510097a67d108828566e5acac24130a SHA512 1887f190062ab377a3d6efe8b631d00c1735902526046ff59a309c9a96c756a75a4e42a95ff3a4bc0af23745eaf10006df27340a1f3411e92fb2388d75181b17
 EBUILD base-0.14.1.ebuild 486 BLAKE2B f45d23ba7ec9690f78a4cfbab8ccfeccee98fc1bd08e3965ce6d9960d84bacc141485d4f7782e2e6464fe5d35c7183cb046fbd195f14d55f688cf50d1779d9cc SHA512 e0c83936ab8e766ba976fbd4d57bc77d549b291f8585a80caf2761868b7b3688c01275165f1987f3bde830c8a4d93c8d4d335b3778551395907fa76a55052776
 MISC metadata.xml 325 BLAKE2B b6ec2fe282aaec8d1859a20e908ba83bee431d766a21006a2effc6d68d26ea62d7e8bda2b6f2cb4e8a04b9ccbdfa4f3041b154bce987474b3375faf3d889e851 SHA512 ad9744b303444107c9177eca8ab5aa45fef6121d17b091f460c414f13b139672b068e0c041fc335c3f6bcfe8b8657bb2f116e9397b3acefaa61d42e25b01053d
diff --git a/dev-ml/base/base-0.14.0.ebuild b/dev-ml/base/base-0.14.0.ebuild
index c45143ed9c05..335aee9d07c6 100644
--- a/dev-ml/base/base-0.14.0.ebuild
+++ b/dev-ml/base/base-0.14.0.ebuild
@@ -15,6 +15,7 @@ KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt"
 
 RDEPEND="
+	<dev-lang/ocaml-4.12
 	>=dev-ml/sexplib0-0.14.0:=
 	dev-ml/dune-configurator:=
 "
diff --git a/dev-ml/core/Manifest b/dev-ml/core/Manifest
index f0bc8fe66c9f..47abfea8a68f 100644
--- a/dev-ml/core/Manifest
+++ b/dev-ml/core/Manifest
@@ -1,3 +1,5 @@
 DIST core-0.14.0.tar.gz 361607 BLAKE2B 1602857bee142c23101380e6d54b6f8df1be8bb67e8f8baf7ca65c2f248d1ff9794e33d96cc58ca1f591b69e4a16b7873043549e01d38e2fc390c884d117d0a3 SHA512 fd3202c115ccda53aa32233f2eac223dcc3fb6272fd6327ea6aa5dcd3b7295936d86102640046c961a2af45d62aa3563a2701a2e0ef54f6cd2bfcb81609639f4
-EBUILD core-0.14.0-r3.ebuild 641 BLAKE2B edb3da1a6608f21de5b96a3017a411bdac80b3f5652450cd96eafeab2206c156bbe22e37decf29bdddd82782c412aa0573102fdcc46ff36ce05e0b17442b5ada SHA512 f95a79cb182f14280d8b244962e48a0f658b70173929e8c04c1215c0bb9fd4fda3f24f9c9a16daa01684f6665a2e45df3fbb7e989d6372abc8b1c438827c4d80
+DIST core-0.14.1.tar.gz 361679 BLAKE2B ca43016c760e620f9073defd84a07bacaa0557d42fd9a60d6c4c894187671526ae07e0b93d29bee961b3460e1b0ec5cb346cc711d583c71fde94a9bf9992bf7e SHA512 29482b1f611f2f15f11562bfed7f8a47d2926333601ed57867c8c134d4b10dbf2ba0309ceb6ae602fe8bca1e1f9324603dba37a5df3183cd0cb690104817ed3f
+EBUILD core-0.14.0-r3.ebuild 663 BLAKE2B 1603396fc7966e792be0d0320b79ca222694d8294ecb657f70794ff69838c9c77401f2c986e93810945a418f2094371afe31bd56183e503c1fb1ed1295c20dee SHA512 6afad762041ff18d91d7be8dd136eaa92d4e51d55d22ce674c56b161104c91d618866db19b65c89e567c8bca5d7209d51d8af5adf6c46c16b5e2c929e20e5726
+EBUILD core-0.14.1.ebuild 712 BLAKE2B 034642d0b7b7e414a3a24dddc76800bec600df99377d8b8f6160975083dcd123db50aa0d415c75b00cfb027845e49a09733b97b0abbcf33979b5f099abf51a36 SHA512 8abcec2a7fddfa7bba42194f87c943f71fed22e9ab7e2fff44e964162e4516c19141d4c4420004c6e7127e064483bc1394df868051b2768e6ec68dfe12d41dea
 MISC metadata.xml 710 BLAKE2B 368091778c4347e69ea5398a3f6013d1741bc9fb20acacc861de152c8afd90d9647ef7b31143c26c7e50e0285b52f2a8688b7203821473004a9b237e65585dd7 SHA512 3d29e7a8c748a4849421fb73a1f1225f6480d032d8eb8bd70870567c8f2ac50ef1504c368204f6f063f71f5c984daff98a1109e81674abc8faca10c5a3414efe
diff --git a/dev-ml/core/core-0.14.0-r3.ebuild b/dev-ml/core/core-0.14.0-r3.ebuild
index 1774dc183f88..59ff7c24b085 100644
--- a/dev-ml/core/core-0.14.0-r3.ebuild
+++ b/dev-ml/core/core-0.14.0-r3.ebuild
@@ -18,6 +18,7 @@ IUSE="+ocamlopt"
 RESTRICT="test"
 
 RDEPEND="
+	<dev-lang/ocaml-4.12
 	dev-ml/base:=
 	dev-ml/core_kernel:=
 	dev-ml/jst-config:=
diff --git a/dev-ml/core/core-0.14.1.ebuild b/dev-ml/core/core-0.14.1.ebuild
new file mode 100644
index 000000000000..6ebd5813a98f
--- /dev/null
+++ b/dev-ml/core/core-0.14.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Jane Street's alternative to the standard library"
+HOMEPAGE="https://github.com/janestreet/core"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+# TODO: Wants quickcheck_deprecated?
+RESTRICT="test"
+
+RDEPEND="
+	dev-ml/base:=
+	dev-ml/core_kernel:=
+	dev-ml/jst-config:=
+	dev-ml/ppx_jane:=
+	dev-ml/sexplib:=
+	dev-ml/spawn:=
+	dev-ml/stdio:=
+	dev-ml/timezone:=
+"
+DEPEND="${RDEPEND}"
+
+src_compile() {
+	dune build @install --profile release || die
+}
diff --git a/dev-ml/core_bench/Manifest b/dev-ml/core_bench/Manifest
index f383183115d1..756fb569b697 100644
--- a/dev-ml/core_bench/Manifest
+++ b/dev-ml/core_bench/Manifest
@@ -1,3 +1,3 @@
 DIST core_bench-0.14.0.tar.gz 42972 BLAKE2B a65585d2cae5080e23d9b8897d15f7ac6e42c36280a06ff21b5f46d5532f3265b672f7d6373573826b80f5f6dc93343b3e93bf8c3d5b471e6717162e9fac4025 SHA512 e86a04c12832ba281669139d74e942ab1ff8d7dc799ea1687cf57a50ef1c7b031191aa1cc44c50586fcfca8e83c3c6f1a8b1aeb40c724fbaaa0e0568c393d75a
-EBUILD core_bench-0.14.0.ebuild 557 BLAKE2B 1a2acc2519e360f7522e07d33a9999b57d8a5f9d335b2a369597c8d59fcdac52af1373d7078994ec90dfecf4d445efcab9b78160299cbf4936fc5abac8a070d9 SHA512 b457aa15b7851a7d0ce69762a9a3dc8c6445ed37dd1bbfd6d325bdf3c100066d591f1925a1da9a9b5d8f6d01d0e992a170b522b08498d0bb25dcb931d356bb2d
+EBUILD core_bench-0.14.0.ebuild 622 BLAKE2B bb3f7bc58d9a4e4de633aecb296e9b2500e06e24e19033bc38d8c2d55f36b81f767c8ac81ec82fa37ae1ddc8d865258164030099d2f565198188c57d94c20cf9 SHA512 79569d266887e26447472493efd8e50f4672666b68380f3256566e8f28b8b5f6808b5a2b2fdeda9f34e4f13e5217bbc3351a64943ff1f4d9177d89bacc15828d
 MISC metadata.xml 319 BLAKE2B e07f2c98a308c50d4037dd942b1a82a4b4a8c71d4be94f96611d8e2955b22c0b78a7bb729030a6ed595fc4ed65f6072bc536f03db4a8a08b43af9d75a65432f6 SHA512 32d64cd410459106199ad3d57a2ddce9651bf95be3b8334632235f9ba3963a0a3fe24142f523889ccd591fa0536b90574e9129fc594c7a7905588978b3aa886d
diff --git a/dev-ml/core_bench/core_bench-0.14.0.ebuild b/dev-ml/core_bench/core_bench-0.14.0.ebuild
index c6b66b01b28d..e181169b6916 100644
--- a/dev-ml/core_bench/core_bench-0.14.0.ebuild
+++ b/dev-ml/core_bench/core_bench-0.14.0.ebuild
@@ -22,3 +22,7 @@ DEPEND="
 	>=dev-ml/re-1.8.0:=
 "
 RDEPEND="${DEPEND}"
+
+src_compile() {
+	dune build @install --profile release || die
+}
diff --git a/dev-ml/labltk/Manifest b/dev-ml/labltk/Manifest
index 737c609c0a67..b4b6a8bdd373 100644
--- a/dev-ml/labltk/Manifest
+++ b/dev-ml/labltk/Manifest
@@ -3,7 +3,7 @@ AUX labltk-8.06.10-this-expression-has-type.patch 644 BLAKE2B 951ccdfa410298bb16
 DIST labltk-8.06.10.tar.gz 371871 BLAKE2B da67b13aa0a0c179c2fcefe6b03f68225b6e886a1233de77b9749be32b8efc845cac60244f9a8494241c8c77c7d6991786280c274becb70f5527ad891c3aac69 SHA512 ef797d21adac48ca5ed35d95ad05fee26f9b6c99b0510909f6087abb9580b8efd219ca65b1efddb170b5409567d83eaaac0473898f5f4db3e15ae4f39df364c8
 DIST labltk-8.06.7.tar.gz 370870 BLAKE2B 2d836c824d9adbd4f03d0e7e81faa51669837eecb4f94f6c89c657966774fe7d6ed928459be3ccca7fd3e7cf67a54ee63f7d2d08dcc8b7e853f5ad64769b33a2 SHA512 3c7352d14bc337adfb1939e72bd2658bb5e60b463f10f3748779084d1b7a6e6225028c775b548e355d69984a8944b91580fa978ff904b20b8b762ba9046f5e7d
 DIST labltk-8.06.9.tar.gz 371504 BLAKE2B 587ff01da120501f85f6d9921e46275858f1e1ce730eef205f9e7d7c64f6d3c0ea701cf832fdb8eb0746e1f0cff1151bccb077641740fb18811473b1553e2940 SHA512 fd6defa302d919f229394c486dcefab110b144534525a87082a27d2cab29c0af4ece3da821098fea25416850ad857f7af979d48790330d62dfb8d8db8f2bf6ca
-EBUILD labltk-8.06.10.ebuild 1031 BLAKE2B 0b291f15603a68a55b067b06d97260aff40ccbf369ba3690a3abc3e5e1716761f461d5290c3213ee5ee1bfe384f22cca05b7db00fbffd0c92d24e8ddefe71916 SHA512 adb3cef90955814d4a0de78e636688132a964ce9d8a56a1867d1c535178812bea47cb9b256a017d82a4abf65dda4ec69617a16db5b8fea9f6fee6b89acc4e3b3
+EBUILD labltk-8.06.10.ebuild 1109 BLAKE2B 43329dcce76e081ee41e741a2c8bf9e089fe835e292e97fcdd5dea84f677155c7a1f3164cce4008f7cdca39b1250328f5eac1bfc0489f49663efe36296a0f572 SHA512 b51fbe704766d898630afcf12e1cac590a610173c385b23c054a5f42a22b8a7c0236c622d60e998e72045ae3e19469d378b9abe1da9fb6c2577ac170bb4a58cb
 EBUILD labltk-8.06.7.ebuild 992 BLAKE2B 67153839b68d13cfdbe8eab47a10c65d03beefbcc08b27edeb9d75c144ef563787978037e6a7a52f6c50707d0ecc52e77c29fe3de509bd19d8c670e4cc82344a SHA512 181baa5df2eada2fb0768691bdf37a2b18e91633e99b529205477310d8eed23a9fd35250aa19ae2e849a09b3ba660483911cc3a3aa60f862f3105ab7e0a1c417
 EBUILD labltk-8.06.9.ebuild 980 BLAKE2B 030b066865f536672e2f097909a622175edb0e0fe622734628cce7cd556ee602041842e99beb79009089e6a59edb450e5542f4ca873ccc732c5bcb10187aab36 SHA512 8c25f38845bc032fba61c9f7694eaf8aa82ca1b80401aad0650fc350dea967dc60bfc53cd625e9de9c6b9f4b551a9c17d1d5adab033b0bd413576e8ece9c6d22
 MISC metadata.xml 233 BLAKE2B 4654803edd576a76b70115913e26d306cc35a2356ed110fb6420e2dd48aef88ab71ee4f5b0cba71b4c2a7624ef42707d405700abf41748e532b9fe0f6cb3b778 SHA512 5158dd5a94fb8cc401825355cc3bb6f04768c6df59fc60593d99f530e27dc448223091a8af25d0e2f4ece9b8a7bf01f4f19f91321901c8f82f55cb4a190b7a70
diff --git a/dev-ml/labltk/labltk-8.06.10.ebuild b/dev-ml/labltk/labltk-8.06.10.ebuild
index 6acd06b500f4..3390c7d7b988 100644
--- a/dev-ml/labltk/labltk-8.06.10.ebuild
+++ b/dev-ml/labltk/labltk-8.06.10.ebuild
@@ -22,9 +22,14 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}/findlib.patch"
-	"${FILESDIR}"/${P}-this-expression-has-type.patch
 )
 
+src_prepare() {
+	has_version "dev-lang/ocaml:0/4.11" && \
+		eapply "${FILESDIR}"/${P}-this-expression-has-type.patch
+	default
+}
+
 src_configure() {
 	./configure --use-findlib --verbose $(usex X "--tk-x11" "--tk-no-x11") || die "configure failed!"
 }
diff --git a/dev-ml/llvm-ocaml/Manifest b/dev-ml/llvm-ocaml/Manifest
index fbd78b3cc31f..3510638bcc1a 100644
--- a/dev-ml/llvm-ocaml/Manifest
+++ b/dev-ml/llvm-ocaml/Manifest
@@ -1,15 +1,11 @@
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
-DIST llvmorg-13.0.0-rc2.tar.gz 147267736 BLAKE2B 153bf7320f2aa911112d366ffc79f7110cb04f135c2a8b176c263f0a75eb768206d9bd462893d45504b0e58aa9e127fdcafb02300eab1666e4616aa654d457dd SHA512 a01baf3eaa02f02af42bfcf6dcf24f166351bf1c09601495617c81e41def23210573bad40a344270f40c5deb881d06863536abac2a6481930766a6a56335fb44
-DIST llvmorg-13.0.0-rc3.tar.gz 147281901 BLAKE2B 640065a2f32dc48edf084d776cb6b950fae86c2a204999e2eec67f93b57615df40adec19785099b0ef2fe11837c3304794ec3585289a5b5051a557618c63c749 SHA512 1401d5a4d6bb5c930d74b9cfbc8e792872f721aab7d7f0c819e2ba5cf47fb818d160c1f71784fba69827f3c9b7414aa91a585d2b813c1851b4799f9d62cebc46
-DIST llvmorg-13.0.0-rc4.tar.gz 147286367 BLAKE2B a43c54b8bb379b0374f99ae07066d7ba4ae2a83dfdb61390101c736f91dc44aa07a88778551aaaf903033562b2a0a863ea6b27392b700c9cddc74e2c7899cad1 SHA512 8ccaaea21ec4fe3c4b4446d3a7cae36a47ed196f407d341da45824bcefefffd3c412c0c5c27670ceaba1458bc53107273f9d3aec2de261b6b82c6d209b45b14d
+DIST llvmorg-13.0.0.tar.gz 147270176 BLAKE2B 628f316b580e1edf3a58d4825b724df759e6ed2a4116802470c04562caefc392fa325c91f388036365a2e45a9595cca6d3557fab12984fc8bcfef29c9116d822 SHA512 8004c05d32b9720fb3391783621690c1df9bd1e97e72cbff9192ed88a84b0acd303b61432145fa917b5b5e548c8cee29b24ef8547dcc8677adf4816e7a8a0eb2
 EBUILD llvm-ocaml-10.0.1.ebuild 2991 BLAKE2B 8f6847347faf4ba2afd66e3b2f8052b27662a9db05ca3d03e5c1ba44ce77ef9731dca1632e21a5bda21ae963531d85db9633f92c33bb9713e0a4b9fdf19ea775 SHA512 2d43e10b0a15ea9b438f93a15bf32575e2d111eea1954c8c36f7ce949774055ee720d448cfd7e08a7627539ca8095d81c8f65e69de926475b8f40d5dbcc75db0
 EBUILD llvm-ocaml-11.1.0.ebuild 3054 BLAKE2B 0498a14f644a956cf1a495c4b10687328cdd7044b4cf90e09d51c3c93c3f8e7eae29e93b605e7079975cf9b585e14e0c50c85f6b210d6516395f3278f0c2cace SHA512 28ac245ce6fb5caafec11a501e4a8e7a39bf15bad171b445f9b6faf82b8c3a4416925c42ac022bddf262332ca275de3969735b99e642df8c3b64ab3b7d04f85a
 EBUILD llvm-ocaml-12.0.1.ebuild 3060 BLAKE2B ed1223c503df5487c666642a02df41095eb724b46a79c1204f8ce2ff6b9eb650fbb46907d00e721c1ecb5df6648afdefeca6dabca456ab54656fc45871beff80 SHA512 57cdf97cf5a401a5ec33f15f8fb1c83998a7503b4ebcab1c2e35c2b35519d9b30f4b25598ddc2f8e6757f6de42a6a5878ab43e50fd45f1df0db6549a204b1680
 EBUILD llvm-ocaml-13.0.0.9999.ebuild 2580 BLAKE2B d044f3d8750bf37a1f9079a0f7659edc50f220abaeff810415062774adde9917e074ae1034da360cd4144e6f23a850b6485b83332edffc89a36282362d76f067 SHA512 2b9d1d759648d36996dcda05b872a204081247100e4cb1efe674ae3853d137ab4169115f4d0466d5b02316e1a35a302733085257bf96e22b8ba964d868e670dd
-EBUILD llvm-ocaml-13.0.0_rc2.ebuild 2580 BLAKE2B d044f3d8750bf37a1f9079a0f7659edc50f220abaeff810415062774adde9917e074ae1034da360cd4144e6f23a850b6485b83332edffc89a36282362d76f067 SHA512 2b9d1d759648d36996dcda05b872a204081247100e4cb1efe674ae3853d137ab4169115f4d0466d5b02316e1a35a302733085257bf96e22b8ba964d868e670dd
-EBUILD llvm-ocaml-13.0.0_rc3.ebuild 2580 BLAKE2B d044f3d8750bf37a1f9079a0f7659edc50f220abaeff810415062774adde9917e074ae1034da360cd4144e6f23a850b6485b83332edffc89a36282362d76f067 SHA512 2b9d1d759648d36996dcda05b872a204081247100e4cb1efe674ae3853d137ab4169115f4d0466d5b02316e1a35a302733085257bf96e22b8ba964d868e670dd
-EBUILD llvm-ocaml-13.0.0_rc4.ebuild 2580 BLAKE2B d044f3d8750bf37a1f9079a0f7659edc50f220abaeff810415062774adde9917e074ae1034da360cd4144e6f23a850b6485b83332edffc89a36282362d76f067 SHA512 2b9d1d759648d36996dcda05b872a204081247100e4cb1efe674ae3853d137ab4169115f4d0466d5b02316e1a35a302733085257bf96e22b8ba964d868e670dd
+EBUILD llvm-ocaml-13.0.0.ebuild 2596 BLAKE2B 4d22e0d0f89b14f338f0dde0701819d5d94f4c298bf024b06c4d13601f6a61e1ecfd7e7db50c8ab1f7c34e0bb9bbed26c5e61e2ddac80bd6766cf1b163f3626a SHA512 aaba7713d7acaff78ab9949765bd2e095bdf7c32a006653967f9a031113b3c3911b01e55c460f67e38da3574bd2dc8d81026a55cad2aea775363287e01b72684
 EBUILD llvm-ocaml-14.0.0.9999.ebuild 2580 BLAKE2B d044f3d8750bf37a1f9079a0f7659edc50f220abaeff810415062774adde9917e074ae1034da360cd4144e6f23a850b6485b83332edffc89a36282362d76f067 SHA512 2b9d1d759648d36996dcda05b872a204081247100e4cb1efe674ae3853d137ab4169115f4d0466d5b02316e1a35a302733085257bf96e22b8ba964d868e670dd
 MISC metadata.xml 217 BLAKE2B 23799663344acc2d532fc6fa7dd798813aef7293fcab616d6300b15a6e603b6d17ca63d5153eb8da1b976215d8e3775e8d3a67026bacc9693993d48ec1cb69a9 SHA512 e13d0436d3a3a449723277a37ae4c5a673139b6da818adf7ad7654d94d3948ed8607b1c27e83e963bf450bd2d5a650c985e27ff5a531db9813cb4ab10b985dd6
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-13.0.0_rc2.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-13.0.0.ebuild
index d0039fc6ae95..6fb5f35078cf 100644
--- a/dev-ml/llvm-ocaml/llvm-ocaml-13.0.0_rc2.ebuild
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-13.0.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0/${PV}"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="debug test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-13.0.0_rc3.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-13.0.0_rc3.ebuild
deleted file mode 100644
index d0039fc6ae95..000000000000
--- a/dev-ml/llvm-ocaml/llvm-ocaml-13.0.0_rc3.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit cmake llvm llvm.org python-any-r1
-
-DESCRIPTION="OCaml bindings for LLVM"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0/${PV}"
-KEYWORDS=""
-IUSE="debug test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-lang/ocaml-4.00.0:0=
-	dev-ml/ocaml-ctypes:=
-	~sys-devel/llvm-${PV}:=[debug?]
-	!sys-devel/llvm[ocaml(-)]"
-
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-lang/perl
-	dev-ml/findlib
-	>=dev-util/cmake-3.16
-	test? ( dev-ml/ounit2 )
-	${PYTHON_DEPS}"
-
-LLVM_COMPONENTS=( llvm )
-LLVM_USE_TARGETS=llvm
-llvm.org_set_globals
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-
-		-DBUILD_SHARED_LIBS=OFF
-		-DLLVM_BUILD_LLVM_DYLIB=ON
-		-DLLVM_LINK_LLVM_DYLIB=ON
-		-DLLVM_OCAML_OUT_OF_TREE=ON
-
-		# cheap hack: LLVM combines both anyway, and the only difference
-		# is that the former list is explicitly verified at cmake time
-		-DLLVM_TARGETS_TO_BUILD=""
-		-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
-		-DLLVM_BUILD_TESTS=$(usex test)
-
-		# disable various irrelevant deps and settings
-		-DLLVM_ENABLE_FFI=OFF
-		-DLLVM_ENABLE_TERMINFO=OFF
-		-DHAVE_HISTEDIT_H=NO
-		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
-		-DLLVM_ENABLE_EH=ON
-		-DLLVM_ENABLE_RTTI=ON
-
-		-DLLVM_HOST_TRIPLE="${CHOST}"
-
-		-DPython3_EXECUTABLE="${PYTHON}"
-
-		# disable go bindings
-		-DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND
-
-		# TODO: ocamldoc
-	)
-
-	use test && mycmakeargs+=(
-		-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_src_configure
-
-	local llvm_libdir=$(llvm-config --libdir)
-	# an ugly hack; TODO: figure out a way to pass -L to ocaml...
-	cd "${BUILD_DIR}/${libdir}" || die
-	ln -s "${llvm_libdir}"/*.so . || die
-
-	if use test; then
-		local llvm_bindir=$(llvm-config --bindir)
-		# Force using system-installed tools.
-		sed -i -e "/llvm_tools_dir/s@\".*\"@\"${llvm_bindir}\"@" \
-			"${BUILD_DIR}"/test/lit.site.cfg.py || die
-	fi
-}
-
-src_compile() {
-	cmake_build ocaml_all
-}
-
-src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-llvm-bindings-ocaml
-}
-
-src_install() {
-	DESTDIR="${D}" \
-	cmake -P "${BUILD_DIR}"/bindings/ocaml/cmake_install.cmake || die
-
-	dodoc bindings/ocaml/README.txt
-}
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-13.0.0_rc4.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-13.0.0_rc4.ebuild
deleted file mode 100644
index d0039fc6ae95..000000000000
--- a/dev-ml/llvm-ocaml/llvm-ocaml-13.0.0_rc4.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit cmake llvm llvm.org python-any-r1
-
-DESCRIPTION="OCaml bindings for LLVM"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0/${PV}"
-KEYWORDS=""
-IUSE="debug test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-lang/ocaml-4.00.0:0=
-	dev-ml/ocaml-ctypes:=
-	~sys-devel/llvm-${PV}:=[debug?]
-	!sys-devel/llvm[ocaml(-)]"
-
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-lang/perl
-	dev-ml/findlib
-	>=dev-util/cmake-3.16
-	test? ( dev-ml/ounit2 )
-	${PYTHON_DEPS}"
-
-LLVM_COMPONENTS=( llvm )
-LLVM_USE_TARGETS=llvm
-llvm.org_set_globals
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-
-		-DBUILD_SHARED_LIBS=OFF
-		-DLLVM_BUILD_LLVM_DYLIB=ON
-		-DLLVM_LINK_LLVM_DYLIB=ON
-		-DLLVM_OCAML_OUT_OF_TREE=ON
-
-		# cheap hack: LLVM combines both anyway, and the only difference
-		# is that the former list is explicitly verified at cmake time
-		-DLLVM_TARGETS_TO_BUILD=""
-		-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
-		-DLLVM_BUILD_TESTS=$(usex test)
-
-		# disable various irrelevant deps and settings
-		-DLLVM_ENABLE_FFI=OFF
-		-DLLVM_ENABLE_TERMINFO=OFF
-		-DHAVE_HISTEDIT_H=NO
-		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
-		-DLLVM_ENABLE_EH=ON
-		-DLLVM_ENABLE_RTTI=ON
-
-		-DLLVM_HOST_TRIPLE="${CHOST}"
-
-		-DPython3_EXECUTABLE="${PYTHON}"
-
-		# disable go bindings
-		-DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND
-
-		# TODO: ocamldoc
-	)
-
-	use test && mycmakeargs+=(
-		-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_src_configure
-
-	local llvm_libdir=$(llvm-config --libdir)
-	# an ugly hack; TODO: figure out a way to pass -L to ocaml...
-	cd "${BUILD_DIR}/${libdir}" || die
-	ln -s "${llvm_libdir}"/*.so . || die
-
-	if use test; then
-		local llvm_bindir=$(llvm-config --bindir)
-		# Force using system-installed tools.
-		sed -i -e "/llvm_tools_dir/s@\".*\"@\"${llvm_bindir}\"@" \
-			"${BUILD_DIR}"/test/lit.site.cfg.py || die
-	fi
-}
-
-src_compile() {
-	cmake_build ocaml_all
-}
-
-src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-llvm-bindings-ocaml
-}
-
-src_install() {
-	DESTDIR="${D}" \
-	cmake -P "${BUILD_DIR}"/bindings/ocaml/cmake_install.cmake || die
-
-	dodoc bindings/ocaml/README.txt
-}
diff --git a/dev-ml/lwt/Manifest b/dev-ml/lwt/Manifest
index aafcf29ea922..e6e2829a08a8 100644
--- a/dev-ml/lwt/Manifest
+++ b/dev-ml/lwt/Manifest
@@ -1,4 +1,5 @@
+AUX lwt-5.3.0-ocaml-4.12.patch 652 BLAKE2B 743c149e53b45dca0797b4b6ceb7cdb9eda64b2233561ac11be492223ff94a5043703651899bf42051b9dfe6481e6f84c6ac968ecf708d9fda09e5dd911f0e2c SHA512 d3073948decaeb3888ee93b5a41fb7ef6db69390a08bf5e78752f85a5c7453a3c0abae0dae0fda9a950acc76560937f7e03dc4bc6c81cbcbbb9998d0282b7c79
 AUX lwt-5.3.0-ppxlib-0.18.0.patch 13548 BLAKE2B fa89411ea65421eb8f8b7f7f782817c27f21d88a12a95a6a8a9d858c6e6665d2a79432ec237daf77d594ba11e4ef1e71921779084055e8df695b696f81b6ce06 SHA512 cd5dc33e0b3366445ce491efda7ff55fcf7f628138fc8213dfa8a7d425d44fd7b312d9008ff1bad5216bb8179bc0e41e5844d1826237c3c26f657d7ec5410671
 DIST lwt-5.3.0.tar.gz 298152 BLAKE2B a39494bf98fcca07bf4601a742f4bfdc1ea2a67e2babbab650c41d2df58296a859520509ddc080af9c4d55be76439b401174720765fb942586d7c866f80cc538 SHA512 9922c19944595b0c07da8e1bbdecb2cc7c5a7edcdc2224215efb819d9c735da8986388a2446bd0762e28533f5d9d386970f07a4f1b0d14255c6743f3a1d16cb6
-EBUILD lwt-5.3.0-r1.ebuild 798 BLAKE2B eef325ce5007d70b4d2925513c7bd421a002ba17a5dd4b0f3a2f5234c04af2841e02af4b515aa7bd537eeb2c03a873ec775d792fc4067811f15b4a7b50741aac SHA512 999d03e9b1c86e9ba9b7f0b6085b7b61e3477ea8a8aa9e7d7808038284e9678d9d79e70926ada1d3db6678bac44a6b9212f84fd7a80302090133362012f0f7c9
-MISC metadata.xml 321 BLAKE2B b05531b4f8b4ad6cc9b111231a7c114970a4506514f099156653fae278076399f50900d339d735cdbdf1a98206c822a3e581839e04ab82bccf994888e8b966aa SHA512 8a5dd27270f1a9ecdd18cb632a7e5812a3b5d6a4cbc87e4fbf5ab4e7396302722a3583584939b8d2fe0182cc70cd79b0c32798edcdb516ebdd472c7b316208cf
+EBUILD lwt-5.3.0-r1.ebuild 900 BLAKE2B 81df205f80c964da2d0caf0ed5437731507e6eae59700279e55d702c442800b3f9051fd07afa67437b6d52b316a7cfc73dfdd9990514789df43b964688c9c139 SHA512 88dac96b1bf0bcc7dc08f7ddbda5cc065055e0cd0865d32a2da6344823cb8efa3ff1371f68042b92e1ee88df5913ed74bcd2628be50b080ad974905d957a30d2
+MISC metadata.xml 414 BLAKE2B 34a1192334c52a4dfe3746119293c05cccc14f6a4b7b5faad4834ad33996a98be8c7854096eebe870a4a0bdc675d796f55788334503423a99632b1625d84b8d9 SHA512 09660f044d6132779e8e63fe6dbca02109317f70af905181b8b344348c72257df804022fedf884c84ddbfe2d60dbcb965e3cc273c30c593f70a083d80c2f92aa
diff --git a/dev-ml/lwt/files/lwt-5.3.0-ocaml-4.12.patch b/dev-ml/lwt/files/lwt-5.3.0-ocaml-4.12.patch
new file mode 100644
index 000000000000..048e28d1d6bc
--- /dev/null
+++ b/dev-ml/lwt/files/lwt-5.3.0-ocaml-4.12.patch
@@ -0,0 +1,24 @@
+--- a/src/unix/lwt_unix.cppo.ml	2021-10-01 20:35:45.285987395 +0200
++++ b/src/unix/lwt_unix.cppo.ml	2021-10-01 20:36:19.570493202 +0200
+@@ -1819,6 +1819,9 @@
+   | SO_ACCEPTCONN
+   | TCP_NODELAY
+   | IPV6_ONLY
++#if OCAML_VERSION >= (4, 12, 0)
++  | SO_REUSEPORT
++#endif
+ 
+ type socket_int_option =
+   Unix.socket_int_option =
+--- a/src/unix/lwt_unix.cppo.mli	2021-10-01 20:33:57.558539065 +0200
++++ b/src/unix/lwt_unix.cppo.mli	2021-10-01 20:35:30.393202008 +0200
+@@ -1008,6 +1008,9 @@
+   | SO_ACCEPTCONN
+   | TCP_NODELAY
+   | IPV6_ONLY
++#if OCAML_VERSION >= (4, 12, 0)
++  | SO_REUSEPORT
++#endif
+ 
+ type socket_int_option =
+     Unix.socket_int_option =
diff --git a/dev-ml/lwt/lwt-5.3.0-r1.ebuild b/dev-ml/lwt/lwt-5.3.0-r1.ebuild
index b635eab67eb5..40958766de01 100644
--- a/dev-ml/lwt/lwt-5.3.0-r1.ebuild
+++ b/dev-ml/lwt/lwt-5.3.0-r1.ebuild
@@ -32,4 +32,9 @@ BDEPEND="
 # backported from https://github.com/ocsigen/lwt/pull/807
 PATCHES=(
 	"${FILESDIR}"/${PN}-5.3.0-ppxlib-0.18.0.patch
+	"${FILESDIR}"/${P}-ocaml-4.12.patch
 )
+
+src_compile() {
+	dune build @install --profile release || die
+}
diff --git a/dev-ml/lwt/metadata.xml b/dev-ml/lwt/metadata.xml
index 18be4f6c21a9..52dc9a8f7464 100644
--- a/dev-ml/lwt/metadata.xml
+++ b/dev-ml/lwt/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="project">
+		<email>ml@gentoo.org</email>
+		<name>ML</name>
+	</maintainer>
 	<maintainer type="person">
 		<email>gienah@gentoo.org</email>
 		<name>Mark Wright</name>
diff --git a/dev-ml/merlin/Manifest b/dev-ml/merlin/Manifest
index d2dc0b9c546c..27ac48a08b3b 100644
--- a/dev-ml/merlin/Manifest
+++ b/dev-ml/merlin/Manifest
@@ -2,5 +2,5 @@ AUX 50merlin-gentoo.el 195 BLAKE2B a5bcca9e3af1810b18337680b4878dcfc41296b98a4b9
 DIST merlin-3.4.2.tar.gz 11016272 BLAKE2B 6fa55423df7ae8f7a8056e90be630f148dd101194de1921605843caf805bd6c9694fa3fe5b8c2f8eff5d57d7d0e9d8653036b6165a49af655158925c7af87d2f SHA512 8225366ebf27ca656ca89fe00d5aec581487ae332aeab81568e7606eaf575648a7614d4d2de8e0757a4e69c6f4014fefa4574c95da13d42acb310c9dd58a468a
 DIST merlin-4.1.tar.gz 2136082 BLAKE2B 3e7e1996611f0cefb3a33b2a78cd36b6e8b84d48bc48f46c45ba340c4be1b93b4a1876f8f4192e911c1c384c416ad7502ba3c7a2abb72eff01215f9fb26bfaf0 SHA512 f0f3ada007f8214b97a8557bddca87eded48ee01a8bb88aba6476e52881ead52d9f47e2666a9292b5c6a490e4cfdc7d8bb322e8489f78eaac7b0f80b6d1e87bc
 EBUILD merlin-3.4.2-r1.ebuild 1265 BLAKE2B a12e5b68da2899f57ecb73de9ff4558a2069fef7056f7a6775616801bd809d058e8c457afe7c659e16f31861786311871860ce2ef58460f50a738939ffab9750 SHA512 355c89138e3838407d9f05d1d393411307700deb38fca7f17efb6cce553f2a4d159fb2b13568704bca3c655dfb975e50afa52f314f7c8815370f3ebf1cf74188
-EBUILD merlin-4.1-r2.ebuild 1258 BLAKE2B 0827684f440916233f9577321217024ffe796ca3cf233d657eae007758638c5d3e1f9f4388d0d6fb430e27a6fcfc65ca8b3ac567132144c300a45b3f9d3a4cfe SHA512 f9960931fae791496b32be1796326a7785652457e1551ba8491e744083c0efe2b11ced05e209bacafa78aae0dcb596a09611553fa30bb75eed5fcd230287ee3e
+EBUILD merlin-4.1-r2.ebuild 1404 BLAKE2B 95db10376b3937bfeff54106b8aa1099ba852590b07a670f1499764862e7f1dd74e05efc461570947e0d5f9dc5c94d3ed9bc1449805e91bae33358cace53dd68 SHA512 07798a89c19f854966f3e078127a1f599b61e17ff905f5dd300ac8101b87465995f536c85cf6ea92db0b9f3d5e34419aa11c3d36baa61ceb4386c398e4707ae9
 MISC metadata.xml 310 BLAKE2B f1255dfdcb6984112e896735ea40f1171a8d52149fa7e8ed279efc1fe08de9b071554f5168bc3f8c0e432bd8344c69f5c5716c5c689ff4ff4edbc27569546246 SHA512 06710c33027574e4c13259e30ca5e862b7bbda0442013676020d00dd1114e92ebee92fa19d2993fc3881c10f9db7b51dd2710fcfbcf9ca7564f8f96e5065705e
diff --git a/dev-ml/merlin/merlin-4.1-r2.ebuild b/dev-ml/merlin/merlin-4.1-r2.ebuild
index 70e3b0b53a56..20b1824bea52 100644
--- a/dev-ml/merlin/merlin-4.1-r2.ebuild
+++ b/dev-ml/merlin/merlin-4.1-r2.ebuild
@@ -13,7 +13,8 @@ SRC_URI="https://github.com/ocaml/merlin/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0/${PV}"
 KEYWORDS="~amd64"
-IUSE="emacs +ocamlopt"
+IUSE="emacs +ocamlopt test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-ml/csexp:=
@@ -26,7 +27,8 @@ RDEPEND="
 		app-emacs/company-mode
 	)
 "
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	test? ( app-misc/jq )"
 
 SITEFILE="50${PN}-gentoo.el"
 
@@ -35,6 +37,9 @@ src_prepare() {
 
 	# Handle installation via the eclass
 	rm emacs/dune || die
+
+	# rm failing test
+	rm -r tests/test-dirs/locate/context-detection/cd-mod_constr.t || die
 }
 
 src_compile() {
diff --git a/dev-ml/opam-format/Manifest b/dev-ml/opam-format/Manifest
index 79cbb16021d4..47e15659e9cf 100644
--- a/dev-ml/opam-format/Manifest
+++ b/dev-ml/opam-format/Manifest
@@ -1,7 +1,7 @@
 AUX debian-Port-to-Dose3-6.0.1.patch 5223 BLAKE2B 8fada8b358cfae3aab9f6b8f0554894f55081197760a08b544229fdcc9d74434c1408cf72a8bb1d4280d11ef94d593ebb54a8f656617d99191d3576d02556793 SHA512 969c79a0552e0ea2388f732ca266d07b4c2a5a6945bd75daa2a435340ffbd8d87d2ada39dbab9cb364b2ad918f60600a59cf1fc06290a3dcbb68568c52fc9c7d
 DIST opam-2.0.8.tar.gz 643221 BLAKE2B 66510a18285f315fe95665e8ba2f334dd44211c716543cdc25f2951a7dfe537f115981046e5963fd08deea4c76f5672fa7cf8e7af2274a713a3165bdd0bac8c2 SHA512 14737dc994be2c54dfeaf2658d3713178033e1bc2b4b845a58b4bfc118bbbf12b502924add0ae32b4b2b6c1944462e5ee7143df3de362d9ee39573249d013bc9
 DIST opam-2.0.9.tar.gz 644429 BLAKE2B d96ee79685a8ee8ff82c7570a747c80e38d86e513736a27904a4e471d1eaf432db72998251ac786cb8fbf1ad425fff42b772c5d26934e0929aae75c0946d4659 SHA512 0d8ee19ac0f3df9de4fd9cfa8daab1f7228f090f5e2e7e26bedf24d8c2ab377aade95048f2d7cd9ee9dbbe738729e26dc99f41f730fa2252df74953362464a22
-EBUILD opam-format-2.0.8-r2.ebuild 817 BLAKE2B ad9a97d3d0439fa4fc6382c423be2d9202e322426c4d58e8bcad567aea6569862365f24dd21275efd4b74ee5e6f9a97dc564e0ff564a39a8a666d69d72adecdd SHA512 973f9bc28a2fa479bb84f5fc9ef8a5852fd606a1d936d15bf8c3f225ee8fd08004d7daa4b834fe69724686db7767771a2938fde776b320eef76396776ab82e76
-EBUILD opam-format-2.0.8-r3.ebuild 984 BLAKE2B 2d0ac08a3955b84ada2dfdcbca6c6fa86e23ef3f5a6c268d8fd775a48d50b6fdf4c6e29d24468ab28ff0c64eb07da59b9dae1ea0673482401230b4171662fabd SHA512 3c0a3534f139b29de193c253c58d8e2693945121af29dfb92a3c69f2e81685187efc5cb610c3208b88ee4b5333681dc70dfaf081e4fb304f9b290c0d52d50e29
-EBUILD opam-format-2.0.9.ebuild 984 BLAKE2B 2d0ac08a3955b84ada2dfdcbca6c6fa86e23ef3f5a6c268d8fd775a48d50b6fdf4c6e29d24468ab28ff0c64eb07da59b9dae1ea0673482401230b4171662fabd SHA512 3c0a3534f139b29de193c253c58d8e2693945121af29dfb92a3c69f2e81685187efc5cb610c3208b88ee4b5333681dc70dfaf081e4fb304f9b290c0d52d50e29
+EBUILD opam-format-2.0.8-r2.ebuild 839 BLAKE2B 9bd5bc8b71da0ecb840f1f5cb14f78052d4d0f1ce8a2beeafa8f7afac25dc1840f48dfb84087fc964d0e72ea8748c48a3df250eb3d29e7197ef949c532faadf2 SHA512 8f78d05582ada892d34954cca1265737a83932bda148890c2ce954a8909cac035f9c5c6c73ec693e7edc193750ee28e5664c26b4d4097fee194a54b7c351cf96
+EBUILD opam-format-2.0.8-r3.ebuild 1049 BLAKE2B 15d7e8ede597b898a9ca914af74a942ff1ba7c1af184439c0d3c71df22899402847d419b95c0c08a53f3297599a2697e2f45206a2cbd4c5831da65ed05f0eee0 SHA512 dd0beec122699837ac24daadefd8322230ac25ba00f36de750f63295dee21bd8737590e08855618aa6dc71c8630a504870a21d79d8b083b43bbaa9d597e90a9d
+EBUILD opam-format-2.0.9.ebuild 1049 BLAKE2B 15d7e8ede597b898a9ca914af74a942ff1ba7c1af184439c0d3c71df22899402847d419b95c0c08a53f3297599a2697e2f45206a2cbd4c5831da65ed05f0eee0 SHA512 dd0beec122699837ac24daadefd8322230ac25ba00f36de750f63295dee21bd8737590e08855618aa6dc71c8630a504870a21d79d8b083b43bbaa9d597e90a9d
 MISC metadata.xml 413 BLAKE2B cbdd94927312b95f2b5f76489f341f658974be49f704b81a4524879bbe780dcc5d9505b863b87da002cd98b8bb1e13967b047095dbe1eac589acd3145b66fc6c SHA512 afe675cebc52bba018a89d8f04b5c993ae8306f8d18ae2175be4c372f3219c63606b34bbb45c7daaab53be8eb7747fb7e86417bd29bbed2753458f564f3078da
diff --git a/dev-ml/opam-format/opam-format-2.0.8-r2.ebuild b/dev-ml/opam-format/opam-format-2.0.8-r2.ebuild
index 54b3b0ce46df..eb552240221e 100644
--- a/dev-ml/opam-format/opam-format-2.0.8-r2.ebuild
+++ b/dev-ml/opam-format/opam-format-2.0.8-r2.ebuild
@@ -19,6 +19,7 @@ KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt"
 
 RDEPEND="
+	<dev-lang/ocaml-4.12
 	~dev-ml/opam-core-${PV}:=
 	dev-ml/re:=
 	dev-ml/opam-file-format:=
diff --git a/dev-ml/opam-format/opam-format-2.0.8-r3.ebuild b/dev-ml/opam-format/opam-format-2.0.8-r3.ebuild
index ace83b9a6ae8..ac4e8512b380 100644
--- a/dev-ml/opam-format/opam-format-2.0.8-r3.ebuild
+++ b/dev-ml/opam-format/opam-format-2.0.8-r3.ebuild
@@ -40,3 +40,7 @@ src_prepare() {
 		  (flags (:standard -warn-error -3-9-33))))
 	EOF
 }
+
+src_compile() {
+	dune build @install --profile release || die
+}
diff --git a/dev-ml/opam-format/opam-format-2.0.9.ebuild b/dev-ml/opam-format/opam-format-2.0.9.ebuild
index ace83b9a6ae8..ac4e8512b380 100644
--- a/dev-ml/opam-format/opam-format-2.0.9.ebuild
+++ b/dev-ml/opam-format/opam-format-2.0.9.ebuild
@@ -40,3 +40,7 @@ src_prepare() {
 		  (flags (:standard -warn-error -3-9-33))))
 	EOF
 }
+
+src_compile() {
+	dune build @install --profile release || die
+}
diff --git a/dev-ml/opam-repository/Manifest b/dev-ml/opam-repository/Manifest
index 866d1b118ccc..34da9e43b6bc 100644
--- a/dev-ml/opam-repository/Manifest
+++ b/dev-ml/opam-repository/Manifest
@@ -1,7 +1,7 @@
 AUX debian-Port-to-Dose3-6.0.1.patch 5223 BLAKE2B 8fada8b358cfae3aab9f6b8f0554894f55081197760a08b544229fdcc9d74434c1408cf72a8bb1d4280d11ef94d593ebb54a8f656617d99191d3576d02556793 SHA512 969c79a0552e0ea2388f732ca266d07b4c2a5a6945bd75daa2a435340ffbd8d87d2ada39dbab9cb364b2ad918f60600a59cf1fc06290a3dcbb68568c52fc9c7d
 DIST opam-2.0.8.tar.gz 643221 BLAKE2B 66510a18285f315fe95665e8ba2f334dd44211c716543cdc25f2951a7dfe537f115981046e5963fd08deea4c76f5672fa7cf8e7af2274a713a3165bdd0bac8c2 SHA512 14737dc994be2c54dfeaf2658d3713178033e1bc2b4b845a58b4bfc118bbbf12b502924add0ae32b4b2b6c1944462e5ee7143df3de362d9ee39573249d013bc9
 DIST opam-2.0.9.tar.gz 644429 BLAKE2B d96ee79685a8ee8ff82c7570a747c80e38d86e513736a27904a4e471d1eaf432db72998251ac786cb8fbf1ad425fff42b772c5d26934e0929aae75c0946d4659 SHA512 0d8ee19ac0f3df9de4fd9cfa8daab1f7228f090f5e2e7e26bedf24d8c2ab377aade95048f2d7cd9ee9dbbe738729e26dc99f41f730fa2252df74953362464a22
-EBUILD opam-repository-2.0.8-r1.ebuild 921 BLAKE2B 1e39fbd674834241eb5eb27768cbe829951cfd15d17811b92134d4f3b97ec2fcdc8a2bf86e5eaee696e175ca1ca23d5f73f2752e53754b73ba8147cb7d044d9f SHA512 071d1c33e57180cbb182eb05e7b044862bc5af3736a904a15e029488cb017cb85249b936d4e2c4f739818d996c02791dc50eeddfac2f43aaac4e3c1e8883a4ac
-EBUILD opam-repository-2.0.8.ebuild 754 BLAKE2B f9d6d9b652e5bd1911cc8f9596a1568928915001d1e1dfa826d760d967d0c867468332496400a844f4d35fa6704656a6718fa9c25ff52ac5469b28cae92da817 SHA512 4f19f6d9dfa8760338fb68b843e6617d6b0cd96673ed4c5ae6a1229c09c8ffabb02e3ed41363d1075988b1f0fbe526cc7b3162cf0cdb01653b6bf57cfb746e42
-EBUILD opam-repository-2.0.9.ebuild 921 BLAKE2B 1e39fbd674834241eb5eb27768cbe829951cfd15d17811b92134d4f3b97ec2fcdc8a2bf86e5eaee696e175ca1ca23d5f73f2752e53754b73ba8147cb7d044d9f SHA512 071d1c33e57180cbb182eb05e7b044862bc5af3736a904a15e029488cb017cb85249b936d4e2c4f739818d996c02791dc50eeddfac2f43aaac4e3c1e8883a4ac
+EBUILD opam-repository-2.0.8-r1.ebuild 986 BLAKE2B b3b1d78d56d5a1524577eb1823110626a25a9d53a0014e9b60c2c0c54458850a141ab328805660d0608e106ca9e68baa382f8e2597aaf4980943bd7e126605b5 SHA512 4bb978d312e6e3e317b0c56d815293e0fbd8e65aaea93814dedc15af627a4082bb34ddc1617666d68201fdd872e811bb59ef31aee54cc2f09546a0b97bd6a6a3
+EBUILD opam-repository-2.0.8.ebuild 776 BLAKE2B 4d63d9ee36f06e82b59510c92c3d5923a17ecb9626427681358d340780e98e1490b1e87366120f9c5429f75a1943aa47aeffbed9a50abed72cd3e76fe12c816a SHA512 1bbfe111bc3e9682205f549dcb7b298ccebd92e268ebb585aa68f98255b87b01ac2aa25535e04d0220b16fd6955dfdfa1d4fc0f17d9a60ab361348e92942a7b6
+EBUILD opam-repository-2.0.9.ebuild 986 BLAKE2B b3b1d78d56d5a1524577eb1823110626a25a9d53a0014e9b60c2c0c54458850a141ab328805660d0608e106ca9e68baa382f8e2597aaf4980943bd7e126605b5 SHA512 4bb978d312e6e3e317b0c56d815293e0fbd8e65aaea93814dedc15af627a4082bb34ddc1617666d68201fdd872e811bb59ef31aee54cc2f09546a0b97bd6a6a3
 MISC metadata.xml 413 BLAKE2B cbdd94927312b95f2b5f76489f341f658974be49f704b81a4524879bbe780dcc5d9505b863b87da002cd98b8bb1e13967b047095dbe1eac589acd3145b66fc6c SHA512 afe675cebc52bba018a89d8f04b5c993ae8306f8d18ae2175be4c372f3219c63606b34bbb45c7daaab53be8eb7747fb7e86417bd29bbed2753458f564f3078da
diff --git a/dev-ml/opam-repository/opam-repository-2.0.8-r1.ebuild b/dev-ml/opam-repository/opam-repository-2.0.8-r1.ebuild
index 77365ae1bced..7715c1f74d1a 100644
--- a/dev-ml/opam-repository/opam-repository-2.0.8-r1.ebuild
+++ b/dev-ml/opam-repository/opam-repository-2.0.8-r1.ebuild
@@ -37,3 +37,7 @@ src_prepare() {
 		  (flags (:standard -warn-error -3-9-33))))
 	EOF
 }
+
+src_compile() {
+	dune build @install --profile release || die
+}
diff --git a/dev-ml/opam-repository/opam-repository-2.0.8.ebuild b/dev-ml/opam-repository/opam-repository-2.0.8.ebuild
index 632b71026c65..4bfd5662c257 100644
--- a/dev-ml/opam-repository/opam-repository-2.0.8.ebuild
+++ b/dev-ml/opam-repository/opam-repository-2.0.8.ebuild
@@ -17,6 +17,7 @@ IUSE="+ocamlopt"
 RESTRICT="test"
 
 RDEPEND="
+	<dev-lang/ocaml-4.12
 	~dev-ml/opam-format-${PV}:=
 	dev-ml/re:=
 	dev-ml/dose3:=
diff --git a/dev-ml/opam-repository/opam-repository-2.0.9.ebuild b/dev-ml/opam-repository/opam-repository-2.0.9.ebuild
index 77365ae1bced..7715c1f74d1a 100644
--- a/dev-ml/opam-repository/opam-repository-2.0.9.ebuild
+++ b/dev-ml/opam-repository/opam-repository-2.0.9.ebuild
@@ -37,3 +37,7 @@ src_prepare() {
 		  (flags (:standard -warn-error -3-9-33))))
 	EOF
 }
+
+src_compile() {
+	dune build @install --profile release || die
+}
diff --git a/dev-ml/opam-solver/Manifest b/dev-ml/opam-solver/Manifest
index 4b1bcc5b9fb0..212d7fea8313 100644
--- a/dev-ml/opam-solver/Manifest
+++ b/dev-ml/opam-solver/Manifest
@@ -1,7 +1,7 @@
 AUX debian-Port-to-Dose3-6.0.1.patch 5223 BLAKE2B 8fada8b358cfae3aab9f6b8f0554894f55081197760a08b544229fdcc9d74434c1408cf72a8bb1d4280d11ef94d593ebb54a8f656617d99191d3576d02556793 SHA512 969c79a0552e0ea2388f732ca266d07b4c2a5a6945bd75daa2a435340ffbd8d87d2ada39dbab9cb364b2ad918f60600a59cf1fc06290a3dcbb68568c52fc9c7d
 DIST opam-2.0.8.tar.gz 643221 BLAKE2B 66510a18285f315fe95665e8ba2f334dd44211c716543cdc25f2951a7dfe537f115981046e5963fd08deea4c76f5672fa7cf8e7af2274a713a3165bdd0bac8c2 SHA512 14737dc994be2c54dfeaf2658d3713178033e1bc2b4b845a58b4bfc118bbbf12b502924add0ae32b4b2b6c1944462e5ee7143df3de362d9ee39573249d013bc9
 DIST opam-2.0.9.tar.gz 644429 BLAKE2B d96ee79685a8ee8ff82c7570a747c80e38d86e513736a27904a4e471d1eaf432db72998251ac786cb8fbf1ad425fff42b772c5d26934e0929aae75c0946d4659 SHA512 0d8ee19ac0f3df9de4fd9cfa8daab1f7228f090f5e2e7e26bedf24d8c2ab377aade95048f2d7cd9ee9dbbe738729e26dc99f41f730fa2252df74953362464a22
-EBUILD opam-solver-2.0.8-r1.ebuild 991 BLAKE2B b3b86e67c53021a8da65d5ab28a3f4d7129c288755e59a3f127c3c6c20cd6c2eeb96bef19c6a700fc43616c58e357e276558020545954eedbaa80c9f4670cc25 SHA512 34917ade63f11472c468b91e290f2a929df49b56d0096e827076f7c05df8867644df6fcdcdc4884e7493eb5c636103e3a282a46501cba2b0cca6b62460bd452f
+EBUILD opam-solver-2.0.8-r1.ebuild 1056 BLAKE2B 825aef1af27521197b8376ccfa90a61334a035d8d15606523bcd54a13f720eafa59e7604fb3771d9c1d170026f7a86e88ebe96f9f0995bb0c29bf20597b63301 SHA512 3c6d7039290275bc6e8e355babec59bbc8282229373cd7c3da7eeff75413766bacf05bcbc980831fda64f71f48c0eb6279d50ecfc340bc780c0e98cbed3a3eb5
 EBUILD opam-solver-2.0.8.ebuild 824 BLAKE2B 9a7a5ebb741dec25ff0a3d3c6e0e1c74f7574b70ff352b7c4e602e085a5a1f3f1ca03d1e9c7f062722529b9b49e1fad83960b8d33223354430ea4d072c4fc19d SHA512 6fb412d1581e2f1ad34d988e4bb6e3e427cc8963924a0ac6b1a235287b4c3e2fa3d4a55e99f7bb7c6bde7a130b919b5cf1191c61e576a5d79e70d3813276f732
-EBUILD opam-solver-2.0.9.ebuild 991 BLAKE2B b3b86e67c53021a8da65d5ab28a3f4d7129c288755e59a3f127c3c6c20cd6c2eeb96bef19c6a700fc43616c58e357e276558020545954eedbaa80c9f4670cc25 SHA512 34917ade63f11472c468b91e290f2a929df49b56d0096e827076f7c05df8867644df6fcdcdc4884e7493eb5c636103e3a282a46501cba2b0cca6b62460bd452f
+EBUILD opam-solver-2.0.9.ebuild 1056 BLAKE2B 825aef1af27521197b8376ccfa90a61334a035d8d15606523bcd54a13f720eafa59e7604fb3771d9c1d170026f7a86e88ebe96f9f0995bb0c29bf20597b63301 SHA512 3c6d7039290275bc6e8e355babec59bbc8282229373cd7c3da7eeff75413766bacf05bcbc980831fda64f71f48c0eb6279d50ecfc340bc780c0e98cbed3a3eb5
 MISC metadata.xml 413 BLAKE2B cbdd94927312b95f2b5f76489f341f658974be49f704b81a4524879bbe780dcc5d9505b863b87da002cd98b8bb1e13967b047095dbe1eac589acd3145b66fc6c SHA512 afe675cebc52bba018a89d8f04b5c993ae8306f8d18ae2175be4c372f3219c63606b34bbb45c7daaab53be8eb7747fb7e86417bd29bbed2753458f564f3078da
diff --git a/dev-ml/opam-solver/opam-solver-2.0.8-r1.ebuild b/dev-ml/opam-solver/opam-solver-2.0.8-r1.ebuild
index aa993e87c76c..4a28e3ba2553 100644
--- a/dev-ml/opam-solver/opam-solver-2.0.8-r1.ebuild
+++ b/dev-ml/opam-solver/opam-solver-2.0.8-r1.ebuild
@@ -40,3 +40,7 @@ src_prepare() {
 		  (flags (:standard -warn-error -3-9-33))))
 	EOF
 }
+
+src_compile() {
+	dune build @install --profile release || die
+}
diff --git a/dev-ml/opam-solver/opam-solver-2.0.9.ebuild b/dev-ml/opam-solver/opam-solver-2.0.9.ebuild
index aa993e87c76c..4a28e3ba2553 100644
--- a/dev-ml/opam-solver/opam-solver-2.0.9.ebuild
+++ b/dev-ml/opam-solver/opam-solver-2.0.9.ebuild
@@ -40,3 +40,7 @@ src_prepare() {
 		  (flags (:standard -warn-error -3-9-33))))
 	EOF
 }
+
+src_compile() {
+	dune build @install --profile release || die
+}
diff --git a/dev-ml/opam-state/Manifest b/dev-ml/opam-state/Manifest
index e33b5a1c5355..6f5b43b433ab 100644
--- a/dev-ml/opam-state/Manifest
+++ b/dev-ml/opam-state/Manifest
@@ -1,7 +1,7 @@
 AUX debian-Port-to-Dose3-6.0.1.patch 5223 BLAKE2B 8fada8b358cfae3aab9f6b8f0554894f55081197760a08b544229fdcc9d74434c1408cf72a8bb1d4280d11ef94d593ebb54a8f656617d99191d3576d02556793 SHA512 969c79a0552e0ea2388f732ca266d07b4c2a5a6945bd75daa2a435340ffbd8d87d2ada39dbab9cb364b2ad918f60600a59cf1fc06290a3dcbb68568c52fc9c7d
 DIST opam-2.0.8.tar.gz 643221 BLAKE2B 66510a18285f315fe95665e8ba2f334dd44211c716543cdc25f2951a7dfe537f115981046e5963fd08deea4c76f5672fa7cf8e7af2274a713a3165bdd0bac8c2 SHA512 14737dc994be2c54dfeaf2658d3713178033e1bc2b4b845a58b4bfc118bbbf12b502924add0ae32b4b2b6c1944462e5ee7143df3de362d9ee39573249d013bc9
 DIST opam-2.0.9.tar.gz 644429 BLAKE2B d96ee79685a8ee8ff82c7570a747c80e38d86e513736a27904a4e471d1eaf432db72998251ac786cb8fbf1ad425fff42b772c5d26934e0929aae75c0946d4659 SHA512 0d8ee19ac0f3df9de4fd9cfa8daab1f7228f090f5e2e7e26bedf24d8c2ab377aade95048f2d7cd9ee9dbbe738729e26dc99f41f730fa2252df74953362464a22
-EBUILD opam-state-2.0.8-r1.ebuild 898 BLAKE2B 19479c7ced8afbbf74644e642a026385a4104bc22e6c231a63fc14292a486d66442de41adb764f718d213a6dfede2d0c7f286f428b35b90335869ee743b66e8e SHA512 cbe5c717e72d38a6c482abb47a0ab25f9f77801266312c7e971165a17c8203e1630a9548010106e52bd3cc2275f7e29b6bf11eb2c1a0f121684fa0c0f636c4ba
-EBUILD opam-state-2.0.8.ebuild 737 BLAKE2B 31e5398a6fd835fab9fe0cf31eeebbd2ca587853b8de942ed54511c04b858b2e3f5fd1a3b46c84bd920c639b606db65fea8c863d5ec746ce75dee0bda3a04c83 SHA512 19caab930f0f43ec38319248a23e89e5e3ef3edb46d84a69ad2db8054a13a806deb3846f1bbfc8e96e1d5a27de9f3a0505316f92a5c34d22cb3259136fd96f00
-EBUILD opam-state-2.0.9.ebuild 898 BLAKE2B 19479c7ced8afbbf74644e642a026385a4104bc22e6c231a63fc14292a486d66442de41adb764f718d213a6dfede2d0c7f286f428b35b90335869ee743b66e8e SHA512 cbe5c717e72d38a6c482abb47a0ab25f9f77801266312c7e971165a17c8203e1630a9548010106e52bd3cc2275f7e29b6bf11eb2c1a0f121684fa0c0f636c4ba
+EBUILD opam-state-2.0.8-r1.ebuild 963 BLAKE2B 00540c40668eb6c09ebed2b7b7681140e4ab57c644bc638159be484b7c52edd25c41203d71cfa4c94002f43cabf0196ed79181832ac47ff6dc8ea8a8e157b00a SHA512 1a17c2ce0eef477d1b21dde125094817c80f87dad847dbb43d0024fed59599309f17bea9e3a86e431ec74911dc6c68d6a2a55c9fb30ef4e229aa1a6117fe3e70
+EBUILD opam-state-2.0.8.ebuild 759 BLAKE2B dfbb268b17a66de025f6bf66d76fa7da257cd88646aa6faebe2b35f882d2b5cea6a896f16f640db633d70d0f50054251e6e3e7be3a8c4e5fceae1595bbddaeca SHA512 dcffb7e14d61ab1c584bfe249b03c53d000ccbef2c9f9c60e879b9de94c803df425802675abd27c1e91590b7ea493623ae9c8a03753fe08798ca1483196eaa8c
+EBUILD opam-state-2.0.9.ebuild 963 BLAKE2B 00540c40668eb6c09ebed2b7b7681140e4ab57c644bc638159be484b7c52edd25c41203d71cfa4c94002f43cabf0196ed79181832ac47ff6dc8ea8a8e157b00a SHA512 1a17c2ce0eef477d1b21dde125094817c80f87dad847dbb43d0024fed59599309f17bea9e3a86e431ec74911dc6c68d6a2a55c9fb30ef4e229aa1a6117fe3e70
 MISC metadata.xml 413 BLAKE2B cbdd94927312b95f2b5f76489f341f658974be49f704b81a4524879bbe780dcc5d9505b863b87da002cd98b8bb1e13967b047095dbe1eac589acd3145b66fc6c SHA512 afe675cebc52bba018a89d8f04b5c993ae8306f8d18ae2175be4c372f3219c63606b34bbb45c7daaab53be8eb7747fb7e86417bd29bbed2753458f564f3078da
diff --git a/dev-ml/opam-state/opam-state-2.0.8-r1.ebuild b/dev-ml/opam-state/opam-state-2.0.8-r1.ebuild
index cf9ab72c819e..cde1ebca6cb4 100644
--- a/dev-ml/opam-state/opam-state-2.0.8-r1.ebuild
+++ b/dev-ml/opam-state/opam-state-2.0.8-r1.ebuild
@@ -36,3 +36,7 @@ src_prepare() {
 		  (flags (:standard -warn-error -3-9-33))))
 	EOF
 }
+
+src_compile() {
+	dune build @install --profile release || die
+}
diff --git a/dev-ml/opam-state/opam-state-2.0.8.ebuild b/dev-ml/opam-state/opam-state-2.0.8.ebuild
index 48e053b3e9cf..9e492c922944 100644
--- a/dev-ml/opam-state/opam-state-2.0.8.ebuild
+++ b/dev-ml/opam-state/opam-state-2.0.8.ebuild
@@ -17,6 +17,7 @@ IUSE="+ocamlopt"
 RESTRICT="test"
 
 RDEPEND="
+	<dev-lang/ocaml-4.12
 	dev-ml/re:=
 	dev-ml/opam-file-format:=
 	~dev-ml/opam-repository-${PV}:=
diff --git a/dev-ml/opam-state/opam-state-2.0.9.ebuild b/dev-ml/opam-state/opam-state-2.0.9.ebuild
index cf9ab72c819e..cde1ebca6cb4 100644
--- a/dev-ml/opam-state/opam-state-2.0.9.ebuild
+++ b/dev-ml/opam-state/opam-state-2.0.9.ebuild
@@ -36,3 +36,7 @@ src_prepare() {
 		  (flags (:standard -warn-error -3-9-33))))
 	EOF
 }
+
+src_compile() {
+	dune build @install --profile release || die
+}
diff --git a/dev-ml/parmap/Manifest b/dev-ml/parmap/Manifest
index 8d0e0a848f76..15f43ca56d9d 100644
--- a/dev-ml/parmap/Manifest
+++ b/dev-ml/parmap/Manifest
@@ -1,7 +1,7 @@
 DIST parmap-1.2.1.tar.gz 47069 BLAKE2B 85d67aacff70c9d8b70c73e4673486804a0d0a4cc52391cd93bf12ed19206c11cb77066e64757f5a22352580789383e04b7d984aade5e60872be12728a173fb6 SHA512 b5ed86b464f68db625e6442606cb74c7e2b10fd066a20732e60042d32b937c20f83ff4ebf17f47b79ee6725e0de9ca42bbb050c06b47d90a27052b3b0fb07afb
 DIST parmap-1.2.3.tar.gz 47481 BLAKE2B 3c65448d244e6079444912ffaaea35982d44123f6259c2d15b7f1618afd10c79972f00f7e2744da270b298f4bca090c34c96e6e36638f2aaabba4ed774af24b5 SHA512 f050492ae1c5fc7c9d0baddaed44ea9920da7d2a5ed6455e93fd427648037a5e00051b6eaaf982174d88ed4de9b0123a1c4eff203f1ba6bef3384b5c7e2952c4
 DIST parmap-1.2.tar.gz 47083 BLAKE2B e790087273fcf749b000c7ad3a2f5b2cafea91c529e3a4687b1d882d203cb43e4069a42675319c27878d8bca3fa0e19af96ab1dfda8df3967dc48d28ec542b91 SHA512 69431e146e8aa01823ae1583c6a5e7753436cecee37c3da3064a836c20cf8c6b9033248412203406d03bd4efdd957b2e118ea5c5866e3bd1f668d8c4fd48777f
-EBUILD parmap-1.2.1.ebuild 608 BLAKE2B 92d88cdfa1a4b8d99d84592c40953d3188669e6b5720d4bb18b5fcf27e35477244085b841968cfdb612668c7447e2e77791a83e877339f8567080738899de8a6 SHA512 ebabf3baff2fa3ebc2776e280bfb6fbead79d5f0f4f4f476fe2de10d38d7e64af6896d315e2eb77488352441a3fc0d87d4267a3cdadbfb38a8047d1899845712
-EBUILD parmap-1.2.3.ebuild 605 BLAKE2B faa09884e58a0c314c0b2da9db6c0fdac422a91a5188680bcf60a18afda475ed147a11b821f916811d22e1fb9091d2e1ad1f96891704d9733710f4c09cd409ae SHA512 20feb2387a081fccf1f9429f5230da9d651ad48ddff836bd9414564d8b4ede11a7d3d6bd3ed675ac642d778efe5ee6a1125b137c970dec82285f13b0a0cf9b72
+EBUILD parmap-1.2.1.ebuild 673 BLAKE2B 75274d441ef9b8d4a78ae5e4b7daf38196fb88293629e20a430bebc1b25207d30f833cbea1918de5978fd42cb54ee2d7ba45ab7e03af007fabbd2a356176c4b5 SHA512 eb817ba2b0d44391ab9e57ab2e87a35fb16e67cb3c4242faf21db40a827eb3f8e918e6a32ae0385f4eae2727ae4446e75e5b5908dd2aeb58bcdd45e59656e174
+EBUILD parmap-1.2.3.ebuild 670 BLAKE2B 1c904777712a4a3e06543e499f381c2f33ac9767666cc8dd8e0f433e733de6f3edf8a3a18da25d6cdbdda39f4db9eded5775d6b5f92ae9eb5f991edc9f1b6cd8 SHA512 f04b0101115c305927e2aa3676dd68695c461bfde8d4b50a5a92580d75df6ab5cca8692a23194e72c3d05fc774c78ab6c2a49244b63036f5608448615258719a
 EBUILD parmap-1.2.ebuild 602 BLAKE2B f818b95d8edfc4e83b56569ab59392fc0a142b224fa7df50b6b08e0fa1ee7df8633c36c563923b3000a2b38bc82d1976731ceca541d72ce9c24fa4e3cab109aa SHA512 4efeda43e48ddad028e583f8ebe3df12bcdf96e802de2555162569178298be87b5ce815537cefdc42c55c92eaa60f962d5ffc423f08b9087f68cdfa8c21e0f11
 MISC metadata.xml 323 BLAKE2B 6e7bcddc8f305eb0ad28f81bf09278c703c7dbfdc7c9825886dae7fa1d8489460a816286f0849cfbc4a1b641cfbc43f6b14a74b0d669593324050f5aefe01c80 SHA512 42cb14a0c6f2439fe053d45546efa9a8a66b2e116aabf02c64f7bb8c28316e302cd86b586cd2d6717f37228a0b04598e99d60feb45d16d301ce8a39da1f02d0a
diff --git a/dev-ml/parmap/parmap-1.2.1.ebuild b/dev-ml/parmap/parmap-1.2.1.ebuild
index 44ada0a27777..5e4efd7f812a 100644
--- a/dev-ml/parmap/parmap-1.2.1.ebuild
+++ b/dev-ml/parmap/parmap-1.2.1.ebuild
@@ -19,3 +19,7 @@ IUSE="+ocamlopt"
 BDEPEND="dev-ml/dune-configurator"
 RDEPEND=">=dev-lang/ocaml-4.03:=[ocamlopt?]"
 DEPEND="${RDEPEND}"
+
+src_compile() {
+	dune build @install --profile release || die
+}
diff --git a/dev-ml/parmap/parmap-1.2.3.ebuild b/dev-ml/parmap/parmap-1.2.3.ebuild
index 444af768d02f..974f988af0ec 100644
--- a/dev-ml/parmap/parmap-1.2.3.ebuild
+++ b/dev-ml/parmap/parmap-1.2.3.ebuild
@@ -19,3 +19,7 @@ IUSE="+ocamlopt"
 BDEPEND="dev-ml/dune-configurator"
 RDEPEND=">=dev-lang/ocaml-4.03:=[ocamlopt?]"
 DEPEND="${RDEPEND}"
+
+src_compile() {
+	dune build @install --profile release || die
+}
diff --git a/dev-ml/patience_diff/Manifest b/dev-ml/patience_diff/Manifest
index 589393e55967..0fdb51dfc6e6 100644
--- a/dev-ml/patience_diff/Manifest
+++ b/dev-ml/patience_diff/Manifest
@@ -1,3 +1,3 @@
 DIST patience_diff-0.14.0.tar.gz 20060 BLAKE2B d47d9a93ef0a7eeada7f050aec0427f8352343609da1332de59d6b3ced41e9942556e1d61e12ab2075bc15cf29afc60191f48da43c1a4358d414352eb6efd044 SHA512 d253488402e515d56ed9d83ef45edfce378d6ad5148d80f8d81341cff28d19115350d72cc057ecd6c14b907888eca8e6bce1b8e71c7a978149979a16a5512fd2
-EBUILD patience_diff-0.14.0.ebuild 473 BLAKE2B 210297c3e20a149680e560948d73cb9a41e729a1481c48427b415a3a5a4b6843c49af34066f0f8ec8596f71e765f5ed8a741eb9718d174bcace166cc16318de2 SHA512 dde5506d835c37c8e6a348884c6028771d9e3a4f319908364be129c7f0b24abb53e16bf9ce8e4f49909107fe1909f2e4941d83a71945c691d180abdfbc8c142a
-MISC metadata.xml 257 BLAKE2B fb8b9db9ae5a0f4df897be20e8da32e9522cbeb3f96be4891670c500f4895ef041388f412091d6021c96e93ba4cf3fc265b21f32b3349797e4218fdbffb1a890 SHA512 7f1accfad4cfe0a26413bd6b0e15ef1f38e9ee20b83fb2099ca98446f40ca63cd32fd3ccf6756646202e3f5471f0ba67855973a6dacd292b0109c964bc34eabf
+EBUILD patience_diff-0.14.0.ebuild 538 BLAKE2B 81c91f8be9fb66ac62f6a963cb32bc4b770a75dbd58d6683e8d4ce378c0bca120740c12f25b27afa18b3d9d6ccd74ce88f461e935b7294c90288c01eb556e225 SHA512 faf975726b4daaaba39ddd3a3c3b19c330d9d5dcfe1ccfc38286d92c7c7f00f9f8c4aadb84908a0176bfc1c015a006952b6a1fb1e4ea52834ae6b32dabe4576a
+MISC metadata.xml 322 BLAKE2B e9510a525c3c5f6cd79ecb521914bebe4b0793cd02ed3bbc881d6915503bfb4167499e412376c8ac5f870dcd6bd57721fe7efa82c0c0fc8c0c20e180371aa431 SHA512 3fca89751f8d8ebe30ebdf89ef8629ea1f8667cbb9259fa4b3a53d3e911719babad516ad4320e9abd88f5246a46072833f55f5110ca80bc17098b5e474017fe7
diff --git a/dev-ml/patience_diff/metadata.xml b/dev-ml/patience_diff/metadata.xml
index 65186ef690b9..c87f5360ebd1 100644
--- a/dev-ml/patience_diff/metadata.xml
+++ b/dev-ml/patience_diff/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="project">
+		<email>ml@gentoo.org</email>
+		<name>ML</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">janestreet/patience_diff</remote-id>
 	</upstream>
diff --git a/dev-ml/patience_diff/patience_diff-0.14.0.ebuild b/dev-ml/patience_diff/patience_diff-0.14.0.ebuild
index 67d3bdbbc951..cd95ca35acf3 100644
--- a/dev-ml/patience_diff/patience_diff-0.14.0.ebuild
+++ b/dev-ml/patience_diff/patience_diff-0.14.0.ebuild
@@ -19,3 +19,7 @@ RDEPEND="
 	dev-ml/core_kernel:=
 	dev-ml/ppx_jane:=
 "
+
+src_compile() {
+	dune build @install --profile release || die
+}
diff --git a/dev-ml/ppx_assert/Manifest b/dev-ml/ppx_assert/Manifest
index db029f4190c3..8426ad8afc8f 100644
--- a/dev-ml/ppx_assert/Manifest
+++ b/dev-ml/ppx_assert/Manifest
@@ -1,3 +1,4 @@
+AUX ppx_assert-0.14.0-4.12.patch 1228 BLAKE2B e12ae7064c8a223b0910fde08c4c9bf898be1c50b142024ec1dfbd409168a14d1d48f537b772443207cbc66174f4b7f1aaff0011ec1580fc24d55342fccf628b SHA512 cbdb4b77646d81ff96438a6c4510af31cbe4b791bcbbe37dfce228da597783cae837c70a01ffb2ab11264082d1847fdc5172c7fba57d12fe93d8bf1354a05c75
 DIST ppx_assert-0.14.0.tar.gz 7239 BLAKE2B 730d1cceee88728291473e73120cc1ae19477927c8f5e20b1a455ab78e34c5917907a60e03ea7d2b898ccb99e42755f1ad918d7fa59ae64bac84fd8356af7647 SHA512 b8ae4a1f08e9110f0809f98d1e0126d50101db7c5b87aa166294aed29df420a079fd2c0797c2888718acd8cd4f2aaaa98f0c445e5fb1423325cc89801e7d52b1
-EBUILD ppx_assert-0.14.0.ebuild 757 BLAKE2B 786041fb4c2dd55760d00111d8ca1f195ce12f9dd281d37dadf7010d62bc9ba8f7a82a8c5228036eaee46c482c7ded24b7a3c3922242279cdb9d9595e006bc29 SHA512 7a4a00d675b63aa741d084d68ee84101d624e1bf5492e13a06a85959719da6f19cc71d57dbfda9657935b71b686445026e2fa55302567b5ee327a99b43c31b5a
-MISC metadata.xml 331 BLAKE2B 8546586066697782a8be2982480bac5dc2a04510e0d832a498e48aa77bcbf210f6620a85076fb460960f2f8012dafd3319595040f20b69ecd3d83f374075edda SHA512 890664fd96752922eb3e487d88334db9537e4bd29e9a98b01df7df5f5788d0700934b86b93de85a314122504a5687d1e0cd8797dbd88322ac636195953559808
+EBUILD ppx_assert-0.14.0.ebuild 800 BLAKE2B ed5bb8b46fed03a66cca27fb8f7dc70773feec2df9055569b52e3f07a81621719d28b569b7c2eb7c9cec1489aa27d738aa5b63f819a19a07a090b3807861e0af SHA512 6dd60159cfefd21c3cd3d61d469dded46a001074fe969c3dbec2a9d37991558e8a96169daf0d12d6b72f5eade36cb5aee38cfce626221a602e246141c3629d14
+MISC metadata.xml 424 BLAKE2B 36ece1e8c41abefc52c0b403f3607aaed672322bfdb8c700dae76cf2ff7da8ccc8235c051cc4b1736aa9e066d196a131b8eac02606dc27e353c804bffa9ad5ab SHA512 2fcef4859e2b6d55dece207b0daaf34cb08c2aea9fbeef8a6aa7a374b6e3e0fa126dbd08af8bfe0247754e8d4d3af6c58040539e3fd0070b3c7604a12aa58e44
diff --git a/dev-ml/ppx_assert/files/ppx_assert-0.14.0-4.12.patch b/dev-ml/ppx_assert/files/ppx_assert-0.14.0-4.12.patch
new file mode 100644
index 000000000000..80ff9fb1eb47
--- /dev/null
+++ b/dev-ml/ppx_assert/files/ppx_assert-0.14.0-4.12.patch
@@ -0,0 +1,30 @@
+--- a/runtime-lib/runtime.ml	2021-09-30 19:07:51.592766183 +0200
++++ b/runtime-lib/runtime.ml	2021-09-30 19:11:18.035634157 +0200
+@@ -71,7 +71,7 @@
+   end;
+   `Fail (expect, got)
+ 
+-let test_result_or_eq ~sexpifier ~comparator ?equal ~expect ~got =
++let test_result_or_eq ~sexpifier ~comparator ~equal ~expect ~got =
+   let pass =
+     match equal with
+     | None -> comparator got expect = 0
+@@ -89,7 +89,7 @@
+   ]
+ 
+ let test_eq ~pos ~sexpifier ~comparator ~here ?message ?equal t1 t2 =
+-  match test_result_or_eq ~sexpifier ~comparator ?equal ~expect:t1 ~got:t2 with
++  match test_result_or_eq ~sexpifier ~comparator ~equal ~expect:t1 ~got:t2 with
+   | `Pass -> ()
+   | `Fail (t1, t2) -> test_eq_failed ~message ~pos ~here ~t1 ~t2
+ 
+@@ -99,7 +99,7 @@
+     Sexp.List [Sexp.Atom "got"; got];
+   ]
+ 
+-let test_result ~pos ~sexpifier ~comparator ~here ?message ?equal ~expect ~got =
+-  match test_result_or_eq ~sexpifier ~comparator ?equal ~expect ~got with
++let[@warning "-16"] test_result ~pos ~sexpifier ~comparator ~here ?message ?equal ~expect ~got =
++  match test_result_or_eq ~sexpifier ~comparator ~equal ~expect ~got with
+   | `Pass -> ()
+   | `Fail (expect, got) -> test_result_failed ~message ~pos ~here ~expect ~got
diff --git a/dev-ml/ppx_assert/metadata.xml b/dev-ml/ppx_assert/metadata.xml
index d2c8c92d51d3..d0d7bf7876c6 100644
--- a/dev-ml/ppx_assert/metadata.xml
+++ b/dev-ml/ppx_assert/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="project">
+		<email>ml@gentoo.org</email>
+		<name>ML</name>
+	</maintainer>
 	<maintainer type="person">
 		<email>gienah@gentoo.org</email>
 		<name>Mark Wright</name>
diff --git a/dev-ml/ppx_assert/ppx_assert-0.14.0.ebuild b/dev-ml/ppx_assert/ppx_assert-0.14.0.ebuild
index 4db2bc4b5920..0be3c6c2301b 100644
--- a/dev-ml/ppx_assert/ppx_assert-0.14.0.ebuild
+++ b/dev-ml/ppx_assert/ppx_assert-0.14.0.ebuild
@@ -27,3 +27,5 @@ DEPEND="
 			dev-ml/cinaps:=
 "
 RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-4.12.patch )