gentoo resync : 08.10.2021

author: V3n3RiX <venerix@koprulu.sector> 2021-10-08 23:06:07 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2021-10-08 23:06:07 +0100
commit: e23a08d0c97a0cc415aaa165da840b056f93c997 (patch)
tree: 4c5f7db60483518201fef36f8cc0712789a08db2 /dev-ml
parent: 391b5b359a346aff490103da7dddc85047f83830 (diff)
114 files changed, 1295 insertions, 144 deletions
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 515754648b0d..f8a916db82ed 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 4ebac7753771..01b5c3a76b01 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 565 BLAKE2B 9376ebda9f8880bd66e0791bea4710c09aa197ab0d39988997c4f9140a8355d280cb27efa5f195f3abfd8cc3f220af76291d47de6e0f39de8050c2958065fb35 SHA512 0f4bf1064315796f72b8d59f56e2b72698196674032d767cc7446e70788aeb20a9196c0db2785fbf8e352c0abe64094b1e0599b6946c5f7a5be68a8e07278aea
+EBUILD async_kernel-0.14.0.ebuild 500 BLAKE2B 8d70ecdd21dc2568ea7e6a94480d79e2f563762f4309ea2136e6f4e6a78918fd25914e93599bb2f62eceb81eafaeef69acd2604b9a5e295630e8adc13e4cf35b SHA512 b80bb0f6c1bba72f13b2e9bacdb4a9693bb510c32592900d9009e20b56555ebb5a074c38b2b2ade4a2ef12474687b36e5b325ba981f247d7fe98ca04a333942b
 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 4f2232ed012e..eddff5633056 100644
--- a/dev-ml/async_kernel/async_kernel-0.14.0.ebuild
+++ b/dev-ml/async_kernel/async_kernel-0.14.0.ebuild
@@ -19,7 +19,3 @@ RDEPEND="
 	dev-ml/ppx_jane:=
 "
 DEPEND="${RDEPEND}"
-
-src_compile() {
-	dune build @install --profile release || die
-}
diff --git a/dev-ml/async_unix/Manifest b/dev-ml/async_unix/Manifest
index 34bd47ae0cab..42e8c1cb9d6d 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 601 BLAKE2B 168319dec24032943c55367cde25214e08c769db30143d500f9d9a1711176959450d44868e65dddd1b75b6b3bfde07593e5aad6d87b66660f177f5db92b4d032 SHA512 b8de94d856302bdd7e376c8901650dfd0d41026865f53c8619a76e9f0dc51bee3ee887ec861a20e39fe68c1e470916107dcb735c1dc887cb22fd4f9eb1359be8
+EBUILD async_unix-0.14.0.ebuild 536 BLAKE2B 987e590419d042071795ad047cdda5dead8c7def791753b6ec31c946e4b78085ccb0931285374b724a20df66754548326e5fb372af35147e79c17775674175a6 SHA512 a6542b3fb14b53ee5959b13700caefa8b364649cd2a0a42caaf8884060c0f82616b273d18196546cf222ae290c36c0d0fa1f63f0d865b70329b2518ea2d0e6af
 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 231d23d4ecdf..51bdd90f7140 100644
--- a/dev-ml/async_unix/async_unix-0.14.0.ebuild
+++ b/dev-ml/async_unix/async_unix-0.14.0.ebuild
@@ -21,7 +21,3 @@ RDEPEND="
 	dev-ml/ppx_jane:=
 "
 DEPEND="${RDEPEND}"
-
-src_compile() {
-	dune build @install --profile release || die
-}
diff --git a/dev-ml/base_quickcheck/Manifest b/dev-ml/base_quickcheck/Manifest
index 5906cfb1f408..8dc5fdadb5ea 100644
--- a/dev-ml/base_quickcheck/Manifest
+++ b/dev-ml/base_quickcheck/Manifest
@@ -1,3 +1,5 @@
 DIST base_quickcheck-0.14.0.tar.gz 66736 BLAKE2B eeaa92ec0eec4736be911128f46b8e4698034b2cb8afa131b31ee96a6edb5db0f28cfd611c101e4417305ee5a1babc2f869f4690b266218562a8fc50f5830acf SHA512 52333bee2591531665b8f8ad0fac1cdaa607b448d0a33b9b905cf98e00df5a700bf0a4ee3cdf3c06d7fcb2b5190363dd5908cc743b2854af9ce5c8d743e3fd58
+DIST base_quickcheck-0.14.1.tar.gz 66827 BLAKE2B 2a274fc0edab3daf7e3d671f7ea24912ecf273cf2b4cb4ab2bd74171a8848163526f97ed860b44aeaa9f3f3faabb22f4598bf604b33c8401733faa22ca7a3c93 SHA512 5d5a3a070a6903ffdd1e13754721d48a9df164f78bd569d3a18b3fd808354550e4603b76d5e48eaa6a4c4d3433f18bb29888478d640fde9ea004619448c3d7d0
 EBUILD base_quickcheck-0.14.0.ebuild 765 BLAKE2B 08d36c59b4f8fcf6bb43ed9e319dfe9e1a175eda8447b41435c257f34f42eb35c26d7e5a95a28f27060983911ee22ee36f08ec67d7ecc2760979c08019f3b6c2 SHA512 30c91a1b596cd0652c2f2084ccfd9b5e3dca9ef4227a14ab2d5d3aeb413311b8846911edc0830c6190841b5290693797dcd36015f83ae4f274f4405231d740e2
+EBUILD base_quickcheck-0.14.1.ebuild 771 BLAKE2B 1311571b056ff6dcf769bac74f8faaecda3cdfc3a3151e5634a4f6d11e107a6da651641be84589a2388deebf1a34592c49a7b2945ad7913a9f0c749428c620d1 SHA512 dcba6c81e7b31b531ecdffc1c06be95bd68023c30fe7b3d02e8252589d0a2af9de1ebb3bcc5a2d2805a5bb4da55b880abdc3b119a85d577b02f095be7367829b
 MISC metadata.xml 336 BLAKE2B 6e0fd85af8abd5f25bcaadbeb62f0971f6ed38780d6b045431cb258cb47bb41c958c596b01d6b5b8ba569a55976f15113c1655125c8b0d11a3b73597069e1ca1 SHA512 9cfe316d1df1581c39124da69fb2ea008e7c517eaf4bd2f46d4ef7b8d68b9c150425b878ec132f19bc8574b3ff41bffcf0d2f8a04955573b1deaf26391b53ee6
diff --git a/dev-ml/base_quickcheck/base_quickcheck-0.14.1.ebuild b/dev-ml/base_quickcheck/base_quickcheck-0.14.1.ebuild
new file mode 100644
index 000000000000..3f8f641d04a3
--- /dev/null
+++ b/dev-ml/base_quickcheck/base_quickcheck-0.14.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Randomized testing framework, designed for compatibility with Base"
+HOMEPAGE="https://github.com/janestreet/base_quickcheck"
+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"
+
+DEPEND="
+	>=dev-ml/base-0.14.0:=
+	>=dev-ml/ppx_base-0.14.0:=
+	>=dev-ml/ppx_fields_conv-0.14.1:=
+	>=dev-ml/ppx_let-0.14.0:=
+	>=dev-ml/ppx_sexp_message-0.14.0:=
+	>=dev-ml/ppx_sexp_value-0.14.0:=
+	dev-ml/splittable_random:=
+	>=dev-ml/ppxlib-0.18.0:=
+	>=dev-ml/ocaml-migrate-parsetree-2.0.0:=
+	dev-ml/cinaps:=
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-ml/bigarray-compat/Manifest b/dev-ml/bigarray-compat/Manifest
index 087d323d247f..7e2520f131b1 100644
--- a/dev-ml/bigarray-compat/Manifest
+++ b/dev-ml/bigarray-compat/Manifest
@@ -1,3 +1,3 @@
 DIST bigarray-compat-1.0.0.tar.gz 1385 BLAKE2B afa38fd206de8738db51742467b95df4aec3e4e713c946c2c1d041da7e19483bdb53dca440b50c9c1b3c3a5fd7ac71a63ccfe74a14a5743f10f35429838a1c14 SHA512 c365fee15582aca35d7b05268cde29e54774ad7df7be56762b4aad78ca1409d4326ad3b34af0f1cc2c7b872837290a9cd9ff43b47987c03bba7bba32fe8a030f
-EBUILD bigarray-compat-1.0.0.ebuild 433 BLAKE2B 69f32d193f0b28ee7740d12b01c356733554718fa379d4f1cbc1519e683ec1569413f9ac7b3a96ca54d654d9781878cbeae0b2500bd522c6dd5784edb12b2a48 SHA512 3a8ed75eca2be86d9ca4b332321128a24307ea184dd30eb137c810bfbacfcf8d6070e583fe670b3f7a4054f745edceee69b5be1faf91abee118b0ae4c3c61556
+EBUILD bigarray-compat-1.0.0.ebuild 438 BLAKE2B a4f5050a4abd86b62895718ba5b48d784ea0ed104511db597ac3ffb1ac3edfebcd43a2e3b23056f327c34a1eaeabc75dae0cf007c0116acebff0d4ac295bbf89 SHA512 f4aebdc53cc7297b18043b3e5866092b31038a974d47c5a3c8b19e02ed11b9355ad18f5b2bf149cd462d18b24a5fa81a3426eac667eb66fa1a90b41df07b942d
 MISC metadata.xml 320 BLAKE2B 01aff5c109d72cdbeea68a7170d2ddc0dbac8b02e667df569c4a1111ba7fc8f73114f1d32dc3883e5bcf07b85bc9d2c5bc6940c65b8ce4d316f2eb7eb9f620a3 SHA512 f4512e72cde3192cd47c1083077ae9d8520cc7067c8249966fd5522d7113b4d4d390897b0abd7fb5c5e292fe490c57e689312ff47b509af3709faf3a27440b3f
diff --git a/dev-ml/bigarray-compat/bigarray-compat-1.0.0.ebuild b/dev-ml/bigarray-compat/bigarray-compat-1.0.0.ebuild
index 3ffba6aed6fb..bfeb0770b6b3 100644
--- a/dev-ml/bigarray-compat/bigarray-compat-1.0.0.ebuild
+++ b/dev-ml/bigarray-compat/bigarray-compat-1.0.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mirage/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="+ocamlopt"
 
 DEPEND=""
diff --git a/dev-ml/bos/Manifest b/dev-ml/bos/Manifest
index c55df093d122..36f78b03e0ab 100644
--- a/dev-ml/bos/Manifest
+++ b/dev-ml/bos/Manifest
@@ -1,5 +1,5 @@
 DIST bos-0.1.6.tbz 39822 BLAKE2B 0e10eb14fb5d429b81c67659c936e8b700c4cd417d1f5be000c8bdb0304de8ad9130e597f6e2e7771380c29c148f4339817bacc458e72a8efa894be3b85965bf SHA512 f1f10a97a32da936a7d5a0c70632e723723ee523c79f9dfd23bc42c039a194e8d69658483e6e856c7911332b799a92bf8cabfe96cc387522d7450b8f3f8f8343
 DIST bos-0.2.0.tbz 41008 BLAKE2B badc344e561ba9335a4ded0c8100da91fe2bc882698c94daa42d9db2f1e2c8c627b81eebb5a7067778c332384504391ea402f7363ec552e8517cb048c8e384fe SHA512 f9120f8108c6da5647c9fbcc78736a5f87bf5627fad01035fdab1af6322c93e75df670d7d2910fe474c92c48ffffcf15955a84e698cfc7bfb7c1ac4fe27d472f
-EBUILD bos-0.1.6.ebuild 911 BLAKE2B 8cde8cc0bce4152cf04c28551f152a39cac3947570b41fbf2802601a29a7efe0bacd73daf5db05335ea8ea48b60a67b55171fc55087d36ed3697e3238bcd3f11 SHA512 c8e81c37ced8a705623bfcbec5a7897b2f1d82cf9299ec6c9c180cda6bb3c6a8b1756306bb2371d46ca7ae65d42a3821173b4fa01b30318b9080576be9c8e3f6
+EBUILD bos-0.1.6.ebuild 908 BLAKE2B c3dd6cd8b24a3e1cf999190ca5879604fbe54e1a3a8499b02b1272d86c37674b2411688b36c02dfb7e0902048f8ea983a5a51b4a2968caf5fcfe8b1cd5a3d9ba SHA512 1321689a587cea31d91f79c8638d4d95b65ab3db3341b0df61959577aa094ba31b26670f402e08949b9fc99ddc8c2c62f230875d2ba4b348170133454f21e174
 EBUILD bos-0.2.0.ebuild 918 BLAKE2B 6fee708d89ca615a5574745791753ccc1ecfa888b29cd9ff345a934cdbf04e31d9937376be181529a0450617615d3f67ad6a53f79d0f94d5787521f5420adf97 SHA512 fa4742dcff0daff633ace9e5370f57e6cf1864750aeafce22cfcafd1209b85970683907dc3f4c90698b22a1ae13784748f6f8490a0ab7b29e82a4806d9a9b53f
 MISC metadata.xml 310 BLAKE2B 451869df8c70299f88448015fc68cb0b72768885c18fc66abc5ccd1c08e3ac0be865c64538536572d02de0515187c21e3af7ed44ba66593598d9327252408629 SHA512 ecd83848005eb7e6351cd793c12e43eb23a1e01c9f740c91bcff14c310c47f764a7ab55a0225be6fc17c2cc56fb1e972ab4ac21f53f532548ba744e0ef950309
diff --git a/dev-ml/bos/bos-0.1.6.ebuild b/dev-ml/bos/bos-0.1.6.ebuild
index d311ea2188f6..db3fc9fd2725 100644
--- a/dev-ml/bos/bos-0.1.6.ebuild
+++ b/dev-ml/bos/bos-0.1.6.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://erratique.ch/software/bos/releases/${P}.tbz"
 
 LICENSE="ISC"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 arm arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ml/camlp4/Manifest b/dev-ml/camlp4/Manifest
index ebeff4860684..1b1fefb3dc24 100644
--- a/dev-ml/camlp4/Manifest
+++ b/dev-ml/camlp4/Manifest
@@ -4,9 +4,11 @@ DIST camlp4-4.09_p1.tar.gz 649702 BLAKE2B 2bf0fd0b4f22d21b9fa7e195a26f4dece56549
 DIST camlp4-4.10_p1.tar.gz 650092 BLAKE2B d7a6221dba5f6ec6963fe35236c29f39b8ae8f928618b5a58f72e7b1cc1f50d716b110f9684150716b56784cf703c0d8fcbc1aad32aeab638faca9c1bf2d5b9e SHA512 7ae0e20053a43399daa4ee9b93b6f4dbebc3e17c5ee79d069c4903cdfb2bf1cfc7d6badecf92fcf62e97a5f85f3be6ed82a62eb2a311bf6398b2792eacf763d8
 DIST camlp4-4.11_p1.tar.gz 650280 BLAKE2B 6fe46b49c1f2b2e5fc87fbbbdba3ccae795c555737495c298456b84f0dca79c750aa6e4ab2c23bbc7ba4724defdfb739e370f468a78658035474d2f3ad255995 SHA512 8e572602c1c465017a234565efa2249c935ba1ad3d399a6b264bfbec345958130a96311c79e437ac995e3ead9ff7b4f2d3fe6aa4a3a82431ae0cc6257a300f4c
 DIST camlp4-4.12.tar.gz 650428 BLAKE2B 4957d3db73ec82fbac58dd95fa13c48f9f8480a70cd6bded43a00df0a182f9b9e31a43acef8264f9d940776667d10b0a5c46bded59ebf4a645719264628428fc SHA512 0a19bb596e47076a28a6bea62007f1d3b59c4d688075f6b723abaa205c555707feb4ea0624259994a4ba5251fdea9dc61cdc936dc13611b36937e755a4bc9b7b
-EBUILD camlp4-4.05_p1-r1.ebuild 1037 BLAKE2B a49e1083934cabb0d4948de323dbe6223502d10600e4e2f742b0a56de304935169a7bec9bf1000a9fe5dae28c08cc867bbb9807397614368966a9432a3e5bb67 SHA512 524616fe30a9914294e30727564a2bf49df9ea3825452c808f447154363e0bbd168ef58d209b59f7cbb652f99e311eb48369105be3ed9c6f8fdf7cb2b18d5091
-EBUILD camlp4-4.09_p1.ebuild 1060 BLAKE2B ca2a14432162c8e7e046655fb629fe77b40abcdfc2459ca92e92d2b2f530995f1814f2c7c117d1405bd3b056158113e8c778454cd69ecbd8717acd83234e1514 SHA512 005cd342be9f80aabc2b62717c63eb4bd4ad6a07c5a66424d38f360631ffa848ac2a859cfc31c921256898e26027568b711b362df9c323e213ae2ddc59a66840
-EBUILD camlp4-4.10_p1-r1.ebuild 1076 BLAKE2B d983ef95e6db0dc4656bf72a673632adb05662431ace347890de8eee34f8644389b72b60604f6177349cc6300af77a2cb9a7d38c7332d99e076a686da4da8723 SHA512 b926e7709797514af564017c723972f986e97a20f0c4098572041774263aa8dbd875a7c0f6ba7bacb6564a2a7b2152ad0fe15d77f9298b9fb34e34e00739a07b
-EBUILD camlp4-4.11_p1-r1.ebuild 1099 BLAKE2B 47c299a46a2d0fbc986a73651f5f046ee188fd73ce6f98c71ff3ad5e5abd7bc47f433ebf8131a3dc51eff1749a1ccd4014ec6bb0685c8067f0a526783130e0b3 SHA512 fc012a26288c5aae4cf4bba00e213b331143c4499ff3e158ba1aed3d3706efb6eafabbb2634d04bae634c1aa858a6dabd2d3c864ed48cef24aa6d171b33cb01e
-EBUILD camlp4-4.12.ebuild 1099 BLAKE2B 47c299a46a2d0fbc986a73651f5f046ee188fd73ce6f98c71ff3ad5e5abd7bc47f433ebf8131a3dc51eff1749a1ccd4014ec6bb0685c8067f0a526783130e0b3 SHA512 fc012a26288c5aae4cf4bba00e213b331143c4499ff3e158ba1aed3d3706efb6eafabbb2634d04bae634c1aa858a6dabd2d3c864ed48cef24aa6d171b33cb01e
+DIST camlp4-4.13.tar.gz 650642 BLAKE2B 5bf70b21f47eefe4631227d0d30fdd08ab965020026d0183fc94b9dbfd1eee45626afbe62bf9507b1a887217cf9245901d40f25cce9430155eb9ec1ddc577554 SHA512 d3307bd11b813540d126719c0afe7e75a7740d0851b272be9bd1a28e8b1ab1ed9a7576109000c8d6cee7ece7f777122aa83917a48147d42ed8f4d72994397819
+EBUILD camlp4-4.05_p1-r1.ebuild 1182 BLAKE2B c7f79908b6e5bb7a64ad6a63a472e44c6fbbb07447623e4fa67a5020ee8770f20558dcfb6f6107dcb0eaea12ff83181ee0785cb658d2a154972d8f4c7af20b0e SHA512 19a429da37b07fce0a5a03068eb6a182788d455692d6d585c2da4fc3e9b7e585ee5e93d0dd71d7f142cf0e44a6b18d325b3a533f265f88a2f2b39e6e5ec65db0
+EBUILD camlp4-4.09_p1-r1.ebuild 1205 BLAKE2B 20c353735915b452053f7b939bbf307dacc09eda5da67075bf30d5bc7f2abdfdbb1534fd8c2166006aab869126ada91a643c3fe8eedadc4c8b4146caa513ba65 SHA512 4ef84ebbd16d74949021fe6bbd98efbb495fe1c246faa2a07180452620c2fa2bdc1dc33fce6342ab4a6f2a19c2995cedb5394cd837913d37126f4caabf75f028
+EBUILD camlp4-4.10_p1-r2.ebuild 1221 BLAKE2B 39586e51ff36e0bb3756776eed91a1cebe90d7be9c3adce8a3c583cfa9f2cded3aa5239e0dab84e9cc9c8079d19a7bc314b875814150566bf2dfefe02bf3d5cf SHA512 24a597fc8be6e52f5b61d4cf33600175461bbc03f3126a0d660c40316ca9073b654fb583bcaa6065455c878bb80beb75e0f2b4b1331906aadd2a60e4260d7465
+EBUILD camlp4-4.11_p1-r2.ebuild 1244 BLAKE2B 994b91a58fc981cb5e85694b65494cf3c503732404dbbbbf5d944313f12bd3a901854b8e4fb345d48dc3510d0abe2a0291348e71659d560887094bc8c35e50a8 SHA512 11863063ffac5d8b9d7cd10a4c7f396a3ca35913bc767db2806f203dff287d7c45ff1054df4c93bb9c2fcaaf8b4d79761c8d588253f72e403136a313dc90583c
+EBUILD camlp4-4.12-r1.ebuild 1244 BLAKE2B 994b91a58fc981cb5e85694b65494cf3c503732404dbbbbf5d944313f12bd3a901854b8e4fb345d48dc3510d0abe2a0291348e71659d560887094bc8c35e50a8 SHA512 11863063ffac5d8b9d7cd10a4c7f396a3ca35913bc767db2806f203dff287d7c45ff1054df4c93bb9c2fcaaf8b4d79761c8d588253f72e403136a313dc90583c
+EBUILD camlp4-4.13-r1.ebuild 1244 BLAKE2B 994b91a58fc981cb5e85694b65494cf3c503732404dbbbbf5d944313f12bd3a901854b8e4fb345d48dc3510d0abe2a0291348e71659d560887094bc8c35e50a8 SHA512 11863063ffac5d8b9d7cd10a4c7f396a3ca35913bc767db2806f203dff287d7c45ff1054df4c93bb9c2fcaaf8b4d79761c8d588253f72e403136a313dc90583c
 MISC metadata.xml 416 BLAKE2B 560e2116bb064decbc8d5e5391966be20ecdfa18ffc362c947b3d5f9aeae1bb2e5d3f391f765e9485075e05a90db69c4f9283b028bd15211e6979621b50d4428 SHA512 db6518378e93c20fd831ab4d2b6ac2168dcb456cf8c6e203f4c2d5a121404e530a8646f1346f34bb4db776cc9caf5f39f0749a6f46b7cc087ad38e7512e9872e
diff --git a/dev-ml/camlp4/camlp4-4.05_p1-r1.ebuild b/dev-ml/camlp4/camlp4-4.05_p1-r1.ebuild
index 8133a505cfb0..e55cdec3ea78 100644
--- a/dev-ml/camlp4/camlp4-4.05_p1-r1.ebuild
+++ b/dev-ml/camlp4/camlp4-4.05_p1-r1.ebuild
@@ -18,7 +18,8 @@ IUSE="+ocamlopt"
 DEPEND="dev-lang/ocaml:0/$(ver_cut 1-2)[ocamlopt?]"
 RDEPEND="${DEPEND}"
 DEPEND="${DEPEND}
-	dev-ml/ocamlbuild"
+	dev-ml/ocamlbuild
+	dev-ml/findlib:="
 
 src_configure() {
 	./configure \
@@ -38,4 +39,9 @@ src_compile() {
 src_install() {
 	emake DESTDIR="${D}" install install-META
 	dodoc CHANGES.md README.md
+
+	if has_version ">=dev-ml/findlib-1.9" ; then
+		# See bug #803275
+		rm "${ED}/usr/$(get_libdir)/ocaml/camlp4/META" || die
+	fi
 }
diff --git a/dev-ml/camlp4/camlp4-4.09_p1.ebuild b/dev-ml/camlp4/camlp4-4.09_p1-r1.ebuild
index 80481b707c6d..4489b5085c96 100644
--- a/dev-ml/camlp4/camlp4-4.09_p1.ebuild
+++ b/dev-ml/camlp4/camlp4-4.09_p1-r1.ebuild
@@ -18,7 +18,8 @@ IUSE="+ocamlopt"
 DEPEND="dev-lang/ocaml:0/4.09[ocamlopt?]"
 RDEPEND="${DEPEND}"
 DEPEND="${DEPEND}
-	dev-ml/ocamlbuild"
+	dev-ml/ocamlbuild
+	dev-ml/findlib:="
 
 S=${WORKDIR}/${P/_p/-}
 PATCHES=( "${FILESDIR}/reload.patch" )
@@ -41,4 +42,9 @@ src_compile() {
 src_install() {
 	emake DESTDIR="${D}" install install-META
 	dodoc CHANGES.md README.md
+
+	if has_version ">=dev-ml/findlib-1.9" ; then
+		# See bug #803275
+		rm "${ED}/usr/$(get_libdir)/ocaml/camlp4/META" || die
+	fi
 }
diff --git a/dev-ml/camlp4/camlp4-4.10_p1-r1.ebuild b/dev-ml/camlp4/camlp4-4.10_p1-r2.ebuild
index d7ad1f1cfbb1..0d165e7722af 100644
--- a/dev-ml/camlp4/camlp4-4.10_p1-r1.ebuild
+++ b/dev-ml/camlp4/camlp4-4.10_p1-r2.ebuild
@@ -18,7 +18,8 @@ IUSE="+ocamlopt"
 DEPEND="dev-lang/ocaml:0/$(ver_cut 1-2)[ocamlopt?]"
 RDEPEND="${DEPEND}"
 DEPEND="${DEPEND}
-	dev-ml/ocamlbuild"
+	dev-ml/ocamlbuild
+	dev-ml/findlib:="
 
 S=${WORKDIR}/${P/_p/-}
 PATCHES=( "${FILESDIR}/reload.patch" )
@@ -41,4 +42,9 @@ src_compile() {
 src_install() {
 	emake DESTDIR="${D}" install install-META
 	dodoc CHANGES.md README.md
+
+	if has_version ">=dev-ml/findlib-1.9" ; then
+		# See bug #803275
+		rm "${ED}/usr/$(get_libdir)/ocaml/camlp4/META" || die
+	fi
 }
diff --git a/dev-ml/camlp4/camlp4-4.11_p1-r1.ebuild b/dev-ml/camlp4/camlp4-4.11_p1-r2.ebuild
index 8162ce77f937..ff2914c91084 100644
--- a/dev-ml/camlp4/camlp4-4.11_p1-r1.ebuild
+++ b/dev-ml/camlp4/camlp4-4.11_p1-r2.ebuild
@@ -18,7 +18,8 @@ IUSE="+ocamlopt"
 DEPEND="dev-lang/ocaml:0/$(ver_cut 1-2)[ocamlopt?]"
 RDEPEND="${DEPEND}"
 DEPEND="${DEPEND}
-	dev-ml/ocamlbuild"
+	dev-ml/ocamlbuild
+	dev-ml/findlib:="
 
 QA_FLAGS_IGNORED='.*'
 
@@ -43,4 +44,9 @@ src_compile() {
 src_install() {
 	emake DESTDIR="${D}" install install-META
 	dodoc CHANGES.md README.md
+
+	if has_version ">=dev-ml/findlib-1.9" ; then
+		# See bug #803275
+		rm "${ED}/usr/$(get_libdir)/ocaml/camlp4/META" || die
+	fi
 }
diff --git a/dev-ml/camlp4/camlp4-4.12.ebuild b/dev-ml/camlp4/camlp4-4.12-r1.ebuild
index 8162ce77f937..ff2914c91084 100644
--- a/dev-ml/camlp4/camlp4-4.12.ebuild
+++ b/dev-ml/camlp4/camlp4-4.12-r1.ebuild
@@ -18,7 +18,8 @@ IUSE="+ocamlopt"
 DEPEND="dev-lang/ocaml:0/$(ver_cut 1-2)[ocamlopt?]"
 RDEPEND="${DEPEND}"
 DEPEND="${DEPEND}
-	dev-ml/ocamlbuild"
+	dev-ml/ocamlbuild
+	dev-ml/findlib:="
 
 QA_FLAGS_IGNORED='.*'
 
@@ -43,4 +44,9 @@ src_compile() {
 src_install() {
 	emake DESTDIR="${D}" install install-META
 	dodoc CHANGES.md README.md
+
+	if has_version ">=dev-ml/findlib-1.9" ; then
+		# See bug #803275
+		rm "${ED}/usr/$(get_libdir)/ocaml/camlp4/META" || die
+	fi
 }
diff --git a/dev-ml/camlp4/camlp4-4.13-r1.ebuild b/dev-ml/camlp4/camlp4-4.13-r1.ebuild
new file mode 100644
index 000000000000..ff2914c91084
--- /dev/null
+++ b/dev-ml/camlp4/camlp4-4.13-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PV=${PV/_p/+}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="System for writing extensible parsers for programming languages"
+HOMEPAGE="https://github.com/camlp4/camlp4"
+SRC_URI="https://github.com/camlp4/camlp4/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+ocamlopt"
+
+DEPEND="dev-lang/ocaml:0/$(ver_cut 1-2)[ocamlopt?]"
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND}
+	dev-ml/ocamlbuild
+	dev-ml/findlib:="
+
+QA_FLAGS_IGNORED='.*'
+
+S=${WORKDIR}/${P/_p/-}
+PATCHES=( "${FILESDIR}/reload.patch" )
+
+src_configure() {
+	./configure \
+		--bindir="${EPREFIX}/usr/bin" \
+		--libdir="$(ocamlc -where)" \
+		--pkgdir="$(ocamlc -where)" \
+		|| die
+}
+
+src_compile() {
+	# Increase stack limit to 11GiB to avoid stack overflow error.
+	ulimit -s 11530000
+	emake byte
+	use ocamlopt && emake native
+}
+
+src_install() {
+	emake DESTDIR="${D}" install install-META
+	dodoc CHANGES.md README.md
+
+	if has_version ">=dev-ml/findlib-1.9" ; then
+		# See bug #803275
+		rm "${ED}/usr/$(get_libdir)/ocaml/camlp4/META" || die
+	fi
+}
diff --git a/dev-ml/camlp5/Manifest b/dev-ml/camlp5/Manifest
index 70fedca5b7a0..101f13612fdc 100644
--- a/dev-ml/camlp5/Manifest
+++ b/dev-ml/camlp5/Manifest
@@ -4,11 +4,13 @@ DIST camlp5-7.12.tar.gz 1008350 BLAKE2B 8f390f6d617a6ef029462aa74ca4d80c0e2eb267
 DIST camlp5-7.13.tar.gz 1031832 BLAKE2B 2afd7e269092d9c40f263e9ce92b3b9f66b0b3f0ae01da43e2094c6a919aa9f26790030f835b630547d51e7bb4a08e74ac8522e7f308864896fa0414370f8f2f SHA512 8ab94b951e6791be895c70e32b930e498229c9ba7bccc505a3e7c2a91ca12fe038b979b9d5822b43e9c74ee2bf552efa1af7a61f1d287100803efb540d5db8b2
 DIST camlp5-7.14.tar.gz 1044110 BLAKE2B c9aa5be80df8d2c376fc41c157b2cd86658dbb90e1babd346b7681afd7453649c7f3682f95f238e51b74b3b3a7a2c5b5a854be892b30a7d1e3b62c3272f5442e SHA512 1b39949c532ca622b01a8e800aa1dcad34f1c944ffe580003642bd742dedc158f3ee54602f3b05f89c0e259525d7feed101b971ebd589449b6d56046389a5bf6
 DIST camlp5-8.00.01.tar.gz 1321790 BLAKE2B df4403af56cd07f8e07745bdb73f698ddba24803cde22f11cfbeda425d4360f51be45a92b3f522c52a204f867bb3403dacebf20bfe463f6fd751901102ef2213 SHA512 f40e57845ac4a14cf260ddd9df616d12df09f67efaf6735e915598aee981721e8203bf9203fb83d08e34e43021c08003de64dbf3bdcd4d12fd079542fb7649aa
+DIST camlp5-8.00.02.tar.gz 1340114 BLAKE2B a251973253a729fd568f9a8410d43e963ca4879b7298186358293869bec0eabe79e97f819cd4af3c771490fbd4a7bd8cb1d47482f4fe699720b3577bad8536f4 SHA512 b9950cac70e77d62f147dc8edac0aef2a2bb563ca7bbc709dcf030e2536a0973188414c8612f8b2441a6e05c4d09579bc474974513bf0c59ad4702a46a0cc7f6
 DIST camlp5-8.00.tar.gz 1321320 BLAKE2B 14957ea83e40f3e2f68c7cbbec1ab84325eba1057f38905a37f9516a99a009024ee0b463cf588880d23d94e710b027b835dd51153a429c8bda22be7fe95dc911 SHA512 6a0d19ced4d94cd3afebfbc373d344229c5faf088e8910dea32ed4dfa841dd9844c72849f8a6281e2bce55295665eae90391cf29d062a44b083761a9e04bce93
 EBUILD camlp5-7.11-r1.ebuild 1048 BLAKE2B c4d7f8810c781ea2959cadeb4cc57dda53527107a77786cafdba1ac5c502d6a948cbf3537464c580ae1e2612338194e2898f4e6c28d9b271244d892fa15a05bf SHA512 043468662e78deeeadc4d04a0cb315be163c451af61c1cbc145cc81a473ed7351f3410ce67976e2337a616ef2a2b8e3e0d8f78236a278c3100b3a029ccc6e0fc
 EBUILD camlp5-7.12.ebuild 1279 BLAKE2B 3f390b87e886b7a0527af8b1c6ea4f315085ed966bdfb690d856093fc898f2a878ebd900c3a59c0e9ef408d5662115e421cc899eca137e37d51a996016bf253f SHA512 fdd203a319dae490c6d23406798fc33bfa5b5218b12724c555943721231f4a2fc90e6039c0cb921b7e16a1b043c4a14f896d6b53c67674713932fd8e869d7bc7
 EBUILD camlp5-7.13.ebuild 1092 BLAKE2B 65a5d564b227635a01dd14e140193930ce7c903ca74b7a297172dc9c315c4d9b3d200a88ded86822d4f9ddf1cfb0c6ed3c492334b552d8b3a91fa7b21d064dfd SHA512 783b13558900be49813b26ca6c7f1cfd0fd7b4f93cbd4f0ecbcdcf19f371f6752032488c6cbc011be4f3bada5c3ea11f9154d0e9862e4e90c3b9608dc3d9a81a
 EBUILD camlp5-7.14.ebuild 1141 BLAKE2B 8f2d1d604a5761717a9191784540c11a2394b69f714c7ab9297742c189117b45c948a2a03268a3b9e9a5f53053a78f00ebb12da980ff16e73811b6a71a740a53 SHA512 74ecb555eb25528241136ce9b88bb2912ae3e54908b903d898bd82c441c27e4a9438e7303959309261325b3c759f782f0c206da1d6de69ef6bba53a58d93a2d0
 EBUILD camlp5-8.00.01.ebuild 1069 BLAKE2B 7f5efb45643cde63727e81f2560714d0da4425ee77792584b77c89da085b033c2db94b789e05361a0708929284997a094bd06bb225947a2cbed6186d34967c81 SHA512 6a6bd5b0314e4d1b44328ed077a3146e6c905c2d73fb5f422271624ef18f23e235e154aa7f837e6c2c1aec202ab201841f475618f3fa5013f2c2f3af98125bf2
+EBUILD camlp5-8.00.02.ebuild 1073 BLAKE2B 3dbaf6c7694f1a52ebfc7b67b34fdec0256a4f4a6b6fd711672756a5d789e78888b96e15f789bbf11af10bd2b4d5e7574248701597efcfe45d8b0f9d10a45c71 SHA512 02f0ee65b774f7ac70953f9b9ed41354de6a95748ee6ecc8b19a7067a4adf07438201f0e204a0d011e18134ef1cdb1b6147d185cfd29789179479ce0765ad79e
 EBUILD camlp5-8.00.ebuild 1073 BLAKE2B 3dbaf6c7694f1a52ebfc7b67b34fdec0256a4f4a6b6fd711672756a5d789e78888b96e15f789bbf11af10bd2b4d5e7574248701597efcfe45d8b0f9d10a45c71 SHA512 02f0ee65b774f7ac70953f9b9ed41354de6a95748ee6ecc8b19a7067a4adf07438201f0e204a0d011e18134ef1cdb1b6147d185cfd29789179479ce0765ad79e
 MISC metadata.xml 416 BLAKE2B a354d5be50f3c22d734a960b5dac99af636478ff44b6fb31758d879ab4b31be5a64993a3cdff8fdaca59c7682d4597a73883c137679ab7817cbfd70869cb2a41 SHA512 b9eb28bca32dde11e1b266526c2381ac8c4bab983d9dab5f84bfffcd684e3c0525afce1e72d0fc7b2369298679a4c859a215ccaf6b223b6fcdf6efde12975fc0
diff --git a/dev-ml/camlp5/camlp5-8.00.02.ebuild b/dev-ml/camlp5/camlp5-8.00.02.ebuild
new file mode 100644
index 000000000000..fe4e5ebe5766
--- /dev/null
+++ b/dev-ml/camlp5/camlp5-8.00.02.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit findlib vcs-clean
+
+DESCRIPTION="A preprocessor-pretty-printer of ocaml"
+HOMEPAGE="https://camlp5.github.io/"
+SRC_URI="https://github.com/camlp5/camlp5/archive/rel${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-rel${PV}"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="doc +ocamlopt"
+
+DEPEND="
+	>=dev-lang/ocaml-3.10:=[ocamlopt?]
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	egit_clean
+	default
+}
+
+src_configure() {
+	./configure \
+		--strict \
+		-prefix /usr \
+		-bindir /usr/bin \
+		-libdir /usr/$(get_libdir)/ocaml \
+		-mandir /usr/share/man || die "configure failed"
+}
+
+src_compile() {
+	ulimit -s 11530000
+	emake out
+	if use ocamlopt; then
+		emake opt
+		emake opt.opt
+	fi
+}
+
+src_test() {
+	emake bootstrap
+}
+
+src_install() {
+	emake DESTDIR="${ED}" install
+	# findlib support
+	insinto "$(ocamlfind printconf destdir)/${PN}"
+	doins etc/META
+
+	dodoc -r doc/*
+	dodoc CHANGES DEVEL ICHANGES README.md UPGRADING MODE
+}
diff --git a/dev-ml/camlzip/Manifest b/dev-ml/camlzip/Manifest
index 7d23d2bd5160..78762dc13491 100644
--- a/dev-ml/camlzip/Manifest
+++ b/dev-ml/camlzip/Manifest
@@ -1,3 +1,5 @@
 DIST camlzip-1.10.tar.gz 27335 BLAKE2B bbf24953634278589395dd9fcedf1e3becce8dad1f380393dc3ac59589143e1685dc14085ef566e12fb751c6f1a333dd368795a5083b94a43b71e058e86489f3 SHA512 5c42e0d808230e3820b2e7ef34b544ca51a7bf0a484ce4e1c8b1e4966133196bb3ff7c3ca85b9c50050aca389316eb52f0335f6e2ad60c000594a33171b9a9a9
+DIST camlzip-1.11.tar.gz 28483 BLAKE2B b270e2a764547117d87a18f9ccca82891bc0dce182ea84f76b693acb34488ff25d8975154b843787554798bfd34c16dc6a25c431f8674c8c59eb2c195167c12b SHA512 4d69ef900437e66e00cd345497ec70f407f28cd8344ee5f2fad685d3bfe356924597d1854b752f2841b4007f96d6e0307cfae7e13cfb6f74951ae3eba5198a06
 EBUILD camlzip-1.10.ebuild 903 BLAKE2B 8c3f6b59e4efeed7418ddf85d711bb41fc3b30a0e02e6f169d5cd0d604b43412fb54ff9b16e79168c413b0cb168900d8e42e0a8dee0e3e86877e00a4572051d2 SHA512 9525f5b22a9ef4c20a518e3cc05ec820cc92c7cdf16b6a10e35ade61678d3d18e81408fadbbe1e6261f389e5e6b5c6c96dfa917e734033d68fde6741c57f9dca
+EBUILD camlzip-1.11.ebuild 910 BLAKE2B b5292983f3976f79961e77496af5c89499fa0ee28140d84dd8caf293e14844e02002507cf7e73b3ddee9210346e227313ce55d4dc887d94a1d4b282117ce7fe2 SHA512 6ecfb6c0cdc8d535bf9bc2979512e62b4c4a04b99adff6d3b4f7f22cc51dc140477fd6bab53fccd525d971e12c8e31ed17cadb99c064f5cb5e47af1572018806
 MISC metadata.xml 317 BLAKE2B d2d9b49548ab2d8a585cb4823b37b990805229909bb3ab23596ac5d916d2e7a2fe56153b1793d5e0979159e97f28289e14ded93d943541b7ab8def4cc195874b SHA512 5b7aa5dfdc7ec25161029b2d96a2596458b5507359fe25ff82268a98038f8d66f4fc095715348990d7116877035e17b0a2ed2d5541a990dcab1bd0155cc12ba1
diff --git a/dev-ml/camlzip/camlzip-1.11.ebuild b/dev-ml/camlzip/camlzip-1.11.ebuild
new file mode 100644
index 000000000000..09d1e837bb67
--- /dev/null
+++ b/dev-ml/camlzip/camlzip-1.11.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit findlib
+
+DESCRIPTION="Compressed file access ML library (ZIP, GZIP and JAR)"
+HOMEPAGE="https://github.com/xavierleroy/camlzip"
+SRC_URI="https://github.com/xavierleroy/camlzip/archive/rel$(ver_rs 1- '').tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-rel$(ver_rs 1- '')"
+
+LICENSE="LGPL-2.1"
+SLOT="1/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+RDEPEND=">=dev-lang/ocaml-4.07:=[ocamlopt?]
+	>=sys-libs/zlib-1.1.3"
+DEPEND="${RDEPEND}"
+
+QA_FLAGS_IGNORED=(
+	"usr/lib.*/ocaml/stublibs/dllcamlzip.so"
+	"usr/lib.*/ocaml/zip/zip.cmxs"
+)
+
+src_compile() {
+	emake all
+
+	if use ocamlopt; then
+		emake allopt
+	fi
+}
+
+src_install() {
+	findlib_src_preinst
+
+	emake DESTDIR="${D}" install-findlib
+	dosym zip/libcamlzip.a /usr/$(get_libdir)/ocaml/libcamlzip.a
+
+	dodoc README.md Changes
+}
diff --git a/dev-ml/core/Manifest b/dev-ml/core/Manifest
index 47abfea8a68f..fd7b3f05f4a3 100644
--- a/dev-ml/core/Manifest
+++ b/dev-ml/core/Manifest
@@ -1,5 +1,5 @@
 DIST core-0.14.0.tar.gz 361607 BLAKE2B 1602857bee142c23101380e6d54b6f8df1be8bb67e8f8baf7ca65c2f248d1ff9794e33d96cc58ca1f591b69e4a16b7873043549e01d38e2fc390c884d117d0a3 SHA512 fd3202c115ccda53aa32233f2eac223dcc3fb6272fd6327ea6aa5dcd3b7295936d86102640046c961a2af45d62aa3563a2701a2e0ef54f6cd2bfcb81609639f4
 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
+EBUILD core-0.14.1.ebuild 647 BLAKE2B 0781022f89122e0d7abad284653b6c7d69c914bf47b9bd4cfa8e721b5ab4a51de2397d2966a6aa021b650b36cae352a5a3e4e935a0d4fcd8e2dc12616f1f9456 SHA512 f77faa49ea82e9e3b3bb6001d05c26d0305bbf61a788d4c3a75d07c614f92e2dff5207ef7adb8c541d86bd95a368297ab51c665ff5addab2f88172b4f78714c3
 MISC metadata.xml 710 BLAKE2B 368091778c4347e69ea5398a3f6013d1741bc9fb20acacc861de152c8afd90d9647ef7b31143c26c7e50e0285b52f2a8688b7203821473004a9b237e65585dd7 SHA512 3d29e7a8c748a4849421fb73a1f1225f6480d032d8eb8bd70870567c8f2ac50ef1504c368204f6f063f71f5c984daff98a1109e81674abc8faca10c5a3414efe
diff --git a/dev-ml/core/core-0.14.1.ebuild b/dev-ml/core/core-0.14.1.ebuild
index 6ebd5813a98f..360f559aa22d 100644
--- a/dev-ml/core/core-0.14.1.ebuild
+++ b/dev-ml/core/core-0.14.1.ebuild
@@ -28,7 +28,3 @@ RDEPEND="
 	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 756fb569b697..f383183115d1 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 622 BLAKE2B bb3f7bc58d9a4e4de633aecb296e9b2500e06e24e19033bc38d8c2d55f36b81f767c8ac81ec82fa37ae1ddc8d865258164030099d2f565198188c57d94c20cf9 SHA512 79569d266887e26447472493efd8e50f4672666b68380f3256566e8f28b8b5f6808b5a2b2fdeda9f34e4f13e5217bbc3351a64943ff1f4d9177d89bacc15828d
+EBUILD core_bench-0.14.0.ebuild 557 BLAKE2B 1a2acc2519e360f7522e07d33a9999b57d8a5f9d335b2a369597c8d59fcdac52af1373d7078994ec90dfecf4d445efcab9b78160299cbf4936fc5abac8a070d9 SHA512 b457aa15b7851a7d0ce69762a9a3dc8c6445ed37dd1bbfd6d325bdf3c100066d591f1925a1da9a9b5d8f6d01d0e992a170b522b08498d0bb25dcb931d356bb2d
 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 e181169b6916..c6b66b01b28d 100644
--- a/dev-ml/core_bench/core_bench-0.14.0.ebuild
+++ b/dev-ml/core_bench/core_bench-0.14.0.ebuild
@@ -22,7 +22,3 @@ DEPEND="
 	>=dev-ml/re-1.8.0:=
 "
 RDEPEND="${DEPEND}"
-
-src_compile() {
-	dune build @install --profile release || die
-}
diff --git a/dev-ml/core_kernel/Manifest b/dev-ml/core_kernel/Manifest
index 86f96beb1eb5..7b42db80d56c 100644
--- a/dev-ml/core_kernel/Manifest
+++ b/dev-ml/core_kernel/Manifest
@@ -1,3 +1,5 @@
 DIST core_kernel-0.14.1.tar.gz 701832 BLAKE2B 0463641f8ab663f00dff59e1ac0b9693f15b71e4f9fa001b54d2449b8a18c8f618a7d7d3149084699d12d4c9834a20fcda6882549f4c69c219e3489ee1223dba SHA512 56488260fce8a066bba06efc349b4760c55d7d2fe38ed47dd7f37d0deb9ea05838a87713ec778df83d7805da5a54513a97d9e678640bb977bfd342bb748e7a33
+DIST core_kernel-0.14.2.tar.gz 701911 BLAKE2B e784d6d8f53df03ffb56075a43bdfc82d5099740c4eebdfdebe196cb3c97211b95892af18ab0f69b3143a873962fa74afe09a961ad851fb8eb4f30287e538157 SHA512 d0f719734d920d98c55ac7d1aa8ab5b3de7a3896f6cd8b1ffc5147c689f072361e79045a0b34c1f5359dbf492e612eabd613c4724fe60d45345c2944dcdcf6de
 EBUILD core_kernel-0.14.1-r3.ebuild 997 BLAKE2B e0520c647e0bb64774e8cbd20e86af0ad014cc73852c37f5e4341c72f4ae07733a573d3b1a757794e6e145f9c575e6fc5c346c6447be9a71abb246f7990a6882 SHA512 37bffd1f91f3620958e0adc4daeafcdfa0b33232521526c725e3d9969039d6e7e08b949d22bfb4bd497e7631dd335edbf5da6e3856ace3ca2b0beb1b8d852a31
+EBUILD core_kernel-0.14.2.ebuild 1003 BLAKE2B 9a30d1032a2ac94389b894a5123a70c819261af4b1a13f2ab01415981b8974219016c296ed3a2a0c52c5e2136943074be45381fd55896735fe67b7567b7fff13 SHA512 244eb455f9e05d17cb77caf3ae8e3563da2987cd407a39cd88d0f0d8703c8c25003e2106b46df9405e30cef4898c22aa60b8f8ab62519d06c95caaae481fc94c
 MISC metadata.xml 640 BLAKE2B 411246c9f2ad1ba00a0475e8195d3b54a0ffd9b7c6804c10b482540e6c27d683451ed63d65f48e2dcab87a53a69fa6215590c8b2f8bb951266697df6226e44a9 SHA512 7854d4748ccc7833d4a029e8ee0fdef9d91c2552d916d77bfe171590a1de6c9e547675e04c886afe9b5b6de8c34e200f6e52a193213ae00ce70f5823fa363292
diff --git a/dev-ml/core_kernel/core_kernel-0.14.2.ebuild b/dev-ml/core_kernel/core_kernel-0.14.2.ebuild
new file mode 100644
index 000000000000..21ede2227bb8
--- /dev/null
+++ b/dev-ml/core_kernel/core_kernel-0.14.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="System-independent part of Core"
+HOMEPAGE="https://github.com/janestreet/core_kernel"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+# Wants quickcheck_deprecated for now
+RESTRICT="test"
+
+RDEPEND="
+	dev-lang/ocaml:=
+	dev-ml/base:=
+	dev-ml/base_bigstring:=
+	dev-ml/base_quickcheck:=
+	dev-ml/bin_prot:=
+	dev-ml/fieldslib:=
+	dev-ml/jane-street-headers:=
+	dev-ml/jst-config:=
+	dev-ml/ppx_assert:=
+	dev-ml/ppx_base:=
+	dev-ml/ppx_hash:=
+	dev-ml/ppx_inline_test:=
+	dev-ml/ppx_jane:=
+	dev-ml/ppx_sexp_conv:=
+	dev-ml/ppx_sexp_message:=
+	dev-ml/splittable_random:=
+	dev-ml/sexplib:=
+	dev-ml/stdio:=
+	dev-ml/time_now:=
+	dev-ml/typerep:=
+	dev-ml/variantslib:=
+	dev-ml/ocaml-migrate-parsetree:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ml/cppo/Manifest b/dev-ml/cppo/Manifest
index 1e8c30a723d9..e30df5f2f0af 100644
--- a/dev-ml/cppo/Manifest
+++ b/dev-ml/cppo/Manifest
@@ -1,3 +1,5 @@
 DIST cppo-1.6.7.tar.gz 29032 BLAKE2B cc02666ca5fbc903cf6a749ee08f7fe34bad4604635084bbf964afdde66783c01e3d48d515eb42a5188189fef67ebe7cf79c0205c60537c9d1a8b14f453fd248 SHA512 fb2865b4004fe3f17d5893659fca90c01557cf6be789500c54b06ac8e0d097181c9f6437f178aae6d786b3f6b639859bc68400f4a7c59e7acd4f296cf8271a9d
+DIST cppo-1.6.8.tar.gz 29063 BLAKE2B 503c9dcc5f25cf69caa5057753ece9e107383a94d191a15f8056f7f417fa252147f2b2d3011493b80728aeca6979c0097e42b1d1af174784528959870366f5f9 SHA512 069bbe0ef09c03b0dc4b5795f909c3ef872fe99c6f1e6704a0fa97594b1570b3579226ec67fe11d696ccc349a4585055bbaf07c65eff423aa45af28abf38c858
 EBUILD cppo-1.6.7.ebuild 490 BLAKE2B 5ce584175da0b9f71b2f1175247a5a27447391971d818ece0c225c157d49135fd1f3cd120ab4e11c5f118848a4bc120d15ab1d57c5c17c0f4031153c833b7922 SHA512 0ba6dcc0c3bd3dd0ade1545c901f73dcc4a408dc0aecf9ceae7637b2a5c46cce633c32ed57ec39e32c1fd88f3cd77d8ce3bda63da9442be6b92e5aeab36fbf34
+EBUILD cppo-1.6.8.ebuild 496 BLAKE2B f385f3a6b2b6e03f3ae36365cee9eb665b8d5ec65681ca83e852b0e69ae21b091ad57ea0d81e304d7eaa4f10be803af6d470485eaa7c5cf5df5fc9da109a5a96 SHA512 31bd1b2c5f8e212f0c9229ef2bcab04c69bfd044c42186dcf2c0636202debd693e33dd2f7a942f5f9363c44aaeb22af97e03d78e842691becce876bd44be612a
 MISC metadata.xml 423 BLAKE2B c7f3efa3db8348c1120a2c77eddebae49b52d16393be3668f35ee702a659a183c2499f207c9607ebe2f7f1162e6167617762d3ad476c2891381f74e090a5b518 SHA512 00f3613b5fa03b08238a2cc541627aba4201a9d38343f0f9b18920bd8956155b5c2134d6093ba78d770596cc313e33d86d566fccbd64526887fcdc9c9ce17d61
diff --git a/dev-ml/cppo/cppo-1.6.8.ebuild b/dev-ml/cppo/cppo-1.6.8.ebuild
new file mode 100644
index 000000000000..2ceba92466f3
--- /dev/null
+++ b/dev-ml/cppo/cppo-1.6.8.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="An equivalent of the C preprocessor for OCaml programs"
+HOMEPAGE="https://github.com/ocaml-community/cppo/"
+SRC_URI="https://github.com/ocaml-community/cppo/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0/${PV}"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+RDEPEND="dev-ml/ocamlbuild
+	dev-ml/findlib:="
+DEPEND="${RDEPEND}"
diff --git a/dev-ml/dose3/Manifest b/dev-ml/dose3/Manifest
index 6cc71583fa56..51880c7e0ae7 100644
--- a/dev-ml/dose3/Manifest
+++ b/dev-ml/dose3/Manifest
@@ -4,6 +4,6 @@ DIST dose3_5.0.1.orig.tar.gz 297433 BLAKE2B 74ae954604f26398f091b4f14d2a633132ae
 DIST dose3_6.0.1-2.debian.tar.xz 23320 BLAKE2B 0351a715756b76c1f81fdf5599d10373ce85554f1d63b4dcbaa647dcf81b099e59c68f93413ca391bdf17b52831b085a7d2b86bc64d86676763bbabd7804a6a4 SHA512 219bb7614d1200adb5d22032cb3d7442c16cdce785088f58b3fcc188856b93817f0157ea6ed1bd72e1f565b9a98df145c188e0fa5d7f538d616b7eccc20ab706
 DIST dose3_6.0.1.orig.tar.gz 1417354 BLAKE2B c5fb08c853d2d3589416237addf767912fffab5ef74b7f3332799ae350a371307bd06a24abe6565d2d00aedc01f58d0a2583db6d2d76fc2ebee634b05405ab86 SHA512 cb9dad4ae296b85317f60133bb9dcc63dad8560486e2bd83139205810643e701de5e9834d8d2de34d8237d0abfd394970088c73eeab08956fc9c4178411303ea
 EBUILD dose3-5.0.1_p16-r3.ebuild 2256 BLAKE2B 04d27714676035014da0ff4dc1b062f4d790629f6aa2487f6afa05e4d95088148a1d7822910833c906b7bf0d9f88003e487582ce46802400291164a7c3bb1716 SHA512 c453ec3a3a63f761e58d0d0d48ab83570eaf9530a17855806e27240b87f1379aead72f528ab907bb33e4c8eae9bdd8b94d53b1b52eda1926b0ab5c07116b3fd7
-EBUILD dose3-6.0.1_p2.ebuild 1288 BLAKE2B 32c87d0c6f376230350d9eb6c18a20302a18facfa3b1d46b257bd81c901204f27ac9f528bd3d7922f1058a8cece31212fb168beacae919538abe1bdb15ba3bb6 SHA512 b26d59678fc4be946aa9178e62bca99448fead0ccda54727923079ddadfe406a6b99a06ea5f7e2d7c06959337d638baccd36e1ba8acfb45f0954bae0c4ac0b1b
+EBUILD dose3-6.0.1_p2.ebuild 1290 BLAKE2B df43efc990783797735461cf0f17430a6565508b8b03dc9f90531963021626b15eddaad531a9c549993abbab17d58d0b09160b25a4b0b596e2b09fdb16c752a9 SHA512 71195ada929102fb6230e8f3ad8e12fe78a789c383b303513066befbf69855cb4b236e1911b26e6d1e522f38eb951dc23d6563cf543f6f3c77718828b8e5c92e
 EBUILD dose3-6.1.ebuild 1040 BLAKE2B e0225b471809cf25b3b11079ba1755c3f894a83ce536d38d6dba27dea8172b98ec2489cbe56a991a3ce6f5efd7dd1b3c57d3cb0c06f009001489bb65bacc0a47 SHA512 30d2a470ce0f164a8f661e2cdd2ef8ac88e9ee41399d89a24e3ca56053c19c4e1312f9953dd2074e0eee2806bc23be0b46a122c5fda0939846a82a55c98fe81d
 MISC metadata.xml 568 BLAKE2B 3ded228894bc51a457d66de967eb5b1a47fd4a1239709f4573e7746198eccbea27db34cb6dface497e38f14b0c3e9405d85241d7757984961c2169f1699cc3b0 SHA512 8fdbf1f9e6fd6719ff88deb8ea5c705be2d35831713c2fbc4d55d9cc6277d1822ede3af006b1e818ed0bca18e84e8b2a1f10b26593a525132a4d40a8e5844e05
diff --git a/dev-ml/dose3/dose3-6.0.1_p2.ebuild b/dev-ml/dose3/dose3-6.0.1_p2.ebuild
index c62ab3d30392..c2656b5b378b 100644
--- a/dev-ml/dose3/dose3-6.0.1_p2.ebuild
+++ b/dev-ml/dose3/dose3-6.0.1_p2.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}-$(ver_cut 1-3)"
 
 LICENSE="LGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 arm arm64 ~ppc ~ppc64"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~x86"
 IUSE="+ocamlopt test"
 
 BDEPEND="
diff --git a/dev-ml/dune-configurator/Manifest b/dev-ml/dune-configurator/Manifest
index bdd0c17aa421..4da3fc8ac227 100644
--- a/dev-ml/dune-configurator/Manifest
+++ b/dev-ml/dune-configurator/Manifest
@@ -1,7 +1,9 @@
 DIST dune-2.8.2.tar.gz 1369417 BLAKE2B d846d35675a18abc3ccc57a52574d81a8fb4f082d9935912f035061c1107b47be8752daeb9c49bb2af4877e419a6c8bc30f846db6d773cf5267d3d761272a872 SHA512 fcbe45ea59492517e0868bf1f801c2bd2f3b1b30234e36d789c33e7ee48bd724726beb211697f3820609bbc27923c8c37d7be89dcbd059558014743360f2d0b7
 DIST dune-2.8.4.tar.gz 1372925 BLAKE2B 5b6d6738a0dc701d852e6cc59a1998f64c006d233f43a804b0b9b677a6eadda25aa20f52799c90910d361e4bc565636a50d218ad5d0a9927239adc5be36b3889 SHA512 13b36eb6a943f9513987a23dab467b2e449cc3a4de35227f8323c3c724b27f19daac500602141ab22a04579243333c8484ce27a7f73e46a72e796d30fb1c3253
 DIST dune-2.9.0.tar.gz 1385143 BLAKE2B c973e4b2c5780a3e4902c31c030b2560fe5be313338a5188edc9b7ff97b63968baba267966d095076bed4f1527a8b8b5a0f980e74f53476d70ec53f20dc661a6 SHA512 1c3b64746b00215cd97b36c0f1c6e2416c9d15c795265634240e9da37e2c2fce02ab3c309a0cb967f9f20a5c6df14e943c3c2942c1a8f4743c3a19c699f4eb24
+DIST dune-2.9.1.tar.gz 1385381 BLAKE2B 27224f803547d02f7110dcfc486ef41f9a4586f6f862ef7f8bbf05cc1f3f6dc8ea03fca99c01842f4226ea3d08f4127daa0e5811dd46cc00f1b96ad7eaafe43d SHA512 4fcff34de4acc4429dd73864ca90e695d8ba436839fd679608f7db292e44be70c3db455a58f59477f2055f84ce497bfa8e90e485ed9536acad3c1b3be3d4be77
 EBUILD dune-configurator-2.8.2-r1.ebuild 3691 BLAKE2B 6cceed0e264b8c1a8a6bc19b4fd790426f68556bf17b0fa80d8e3ec4f129aac627301f4dc61005e9bda9706f5d60425d1576044ef4a6c14e20e1a16c4e1790e4 SHA512 2d7b330a4fa3fb4ad8ddef912aa05f2b2d83123d434189a48b1a6f5b058ac3d80541e51d7ea53d5b85316c61914d1dfe7b814f773621522f52e23481bd7d3bc2
 EBUILD dune-configurator-2.8.4.ebuild 4113 BLAKE2B a7b7a6dd0339659e6a1f7a2a1e3ca9a086d849860164c1fda0f3f605208ba2fc71226688f87ffc29a8aef0db03713b2ce135ff8ba80b1e6b555d04c7b630460b SHA512 248672c231a7c1971ee4fb15ec5bc9c73b90a470dd2c41f6e69c1e8a1aa79cf1d77a4a7fde288a6ecfa3d798ca8ea70957a8925652b527920d3f7546e1edd53d
 EBUILD dune-configurator-2.9.0.ebuild 4119 BLAKE2B 41ee9db5c9e79840dae7e1cf2489f83f154ba64a90e32260fdb0af5b738e046a0d4d9912c59301fbf9567f3beb502e0164a7a9a7abaf3a4d0fc4f87949663b2f SHA512 17f1777fbacebca4abbf2636a6b6ff46a5b58fa32d28fee2cd6b9e9168f2200ba31f1b998ff3f4fd9b59a6b1df7afb4320f82ae5197a32c5a3d15a3aaf9cdacd
+EBUILD dune-configurator-2.9.1.ebuild 4119 BLAKE2B 41ee9db5c9e79840dae7e1cf2489f83f154ba64a90e32260fdb0af5b738e046a0d4d9912c59301fbf9567f3beb502e0164a7a9a7abaf3a4d0fc4f87949663b2f SHA512 17f1777fbacebca4abbf2636a6b6ff46a5b58fa32d28fee2cd6b9e9168f2200ba31f1b998ff3f4fd9b59a6b1df7afb4320f82ae5197a32c5a3d15a3aaf9cdacd
 MISC metadata.xml 413 BLAKE2B 68bcbe6d091780d3ea48707a42b402cfcc075b1ca0c58a8e145bc8ae6e89806361325f772e9e8b05484fc258f09e33c18fa329a494881e3275f534c65b283c15 SHA512 6520ccff6f2071125a07d0e6bc365c8a919ff32791af97fc633ef68b351de8295454884126334e182da7233744d489acfeb2519c3935990ad21eb20da3f5a1f9
diff --git a/dev-ml/dune-configurator/dune-configurator-2.9.1.ebuild b/dev-ml/dune-configurator/dune-configurator-2.9.1.ebuild
new file mode 100644
index 000000000000..87edcf4c3a33
--- /dev/null
+++ b/dev-ml/dune-configurator/dune-configurator-2.9.1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="A composable build system for OCaml"
+HOMEPAGE="https://github.com/ocaml/dune"
+SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz -> dune-${PV}.tar.gz"
+S="${WORKDIR}/dune-${PV}"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	~dev-ml/dune-private-libs-${PV}:=[ocamlopt=]
+	dev-ml/csexp:=[ocamlopt=]
+	dev-ml/result:=[ocamlopt=]
+"
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND}
+	test? (
+		dev-ml/core_bench
+		dev-ml/menhir
+		dev-ml/opam
+		dev-ml/ppx_expect
+	)
+"
+# TODO for test deps:
+# Add cram?
+# Add dev-ml/js_of_ocaml once dev-ml/ocaml-base64 is ported to Dune
+# Add coq?
+
+src_prepare() {
+	default
+
+	# Keep this list in sync with dev-ml/dune-private-libs
+	local bad_tests=(
+		# List of tests calling git, mercurial, etc
+		test/blackbox-tests/test-cases/dune-project-meta/main.t
+		test/blackbox-tests/test-cases/meta-template-version-bug.t
+		test/blackbox-tests/test-cases/subst/project-name-restriction.t
+		test/blackbox-tests/test-cases/subst/with-opam-file.t
+		test/blackbox-tests/test-cases/subst.t
+		test/blackbox-tests/test-cases/subst/unicode.t
+		test/blackbox-tests/test-cases/subst/from-project-file.t
+		test/blackbox-tests/test-cases/trace-file.t
+		otherlibs/build-info/test/run.t
+		test/expect-tests/vcs_tests.ml
+
+		# Strange failures, seemingly from newer versions of deps
+		test/blackbox-tests/test-cases/merlin/allow_approximate_merlin_warn.t
+		test/blackbox-tests/test-cases/merlin/merlin-tests.t
+		test/blackbox-tests/test-cases/merlin/github4125.t
+		test/blackbox-tests/test-cases/install-dry-run.t
+		test/blackbox-tests/test-cases/c-flags.t
+		test/blackbox-tests/test-cases/install-libdir.t
+		test/blackbox-tests/test-cases/dune-cache/trim.t
+
+		# Strange failures about opam not being initialised
+		test/blackbox-tests/test-cases/merlin/merlin-from-subdir.t
+		test/blackbox-tests/test-cases/merlin/symlinks.t
+		test/blackbox-tests/test-cases/merlin/src-dirs-of-deps.t
+		test/blackbox-tests/test-cases/merlin/per-module-pp.t
+		test/blackbox-tests/test-cases/merlin/server.t
+		test/blackbox-tests/test-cases/github1946.t
+		test/blackbox-tests/test-cases/github759.t
+
+		# Wants nodejs!
+		test/blackbox-tests/test-cases/jsoo/simple.t
+		test/blackbox-tests/test-cases/jsoo/inline-tests.t
+		test/blackbox-tests/test-cases/jsoo/github3622.t
+		# Wants js_of_ocaml (can't include yet b/c of ocaml-base64 porting)
+		test/blackbox-tests/test-cases/jsoo/explicit-js-mode-specified.t
+
+		# Wants coq which doesn't build for me right now
+		test/blackbox-tests/test-cases/coq/rec-module.t
+		test/blackbox-tests/test-cases/coq/compose-sub-theory.t
+		test/blackbox-tests/test-cases/coq/native-compose.t
+		test/blackbox-tests/test-cases/coq/base-unsound.t
+		test/blackbox-tests/test-cases/coq/base.t
+		test/blackbox-tests/test-cases/coq/native-single.t
+		test/blackbox-tests/test-cases/coq/compose-simple.t
+		test/blackbox-tests/test-cases/coq/ml-lib.t
+		test/blackbox-tests/test-cases/coq/extract.t
+		test/blackbox-tests/test-cases/coq/compose-plugin.t
+
+		# Unpackaged dependencies (a rabbit hole for now)
+		# utop -> lambda-term, zed
+		test/blackbox-tests/test-cases/utop/github3188.t
+		test/blackbox-tests/test-cases/utop/utop-simple.t
+		test/blackbox-tests/test-cases/utop/utop-default.t
+		test/blackbox-tests/test-cases/utop/utop-default-implementation.t
+		test/blackbox-tests/test-cases/utop/utop-ppx-rewriters.t
+		# ocamlformat
+		test/blackbox-tests/test-cases/formatting.t
+		# mdx
+		test/blackbox-tests/test-cases/mdx-stanza.t
+		# odoc
+		test/blackbox-tests/test-cases/odoc/odoc-simple.t
+		test/blackbox-tests/test-cases/odoc/odoc-package-mld-link.t
+		test/blackbox-tests/test-cases/odoc/multiple-private-libs.t
+		test/blackbox-tests/test-cases/odoc/odoc-unique-mlds.t
+		test/blackbox-tests/test-cases/odoc/github717-odoc-index.t
+		test/blackbox-tests/test-cases/odoc/warnings.t
+	)
+
+	rm -r ${bad_tests[@]} || die "Failed to remove broken/inappropriate tests"
+}
+
+src_configure() {
+	:
+}
diff --git a/dev-ml/dune-private-libs/Manifest b/dev-ml/dune-private-libs/Manifest
index 8eb641182a9b..b520d90c0a58 100644
--- a/dev-ml/dune-private-libs/Manifest
+++ b/dev-ml/dune-private-libs/Manifest
@@ -1,7 +1,9 @@
 DIST dune-2.8.2.tar.gz 1369417 BLAKE2B d846d35675a18abc3ccc57a52574d81a8fb4f082d9935912f035061c1107b47be8752daeb9c49bb2af4877e419a6c8bc30f846db6d773cf5267d3d761272a872 SHA512 fcbe45ea59492517e0868bf1f801c2bd2f3b1b30234e36d789c33e7ee48bd724726beb211697f3820609bbc27923c8c37d7be89dcbd059558014743360f2d0b7
 DIST dune-2.8.4.tar.gz 1372925 BLAKE2B 5b6d6738a0dc701d852e6cc59a1998f64c006d233f43a804b0b9b677a6eadda25aa20f52799c90910d361e4bc565636a50d218ad5d0a9927239adc5be36b3889 SHA512 13b36eb6a943f9513987a23dab467b2e449cc3a4de35227f8323c3c724b27f19daac500602141ab22a04579243333c8484ce27a7f73e46a72e796d30fb1c3253
 DIST dune-2.9.0.tar.gz 1385143 BLAKE2B c973e4b2c5780a3e4902c31c030b2560fe5be313338a5188edc9b7ff97b63968baba267966d095076bed4f1527a8b8b5a0f980e74f53476d70ec53f20dc661a6 SHA512 1c3b64746b00215cd97b36c0f1c6e2416c9d15c795265634240e9da37e2c2fce02ab3c309a0cb967f9f20a5c6df14e943c3c2942c1a8f4743c3a19c699f4eb24
+DIST dune-2.9.1.tar.gz 1385381 BLAKE2B 27224f803547d02f7110dcfc486ef41f9a4586f6f862ef7f8bbf05cc1f3f6dc8ea03fca99c01842f4226ea3d08f4127daa0e5811dd46cc00f1b96ad7eaafe43d SHA512 4fcff34de4acc4429dd73864ca90e695d8ba436839fd679608f7db292e44be70c3db455a58f59477f2055f84ce497bfa8e90e485ed9536acad3c1b3be3d4be77
 EBUILD dune-private-libs-2.8.2-r1.ebuild 3691 BLAKE2B 7275871c01c4f1c68db72e7c0fe976103dd916007fee23c901f5007783b84a113f30857fb1106f64e0e01a3b4db2cae19115cd29a921ccf7a7c4527234c21d3f SHA512 846081c97aa0fd064e2089fc9d17b87ca6ca2c247341ddd1704bd53170c829151a8a3b4fa9404b71eed99705e4d437c31baff7be7835c1150750900940617d7a
 EBUILD dune-private-libs-2.8.4.ebuild 4113 BLAKE2B abbb2c64d54ffe7b78468d37517a83725e561ba58cfc85f710576342720bb92bc8b40e7818ebc1537c0ce5651d1a38ae8da5ffaeab278a63364a5298bbab44c7 SHA512 6d6f87691c660cd4d01e8a3adb86cb46b2cbac3b4288e8f9d34a89795bf8e7891badd9bc364ed8593c85a8b45bcde24da03c1cb6026c054aef3d164f47598ceb
 EBUILD dune-private-libs-2.9.0.ebuild 4119 BLAKE2B eaea1ebab708adcbd6d1807cb2a14010e3cac7d7dbaeaa12c291ea2d2c4dc804a5e34a4a2c02ac342f73d98f09156ceb5bee510fe0d15dc91bbfdf7afd70dc2e SHA512 458293150214b84f21c2aa64923bf04fe49e7f7d1bd075219e12bed6ccf989bc2af492c15e0b18979e85483c15e13a35d481c3a1f18540b27a14d3302105f49a
+EBUILD dune-private-libs-2.9.1.ebuild 4119 BLAKE2B eaea1ebab708adcbd6d1807cb2a14010e3cac7d7dbaeaa12c291ea2d2c4dc804a5e34a4a2c02ac342f73d98f09156ceb5bee510fe0d15dc91bbfdf7afd70dc2e SHA512 458293150214b84f21c2aa64923bf04fe49e7f7d1bd075219e12bed6ccf989bc2af492c15e0b18979e85483c15e13a35d481c3a1f18540b27a14d3302105f49a
 MISC metadata.xml 413 BLAKE2B 68bcbe6d091780d3ea48707a42b402cfcc075b1ca0c58a8e145bc8ae6e89806361325f772e9e8b05484fc258f09e33c18fa329a494881e3275f534c65b283c15 SHA512 6520ccff6f2071125a07d0e6bc365c8a919ff32791af97fc633ef68b351de8295454884126334e182da7233744d489acfeb2519c3935990ad21eb20da3f5a1f9
diff --git a/dev-ml/dune-private-libs/dune-private-libs-2.9.1.ebuild b/dev-ml/dune-private-libs/dune-private-libs-2.9.1.ebuild
new file mode 100644
index 000000000000..7b6b59feb352
--- /dev/null
+++ b/dev-ml/dune-private-libs/dune-private-libs-2.9.1.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="A composable build system for OCaml"
+HOMEPAGE="https://github.com/ocaml/dune"
+SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz -> dune-${PV}.tar.gz"
+S="${WORKDIR}/dune-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	~dev-ml/dune-${PV}
+	test? (
+		dev-ml/core_bench
+		dev-ml/menhir
+		dev-ml/opam
+		dev-ml/ppx_expect
+	)
+"
+DEPEND="
+	dev-ml/csexp:=[ocamlopt=]
+	dev-ml/findlib:=[ocamlopt=]
+	>=dev-lang/ocaml-4.09:=
+"
+RDEPEND="${DEPEND}"
+
+# TODO for test deps:
+# Add cram?
+# Add dev-ml/js_of_ocaml once dev-ml/ocaml-base64 is ported to Dune
+# Add coq?
+
+src_prepare() {
+	default
+
+	# Keep this list in sync with dev-ml/dune-configurator
+	local bad_tests=(
+		# List of tests calling git, mercurial, etc
+		test/blackbox-tests/test-cases/dune-project-meta/main.t
+		test/blackbox-tests/test-cases/meta-template-version-bug.t
+		test/blackbox-tests/test-cases/subst/project-name-restriction.t
+		test/blackbox-tests/test-cases/subst/with-opam-file.t
+		test/blackbox-tests/test-cases/subst.t
+		test/blackbox-tests/test-cases/subst/unicode.t
+		test/blackbox-tests/test-cases/subst/from-project-file.t
+		test/blackbox-tests/test-cases/trace-file.t
+		otherlibs/build-info/test/run.t
+		test/expect-tests/vcs_tests.ml
+
+		# Strange failures, seemingly from newer versions of deps
+		test/blackbox-tests/test-cases/merlin/allow_approximate_merlin_warn.t
+		test/blackbox-tests/test-cases/merlin/merlin-tests.t
+		test/blackbox-tests/test-cases/merlin/github4125.t
+		test/blackbox-tests/test-cases/install-dry-run.t
+		test/blackbox-tests/test-cases/c-flags.t
+		test/blackbox-tests/test-cases/install-libdir.t
+		test/blackbox-tests/test-cases/dune-cache/trim.t
+
+		# Strange failures about opam not being initialised
+		test/blackbox-tests/test-cases/merlin/merlin-from-subdir.t
+		test/blackbox-tests/test-cases/merlin/symlinks.t
+		test/blackbox-tests/test-cases/merlin/src-dirs-of-deps.t
+		test/blackbox-tests/test-cases/merlin/per-module-pp.t
+		test/blackbox-tests/test-cases/merlin/server.t
+		test/blackbox-tests/test-cases/github1946.t
+		test/blackbox-tests/test-cases/github759.t
+
+		# Wants nodejs!
+		test/blackbox-tests/test-cases/jsoo/simple.t
+		test/blackbox-tests/test-cases/jsoo/inline-tests.t
+		test/blackbox-tests/test-cases/jsoo/github3622.t
+		# Wants js_of_ocaml (can't include yet b/c of ocaml-base64 porting)
+		test/blackbox-tests/test-cases/jsoo/explicit-js-mode-specified.t
+
+		# Wants coq which doesn't build for me right now
+		test/blackbox-tests/test-cases/coq/rec-module.t
+		test/blackbox-tests/test-cases/coq/compose-sub-theory.t
+		test/blackbox-tests/test-cases/coq/native-compose.t
+		test/blackbox-tests/test-cases/coq/base-unsound.t
+		test/blackbox-tests/test-cases/coq/base.t
+		test/blackbox-tests/test-cases/coq/native-single.t
+		test/blackbox-tests/test-cases/coq/compose-simple.t
+		test/blackbox-tests/test-cases/coq/ml-lib.t
+		test/blackbox-tests/test-cases/coq/extract.t
+		test/blackbox-tests/test-cases/coq/compose-plugin.t
+
+		# Unpackaged dependencies (a rabbit hole for now)
+		# utop -> lambda-term, zed
+		test/blackbox-tests/test-cases/utop/github3188.t
+		test/blackbox-tests/test-cases/utop/utop-simple.t
+		test/blackbox-tests/test-cases/utop/utop-default.t
+		test/blackbox-tests/test-cases/utop/utop-default-implementation.t
+		test/blackbox-tests/test-cases/utop/utop-ppx-rewriters.t
+		# ocamlformat
+		test/blackbox-tests/test-cases/formatting.t
+		# mdx
+		test/blackbox-tests/test-cases/mdx-stanza.t
+		# odoc
+		test/blackbox-tests/test-cases/odoc/odoc-simple.t
+		test/blackbox-tests/test-cases/odoc/odoc-package-mld-link.t
+		test/blackbox-tests/test-cases/odoc/multiple-private-libs.t
+		test/blackbox-tests/test-cases/odoc/odoc-unique-mlds.t
+		test/blackbox-tests/test-cases/odoc/github717-odoc-index.t
+		test/blackbox-tests/test-cases/odoc/warnings.t
+	)
+
+	rm -r ${bad_tests[@]} || die "Failed to remove broken/inappropriate tests"
+}
+
+src_configure() {
+	:
+}
diff --git a/dev-ml/dune/Manifest b/dev-ml/dune/Manifest
index 249560a9f296..4f35cf6a203e 100644
--- a/dev-ml/dune/Manifest
+++ b/dev-ml/dune/Manifest
@@ -4,10 +4,12 @@ DIST dune-2.7.1.tar.gz 1290915 BLAKE2B 85a2dee92d1ead03b43b80742c291f4470dd9e1d8
 DIST dune-2.8.2.tar.gz 1369417 BLAKE2B d846d35675a18abc3ccc57a52574d81a8fb4f082d9935912f035061c1107b47be8752daeb9c49bb2af4877e419a6c8bc30f846db6d773cf5267d3d761272a872 SHA512 fcbe45ea59492517e0868bf1f801c2bd2f3b1b30234e36d789c33e7ee48bd724726beb211697f3820609bbc27923c8c37d7be89dcbd059558014743360f2d0b7
 DIST dune-2.8.4.tar.gz 1372925 BLAKE2B 5b6d6738a0dc701d852e6cc59a1998f64c006d233f43a804b0b9b677a6eadda25aa20f52799c90910d361e4bc565636a50d218ad5d0a9927239adc5be36b3889 SHA512 13b36eb6a943f9513987a23dab467b2e449cc3a4de35227f8323c3c724b27f19daac500602141ab22a04579243333c8484ce27a7f73e46a72e796d30fb1c3253
 DIST dune-2.9.0.tar.gz 1385143 BLAKE2B c973e4b2c5780a3e4902c31c030b2560fe5be313338a5188edc9b7ff97b63968baba267966d095076bed4f1527a8b8b5a0f980e74f53476d70ec53f20dc661a6 SHA512 1c3b64746b00215cd97b36c0f1c6e2416c9d15c795265634240e9da37e2c2fce02ab3c309a0cb967f9f20a5c6df14e943c3c2942c1a8f4743c3a19c699f4eb24
+DIST dune-2.9.1.tar.gz 1385381 BLAKE2B 27224f803547d02f7110dcfc486ef41f9a4586f6f862ef7f8bbf05cc1f3f6dc8ea03fca99c01842f4226ea3d08f4127daa0e5811dd46cc00f1b96ad7eaafe43d SHA512 4fcff34de4acc4429dd73864ca90e695d8ba436839fd679608f7db292e44be70c3db455a58f59477f2055f84ce497bfa8e90e485ed9536acad3c1b3be3d4be77
 EBUILD dune-1.11.4.ebuild 670 BLAKE2B adc969c1d17b4012bf83eee162f575ac804a97fb73cdfe49479fc6c8c0e63a45b60b21d0e33ef335b58b8576e7efbc8298972da3d8c6d0dd1d7ee0192c77bc07 SHA512 0edaaa2853cabda0a8aae6f67b633262608592e1cbe0fa0043f8bc9a4af80fd2a7f5b10ec2156d8c384ae4cf69fbc63c41e31672c45afadae849f03bc2d01c71
 EBUILD dune-2.1.0.ebuild 675 BLAKE2B 96dd8ec1a6c065919c057a9faf06321f60aec1bf4d14db47b194ddbac137a614898331b02c45b528ded939f94576de2789a1c1b0fb7796f4e37a7b2f196dce5b SHA512 b655265fa0774f42cb9428c2d86f574b311660a88300c8e0bb9c35aa4b5d5750bb6392084614c2cdbfee6766c7a50067b0be9ff0f3e8c4ca1f8bd4e9cb918acb
 EBUILD dune-2.7.1.ebuild 767 BLAKE2B 18b22cc6407814bdef1baedfe7c325224d69fd126c301117df421e063021d16f9d8a5582e2bc6f10dab9f60c27f2fa4901514930fed56c3ec390f00697817d94 SHA512 789838c90fd024367af2cdb5b5f125b0a2d58f5afbac1af09d7b69968503e0256d4974453e1b5c958d3e73c00ec24442f34c448dc2913742ad31bd059c49379c
 EBUILD dune-2.8.2.ebuild 896 BLAKE2B 528ec447be147ccfb4a710413611572d965436af2329ca4d24ca98f8171085890d1578f6bb184a1440b1e4e071ae14b53d095606af7ab6aca322a93aeeae8338 SHA512 30d730b466910f63939417076c699235e00dcad0df4050916626aa08ffbb81cb1521d3fb8fc2234f2ab1d45d4b10b7656719f4bf63ed2d9383d2c6caa2906924
 EBUILD dune-2.8.4.ebuild 896 BLAKE2B 528ec447be147ccfb4a710413611572d965436af2329ca4d24ca98f8171085890d1578f6bb184a1440b1e4e071ae14b53d095606af7ab6aca322a93aeeae8338 SHA512 30d730b466910f63939417076c699235e00dcad0df4050916626aa08ffbb81cb1521d3fb8fc2234f2ab1d45d4b10b7656719f4bf63ed2d9383d2c6caa2906924
 EBUILD dune-2.9.0.ebuild 902 BLAKE2B 56cfab513a0767ba85a2e8808e8f3a7cc687869a8c60366a42d278ee52774078690b8c4110bdbeac07fc3699cc1fb1dd4f1efd6087c3e086c9ae2da862a691ac SHA512 5c954d7e379db8aaf2eca54cdd084c2146e627bd61b0ce556fabc1d2c4de31738f98df0f07518a15257887f80db92e2cd5c7a587c8d72b9266fabe35093c6cc9
+EBUILD dune-2.9.1.ebuild 903 BLAKE2B f3df6ccdf9cefd2d7f1ba4d9bfb5ede97639919a214e7fd709cb7928b5923f84a41bce96055108a40ddef55ace5a6301b2aa08b3ac6ca6d374f1621a6c56aaf0 SHA512 f8f733b489eaddecda74cdccc66932716f0103151d98778278bc4cf929eb03a6011679f8f4e529c86d491ac1d3cb6469e366326e97f656c72a1a4ce5063e4f93
 MISC metadata.xml 413 BLAKE2B 68bcbe6d091780d3ea48707a42b402cfcc075b1ca0c58a8e145bc8ae6e89806361325f772e9e8b05484fc258f09e33c18fa329a494881e3275f534c65b283c15 SHA512 6520ccff6f2071125a07d0e6bc365c8a919ff32791af97fc633ef68b351de8295454884126334e182da7233744d489acfeb2519c3935990ad21eb20da3f5a1f9
diff --git a/dev-ml/dune/dune-2.9.1.ebuild b/dev-ml/dune/dune-2.9.1.ebuild
new file mode 100644
index 000000000000..93856341506f
--- /dev/null
+++ b/dev-ml/dune/dune-2.9.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multiprocessing
+
+DESCRIPTION="A composable build system for OCaml"
+HOMEPAGE="https://github.com/ocaml/dune"
+SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-lang/ocaml-4.08:=
+	!dev-ml/jbuilder
+"
+DEPEND="
+	${RDEPEND}
+	dev-ml/findlib
+	test? (
+		dev-ml/core_bench
+		dev-ml/ppx_bench
+		dev-ml/ppx_expect
+	)
+"
+
+QA_FLAGS_IGNORED="usr/bin/dune"
+
+src_configure() {
+	:
+}
+
+src_compile() {
+	ocaml bootstrap.ml || die
+	./dune.exe build -p "${PN}" --profile dune-bootstrap -j $(makeopts_jobs) || die
+}
+
+src_install() {
+	default
+	mv "${ED}"/usr/doc "${ED}"/usr/share/doc/${PF} || die
+	mv "${ED}"/usr/man "${ED}"/usr/share/man || die
+}
diff --git a/dev-ml/extlib/Manifest b/dev-ml/extlib/Manifest
index 9b91347166b7..0fb39be4eca4 100644
--- a/dev-ml/extlib/Manifest
+++ b/dev-ml/extlib/Manifest
@@ -2,5 +2,5 @@ AUX extlib-1.7.7-no-git.patch 283 BLAKE2B 2cfc23016472905c9dfb28615bce04d607a70b
 DIST extlib-1.7.7.tar.gz 88870 BLAKE2B fff84524ef227718d3908c5b65f4b781360cebc0dca3a8862aa11ea671499b45192c5106769e104d396118e3cdcd904ddce06df784f8fd0eadb7a2372ca3df94 SHA512 088a6c5bbe6530cd60e2276dc02592b69ad7ad685b752f0544c54b6246b8131238c6423ce7bfc81fe3ad1766f605ecf52fd3888d55cca63e22c947afedf610c5
 DIST extlib-1.7.8.tar.gz 90213 BLAKE2B cf78d819c542e84825bea3422d1b9afb46a3f72274ac40c704ae872a5889cbe0793f1e27f2dd8f38dee118590300d3bc6a336bfd29a16dfad00008a63ceeb17c SHA512 4a0d5d82da068c34286a1547e173f2634372d01c201823edfda2b8f72d3ff58fa26da29dde9a8b2fda28989cdb655d5a9cfd71310660e5c593026a75a833e6c6
 EBUILD extlib-1.7.7.ebuild 971 BLAKE2B e6197bf35b329a9a78def6c235793a8266e4379ece7b4c58d47259d7adb96fa758ca8639eddcbbc38f8df377682f6d9d655e8929160857147040a77d82340a71 SHA512 6b5bea15b76345fe16a7015147164b291e975ccbe64d41a4ed8e23dcb21724d0dd0b0622400858f0738ddfeacfd999d1b55e060358715bb996699c7f2a780a36
-EBUILD extlib-1.7.8.ebuild 921 BLAKE2B 3648783248395e13185f8774bce4c7ad1838521185a7529d89de81daebf7381e89e620ba6bdf745aa78d051005e29a7ba4520d601835d7f2414c594f1e58857f SHA512 ae712a1cb6ba938532a714da501bacf0f009320c71173254a9950a59683387d57176cea00c9351ea79bce0590b3e3542968d205dd2cf3da601cbc8b3ee015bad
+EBUILD extlib-1.7.8.ebuild 918 BLAKE2B dc4e4df094178eeb1db700c472efbe29f7f9082073a888b11b3aca67dde55ca1f5e40dead97af6e9dd3682977351c8c877fc0b59f1b72b5fcdeca9562aeb2888 SHA512 ff10d53b326235ad9c6827e6cc6fbd6c7aa53fd3aac5c2975eed6cb1bd81c13a2774d188ab21714d17ed301707b37bb5ac3d50f5ec0665eb5635da60a95bb909
 MISC metadata.xml 385 BLAKE2B 69ceb184f4b3add8c192dc74c7a8c588f885a125f4fdb0d2d83a1760241ea35fb6365604268ce66c9759a52c742abbcf02a6cc9738eecad5a6cdc0bc247001e5 SHA512 8157c72cfce80eb5981add6285952d2befee14a0dedf3276985d2c9f812b588d6d022178cbebf5b7bf5950ca6744bd5c8daa4a76a5863299eebdd4f90e9d4a67
diff --git a/dev-ml/extlib/extlib-1.7.8.ebuild b/dev-ml/extlib/extlib-1.7.8.ebuild
index 8c99d9db050a..86f42e414812 100644
--- a/dev-ml/extlib/extlib-1.7.8.ebuild
+++ b/dev-ml/extlib/extlib-1.7.8.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/ocaml-${P}"
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 arm arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc +ocamlopt"
 
 # See bug #704146
diff --git a/dev-ml/fpath/Manifest b/dev-ml/fpath/Manifest
index 91ccc23fac9d..de062d7548e8 100644
--- a/dev-ml/fpath/Manifest
+++ b/dev-ml/fpath/Manifest
@@ -1,5 +1,5 @@
 DIST fpath-0.7.2.tbz 24142 BLAKE2B 5aa22a33d0155c2a446c3622d6feef0748be3eaa72f07e7e2770fda1993794864072a5f50a052537b9724e39935064967c87f82d860a2da17fbc86279a1930ab SHA512 d8ab8d6f183a1742d74a3a3220cc1d62e7df38a6f3ca1c04fad18426a0897152255382305ad14d058b5b85ab55a27536c39a62deffac8d46984a730a2a18405d
 DIST fpath-0.7.3.tbz 24345 BLAKE2B 5d4e68acebdafb6378422b31385e78decff2dfce1bedd102c7e6baac519f9843e0828629f4a15e075f506865e1af6f9cc7ece761e74fe6608d3476338cc556cb SHA512 acf4b379aee3c25305ef71d1b97b154faa6de1e8248a8e8d046cf11090a3e94f2dc048b961bb51725ca7384e784455f2893fbd51f26bf80571a9cc7e9475b945
-EBUILD fpath-0.7.2.ebuild 565 BLAKE2B e08aa3a46b781dd135bfa70063a2137e4bd8a1348052f5f5c59e53d0b22fbd1fb74a946bed0ccaab3167c69bc82d6e88ffd4846e0dec34b64c02bd515b99904e SHA512 75830aa737f230bb6dcfc232de484cb5aa922cfff2e94366afc8bab63e8c12753cf738d559fd2f24a0cfb62164c4ab476415bdf215f8e8422c6c05ce439cbdcd
+EBUILD fpath-0.7.2.ebuild 562 BLAKE2B 3f1fd182e9e06b250a70da7dba5912c482be621497f217dcd6faacb4de6e1dcf0e998923cf076f893a1cb201f931b9437c9a580ab307b5160d3914ce0c0389a4 SHA512 7c0087bea3e7daefbfb716fad0007a56ff73f3c81b4269865e64448c1f939c07460297a1d19ce471bd10a6a96794da3c260e7cd298758f20a70e38cba80cae4b
 EBUILD fpath-0.7.3.ebuild 565 BLAKE2B bae6063030f1d9da97f30f1ee8403502760a57f4da88c6d2284a54b887145dc28fcb5f794403090a9ce3a6d0128c5f379f769f1202ef17a78a328fe29c617ffe SHA512 eea81ad44218a70c4157b32390fa01d4ed65c50a1cf36de2dd6bb2dc9f5dcbd809ad28a4a32a7fdded311f08dd9d8e931b435d4cdd3a61b7f6ffb12512592b58
 MISC metadata.xml 312 BLAKE2B 25e78fc547cff8e938dcd8eeaac127b31e60a758a183cd4d01258e7efac1b8a820eb241adc66169b15806fc539dbab324b85f9d50cb10f2aba61a8f64d3c7dab SHA512 b835a40c52db072c5f0bbca539437f959be01089e1aa6587cc4f8dc16150ec8be3800c9aeb00143b29c6557eba5bf952718f1cdbb96fe5f30851a165f410131d
diff --git a/dev-ml/fpath/fpath-0.7.2.ebuild b/dev-ml/fpath/fpath-0.7.2.ebuild
index 93ce99fbfac0..cd686c223196 100644
--- a/dev-ml/fpath/fpath-0.7.2.ebuild
+++ b/dev-ml/fpath/fpath-0.7.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://erratique.ch/software/fpath/releases/${P}.tbz"
 
 LICENSE="ISC"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 arm arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-ml/lwt/Manifest b/dev-ml/lwt/Manifest
index e6e2829a08a8..873f0f47af78 100644
--- a/dev-ml/lwt/Manifest
+++ b/dev-ml/lwt/Manifest
@@ -1,5 +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 900 BLAKE2B 81df205f80c964da2d0caf0ed5437731507e6eae59700279e55d702c442800b3f9051fd07afa67437b6d52b316a7cfc73dfdd9990514789df43b964688c9c139 SHA512 88dac96b1bf0bcc7dc08f7ddbda5cc065055e0cd0865d32a2da6344823cb8efa3ff1371f68042b92e1ee88df5913ed74bcd2628be50b080ad974905d957a30d2
+EBUILD lwt-5.3.0-r1.ebuild 835 BLAKE2B 05a4143a50d26354d5ccc3534c269702bb510ae665cc83b917bab3722adbeb43a5ca7498283f196d1f04b989849a4d7f9ca843dfd3e043f991c9580251d544d6 SHA512 5fd73aa06279d5460ee8ee1f960edbc8b7bb21a63b21324cbd563e5ce2e979394568c827f6f7e51d13c45d6f5e3bcfce699a86759b8bdf7d73894bc2dfafbce3
 MISC metadata.xml 414 BLAKE2B 34a1192334c52a4dfe3746119293c05cccc14f6a4b7b5faad4834ad33996a98be8c7854096eebe870a4a0bdc675d796f55788334503423a99632b1625d84b8d9 SHA512 09660f044d6132779e8e63fe6dbca02109317f70af905181b8b344348c72257df804022fedf884c84ddbfe2d60dbcb965e3cc273c30c593f70a083d80c2f92aa
diff --git a/dev-ml/lwt/lwt-5.3.0-r1.ebuild b/dev-ml/lwt/lwt-5.3.0-r1.ebuild
index 40958766de01..8e708c4359be 100644
--- a/dev-ml/lwt/lwt-5.3.0-r1.ebuild
+++ b/dev-ml/lwt/lwt-5.3.0-r1.ebuild
@@ -34,7 +34,3 @@ 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/merlin/Manifest b/dev-ml/merlin/Manifest
index 27ac48a08b3b..f8016977d04f 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 1404 BLAKE2B 95db10376b3937bfeff54106b8aa1099ba852590b07a670f1499764862e7f1dd74e05efc461570947e0d5f9dc5c94d3ed9bc1449805e91bae33358cace53dd68 SHA512 07798a89c19f854966f3e078127a1f599b61e17ff905f5dd300ac8101b87465995f536c85cf6ea92db0b9f3d5e34419aa11c3d36baa61ceb4386c398e4707ae9
+EBUILD merlin-4.1-r2.ebuild 1407 BLAKE2B 31dca48e94c00c377212114a39879922ff4bcd5ed5069a13a3a760f0a05fc92dc2c2d7f89fc73a9e489185cba0e4e36b4ed53f46f9f0d1a49e40f1b6339cff9c SHA512 0fcc8a797b5e2cdcffab5276d403add0cfe341cc6d9571730b74ae1d01e833c5227d7eb1a4443853d65836e6ea8e1c2ec60e23f790fbeda5c3b2a144f0f06e02
 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 20b1824bea52..1433cc088f65 100644
--- a/dev-ml/merlin/merlin-4.1-r2.ebuild
+++ b/dev-ml/merlin/merlin-4.1-r2.ebuild
@@ -43,7 +43,7 @@ src_prepare() {
 }
 
 src_compile() {
-	dune_src_compile
+	dune build @install
 
 	if use emacs ; then
 		# Build the emacs integration
diff --git a/dev-ml/num/Manifest b/dev-ml/num/Manifest
index 2f03573e7cdd..820ce07ce9b5 100644
--- a/dev-ml/num/Manifest
+++ b/dev-ml/num/Manifest
@@ -2,5 +2,5 @@ AUX num-1.3-cflags.patch 409 BLAKE2B 97db7e69d4bee7e6940386349620799d586ab7094a5
 DIST num-1.3.tar.gz 66251 BLAKE2B d6fde246693c8aef3b881a4ebc2b601392e0f0bf561dc4f4d32a5e1f835a5186deba3ffa77c88c6c05cd6e837dc836567fcabffefae99ce1ccae94e1bdfc849a SHA512 c88310f8c45700990095e6b2e9abf24c27347711b9abfd1dde75e540fbbfc6a365e6713bd69f66009af305728fcb36dc61eb37fdd0be7d73824b0e92fbe8c031
 DIST num-1.4.tar.gz 66327 BLAKE2B 59eae642e19f452dd911ef6c32b89978f2034a5fcaece4a358f3da447c8d6cb2b2581c39d032eb117edaf7ecf942583281eb6e31716b06960e768c2a985e099e SHA512 0cc9be8ad95704bb683b4bf6698bada1ee9a40dc05924b72adc7b969685c33eeb68ccf174cc09f6a228c48c18fe94af06f28bebc086a24973a066da620db8e6f
 EBUILD num-1.3-r1.ebuild 781 BLAKE2B 00e2a293bd75493d356699c154a45c4bbc82b9f35fd5167896a9ed581ac2d10405db1c60a3acd5634c02774ab3695cea2931adcc636c71fbb7c29e9a8ccef32e SHA512 83d3167348b0beb3699362207258ce9f12a4b9b9229f1f2c9c4590104f5d854f86db2b4b1dc6e137797513436e46afb2d581dc6027c8809a39ceee9daf6a5b38
-EBUILD num-1.4-r1.ebuild 854 BLAKE2B b579243489891f48f792ea9bd75444e921bbd827eb7b888efa0954d1a45d433fec34c28ad20e7d96e1f98ae4403936b9a371a0d5da7c6d3e3ff48322d33bec8a SHA512 c16cf43aea2bc87f0785d471a5f22efddfe86f12481b09ed24d9f9701850fc9b36611b040cd6b528dd447a27ba3c4c9c68c446042f0a3a78783e3a963fe34fcd
+EBUILD num-1.4-r2.ebuild 904 BLAKE2B 771d388a4a36a9c124762e7d37249d552335832d5e04b19b7384d8e76c4f9c4cc13e960654330fc294475b0595c548faf1954d6113b48f8e0113851843b8fb9b SHA512 5710ea0c169ac296be0173f5f74690127e7cc7722f23f521d852da3c9072a4bc439765c1260393ba24b4068daf14cc038bc6fab91ac34afd0dc6f8ecf46fa35c
 MISC metadata.xml 338 BLAKE2B f947fa0825c1a3fd959515164da36ffc9694c570ed6eb6eef8686fc24b4582ee88ecb7304507c79cf2733fb77ae3570468ec8da886367d79721c81f148931833 SHA512 9d052ada92f441fa4908f4ec9a2561f7276872281ffa65f0ad92c8d0f7c15aeea11d6c887d4af7535d7d72bce3dec8f12622aee5eb9a79e510e8baaa208a54cd
diff --git a/dev-ml/num/num-1.4-r1.ebuild b/dev-ml/num/num-1.4-r2.ebuild
index cf5b56b7a6d8..cf3d3b3bc4c9 100644
--- a/dev-ml/num/num-1.4-r1.ebuild
+++ b/dev-ml/num/num-1.4-r2.ebuild
@@ -16,6 +16,7 @@ KEYWORDS="amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-
 IUSE="+ocamlopt"
 
 RDEPEND="dev-lang/ocaml:=[ocamlopt?]"
+DEPEND="dev-ml/findlib:="
 
 src_compile() {
 	emake CFLAGS="${CFLAGS}" NATDYNLINK="$(usex ocamlopt true false)"
@@ -27,6 +28,10 @@ src_test() {
 }
 
 src_install() {
-	findlib_src_preinst
-	OCAMLPATH="${OCAMLFIND_DESTDIR}" emake install DESTDIR="${D}" NATDYNLINK="$(usex ocamlopt true false)"
+	findlib_src_install
+
+	if has_version ">=dev-ml/findlib-1.9" ; then
+		# See bug #803275
+		rm "${ED}/usr/$(get_libdir)/ocaml/num-top/META" || die
+	fi
 }
diff --git a/dev-ml/ocaml-base64/Manifest b/dev-ml/ocaml-base64/Manifest
index 04fc3e9a1f51..6c16c6489e2f 100644
--- a/dev-ml/ocaml-base64/Manifest
+++ b/dev-ml/ocaml-base64/Manifest
@@ -1,3 +1,3 @@
 DIST ocaml-base64-3.5.0.tar.gz 18888 BLAKE2B e35d6331f163a066169455ea3dac304cedd7ca47fac0a2cbda26b8bd9620b4e49e144d5a06a8a2c6085501e531b2be98f6b24002880d83d6d57025ee055e0887 SHA512 a3886701943a9b165a74e45f66c3d8279b381927774217f5e042494811bc17a08f8933292335d4b76f01c6b1d3c496b4cfca650faa5848ddbf6150ac87386038
-EBUILD ocaml-base64-3.5.0.ebuild 533 BLAKE2B 9aec009b43cd3b31c210ca7f2153ea5a8d95f72f076b310abe8e380039eebbc6540871d6a65eb74a7ac64e37f2b7f258e996dfa765f47b9dc2ef2ca7df20efa3 SHA512 bd5452692ce8b42141a5c1ae0abdb2465a14688f04f0e59def0a5420121c8bca0b24e0f060874bdacd12112c55733e9ab111fa0db95fce89da7052b28559b63d
+EBUILD ocaml-base64-3.5.0.ebuild 530 BLAKE2B 70026070d451ddf36d7676eef873ec852a5ef0c762137a99ace24ded245dee8626821c936d8be56cc66bc374cba1cbe8d297dcb9a27471ef5ea564af9d35bfea SHA512 642d0c02d40dd51cd711f9c970856fef55cfb68143f326ca20c6ac21b3438ac6304529c8cd271fd92efcf4a35535d0bc223fac4fa4924b460ba25f66b0790d32
 MISC metadata.xml 327 BLAKE2B 8c6793a0aedb17700d928b0c30d92298db13be50e6b7f520a7838fd76f4331c28a1787585cbc13999c125d39dd49698a3adab5b2822e2a7fe3b7204dc5f224f6 SHA512 3c806541652650a16615df0a83510a97f82ab3eb3208b47f341842ffbbd16984660b22d99c678896eb82e0c278e8a82824d17574ed4b7cf31291793d1bbbb78b
diff --git a/dev-ml/ocaml-base64/ocaml-base64-3.5.0.ebuild b/dev-ml/ocaml-base64/ocaml-base64-3.5.0.ebuild
index e8bc15af29c4..389d8b0497a3 100644
--- a/dev-ml/ocaml-base64/ocaml-base64-3.5.0.ebuild
+++ b/dev-ml/ocaml-base64/ocaml-base64-3.5.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mirage/ocaml-base64/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="ISC"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 arm arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~x86"
 IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ml/ocaml-ctypes/Manifest b/dev-ml/ocaml-ctypes/Manifest
index 7813d75058af..fc928cd8320d 100644
--- a/dev-ml/ocaml-ctypes/Manifest
+++ b/dev-ml/ocaml-ctypes/Manifest
@@ -1,5 +1,5 @@
 DIST ocaml-ctypes-0.17.1.tar.gz 208101 BLAKE2B b9fe6632058a670c988ba9f1ae81b75aa5373de7231cef04d5e2ede61a44cbaa0324c04197a0a202847599a9bbe7dccd18fd3279f3f351493aaec4959caf3ada SHA512 1e197009f7e6b29b43944f757e987934337ebfa11bb2ff2ca8ba3ebc607e37cf1259d07a90d7faf4b91b49ee20d5c65357ad305f34ada0a8d336a3904233150e
 DIST ocaml-ctypes-0.19.1.tar.gz 206762 BLAKE2B 29b4636e711b9b3ecf3de5d66b796d4d8ddf1109fd7b065666577ce9412e0ef3712f704729dac3b9467ac7ace8f501b90bfc1dc82b86dbe1668e5d13be46741f SHA512 cbf422a2c457b215815a04122d0522ed0f274c5927cecd25951472de6cc6fcd1151b67f95d6bbfeeb3b5f15a9fe9bdedb8861e77bd0de9902418962065e4dfc0
 EBUILD ocaml-ctypes-0.17.1-r1.ebuild 800 BLAKE2B 4df19810dd960c6d51525dde9dc2b374e7ffed06102bdb6622c847b621e699caba711e3b1ca06ea4daeeb87fb7ec05c0c3a41c8b58120ce658633ffeacd8fd09 SHA512 2239d8cef4ce0c401be0422dd8daf73de29322228ad7764c5d0e2d558bdbfc65d77728a97ff2a7987bb502a45ba8774108ec7f18f247d8dd31d22af4068b4786
-EBUILD ocaml-ctypes-0.19.1.ebuild 817 BLAKE2B ce1f9c51e262f069cac6e6d0396c382f28cddb09e28adbb1d873ad7a9d466860ced15d2d1b7590afd25eba79ccd68cb1199faa20d482570ac044699dbaf09f57 SHA512 19f2335492966ac510b38c22902d155d99110e120da4bf6e9a051eaf6eb5c5f668f4799eb40830b845f5b193aa604057b86c152858427209bf216019cd198016
+EBUILD ocaml-ctypes-0.19.1.ebuild 822 BLAKE2B 3680401b400804b3f3cb891aaacab783643d0c3e1473de0634c29ca4330af45f14d7ba20aeeddac6f9314fd9127597c16acdd0dc4522ddafec0b1edc8f8d6abd SHA512 2e7479c1fb7808421f3823f8623e15777bb116cf6a560ac0b5db338289e456a608f843566bb5dccc61de551d73bfb8ff474840aed11853a3cc431ae2e399671f
 MISC metadata.xml 332 BLAKE2B 96f7e364efba1f351c647a1c929d7f945badd062b9b6b85107f2df8638b21cad9ca52457e58ab7e13d203817baef5644d752e7d35703f78672cf91173abcb0bd SHA512 f982ae0f1c07b31bba3df030e972c88621521f7c5c205b9b31e5385395558f0471ad31dd612e247190df7b6663e8180ec1e525a15c24b0c2fa4d0823e4ed052e
diff --git a/dev-ml/ocaml-ctypes/ocaml-ctypes-0.19.1.ebuild b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.19.1.ebuild
index 40a1bee9e11b..7bdbd62f4abd 100644
--- a/dev-ml/ocaml-ctypes/ocaml-ctypes-0.19.1.ebuild
+++ b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.19.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ocamllabs/ocaml-ctypes/archive/${PV}.tar.gz -> ${P}.
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ml/ocaml-gettext/Manifest b/dev-ml/ocaml-gettext/Manifest
index 1152b4037ad0..7c925fcb3f22 100644
--- a/dev-ml/ocaml-gettext/Manifest
+++ b/dev-ml/ocaml-gettext/Manifest
@@ -1,6 +1,6 @@
 AUX ocaml-unsafe-string.patch 599 BLAKE2B 22e49acb160c01cfc9eed25bfbfbf45b281ca049c77801a81c2d4a5191c50eea5650a2db2f34df1bd49169fa2bd49dbf957fee57e3fe181ef6c37252df04d693 SHA512 78ba4efdfb0e681c4ab77af7d957de7e56a67cd97557db991ab62ec857f8fa19d374c979b4773d2a9e146db5942ce124c1603aefab065c503ddded38eef9f6b7
 DIST ocaml-gettext-0.3.7.tar.gz 134316 BLAKE2B 9de6ef9e04afbb6001ddc5ef145a687ad88a20eef1c27d3a3e6136f81ad46100cc6496cb66e3edfbf0f7eacfa8abbccb44d846d2f676862c96b8ceb860d8f424 SHA512 1358320359b9d2f3fd97a47d69b2a619942a65605c1e5cbf25e33ef42a10273167b526bca15e6c9523b87d8ea9dfd3215334050ad8eb84a8c41d4feef880a27a
 DIST ocaml-gettext-0.4.2.tar.gz 110249 BLAKE2B 54a25ba9f8fb20194fdfaf651586222fab68f927ebfa711812f7c9a387ff40c19e1bf3f63124127356b32b0ca0be2c5ff4e1cdfaf5f3afe690b90c0ca96c470d SHA512 fb89be8d8d9e0ed9327b81a0c81c884ff3f1a97e46b475ef8084abded5c84a256de05d5aa0f42be94f43ab438276a4506af726b6950e4161359a9616fb5832ec
-EBUILD ocaml-gettext-0.3.7-r3.ebuild 1586 BLAKE2B a05ca5121e131b14bc4671a5296dc67717ac091a2f3de268a9338816b8d5c2a7387e15f5380c1359e0cdd927839aab31110dc7ddf772dfa0033eaba682944cc8 SHA512 05c3c8e0004294d77cc915fe7e9ea12a3b07c27367b48e1f92dd1b90021b5f2cedb8cd408f10a73befbfe45e6fdf7824a4ff9fb256cab20f367975fda5ceb89e
+EBUILD ocaml-gettext-0.3.7-r3.ebuild 1596 BLAKE2B 1ccc4550cc137417c306482d698a453ae2a298cb4c2f7c4a0fea2ea91c2875f4d07715c0367377662e7680db7c85e04370dcb0edf8092fa3bc71b90deaaf1cd3 SHA512 358f834ca7ea70a153d110a091cf096e4bb26ab413dd66c21a204d300f557dc9b562ea795f6089066804f18324041b0b1338a2d1363f7664ca66e0319a3c89f4
 EBUILD ocaml-gettext-0.4.2.ebuild 917 BLAKE2B 898206729a10a4e6a7109dd9975393a51ca1d5d528ce3de6566348c14f28a9771a731221063a0ac6466511257bde2d2766882c8ead2dc8fb9f13280c9d4075c5 SHA512 eb3e47e901bb47b21e5dca54106cb8d9d1816a5458ca5668fd7cabece316a0364a901c26759a8f45afaf9eb0bd923fdfd34e59fdd73f2ceade4fa53e4bc9ad12
 MISC metadata.xml 663 BLAKE2B 5e9c4bc463940173b2ccb2a90ab4c4b6171c3492edc3eaf17a2a6f5b98b9de8d4c65aef5c0359cb71cd1b03f00cf79d30265e178b7ff0839ee4ea15385dc7eec SHA512 3bd44af35d19acd78604e39c5f25efa6a24f8dbd2065a13d5dcfd46da41c11176117468c3fd3df2b1ae2db9e4ee9ecd3ac9023fa9fb0562bc0eee87b975cfc1b
diff --git a/dev-ml/ocaml-gettext/ocaml-gettext-0.3.7-r3.ebuild b/dev-ml/ocaml-gettext/ocaml-gettext-0.3.7-r3.ebuild
index 7af5b26e0ad4..ca902d4b1b81 100644
--- a/dev-ml/ocaml-gettext/ocaml-gettext-0.3.7-r3.ebuild
+++ b/dev-ml/ocaml-gettext/ocaml-gettext-0.3.7-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/gildor478/ocaml-gettext/archive/${PV}.tar.gz -> ${P}
 LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
+IUSE="doc +ocamlopt test"
 RESTRICT="!test? ( test )"
 
 PATCHES=( "${FILESDIR}"/ocaml-unsafe-string.patch )
diff --git a/dev-ml/opam-client/Manifest b/dev-ml/opam-client/Manifest
index 49b213df377f..92dc96ecbaa1 100644
--- a/dev-ml/opam-client/Manifest
+++ b/dev-ml/opam-client/Manifest
@@ -1,7 +1,10 @@
 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-client-2.0.8-r1.ebuild 959 BLAKE2B 0c49373bc78678c7fc11fc5cb9d33a5495d83dc5d5de67e7219f1dba81fc448b9038a41ed01bfd05f33a48a0d70f9edf1f10bc87e5c2958863f7b4c90dc47a6d SHA512 5cc5ceeaa8b0c3c3a1ae5897a49b7d1643652010c2aa610a6a0cf4c4c18101e26c2c4bc65e0de858ba5e472ba411d76261af8f3dac506a30d205480a115ba491
-EBUILD opam-client-2.0.8.ebuild 798 BLAKE2B 4ee97d0154b58106d99c2a298dd52d254e13e18dd7104d8f4222cf2d7e3397036c22aa03b23b529a42712b6a5eb099eed7d9f4d9d444046f0c22cfbc82efd0d1 SHA512 e5f5a45fe8cd9b85e2369fee75760049ec06b2aaa712deae2952fada604efe462fa4c2135382f98249a19f716f51cf5116d828fd2b0d2783898df3f635590fb7
+DIST opam-2.1.0-dose3-6.patch.xz 5896 BLAKE2B f605064ebae7d327895729962a345a3c679519895aa2568f0c2d199d4ba9d6ae948a4fc418cfd26cc65079eb6ef3545f24a35e08c969d215529664a80d0c9147 SHA512 e00da74d7baef62319e884e3a05112bcf86a02d887c274bd15fb0d15bb8198e9a37a421f388bec3fce198e7a1b4d37024b18609dc65978c6ee8a7889df9bd608
+DIST opam-2.1.0.tar.gz 825966 BLAKE2B 42ab8ad2825e4e167618ece7bd2ce77ff055d584039fe2f644fa1c3e99d175cc7047f32bda53599af4fb177d844970883125cebca823024d1bc43a34857f20c5 SHA512 c0060e609c49a12dc8f64accef990aa593db818b72df3984fb9b4b22d8678b46c515916c84134a62dab614c716b61788eadc954d295f32c1f27d38aec22b3edf
+EBUILD opam-client-2.0.8-r1.ebuild 954 BLAKE2B 4d721cbecd897c0c8f6cea1868c783b543184f2e5f339e6900f9d4a99fe87e1bab120ecf40d4f3656d29dd8412cc15e95f472f478f962efaed77d72e03860ded SHA512 f5311b956917468aba3dbb84b7ce736c6f2a6fc84da1d6f31da99a481c41456e143cbe6bbe7ab7727ab01a4bdd60344efe51aaa37f613943ed3006b225f4061f
+EBUILD opam-client-2.0.8.ebuild 820 BLAKE2B 7c899f93e3c1f5f52ea56506976ae5deeed672887983777c67624e5caf535aff241bb1e1615e4545cd5e2c194a92b7dc8348d4530ec2a0233836f3a4cb4913b3 SHA512 e7d1d9b430710f102c8b7df90befc6cbc915e8b92b8702f03d2903a6944e3c6eeb85288169add272bca90df197ecac0a856080fd1323e644d135e45a824ce370
 EBUILD opam-client-2.0.9.ebuild 959 BLAKE2B 0c49373bc78678c7fc11fc5cb9d33a5495d83dc5d5de67e7219f1dba81fc448b9038a41ed01bfd05f33a48a0d70f9edf1f10bc87e5c2958863f7b4c90dc47a6d SHA512 5cc5ceeaa8b0c3c3a1ae5897a49b7d1643652010c2aa610a6a0cf4c4c18101e26c2c4bc65e0de858ba5e472ba411d76261af8f3dac506a30d205480a115ba491
+EBUILD opam-client-2.1.0.ebuild 945 BLAKE2B e8932dd197dfd2ef3122a879898610f38c39417ed60bc23d54a65fdc013229056da482bdca95f11cbb7d3366e45b654edc5c91f203e10a72602e75b3a1341ea2 SHA512 8ef8778daaccdc3311caaca0602318292d6e02acb587b8d538f0b8c1349addb5c1a1ab6088a9442f6700102c284c998965503ce60219f07d7261aa7fec6b7b38
 MISC metadata.xml 413 BLAKE2B cbdd94927312b95f2b5f76489f341f658974be49f704b81a4524879bbe780dcc5d9505b863b87da002cd98b8bb1e13967b047095dbe1eac589acd3145b66fc6c SHA512 afe675cebc52bba018a89d8f04b5c993ae8306f8d18ae2175be4c372f3219c63606b34bbb45c7daaab53be8eb7747fb7e86417bd29bbed2753458f564f3078da
diff --git a/dev-ml/opam-client/opam-client-2.0.8-r1.ebuild b/dev-ml/opam-client/opam-client-2.0.8-r1.ebuild
index 4b52fb7e1ef9..03972111ac0f 100644
--- a/dev-ml/opam-client/opam-client-2.0.8-r1.ebuild
+++ b/dev-ml/opam-client/opam-client-2.0.8-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/opam-${PV/_/-}"
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~x86"
 IUSE="+ocamlopt"
 
 RDEPEND="
diff --git a/dev-ml/opam-client/opam-client-2.0.8.ebuild b/dev-ml/opam-client/opam-client-2.0.8.ebuild
index cb9b0a4fcf42..3a2775f3db09 100644
--- a/dev-ml/opam-client/opam-client-2.0.8.ebuild
+++ b/dev-ml/opam-client/opam-client-2.0.8.ebuild
@@ -16,6 +16,7 @@ KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt"
 
 RDEPEND="
+	<dev-lang/ocaml-4.12
 	dev-ml/cmdliner:=
 	~dev-ml/opam-repository-${PV}:=
 	~dev-ml/opam-state-${PV}:=
diff --git a/dev-ml/opam-client/opam-client-2.1.0.ebuild b/dev-ml/opam-client/opam-client-2.1.0.ebuild
new file mode 100644
index 000000000000..b03d1b117962
--- /dev/null
+++ b/dev-ml/opam-client/opam-client-2.1.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="opam client libraries"
+HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam"
+SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/dev-ml/opam/opam-2.1.0-dose3-6.patch.xz"
+S="${WORKDIR}/opam-${PV/_/-}"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+RDEPEND="
+	dev-ml/cmdliner:=
+	~dev-ml/opam-repository-${PV}:=
+	~dev-ml/opam-state-${PV}:=
+	~dev-ml/opam-solver-${PV}:=
+	dev-ml/opam-file-format:=
+	dev-ml/re:=
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${WORKDIR}"/opam-2.1.0-dose3-6.patch )
+
+src_prepare() {
+	default
+	cat <<- EOF >> "${S}/dune"
+		(env
+		 (dev
+		  (flags (:standard -warn-error -3-9-33)))
+		 (release
+		  (flags (:standard -warn-error -3-9-33))))
+	EOF
+}
diff --git a/dev-ml/opam-core/Manifest b/dev-ml/opam-core/Manifest
index 5a0dd86ecc66..66d53554c4fb 100644
--- a/dev-ml/opam-core/Manifest
+++ b/dev-ml/opam-core/Manifest
@@ -1,5 +1,8 @@
 DIST opam-2.0.8.tar.gz 643221 BLAKE2B 66510a18285f315fe95665e8ba2f334dd44211c716543cdc25f2951a7dfe537f115981046e5963fd08deea4c76f5672fa7cf8e7af2274a713a3165bdd0bac8c2 SHA512 14737dc994be2c54dfeaf2658d3713178033e1bc2b4b845a58b4bfc118bbbf12b502924add0ae32b4b2b6c1944462e5ee7143df3de362d9ee39573249d013bc9
 DIST opam-2.0.9.tar.gz 644429 BLAKE2B d96ee79685a8ee8ff82c7570a747c80e38d86e513736a27904a4e471d1eaf432db72998251ac786cb8fbf1ad425fff42b772c5d26934e0929aae75c0946d4659 SHA512 0d8ee19ac0f3df9de4fd9cfa8daab1f7228f090f5e2e7e26bedf24d8c2ab377aade95048f2d7cd9ee9dbbe738729e26dc99f41f730fa2252df74953362464a22
+DIST opam-2.1.0-dose3-6.patch.xz 5896 BLAKE2B f605064ebae7d327895729962a345a3c679519895aa2568f0c2d199d4ba9d6ae948a4fc418cfd26cc65079eb6ef3545f24a35e08c969d215529664a80d0c9147 SHA512 e00da74d7baef62319e884e3a05112bcf86a02d887c274bd15fb0d15bb8198e9a37a421f388bec3fce198e7a1b4d37024b18609dc65978c6ee8a7889df9bd608
+DIST opam-2.1.0.tar.gz 825966 BLAKE2B 42ab8ad2825e4e167618ece7bd2ce77ff055d584039fe2f644fa1c3e99d175cc7047f32bda53599af4fb177d844970883125cebca823024d1bc43a34857f20c5 SHA512 c0060e609c49a12dc8f64accef990aa593db818b72df3984fb9b4b22d8678b46c515916c84134a62dab614c716b61788eadc954d295f32c1f27d38aec22b3edf
 EBUILD opam-core-2.0.8-r1.ebuild 880 BLAKE2B 4cdae8b13b22234fc9628ba3816a5382940201bb6a416766dc0ed1bc096f79fa5ed3d4601547eb83a9655c183a5aa52703e5dc6b068558e0ab83492782c95f6a SHA512 9097d88ac2615449b25a39dde43ae0b61b67bada0f14b2e51071dee777e23b81c7db2872e814e06f44a625bc1d9dcbff27edac87b002f3496ce996dba37696a1
 EBUILD opam-core-2.0.9.ebuild 886 BLAKE2B 46d8727976c104e28523732be20be6b7befde9a3becf3be12e41fde5ff0b6e93d9dfd01cb1536245bb86a8ba2d8864f08fdb4bfb4de54523851fc6fd43366398 SHA512 be4693a07a8c5d52150a175e20ca22f2e441c782ed94dfab55d6df7fa3be78cf699cb6e66a9f9a548c33706a8fdad74047c9c109b90000a4c85fbbd74e3f0d7e
+EBUILD opam-core-2.1.0.ebuild 1008 BLAKE2B 7237cf6ac3134cd86239a99187b97026fa608046b17f78d9b2fbd066b94b7d4f4c9e2361e02dcdb53fe89a750905a868a6ad0c894dc85ddd760e881f2cc2a2be SHA512 713968464097a18b57deea518fba9136b39c7155e068854eb32fc712af19155d143d01415a99dbaf896079e6dfe9ad2613e290b600ffd650cca5bd2a4755c08f
 MISC metadata.xml 413 BLAKE2B cbdd94927312b95f2b5f76489f341f658974be49f704b81a4524879bbe780dcc5d9505b863b87da002cd98b8bb1e13967b047095dbe1eac589acd3145b66fc6c SHA512 afe675cebc52bba018a89d8f04b5c993ae8306f8d18ae2175be4c372f3219c63606b34bbb45c7daaab53be8eb7747fb7e86417bd29bbed2753458f564f3078da
diff --git a/dev-ml/opam-core/opam-core-2.1.0.ebuild b/dev-ml/opam-core/opam-core-2.1.0.ebuild
new file mode 100644
index 000000000000..200b36c8bd17
--- /dev/null
+++ b/dev-ml/opam-core/opam-core-2.1.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# We are opam
+OPAM_INSTALLER_DEP=" "
+inherit opam
+
+DESCRIPTION="Core libraries for opam"
+HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam"
+SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/dev-ml/opam/opam-2.1.0-dose3-6.patch.xz"
+S="${WORKDIR}/opam-${PV}"
+OPAM_INSTALLER="${S}/opam-installer"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+	dev-ml/ocamlgraph:=
+	dev-ml/re:=
+	dev-ml/opam-file-format:=
+	dev-ml/cmdliner:=
+"
+DEPEND="${RDEPEND}
+	dev-ml/cppo"
+
+PATCHES=( "${WORKDIR}"/opam-2.1.0-dose3-6.patch )
+
+src_prepare() {
+	default
+	cat <<- EOF >> "${S}/dune"
+		(env
+		 (dev
+		  (flags (:standard -warn-error -3-9)))
+		 (release
+		  (flags (:standard -warn-error -3-9))))
+	EOF
+}
+
+src_compile() {
+	emake -j1 opam-installer
+	emake -j1 ${PN}.install
+}
diff --git a/dev-ml/opam-format/Manifest b/dev-ml/opam-format/Manifest
index 47e15659e9cf..c6666862804e 100644
--- a/dev-ml/opam-format/Manifest
+++ b/dev-ml/opam-format/Manifest
@@ -1,7 +1,10 @@
 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
+DIST opam-2.1.0-dose3-6.patch.xz 5896 BLAKE2B f605064ebae7d327895729962a345a3c679519895aa2568f0c2d199d4ba9d6ae948a4fc418cfd26cc65079eb6ef3545f24a35e08c969d215529664a80d0c9147 SHA512 e00da74d7baef62319e884e3a05112bcf86a02d887c274bd15fb0d15bb8198e9a37a421f388bec3fce198e7a1b4d37024b18609dc65978c6ee8a7889df9bd608
+DIST opam-2.1.0.tar.gz 825966 BLAKE2B 42ab8ad2825e4e167618ece7bd2ce77ff055d584039fe2f644fa1c3e99d175cc7047f32bda53599af4fb177d844970883125cebca823024d1bc43a34857f20c5 SHA512 c0060e609c49a12dc8f64accef990aa593db818b72df3984fb9b4b22d8678b46c515916c84134a62dab614c716b61788eadc954d295f32c1f27d38aec22b3edf
 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
+EBUILD opam-format-2.0.8-r3.ebuild 979 BLAKE2B 15c0e4f3273766012695f6efdbf0281398b24da93059f532add6d5d3207a043ed9a1b7ef2d789683290a9f94da6b880797414adc87aa9547dec7a9712e1b7839 SHA512 6f71d129bdc4eb31ff84afe02901ec0cc7991e31c93275fe72b8205763546c7e4cc084d17399259f1bfef5770661c391c8214012163a5023c335555babfa2d90
+EBUILD opam-format-2.0.9.ebuild 984 BLAKE2B 2d0ac08a3955b84ada2dfdcbca6c6fa86e23ef3f5a6c268d8fd775a48d50b6fdf4c6e29d24468ab28ff0c64eb07da59b9dae1ea0673482401230b4171662fabd SHA512 3c0a3534f139b29de193c253c58d8e2693945121af29dfb92a3c69f2e81685187efc5cb610c3208b88ee4b5333681dc70dfaf081e4fb304f9b290c0d52d50e29
+EBUILD opam-format-2.1.0.ebuild 970 BLAKE2B 7463ddab831f848e84822238445c88bbfedfc2264f837f585416285ce3fb92945963a4c881329948bf416820779f5d18c51526833a086588ab35c45e4f7b90ae SHA512 2f02b5fec36acb49976bc479c6489335a02266cca8552e8e32bb1105ed50d5b0de6031f6db58fc29768a876f79d2caff63098445b427e1e2b6b972bfe0478f64
 MISC metadata.xml 413 BLAKE2B cbdd94927312b95f2b5f76489f341f658974be49f704b81a4524879bbe780dcc5d9505b863b87da002cd98b8bb1e13967b047095dbe1eac589acd3145b66fc6c SHA512 afe675cebc52bba018a89d8f04b5c993ae8306f8d18ae2175be4c372f3219c63606b34bbb45c7daaab53be8eb7747fb7e86417bd29bbed2753458f564f3078da
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 ac4e8512b380..a58e8467aae8 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
@@ -15,7 +15,7 @@ OPAM_INSTALLER="${S}/opam-installer"
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~x86"
 IUSE="+ocamlopt"
 
 RDEPEND="
@@ -40,7 +40,3 @@ 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 ac4e8512b380..ace83b9a6ae8 100644
--- a/dev-ml/opam-format/opam-format-2.0.9.ebuild
+++ b/dev-ml/opam-format/opam-format-2.0.9.ebuild
@@ -40,7 +40,3 @@ 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.1.0.ebuild b/dev-ml/opam-format/opam-format-2.1.0.ebuild
new file mode 100644
index 000000000000..027845d265fc
--- /dev/null
+++ b/dev-ml/opam-format/opam-format-2.1.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# We are opam
+OPAM_INSTALLER_DEP=" "
+inherit dune
+
+DESCRIPTION="Core libraries for opam"
+HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam"
+SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/dev-ml/opam/opam-2.1.0-dose3-6.patch.xz"
+S="${WORKDIR}/opam-${PV}"
+OPAM_INSTALLER="${S}/opam-installer"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+RDEPEND="
+	~dev-ml/opam-core-${PV}:=
+	dev-ml/re:=
+	dev-ml/opam-file-format:=
+	>=dev-ml/dose3-6.0:=
+"
+DEPEND="${RDEPEND}
+	dev-ml/cppo"
+
+PATCHES=( "${WORKDIR}"/opam-2.1.0-dose3-6.patch )
+
+src_prepare() {
+	default
+	cat <<- EOF >> "${S}/dune"
+		(env
+		 (dev
+		  (flags (:standard -warn-error -3-9-33)))
+		 (release
+		  (flags (:standard -warn-error -3-9-33))))
+	EOF
+}
diff --git a/dev-ml/opam-installer/Manifest b/dev-ml/opam-installer/Manifest
index 584ae3d4dc09..6feaf42b8ea2 100644
--- a/dev-ml/opam-installer/Manifest
+++ b/dev-ml/opam-installer/Manifest
@@ -1,8 +1,11 @@
 AUX debian-Port-to-Dose3-6.0.1.patch 5223 BLAKE2B 8fada8b358cfae3aab9f6b8f0554894f55081197760a08b544229fdcc9d74434c1408cf72a8bb1d4280d11ef94d593ebb54a8f656617d99191d3576d02556793 SHA512 969c79a0552e0ea2388f732ca266d07b4c2a5a6945bd75daa2a435340ffbd8d87d2ada39dbab9cb364b2ad918f60600a59cf1fc06290a3dcbb68568c52fc9c7d
+DIST opam-2.1.0-dose3-6.patch.xz 5896 BLAKE2B f605064ebae7d327895729962a345a3c679519895aa2568f0c2d199d4ba9d6ae948a4fc418cfd26cc65079eb6ef3545f24a35e08c969d215529664a80d0c9147 SHA512 e00da74d7baef62319e884e3a05112bcf86a02d887c274bd15fb0d15bb8198e9a37a421f388bec3fce198e7a1b4d37024b18609dc65978c6ee8a7889df9bd608
 DIST opam-full-2.0.8.tar.gz 8006252 BLAKE2B 26348bdbb8bdc2fbf9d736286c1f4134ce065e8c15e34d51c8d2c6e5338fd6db089df38a19b07cde70770724fc4cc3dbd9e7d75628e5435ca8a2f8c0d4d3f2f0 SHA512 f08893ad0c1e124368168f28dcb5c3293e443da712d7b12db432c21ff72f7e1440bcc7156f49661d286360a16dcd166d3d02ecdebf8b1cda7c7df2b22e48f80f
 DIST opam-full-2.0.9.tar.gz 8029605 BLAKE2B c2ae06bdbbdbe9db270ec0027ec8d13a228f0af2ae5089476fa3a698d27e1f47abf2e3a15ecc9ca610717ba6b979b4ca76cce56c52f6592ae789b88fb5e5b68d SHA512 9f44d878a2599a876f5e5b9b7457b6f446a5e59156ed3d449dcc29e40c44df8b69da619eabdf030e45526fba4bd9a00c65dec2c36552d2e03788596b0aceee85
+DIST opam-full-2.1.0.tar.gz 9136886 BLAKE2B 3d51159568b6e85834f70a3545fe37d82470d4253bf9db6fef32b4314fd0a82182737bba6be62a9dd04b6d8fb8d7468b2e23ac39fa475f467adfdb0ec8d52181 SHA512 2c4955e450cde7211dbab507cbdc5d6e67805353e384df525d77ebf5561d6a4de91f7e5691567b2dc61146fc29df6fa5dc8aa8562330a4746db3a52b7487811a
 EBUILD opam-installer-2.0.8-r1.ebuild 1029 BLAKE2B 53066e7d4fe28f77ae2cbc1a1eb3056a60d04ada7eb72c0589498815c8ad3937ef6335b73a675bcf7060c6bf85534b3b497b55ac782c1f7a0d3e32537c1489cd SHA512 df08f41985fd16842021dc0e5c8a361a1d8376d1b716f3fb2aff8bdc007ff311ba51844894325e76657a688a03021fe7360c9522ac6f41231ef499de214d469e
-EBUILD opam-installer-2.0.8-r2.ebuild 1019 BLAKE2B c45a32eb576fa8d9c3c1340d60744cba3f26ecb5d8b4479d31d6d8e69ae32d019fd43d020c02e10fe09934dca2cd929d06a3143f9ee23e961a7b4555e76874e3 SHA512 a7e20b91999336d213bd108c6ebcb6311b9da1115df85a5e6d8fc60215ce75744c66cb9d5e6d21f5297c84b69b85964a557a91a1541798c5f8aec29fca09ac79
-EBUILD opam-installer-2.0.8-r3.ebuild 1193 BLAKE2B 2146bb8d98820a6baeffb5ee098527ca75529e4fa8302efac24e455526242db224707dced11a2bad732da18db02e680d979518fb156e28974c4dac4ca833c909 SHA512 3572227ee5a0c0b89d4ed201da95d831056d5227673a5015bb4139fd08b2b5ff0e73a22c0e2e14fec989b18303222abf38ae7d78c7b7385f8e45c4420c9db299
+EBUILD opam-installer-2.0.8-r2.ebuild 1014 BLAKE2B d5152345b50b7475a4f19f8e34bce269a8329e85ad7ca86f89373cc20f5ffc6e5e233c8ccf5247797fb86880a8bfd37005941e753b2bf6a06d3a7194462da18b SHA512 4d91c847eca096f95654cffa6c26701e1c4e65c1bf0e28c3eba3b01da9170071449a7e335954da270764581b4bc7a7dc1b0210d50e254bd22c9eeeef22f0223d
+EBUILD opam-installer-2.0.8-r3.ebuild 1188 BLAKE2B 6116289307046edd8627abb25a9d10a34bf07dca499c853f452a1d7b3a76a06545b0c30ca8fdeb9e5fdf1384b697a2764fb42be453310ecefdf370e8a3a71405 SHA512 33d7f0bf455b6366349d60119a4f2c96ba87e6da47b775ce154ed59652d4ae002b6ac00fa23c57a7984b17ffc8f9dd614549fc756b833cefe6d56c8bda5d9c7c
 EBUILD opam-installer-2.0.9.ebuild 1193 BLAKE2B 2146bb8d98820a6baeffb5ee098527ca75529e4fa8302efac24e455526242db224707dced11a2bad732da18db02e680d979518fb156e28974c4dac4ca833c909 SHA512 3572227ee5a0c0b89d4ed201da95d831056d5227673a5015bb4139fd08b2b5ff0e73a22c0e2e14fec989b18303222abf38ae7d78c7b7385f8e45c4420c9db299
+EBUILD opam-installer-2.1.0.ebuild 1025 BLAKE2B 4fcb445ca539b14a30c79788fbd7350eaf242fb8dace406f043d4db4adaf8bec51a1d72c3134dfab25e615501f5ea8c2e751ee1e00502b4adbeb22ac9048b97b SHA512 f237e7f35d2567d8bba39f9a281706a8060cfb2680be1ecad78094ace4ac14a4be5d65b5715c2f213b39335df7ddbb27f1b54c8da21864474624def819f5abcf
 MISC metadata.xml 413 BLAKE2B cbdd94927312b95f2b5f76489f341f658974be49f704b81a4524879bbe780dcc5d9505b863b87da002cd98b8bb1e13967b047095dbe1eac589acd3145b66fc6c SHA512 afe675cebc52bba018a89d8f04b5c993ae8306f8d18ae2175be4c372f3219c63606b34bbb45c7daaab53be8eb7747fb7e86417bd29bbed2753458f564f3078da
diff --git a/dev-ml/opam-installer/opam-installer-2.0.8-r2.ebuild b/dev-ml/opam-installer/opam-installer-2.0.8-r2.ebuild
index 0794b29319b7..739c1989676d 100644
--- a/dev-ml/opam-installer/opam-installer-2.0.8-r2.ebuild
+++ b/dev-ml/opam-installer/opam-installer-2.0.8-r2.ebuild
@@ -16,7 +16,7 @@ OPAM_INSTALLER="${S}/opam-installer"
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 
 RDEPEND="
 	>=dev-lang/ocaml-4.02.3
diff --git a/dev-ml/opam-installer/opam-installer-2.0.8-r3.ebuild b/dev-ml/opam-installer/opam-installer-2.0.8-r3.ebuild
index a2b88905a299..2f86f0c66750 100644
--- a/dev-ml/opam-installer/opam-installer-2.0.8-r3.ebuild
+++ b/dev-ml/opam-installer/opam-installer-2.0.8-r3.ebuild
@@ -16,7 +16,7 @@ OPAM_INSTALLER="${S}/opam-installer"
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~x86"
 
 # Cherry-picked from https://deb.debian.org/debian/pool/main/o/opam/opam_2.0.8-1.debian.tar.xz
 PATCHES=( "${FILESDIR}/debian-Port-to-Dose3-6.0.1.patch" )
diff --git a/dev-ml/opam-installer/opam-installer-2.1.0.ebuild b/dev-ml/opam-installer/opam-installer-2.1.0.ebuild
new file mode 100644
index 000000000000..1ea426a6380d
--- /dev/null
+++ b/dev-ml/opam-installer/opam-installer-2.1.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# We are opam
+OPAM_INSTALLER_DEP=" "
+OPAM_SKIP_VALIDATION=yes
+inherit dune
+
+DESCRIPTION="Core installer for opam packages"
+HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam"
+SRC_URI="https://github.com/ocaml/opam/releases/download/${PV}/opam-full-${PV}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/dev-ml/opam/opam-2.1.0-dose3-6.patch.xz"
+S="${WORKDIR}/opam-full-${PV/_/-}"
+OPAM_INSTALLER="${S}/_build/install/default/bin/opam-installer"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+PATCHES=( "${WORKDIR}"/opam-2.1.0-dose3-6.patch )
+
+RDEPEND="
+	>=dev-lang/ocaml-4.02.3
+	dev-ml/cmdliner:=
+	~dev-ml/opam-format-${PV}
+	>=dev-ml/dose3-6
+"
+DEPEND="${RDEPEND}
+	dev-ml/findlib"
+
+src_configure() {
+	econf \
+		--prefix="${EPREFIX}/usr" \
+		--with-mccs \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--mandir="${EPREFIX}/usr/share/man"
+}
diff --git a/dev-ml/opam-repository/Manifest b/dev-ml/opam-repository/Manifest
index 34da9e43b6bc..00910ebe3c23 100644
--- a/dev-ml/opam-repository/Manifest
+++ b/dev-ml/opam-repository/Manifest
@@ -1,7 +1,10 @@
 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 986 BLAKE2B b3b1d78d56d5a1524577eb1823110626a25a9d53a0014e9b60c2c0c54458850a141ab328805660d0608e106ca9e68baa382f8e2597aaf4980943bd7e126605b5 SHA512 4bb978d312e6e3e317b0c56d815293e0fbd8e65aaea93814dedc15af627a4082bb34ddc1617666d68201fdd872e811bb59ef31aee54cc2f09546a0b97bd6a6a3
+DIST opam-2.1.0-dose3-6.patch.xz 5896 BLAKE2B f605064ebae7d327895729962a345a3c679519895aa2568f0c2d199d4ba9d6ae948a4fc418cfd26cc65079eb6ef3545f24a35e08c969d215529664a80d0c9147 SHA512 e00da74d7baef62319e884e3a05112bcf86a02d887c274bd15fb0d15bb8198e9a37a421f388bec3fce198e7a1b4d37024b18609dc65978c6ee8a7889df9bd608
+DIST opam-2.1.0.tar.gz 825966 BLAKE2B 42ab8ad2825e4e167618ece7bd2ce77ff055d584039fe2f644fa1c3e99d175cc7047f32bda53599af4fb177d844970883125cebca823024d1bc43a34857f20c5 SHA512 c0060e609c49a12dc8f64accef990aa593db818b72df3984fb9b4b22d8678b46c515916c84134a62dab614c716b61788eadc954d295f32c1f27d38aec22b3edf
+EBUILD opam-repository-2.0.8-r1.ebuild 916 BLAKE2B 8eb5b7673361f0e555bf1d4852d8c2d580fd015a7306f2d32628d92cd947087bb91757c7448fcd5e0f4717ad90a93b65925cbb906de2923018e64ccec89530df SHA512 433c65791a8e225a9a3491968b833acb7348361991c4a08acb8da9a229301b7f98cc1e383e8dfb7fcca75469a36dae0d86e413c6dfae173f90256d761f986859
 EBUILD opam-repository-2.0.8.ebuild 776 BLAKE2B 4d63d9ee36f06e82b59510c92c3d5923a17ecb9626427681358d340780e98e1490b1e87366120f9c5429f75a1943aa47aeffbed9a50abed72cd3e76fe12c816a SHA512 1bbfe111bc3e9682205f549dcb7b298ccebd92e268ebb585aa68f98255b87b01ac2aa25535e04d0220b16fd6955dfdfa1d4fc0f17d9a60ab361348e92942a7b6
-EBUILD opam-repository-2.0.9.ebuild 986 BLAKE2B b3b1d78d56d5a1524577eb1823110626a25a9d53a0014e9b60c2c0c54458850a141ab328805660d0608e106ca9e68baa382f8e2597aaf4980943bd7e126605b5 SHA512 4bb978d312e6e3e317b0c56d815293e0fbd8e65aaea93814dedc15af627a4082bb34ddc1617666d68201fdd872e811bb59ef31aee54cc2f09546a0b97bd6a6a3
+EBUILD opam-repository-2.0.9.ebuild 921 BLAKE2B 1e39fbd674834241eb5eb27768cbe829951cfd15d17811b92134d4f3b97ec2fcdc8a2bf86e5eaee696e175ca1ca23d5f73f2752e53754b73ba8147cb7d044d9f SHA512 071d1c33e57180cbb182eb05e7b044862bc5af3736a904a15e029488cb017cb85249b936d4e2c4f739818d996c02791dc50eeddfac2f43aaac4e3c1e8883a4ac
+EBUILD opam-repository-2.1.0.ebuild 907 BLAKE2B a5ea29777911bbdd1f19661edc4bad8e104ab69f937aa0bed110fcf25383d2c204aa72531f4e2e6e0737d0f93d0acaaef4598f073e3bc682b2ca9d49e5d5c536 SHA512 07b96a5df895d6420e37af1ca2d73dc020feeb034e361e048dc0f607ac95ddb53d3b57833621295c4f527794e101c9431398af6934e7bfe2660cbe5b08ebcd8d
 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 7715c1f74d1a..aab9a3c1727e 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
@@ -12,7 +12,7 @@ S="${WORKDIR}/opam-${PV/_/-}"
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~x86"
 IUSE="+ocamlopt"
 RESTRICT="test"
 
@@ -37,7 +37,3 @@ 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.9.ebuild b/dev-ml/opam-repository/opam-repository-2.0.9.ebuild
index 7715c1f74d1a..77365ae1bced 100644
--- a/dev-ml/opam-repository/opam-repository-2.0.9.ebuild
+++ b/dev-ml/opam-repository/opam-repository-2.0.9.ebuild
@@ -37,7 +37,3 @@ 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.1.0.ebuild b/dev-ml/opam-repository/opam-repository-2.1.0.ebuild
new file mode 100644
index 000000000000..b7f297cca04b
--- /dev/null
+++ b/dev-ml/opam-repository/opam-repository-2.1.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="opam repository libraries"
+HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam"
+SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/dev-ml/opam/opam-2.1.0-dose3-6.patch.xz"
+S="${WORKDIR}/opam-${PV/_/-}"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+RESTRICT="test"
+
+RDEPEND="
+	~dev-ml/opam-format-${PV}:=
+	dev-ml/re:=
+	>=dev-ml/dose3-6.0:=
+	dev-ml/opam-file-format:=
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${WORKDIR}"/opam-2.1.0-dose3-6.patch )
+
+src_prepare() {
+	default
+	cat <<- EOF >> "${S}/dune"
+		(env
+		 (dev
+		  (flags (:standard -warn-error -3-9-33)))
+		 (release
+		  (flags (:standard -warn-error -3-9-33))))
+	EOF
+}
diff --git a/dev-ml/opam-solver/Manifest b/dev-ml/opam-solver/Manifest
index 212d7fea8313..fab5fd04e51e 100644
--- a/dev-ml/opam-solver/Manifest
+++ b/dev-ml/opam-solver/Manifest
@@ -1,7 +1,10 @@
 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 1056 BLAKE2B 825aef1af27521197b8376ccfa90a61334a035d8d15606523bcd54a13f720eafa59e7604fb3771d9c1d170026f7a86e88ebe96f9f0995bb0c29bf20597b63301 SHA512 3c6d7039290275bc6e8e355babec59bbc8282229373cd7c3da7eeff75413766bacf05bcbc980831fda64f71f48c0eb6279d50ecfc340bc780c0e98cbed3a3eb5
+DIST opam-2.1.0-dose3-6.patch.xz 5896 BLAKE2B f605064ebae7d327895729962a345a3c679519895aa2568f0c2d199d4ba9d6ae948a4fc418cfd26cc65079eb6ef3545f24a35e08c969d215529664a80d0c9147 SHA512 e00da74d7baef62319e884e3a05112bcf86a02d887c274bd15fb0d15bb8198e9a37a421f388bec3fce198e7a1b4d37024b18609dc65978c6ee8a7889df9bd608
+DIST opam-2.1.0.tar.gz 825966 BLAKE2B 42ab8ad2825e4e167618ece7bd2ce77ff055d584039fe2f644fa1c3e99d175cc7047f32bda53599af4fb177d844970883125cebca823024d1bc43a34857f20c5 SHA512 c0060e609c49a12dc8f64accef990aa593db818b72df3984fb9b4b22d8678b46c515916c84134a62dab614c716b61788eadc954d295f32c1f27d38aec22b3edf
+EBUILD opam-solver-2.0.8-r1.ebuild 986 BLAKE2B cc4c6852582d9a59a1fdca64cf2e7242bce41ea10813a2ab8c1a2a52569fbd6e574b693f60cbc1545e129a5fb648c616639b069d422b4d3de62bc5ad2a79af69 SHA512 1ab657ca63f6cb00c88e47934525c201af6520586f453033201340697374bf4c85a885882a279c20fb35581478cf2144c3204d3e9752b0ef30ed2620eba49998
 EBUILD opam-solver-2.0.8.ebuild 824 BLAKE2B 9a7a5ebb741dec25ff0a3d3c6e0e1c74f7574b70ff352b7c4e602e085a5a1f3f1ca03d1e9c7f062722529b9b49e1fad83960b8d33223354430ea4d072c4fc19d SHA512 6fb412d1581e2f1ad34d988e4bb6e3e427cc8963924a0ac6b1a235287b4c3e2fa3d4a55e99f7bb7c6bde7a130b919b5cf1191c61e576a5d79e70d3813276f732
-EBUILD opam-solver-2.0.9.ebuild 1056 BLAKE2B 825aef1af27521197b8376ccfa90a61334a035d8d15606523bcd54a13f720eafa59e7604fb3771d9c1d170026f7a86e88ebe96f9f0995bb0c29bf20597b63301 SHA512 3c6d7039290275bc6e8e355babec59bbc8282229373cd7c3da7eeff75413766bacf05bcbc980831fda64f71f48c0eb6279d50ecfc340bc780c0e98cbed3a3eb5
+EBUILD opam-solver-2.0.9.ebuild 991 BLAKE2B b3b86e67c53021a8da65d5ab28a3f4d7129c288755e59a3f127c3c6c20cd6c2eeb96bef19c6a700fc43616c58e357e276558020545954eedbaa80c9f4670cc25 SHA512 34917ade63f11472c468b91e290f2a929df49b56d0096e827076f7c05df8867644df6fcdcdc4884e7493eb5c636103e3a282a46501cba2b0cca6b62460bd452f
+EBUILD opam-solver-2.1.0.ebuild 977 BLAKE2B 9b13e4b2e12320e53e0d4e2ea0df78e0dc83b1b02b97c97ef0eafa9b66bf0bd00c1dc125f5380b2e2f5e0053fd20f49ac0c74248b67abc5650a608d6d59189c0 SHA512 3c5e0ac05b7fdc3f63df240814a562d9a0b83a398442ad965cf5058124d1a5eef58ba39952e55b028acb9094f9bec00040519af430c14dfa68c0e8961ea3ab49
 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 4a28e3ba2553..5a8e924ec8fa 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
@@ -12,7 +12,7 @@ S="${WORKDIR}/opam-${PV/_/-}"
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~x86"
 IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
@@ -40,7 +40,3 @@ 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 4a28e3ba2553..aa993e87c76c 100644
--- a/dev-ml/opam-solver/opam-solver-2.0.9.ebuild
+++ b/dev-ml/opam-solver/opam-solver-2.0.9.ebuild
@@ -40,7 +40,3 @@ 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.1.0.ebuild b/dev-ml/opam-solver/opam-solver-2.1.0.ebuild
new file mode 100644
index 000000000000..3ee659981fd5
--- /dev/null
+++ b/dev-ml/opam-solver/opam-solver-2.1.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="opam solver"
+HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam"
+SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/dev-ml/opam/opam-2.1.0-dose3-6.patch.xz"
+S="${WORKDIR}/opam-${PV/_/-}"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	~dev-ml/opam-format-${PV}:=
+	dev-ml/opam-file-format:=
+	dev-ml/re:=
+	>=dev-ml/mccs-1.1.4:=
+	>=dev-ml/dose3-6.0:=
+	dev-ml/cudf:=
+"
+DEPEND="${RDEPEND}
+	test? ( dev-ml/opam-client )"
+
+PATCHES=( "${WORKDIR}"/opam-2.1.0-dose3-6.patch )
+
+src_prepare() {
+	default
+	cat <<- EOF >> "${S}/dune"
+		(env
+		 (dev
+		  (flags (:standard -warn-error -3-9-33)))
+		 (release
+		  (flags (:standard -warn-error -3-9-33))))
+	EOF
+}
diff --git a/dev-ml/opam-state/Manifest b/dev-ml/opam-state/Manifest
index 6f5b43b433ab..53f18a64249d 100644
--- a/dev-ml/opam-state/Manifest
+++ b/dev-ml/opam-state/Manifest
@@ -1,7 +1,10 @@
 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 963 BLAKE2B 00540c40668eb6c09ebed2b7b7681140e4ab57c644bc638159be484b7c52edd25c41203d71cfa4c94002f43cabf0196ed79181832ac47ff6dc8ea8a8e157b00a SHA512 1a17c2ce0eef477d1b21dde125094817c80f87dad847dbb43d0024fed59599309f17bea9e3a86e431ec74911dc6c68d6a2a55c9fb30ef4e229aa1a6117fe3e70
+DIST opam-2.1.0-dose3-6.patch.xz 5896 BLAKE2B f605064ebae7d327895729962a345a3c679519895aa2568f0c2d199d4ba9d6ae948a4fc418cfd26cc65079eb6ef3545f24a35e08c969d215529664a80d0c9147 SHA512 e00da74d7baef62319e884e3a05112bcf86a02d887c274bd15fb0d15bb8198e9a37a421f388bec3fce198e7a1b4d37024b18609dc65978c6ee8a7889df9bd608
+DIST opam-2.1.0.tar.gz 825966 BLAKE2B 42ab8ad2825e4e167618ece7bd2ce77ff055d584039fe2f644fa1c3e99d175cc7047f32bda53599af4fb177d844970883125cebca823024d1bc43a34857f20c5 SHA512 c0060e609c49a12dc8f64accef990aa593db818b72df3984fb9b4b22d8678b46c515916c84134a62dab614c716b61788eadc954d295f32c1f27d38aec22b3edf
+EBUILD opam-state-2.0.8-r1.ebuild 893 BLAKE2B e0571da86d9165e7fa673e253b8f6215ff495e1bcabba5d230f1a7e3dfe84a44d6c4c1d32ee9d7c0c06ce14aa32aceef893416e5d83aa015adb6c1e80c1efefc SHA512 768db1a52197a7f437e848c06ad1ff019973c1df5d3671bb11cf0aea5d8895648ea820ee51ac4d81c24e2cf9167aafa92b4d3352cb6be66a947a93259622511e
 EBUILD opam-state-2.0.8.ebuild 759 BLAKE2B dfbb268b17a66de025f6bf66d76fa7da257cd88646aa6faebe2b35f882d2b5cea6a896f16f640db633d70d0f50054251e6e3e7be3a8c4e5fceae1595bbddaeca SHA512 dcffb7e14d61ab1c584bfe249b03c53d000ccbef2c9f9c60e879b9de94c803df425802675abd27c1e91590b7ea493623ae9c8a03753fe08798ca1483196eaa8c
-EBUILD opam-state-2.0.9.ebuild 963 BLAKE2B 00540c40668eb6c09ebed2b7b7681140e4ab57c644bc638159be484b7c52edd25c41203d71cfa4c94002f43cabf0196ed79181832ac47ff6dc8ea8a8e157b00a SHA512 1a17c2ce0eef477d1b21dde125094817c80f87dad847dbb43d0024fed59599309f17bea9e3a86e431ec74911dc6c68d6a2a55c9fb30ef4e229aa1a6117fe3e70
+EBUILD opam-state-2.0.9.ebuild 898 BLAKE2B 19479c7ced8afbbf74644e642a026385a4104bc22e6c231a63fc14292a486d66442de41adb764f718d213a6dfede2d0c7f286f428b35b90335869ee743b66e8e SHA512 cbe5c717e72d38a6c482abb47a0ab25f9f77801266312c7e971165a17c8203e1630a9548010106e52bd3cc2275f7e29b6bf11eb2c1a0f121684fa0c0f636c4ba
+EBUILD opam-state-2.1.0.ebuild 884 BLAKE2B ba2f2c0c46f36a7da0d2717cc10e548994947482efd9e7de2a3758f956b074384be391db9b6f204c3217e3e0b66314df71edf07222c05e8d81f5d3d6bb3d1a49 SHA512 b550a358e9ac408057271648f7433c96d04d5b8a0d1854ba953b1c37202e97d2132847f4637b1990ef2f3c50afa3b9685a265d9ab8412c738a6ea5abbc2466e4
 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 cde1ebca6cb4..ce874e2ac46b 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
@@ -12,7 +12,7 @@ S="${WORKDIR}/opam-${PV/_/-}"
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~x86"
 IUSE="+ocamlopt"
 RESTRICT="test"
 
@@ -36,7 +36,3 @@ 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.9.ebuild b/dev-ml/opam-state/opam-state-2.0.9.ebuild
index cde1ebca6cb4..cf9ab72c819e 100644
--- a/dev-ml/opam-state/opam-state-2.0.9.ebuild
+++ b/dev-ml/opam-state/opam-state-2.0.9.ebuild
@@ -36,7 +36,3 @@ 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.1.0.ebuild b/dev-ml/opam-state/opam-state-2.1.0.ebuild
new file mode 100644
index 000000000000..6c2a6cf8e81f
--- /dev/null
+++ b/dev-ml/opam-state/opam-state-2.1.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="opam state libraries"
+HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam"
+SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/dev-ml/opam/opam-2.1.0-dose3-6.patch.xz"
+S="${WORKDIR}/opam-${PV/_/-}"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+RESTRICT="test"
+
+RDEPEND="
+	dev-ml/re:=
+	dev-ml/opam-file-format:=
+	~dev-ml/opam-repository-${PV}:=
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${WORKDIR}"/opam-2.1.0-dose3-6.patch )
+
+src_prepare() {
+	default
+	cat <<- EOF >> "${S}/dune"
+		(env
+		 (dev
+		  (flags (:standard -warn-error -3-9-33)))
+		 (release
+		  (flags (:standard -warn-error -3-9-33))))
+	EOF
+}
diff --git a/dev-ml/opam/Manifest b/dev-ml/opam/Manifest
index 084b0562c45e..be2c60a102e0 100644
--- a/dev-ml/opam/Manifest
+++ b/dev-ml/opam/Manifest
@@ -1,5 +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
-EBUILD opam-2.0.8-r1.ebuild 796 BLAKE2B 83b7753c328cc34f0b96c2609b97e4c9ecced2e759e678adb8f4a4d9b69718b78918d258364431a47d86066db0cec6d8741344da0e0921c2c8cea34362233203 SHA512 a4e040c25560f328d8e533dc348fce084c839b5ad001dc41ea58823b64e437730e0bf2b4826f2d8d4ad0bc988f4f4328115562a5b28534f99cd9b01690a0f15f
-EBUILD opam-2.0.8-r2.ebuild 963 BLAKE2B 3ba5f51f310eaa23515c561525215b2e21ce836d77aae765829a30b79c440d4910870171176e5460a8c6075e1c0f9e3bf699d5f9eefb2a80757a13ad18b5f6c1 SHA512 3b3e82b207f16807d1e266b5e1284622c5a8c58aad21dcd56664f053a84c4cae3029286c8ddf5c0082be13b8ba6bb43d6f7775d475be9c01b0002ea566a43e95
+DIST opam-2.1.0.tar.gz 825966 BLAKE2B 42ab8ad2825e4e167618ece7bd2ce77ff055d584039fe2f644fa1c3e99d175cc7047f32bda53599af4fb177d844970883125cebca823024d1bc43a34857f20c5 SHA512 c0060e609c49a12dc8f64accef990aa593db818b72df3984fb9b4b22d8678b46c515916c84134a62dab614c716b61788eadc954d295f32c1f27d38aec22b3edf
+EBUILD opam-2.0.8-r1.ebuild 818 BLAKE2B 2cdef3169d4c660daa501a449c0f204ae3bd12e8bd1a66cb4bde94ea4e523457fe952a61330cecbd1a59d14754d0e167efe453589387f9fe666b7804caa370f4 SHA512 7ebd4e81e160649198b792911d5f16bd4a7c001b60b2b4db3b8509caeb0d537c4114618d25b1ffbbd66c96f32373a7824b6530587ad8f9f4d1249de9400cf7d2
+EBUILD opam-2.0.8-r2.ebuild 958 BLAKE2B a29b001a98117c644dce3c731db62520631662fa9dc5b73ca247e1234dc2c7d95c0b2535fc2d4c186fadb0461cce62423fd1d434843527cf0b6f7a4ce4f79a96 SHA512 c8b808a8bee1947f8aaff9cb7204013c8686302ffa43e6390ed8096b515019b869aa14d86591117dff7f09896229996c544ce5abb8bccc03580b3b54b104de3f
+EBUILD opam-2.1.0.ebuild 963 BLAKE2B 3ba5f51f310eaa23515c561525215b2e21ce836d77aae765829a30b79c440d4910870171176e5460a8c6075e1c0f9e3bf699d5f9eefb2a80757a13ad18b5f6c1 SHA512 3b3e82b207f16807d1e266b5e1284622c5a8c58aad21dcd56664f053a84c4cae3029286c8ddf5c0082be13b8ba6bb43d6f7775d475be9c01b0002ea566a43e95
 MISC metadata.xml 413 BLAKE2B cbdd94927312b95f2b5f76489f341f658974be49f704b81a4524879bbe780dcc5d9505b863b87da002cd98b8bb1e13967b047095dbe1eac589acd3145b66fc6c SHA512 afe675cebc52bba018a89d8f04b5c993ae8306f8d18ae2175be4c372f3219c63606b34bbb45c7daaab53be8eb7747fb7e86417bd29bbed2753458f564f3078da
diff --git a/dev-ml/opam/opam-2.0.8-r1.ebuild b/dev-ml/opam/opam-2.0.8-r1.ebuild
index 6fd893a1ef12..d380dc8772c7 100644
--- a/dev-ml/opam/opam-2.0.8-r1.ebuild
+++ b/dev-ml/opam/opam-2.0.8-r1.ebuild
@@ -16,6 +16,7 @@ KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt"
 
 RDEPEND="
+	<dev-lang/ocaml-4.12
 	dev-ml/cmdliner:=
 	dev-ml/cudf:=
 	dev-ml/dose3:=
diff --git a/dev-ml/opam/opam-2.0.8-r2.ebuild b/dev-ml/opam/opam-2.0.8-r2.ebuild
index e882aefd038f..405deff7d89a 100644
--- a/dev-ml/opam/opam-2.0.8-r2.ebuild
+++ b/dev-ml/opam/opam-2.0.8-r2.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/opam-${PV/_/-}"
 
 LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~x86"
 IUSE="+ocamlopt"
 
 RDEPEND="
diff --git a/dev-ml/opam/opam-2.1.0.ebuild b/dev-ml/opam/opam-2.1.0.ebuild
new file mode 100644
index 000000000000..e882aefd038f
--- /dev/null
+++ b/dev-ml/opam/opam-2.1.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="A source-based package manager for OCaml"
+HOMEPAGE="http://opam.ocaml.org/"
+SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz"
+S="${WORKDIR}/opam-${PV/_/-}"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+RDEPEND="
+	dev-ml/cmdliner:=
+	dev-ml/cudf:=
+	>=dev-ml/dose3-6.0:=
+	dev-ml/extlib:=
+	~dev-ml/opam-client-${PV}:=
+	dev-ml/opam-file-format:=
+	dev-ml/re:="
+DEPEND="${RDEPEND}"
+
+# Cherry-picked from https://deb.debian.org/debian/pool/main/o/opam/opam_2.0.8-1.debian.tar.xz
+PATCHES=( "${FILESDIR}/debian-Port-to-Dose3-6.0.1.patch" )
+
+src_prepare() {
+	default
+
+	cat <<- EOF >> "${S}/dune"
+		(env
+		 (dev
+		  (flags (:standard -warn-error -3-9-33)))
+		 (release
+		  (flags (:standard -warn-error -3-9-33))))
+	EOF
+}
diff --git a/dev-ml/parmap/Manifest b/dev-ml/parmap/Manifest
index 15f43ca56d9d..13a1482ae15a 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 673 BLAKE2B 75274d441ef9b8d4a78ae5e4b7daf38196fb88293629e20a430bebc1b25207d30f833cbea1918de5978fd42cb54ee2d7ba45ab7e03af007fabbd2a356176c4b5 SHA512 eb817ba2b0d44391ab9e57ab2e87a35fb16e67cb3c4242faf21db40a827eb3f8e918e6a32ae0385f4eae2727ae4446e75e5b5908dd2aeb58bcdd45e59656e174
-EBUILD parmap-1.2.3.ebuild 670 BLAKE2B 1c904777712a4a3e06543e499f381c2f33ac9767666cc8dd8e0f433e733de6f3edf8a3a18da25d6cdbdda39f4db9eded5775d6b5f92ae9eb5f991edc9f1b6cd8 SHA512 f04b0101115c305927e2aa3676dd68695c461bfde8d4b50a5a92580d75df6ab5cca8692a23194e72c3d05fc774c78ab6c2a49244b63036f5608448615258719a
+EBUILD parmap-1.2.1.ebuild 608 BLAKE2B 92d88cdfa1a4b8d99d84592c40953d3188669e6b5720d4bb18b5fcf27e35477244085b841968cfdb612668c7447e2e77791a83e877339f8567080738899de8a6 SHA512 ebabf3baff2fa3ebc2776e280bfb6fbead79d5f0f4f4f476fe2de10d38d7e64af6896d315e2eb77488352441a3fc0d87d4267a3cdadbfb38a8047d1899845712
+EBUILD parmap-1.2.3.ebuild 602 BLAKE2B f818b95d8edfc4e83b56569ab59392fc0a142b224fa7df50b6b08e0fa1ee7df8633c36c563923b3000a2b38bc82d1976731ceca541d72ce9c24fa4e3cab109aa SHA512 4efeda43e48ddad028e583f8ebe3df12bcdf96e802de2555162569178298be87b5ce815537cefdc42c55c92eaa60f962d5ffc423f08b9087f68cdfa8c21e0f11
 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 5e4efd7f812a..44ada0a27777 100644
--- a/dev-ml/parmap/parmap-1.2.1.ebuild
+++ b/dev-ml/parmap/parmap-1.2.1.ebuild
@@ -19,7 +19,3 @@ 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 974f988af0ec..170399c1cc16 100644
--- a/dev-ml/parmap/parmap-1.2.3.ebuild
+++ b/dev-ml/parmap/parmap-1.2.3.ebuild
@@ -13,13 +13,9 @@ S="${WORKDIR}/${PN}-${MY_PV/+/-}"
 
 LICENSE="LGPL-2-with-linking-exception"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 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 0fdb51dfc6e6..d53927f7c24c 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 538 BLAKE2B 81c91f8be9fb66ac62f6a963cb32bc4b770a75dbd58d6683e8d4ce378c0bca120740c12f25b27afa18b3d9d6ccd74ce88f461e935b7294c90288c01eb556e225 SHA512 faf975726b4daaaba39ddd3a3c3b19c330d9d5dcfe1ccfc38286d92c7c7f00f9f8c4aadb84908a0176bfc1c015a006952b6a1fb1e4ea52834ae6b32dabe4576a
+EBUILD patience_diff-0.14.0.ebuild 473 BLAKE2B 210297c3e20a149680e560948d73cb9a41e729a1481c48427b415a3a5a4b6843c49af34066f0f8ec8596f71e765f5ed8a741eb9718d174bcace166cc16318de2 SHA512 dde5506d835c37c8e6a348884c6028771d9e3a4f319908364be129c7f0b24abb53e16bf9ce8e4f49909107fe1909f2e4941d83a71945c691d180abdfbc8c142a
 MISC metadata.xml 322 BLAKE2B e9510a525c3c5f6cd79ecb521914bebe4b0793cd02ed3bbc881d6915503bfb4167499e412376c8ac5f870dcd6bd57721fe7efa82c0c0fc8c0c20e180371aa431 SHA512 3fca89751f8d8ebe30ebdf89ef8629ea1f8667cbb9259fa4b3a53d3e911719babad516ad4320e9abd88f5246a46072833f55f5110ca80bc17098b5e474017fe7
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 cd95ca35acf3..67d3bdbbc951 100644
--- a/dev-ml/patience_diff/patience_diff-0.14.0.ebuild
+++ b/dev-ml/patience_diff/patience_diff-0.14.0.ebuild
@@ -19,7 +19,3 @@ RDEPEND="
 	dev-ml/core_kernel:=
 	dev-ml/ppx_jane:=
 "
-
-src_compile() {
-	dune build @install --profile release || die
-}
diff --git a/dev-ml/ppx_optcomp/Manifest b/dev-ml/ppx_optcomp/Manifest
index bdc9e94ef306..f596387a2501 100644
--- a/dev-ml/ppx_optcomp/Manifest
+++ b/dev-ml/ppx_optcomp/Manifest
@@ -1,4 +1,6 @@
 AUX ppx_optcomp-0.14.0-ppxlib-0.18.0.patch 2581 BLAKE2B bf7f888acc462481e03a2d091e9a453d87f9173708c865c419d0d1e89dc315225196ac5e275de7957649ce7c09d056622998aeb3555b274c4e1e6c283193dd6f SHA512 cb50911a137c0fa0efcafdd9bd6cfa0e196c20816e7696bff7ad8aa81d015f18b534c8f0fdf47da0ce4289409cd5fd3b01ef051d3139fd30ac834d91a80ce47d
 DIST ppx_optcomp-0.14.0.tar.gz 16583 BLAKE2B 9b139708e02501245d5440a862324fe0191c9c96772e6599ed474a734263c4d2c0fa08fff666abd2efb218ec03a2b9b47c5ef6480d53a8d0f280550b741ac39a SHA512 e86b108d805500cbd7be628f41436ec8de0e8622d4218631d01bf73b0e70da0a057b8531465206baa9b8851ce9c22c5cd53921fccfae352ee46527d69964dc44
+DIST ppx_optcomp-0.14.3.tar.gz 16749 BLAKE2B 3c6dd2b5ac0a10e3d95c6a734ee09b0bef8af6d949c9f31150f1f8ac14ec72bb06455c3bf0c025bc99b939fa86b0d730abd8aefcdbd3998bfc16eef7a6a766bd SHA512 73b53dece639aebe20a8c9eaec50f6f491ac8163d96ceab66169d99f9bb50ed9c40c38731cd6e8543dae97c3a45650733d622e5bd4a2db812000c4694c823157
 EBUILD ppx_optcomp-0.14.0.ebuild 688 BLAKE2B 433e1f96b3758e705bf0896c8b61c88a6a17d6d5b6298beba3e52ac72816374343899fed09b3dababc26f862251267455df400606917b10bd406d31b8dc00f61 SHA512 b393ee83145a552f568d8c7302dd878d02ace806fb158ff7b78aa489500641d0152919ae937f9cddc2912a87f793db7163d186efe5fb4c1a31858b273eadc642
+EBUILD ppx_optcomp-0.14.3.ebuild 638 BLAKE2B c14194aadc3ff5c85cd358a251ecac2ab3399fb6d0179eecf43347d4cb67b1802cb83452df9bccf2a71e7423c63022f1b8dd28258bbc1dbee1570825b0efbbd8 SHA512 5cfa4f219cf194985e599a021b27c31333e4f18f7aca3c705bcafe631f1af09463b81273c88b57ca585da9224e80f8523d9b4a42ca7c8f4ec1436ac9207eb042
 MISC metadata.xml 332 BLAKE2B b14db5b16fb10c0e04248ce53e7506ad7bbffb9d4a41ea26821a680d7166e66d0060e3bb117304e585fc5dc6fcdc30d245a28edeeb3535d1e6ae04f2147a361b SHA512 791b64320d146e5fd0e46990e01123069243119b1229b9446d9fd7e9dbc6976c9f93cdfc63884ff22fcc35de64c944e3822ec9fccb88bac7eae97e6e0b368bb8
diff --git a/dev-ml/ppx_optcomp/ppx_optcomp-0.14.3.ebuild b/dev-ml/ppx_optcomp/ppx_optcomp-0.14.3.ebuild
new file mode 100644
index 000000000000..d01ce62cd244
--- /dev/null
+++ b/dev-ml/ppx_optcomp/ppx_optcomp-0.14.3.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Optional compilation for OCaml"
+HOMEPAGE="https://github.com/janestreet/ppx_optcomp"
+SRC_URI="https://github.com/janestreet/ppx_optcomp/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+DEPEND="
+	>=dev-ml/base-0.14.0:=
+	dev-ml/findlib:=
+	>=dev-ml/stdio-0.14.0:=
+	>=dev-ml/ppxlib-0.18.0:=
+	>=dev-ml/ocaml-compiler-libs-0.11.0:=
+	>=dev-ml/ocaml-migrate-parsetree-2.0.0:=
+	dev-ml/cinaps:=
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-ml/ppx_tools/Manifest b/dev-ml/ppx_tools/Manifest
index 74c782765be9..c75b6917230d 100644
--- a/dev-ml/ppx_tools/Manifest
+++ b/dev-ml/ppx_tools/Manifest
@@ -1,5 +1,7 @@
 DIST ppx_tools-6.2.tar.gz 46150 BLAKE2B f8af2a1eee81d5a1e73ac606ab79d285c8c226533bcf715ed22386aecfaf51260fb9a5075d270675f1b601cb174b68d8c85556f418031a7b6bda06c4376fe443 SHA512 fc3943c69901ef46843355c3482d5a1481d05ee94fb0a344ec04101059a02cbaa76fed5742cfae82730edf378f2e140d859a5cf590653f85359255d451f07dc8
 DIST ppx_tools-6.3.tar.gz 18811 BLAKE2B b1389dbe0c6fd855cafc8d64a9db550866317172909c2731f01acd412c6f8147f07e19a82d527187d0b211fca9eb2f2ad63bb53e8f375b0b8107c4e723710000 SHA512 6a88f6f877f49ea8736aeca60673a19c52d5104ad9e2a3e56db3f71cd557d39df9c709c4e678ccf10263ff1f3e0504f4676227bd05ceba1e0294453a988a736c
+DIST ppx_tools-6.4.tar.gz 19051 BLAKE2B dcb3e5a4ca5dd6243cae013739b93c6fe100ca21ad56c46e284255977f4e6d4263ef8d937ed672939e5b31bbe0904dcb1d71105f49385ad5d43404b19a9fe2c6 SHA512 514aa283f6bee11bf257abec98a751c656db63203caa4caee5ce606bcdee75891441a794b0bac22e2ff2e5d2760cd39ffaa2fce6bb118155daf05175917e6e7c
 EBUILD ppx_tools-6.2.ebuild 505 BLAKE2B 690649eab5fc48940936171e98bcf51edb1c0dafeebfe378a88b2c646f8df488270baed8845d480dfb47523819d6bc02daec4f9fd7265c4899cdd1bb4ffb5749 SHA512 c4cab13bb3694fad4c39300d31a9a81487f873eb45e0af9b243c891f646a505a2c33641cf25ddf084ae295f6577700cec8fcf478dce3c7f1b5391dee90d50b45
 EBUILD ppx_tools-6.3.ebuild 469 BLAKE2B b0c45a83419c6dbfb95d0585be01fccaf1e1af16278f1faabe7a00ec9e0e40d31335211ffdacc062ec05c251e39b33f1754364beb538d1afed6ca8c9ef55e933 SHA512 d483bf1fe95c97d0d23677d70d348fa5490e49be5bc7819696e0ae6a47a70cbfb116c5ab08dd3e8e058285ef73793793fe0af92e400b24c0063ff299d972c0b3
+EBUILD ppx_tools-6.4.ebuild 471 BLAKE2B 8eb9d070efc1b625c6f1d5e1b80babe69018e5626e1a45d37c0233f01b526707e90fae71501a227e16f3eda16ed22010ebafbf2c6fcd75df860cd6f80190786c SHA512 0cbc257b617cfd5383fdb42b130233993dc201836ea2dd29556d60e2915456b0d84bf34c5eb26f8e433af4e9ac7bd4c34560ba76e5eacffd27a9046aafca1a31
 MISC metadata.xml 424 BLAKE2B ef86805d6a907c1d81fa71dd3599c66bbe5f6f2275b17c8f43998276d3c99329d96754717bfe935a56ed50fdf65f9e688a01832220253bc2d5909c0717661ff9 SHA512 5dc85ce4085784bda6fe0b3b601858f784c542c26444eb92068328324898d5835eba450ef723d3eb1317f1a0eae82a1e7a430c609bf57162b1c2ac5ea142c501
diff --git a/dev-ml/ppx_tools/ppx_tools-6.4.ebuild b/dev-ml/ppx_tools/ppx_tools-6.4.ebuild
new file mode 100644
index 000000000000..1d025b5dacda
--- /dev/null
+++ b/dev-ml/ppx_tools/ppx_tools-6.4.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+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"
+S="${WORKDIR}/${PN}-$(ver_rs 2 '-')"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
diff --git a/dev-ml/ppx_variants_conv/Manifest b/dev-ml/ppx_variants_conv/Manifest
index a03df17aff99..ae81fe75a880 100644
--- a/dev-ml/ppx_variants_conv/Manifest
+++ b/dev-ml/ppx_variants_conv/Manifest
@@ -1,3 +1,5 @@
+AUX ppx_variants_conv-0.14.1-ppxlib-0.23-compatibility.patch 983 BLAKE2B bbc00d09fc8ff80ced828a52206d5e2d24073a33b8777af9e6bfc55e934d6450b6054065e312a299f172e700b27e4eb664a4ed9594ad559976f51a96544731de SHA512 9eaa489d9fe1459990c7c6d6f3454dd06c20100f0344e31fc8ba9ad59e8c68e5759b83c89d5e600e1308e0bebbc98fbeecf3ab9b578307560e21dae22732d50c
 DIST ppx_variants_conv-0.14.1.tar.gz 9640 BLAKE2B a73241a8dfc1cf41d2ad184f7e321484525794e66a1e881c822616aca6f8d221e9e699464716410a71ae3cbd542eef6315e0d183447e5e0e49bdb02935876375 SHA512 2ee21751de1595e56b151d87413554af5c0aaf92053ddd2834cadea812f1f59fcd078f6f4a9e9894eca9ffbf211ed2de996df065534c84256dc9670ee8fcbed5
+EBUILD ppx_variants_conv-0.14.1-r1.ebuild 739 BLAKE2B 6cfd302aca4698039f5bcba86d5f608ee5e147623f2d943ae4d417ab3ecb3ad90a44d8cffec76fe0e4154158f81d3e58d55b2e6636edb78e536c0a1d173d0909 SHA512 41a6d2deebe1979f02edcb3c401dbb09c5b047168f8a35a765c7fc15df17ec01a5ec8e54f239de1406b992721dab2afd44bfc902437d9e580325682a87521116
 EBUILD ppx_variants_conv-0.14.1.ebuild 664 BLAKE2B ff37f6685ad3c48f862dcd628d59016eacfa9d8e7740ac07cf0cdea0018080c3279e516f61dbe9cd6c8b4be3dc1bb1e5f493cdb0c041f4a030a8e5bd20c1faa0 SHA512 369332b89c74b0e09f0d69a173150347cc998c7507f4a0f78031e42ecb35a4f40cb04e6b77953afa8a8d379208328d8318ddf5041b794ee679402114d1e4a195
-MISC metadata.xml 338 BLAKE2B dfe645a1e9d551c9240fed15b666b55df5c04ca56dae2cf1051490d7f17c3de1850d93006861e916574ca86abb849c025eaae04661cf4b91dfd76365b8490df6 SHA512 fe8aa3284cae7c769d4d08586f5d8312c11937b4bd789f6326cb10cd62dbc6e243b9c23830cd5c2695a12641ecf9394b3192656fdf2239f67cae59d13e46c49b
+MISC metadata.xml 431 BLAKE2B 83c405af5f5545235e34f693d30cb519fc076516c1ce567589f1b4944c67df76cc959370b65fecba7b5be8fd9cc17fab164ee4886be1a760af3b7d65c7678af6 SHA512 21e04b3f4d77d63737123d349a57917a99a57b927d83a3020cb2b9455ff9a3bd3d53f11a4bc8a20a0ad7494484f393df1ab0c14ae39ca85e2558cb91296fbe8c
diff --git a/dev-ml/ppx_variants_conv/files/ppx_variants_conv-0.14.1-ppxlib-0.23-compatibility.patch b/dev-ml/ppx_variants_conv/files/ppx_variants_conv-0.14.1-ppxlib-0.23-compatibility.patch
new file mode 100644
index 000000000000..d8df60aeec71
--- /dev/null
+++ b/dev-ml/ppx_variants_conv/files/ppx_variants_conv-0.14.1-ppxlib-0.23-compatibility.patch
@@ -0,0 +1,31 @@
+From 6103f6fc56f978c847ba7c1f2d9f38ee93a5e337 Mon Sep 17 00:00:00 2001
+From: Sonja Heinze <sonjaleaheinze@gmail.com>
+Date: Tue, 9 Mar 2021 12:57:47 +0100
+Subject: [PATCH] Adapt to Ppxlib's API change
+
+Ppxlib is removing Lexer.keyword_table from the API in exchange for
+the more lightweight Keyword.is_keyword.
+
+Signed-off-by: Sonja Heinze <sonjaleaheinze@gmail.com>
+--- a/ppx_variants_conv.opam
++++ b/ppx_variants_conv.opam
+@@ -15,7 +15,7 @@ depends: [
+   "base"        {>= "v0.14" & < "v0.15"}
+   "variantslib" {>= "v0.14" & < "v0.15"}
+   "dune"        {>= "2.0.0"}
+-  "ppxlib"      {>= "0.14.0"}
++  "ppxlib"      {>= "0.23.0"}
+ ]
+ synopsis: "Generation of accessor and iteration functions for ocaml variant types"
+ description: "
+--- a/src/ppx_variants_conv.ml
++++ b/src/ppx_variants_conv.ml
+@@ -66,7 +66,7 @@ end
+ 
+ let variant_name_to_string v =
+   let s = String.lowercase v in
+-  if Caml.Hashtbl.mem Lexer.keyword_table s
++  if Keyword.is_keyword s
+   then s ^ "_"
+   else s
+ 
diff --git a/dev-ml/ppx_variants_conv/metadata.xml b/dev-ml/ppx_variants_conv/metadata.xml
index 029ff6ac939f..b5b4c3bff187 100644
--- a/dev-ml/ppx_variants_conv/metadata.xml
+++ b/dev-ml/ppx_variants_conv/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_variants_conv/ppx_variants_conv-0.14.1-r1.ebuild b/dev-ml/ppx_variants_conv/ppx_variants_conv-0.14.1-r1.ebuild
new file mode 100644
index 000000000000..8915cf1f56d1
--- /dev/null
+++ b/dev-ml/ppx_variants_conv/ppx_variants_conv-0.14.1-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Generation of accessor and iteration functions for ocaml variant types"
+HOMEPAGE="https://github.com/janestreet/ppx_variants_conv"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+DEPEND="
+	>=dev-ml/base-0.14.0:=
+	>=dev-ml/variantslib-0.14.0:=
+	>=dev-ml/ppxlib-0.23.0:=
+	>=dev-ml/ocaml-compiler-libs-0.11.0:=
+	>=dev-ml/ocaml-migrate-parsetree-2.0.0:=
+	dev-ml/cinaps:=
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.14.1-ppxlib-0.23-compatibility.patch
+)
diff --git a/dev-ml/ppxlib/Manifest b/dev-ml/ppxlib/Manifest
index 7572a42c3e43..b271fcca81ce 100644
--- a/dev-ml/ppxlib/Manifest
+++ b/dev-ml/ppxlib/Manifest
@@ -1,11 +1,14 @@
+AUX ppxlib-0.23.0-fix-ocaml-4.13.patch 844 BLAKE2B a978b50623d08439503744ee168ffc267f5ae9dca8b9a0671482cfa5512ae2dd38b4d70972f90791fb876e844e346935210ed64704abc8152f27c28f49649369 SHA512 49fb9de4006a9d19ab6da2945a57f11c1154fff07055ea8a1290db2f85c1e28454350a3b050cd2af2c68146c5de30068cdc38b2ca37d3898f4a425002809e17a
 DIST ppxlib-0.18.0.tar.gz 192929 BLAKE2B db14821aa77eac02038632ee8a9756ffd7a7b561c5852c4a5bb6882da531a6d2833737d4d1d372ff73251c168e2da57c7df0c724b1d9a6c4829632881aa4d2b3 SHA512 73b785eec34ca68451936c750ff68a4799b8c265cd973a587bd77b60cb933409eed4edfd4c9a4b0b1ada8d3a0bae5c5c719e4258d00cb0290a6842c67be1fd3d
 DIST ppxlib-0.20.0.tar.gz 193453 BLAKE2B baf5703737792f274654de489aee31c1d324011cbe7e4f5b73102ea352d10ca513ed1b04ec43324640a01c0e5d168945806f6fd4e3a60c9f70c28392a720ec61 SHA512 e19699cb09c441d0ecbda191df78e8227111f1880be4f2810228cbfbf93c9474ba6d04e0e3b4b14820ea7dbd1388fd4ac86f818a28819e7d8b0dd00200609a7d
 DIST ppxlib-0.21.0.tar.gz 201905 BLAKE2B f7a7b69ab07b2a5dce542877989fb4ca820acdda375371895072b857a44e8e7f437695f43990472dfad88261179ff07bd33f6e39881c2b28ff2650d7e2a53bdf SHA512 5760ecc8a5e0c0f49ad4f0d3ba2546185d36411f4292c4ebfbf0c9520438546a60d8fe0b265cec70793b03cc684e399401ff761cb1c369966add70118f1ecda5
 DIST ppxlib-0.22.0.tar.gz 202241 BLAKE2B 6b18ceb23e248eb2b4faed66ba0ea1cbee36df61cee9458fc0fd7057eff433340cb602a429c3f100ee054da06d9de20eca44e5ecc4ba98c888cfec2c83097151 SHA512 11442120c24bf60d9de90c9a325de9e5d87d87ba08d8e4cd216a3434f422c62427aa4214909b80646db638423ea35dff4280d5a70cf51bdfadc0a97745c32d41
 DIST ppxlib-0.22.2.tar.gz 202895 BLAKE2B 41d2c2e698846e5dfeb4158966b65dd29b253645b0286d0eab5a9dfb0e684b8b43f17a32b23023198d2c4e50e836705d2c965ea74ef337c5b0cf6aecd6fa4167 SHA512 3a83693551f11965b219a9caa4eaffbf358ea1311e05a38bfd531b8ad225d6571d86db7282e1d5bdc09775f2ba47791c03351402720cf5c2adefc52926d498e4
-EBUILD ppxlib-0.18.0.ebuild 761 BLAKE2B 40f8e9ac892537578d8eb96c5429f55154df6309f27a8724c4fbfaa7837066bc0622e814ff4aa476e28d5dff2160d91a50c3ffb77d3657077c775904fd6084ef SHA512 a52e6211ad464a40dd1cfa2487c7c08f6e728882160ea41694298cc9b08fc203aca2e7daa7a33cdd2bad089f3ae3cf41e568396c37630397e8901891c9c2d4af
-EBUILD ppxlib-0.20.0.ebuild 718 BLAKE2B bcbe2675a790ec9efcdeb45d1c94f1992093e61ba128ca58f562cda548a4113ac4b05c7837db8de0974c793a79adfe994ef02e04c216e4d2c0455b40662377e8 SHA512 1dfc324b78552da53e495819c766bba9a3fcb05b2b3ba2ef840bed21bbdf04b781030aae0b267c8190563ca17553034ea4ff050226bfcdecaf32becb6fee03a4
-EBUILD ppxlib-0.21.0-r1.ebuild 793 BLAKE2B 43d4d93deb4341d9f6a2db4649010f825136452a39a8390070f4d759cddba1645f6ac19712103de9ecddc0d0094126203f83298e5705e337a0cab2c05507f6e4 SHA512 f7664fece24435d4d7257a31fad08fa3355a8c83d04bf3901105a6474442d5064c85cb350a88fa9a1bda1a7a821c5ce758c8bddba803a154239077caeac9a6d3
-EBUILD ppxlib-0.22.0-r1.ebuild 824 BLAKE2B 41c8dc3159fca69f1c2dbe7188349e066bf3f4231db9f0b64948f9340b178ba134bdc48bae16edac7109f439fc5dfd676c4f96359ffd73a3121e19585251cb06 SHA512 a83abb94d9b45b2834fc040c588ce55da6b1d942f36b9f93d5df0c861ef3793e926c0a44d2e0eb6dd310b1ff2cf1e6971e0e5740bddbce264a314884c3ab450c
-EBUILD ppxlib-0.22.2.ebuild 824 BLAKE2B 043500855f551d559d157e21ccd79781ca2386ee3b21dc3cfae189addac167dcf54d421676be1897e2c518d50b960ffe7f5c742ca89191465a0dba8ff84412a1 SHA512 c117afa371b5cafdce5f17a7e4b0cbe98d057d60e9434ae86f17f18ce363a021c593ee88ac07031daa4d65bcf4b15689046928aaa8fba854a705c0c6f415c052
+DIST ppxlib-0.23.0.tar.gz 364308 BLAKE2B b1cc622eb5e01c455da437365053fd32a00d33007520cf28536e1f45c142aa0a9083da614110c1096fd3f8326453eb037a8c0054e00e17a813f99f3d8efde5d7 SHA512 9d6692ec4247031f26aed3bdc59808a5f929c34dbac3515a8b2a61c59ec118f0e90d12948d22aea40e9f01b1ed782e9dfa5b0263314b967217b2ac4006446c53
+EBUILD ppxlib-0.18.0.ebuild 944 BLAKE2B b99d31790fa17ba7f143859e2ec4cfdcc6a6e879c161e34f5996a5eb881d63889f69a4ac65d1412582722c4e4f1c784ee4ecdb823edc55a065bb9067787fe1ed SHA512 7455d8e04281bd708968d5f58d0d4a09032305a25db0cda77643ce4962c367a85ebaa5c48785441f842c829b0c93d858b31a9fe4e11560892f447dbdc098f263
+EBUILD ppxlib-0.20.0.ebuild 901 BLAKE2B b57d590e48284b9649369eeb22d9375df37f67731f831eccb84e7e725b8fe6089848880ff290dfde59313808528796da4738a3d5adbfebc962acd3d5c0742f4c SHA512 aa83ca0db89d6c1de32ce271e357f5d8b8a1a60feaccff566ae8528a1ec3db49bcab9204731cfe7e19ff21915565a89a8ed5bff02c81201b41912b83e0ca9815
+EBUILD ppxlib-0.21.0-r2.ebuild 1112 BLAKE2B 2483fe8e618d609243789a36723f8b4529d0838c9e4e79ae1e88fbe6852642779a6e759b4a5dafce84d00cc7e28b3505786cd40736b31c30eb8f75ea19ffea42 SHA512 678061b8c983ac71c545448a6e058d4f7ae2cb30534bc51b40bd08ee6bdc7e9fe137ca93eb26e3f2457a22c9e828693cd1fd83b80eb725c6ac2dc30eda5e0634
+EBUILD ppxlib-0.22.0-r2.ebuild 1143 BLAKE2B c71e6f6736f0e1edd8116827779a24f3ab0050e6207e5bd2cc192d5d4106a60a578d08a2de55279baeb2f0aae77fd675bc3f3818c449cb9bf72b3b727d863bed SHA512 4d56a68e5e0dac526b2e2ee8e470755af03edc6c7ddf084aa0c7718802ec4f56472eff28931840ed480feb242fb814e3f1e76163e7b684bffc29c36cf934a8ac
+EBUILD ppxlib-0.22.2-r1.ebuild 1143 BLAKE2B a6986fa8ad936d5ff6247ced664d094c818bde608a53c083f99885419a3a61e4e63a6b3bbdf2be2842f1402de2982d4e25ee1e90df1c4d39a93b607d7490035e SHA512 8f908a7b0a5fdecef965078984a4179e7c662b7572d0f00ef274568ca61cd650fb9f6f25e742433091b7595b20cc4a0dd5c277d037a4cdf50bfff8a1fa55d6ee
+EBUILD ppxlib-0.23.0.ebuild 1010 BLAKE2B 9fb76e9323c8b323536abe9cd27221e5ec4a8667365fde8f4e74e0cf0b9cc9add952c1ab8a0571ad1eb54ccbae0b577a4b1a3fe329e60b6471c29eeb347ba797 SHA512 75e482e0a387a79b263afbe51c98e97a0c4ac8a3dc8d35f10a978889355a60cae5b8caab354722748b465fc7dd0db7b4744f783df446240c01fbd35e51d44eba
 MISC metadata.xml 419 BLAKE2B 97371846a88fb0008519bfb72fff654aa18401b2066073c09099b1987efbb9ad49012c0ab7624218894130a2cda3d5fba6056522eacd30712d08b7784801d9cf SHA512 8dc94b1dd499f7caa3696de963e69063193892dc939609c581fec3b2d93eca4f266e9360cb5144978ba36864d9143b6fb0a1eb0e0ac5061e04b84a68e787a8f7
diff --git a/dev-ml/ppxlib/files/ppxlib-0.23.0-fix-ocaml-4.13.patch b/dev-ml/ppxlib/files/ppxlib-0.23.0-fix-ocaml-4.13.patch
new file mode 100644
index 000000000000..00bf6dc0e4cc
--- /dev/null
+++ b/dev-ml/ppxlib/files/ppxlib-0.23.0-fix-ocaml-4.13.patch
@@ -0,0 +1,23 @@
+https://github.com/ocaml-ppx/ppxlib/commit/ce371cfb4c2ad712cd8e9b803bbf4ef650aa5e72
+
+From: Sonja Heinze <sonjaleaheinze@gmail.com>
+Date: Fri, 10 Sep 2021 16:08:22 +0200
+Subject: [PATCH] Make our expect-test version compatible with 4.13 compiler
+
+The Warnings.parse_options function was returning a unit on older compilers
+and is returning an alert option now, but under the hood it still has the
+same side-effects.
+
+Signed-off-by: Sonja Heinze <sonjaleaheinze@gmail.com>
+--- a/test/expect/expect_test.ml
++++ b/test/expect/expect_test.ml
+@@ -63,7 +63,7 @@ let main () =
+     setup_printers ppf;
+     Topfind.log := ignore;
+ 
+-    Warnings.parse_options false "@a-4-29-40-41-42-44-45-48-58";
++    let _ = Warnings.parse_options false "@a-4-29-40-41-42-44-45-48-58" in
+     Clflags.real_paths := false;
+     Toploop.initialize_toplevel_env ();
+ 
+
diff --git a/dev-ml/ppxlib/ppxlib-0.18.0.ebuild b/dev-ml/ppxlib/ppxlib-0.18.0.ebuild
index 3cee14a81864..322bc6a963d6 100644
--- a/dev-ml/ppxlib/ppxlib-0.18.0.ebuild
+++ b/dev-ml/ppxlib/ppxlib-0.18.0.ebuild
@@ -5,6 +5,11 @@ EAPI=7
 
 inherit dune
 
+# Note that new "major" versions may change which OCaml version they support
+# See:
+# https://github.com/ocaml-ppx/ppxlib/issues/243
+# https://github.com/ocaml-ppx/ppxlib/issues/232
+
 DESCRIPTION="Base library and tools for ppx rewriters"
 HOMEPAGE="https://github.com/ocaml-ppx/ppxlib"
 SRC_URI="https://github.com/ocaml-ppx/ppxlib/archive/${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/dev-ml/ppxlib/ppxlib-0.20.0.ebuild b/dev-ml/ppxlib/ppxlib-0.20.0.ebuild
index d7f81c1a3a3b..8ea171116681 100644
--- a/dev-ml/ppxlib/ppxlib-0.20.0.ebuild
+++ b/dev-ml/ppxlib/ppxlib-0.20.0.ebuild
@@ -5,6 +5,11 @@ EAPI=7
 
 inherit dune
 
+# Note that new "major" versions may change which OCaml version they support
+# See:
+# https://github.com/ocaml-ppx/ppxlib/issues/243
+# https://github.com/ocaml-ppx/ppxlib/issues/232
+
 DESCRIPTION="Base library and tools for ppx rewriters"
 HOMEPAGE="https://github.com/ocaml-ppx/ppxlib"
 SRC_URI="https://github.com/ocaml-ppx/ppxlib/archive/${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/dev-ml/ppxlib/ppxlib-0.21.0-r1.ebuild b/dev-ml/ppxlib/ppxlib-0.21.0-r2.ebuild
index 4e0bb08cb7f4..e6b9510929d3 100644
--- a/dev-ml/ppxlib/ppxlib-0.21.0-r1.ebuild
+++ b/dev-ml/ppxlib/ppxlib-0.21.0-r2.ebuild
@@ -5,6 +5,11 @@ EAPI=7
 
 inherit dune
 
+# Note that new "major" versions may change which OCaml version they support
+# See:
+# https://github.com/ocaml-ppx/ppxlib/issues/243
+# https://github.com/ocaml-ppx/ppxlib/issues/232
+
 DESCRIPTION="Base library and tools for ppx rewriters"
 HOMEPAGE="https://github.com/ocaml-ppx/ppxlib"
 SRC_URI="https://github.com/ocaml-ppx/ppxlib/archive/${PV}.tar.gz -> ${P}.tar.gz"
@@ -15,7 +20,6 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
-# nss[utils] has /usr/bin/pp
 RDEPEND="
 	>=dev-ml/base-0.11.0:=
 	dev-ml/findlib:=
@@ -25,7 +29,6 @@ RDEPEND="
 	dev-ml/stdlib-shims:=
 	>=dev-ml/ppx_derivers-1.2.1:=
 	>=dev-ml/stdio-0.11.0:=
-	!dev-libs/nss[utils]
 "
 DEPEND="${DEPEND}
 	test? (
@@ -33,3 +36,11 @@ DEPEND="${DEPEND}
 		dev-ml/re:=
 	)
 "
+
+src_install() {
+	dune_src_install
+
+	# Clashes with dev-libs/nss[utils], accidentally installed upstream
+	# https://github.com/ocaml-ppx/ppxlib/issues/224
+	rm "${ED}"/usr/bin/pp || die
+}
diff --git a/dev-ml/ppxlib/ppxlib-0.22.0-r1.ebuild b/dev-ml/ppxlib/ppxlib-0.22.0-r2.ebuild
index 116ac1f1e0ee..eca76b2308f1 100644
--- a/dev-ml/ppxlib/ppxlib-0.22.0-r1.ebuild
+++ b/dev-ml/ppxlib/ppxlib-0.22.0-r2.ebuild
@@ -5,6 +5,11 @@ EAPI=7
 
 inherit dune
 
+# Note that new "major" versions may change which OCaml version they support
+# See:
+# https://github.com/ocaml-ppx/ppxlib/issues/243
+# https://github.com/ocaml-ppx/ppxlib/issues/232
+
 DESCRIPTION="Base library and tools for ppx rewriters"
 HOMEPAGE="https://github.com/ocaml-ppx/ppxlib"
 SRC_URI="https://github.com/ocaml-ppx/ppxlib/archive/${PV}.tar.gz -> ${P}.tar.gz"
@@ -15,14 +20,12 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
-# nss[utils] has /usr/bin/pp
 RDEPEND="
 	>=dev-ml/ocaml-compiler-libs-0.11.0:=
 	>=dev-ml/ocaml-migrate-parsetree-2.1.0:=
 	dev-ml/sexplib0:=
 	dev-ml/stdlib-shims:=
 	>=dev-ml/ppx_derivers-1.2.1:=
-	!dev-libs/nss[utils]
 "
 DEPEND="${DEPEND}
 	test? (
@@ -34,3 +37,11 @@ DEPEND="${DEPEND}
 	)
 "
 BDEPEND=">=dev-ml/dune-2.8"
+
+src_install() {
+	dune_src_install
+
+	# Clashes with dev-libs/nss[utils], accidentally installed upstream
+	# https://github.com/ocaml-ppx/ppxlib/issues/224
+	rm "${ED}"/usr/bin/pp || die
+}
diff --git a/dev-ml/ppxlib/ppxlib-0.22.2-r1.ebuild b/dev-ml/ppxlib/ppxlib-0.22.2-r1.ebuild
new file mode 100644
index 000000000000..0acf232740e3
--- /dev/null
+++ b/dev-ml/ppxlib/ppxlib-0.22.2-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+# Note that new "major" versions may change which OCaml version they support
+# See:
+# https://github.com/ocaml-ppx/ppxlib/issues/243
+# https://github.com/ocaml-ppx/ppxlib/issues/232
+
+DESCRIPTION="Base library and tools for ppx rewriters"
+HOMEPAGE="https://github.com/ocaml-ppx/ppxlib"
+SRC_URI="https://github.com/ocaml-ppx/ppxlib/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-ml/ocaml-compiler-libs-0.11.0:=
+	>=dev-ml/ocaml-migrate-parsetree-2.2.0:=
+	dev-ml/sexplib0:=
+	dev-ml/stdlib-shims:=
+	>=dev-ml/ppx_derivers-1.2.1:=
+"
+DEPEND="${DEPEND}
+	test? (
+		dev-ml/findlib:=
+		>=dev-ml/base-0.11.0:=
+		dev-ml/cinaps:=
+		dev-ml/re:=
+		>=dev-ml/stdio-0.11.0:=
+	)
+"
+BDEPEND=">=dev-ml/dune-2.8"
+
+src_install() {
+	dune_src_install
+
+	# Clashes with dev-libs/nss[utils], accidentally installed upstream
+	# https://github.com/ocaml-ppx/ppxlib/issues/224
+	rm "${ED}"/usr/bin/pp || die
+}
diff --git a/dev-ml/ppxlib/ppxlib-0.22.2.ebuild b/dev-ml/ppxlib/ppxlib-0.23.0.ebuild
index bc486940ff77..c34f8878151c 100644
--- a/dev-ml/ppxlib/ppxlib-0.22.2.ebuild
+++ b/dev-ml/ppxlib/ppxlib-0.23.0.ebuild
@@ -5,6 +5,11 @@ EAPI=7
 
 inherit dune
 
+# Note that new "major" versions may change which OCaml version they support
+# See:
+# https://github.com/ocaml-ppx/ppxlib/issues/243
+# https://github.com/ocaml-ppx/ppxlib/issues/232
+
 DESCRIPTION="Base library and tools for ppx rewriters"
 HOMEPAGE="https://github.com/ocaml-ppx/ppxlib"
 SRC_URI="https://github.com/ocaml-ppx/ppxlib/archive/${PV}.tar.gz -> ${P}.tar.gz"
@@ -15,14 +20,12 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
-# nss[utils] has /usr/bin/pp
 RDEPEND="
 	>=dev-ml/ocaml-compiler-libs-0.11.0:=
 	>=dev-ml/ocaml-migrate-parsetree-2.2.0:=
 	dev-ml/sexplib0:=
 	dev-ml/stdlib-shims:=
 	>=dev-ml/ppx_derivers-1.2.1:=
-	!dev-libs/nss[utils]
 "
 DEPEND="${DEPEND}
 	test? (
@@ -34,3 +37,7 @@ DEPEND="${DEPEND}
 	)
 "
 BDEPEND=">=dev-ml/dune-2.8"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-ocaml-4.13.patch
+)
diff --git a/dev-ml/re/Manifest b/dev-ml/re/Manifest
index d3b661a03dd1..3fbf8d0026d3 100644
--- a/dev-ml/re/Manifest
+++ b/dev-ml/re/Manifest
@@ -1,4 +1,6 @@
 AUX ounit2.patch 345 BLAKE2B 9db15f913a961c6aec6025ecf9c7dbf37dfed084e57246cb7e52012b548199014c8b93e0d75c6baf5b32a4cc806584bf3a50d48a50a8fa81d08690dd43aff072 SHA512 c002d4e2343931b6954828226678ec2b1e878fc36bdd031cb0e9158222e375b3595b2e58ef7de3b9ff9613b44ffdb29d8e5fe4fb8284a7ad1815712893bf9cb1
+DIST ocaml-re-1.10.3.tar.gz 90155 BLAKE2B 44f7779e2004c8ac24f6bf476edaea5f6469fd64319c681df1917d571e5f4175559516e5f19bcf5eee19687eb3ad0c93b672b97cfdc54f29803180b3b9a229d7 SHA512 c86bc375d52ba4d0363d56636dd389c29ce3fc430f569fd5c3af3265023bb80462d94ea9fce97387fdebc8731d33166871ac2f9162327674c2b97bdbde423bbd
 DIST ocaml-re-1.9.0.tar.gz 83642 BLAKE2B abcabb80ffef241fc7e8ea075f49365cc64f8749db1d1f7eb654eeb52f5be8e96756f98ae7903391a26d8537f82e105878a38a15923d7f93c61abd5c08d3ff98 SHA512 3e11c6eccf573ab5d7f43accf1f1ac9eda0d7320067e142b9f76b309315c1e30d22c5bb80c7a54b05d9c92d3518d26ea82b5093de9b48f86e3c62d6073f14eda
+EBUILD re-1.10.3.ebuild 615 BLAKE2B 1ab3c4fceae334388f2084e287a39e4ce6931eb9f8a096bfcd62c96b70d3bfc30a82e0ca4db5dca79aa51d265f6c52c04a741695c10046865194e143d41f2242 SHA512 0dfd8db8c5d242ef234a2c4280d14a51bb25a553025a6a5ae9aded0686c7c08efc54639fd1b80bc714631ae70fcb9487273a839792a054fbe602cd1906a010f4
 EBUILD re-1.9.0.ebuild 609 BLAKE2B 6b4c1fb2172a7206c587046346c6225556264f3daefaf2084d1ebac8cae6e7cd7362df2a1848ba463feefee0b78990e504fffaf93acc66d97801d9a8af8a6be8 SHA512 a011dbec8598f85552ac61ea5095258476c4df9d7ca82b8b1fce4caa6f8ef43b08e3765e39de150f2985895f7f739ad9f74552cf1351589cebf7b9ff9894ab9d
 MISC metadata.xml 417 BLAKE2B f430469be32b652c280b3044cc455f267f494c8b92778971ca7e497996b9149cfa75e01829552cc5fca41734e8e3d17e7773f7a2484121b1b99a4632a20a075c SHA512 c19dce40e6ed1a36fd00a52ca0b9c85767d01fd7f48181b908b7c205da33032b65da4576f5e6829e925596e0ecca7b49555545aacf0744c3e151c4174a4d086a
diff --git a/dev-ml/re/re-1.10.3.ebuild b/dev-ml/re/re-1.10.3.ebuild
new file mode 100644
index 000000000000..9dc727449c23
--- /dev/null
+++ b/dev-ml/re/re-1.10.3.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Regular expression library for OCaml"
+HOMEPAGE="https://github.com/ocaml/ocaml-re"
+SRC_URI="https://github.com/ocaml/ocaml-re/archive/${PV}.tar.gz -> ocaml-${P}.tar.gz"
+S="${WORKDIR}/ocaml-${P}"
+
+LICENSE="LGPL-2-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="!dev-ml/ocaml-re
+	dev-ml/seq:=
+"
+DEPEND="${RDEPEND}
+	test? ( dev-ml/ounit2 )"
+
+PATCHES=( "${FILESDIR}/ounit2.patch" )
diff --git a/dev-ml/rresult/Manifest b/dev-ml/rresult/Manifest
index 838fc439ee81..ea17185f5745 100644
--- a/dev-ml/rresult/Manifest
+++ b/dev-ml/rresult/Manifest
@@ -1,5 +1,5 @@
 DIST rresult-0.5.0.tbz 9185 BLAKE2B efe8d248aa3d68b13b011dccb98cb04127dfec9d659dfe8619f658b254cfcdca833e125310553dee54ef4be239c308e762d2290386f4fd08a5f2c1835faa9ef1 SHA512 45787b61adb7daedf72e4ff632cf3d4917bccb3e83613dabf93437982887d9a0ed3b6cbefb2b17cb341a825346cb0609286df581c6ff379583dc83672ee25efc
 DIST rresult-0.6.0.tbz 7731 BLAKE2B d93b4a3fe54541101d52e768555aa306f87d1c34b57c7eb7a92092051a047586c43dded3be9ef0c84675d935c4a91162a8ff612d540f951f2842cfdf9f709f24 SHA512 66cb7acb525c17dde4e7572fa5a0d925466f8e759b90a12d952ca076d25de49404c962e061557f2255112fbf1d731f8da696acd536cbb9433a4b1d9662095c3a
-EBUILD rresult-0.5.0.ebuild 540 BLAKE2B 89d50f57ec0cd435ee5c21a9777f73195333fe0eb8de4c812a39935b5d9c002d1d3085792d818dfb6b70f4b39790b4ba9f5e61c643f22d79f7a8b6c6a61a32fb SHA512 e66dfc907c47a6aa08dea92508f6c9081cfc1616a1a7ef602b59b87721876cd241e53ebb94454135024798cab9a289e0d8a86deeba33f1c206f725d813248349
+EBUILD rresult-0.5.0.ebuild 537 BLAKE2B 268da618a4d646f5f879b2897b99b78fb5a93725a8502cb2bde5d907c78b2d3a7e9c10d47e8d6e17d8852cdbf4c6089440ec9fca0ee020df3f81e16cb6a174ed SHA512 11ae7ab67ea3d474c8f952f1f3b9400414d5dea30aa910c62f97d3942276cde5345c70dc3d0a2fc92092e379c7d373b6dd2515c2e443a6122de2ea8749fe5e17
 EBUILD rresult-0.6.0.ebuild 543 BLAKE2B 821ba47da90a028bfabd5c98a0767229d5db9a13e17b58c9744adc2d7e2b7714058f885b4702932a664ca5ec7975ca3c1d42e4620796667540a2d749420cdbaf SHA512 d31aacf899f5479bb348b2b9a23b57862d2225b5debfde2f40da977e286122c58519b77c1a94b9a5b54898148841c225111dccb03cbbcd5a57c0859c749e56e3
 MISC metadata.xml 314 BLAKE2B 3ec15d97bf35ceb3f76caa4268557f4a32cff0673c4dcc20376d2cf8f41eae93f154a77b2ab56f82a9b370e1ab51eaf09bcae142cd9b0fd5cb653f78f7bd9d5d SHA512 60a95e3a7fd8c3f4dfcb5c150630f2f0df58b129de1b69a6cbf29f9aafbbe7a9b03795ee9e9448c5ff14103f631dc85fd9689e2fa3a82bb1b7953b6b1ba171f7
diff --git a/dev-ml/rresult/rresult-0.5.0.ebuild b/dev-ml/rresult/rresult-0.5.0.ebuild
index b689f342ebc5..9144c414ce88 100644
--- a/dev-ml/rresult/rresult-0.5.0.ebuild
+++ b/dev-ml/rresult/rresult-0.5.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://erratique.ch/software/rresult/releases/${P}.tbz"
 
 LICENSE="ISC"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 arm arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~x86"
 IUSE=""
 
 RDEPEND="dev-ml/result:="
diff --git a/dev-ml/stdlib-shims/Manifest b/dev-ml/stdlib-shims/Manifest
index 424b2b2e764c..3b034f6e1118 100644
--- a/dev-ml/stdlib-shims/Manifest
+++ b/dev-ml/stdlib-shims/Manifest
@@ -1,5 +1,5 @@
 DIST stdlib-shims-0.2.0.tbz 15980 BLAKE2B 4d83b8642a4bccc9f090c0a2f23a4d2f16bbf2ec686ab41e357f5f544d659e82f10cba85f9d578c939a2a874d0006b7fd17846bb8ffe1b6fc7cb760e4aa33db1 SHA512 19e8d8e004583e94ce060d3598c886dae1c24dd79dfd177aab4bd2865846f668a83071f087d9371393f226c14c90042eb2ec76619654c655995aeff9d4765621
 DIST stdlib-shims-0.3.0.tbz 10163 BLAKE2B 442f07a9b80fb915a0254ba814227798c838f9fa4c6e9a94c4b99c22ca25844f121de235cb758707179275da9200cd45cbb6e68392b0217af97c6e1bb04a13a3 SHA512 1151d7edc8923516e9a36995a3f8938d323aaade759ad349ed15d6d8501db61ffbe63277e97c4d86149cf371306ac23df0f581ec7e02611f58335126e1870980
-EBUILD stdlib-shims-0.2.0.ebuild 494 BLAKE2B a7d0c4c475cbb22d4525aa9ea9e108bfce0ed399a94a4ad8de49ecf9c329c0c3aa6db7426328db8136d27ead0abcd3cf1cda957d54c67967c536191c5890ae6a SHA512 2951bfb90d39bf477141f17be4f51c9327c793c2515940840869e62e23abeae7586c1dca3d43751a96b852558d27bfe9b0c9d8a80bf4b4432b64fb670718c612
-EBUILD stdlib-shims-0.3.0.ebuild 500 BLAKE2B 36e6915b87f419b81438d29cae60bda9e8e22d6edafd7b8dace20bb48e99e777551762fd7dcb4536172f3b26dfc60513df744852b87b86eb7304ddaff6a11537 SHA512 d5c897e0b0c6f336bf9351f4cb2c2f2496adb42dfaccb8f3951f25da8541eefda46abba29d7fd22f6a4239ef469aa4ff2fa263a300bf5e90099b672c286fe087
+EBUILD stdlib-shims-0.2.0.ebuild 495 BLAKE2B 81978f9c8fd11fa867bfa8d5ea7a9252341ba0250fab6f3bd3009d81fd1da7b6824a5417468306f9093c1486cd9dfc968b08f2949b1920dc3067949a68e36a52 SHA512 f00ef93c258fdbdd12baab287fb97c4861383e41fad530f9de9d9fd85fa94199b04af32c6e5311cbf122fcf319c185f478265627daec5598627fd6310472d259
+EBUILD stdlib-shims-0.3.0.ebuild 501 BLAKE2B 00033f6b9490dcc5b993a13aad9a962881937699318004e656bf38e504b06ea7e1ea2e09aacc599396d2a55cf2a33014c4c6ac817e6bbc7813470900ffe30006 SHA512 8c6e3a8cbadba9e7c6b22a83cd3f3d8832024a6d731cce9c75b3b40bcc225f3b1c43b6684cf7ac470a6eafc7011860e410a428feef64773fab0cd7ab41241c36
 MISC metadata.xml 895 BLAKE2B 74b7031dde405fc76a61931db210dd593deff24eb2eb0b97608d9b41d05197aa57c3b1ac05e3278cc6bed373ce3e12d124408dc550cb2aaae56d34ae2a714355 SHA512 435472e56e1b1fd7bb7e050d27ac40ec5cfda05b67fe88b7f4aa0a6d4e785a6324f01340b32ad7a58c5173d4db06e61fa68c11d805dc9fcbf806f3df4b942545
diff --git a/dev-ml/stdlib-shims/stdlib-shims-0.2.0.ebuild b/dev-ml/stdlib-shims/stdlib-shims-0.2.0.ebuild
index 5ce9d879e11b..9f748eb07a6d 100644
--- a/dev-ml/stdlib-shims/stdlib-shims-0.2.0.ebuild
+++ b/dev-ml/stdlib-shims/stdlib-shims-0.2.0.ebuild
@@ -12,6 +12,6 @@ SRC_URI="https://github.com/ocaml/${PN}/releases/download/${PV}/${P}.tbz"
 LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="0"
 KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
-IUSE="ocamlopt"
+IUSE="+ocamlopt"
 
 DOCS=( "README.md" "CHANGES.md" "LICENSE" )
diff --git a/dev-ml/stdlib-shims/stdlib-shims-0.3.0.ebuild b/dev-ml/stdlib-shims/stdlib-shims-0.3.0.ebuild
index 135f3ce10d48..f4a918c72443 100644
--- a/dev-ml/stdlib-shims/stdlib-shims-0.3.0.ebuild
+++ b/dev-ml/stdlib-shims/stdlib-shims-0.3.0.ebuild
@@ -12,6 +12,6 @@ SRC_URI="https://github.com/ocaml/${PN}/releases/download/${PV}/${P}.tbz"
 LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="ocamlopt"
+IUSE="+ocamlopt"
 
 DOCS=( "README.md" "CHANGES.md" "LICENSE" )
diff --git a/dev-ml/uucp/Manifest b/dev-ml/uucp/Manifest
index 63b6b6330194..52bbfc9eb9da 100644
--- a/dev-ml/uucp/Manifest
+++ b/dev-ml/uucp/Manifest
@@ -1,3 +1,5 @@
 DIST uucp-13.0.0.tbz 466488 BLAKE2B 90b62446ed069f95b0ca8bbad8273b215f0a66f6a3d19639d60a73f440268e9274d4e98e7ac8a534bbb6a34ab485e989432894f22f2f5c1303ca49f828efe859 SHA512 24d0fc75ba337115fd6445d3c3dfa60fe5f6920b227cd8360cd60ad51b652ccc2129a47f195f7559d99635367e64855343dc03de1109987f296a280e0fefff4d
+DIST uucp-14.0.0.tbz 476162 BLAKE2B 1c75b7bf98858bc60dee12bebfa99556afd6b344b65b12a4eafcbd39c57e2359f1a47aa0f28c5450f078db95d78ab545eecf84d0d5dbadb2bf1705c17e7179a4 SHA512 2d0224aed5d5accbb121624898f08598e8c74a2415942f159a54221c0cdac62ed64fc70a039c833e50110cefce77754ada9ac2d58f79a6fc9331135326fe6899
 EBUILD uucp-13.0.0-r2.ebuild 605 BLAKE2B 1474526e0e1a8d6a1229525c04328cd10a9712a36b74a7a1d9979218368e775fbb2581c965e78999a567e77feac2c144fb17422a651d36efd19e9aaba95c2105 SHA512 58cd2ea713961be9ee31e7e1d768997d3fb7386b46c8fba99b4b46acd45a2439c58d388f0982d414e5acb33a4465c808754deed68045e42842bb53198de63f1b
+EBUILD uucp-14.0.0.ebuild 599 BLAKE2B 23698c3375afa24426cded31abcd1469bfddfaf8a5d911541c42fc39a57d0c08168739404ed8489414b642e34da62eba51453d187711114fc871f3444cd53efd SHA512 41b59fb2162f9d9f42fbf1d0dffd1461ca1832f24171fafb71050adee8b4719c232b00da0e197c45cf81ea932f027260374ca0eb6cb1b8f560d2c71f3c3f196f
 MISC metadata.xml 311 BLAKE2B a76d9caedb7c1705259a0b1e462b017a72d6704d937134f3b412dfbab5edad0dd301c0099286616863e8c2ebfea4152702e708c6ce60b15dca195ddb4e1888bc SHA512 fbb904d6b4a2fe7e080c66b76934ca3ef6c1ef0da78fb198d54700e03c4cc1a47a2978d79210dd153b630666c154511742d580fe3e5b1d840b7ee0b24cf215d8
diff --git a/dev-ml/uucp/uucp-14.0.0.ebuild b/dev-ml/uucp/uucp-14.0.0.ebuild
new file mode 100644
index 000000000000..ec89c6b0ae38
--- /dev/null
+++ b/dev-ml/uucp/uucp-14.0.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit opam
+
+DESCRIPTION="Unicode character properties for OCaml"
+HOMEPAGE="https://erratique.ch/software/uucp https://github.com/dbuenzli/uucp"
+SRC_URI="https://erratique.ch/software/uucp/releases/${P}.tbz"
+
+LICENSE="ISC"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-ml/topkg
+	dev-ml/findlib"
+RDEPEND="${DEPEND}"
+BDEPEND="dev-ml/ocamlbuild"
+OPAM_FILE=opam
+
+src_compile() {
+	ocaml pkg/pkg.ml build \
+		--with-uutf true \
+		--with-uunf false \
+		--with-cmdliner true \
+		|| die
+}
author	V3n3RiX <venerix@koprulu.sector>	2021-10-08 23:06:07 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2021-10-08 23:06:07 +0100
commit	e23a08d0c97a0cc415aaa165da840b056f93c997 (patch)
tree	4c5f7db60483518201fef36f8cc0712789a08db2 /dev-ml
parent	391b5b359a346aff490103da7dddc85047f83830 (diff)