gentoo resync : 15.06.2021

77 files changed, 1766 insertions, 58 deletions

diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index a7d100eab543..7eff1fefaadb 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/alcotest/Manifest b/dev-ml/alcotest/Manifest
index f4f1ac3cad11..834c37def3bd 100644
--- a/dev-ml/alcotest/Manifest
+++ b/dev-ml/alcotest/Manifest
@@ -1,3 +1,3 @@
 DIST alcotest-1.2.3.tar.gz 274177 BLAKE2B 1c38baf8932fe16ec3899cd1dd747099065cf93677271aad5ec33706ed7b6fd82dac84f9ed7518c56d178bf1f98a0b131d5e0f4745d47b07021f0fef932fde28 SHA512 0f3e2a5f56a17b6ddf5173d490b8a1aa2b23382bd0535d9d8be09fb8d4dd02dd1b92f9d00b957b11843d671262469e28b3be4f987538e373eb5e1f30c3a406a3
-EBUILD alcotest-1.2.3-r3.ebuild 669 BLAKE2B e04f6c3d76dcfe293b5df9b8ba5ac728ddd68859c1f88ebe0000751909651ca3175d2d78c7bda13c91fa20677280c3ba12d24387c383a4c8a2b1192d4dad1ea9 SHA512 cc461a10f57b09e40dbe968ed6c96523462900eaba000a444c43f4077c90fb80845bb2cda3d3e74e7fc386d34aeffba29a70a90a29ae0b551859f41b361518a1
+EBUILD alcotest-1.2.3-r3.ebuild 668 BLAKE2B 6147c5b6a4f40d3ee6b04f57939751098d0558135534e523585c69aafc2c4b6074a66d65d7a5b8df01d419123d0fc68585a0f5315c66d8d9199c6c1ffb6ca51e SHA512 6b5ddbe10503affb3ed5149f05b4dfe5385d0c5a40ce110f7bf0efa13297c3c807003c13af2fea8b25474e9113a7b0853787ebf8112a60bbe99893302460b009
 MISC metadata.xml 312 BLAKE2B 5beaeb2d3788d842e87db7d42004617c222e706451ef5370be5c053b5e2e45524941d8c70c4b95e07d688683489919e6125181ec7a7d5dcf54a8a05093c93026 SHA512 d16ec08946503a4e8027aef8c59b7d973b98ef0f001d9967857d660ceab7f609d28a24fe6a24c3be5db5137ce22d31ef6535f87cfa8c2533873f278054fb3183
diff --git a/dev-ml/alcotest/alcotest-1.2.3-r3.ebuild b/dev-ml/alcotest/alcotest-1.2.3-r3.ebuild
index bbfd3a1925e0..5b7a4817580f 100644
--- a/dev-ml/alcotest/alcotest-1.2.3-r3.ebuild
+++ b/dev-ml/alcotest/alcotest-1.2.3-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mirage/alcotest/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="ISC"
 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/astring/Manifest b/dev-ml/astring/Manifest
index 7bfdb850976d..031886bb01ac 100644
--- a/dev-ml/astring/Manifest
+++ b/dev-ml/astring/Manifest
@@ -1,3 +1,3 @@
 DIST astring-0.8.5.tbz 37499 BLAKE2B bff0b9a295da9e33e0cc4bf1a5a0c3cec4010f477d67a39650bbb8e61f12e517cd5734f1e869d35448e4e555a04d0223b76181f29ee299ef9f19359c7d59e69a SHA512 b40634cc2053d651bce5c1974996b352ffa48ecac429919113840b2a807efb34387d950f12accb346afd5e40514cb90219d70b00109c30e1450c4e99f65c9856
-EBUILD astring-0.8.5.ebuild 587 BLAKE2B df9b7963f804273b550d7e7a253a8d2db16f369d127b178fb10130077e9cbc6f632fff13aa62875ec128bf615d59ca2333aa847690a7de1a4d7c53d76028fbc1 SHA512 62e5287372da4818ebb370bcd127f941e473d3a86f5474995113c87d8e1f10096c13cd372654a3a6f8903fa57a2a7905710e25ac30bd0d881428a2916c00f576
+EBUILD astring-0.8.5.ebuild 586 BLAKE2B bfb7cf6a722fb915bd8ba0c43704f21378493b82a3b0569f14b3a7e577caa5defdaab91bd4d8c496e7bb1dfd3a044f5ad2f2b8f8ab8d9d27483b4bd412be2503 SHA512 9e287bb1af8dadf2c7f8c6e908ee36fbd9bc8f2c2d4474b9406bd631bd303b770b7517bb9dd7d3b3dbb1fded25fc2a44549774c1e051199df20649c7afe9ff2b
 MISC metadata.xml 332 BLAKE2B bb0dcf9efae54d3c1f2708df73254af5e5f0a87a1c6651809e78e975a1d05f42c83db5a1f0c7bd4ec345695bfefd81de2ff201d917f8a8c15cb70855b890fe65 SHA512 b45554a47abc646388c8daa8b7e79f4bcbcddb9f4699b5c91b93eaf2acaddfe2838c179256473dab11d2dfce9ee626f68494629d1801e8ed199b4c391a8fe34c
diff --git a/dev-ml/astring/astring-0.8.5.ebuild b/dev-ml/astring/astring-0.8.5.ebuild
index 9496ce793096..c68d81c6dae3 100644
--- a/dev-ml/astring/astring-0.8.5.ebuild
+++ b/dev-ml/astring/astring-0.8.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://erratique.ch/software/astring/releases/${P}.tbz"
 
 LICENSE="ISC"
 SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 
 OCAML_DEP=">=dev-lang/ocaml-4.05.0:="
 BDEPEND="
diff --git a/dev-ml/async_kernel/Manifest b/dev-ml/async_kernel/Manifest
index c2a3d29e6d74..e004d43b7f7f 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 501 BLAKE2B 2d330d4b4c06ef729d9d2b4f31e0cb15391cd267261b54947e870ff14c8ca884fc508fd30ddcfd08143a20381a9ee77e465da5202166eed330080b5b3707b766 SHA512 83002a9c0b50e8d215b2a10b2662054e6db4d7ac2718dcb4fcb7c60860c6e88b9dc47ad5b36c58e4154aa529354b219c5084bd73acdacb31a5a773ed75628138
+EBUILD async_kernel-0.14.0.ebuild 500 BLAKE2B 8d70ecdd21dc2568ea7e6a94480d79e2f563762f4309ea2136e6f4e6a78918fd25914e93599bb2f62eceb81eafaeef69acd2604b9a5e295630e8adc13e4cf35b SHA512 b80bb0f6c1bba72f13b2e9bacdb4a9693bb510c32592900d9009e20b56555ebb5a074c38b2b2ade4a2ef12474687b36e5b325ba981f247d7fe98ca04a333942b
 MISC metadata.xml 255 BLAKE2B a46c62417f85a5b501427db310d8b72515be3555082ca620c9ad5c3779138e4bb791787dbcb5d0a24aa839b5d41fa8b227a31f99fad760c9902d0dfd3ad93162 SHA512 be2ed408adedd7f6505032ed11073d13b07e404d19c44c1acb10da5d3fab716c2245d7a55ab7a1461ecdf7bc22bb7de96cd32ae9508ddced925c76406c6db6ef
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 5292c680c149..eddff5633056 100644
--- a/dev-ml/async_kernel/async_kernel-0.14.0.ebuild
+++ b/dev-ml/async_kernel/async_kernel-0.14.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 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/async_unix/Manifest b/dev-ml/async_unix/Manifest
index df0f992d4f8d..c6a637f1c6a2 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 537 BLAKE2B 7342201fda486a6e20bfe8e26e328a61e97ea8fcbdabc7d837e762860ff40312eaeb885e9c8f89ce08ad74f05f979d1b558a41f1b9d76451e568dac884c1952e SHA512 466c2e74a10fe1ceb0bd36ffdf9eb43797b4448a20fd96f226847cd14aef12885921197f668af78cce9ec20eb65d4c2f7cf8c6b7c31189e75c1a2d990073231a
+EBUILD async_unix-0.14.0.ebuild 536 BLAKE2B 987e590419d042071795ad047cdda5dead8c7def791753b6ec31c946e4b78085ccb0931285374b724a20df66754548326e5fb372af35147e79c17775674175a6 SHA512 a6542b3fb14b53ee5959b13700caefa8b364649cd2a0a42caaf8884060c0f82616b273d18196546cf222ae290c36c0d0fa1f63f0d865b70329b2518ea2d0e6af
 MISC metadata.xml 253 BLAKE2B 0119814797fa3c3d05048b625f47beb2588cefc93f90594e1fa0fa1f70858f3a84d5e71e912025cd0db1556ff22bd12ba8fe19951e0bcda22c7e11e9ac5b739b SHA512 9ae29fd2c07040726fac076a79e59a91d83db3aa6a01ccf0b2832d9dde07008a45e2272dc18a5b8683cb6dcb9ce120762e8561fe43329782dedf730f27cdeb68
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 2e8590dfcf96..51bdd90f7140 100644
--- a/dev-ml/async_unix/async_unix-0.14.0.ebuild
+++ b/dev-ml/async_unix/async_unix-0.14.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 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/camlp4/Manifest b/dev-ml/camlp4/Manifest
index 60290cbaa5e2..20180fa541c3 100644
--- a/dev-ml/camlp4/Manifest
+++ b/dev-ml/camlp4/Manifest
@@ -1,11 +1,13 @@
 AUX oc409.patch 615 BLAKE2B 6bda1fa9e8424dd31552756f67569fbe37b4b83fa75566cb9675823ee34cc37cd41be1fd6ba53969a736f08f15e8c9073c9c60997342bbb3c65adb71ffa7313a SHA512 de9b3efe72731152d8c6320e8ce4b5d9bb9c44ed1116dcebefb8dc87d725c1d3feaa81f57bed3eda7bac34d7745811ba373bbfc540bf94761d42a216ce09ab58
 AUX reload.patch 595 BLAKE2B 61d89b27f1e192d160160f14a3a58a57ea77e9ac6dd214a8fedb26b2ec554ed5b0b4ea360e04f52110054840821119a2f4dac6db71318c0edbfbeeca64485db6 SHA512 e39221716cda7a38dc6af4b39b68ce3bba023c625535227c40d01a87c52d4756cc46f9c014a8806b468cd9a01e8a65b848f397203950ef03528393121c2c6537
 DIST camlp4-4.05_p1.tar.gz 647566 BLAKE2B 068c1016a75616811787eb480b61349a32960997f03e0bc99d63e15357a8932a6019d9e7195541fd942ef99fc1d71c067fb5fcb0fd0c2c3efb77aac494589854 SHA512 0ee9720286d0d832fb7d2d21a8877856e0e47c94c86b1b58d28f8e757a18472eecb56a16e3a04ce815f240dd5048f5d597515461d084fd1cf4da1b121f97a3fe
-DIST camlp4-4.08_p1.tar.gz 649830 BLAKE2B 8dff6f82618d0f61a56acfa71ae679d4ba5ed4aea272019da7b19ea64960c80e50c55482ff9782748dad5042aa1bcd8728ff0825f8f900ff27239db0e0db3515 SHA512 1f8d6df42935ecdbed96a7b02d05564665b4bf0cbe4f5fd1800a1f292d8b3864d973df1e9e8c566c0fd00b5a55ba47ecd9bd07f134a9be83601e010b0246e075
+DIST camlp4-4.09_p1.tar.gz 649702 BLAKE2B 2bf0fd0b4f22d21b9fa7e195a26f4dece56549c56d191480d5c874aac9422d2d4aa41e23e96c078f653f6da6bdbd186583cb02e857741fdb526b53b000b981bb SHA512 71a8eed173013bdea61f7a268c82acaa1f5215aebbf4b638efba137760e849f9fede82f801aa14e5d6cc334d6e67d752988b15a36557b363a8feaf9ba1d1add4
 DIST camlp4-4.10_p1.tar.gz 650092 BLAKE2B d7a6221dba5f6ec6963fe35236c29f39b8ae8f928618b5a58f72e7b1cc1f50d716b110f9684150716b56784cf703c0d8fcbc1aad32aeab638faca9c1bf2d5b9e SHA512 7ae0e20053a43399daa4ee9b93b6f4dbebc3e17c5ee79d069c4903cdfb2bf1cfc7d6badecf92fcf62e97a5f85f3be6ed82a62eb2a311bf6398b2792eacf763d8
 DIST camlp4-4.11_p1.tar.gz 650280 BLAKE2B 6fe46b49c1f2b2e5fc87fbbbdba3ccae795c555737495c298456b84f0dca79c750aa6e4ab2c23bbc7ba4724defdfb739e370f468a78658035474d2f3ad255995 SHA512 8e572602c1c465017a234565efa2249c935ba1ad3d399a6b264bfbec345958130a96311c79e437ac995e3ead9ff7b4f2d3fe6aa4a3a82431ae0cc6257a300f4c
-EBUILD camlp4-4.05_p1.ebuild 1029 BLAKE2B 9c6ded1579caaa21eb8b9ef4a58fcfff773e622ada30606c786948ff48d8188ea291d570cd5aafe420cade8f42c2df04fdfc257393d6abb65cf1a617eab41f93 SHA512 1d11caf10debd97be5b34655f8f0ecd8b167ff86ce0ebe891000bf35fdb2c95c13472dc98bb943332637e3312a3a0fcda1cca6c12220b2415cc6e0f0d08bd2b1
-EBUILD camlp4-4.08_p1.ebuild 1116 BLAKE2B 9290cf09c2a9fc745bfc1be817965d401b09555991600f053f23726c53752dbef5f1bf0b1bf569d448b793bbebb4dd9173861c220e580a482cb8f12974047911 SHA512 6b269562e5401ffc8b8aefb5ea159f803e7cf61215471351302a7822a9cf9c940d304e1f1a7cd517c1c73336174b8584b731adaa9ed9624a96bf5b5cb18e449c
-EBUILD camlp4-4.10_p1.ebuild 1070 BLAKE2B 657cb82026e41f73108b3e17b037c5db39940327bab6a0b3c1ce2e21c995d77ceb6679bdb6fc05ee15a18f1daf6a9f0f4f1f15c46a6b718163628ff14a855ecf SHA512 c559a97688601ad409049f0a1a069a8aec654d37ae065f7f4adeb5e997ac4289bd6170c3209c35ec29451f75110c17c9b57751f13d19459145989b55bfbfcb72
-EBUILD camlp4-4.11_p1.ebuild 1093 BLAKE2B ea53b00b9f901e448470a0e805dc7959f466998eb267150a4cf96f971e5cd903d91e88410ad65ca9c287b8d4604b28bbab6c4d7ccfc1d688ab689797d2329b97 SHA512 e1aa33105784007697f7eae883a55b2388cbb86bb9e38f38ac7876c4e7c4f29ac2d3f11a1257f5d2af485c51e361df68edc3fe88ec2121402e9357289650261c
+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
 MISC metadata.xml 415 BLAKE2B 71ebce898009219ae77c1cd07c0103aaf322a742fa4012fb0bad0c7cd9fe07a15563a594af1c8c31e09459ecdd0af58d2d5f44d6ece7edc0ce53042b5430c326 SHA512 27f7a2c68e7eef2278eaf51e1cea93646c1281726cdacf881e9e3aa3e4ac0b4806294651a00392b62d730264b3bded358b4f25b203bcd9c92055aefb34beb085
diff --git a/dev-ml/camlp4/camlp4-4.05_p1.ebuild b/dev-ml/camlp4/camlp4-4.05_p1-r1.ebuild
index e3f1c78d6c13..8133a505cfb0 100644
--- a/dev-ml/camlp4/camlp4-4.05_p1.ebuild
+++ b/dev-ml/camlp4/camlp4-4.05_p1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SLOT="0/${PV}"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="+ocamlopt"
 
-DEPEND="=dev-lang/ocaml-4.05*:=[ocamlopt?]"
+DEPEND="dev-lang/ocaml:0/$(ver_cut 1-2)[ocamlopt?]"
 RDEPEND="${DEPEND}"
 DEPEND="${DEPEND}
 	dev-ml/ocamlbuild"
diff --git a/dev-ml/camlp4/camlp4-4.08_p1.ebuild b/dev-ml/camlp4/camlp4-4.09_p1.ebuild
index 06769da466cf..80481b707c6d 100644
--- a/dev-ml/camlp4/camlp4-4.08_p1.ebuild
+++ b/dev-ml/camlp4/camlp4-4.09_p1.ebuild
@@ -9,24 +9,19 @@ 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"
-S="${WORKDIR}/${P/_p/-}"
 
 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-4.09.0:=[ocamlopt?]"
+DEPEND="dev-lang/ocaml:0/4.09[ocamlopt?]"
 RDEPEND="${DEPEND}"
 DEPEND="${DEPEND}
 	dev-ml/ocamlbuild"
 
-QA_FLAGS_IGNORED='.*'
-
-PATCHES=(
-	"${FILESDIR}/reload.patch"
-	"${FILESDIR}/oc409.patch"
-)
+S=${WORKDIR}/${P/_p/-}
+PATCHES=( "${FILESDIR}/reload.patch" )
 
 src_configure() {
 	./configure \
diff --git a/dev-ml/camlp4/camlp4-4.10_p1.ebuild b/dev-ml/camlp4/camlp4-4.10_p1-r1.ebuild
index b80025c98baa..d7ad1f1cfbb1 100644
--- a/dev-ml/camlp4/camlp4-4.10_p1.ebuild
+++ b/dev-ml/camlp4/camlp4-4.10_p1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SLOT="0/${PV}"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="+ocamlopt"
 
-DEPEND=">=dev-lang/ocaml-4.10.0:=[ocamlopt?]"
+DEPEND="dev-lang/ocaml:0/$(ver_cut 1-2)[ocamlopt?]"
 RDEPEND="${DEPEND}"
 DEPEND="${DEPEND}
 	dev-ml/ocamlbuild"
diff --git a/dev-ml/camlp4/camlp4-4.11_p1.ebuild b/dev-ml/camlp4/camlp4-4.11_p1-r1.ebuild
index f50ced55ac78..8162ce77f937 100644
--- a/dev-ml/camlp4/camlp4-4.11_p1.ebuild
+++ b/dev-ml/camlp4/camlp4-4.11_p1-r1.ebuild
@@ -15,7 +15,7 @@ SLOT="0/${PV}"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="+ocamlopt"
 
-DEPEND=">=dev-lang/ocaml-4.11.0:=[ocamlopt?]"
+DEPEND="dev-lang/ocaml:0/$(ver_cut 1-2)[ocamlopt?]"
 RDEPEND="${DEPEND}"
 DEPEND="${DEPEND}
 	dev-ml/ocamlbuild"
diff --git a/dev-ml/camlp4/camlp4-4.12.ebuild b/dev-ml/camlp4/camlp4-4.12.ebuild
new file mode 100644
index 000000000000..8162ce77f937
--- /dev/null
+++ b/dev-ml/camlp4/camlp4-4.12.ebuild
@@ -0,0 +1,46 @@
+# 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"
+
+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
+}
diff --git a/dev-ml/camlp5/Manifest b/dev-ml/camlp5/Manifest
index 1f4a5e398dce..d688bf5d2c13 100644
--- a/dev-ml/camlp5/Manifest
+++ b/dev-ml/camlp5/Manifest
@@ -3,10 +3,12 @@ DIST camlp5-7.11.tar.gz 878224 BLAKE2B f384764da43653a2f75664681a4f202ec84497720
 DIST camlp5-7.12.tar.gz 1008350 BLAKE2B 8f390f6d617a6ef029462aa74ca4d80c0e2eb267bb6957aac43fdecc425aae34dfc7f3e572c8a1f4ee6b032dd90b3b8262094f80a19ea0bb19b80a88d22d3f28 SHA512 233d973b0a968a7812b977e8a37da8e8daa0f3ef81ca7c473d83c1602380dae6c14f94daffb6bb799f8d90fab121238a46e89a233202cd6f622b0da2f728c0c0
 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.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 1073 BLAKE2B 3dbaf6c7694f1a52ebfc7b67b34fdec0256a4f4a6b6fd711672756a5d789e78888b96e15f789bbf11af10bd2b4d5e7574248701597efcfe45d8b0f9d10a45c71 SHA512 02f0ee65b774f7ac70953f9b9ed41354de6a95748ee6ecc8b19a7067a4adf07438201f0e204a0d011e18134ef1cdb1b6147d185cfd29789179479ce0765ad79e
 EBUILD camlp5-8.00.ebuild 1073 BLAKE2B 3dbaf6c7694f1a52ebfc7b67b34fdec0256a4f4a6b6fd711672756a5d789e78888b96e15f789bbf11af10bd2b4d5e7574248701597efcfe45d8b0f9d10a45c71 SHA512 02f0ee65b774f7ac70953f9b9ed41354de6a95748ee6ecc8b19a7067a4adf07438201f0e204a0d011e18134ef1cdb1b6147d185cfd29789179479ce0765ad79e
 MISC metadata.xml 415 BLAKE2B cba4109b6961dba8c767674cc6633812ed76c99e8091ae2b0ca0c285ead9e730d575cc96c448fce7873375a0aa8d16acbb2f80f85d8e26a174ca8945976580b0 SHA512 4e2255d7af948851ca86e708c01be5d61e46235078b6e5606687ca3975ae7d7618d8e531c5b9ca6f1eac893f065258d7191e544f5bb6331fb6e3a9c5ac274f93
diff --git a/dev-ml/camlp5/camlp5-8.00.01.ebuild b/dev-ml/camlp5/camlp5-8.00.01.ebuild
new file mode 100644
index 000000000000..fe4e5ebe5766
--- /dev/null
+++ b/dev-ml/camlp5/camlp5-8.00.01.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/dose3/Manifest b/dev-ml/dose3/Manifest
index 1576785b7f2a..912836e8e1e0 100644
--- a/dev-ml/dose3/Manifest
+++ b/dev-ml/dose3/Manifest
@@ -1,4 +1,7 @@
 DIST dose3_5.0.1-16.debian.tar.xz 39448 BLAKE2B a5ae8c74ee1a5a89bf3594cbaf0b37703fcf03a03e336c6b91626fcb6767518c517bf28ec4a24f6cbeb40e1544b34e95855507f39aacca110e8daa6e6e5d3994 SHA512 52d14a45bc0b0a66c4cf3acc05b479b1456c78fa8cb0e453a01dd2f0d849dfcf959bd9e8ff8d505272ad7ad542ff402013746816ead3ccd2dbd0bed572ee2930
 DIST dose3_5.0.1.orig.tar.gz 297433 BLAKE2B 74ae954604f26398f091b4f14d2a633132ae62102f52af13284af27e41cd7c47afb1b533b0821a8921ba33fa6658e94b3bb6bf5f104f48881a50e14517cd65e2 SHA512 e66526319446054041f138ee2633043d0832089f6a554cf566a28de899d10383acfb1aa6bf1a368811602939676510933a7d2404fd34dbeba15045b458f5af84
-EBUILD dose3-5.0.1_p16-r2.ebuild 2257 BLAKE2B 7fc8cf9ce79d9f692c0cfa2f3afbb8072ce1467c2c5eceae04e5c32160cbd8c9488bebe52d8df46b6650d52e4e2cfc53f0ecc0a16ebeb51e2f28f6db802a7f5f SHA512 d46c94ddbd9226422025536a090c54f6800825d01745099c138242c3177208e7993cdd96399519868d9d4378f6b3584e5dd5f378af36a9488fa839f625b62bea
+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 1290 BLAKE2B 0b1bd09cf903e03dfe054ed3109fa8376c9228bc533620f6ec668bf76867e5d1bb24e44050ba080abb97cd1a4cb713fd2a061f2367e6afbe81c7c428c3d51034 SHA512 97abd4158824da5464b4d2bec931676f45f2dba744886ef835a3a97839bebae2f001ec6a8fef8dd8cec43ee1c288aedc14d92895af807951c3fa248d82d78798
 MISC metadata.xml 567 BLAKE2B edf392175ce748915b9584ba1bb3885338c52f2c85f0beaa7695ecc556319af95d3485ab8bf94d97975e4cea2b30ddd47e31fe5df8a97911ddca0e720903c760 SHA512 254fd968a79b76a7ee792091a1106d20e76d168f57afa415aace3d150c793613c73d3bbd9d8a150d99595445ade1966da0dc059cb61dfae084478a5aeddb7fc8
diff --git a/dev-ml/dose3/dose3-5.0.1_p16-r2.ebuild b/dev-ml/dose3/dose3-5.0.1_p16-r3.ebuild
index b869201b21ed..8a2d9bb0eca3 100644
--- a/dev-ml/dose3/dose3-5.0.1_p16-r2.ebuild
+++ b/dev-ml/dose3/dose3-5.0.1_p16-r3.ebuild
@@ -22,7 +22,7 @@ BDEPEND="
 "
 RDEPEND="
 	>=dev-lang/ocaml-3.12:=[ocamlopt=]
-	<=dev-lang/ocaml-4.09.0:=[ocamlopt=]
+	<dev-lang/ocaml-4.10.0:=[ocamlopt=]
 	dev-ml/cudf:=[ocamlopt=]
 	>=dev-ml/extlib-1.7.0:=[ocamlopt=]
 	>=dev-ml/ocamlgraph-1.8.6:=[ocamlopt=]
diff --git a/dev-ml/dose3/dose3-6.0.1_p2.ebuild b/dev-ml/dose3/dose3-6.0.1_p2.ebuild
new file mode 100644
index 000000000000..717fe2ff2ee1
--- /dev/null
+++ b/dev-ml/dose3/dose3-6.0.1_p2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Library to perform analysis on package repositories"
+HOMEPAGE="http://www.mancoosi.org/software/ https://gforge.inria.fr/projects/dose"
+SRC_URI="http://deb.debian.org/debian/pool/main/d/dose3/${PN}_$(ver_cut 1-3).orig.tar.gz"
+SRC_URI+=" http://deb.debian.org/debian/pool/main/d/dose3/${PN}_${PV/_p/-}.debian.tar.xz"
+S="${WORKDIR}/${PN}-$(ver_cut 1-3)"
+
+LICENSE="LGPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64"
+IUSE="+ocamlopt test"
+
+BDEPEND="
+	dev-ml/findlib
+	dev-ml/ocamlbuild
+"
+RDEPEND="
+	>=dev-lang/ocaml-4.03:=[ocamlopt=]
+	dev-ml/ocaml-base64:=[ocamlopt=]
+	>=dev-ml/cudf-0.7:=[ocamlopt=]
+	>=dev-ml/extlib-1.7.8:=[ocamlopt=]
+	>=dev-ml/ocamlgraph-2.0.0:=[ocamlopt=]
+	>=dev-ml/re-1.2.2:=[ocamlopt=]
+	dev-ml/parmap:=[ocamlopt=]
+	>=dev-ml/camlzip-1.08:=[ocamlopt=]
+	>=dev-ml/camlbz2-0.7.0:=
+	dev-ml/ocaml-expat:=[ocamlopt=]
+	dev-ml/xml-light:=[ocamlopt=]
+	app-arch/rpm
+"
+DEPEND="${RDEPEND}
+	test? ( dev-python/pyyaml[libyaml] )
+"
+
+# missing test data
+RESTRICT="test"
+
+QA_FLAGS_IGNORED='.*'
+
+src_prepare() {
+	default
+
+	elog "Applying Debian patchset..."
+	for file in "${WORKDIR}"/debian/patches/*.patch ; do
+		eapply "${file}"
+	done
+}
diff --git a/dev-ml/duration/Manifest b/dev-ml/duration/Manifest
index 627256811f7f..092554fcd914 100644
--- a/dev-ml/duration/Manifest
+++ b/dev-ml/duration/Manifest
@@ -1,3 +1,3 @@
 DIST duration-0.1.3.tar.gz 4295 BLAKE2B 1bcf0d457e76c6dfe05308dbbdcd02e534abecb621d30d4d031e2218da48515e1086c0c71c3c91ea84350143dc3255ae368d66ba43ec9fb763932efbb3654128 SHA512 eeb219821e65d5cdee0b1038afd856b58f21633498e8cae37a7195d2a045cd0b11c4c817a6518d20c5a6c5f8c7ebfa9b84dae16bb847a658a8dc1aae5a9be5ab
-EBUILD duration-0.1.3.ebuild 472 BLAKE2B dbe30fc03b0c014265d2f725d5f9d00b7aca5b7638d4f1d06b6275e9f1784b9f41f7bddf99253470b9a7b996d2c99868bebcb9ea43a99abd83bdb80b2c7ee1e4 SHA512 69e8f9d7ed6517e68a9fc1ce42b9679f5a259e65ebbec3ba918a919482628353dcd2a676b62f60ce4cd840b0bac5f9543732f19f27a0005e08f8284915bd8e42
+EBUILD duration-0.1.3.ebuild 471 BLAKE2B 15193e111d0a01e05c67b7a25ec69962aa1a7481b18aa0fdb758b4fa5858f7616e93815ba2e1508f04d783afd42924def36e487f0ddba62269acf8887120b580 SHA512 e051682009d773f2311ec9d6c1f232ab9480d3bb89855dd8146c3bd25058fdd1e36b20e07e74a5d785aae08c85fe3b43437c07e73c379677b74c6c6dc77bfde3
 MISC metadata.xml 247 BLAKE2B ddda0ea2f5068bed824871d1b734188ba122a58d22ab67fb491beb7d48349ded25fb96d6c95f0efa4c756d44a7e30d8a78b0a2b8020fb35b2715c4ea3b41c02a SHA512 4fda15644be2ad3faf61b9a05fad67cdb8ac023dd63de9e0fb034396a38c512d51721d299e07881521fac159d18ba7561fa614980b7ccb60b741fec24e1ef609
diff --git a/dev-ml/duration/duration-0.1.3.ebuild b/dev-ml/duration/duration-0.1.3.ebuild
index 29908b04a4fd..b2f39f92ac99 100644
--- a/dev-ml/duration/duration-0.1.3.ebuild
+++ b/dev-ml/duration/duration-0.1.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/hannesm/duration/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 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/fmt/Manifest b/dev-ml/fmt/Manifest
index fc17981930bd..6eb30b1a354c 100644
--- a/dev-ml/fmt/Manifest
+++ b/dev-ml/fmt/Manifest
@@ -1,3 +1,3 @@
 DIST fmt-0.8.9.tbz 21469 BLAKE2B 4cddf626118c9bdea435f9db4e6a3c0b92b49b2c07d1b0f708ae7b82963453be666ad49df196d98b466236509d3fa5a519e191da6b2385a308d1019f1583f0b5 SHA512 19b97caf5d2dbe86cd75bec478707b8f4e4b899b2a11ce04790dc5acb5c9ed6ea98047de52ee50c6480231a16307af2541eabaa94d18d7d008f7a67496f5f626
-EBUILD fmt-0.8.9-r1.ebuild 835 BLAKE2B 8ae3edafa085066f3855d1573f1d306558e01047e291a5c4ceed3c2bec218abfe11ce40460805d5611b4ccb308f8b4860b937de8de1d3a5cd499902441d7acd2 SHA512 fd3723b0a69c16764fdf0b9aa7fa6d79f8c3ac5da8f3049dabce5c1d4cb601727fc6ca96eccad27bf38a5dd9a0cda2527f2be68bfe51c2ecd29367c7c45a15de
+EBUILD fmt-0.8.9-r1.ebuild 834 BLAKE2B 190d96c89021110250dcec8a7fcf6afcffc25fff399bc8b44a312efcda447d2444bd9b4194e245843f189746dfd94970dbda218a6727248ef6d2ff94e657d728 SHA512 7908d43f5cb907314c301a0524750fc2e2a97c7a027e118ce235d959863f2ca0bc1f154365518bfecedbac9e458ffbea5cf8989199eaee666c4f6545726a574a
 MISC metadata.xml 244 BLAKE2B 7bad0b6c3b4ef28ccc919f1cbd297434f930aee5575e6135e78409a31f2e8e6406201c3dd81992cf89f808a0f3af6aac46165395ec7cda6b4af91274696a9eb7 SHA512 319d9b69276e64a092b5c35b50894347712a625e6af1773fe2b2e988428f7cfae19fcbeadea0152c3c02969f4dd5b5e2e369a6a2f29579d037d819b314461705
diff --git a/dev-ml/fmt/fmt-0.8.9-r1.ebuild b/dev-ml/fmt/fmt-0.8.9-r1.ebuild
index 3fa332cf935d..319a624012f3 100644
--- a/dev-ml/fmt/fmt-0.8.9-r1.ebuild
+++ b/dev-ml/fmt/fmt-0.8.9-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://erratique.ch/software/fmt/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/graphics/Manifest b/dev-ml/graphics/Manifest
index cb4edb4efbe2..91460cd0bc31 100644
--- a/dev-ml/graphics/Manifest
+++ b/dev-ml/graphics/Manifest
@@ -1,3 +1,3 @@
 DIST graphics-5.1.1.tbz 58713 BLAKE2B 75f81b938be8a44f904418851ed747742ad63556ef94c533872f4b04705a0209a06f969add207bf332e1ab3d6a98a819c0ed2b0f50bdf1275f5d57ff6caa2fed SHA512 15adbe03211e7392a2fded2d9fd5e0cc2c532b4a1de3b6c90945e9e99cc4f419583a204f357f8c9fd92d1ffce48e13e1f146da1f009eb4645150b7394f799e0a
-EBUILD graphics-5.1.1.ebuild 515 BLAKE2B 50a944142ccf0b6c0e729d1070e5c92d60f815776ec573591bc943ae92e6aa6b44eddf623649b93c60791f8a78a9829559a48bc0c6156b1e247d9b6b437aec81 SHA512 af3f2a8d83e548cd778f2bcdf0c7a40633a528f622ca2f971b426a634e9537ec30b40e9a67f0aa89fde307b38db9cb936c11aa7631b5e68f75a018a3ac7d1cc2
+EBUILD graphics-5.1.1-r1.ebuild 517 BLAKE2B b524e4a516d11651721d075acb1aee40581737b818ddcb98aec15334fafd0215dfb62d21e6275befb196477e4a641999e3fb6dde544f87822f8d5fe319fc7a55 SHA512 ec78284c78bdb135056c98ca415700b5de7e5f8c937c7d53855743d6d210b90e5dbf1db7e7ddb20664062f16c4971d36e0490dcc72b64852ea35f4eb9560fafa
 MISC metadata.xml 232 BLAKE2B 502ab2778b7b5d1ac9441b71cab7ff412fbb5663747f4abfc59fb45559185dda510683f1e8ffea5db8f6b31874ca209fde5c524e3526cb125931ee1feb7ee68d SHA512 7ac25a89f6b48a8e858fd1e9f4d3e938a82a4591f21249d81e8d9f1d028c5f427a3669933a932c0e8a1dc7455106696e3bfba3573976edcd8c7ec89368dacde2
diff --git a/dev-ml/graphics/graphics-5.1.1.ebuild b/dev-ml/graphics/graphics-5.1.1-r1.ebuild
index a1403dc8fcf4..7a3977c3a2ce 100644
--- a/dev-ml/graphics/graphics-5.1.1.ebuild
+++ b/dev-ml/graphics/graphics-5.1.1-r1.ebuild
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 
 RDEPEND="dev-ml/dune-configurator:=[ocamlopt?]
-	>=dev-lang/ocaml-4.09
+	>=dev-lang/ocaml-4.09:=
 	x11-libs/libX11:="
 DEPEND="${RDEPEND}"
 BDEPEND=""
diff --git a/dev-ml/labltk/Manifest b/dev-ml/labltk/Manifest
index 9b7b0c1f1552..3e717c4b60fc 100644
--- a/dev-ml/labltk/Manifest
+++ b/dev-ml/labltk/Manifest
@@ -1,6 +1,8 @@
 AUX findlib.patch 645 BLAKE2B 63c8dc3a2b332129bf90af98b908e1ade5a15381a903ec9591973b6a2c3843fe254fb0001ce627ec831df5d4c6885d01de679f3d7b74e6538692de08a1fcf608 SHA512 4f5172bc7d603375bda331d40708ad14e7e9e7374f97cbd11da56473ca704421f7c801559dbcc753fe8004a809b80142158974a1c5c469eb2894580121cc9442
+DIST labltk-8.06.10.tar.gz 371871 BLAKE2B da67b13aa0a0c179c2fcefe6b03f68225b6e886a1233de77b9749be32b8efc845cac60244f9a8494241c8c77c7d6991786280c274becb70f5527ad891c3aac69 SHA512 ef797d21adac48ca5ed35d95ad05fee26f9b6c99b0510909f6087abb9580b8efd219ca65b1efddb170b5409567d83eaaac0473898f5f4db3e15ae4f39df364c8
 DIST labltk-8.06.7.tar.gz 370870 BLAKE2B 2d836c824d9adbd4f03d0e7e81faa51669837eecb4f94f6c89c657966774fe7d6ed928459be3ccca7fd3e7cf67a54ee63f7d2d08dcc8b7e853f5ad64769b33a2 SHA512 3c7352d14bc337adfb1939e72bd2658bb5e60b463f10f3748779084d1b7a6e6225028c775b548e355d69984a8944b91580fa978ff904b20b8b762ba9046f5e7d
 DIST labltk-8.06.9.tar.gz 371504 BLAKE2B 587ff01da120501f85f6d9921e46275858f1e1ce730eef205f9e7d7c64f6d3c0ea701cf832fdb8eb0746e1f0cff1151bccb077641740fb18811473b1553e2940 SHA512 fd6defa302d919f229394c486dcefab110b144534525a87082a27d2cab29c0af4ece3da821098fea25416850ad857f7af979d48790330d62dfb8d8db8f2bf6ca
+EBUILD labltk-8.06.10.ebuild 980 BLAKE2B 030b066865f536672e2f097909a622175edb0e0fe622734628cce7cd556ee602041842e99beb79009089e6a59edb450e5542f4ca873ccc732c5bcb10187aab36 SHA512 8c25f38845bc032fba61c9f7694eaf8aa82ca1b80401aad0650fc350dea967dc60bfc53cd625e9de9c6b9f4b551a9c17d1d5adab033b0bd413576e8ece9c6d22
 EBUILD labltk-8.06.7.ebuild 992 BLAKE2B 67153839b68d13cfdbe8eab47a10c65d03beefbcc08b27edeb9d75c144ef563787978037e6a7a52f6c50707d0ecc52e77c29fe3de509bd19d8c670e4cc82344a SHA512 181baa5df2eada2fb0768691bdf37a2b18e91633e99b529205477310d8eed23a9fd35250aa19ae2e849a09b3ba660483911cc3a3aa60f862f3105ab7e0a1c417
 EBUILD labltk-8.06.9.ebuild 980 BLAKE2B 030b066865f536672e2f097909a622175edb0e0fe622734628cce7cd556ee602041842e99beb79009089e6a59edb450e5542f4ca873ccc732c5bcb10187aab36 SHA512 8c25f38845bc032fba61c9f7694eaf8aa82ca1b80401aad0650fc350dea967dc60bfc53cd625e9de9c6b9f4b551a9c17d1d5adab033b0bd413576e8ece9c6d22
 MISC metadata.xml 232 BLAKE2B 502ab2778b7b5d1ac9441b71cab7ff412fbb5663747f4abfc59fb45559185dda510683f1e8ffea5db8f6b31874ca209fde5c524e3526cb125931ee1feb7ee68d SHA512 7ac25a89f6b48a8e858fd1e9f4d3e938a82a4591f21249d81e8d9f1d028c5f427a3669933a932c0e8a1dc7455106696e3bfba3573976edcd8c7ec89368dacde2
diff --git a/dev-ml/labltk/labltk-8.06.10.ebuild b/dev-ml/labltk/labltk-8.06.10.ebuild
new file mode 100644
index 000000000000..10d78bc548ad
--- /dev/null
+++ b/dev-ml/labltk/labltk-8.06.10.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit findlib
+
+DESCRIPTION="OCaml interface to the Tcl/Tk GUI framework"
+HOMEPAGE="https://garrigue.github.io/labltk/"
+SRC_URI="https://github.com/garrigue/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="QPL-1.0 LGPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+ocamlopt X"
+
+RDEPEND="dev-lang/tk:=
+	>=dev-lang/ocaml-4.11:=[ocamlopt?,X(+)?]"
+DEPEND="${RDEPEND}
+	dev-ml/findlib
+"
+
+PATCHES=(
+	"${FILESDIR}/findlib.patch"
+)
+
+src_configure() {
+	./configure --use-findlib --verbose $(usex X "--tk-x11" "--tk-no-x11") || die "configure failed!"
+}
+
+src_compile() {
+	emake -j1
+	use ocamlopt && emake -j1 opt
+}
+
+src_install() {
+	findlib_src_preinst
+	dodir /usr/bin
+	emake \
+		INSTALLDIR="${D}/$(ocamlc -where)/labltk" \
+		INSTALLBINDIR="${ED}/usr/bin/" \
+		install
+	dodoc Changes README.mlTk
+}
diff --git a/dev-ml/logs/Manifest b/dev-ml/logs/Manifest
index 3371ef046a0d..29b7e9509180 100644
--- a/dev-ml/logs/Manifest
+++ b/dev-ml/logs/Manifest
@@ -1,3 +1,3 @@
 DIST logs-0.7.0.tbz 18458 BLAKE2B 091d1778166af0b67e17e932a775a73e31e5d167b94b1b378063a7112c21bf1ac935c7e51fe29bcc0121cd5e60ea46ed3c7381f4db5df400b463feedfbe89663 SHA512 657f66eeaf5788947a3ff4b2a179f7e192ad4ce086fc8968286066d4b83af476523b3befce50ee58abf2d9b8c8dc65573ba8ed62f9c5e7933db29a7fb769646a
-EBUILD logs-0.7.0.ebuild 1382 BLAKE2B 684065355180dbb38cc0be5e0619d20b7b8e4f34980eca0b70e049dd9bf03605429be97253236dbd7489ba8eb1278fc246f5f8863e0081943267da9896ec0b8d SHA512 247cb2cb23b5d77aaa027c92848036c13048900b9d7f2f07907347f3d437167f00320836ab70a44250c69d5dcdd8c9e4924f177e6050d06c214a993ef24f87bb
+EBUILD logs-0.7.0.ebuild 1381 BLAKE2B fd03c86410c3a372dd81e8eb98fd247ef69d48b20721a6f1444faf982b4f587372ff3d172e90394cd91171ed593f753b64a0c5d1970299a6324abf44429beb81 SHA512 9d6a5ef5aa12eddfa45e86203f4c82f79dd69e2929e506344583e775ddbb07bf88ded701ce16b72b0482024395762e77e53fca18afa4d9873b774ec120e1c212
 MISC metadata.xml 586 BLAKE2B bd04cdf2c8e2cbf3ccb49ec1394ab882e0c104c6fbec63fe72d8497f79c91814e6df34f5e2065a4d91c6fcac2d2500a6cf4f35dd5f71dcdd0fe1c30adac042eb SHA512 ac20ca8fcaf6372f88f50ec77f6632a6d04597a8b6257e5a61ff4d66b34d74259b0ab671c840b79613213f6807c131cf6c46cf3fdb3686324548a9f23270f054
diff --git a/dev-ml/logs/logs-0.7.0.ebuild b/dev-ml/logs/logs-0.7.0.ebuild
index a6b13788d2eb..86e91a5d29da 100644
--- a/dev-ml/logs/logs-0.7.0.ebuild
+++ b/dev-ml/logs/logs-0.7.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://erratique.ch/software/logs/releases/${P}.tbz"
 
 LICENSE="ISC"
 SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+fmt cli +lwt test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ml/mccs/Manifest b/dev-ml/mccs/Manifest
index 23f8147fe0ec..47298aaaf574 100644
--- a/dev-ml/mccs/Manifest
+++ b/dev-ml/mccs/Manifest
@@ -1,3 +1,5 @@
 DIST mccs-1.1.11.tar.gz 1008163 BLAKE2B 49f173b99baa1acfd96f8ef873b664ba61dc9a770ad62873f956f017e3940737be74f5d5392d4043c9ade3e74e09d9c6b11c47af7755558b25f1f62e6ab80d84 SHA512 095393ca63fb591a833a7a37117a80a2e817b437bbcd655301b376f749a3756c8aff26b2fcdebfc5f68b9c30d8971a7ba057f610117516e3e85a3fe7bd3906d0
+DIST mccs-1.1.13.tar.gz 1024449 BLAKE2B c653c7d0b5fb6f9ea8facd8bfab517d80c7ec8cfd1ca512d81b81760e1d21c6978696af1cac596f0b11014464851c0c32e3bb5c6f70d88ad1bb7ef0034b8ff7d SHA512 2c2bc3c0e82b53a0e20c2542704eba8e3a2a1884f31b1a0a0079dd22fc02be8a8a62e582bdbf501339be0e9d6824872d737087e0fe150073b29b374505de073d
 EBUILD mccs-1.1.11.ebuild 632 BLAKE2B bbfd52836642ef6d1482ea4a5088a6f6ccfb6bb62c08879ee0a39001b297abca0b0180251eb4bc1c3505303e573214aea5d3b8237873ee249e45383e9f9a481a SHA512 3ca6ae2551903f4e49e52673a973dc0889d47967126ab7c6cdbd9df95ba9e1feff44780cdcabd0203c38256b92c1bce5a43dba3cd09286ee1bb158616f30cd40
+EBUILD mccs-1.1.13.ebuild 638 BLAKE2B b073c5eb40f011eebedc085c3774928ddc2931a50258c790a1e933e804e00063d895cb17e9cd24216fc979bd76745f6d6e13c7b2edd7cc2e691732c84550ab19 SHA512 0d65b1e8b1d683d483b023c529a8b16491a6315a432475f495534c04d8e095e0539714c6243af13bc22547355f5724059ada763fbd3f5af3ae023dd47998666e
 MISC metadata.xml 325 BLAKE2B 7385ff0e6224f5197139764e79e60e849806e74d9f15f17934358bb3cc9a7ff41213e53167351b4a1308e84a436f8e14e9416da49df5615f07d33604e09bcb45 SHA512 ae6f92a85cbac16fb2c53676e7b3d326bf637a47129f3f4b413ad3a4c9df4a807f10a8513f2876a9310efc8a2d8ad3215a448ae9a9ad9128e356403b394a58f4
diff --git a/dev-ml/mccs/mccs-1.1.13.ebuild b/dev-ml/mccs/mccs-1.1.13.ebuild
new file mode 100644
index 000000000000..13b947434b03
--- /dev/null
+++ b/dev-ml/mccs/mccs-1.1.13.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
+
+MY_PV=$(ver_rs 2 '+')
+
+DESCRIPTION="Multi Criteria CUDF Solver"
+HOMEPAGE="http://www.i3s.unice.fr/~cpjm/misc/ https://github.com/AltGr/ocaml-mccs/issues"
+SRC_URI="https://github.com/AltGr/ocaml-mccs/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/ocaml-${PN}-$(ver_rs 2 '-')
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-ml/cudf:=
+	sci-mathematics/glpk:=
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-ml/extlib:=
+	)
+"
diff --git a/dev-ml/merlin-extend/Manifest b/dev-ml/merlin-extend/Manifest
index 85bf7824791b..8ad287c5a8d1 100644
--- a/dev-ml/merlin-extend/Manifest
+++ b/dev-ml/merlin-extend/Manifest
@@ -1,3 +1,3 @@
 DIST merlin-extend-0.3.tar.gz 15422 BLAKE2B cfd658c9afa6f4500899c342c86c75399cbbef89fe5817c2a957ec93ba02c360fff66e01b81890d19c87a89380ba1cd352a2ffdc10a2dc53c7d535e8af5f720a SHA512 1e6436299b38c7fa57ae5b681a1409795545bc6f5956d6b1c37cbfdbdabfd90da476c030067fe2e016c823d60d1e5498c4536c869bf58425e1a6ff78295efba4
-EBUILD merlin-extend-0.3.ebuild 488 BLAKE2B e366b3905c7dbe07279b7dd12cabe56e579eee53763f5a6069e9992ad6f49536c2b40e17fd602a40b58f0f05df6316d20802349b30d626dea5a2d3b93a53307d SHA512 a6850604dc7e12b447f3efc8cca8926aa745be0e47bf6542d23a3a6b5bbc657de3f5d7869791737343205a9261022bb24a4097fefcae7ff4c1f441b9d5f79e18
+EBUILD merlin-extend-0.3-r1.ebuild 486 BLAKE2B f227cdf4269f27a1b06b23535039c85b4bbc8482e2ae752a4dc45c2abf643fa5d025d4d852c13ac3ea0b264494047fbe86411b770659f3f2e258d8ba149e01d5 SHA512 ed84872092614bb99c9a623d098d40cdbfd51d69e7ae1432d20f6b8efd81bec7cdc9b860fb274840fa73029b87ac381d0ea0fab73da863757094b32c41647024
 MISC metadata.xml 318 BLAKE2B b58e16f26419d26ae958729d1b854a1ea29f3e71c9c9b6bfcc7851c1b0248bc26bc0e13028cab62744013280a88254d42e03e7894994033de077b781eaa76ecf SHA512 c50c068b90bc67f46cc5016182ecd06929dd31c2bff0a63065196a0adf382dcbe33f2e4a19a1e5744ce4d805a9d342ce1c9ceda4e1079f061af3497df2302365
diff --git a/dev-ml/merlin-extend/merlin-extend-0.3.ebuild b/dev-ml/merlin-extend/merlin-extend-0.3-r1.ebuild
index e15e2f21b2f2..049701ee3106 100644
--- a/dev-ml/merlin-extend/merlin-extend-0.3.ebuild
+++ b/dev-ml/merlin-extend/merlin-extend-0.3-r1.ebuild
@@ -13,7 +13,7 @@ LICENSE="MIT"
 SLOT="0/${PV}"
 KEYWORDS="~amd64"
 
-DEPEND="dev-lang/ocaml:0/4.05.0"
+DEPEND="dev-lang/ocaml:0/4.05"
 RDEPEND="${DEPEND}"
 DEPEND="${DEPEND}
 	dev-ml/cppo"
diff --git a/dev-ml/mirage-clock/Manifest b/dev-ml/mirage-clock/Manifest
index c4bb5e1768bc..9bbbe27778ad 100644
--- a/dev-ml/mirage-clock/Manifest
+++ b/dev-ml/mirage-clock/Manifest
@@ -1,3 +1,3 @@
 DIST mirage-clock-3.1.0.tar.gz 8441 BLAKE2B a8cc3b1ab3f929c4c28ce5f0dfe30d316b1d9445f4fd053743d5e224e8b5630c9ae2d12804ca690488a238c6aa8cd8b197ca8ca7d9e49b902964570c78ed946b SHA512 e4518a6c47e18c7fd3fd910de2f68cacb18735d59bcfffc79b676c8526466f2134979805222c39496588ef6f16a8f6b1fb79fec478459a3ec474fb60118c5551
-EBUILD mirage-clock-3.1.0.ebuild 445 BLAKE2B 60c526b3a89e10920f76832f31b140bf1f63f56aceaa86d9850e34a2b2e7c5daa98db321289ab2c55a8f44ced67c5dd53e97e9066640015229c408e74cd68047 SHA512 94b199a26f748ad13ca2b9909b3cd1e6b0830e2072142e9bb7ea13b0c4e03c193d80b3ab4030c16cbb4f57995416d380112a97882d614ef74c17ab479d6ef3d0
+EBUILD mirage-clock-3.1.0.ebuild 444 BLAKE2B 64b0dcd3cf2d375943f912cc0f39d78b3edc39783f929ae83ce8d5f89bb3eabdc5e7348cb272d1422d7493b94d756189fc6b55eb4e1c231053e1cd32949544db SHA512 66473edb5441b2593e6235a6ed0e26694d12c591e3cb849210b56a5cc5a6351c79b5bf5d33398af1854e5e605f59dcd7f645da963ea505ea0a49fafde0a59ed3
 MISC metadata.xml 316 BLAKE2B 5f073f5aacc52114af298e651850326c5f32bd1378b45949a7d5c415ecc7a0ead09c1165031de08c79b6f8455cd5f93d6beac975ddaa0abad74583bdc0badbfd SHA512 4170911266033cd76d7d21b2e599afebeb2947784a6c7377107657dded1af24eb3d63dd6102b75a3823311ce059f19e00e67f7778f3ac3ec552d93f1592a3248
diff --git a/dev-ml/mirage-clock/mirage-clock-3.1.0.ebuild b/dev-ml/mirage-clock/mirage-clock-3.1.0.ebuild
index 6c89519d1dd3..ff638b802a29 100644
--- a/dev-ml/mirage-clock/mirage-clock-3.1.0.ebuild
+++ b/dev-ml/mirage-clock/mirage-clock-3.1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mirage/mirage-clock/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"
 
 BDEPEND="dev-ml/dune-configurator"
diff --git a/dev-ml/mtime/Manifest b/dev-ml/mtime/Manifest
index 5f4bad190be6..279492b8edaa 100644
--- a/dev-ml/mtime/Manifest
+++ b/dev-ml/mtime/Manifest
@@ -1,3 +1,3 @@
 DIST mtime-1.1.0.tbz 15467 BLAKE2B 975fdb01c6a4806035a5fbc256d192d6c2f45bdfb750045293b10a732c5613108d9bce897d3c1be660af60d6e9bafbf299dedbc0d872d1c09f65f47b11c9a6b6 SHA512 8ed5dae589dd27fc6e748218a9d9fb9d7d954d231fc2100d61c1b336e0ed38a215bc608cdea9965547729177c78c868c1de6a5ceac6735686a3de1c4a791746c
-EBUILD mtime-1.1.0.ebuild 718 BLAKE2B c87c302f121d1f2f3bc65b9c73d8cd48ba1f046a2e4ef14404a68dfd579d6740797c5a12cbc06a713b26616bdd8c4f5490af9d36b4a2581c830a8f70be8aa6f9 SHA512 cd90f51810d4c9cf11ff66d3ffd460307f7215c346cb40fdaaece47e4b5c8bd81ce3859905b2f6033b40281e202ef7f5b946e1eae354885dd1ef3c13718bafc2
+EBUILD mtime-1.1.0.ebuild 717 BLAKE2B d49774f2eb6d262680e3f0bd929ad61a91a16913864361d374188004c2ebd5c52ebefaae73d1b5a38c588a258fbd317f612f83392a32bce10b618ccd5c00d40b SHA512 03b1bcd56fa44c53c2e10967fa29a5211057dded1de5554db54cbed83a0dd8d3c9202d8dcddc157f1cdfaf494c9043e628e3777023ffd866b2151948ab12fd10
 MISC metadata.xml 311 BLAKE2B ec6d4e0813be98a7a30d4e8ca05ac9c74953bb0fa763c7d004ac76f23dfefb8d157784dab7f0d3674a81e840659d16ba4f28ffe3ab6913aa6affefe80b8786eb SHA512 ac2409cb1fcd4b9ba1760c38024a96ac3dccb7337b78e7eff636c23cf7f2aeea22fdec377eb80afedfda0738a2396d511afb1d4f0913fb6e95ab8473a850b9df
diff --git a/dev-ml/mtime/mtime-1.1.0.ebuild b/dev-ml/mtime/mtime-1.1.0.ebuild
index fe9d3ec750b8..4ca1ab377ca3 100644
--- a/dev-ml/mtime/mtime-1.1.0.ebuild
+++ b/dev-ml/mtime/mtime-1.1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://erratique.ch/software/mtime/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/num/Manifest b/dev-ml/num/Manifest
index 0ac96aeaf800..2a950ed9680b 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 733 BLAKE2B c615ba53e5931d7523cccfe98b0358e518143429cd360da39e497f801bf58635b7a4ef15b63850f1cc36bb64ec9695ab5a9451449b832e769379f9ff16711ca9 SHA512 9aacfd615e5261869853719d3f2b0292bedb849ccc21db44f5796d962501588b3753ef1ba3991452b7ce1c3a7e50781c885a691f917dd5804e79ce47731fab84
+EBUILD num-1.4-r1.ebuild 854 BLAKE2B b579243489891f48f792ea9bd75444e921bbd827eb7b888efa0954d1a45d433fec34c28ad20e7d96e1f98ae4403936b9a371a0d5da7c6d3e3ff48322d33bec8a SHA512 c16cf43aea2bc87f0785d471a5f22efddfe86f12481b09ed24d9f9701850fc9b36611b040cd6b528dd447a27ba3c4c9c68c446042f0a3a78783e3a963fe34fcd
 MISC metadata.xml 337 BLAKE2B a5226f08e396ac186d438cd68a253580cc27d9bb0748e8afc49b7f2eafc3eda15d6add9c16bac268b75fd7cbb0ab160a1be8fe56e0ed3d902184157d581ab1c1 SHA512 5b913612f28ef5235ce57b6ec586f1b20d0ccaadfc760fe7cf8e186aeb4be261f8cd17f045de61edfda6c31f347ed965653c917b23523e3fd8d0071a3e845b4b
diff --git a/dev-ml/num/num-1.4-r1.ebuild b/dev-ml/num/num-1.4-r1.ebuild
index dca4527a23d9..cf5b56b7a6d8 100644
--- a/dev-ml/num/num-1.4-r1.ebuild
+++ b/dev-ml/num/num-1.4-r1.ebuild
@@ -15,8 +15,10 @@ SLOT="0"
 KEYWORDS="amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="+ocamlopt"
 
+RDEPEND="dev-lang/ocaml:=[ocamlopt?]"
+
 src_compile() {
-	emake CFLAGS="${CFLAGS}"
+	emake CFLAGS="${CFLAGS}" NATDYNLINK="$(usex ocamlopt true false)"
 }
 
 src_test() {
@@ -26,5 +28,5 @@ src_test() {
 
 src_install() {
 	findlib_src_preinst
-	OCAMLPATH="${OCAMLFIND_DESTDIR}" emake install DESTDIR="${D}"
+	OCAMLPATH="${OCAMLFIND_DESTDIR}" emake install DESTDIR="${D}" NATDYNLINK="$(usex ocamlopt true false)"
 }
diff --git a/dev-ml/ocaml-fileutils/Manifest b/dev-ml/ocaml-fileutils/Manifest
index bb19942263b7..eedbdacfd2c9 100644
--- a/dev-ml/ocaml-fileutils/Manifest
+++ b/dev-ml/ocaml-fileutils/Manifest
@@ -1,3 +1,5 @@
 DIST ocaml-fileutils-0.6.2.tar.bz2 43060 BLAKE2B 20828875a25b1a9d2a41bf495cda00b0ac753efa20111b32a9d2ca439a56e9f07bf0953d16ee9148cf065e204fa1d8d624eaa89f6f4ae7e1613fdaa7cb44fc24 SHA512 104c7389832f22ec189ce6f1596144b28dcaeea7d23d5b19d369c44e54326e97fcb7b4f4c4a8d2965523e63b35b594a1351b7e630dde590871efe512fe38853c
+DIST ocaml-fileutils-0.6.3.tar.bz2 43157 BLAKE2B a9adf17d028abd664dbdec3fefa301a6b502941a6da4ef9c3ef02b876f187d224e404f6a9ffb5460035ba475154c60109a5218cb8b9bb36153ca791f8d218e7d SHA512 2c5e75b894e9f5e3b003d61977a87f5c6964a89d844949eedc55f97c5875cc52052182420bbb4e73925d306479c66400df74e4adfccc5b2102347d13e99505cf
 EBUILD ocaml-fileutils-0.6.2.ebuild 751 BLAKE2B 90a512b800b5038777e141bb95452a413e24500e8e325abecaf347cd7ac39975b090d285371b27f0b1a888c4fa522a7ae437f98db053331a0a20781b16f71bfc SHA512 6358e0ab33ba4a5973b346a1cefe6f719fdbdd603674b33dbcec1c13652515b08b374754231ce6f3aa3ed31dc9711376771d6704fa4363a0b3d439dc2fea88a1
+EBUILD ocaml-fileutils-0.6.3.ebuild 751 BLAKE2B 90a512b800b5038777e141bb95452a413e24500e8e325abecaf347cd7ac39975b090d285371b27f0b1a888c4fa522a7ae437f98db053331a0a20781b16f71bfc SHA512 6358e0ab33ba4a5973b346a1cefe6f719fdbdd603674b33dbcec1c13652515b08b374754231ce6f3aa3ed31dc9711376771d6704fa4363a0b3d439dc2fea88a1
 MISC metadata.xml 829 BLAKE2B d5b5d0678a3bfe6d9aa4f99e2d79478d528d726d53f899cd2400a6ca45b20281bcaa606d1c9028cf84bdca1cb6c9bd0f5d28f5c8fe4db1bf1ed9ac9b044d6649 SHA512 84c9e1c83e6670ae473dc9d3e7227d82ae3d4bd57c9ed0b5ef80eacd8e1e8f074cae7babcd9ff331a4c5f1bfd14f561a094857db31cb7a85c6ec3329bff6e0d6
diff --git a/dev-ml/ocaml-fileutils/ocaml-fileutils-0.6.3.ebuild b/dev-ml/ocaml-fileutils/ocaml-fileutils-0.6.3.ebuild
new file mode 100644
index 000000000000..72c2b68e4139
--- /dev/null
+++ b/dev-ml/ocaml-fileutils/ocaml-fileutils-0.6.3.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DUNE_PKG_NAME="fileutils"
+
+inherit dune
+
+DESCRIPTION="Pure OCaml functions to manipulate real file (POSIX like) and filename"
+HOMEPAGE="https://github.com/gildor478/ocaml-fileutils"
+SRC_URI="https://github.com/gildor478/${PN}/releases/download/v${PV}/${DUNE_PKG_NAME}-v${PV}.tbz -> ${P}.tar.bz2"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+ocamlopt"
+
+DEPEND=">=dev-ml/ounit2-2.0.0
+	>=dev-ml/stdlib-shims-0.2.0"
+
+DOCS=( "README.md" "CHANGES.md" "LICENSE.txt" )
+
+S="${WORKDIR}/${DUNE_PKG_NAME}-v${PV}"
+
+src_prepare() {
+	default
+
+	# Port to dev-ml/ounit2
+	sed -i -e 's/oUnit/ounit2/' test/dune || die
+}
diff --git a/dev-ml/ocaml-gettext/Manifest b/dev-ml/ocaml-gettext/Manifest
index cb09d2658da9..4f893538150f 100644
--- a/dev-ml/ocaml-gettext/Manifest
+++ b/dev-ml/ocaml-gettext/Manifest
@@ -1,3 +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.4.2.ebuild 917 BLAKE2B 898206729a10a4e6a7109dd9975393a51ca1d5d528ce3de6566348c14f28a9771a731221063a0ac6466511257bde2d2766882c8ead2dc8fb9f13280c9d4075c5 SHA512 eb3e47e901bb47b21e5dca54106cb8d9d1816a5458ca5668fd7cabece316a0364a901c26759a8f45afaf9eb0bd923fdfd34e59fdd73f2ceade4fa53e4bc9ad12
 MISC metadata.xml 662 BLAKE2B 754d4c1d39fc2c171dfb45d123de58c96cfbeaaefe92d2f04c758db51897776c2e892120e60a2cea66f7a76aa3e2c621149b6f6d86ce76193ff82fbf9d9f09c1 SHA512 37b456155c65f227395d9220632f681d1b6727806fa97aeef1c5955679cccf2f10163e8176b7c083c2b2a5721a156e68faef4ca528d3d36b3ef528fa2ecf4025
diff --git a/dev-ml/ocaml-gettext/files/ocaml-unsafe-string.patch b/dev-ml/ocaml-gettext/files/ocaml-unsafe-string.patch
new file mode 100644
index 000000000000..8d0a12c80d0e
--- /dev/null
+++ b/dev-ml/ocaml-gettext/files/ocaml-unsafe-string.patch
@@ -0,0 +1,17 @@
+diff --git a/ConfMakefile.in b/ConfMakefile.in
+index 5a1e9ea..b562698 100644
+--- a/ConfMakefile.in
++++ b/ConfMakefile.in
+@@ -37,9 +37,9 @@ OCAMLLIB=@OCAMLLIB@
+ OCAMLFIND_COMMANDS = "ocamlc=@OCAMLC@ \
+ 	ocamlopt=@OCAMLOPT@ \
+ 	ocamldep=@OCAMLDEP@"
+-OCAMLC       = @OCAMLFIND@ ocamlc 
+-OCAMLOPT     = @OCAMLFIND@ ocamlopt
+-OCAMLDEP     = @OCAMLFIND@ ocamldep
++OCAMLC       = @OCAMLFIND@ ocamlc -unsafe-string 
++OCAMLOPT     = @OCAMLFIND@ ocamlopt -unsafe-string
++OCAMLDEP     = @OCAMLFIND@ ocamldep -unsafe-string
+ OCAMLBEST    = @OCAMLBEST@
+ OCAMLVERSION = @OCAMLVERSION@
+ OCAMLFIND    = @OCAMLFIND@
diff --git a/dev-ml/ocaml-gettext/ocaml-gettext-0.3.7-r3.ebuild b/dev-ml/ocaml-gettext/ocaml-gettext-0.3.7-r3.ebuild
new file mode 100644
index 000000000000..7af5b26e0ad4
--- /dev/null
+++ b/dev-ml/ocaml-gettext/ocaml-gettext-0.3.7-r3.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools findlib
+
+DESCRIPTION="Provides support for internationalization of OCaml program"
+HOMEPAGE="https://github.com/gildor478/ocaml-gettext"
+SRC_URI="https://github.com/gildor478/ocaml-gettext/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+PATCHES=( "${FILESDIR}"/ocaml-unsafe-string.patch )
+
+BDEPEND="
+	doc? (
+		app-text/docbook-xsl-stylesheets
+		dev-libs/libxslt
+	)
+"
+# OCaml 4.10 does not support -unsafe-string by default
+# bug #666149
+RDEPEND="
+	>=dev-lang/ocaml-3.12.1:=
+	<dev-lang/ocaml-4.10.0:=
+	>=dev-ml/ocaml-fileutils-0.4.0:=
+	>=dev-ml/camomile-0.8.3:=
+	sys-devel/gettext
+	dev-ml/camlp4:=
+	!dev-ml/ocaml-gettext-stub
+"
+DEPEND="
+	${RDEPEND}
+	test? ( dev-ml/ounit2 )
+"
+
+src_prepare() {
+	default
+
+	# Porting to dev-ml/ounit2
+	sed -i \
+		-e 's/OCAMLFIND_CHECK_MODULE(oUnit/OCAMLFIND_CHECK_MODULE(ounit2/' \
+		configure.in || die
+	sed -i \
+		-e 's/oUnit/ounit2/' \
+		test/Makefile || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--with-docbook-stylesheet="${EPREFIX}/usr/share/sgml/docbook/xsl-stylesheets/" \
+		$(use_enable doc) \
+		$(use_enable test)
+}
+
+src_compile() {
+	emake -j1
+}
+
+src_install() {
+	findlib_src_preinst
+	emake -j1 DESTDIR="${D}" \
+		BINDIR="${ED}/usr/bin" \
+		PODIR="${ED}/usr/share/locale/" \
+		DOCDIR="${ED}/usr/share/doc/${PF}" \
+		MANDIR="${ED}/usr/share/man" \
+		install
+	dodoc CHANGELOG README THANKS TODO
+}
diff --git a/dev-ml/opam-client/Manifest b/dev-ml/opam-client/Manifest
index b47c4bd65ead..82bd71a0c47f 100644
--- a/dev-ml/opam-client/Manifest
+++ b/dev-ml/opam-client/Manifest
@@ -1,3 +1,5 @@
+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-client-2.0.8-r1.ebuild 954 BLAKE2B b775a811ed592b8714826ef7a2acebb8b1efaa61244cae48a9bb4e47fb224d8ff94747da97a4530f6ce924b2200e50cb88fd29e855a778908e480ab53fdf11b8 SHA512 8c31ad7de345b2657720d11276f5fe6d864187c57f916003fd82c1794b173d8bed1bb1082c520b0cd33083d763fb1e604f93c57c4a1015d868889c1c07315656
 EBUILD opam-client-2.0.8.ebuild 798 BLAKE2B 4ee97d0154b58106d99c2a298dd52d254e13e18dd7104d8f4222cf2d7e3397036c22aa03b23b529a42712b6a5eb099eed7d9f4d9d444046f0c22cfbc82efd0d1 SHA512 e5f5a45fe8cd9b85e2369fee75760049ec06b2aaa712deae2952fada604efe462fa4c2135382f98249a19f716f51cf5116d828fd2b0d2783898df3f635590fb7
 MISC metadata.xml 412 BLAKE2B 3cd375059a5716aba5f14f8004970adb55bbec02cf911cc5739475a80789c86ab6d27f192e4757191be8e914e61db531b330695eba224e81273e351d507bd57b SHA512 6119e7d8b9cf779ac2070b8cbe9820849fa80542e86b353d0cab9c60bca6e5d122a1e4f57a75f3189058587e9e8c7d8c5f37e5d4a22395506c437f411df1c4e4
diff --git a/dev-ml/opam-client/files/debian-Port-to-Dose3-6.0.1.patch b/dev-ml/opam-client/files/debian-Port-to-Dose3-6.0.1.patch
new file mode 100644
index 000000000000..a8af27416df1
--- /dev/null
+++ b/dev-ml/opam-client/files/debian-Port-to-Dose3-6.0.1.patch
@@ -0,0 +1,142 @@
+From: Mehdi Dogguy <mehdi@debian.org>
+Date: Sun, 28 Feb 2021 19:27:24 +0100
+Subject: Port to Dose3 6.0.1
+
+---
+ src/client/opamAdminCheck.ml       | 2 ++
+ src/client/opamAdminRepoUpgrade.ml | 2 ++
+ src/solver/opamBuiltinMccs.ml.real | 2 +-
+ src/solver/opamCudf.ml             | 5 ++++-
+ src/solver/opamCudf.mli            | 4 ++--
+ src/solver/opamCudfSolver.ml       | 4 ++--
+ src/solver/opamSolver.ml           | 4 +++-
+ 7 files changed, 16 insertions(+), 7 deletions(-)
+
+diff --git a/src/client/opamAdminCheck.ml b/src/client/opamAdminCheck.ml
+index 05543a2..f23bfc4 100644
+--- a/src/client/opamAdminCheck.ml
++++ b/src/client/opamAdminCheck.ml
+@@ -8,6 +8,8 @@
+ (*                                                                        *)
+ (**************************************************************************)
+ 
++module Algo = Dose_algo
++
+ open OpamTypes
+ open OpamPackage.Set.Op
+ 
+diff --git a/src/client/opamAdminRepoUpgrade.ml b/src/client/opamAdminRepoUpgrade.ml
+index 0be53b2..635e792 100644
+--- a/src/client/opamAdminRepoUpgrade.ml
++++ b/src/client/opamAdminRepoUpgrade.ml
+@@ -8,6 +8,8 @@
+ (*                                                                        *)
+ (**************************************************************************)
+ 
++module Algo = Dose_algo
++
+ open OpamTypes
+ open OpamProcess.Job.Op
+ open OpamStd.Option.Op
+diff --git a/src/solver/opamBuiltinMccs.ml.real b/src/solver/opamBuiltinMccs.ml.real
+index ab39ab3..2b41982 100644
+--- a/src/solver/opamBuiltinMccs.ml.real
++++ b/src/solver/opamBuiltinMccs.ml.real
+@@ -35,7 +35,7 @@ let call solver_backend ext ~criteria ?timeout cudf =
+       ~verbose:OpamCoreConfig.(!r.debug_level >= 2)
+       ?timeout criteria cudf
+   with
+-  | None -> raise Common.CudfSolver.Unsat
++  | None -> raise Dose_common.CudfSolver.Unsat
+   | Some (preamble, univ) -> Some preamble, univ
+   | exception Mccs.Timeout -> raise Timeout
+ 
+diff --git a/src/solver/opamCudf.ml b/src/solver/opamCudf.ml
+index e07ff54..ad7293c 100644
+--- a/src/solver/opamCudf.ml
++++ b/src/solver/opamCudf.ml
+@@ -9,6 +9,9 @@
+ (*                                                                        *)
+ (**************************************************************************)
+ 
++module Common = Dose_common
++module Algo = Dose_algo
++
+ open OpamTypes
+ open OpamTypesBase
+ 
+@@ -634,7 +637,7 @@ let call_external_solver ~version_map univ req =
+       let r =
+         Algo.Depsolver.check_request_using
+           ~call_solver:(OpamSolverConfig.call_solver ~criteria)
+-          ~criteria ~explain:true cudf_request
++          ~explain:true cudf_request
+       in
+       log "Solver call done in %.3f" (chrono ());
+       r
+diff --git a/src/solver/opamCudf.mli b/src/solver/opamCudf.mli
+index cb8158d..c928ccf 100644
+--- a/src/solver/opamCudf.mli
++++ b/src/solver/opamCudf.mli
+@@ -24,7 +24,7 @@ module Map: OpamStd.MAP with type key = Cudf.package
+ module Graph: sig
+   (** Graph of cudf packages *)
+ 
+-  include module type of Algo.Defaultgraphs.PackageGraph.G
++  include module type of Dose_algo.Defaultgraphs.PackageGraph.G
+ 
+   (** Build a graph from a CUDF universe. Warning: dependency edges are towards
+       the dependency, which is the reverse of what happens in the action
+@@ -180,7 +180,7 @@ val string_of_vpkgs: Cudf_types.vpkg list -> string
+ 
+ val make_conflicts:
+   version_map:int package_map -> Cudf.universe ->
+-  Algo.Diagnostic.diagnosis -> ('a, conflict) result
++  Dose_algo.Diagnostic.diagnosis -> ('a, conflict) result
+ val cycle_conflict:
+   version_map:int package_map -> Cudf.universe ->
+   string list list -> ('a, conflict) result
+diff --git a/src/solver/opamCudfSolver.ml b/src/solver/opamCudfSolver.ml
+index 03486f1..2651373 100644
+--- a/src/solver/opamCudfSolver.ml
++++ b/src/solver/opamCudfSolver.ml
+@@ -57,7 +57,7 @@ let call_external_solver command ~criteria ?timeout (_, universe,_ as cudf) =
+     in
+     OpamFilename.remove solver_in;
+     if not (OpamFilename.exists solver_out) then
+-      raise (Common.CudfSolver.Error "no output")
++      raise (Dose_common.CudfSolver.Error "no output")
+     else if
+       (let ic = OpamFilename.open_in solver_out in
+        try
+@@ -65,7 +65,7 @@ let call_external_solver command ~criteria ?timeout (_, universe,_ as cudf) =
+          i = "FAIL"
+        with End_of_file -> close_in ic; false)
+     then
+-      raise Common.CudfSolver.Unsat
++      raise Dose_common.CudfSolver.Unsat
+     else
+     let r =
+       Cudf_parser.load_solution_from_file
+diff --git a/src/solver/opamSolver.ml b/src/solver/opamSolver.ml
+index 3748e75..bbf995f 100644
+--- a/src/solver/opamSolver.ml
++++ b/src/solver/opamSolver.ml
+@@ -9,6 +9,8 @@
+ (*                                                                        *)
+ (**************************************************************************)
+ 
++module Algo = Dose_algo
++
+ open OpamTypes
+ open OpamTypesBase
+ open OpamPackage.Set.Op
+@@ -84,7 +86,7 @@ let cudf_versions_map universe packages =
+     pmap OpamPackage.Map.empty
+ 
+ let name_to_cudf name =
+-  Common.CudfAdd.encode (OpamPackage.Name.to_string name)
++  Dose_common.CudfAdd.encode (OpamPackage.Name.to_string name)
+ 
+ let constraint_to_cudf version_map name (op,v) =
+   let nv = OpamPackage.create name v in
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
new file mode 100644
index 000000000000..148f9780e7a8
--- /dev/null
+++ b/dev-ml/opam-client/opam-client-2.0.8-r1.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"
+S="${WORKDIR}/opam-${PV/_/-}"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64"
+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}"
+
+# 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/opam-file-format/Manifest b/dev-ml/opam-file-format/Manifest
index 970db123cf1e..fce461c9933e 100644
--- a/dev-ml/opam-file-format/Manifest
+++ b/dev-ml/opam-file-format/Manifest
@@ -1,5 +1,5 @@
 DIST opam-file-format-2.1.0.tar.gz 23233 BLAKE2B 34d832c5ee13a0db43e77f3b33e7728faa7dccccc8daed50dca89630ab11d6f307413b8fecfef5a7c3e0f7ea04ef27105c8f42d8b5227d2587bdc2c2defe59d3 SHA512 b948545497de0386457a9b5772924572249e38164aa49d5ab2ac9442d1231a56a3b8132a95197d74cbbe34336a7edc04eaca351a8763c4a009a512085ca0ab25
 DIST opam-file-format-2.1.2.tar.gz 32120 BLAKE2B 3756ae2e2ad8e60d9611f1879ee07179e5f98ce4bd9f0fa9759e723446aac60f811e282903a57803fdb1c742f7027fb3a4b0d018dee74762645f5f0ec28aaeda SHA512 24fcc8a89dd79fee4fb54cfcd3a9b392819eb8214c97f43e226d44f1bc98111effade15f21f1e13aa5d3555cb458cbe269ba78ee4a1470c554f479446012d7ee
 EBUILD opam-file-format-2.1.0.ebuild 722 BLAKE2B 3f6748e96bc9e6c19827dd03e03869e9ae1b8e95a180bdc050aa75ad7ffe27d75cbca38345455bf6899b5b5797b045a781ce276165a643d79f12e2cebcab7208 SHA512 2ef42c81d573649da5690120aad105e178d89dcb8cae95c49f99d2c3452348f110ef0bad4563ad9f05c9d168f7d19f62155afb90b8d8b99c9110b7401bedc00c
-EBUILD opam-file-format-2.1.2.ebuild 573 BLAKE2B bd3752908350affce41b7045ef293a12f339aaa08088523f1ce54984685827041ec7d72f468d094de309aaaa534c98f3bf54951fefe95cbdabc85c7b28f617ea SHA512 2172a5b7b840e662d366264dd84f59929cedf41cf242f8c1fe305dc9c85cd042f3836537e41eb4e6a8534b6f5d1eacd9760a334fcb6be23213c0fda4820d710d
+EBUILD opam-file-format-2.1.2.ebuild 572 BLAKE2B 3e889c1cd89dee0649cfa12fe06e23a2e97c3c77ed80391d931055593d93973c848e0b258e5f24665e1e48c942c22b88ad58528da2cf87baaff84c4a11ab3eb7 SHA512 a08f520e8296b67363d6f609cb78e17193d77b7ca3febe9caae653983404d81dd3cd3197bd097a9230f4a18a524fb0f64a26dad1a773fff7ff83464e64342486
 MISC metadata.xml 424 BLAKE2B be67fa815545cce58cd870b84438927044fdca0ff12b9498217d3d04fe1e68981409e5c8d5b040da85f7969004cad18260b3bd0e105234f9ddd55271aa12c434 SHA512 282c587f3927e29035d987cb102c4b9042081d758787831335d7ce6b009193f7058e5c5e4e1ba5db3794e9dbdc79f2203e93783304f908aa26ffc7ddcd87969b
diff --git a/dev-ml/opam-file-format/opam-file-format-2.1.2.ebuild b/dev-ml/opam-file-format/opam-file-format-2.1.2.ebuild
index 943ebfa49c02..25d72cb13595 100644
--- a/dev-ml/opam-file-format/opam-file-format-2.1.2.ebuild
+++ b/dev-ml/opam-file-format/opam-file-format-2.1.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/ocaml/opam-file-format/archive/${MY_PV}.tar.gz -> ${
 
 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 )"
 
diff --git a/dev-ml/opam-format/Manifest b/dev-ml/opam-format/Manifest
index 7df558dad308..093a0d07e32b 100644
--- a/dev-ml/opam-format/Manifest
+++ b/dev-ml/opam-format/Manifest
@@ -1,3 +1,5 @@
+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-format-2.0.8-r2.ebuild 817 BLAKE2B ad9a97d3d0439fa4fc6382c423be2d9202e322426c4d58e8bcad567aea6569862365f24dd21275efd4b74ee5e6f9a97dc564e0ff564a39a8a666d69d72adecdd SHA512 973f9bc28a2fa479bb84f5fc9ef8a5852fd606a1d936d15bf8c3f225ee8fd08004d7daa4b834fe69724686db7767771a2938fde776b320eef76396776ab82e76
+EBUILD opam-format-2.0.8-r3.ebuild 979 BLAKE2B 12f62ce1f4f9cddaf4f985ac2049306605e79395bc5fe3fa8fbdba5f2c92a59f4e668f0689aa3f32fc499e3d07c9b623634a37579b63142d372880f4d22def25 SHA512 512fe4ac65a91b0c8804166f4c0d84afc5ab075e5942655c78940095f2a6815149781798e4f5a8dc31fd945a79a47230a1506c7f0596f431b519b79908d62029
 MISC metadata.xml 412 BLAKE2B 3cd375059a5716aba5f14f8004970adb55bbec02cf911cc5739475a80789c86ab6d27f192e4757191be8e914e61db531b330695eba224e81273e351d507bd57b SHA512 6119e7d8b9cf779ac2070b8cbe9820849fa80542e86b353d0cab9c60bca6e5d122a1e4f57a75f3189058587e9e8c7d8c5f37e5d4a22395506c437f411df1c4e4
diff --git a/dev-ml/opam-format/files/debian-Port-to-Dose3-6.0.1.patch b/dev-ml/opam-format/files/debian-Port-to-Dose3-6.0.1.patch
new file mode 100644
index 000000000000..a8af27416df1
--- /dev/null
+++ b/dev-ml/opam-format/files/debian-Port-to-Dose3-6.0.1.patch
@@ -0,0 +1,142 @@
+From: Mehdi Dogguy <mehdi@debian.org>
+Date: Sun, 28 Feb 2021 19:27:24 +0100
+Subject: Port to Dose3 6.0.1
+
+---
+ src/client/opamAdminCheck.ml       | 2 ++
+ src/client/opamAdminRepoUpgrade.ml | 2 ++
+ src/solver/opamBuiltinMccs.ml.real | 2 +-
+ src/solver/opamCudf.ml             | 5 ++++-
+ src/solver/opamCudf.mli            | 4 ++--
+ src/solver/opamCudfSolver.ml       | 4 ++--
+ src/solver/opamSolver.ml           | 4 +++-
+ 7 files changed, 16 insertions(+), 7 deletions(-)
+
+diff --git a/src/client/opamAdminCheck.ml b/src/client/opamAdminCheck.ml
+index 05543a2..f23bfc4 100644
+--- a/src/client/opamAdminCheck.ml
++++ b/src/client/opamAdminCheck.ml
+@@ -8,6 +8,8 @@
+ (*                                                                        *)
+ (**************************************************************************)
+ 
++module Algo = Dose_algo
++
+ open OpamTypes
+ open OpamPackage.Set.Op
+ 
+diff --git a/src/client/opamAdminRepoUpgrade.ml b/src/client/opamAdminRepoUpgrade.ml
+index 0be53b2..635e792 100644
+--- a/src/client/opamAdminRepoUpgrade.ml
++++ b/src/client/opamAdminRepoUpgrade.ml
+@@ -8,6 +8,8 @@
+ (*                                                                        *)
+ (**************************************************************************)
+ 
++module Algo = Dose_algo
++
+ open OpamTypes
+ open OpamProcess.Job.Op
+ open OpamStd.Option.Op
+diff --git a/src/solver/opamBuiltinMccs.ml.real b/src/solver/opamBuiltinMccs.ml.real
+index ab39ab3..2b41982 100644
+--- a/src/solver/opamBuiltinMccs.ml.real
++++ b/src/solver/opamBuiltinMccs.ml.real
+@@ -35,7 +35,7 @@ let call solver_backend ext ~criteria ?timeout cudf =
+       ~verbose:OpamCoreConfig.(!r.debug_level >= 2)
+       ?timeout criteria cudf
+   with
+-  | None -> raise Common.CudfSolver.Unsat
++  | None -> raise Dose_common.CudfSolver.Unsat
+   | Some (preamble, univ) -> Some preamble, univ
+   | exception Mccs.Timeout -> raise Timeout
+ 
+diff --git a/src/solver/opamCudf.ml b/src/solver/opamCudf.ml
+index e07ff54..ad7293c 100644
+--- a/src/solver/opamCudf.ml
++++ b/src/solver/opamCudf.ml
+@@ -9,6 +9,9 @@
+ (*                                                                        *)
+ (**************************************************************************)
+ 
++module Common = Dose_common
++module Algo = Dose_algo
++
+ open OpamTypes
+ open OpamTypesBase
+ 
+@@ -634,7 +637,7 @@ let call_external_solver ~version_map univ req =
+       let r =
+         Algo.Depsolver.check_request_using
+           ~call_solver:(OpamSolverConfig.call_solver ~criteria)
+-          ~criteria ~explain:true cudf_request
++          ~explain:true cudf_request
+       in
+       log "Solver call done in %.3f" (chrono ());
+       r
+diff --git a/src/solver/opamCudf.mli b/src/solver/opamCudf.mli
+index cb8158d..c928ccf 100644
+--- a/src/solver/opamCudf.mli
++++ b/src/solver/opamCudf.mli
+@@ -24,7 +24,7 @@ module Map: OpamStd.MAP with type key = Cudf.package
+ module Graph: sig
+   (** Graph of cudf packages *)
+ 
+-  include module type of Algo.Defaultgraphs.PackageGraph.G
++  include module type of Dose_algo.Defaultgraphs.PackageGraph.G
+ 
+   (** Build a graph from a CUDF universe. Warning: dependency edges are towards
+       the dependency, which is the reverse of what happens in the action
+@@ -180,7 +180,7 @@ val string_of_vpkgs: Cudf_types.vpkg list -> string
+ 
+ val make_conflicts:
+   version_map:int package_map -> Cudf.universe ->
+-  Algo.Diagnostic.diagnosis -> ('a, conflict) result
++  Dose_algo.Diagnostic.diagnosis -> ('a, conflict) result
+ val cycle_conflict:
+   version_map:int package_map -> Cudf.universe ->
+   string list list -> ('a, conflict) result
+diff --git a/src/solver/opamCudfSolver.ml b/src/solver/opamCudfSolver.ml
+index 03486f1..2651373 100644
+--- a/src/solver/opamCudfSolver.ml
++++ b/src/solver/opamCudfSolver.ml
+@@ -57,7 +57,7 @@ let call_external_solver command ~criteria ?timeout (_, universe,_ as cudf) =
+     in
+     OpamFilename.remove solver_in;
+     if not (OpamFilename.exists solver_out) then
+-      raise (Common.CudfSolver.Error "no output")
++      raise (Dose_common.CudfSolver.Error "no output")
+     else if
+       (let ic = OpamFilename.open_in solver_out in
+        try
+@@ -65,7 +65,7 @@ let call_external_solver command ~criteria ?timeout (_, universe,_ as cudf) =
+          i = "FAIL"
+        with End_of_file -> close_in ic; false)
+     then
+-      raise Common.CudfSolver.Unsat
++      raise Dose_common.CudfSolver.Unsat
+     else
+     let r =
+       Cudf_parser.load_solution_from_file
+diff --git a/src/solver/opamSolver.ml b/src/solver/opamSolver.ml
+index 3748e75..bbf995f 100644
+--- a/src/solver/opamSolver.ml
++++ b/src/solver/opamSolver.ml
+@@ -9,6 +9,8 @@
+ (*                                                                        *)
+ (**************************************************************************)
+ 
++module Algo = Dose_algo
++
+ open OpamTypes
+ open OpamTypesBase
+ open OpamPackage.Set.Op
+@@ -84,7 +86,7 @@ let cudf_versions_map universe packages =
+     pmap OpamPackage.Map.empty
+ 
+ let name_to_cudf name =
+-  Common.CudfAdd.encode (OpamPackage.Name.to_string name)
++  Dose_common.CudfAdd.encode (OpamPackage.Name.to_string name)
+ 
+ let constraint_to_cudf version_map name (op,v) =
+   let nv = OpamPackage.create name v in
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
new file mode 100644
index 000000000000..e6950762f670
--- /dev/null
+++ b/dev-ml/opam-format/opam-format-2.0.8-r3.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"
+S="${WORKDIR}/opam-${PV}"
+OPAM_INSTALLER="${S}/opam-installer"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64"
+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"
+
+# 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/opam-installer/Manifest b/dev-ml/opam-installer/Manifest
index f561d2a100b7..b035f2c3bce1 100644
--- a/dev-ml/opam-installer/Manifest
+++ b/dev-ml/opam-installer/Manifest
@@ -1,4 +1,6 @@
+AUX debian-Port-to-Dose3-6.0.1.patch 5223 BLAKE2B 8fada8b358cfae3aab9f6b8f0554894f55081197760a08b544229fdcc9d74434c1408cf72a8bb1d4280d11ef94d593ebb54a8f656617d99191d3576d02556793 SHA512 969c79a0552e0ea2388f732ca266d07b4c2a5a6945bd75daa2a435340ffbd8d87d2ada39dbab9cb364b2ad918f60600a59cf1fc06290a3dcbb68568c52fc9c7d
 DIST opam-full-2.0.8.tar.gz 8006252 BLAKE2B 26348bdbb8bdc2fbf9d736286c1f4134ce065e8c15e34d51c8d2c6e5338fd6db089df38a19b07cde70770724fc4cc3dbd9e7d75628e5435ca8a2f8c0d4d3f2f0 SHA512 f08893ad0c1e124368168f28dcb5c3293e443da712d7b12db432c21ff72f7e1440bcc7156f49661d286360a16dcd166d3d02ecdebf8b1cda7c7df2b22e48f80f
 EBUILD opam-installer-2.0.8-r1.ebuild 1029 BLAKE2B 53066e7d4fe28f77ae2cbc1a1eb3056a60d04ada7eb72c0589498815c8ad3937ef6335b73a675bcf7060c6bf85534b3b497b55ac782c1f7a0d3e32537c1489cd SHA512 df08f41985fd16842021dc0e5c8a361a1d8376d1b716f3fb2aff8bdc007ff311ba51844894325e76657a688a03021fe7360c9522ac6f41231ef499de214d469e
 EBUILD opam-installer-2.0.8-r2.ebuild 1020 BLAKE2B a2b8afb4a80a772b812f7394aef05b7d1d8a30c23c8e6f8fc9d6d46de38b8389e8fe975be391f620f94586e459712c5522289bf74b1aee15a9e0a9da1a28404c SHA512 e8a63747de673e5fae11313803192c585d94e91c5d99eb36f8816013e905c305a5bfc21833a40f9291670201288aabe427454d4731d609e6702a891876925717
+EBUILD opam-installer-2.0.8-r3.ebuild 1175 BLAKE2B 677c10ed2872a5b993de10146926a9623d621ed63e0e15890d2d1b117316ce885d2f0fad2ea45c14187d8feb872ad8911b6cdbf038441c6fb0742bd7f7eb8a74 SHA512 a05b98da794574536c68b9c4ceef03a232f6772762f18e1107d87e8bd57bb3759faacec32dfd0c40c77b77fbbd609ed3e5a79c8c620e91082fd97e4e67af37da
 MISC metadata.xml 412 BLAKE2B 3cd375059a5716aba5f14f8004970adb55bbec02cf911cc5739475a80789c86ab6d27f192e4757191be8e914e61db531b330695eba224e81273e351d507bd57b SHA512 6119e7d8b9cf779ac2070b8cbe9820849fa80542e86b353d0cab9c60bca6e5d122a1e4f57a75f3189058587e9e8c7d8c5f37e5d4a22395506c437f411df1c4e4
diff --git a/dev-ml/opam-installer/files/debian-Port-to-Dose3-6.0.1.patch b/dev-ml/opam-installer/files/debian-Port-to-Dose3-6.0.1.patch
new file mode 100644
index 000000000000..a8af27416df1
--- /dev/null
+++ b/dev-ml/opam-installer/files/debian-Port-to-Dose3-6.0.1.patch
@@ -0,0 +1,142 @@
+From: Mehdi Dogguy <mehdi@debian.org>
+Date: Sun, 28 Feb 2021 19:27:24 +0100
+Subject: Port to Dose3 6.0.1
+
+---
+ src/client/opamAdminCheck.ml       | 2 ++
+ src/client/opamAdminRepoUpgrade.ml | 2 ++
+ src/solver/opamBuiltinMccs.ml.real | 2 +-
+ src/solver/opamCudf.ml             | 5 ++++-
+ src/solver/opamCudf.mli            | 4 ++--
+ src/solver/opamCudfSolver.ml       | 4 ++--
+ src/solver/opamSolver.ml           | 4 +++-
+ 7 files changed, 16 insertions(+), 7 deletions(-)
+
+diff --git a/src/client/opamAdminCheck.ml b/src/client/opamAdminCheck.ml
+index 05543a2..f23bfc4 100644
+--- a/src/client/opamAdminCheck.ml
++++ b/src/client/opamAdminCheck.ml
+@@ -8,6 +8,8 @@
+ (*                                                                        *)
+ (**************************************************************************)
+ 
++module Algo = Dose_algo
++
+ open OpamTypes
+ open OpamPackage.Set.Op
+ 
+diff --git a/src/client/opamAdminRepoUpgrade.ml b/src/client/opamAdminRepoUpgrade.ml
+index 0be53b2..635e792 100644
+--- a/src/client/opamAdminRepoUpgrade.ml
++++ b/src/client/opamAdminRepoUpgrade.ml
+@@ -8,6 +8,8 @@
+ (*                                                                        *)
+ (**************************************************************************)
+ 
++module Algo = Dose_algo
++
+ open OpamTypes
+ open OpamProcess.Job.Op
+ open OpamStd.Option.Op
+diff --git a/src/solver/opamBuiltinMccs.ml.real b/src/solver/opamBuiltinMccs.ml.real
+index ab39ab3..2b41982 100644
+--- a/src/solver/opamBuiltinMccs.ml.real
++++ b/src/solver/opamBuiltinMccs.ml.real
+@@ -35,7 +35,7 @@ let call solver_backend ext ~criteria ?timeout cudf =
+       ~verbose:OpamCoreConfig.(!r.debug_level >= 2)
+       ?timeout criteria cudf
+   with
+-  | None -> raise Common.CudfSolver.Unsat
++  | None -> raise Dose_common.CudfSolver.Unsat
+   | Some (preamble, univ) -> Some preamble, univ
+   | exception Mccs.Timeout -> raise Timeout
+ 
+diff --git a/src/solver/opamCudf.ml b/src/solver/opamCudf.ml
+index e07ff54..ad7293c 100644
+--- a/src/solver/opamCudf.ml
++++ b/src/solver/opamCudf.ml
+@@ -9,6 +9,9 @@
+ (*                                                                        *)
+ (**************************************************************************)
+ 
++module Common = Dose_common
++module Algo = Dose_algo
++
+ open OpamTypes
+ open OpamTypesBase
+ 
+@@ -634,7 +637,7 @@ let call_external_solver ~version_map univ req =
+       let r =
+         Algo.Depsolver.check_request_using
+           ~call_solver:(OpamSolverConfig.call_solver ~criteria)
+-          ~criteria ~explain:true cudf_request
++          ~explain:true cudf_request
+       in
+       log "Solver call done in %.3f" (chrono ());
+       r
+diff --git a/src/solver/opamCudf.mli b/src/solver/opamCudf.mli
+index cb8158d..c928ccf 100644
+--- a/src/solver/opamCudf.mli
++++ b/src/solver/opamCudf.mli
+@@ -24,7 +24,7 @@ module Map: OpamStd.MAP with type key = Cudf.package
+ module Graph: sig
+   (** Graph of cudf packages *)
+ 
+-  include module type of Algo.Defaultgraphs.PackageGraph.G
++  include module type of Dose_algo.Defaultgraphs.PackageGraph.G
+ 
+   (** Build a graph from a CUDF universe. Warning: dependency edges are towards
+       the dependency, which is the reverse of what happens in the action
+@@ -180,7 +180,7 @@ val string_of_vpkgs: Cudf_types.vpkg list -> string
+ 
+ val make_conflicts:
+   version_map:int package_map -> Cudf.universe ->
+-  Algo.Diagnostic.diagnosis -> ('a, conflict) result
++  Dose_algo.Diagnostic.diagnosis -> ('a, conflict) result
+ val cycle_conflict:
+   version_map:int package_map -> Cudf.universe ->
+   string list list -> ('a, conflict) result
+diff --git a/src/solver/opamCudfSolver.ml b/src/solver/opamCudfSolver.ml
+index 03486f1..2651373 100644
+--- a/src/solver/opamCudfSolver.ml
++++ b/src/solver/opamCudfSolver.ml
+@@ -57,7 +57,7 @@ let call_external_solver command ~criteria ?timeout (_, universe,_ as cudf) =
+     in
+     OpamFilename.remove solver_in;
+     if not (OpamFilename.exists solver_out) then
+-      raise (Common.CudfSolver.Error "no output")
++      raise (Dose_common.CudfSolver.Error "no output")
+     else if
+       (let ic = OpamFilename.open_in solver_out in
+        try
+@@ -65,7 +65,7 @@ let call_external_solver command ~criteria ?timeout (_, universe,_ as cudf) =
+          i = "FAIL"
+        with End_of_file -> close_in ic; false)
+     then
+-      raise Common.CudfSolver.Unsat
++      raise Dose_common.CudfSolver.Unsat
+     else
+     let r =
+       Cudf_parser.load_solution_from_file
+diff --git a/src/solver/opamSolver.ml b/src/solver/opamSolver.ml
+index 3748e75..bbf995f 100644
+--- a/src/solver/opamSolver.ml
++++ b/src/solver/opamSolver.ml
+@@ -9,6 +9,8 @@
+ (*                                                                        *)
+ (**************************************************************************)
+ 
++module Algo = Dose_algo
++
+ open OpamTypes
+ open OpamTypesBase
+ open OpamPackage.Set.Op
+@@ -84,7 +86,7 @@ let cudf_versions_map universe packages =
+     pmap OpamPackage.Map.empty
+ 
+ let name_to_cudf name =
+-  Common.CudfAdd.encode (OpamPackage.Name.to_string name)
++  Dose_common.CudfAdd.encode (OpamPackage.Name.to_string name)
+ 
+ let constraint_to_cudf version_map name (op,v) =
+   let nv = OpamPackage.create name v in
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
new file mode 100644
index 000000000000..7bd84a692fe7
--- /dev/null
+++ b/dev-ml/opam-installer/opam-installer-2.0.8-r3.ebuild
@@ -0,0 +1,45 @@
+# 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 opam
+
+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"
+S="${WORKDIR}/opam-full-${PV/_/-}"
+OPAM_INSTALLER="${S}/opam-installer"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+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" )
+
+RDEPEND="
+	>=dev-lang/ocaml-4.02.3
+	dev-ml/cmdliner:=
+	~dev-ml/opam-format-${PV}
+"
+DEPEND="${RDEPEND}
+	dev-ml/findlib"
+
+src_configure() {
+	econf \
+		--prefix="${EPREFIX}/usr" \
+		--with-mccs \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--mandir="${EPREFIX}/usr/share/man"
+}
+
+src_compile() {
+	sed -e 's/DUNE = .*$/DUNE = /' -i Makefile.config
+	#passing -jX to the dune build leads to errors
+	#see: https://github.com/ocaml/opam/issues/3585
+	emake DUNE_PROMOTE_ARG="" -j1
+}
diff --git a/dev-ml/opam-repository/Manifest b/dev-ml/opam-repository/Manifest
index f6b824d05f6d..139efb39abbc 100644
--- a/dev-ml/opam-repository/Manifest
+++ b/dev-ml/opam-repository/Manifest
@@ -1,3 +1,5 @@
+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-repository-2.0.8-r1.ebuild 916 BLAKE2B 712b4e21a713e34a56146d2125747408509bd404f63818d326c0938121986e624206d1e2b87a5e768c32ae1cd16aa09fb08ea2345e45830f0e27a2759ede22eb SHA512 9b8ca8b52c903f430ff852f9d435b52e33f6c223108438e86e6c8227612882d7bc9148050cf74d40dd7e1c5eea8da2dcc88639f9364eb034d382349f7893a5ac
 EBUILD opam-repository-2.0.8.ebuild 754 BLAKE2B f9d6d9b652e5bd1911cc8f9596a1568928915001d1e1dfa826d760d967d0c867468332496400a844f4d35fa6704656a6718fa9c25ff52ac5469b28cae92da817 SHA512 4f19f6d9dfa8760338fb68b843e6617d6b0cd96673ed4c5ae6a1229c09c8ffabb02e3ed41363d1075988b1f0fbe526cc7b3162cf0cdb01653b6bf57cfb746e42
 MISC metadata.xml 412 BLAKE2B 3cd375059a5716aba5f14f8004970adb55bbec02cf911cc5739475a80789c86ab6d27f192e4757191be8e914e61db531b330695eba224e81273e351d507bd57b SHA512 6119e7d8b9cf779ac2070b8cbe9820849fa80542e86b353d0cab9c60bca6e5d122a1e4f57a75f3189058587e9e8c7d8c5f37e5d4a22395506c437f411df1c4e4
diff --git a/dev-ml/opam-repository/files/debian-Port-to-Dose3-6.0.1.patch b/dev-ml/opam-repository/files/debian-Port-to-Dose3-6.0.1.patch
new file mode 100644
index 000000000000..a8af27416df1
--- /dev/null
+++ b/dev-ml/opam-repository/files/debian-Port-to-Dose3-6.0.1.patch
@@ -0,0 +1,142 @@
+From: Mehdi Dogguy <mehdi@debian.org>
+Date: Sun, 28 Feb 2021 19:27:24 +0100
+Subject: Port to Dose3 6.0.1
+
+---
+ src/client/opamAdminCheck.ml       | 2 ++
+ src/client/opamAdminRepoUpgrade.ml | 2 ++
+ src/solver/opamBuiltinMccs.ml.real | 2 +-
+ src/solver/opamCudf.ml             | 5 ++++-
+ src/solver/opamCudf.mli            | 4 ++--
+ src/solver/opamCudfSolver.ml       | 4 ++--
+ src/solver/opamSolver.ml           | 4 +++-
+ 7 files changed, 16 insertions(+), 7 deletions(-)
+
+diff --git a/src/client/opamAdminCheck.ml b/src/client/opamAdminCheck.ml
+index 05543a2..f23bfc4 100644
+--- a/src/client/opamAdminCheck.ml
++++ b/src/client/opamAdminCheck.ml
+@@ -8,6 +8,8 @@
+ (*                                                                        *)
+ (**************************************************************************)
+ 
++module Algo = Dose_algo
++
+ open OpamTypes
+ open OpamPackage.Set.Op
+ 
+diff --git a/src/client/opamAdminRepoUpgrade.ml b/src/client/opamAdminRepoUpgrade.ml
+index 0be53b2..635e792 100644
+--- a/src/client/opamAdminRepoUpgrade.ml
++++ b/src/client/opamAdminRepoUpgrade.ml
+@@ -8,6 +8,8 @@
+ (*                                                                        *)
+ (**************************************************************************)
+ 
++module Algo = Dose_algo
++
+ open OpamTypes
+ open OpamProcess.Job.Op
+ open OpamStd.Option.Op
+diff --git a/src/solver/opamBuiltinMccs.ml.real b/src/solver/opamBuiltinMccs.ml.real
+index ab39ab3..2b41982 100644
+--- a/src/solver/opamBuiltinMccs.ml.real
++++ b/src/solver/opamBuiltinMccs.ml.real
+@@ -35,7 +35,7 @@ let call solver_backend ext ~criteria ?timeout cudf =
+       ~verbose:OpamCoreConfig.(!r.debug_level >= 2)
+       ?timeout criteria cudf
+   with
+-  | None -> raise Common.CudfSolver.Unsat
++  | None -> raise Dose_common.CudfSolver.Unsat
+   | Some (preamble, univ) -> Some preamble, univ
+   | exception Mccs.Timeout -> raise Timeout
+ 
+diff --git a/src/solver/opamCudf.ml b/src/solver/opamCudf.ml
+index e07ff54..ad7293c 100644
+--- a/src/solver/opamCudf.ml
++++ b/src/solver/opamCudf.ml
+@@ -9,6 +9,9 @@
+ (*                                                                        *)
+ (**************************************************************************)
+ 
++module Common = Dose_common
++module Algo = Dose_algo
++
+ open OpamTypes
+ open OpamTypesBase
+ 
+@@ -634,7 +637,7 @@ let call_external_solver ~version_map univ req =
+       let r =
+         Algo.Depsolver.check_request_using
+           ~call_solver:(OpamSolverConfig.call_solver ~criteria)
+-          ~criteria ~explain:true cudf_request
++          ~explain:true cudf_request
+       in
+       log "Solver call done in %.3f" (chrono ());
+       r
+diff --git a/src/solver/opamCudf.mli b/src/solver/opamCudf.mli
+index cb8158d..c928ccf 100644
+--- a/src/solver/opamCudf.mli
++++ b/src/solver/opamCudf.mli
+@@ -24,7 +24,7 @@ module Map: OpamStd.MAP with type key = Cudf.package
+ module Graph: sig
+   (** Graph of cudf packages *)
+ 
+-  include module type of Algo.Defaultgraphs.PackageGraph.G
++  include module type of Dose_algo.Defaultgraphs.PackageGraph.G
+ 
+   (** Build a graph from a CUDF universe. Warning: dependency edges are towards
+       the dependency, which is the reverse of what happens in the action
+@@ -180,7 +180,7 @@ val string_of_vpkgs: Cudf_types.vpkg list -> string
+ 
+ val make_conflicts:
+   version_map:int package_map -> Cudf.universe ->
+-  Algo.Diagnostic.diagnosis -> ('a, conflict) result
++  Dose_algo.Diagnostic.diagnosis -> ('a, conflict) result
+ val cycle_conflict:
+   version_map:int package_map -> Cudf.universe ->
+   string list list -> ('a, conflict) result
+diff --git a/src/solver/opamCudfSolver.ml b/src/solver/opamCudfSolver.ml
+index 03486f1..2651373 100644
+--- a/src/solver/opamCudfSolver.ml
++++ b/src/solver/opamCudfSolver.ml
+@@ -57,7 +57,7 @@ let call_external_solver command ~criteria ?timeout (_, universe,_ as cudf) =
+     in
+     OpamFilename.remove solver_in;
+     if not (OpamFilename.exists solver_out) then
+-      raise (Common.CudfSolver.Error "no output")
++      raise (Dose_common.CudfSolver.Error "no output")
+     else if
+       (let ic = OpamFilename.open_in solver_out in
+        try
+@@ -65,7 +65,7 @@ let call_external_solver command ~criteria ?timeout (_, universe,_ as cudf) =
+          i = "FAIL"
+        with End_of_file -> close_in ic; false)
+     then
+-      raise Common.CudfSolver.Unsat
++      raise Dose_common.CudfSolver.Unsat
+     else
+     let r =
+       Cudf_parser.load_solution_from_file
+diff --git a/src/solver/opamSolver.ml b/src/solver/opamSolver.ml
+index 3748e75..bbf995f 100644
+--- a/src/solver/opamSolver.ml
++++ b/src/solver/opamSolver.ml
+@@ -9,6 +9,8 @@
+ (*                                                                        *)
+ (**************************************************************************)
+ 
++module Algo = Dose_algo
++
+ open OpamTypes
+ open OpamTypesBase
+ open OpamPackage.Set.Op
+@@ -84,7 +86,7 @@ let cudf_versions_map universe packages =
+     pmap OpamPackage.Map.empty
+ 
+ let name_to_cudf name =
+-  Common.CudfAdd.encode (OpamPackage.Name.to_string name)
++  Dose_common.CudfAdd.encode (OpamPackage.Name.to_string name)
+ 
+ let constraint_to_cudf version_map name (op,v) =
+   let nv = OpamPackage.create name v in
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
new file mode 100644
index 000000000000..b01ba19de6e0
--- /dev/null
+++ b/dev-ml/opam-repository/opam-repository-2.0.8-r1.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"
+S="${WORKDIR}/opam-${PV/_/-}"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64"
+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}"
+
+# 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/opam-solver/Manifest b/dev-ml/opam-solver/Manifest
index a8e194775eff..22c56911cd9e 100644
--- a/dev-ml/opam-solver/Manifest
+++ b/dev-ml/opam-solver/Manifest
@@ -1,3 +1,5 @@
+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-solver-2.0.8-r1.ebuild 986 BLAKE2B e8789ea45125c869861e5f9d15518a5b1e726538d89a32a215ebc9d85de904a440c036896852f4ee01e410937dbe78fc94ab0dae72cd29f5f3b43026b0181c08 SHA512 4edd8c45fbf20cc04944f014cdc234ab6cd7c59449df530fbeeed1a26cf8ede0c9b58cd4a789146f1ef107d26e8f9ad8997cf27abd1b12227cbdb6bdfbee0bfe
 EBUILD opam-solver-2.0.8.ebuild 824 BLAKE2B 9a7a5ebb741dec25ff0a3d3c6e0e1c74f7574b70ff352b7c4e602e085a5a1f3f1ca03d1e9c7f062722529b9b49e1fad83960b8d33223354430ea4d072c4fc19d SHA512 6fb412d1581e2f1ad34d988e4bb6e3e427cc8963924a0ac6b1a235287b4c3e2fa3d4a55e99f7bb7c6bde7a130b919b5cf1191c61e576a5d79e70d3813276f732
 MISC metadata.xml 412 BLAKE2B 3cd375059a5716aba5f14f8004970adb55bbec02cf911cc5739475a80789c86ab6d27f192e4757191be8e914e61db531b330695eba224e81273e351d507bd57b SHA512 6119e7d8b9cf779ac2070b8cbe9820849fa80542e86b353d0cab9c60bca6e5d122a1e4f57a75f3189058587e9e8c7d8c5f37e5d4a22395506c437f411df1c4e4
diff --git a/dev-ml/opam-solver/files/debian-Port-to-Dose3-6.0.1.patch b/dev-ml/opam-solver/files/debian-Port-to-Dose3-6.0.1.patch
new file mode 100644
index 000000000000..a8af27416df1
--- /dev/null
+++ b/dev-ml/opam-solver/files/debian-Port-to-Dose3-6.0.1.patch
@@ -0,0 +1,142 @@
+From: Mehdi Dogguy <mehdi@debian.org>
+Date: Sun, 28 Feb 2021 19:27:24 +0100
+Subject: Port to Dose3 6.0.1
+
+---
+ src/client/opamAdminCheck.ml       | 2 ++
+ src/client/opamAdminRepoUpgrade.ml | 2 ++
+ src/solver/opamBuiltinMccs.ml.real | 2 +-
+ src/solver/opamCudf.ml             | 5 ++++-
+ src/solver/opamCudf.mli            | 4 ++--
+ src/solver/opamCudfSolver.ml       | 4 ++--
+ src/solver/opamSolver.ml           | 4 +++-
+ 7 files changed, 16 insertions(+), 7 deletions(-)
+
+diff --git a/src/client/opamAdminCheck.ml b/src/client/opamAdminCheck.ml
+index 05543a2..f23bfc4 100644
+--- a/src/client/opamAdminCheck.ml
++++ b/src/client/opamAdminCheck.ml
+@@ -8,6 +8,8 @@
+ (*                                                                        *)
+ (**************************************************************************)
+ 
++module Algo = Dose_algo
++
+ open OpamTypes
+ open OpamPackage.Set.Op
+ 
+diff --git a/src/client/opamAdminRepoUpgrade.ml b/src/client/opamAdminRepoUpgrade.ml
+index 0be53b2..635e792 100644
+--- a/src/client/opamAdminRepoUpgrade.ml
++++ b/src/client/opamAdminRepoUpgrade.ml
+@@ -8,6 +8,8 @@
+ (*                                                                        *)
+ (**************************************************************************)
+ 
++module Algo = Dose_algo
++
+ open OpamTypes
+ open OpamProcess.Job.Op
+ open OpamStd.Option.Op
+diff --git a/src/solver/opamBuiltinMccs.ml.real b/src/solver/opamBuiltinMccs.ml.real
+index ab39ab3..2b41982 100644
+--- a/src/solver/opamBuiltinMccs.ml.real
++++ b/src/solver/opamBuiltinMccs.ml.real
+@@ -35,7 +35,7 @@ let call solver_backend ext ~criteria ?timeout cudf =
+       ~verbose:OpamCoreConfig.(!r.debug_level >= 2)
+       ?timeout criteria cudf
+   with
+-  | None -> raise Common.CudfSolver.Unsat
++  | None -> raise Dose_common.CudfSolver.Unsat
+   | Some (preamble, univ) -> Some preamble, univ
+   | exception Mccs.Timeout -> raise Timeout
+ 
+diff --git a/src/solver/opamCudf.ml b/src/solver/opamCudf.ml
+index e07ff54..ad7293c 100644
+--- a/src/solver/opamCudf.ml
++++ b/src/solver/opamCudf.ml
+@@ -9,6 +9,9 @@
+ (*                                                                        *)
+ (**************************************************************************)
+ 
++module Common = Dose_common
++module Algo = Dose_algo
++
+ open OpamTypes
+ open OpamTypesBase
+ 
+@@ -634,7 +637,7 @@ let call_external_solver ~version_map univ req =
+       let r =
+         Algo.Depsolver.check_request_using
+           ~call_solver:(OpamSolverConfig.call_solver ~criteria)
+-          ~criteria ~explain:true cudf_request
++          ~explain:true cudf_request
+       in
+       log "Solver call done in %.3f" (chrono ());
+       r
+diff --git a/src/solver/opamCudf.mli b/src/solver/opamCudf.mli
+index cb8158d..c928ccf 100644
+--- a/src/solver/opamCudf.mli
++++ b/src/solver/opamCudf.mli
+@@ -24,7 +24,7 @@ module Map: OpamStd.MAP with type key = Cudf.package
+ module Graph: sig
+   (** Graph of cudf packages *)
+ 
+-  include module type of Algo.Defaultgraphs.PackageGraph.G
++  include module type of Dose_algo.Defaultgraphs.PackageGraph.G
+ 
+   (** Build a graph from a CUDF universe. Warning: dependency edges are towards
+       the dependency, which is the reverse of what happens in the action
+@@ -180,7 +180,7 @@ val string_of_vpkgs: Cudf_types.vpkg list -> string
+ 
+ val make_conflicts:
+   version_map:int package_map -> Cudf.universe ->
+-  Algo.Diagnostic.diagnosis -> ('a, conflict) result
++  Dose_algo.Diagnostic.diagnosis -> ('a, conflict) result
+ val cycle_conflict:
+   version_map:int package_map -> Cudf.universe ->
+   string list list -> ('a, conflict) result
+diff --git a/src/solver/opamCudfSolver.ml b/src/solver/opamCudfSolver.ml
+index 03486f1..2651373 100644
+--- a/src/solver/opamCudfSolver.ml
++++ b/src/solver/opamCudfSolver.ml
+@@ -57,7 +57,7 @@ let call_external_solver command ~criteria ?timeout (_, universe,_ as cudf) =
+     in
+     OpamFilename.remove solver_in;
+     if not (OpamFilename.exists solver_out) then
+-      raise (Common.CudfSolver.Error "no output")
++      raise (Dose_common.CudfSolver.Error "no output")
+     else if
+       (let ic = OpamFilename.open_in solver_out in
+        try
+@@ -65,7 +65,7 @@ let call_external_solver command ~criteria ?timeout (_, universe,_ as cudf) =
+          i = "FAIL"
+        with End_of_file -> close_in ic; false)
+     then
+-      raise Common.CudfSolver.Unsat
++      raise Dose_common.CudfSolver.Unsat
+     else
+     let r =
+       Cudf_parser.load_solution_from_file
+diff --git a/src/solver/opamSolver.ml b/src/solver/opamSolver.ml
+index 3748e75..bbf995f 100644
+--- a/src/solver/opamSolver.ml
++++ b/src/solver/opamSolver.ml
+@@ -9,6 +9,8 @@
+ (*                                                                        *)
+ (**************************************************************************)
+ 
++module Algo = Dose_algo
++
+ open OpamTypes
+ open OpamTypesBase
+ open OpamPackage.Set.Op
+@@ -84,7 +86,7 @@ let cudf_versions_map universe packages =
+     pmap OpamPackage.Map.empty
+ 
+ let name_to_cudf name =
+-  Common.CudfAdd.encode (OpamPackage.Name.to_string name)
++  Dose_common.CudfAdd.encode (OpamPackage.Name.to_string name)
+ 
+ let constraint_to_cudf version_map name (op,v) =
+   let nv = OpamPackage.create name v in
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
new file mode 100644
index 000000000000..3241b232186e
--- /dev/null
+++ b/dev-ml/opam-solver/opam-solver-2.0.8-r1.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"
+S="${WORKDIR}/opam-${PV/_/-}"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64"
+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 )"
+
+# 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/opam-state/Manifest b/dev-ml/opam-state/Manifest
index d40cb954e944..6cb42386bbd9 100644
--- a/dev-ml/opam-state/Manifest
+++ b/dev-ml/opam-state/Manifest
@@ -1,3 +1,5 @@
+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-state-2.0.8-r1.ebuild 893 BLAKE2B 0a94146418ce7920767d36dffed888206f23dc56e0da136e404c14aa4fa63f3d628f88feba0bb8f828ddfab803597eb49987036a842428964fee844504637249 SHA512 4fe85aaa961bc4f537272288f021161ed232ba61408c9d65603a7a01a75766b51c90eeb32d8a379f6f21527e90fca943beb0d0812853e4441e7416060cef1c51
 EBUILD opam-state-2.0.8.ebuild 737 BLAKE2B 31e5398a6fd835fab9fe0cf31eeebbd2ca587853b8de942ed54511c04b858b2e3f5fd1a3b46c84bd920c639b606db65fea8c863d5ec746ce75dee0bda3a04c83 SHA512 19caab930f0f43ec38319248a23e89e5e3ef3edb46d84a69ad2db8054a13a806deb3846f1bbfc8e96e1d5a27de9f3a0505316f92a5c34d22cb3259136fd96f00
 MISC metadata.xml 412 BLAKE2B 3cd375059a5716aba5f14f8004970adb55bbec02cf911cc5739475a80789c86ab6d27f192e4757191be8e914e61db531b330695eba224e81273e351d507bd57b SHA512 6119e7d8b9cf779ac2070b8cbe9820849fa80542e86b353d0cab9c60bca6e5d122a1e4f57a75f3189058587e9e8c7d8c5f37e5d4a22395506c437f411df1c4e4
diff --git a/dev-ml/opam-state/files/debian-Port-to-Dose3-6.0.1.patch b/dev-ml/opam-state/files/debian-Port-to-Dose3-6.0.1.patch
new file mode 100644
index 000000000000..a8af27416df1
--- /dev/null
+++ b/dev-ml/opam-state/files/debian-Port-to-Dose3-6.0.1.patch
@@ -0,0 +1,142 @@
+From: Mehdi Dogguy <mehdi@debian.org>
+Date: Sun, 28 Feb 2021 19:27:24 +0100
+Subject: Port to Dose3 6.0.1
+
+---
+ src/client/opamAdminCheck.ml       | 2 ++
+ src/client/opamAdminRepoUpgrade.ml | 2 ++
+ src/solver/opamBuiltinMccs.ml.real | 2 +-
+ src/solver/opamCudf.ml             | 5 ++++-
+ src/solver/opamCudf.mli            | 4 ++--
+ src/solver/opamCudfSolver.ml       | 4 ++--
+ src/solver/opamSolver.ml           | 4 +++-
+ 7 files changed, 16 insertions(+), 7 deletions(-)
+
+diff --git a/src/client/opamAdminCheck.ml b/src/client/opamAdminCheck.ml
+index 05543a2..f23bfc4 100644
+--- a/src/client/opamAdminCheck.ml
++++ b/src/client/opamAdminCheck.ml
+@@ -8,6 +8,8 @@
+ (*                                                                        *)
+ (**************************************************************************)
+ 
++module Algo = Dose_algo
++
+ open OpamTypes
+ open OpamPackage.Set.Op
+ 
+diff --git a/src/client/opamAdminRepoUpgrade.ml b/src/client/opamAdminRepoUpgrade.ml
+index 0be53b2..635e792 100644
+--- a/src/client/opamAdminRepoUpgrade.ml
++++ b/src/client/opamAdminRepoUpgrade.ml
+@@ -8,6 +8,8 @@
+ (*                                                                        *)
+ (**************************************************************************)
+ 
++module Algo = Dose_algo
++
+ open OpamTypes
+ open OpamProcess.Job.Op
+ open OpamStd.Option.Op
+diff --git a/src/solver/opamBuiltinMccs.ml.real b/src/solver/opamBuiltinMccs.ml.real
+index ab39ab3..2b41982 100644
+--- a/src/solver/opamBuiltinMccs.ml.real
++++ b/src/solver/opamBuiltinMccs.ml.real
+@@ -35,7 +35,7 @@ let call solver_backend ext ~criteria ?timeout cudf =
+       ~verbose:OpamCoreConfig.(!r.debug_level >= 2)
+       ?timeout criteria cudf
+   with
+-  | None -> raise Common.CudfSolver.Unsat
++  | None -> raise Dose_common.CudfSolver.Unsat
+   | Some (preamble, univ) -> Some preamble, univ
+   | exception Mccs.Timeout -> raise Timeout
+ 
+diff --git a/src/solver/opamCudf.ml b/src/solver/opamCudf.ml
+index e07ff54..ad7293c 100644
+--- a/src/solver/opamCudf.ml
++++ b/src/solver/opamCudf.ml
+@@ -9,6 +9,9 @@
+ (*                                                                        *)
+ (**************************************************************************)
+ 
++module Common = Dose_common
++module Algo = Dose_algo
++
+ open OpamTypes
+ open OpamTypesBase
+ 
+@@ -634,7 +637,7 @@ let call_external_solver ~version_map univ req =
+       let r =
+         Algo.Depsolver.check_request_using
+           ~call_solver:(OpamSolverConfig.call_solver ~criteria)
+-          ~criteria ~explain:true cudf_request
++          ~explain:true cudf_request
+       in
+       log "Solver call done in %.3f" (chrono ());
+       r
+diff --git a/src/solver/opamCudf.mli b/src/solver/opamCudf.mli
+index cb8158d..c928ccf 100644
+--- a/src/solver/opamCudf.mli
++++ b/src/solver/opamCudf.mli
+@@ -24,7 +24,7 @@ module Map: OpamStd.MAP with type key = Cudf.package
+ module Graph: sig
+   (** Graph of cudf packages *)
+ 
+-  include module type of Algo.Defaultgraphs.PackageGraph.G
++  include module type of Dose_algo.Defaultgraphs.PackageGraph.G
+ 
+   (** Build a graph from a CUDF universe. Warning: dependency edges are towards
+       the dependency, which is the reverse of what happens in the action
+@@ -180,7 +180,7 @@ val string_of_vpkgs: Cudf_types.vpkg list -> string
+ 
+ val make_conflicts:
+   version_map:int package_map -> Cudf.universe ->
+-  Algo.Diagnostic.diagnosis -> ('a, conflict) result
++  Dose_algo.Diagnostic.diagnosis -> ('a, conflict) result
+ val cycle_conflict:
+   version_map:int package_map -> Cudf.universe ->
+   string list list -> ('a, conflict) result
+diff --git a/src/solver/opamCudfSolver.ml b/src/solver/opamCudfSolver.ml
+index 03486f1..2651373 100644
+--- a/src/solver/opamCudfSolver.ml
++++ b/src/solver/opamCudfSolver.ml
+@@ -57,7 +57,7 @@ let call_external_solver command ~criteria ?timeout (_, universe,_ as cudf) =
+     in
+     OpamFilename.remove solver_in;
+     if not (OpamFilename.exists solver_out) then
+-      raise (Common.CudfSolver.Error "no output")
++      raise (Dose_common.CudfSolver.Error "no output")
+     else if
+       (let ic = OpamFilename.open_in solver_out in
+        try
+@@ -65,7 +65,7 @@ let call_external_solver command ~criteria ?timeout (_, universe,_ as cudf) =
+          i = "FAIL"
+        with End_of_file -> close_in ic; false)
+     then
+-      raise Common.CudfSolver.Unsat
++      raise Dose_common.CudfSolver.Unsat
+     else
+     let r =
+       Cudf_parser.load_solution_from_file
+diff --git a/src/solver/opamSolver.ml b/src/solver/opamSolver.ml
+index 3748e75..bbf995f 100644
+--- a/src/solver/opamSolver.ml
++++ b/src/solver/opamSolver.ml
+@@ -9,6 +9,8 @@
+ (*                                                                        *)
+ (**************************************************************************)
+ 
++module Algo = Dose_algo
++
+ open OpamTypes
+ open OpamTypesBase
+ open OpamPackage.Set.Op
+@@ -84,7 +86,7 @@ let cudf_versions_map universe packages =
+     pmap OpamPackage.Map.empty
+ 
+ let name_to_cudf name =
+-  Common.CudfAdd.encode (OpamPackage.Name.to_string name)
++  Dose_common.CudfAdd.encode (OpamPackage.Name.to_string name)
+ 
+ let constraint_to_cudf version_map name (op,v) =
+   let nv = OpamPackage.create name v in
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
new file mode 100644
index 000000000000..ec8a0ae0e12d
--- /dev/null
+++ b/dev-ml/opam-state/opam-state-2.0.8-r1.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"
+S="${WORKDIR}/opam-${PV/_/-}"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64"
+IUSE="+ocamlopt"
+RESTRICT="test"
+
+RDEPEND="
+	dev-ml/re:=
+	dev-ml/opam-file-format:=
+	~dev-ml/opam-repository-${PV}:=
+"
+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/opam/Manifest b/dev-ml/opam/Manifest
index bc88798bebea..28888eba1682 100644
--- a/dev-ml/opam/Manifest
+++ b/dev-ml/opam/Manifest
@@ -1,3 +1,5 @@
+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 958 BLAKE2B 2226c961145ae54d6ae44533ffde97051df621f43ecc1979011398bca11e06ed3ad339e2c4c934668d1b839d7178bce8389b90a6102a3969f111693e156612f5 SHA512 5daad86b60886e02d011a22b2be48fca1751586daae90e45407547e778a067f5fa84a19e7bd7f22e36de714ac351e5ef35f509bcc68f51417e052dd1551560af
 MISC metadata.xml 412 BLAKE2B 3cd375059a5716aba5f14f8004970adb55bbec02cf911cc5739475a80789c86ab6d27f192e4757191be8e914e61db531b330695eba224e81273e351d507bd57b SHA512 6119e7d8b9cf779ac2070b8cbe9820849fa80542e86b353d0cab9c60bca6e5d122a1e4f57a75f3189058587e9e8c7d8c5f37e5d4a22395506c437f411df1c4e4
diff --git a/dev-ml/opam/files/debian-Port-to-Dose3-6.0.1.patch b/dev-ml/opam/files/debian-Port-to-Dose3-6.0.1.patch
new file mode 100644
index 000000000000..a8af27416df1
--- /dev/null
+++ b/dev-ml/opam/files/debian-Port-to-Dose3-6.0.1.patch
@@ -0,0 +1,142 @@
+From: Mehdi Dogguy <mehdi@debian.org>
+Date: Sun, 28 Feb 2021 19:27:24 +0100
+Subject: Port to Dose3 6.0.1
+
+---
+ src/client/opamAdminCheck.ml       | 2 ++
+ src/client/opamAdminRepoUpgrade.ml | 2 ++
+ src/solver/opamBuiltinMccs.ml.real | 2 +-
+ src/solver/opamCudf.ml             | 5 ++++-
+ src/solver/opamCudf.mli            | 4 ++--
+ src/solver/opamCudfSolver.ml       | 4 ++--
+ src/solver/opamSolver.ml           | 4 +++-
+ 7 files changed, 16 insertions(+), 7 deletions(-)
+
+diff --git a/src/client/opamAdminCheck.ml b/src/client/opamAdminCheck.ml
+index 05543a2..f23bfc4 100644
+--- a/src/client/opamAdminCheck.ml
++++ b/src/client/opamAdminCheck.ml
+@@ -8,6 +8,8 @@
+ (*                                                                        *)
+ (**************************************************************************)
+ 
++module Algo = Dose_algo
++
+ open OpamTypes
+ open OpamPackage.Set.Op
+ 
+diff --git a/src/client/opamAdminRepoUpgrade.ml b/src/client/opamAdminRepoUpgrade.ml
+index 0be53b2..635e792 100644
+--- a/src/client/opamAdminRepoUpgrade.ml
++++ b/src/client/opamAdminRepoUpgrade.ml
+@@ -8,6 +8,8 @@
+ (*                                                                        *)
+ (**************************************************************************)
+ 
++module Algo = Dose_algo
++
+ open OpamTypes
+ open OpamProcess.Job.Op
+ open OpamStd.Option.Op
+diff --git a/src/solver/opamBuiltinMccs.ml.real b/src/solver/opamBuiltinMccs.ml.real
+index ab39ab3..2b41982 100644
+--- a/src/solver/opamBuiltinMccs.ml.real
++++ b/src/solver/opamBuiltinMccs.ml.real
+@@ -35,7 +35,7 @@ let call solver_backend ext ~criteria ?timeout cudf =
+       ~verbose:OpamCoreConfig.(!r.debug_level >= 2)
+       ?timeout criteria cudf
+   with
+-  | None -> raise Common.CudfSolver.Unsat
++  | None -> raise Dose_common.CudfSolver.Unsat
+   | Some (preamble, univ) -> Some preamble, univ
+   | exception Mccs.Timeout -> raise Timeout
+ 
+diff --git a/src/solver/opamCudf.ml b/src/solver/opamCudf.ml
+index e07ff54..ad7293c 100644
+--- a/src/solver/opamCudf.ml
++++ b/src/solver/opamCudf.ml
+@@ -9,6 +9,9 @@
+ (*                                                                        *)
+ (**************************************************************************)
+ 
++module Common = Dose_common
++module Algo = Dose_algo
++
+ open OpamTypes
+ open OpamTypesBase
+ 
+@@ -634,7 +637,7 @@ let call_external_solver ~version_map univ req =
+       let r =
+         Algo.Depsolver.check_request_using
+           ~call_solver:(OpamSolverConfig.call_solver ~criteria)
+-          ~criteria ~explain:true cudf_request
++          ~explain:true cudf_request
+       in
+       log "Solver call done in %.3f" (chrono ());
+       r
+diff --git a/src/solver/opamCudf.mli b/src/solver/opamCudf.mli
+index cb8158d..c928ccf 100644
+--- a/src/solver/opamCudf.mli
++++ b/src/solver/opamCudf.mli
+@@ -24,7 +24,7 @@ module Map: OpamStd.MAP with type key = Cudf.package
+ module Graph: sig
+   (** Graph of cudf packages *)
+ 
+-  include module type of Algo.Defaultgraphs.PackageGraph.G
++  include module type of Dose_algo.Defaultgraphs.PackageGraph.G
+ 
+   (** Build a graph from a CUDF universe. Warning: dependency edges are towards
+       the dependency, which is the reverse of what happens in the action
+@@ -180,7 +180,7 @@ val string_of_vpkgs: Cudf_types.vpkg list -> string
+ 
+ val make_conflicts:
+   version_map:int package_map -> Cudf.universe ->
+-  Algo.Diagnostic.diagnosis -> ('a, conflict) result
++  Dose_algo.Diagnostic.diagnosis -> ('a, conflict) result
+ val cycle_conflict:
+   version_map:int package_map -> Cudf.universe ->
+   string list list -> ('a, conflict) result
+diff --git a/src/solver/opamCudfSolver.ml b/src/solver/opamCudfSolver.ml
+index 03486f1..2651373 100644
+--- a/src/solver/opamCudfSolver.ml
++++ b/src/solver/opamCudfSolver.ml
+@@ -57,7 +57,7 @@ let call_external_solver command ~criteria ?timeout (_, universe,_ as cudf) =
+     in
+     OpamFilename.remove solver_in;
+     if not (OpamFilename.exists solver_out) then
+-      raise (Common.CudfSolver.Error "no output")
++      raise (Dose_common.CudfSolver.Error "no output")
+     else if
+       (let ic = OpamFilename.open_in solver_out in
+        try
+@@ -65,7 +65,7 @@ let call_external_solver command ~criteria ?timeout (_, universe,_ as cudf) =
+          i = "FAIL"
+        with End_of_file -> close_in ic; false)
+     then
+-      raise Common.CudfSolver.Unsat
++      raise Dose_common.CudfSolver.Unsat
+     else
+     let r =
+       Cudf_parser.load_solution_from_file
+diff --git a/src/solver/opamSolver.ml b/src/solver/opamSolver.ml
+index 3748e75..bbf995f 100644
+--- a/src/solver/opamSolver.ml
++++ b/src/solver/opamSolver.ml
+@@ -9,6 +9,8 @@
+ (*                                                                        *)
+ (**************************************************************************)
+ 
++module Algo = Dose_algo
++
+ open OpamTypes
+ open OpamTypesBase
+ open OpamPackage.Set.Op
+@@ -84,7 +86,7 @@ let cudf_versions_map universe packages =
+     pmap OpamPackage.Map.empty
+ 
+ let name_to_cudf name =
+-  Common.CudfAdd.encode (OpamPackage.Name.to_string name)
++  Dose_common.CudfAdd.encode (OpamPackage.Name.to_string name)
+ 
+ let constraint_to_cudf version_map name (op,v) =
+   let nv = OpamPackage.create name v in
diff --git a/dev-ml/opam/opam-2.0.8-r2.ebuild b/dev-ml/opam/opam-2.0.8-r2.ebuild
new file mode 100644
index 000000000000..b94e4ef3bcb6
--- /dev/null
+++ b/dev-ml/opam/opam-2.0.8-r2.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"
+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 5cdad149b3a6..d61ccd5b9e49 100644
--- a/dev-ml/parmap/Manifest
+++ b/dev-ml/parmap/Manifest
@@ -1,5 +1,7 @@
 DIST parmap-1.2.1.tar.gz 47069 BLAKE2B 85d67aacff70c9d8b70c73e4673486804a0d0a4cc52391cd93bf12ed19206c11cb77066e64757f5a22352580789383e04b7d984aade5e60872be12728a173fb6 SHA512 b5ed86b464f68db625e6442606cb74c7e2b10fd066a20732e60042d32b937c20f83ff4ebf17f47b79ee6725e0de9ca42bbb050c06b47d90a27052b3b0fb07afb
+DIST parmap-1.2.3.tar.gz 47481 BLAKE2B 3c65448d244e6079444912ffaaea35982d44123f6259c2d15b7f1618afd10c79972f00f7e2744da270b298f4bca090c34c96e6e36638f2aaabba4ed774af24b5 SHA512 f050492ae1c5fc7c9d0baddaed44ea9920da7d2a5ed6455e93fd427648037a5e00051b6eaaf982174d88ed4de9b0123a1c4eff203f1ba6bef3384b5c7e2952c4
 DIST parmap-1.2.tar.gz 47083 BLAKE2B e790087273fcf749b000c7ad3a2f5b2cafea91c529e3a4687b1d882d203cb43e4069a42675319c27878d8bca3fa0e19af96ab1dfda8df3967dc48d28ec542b91 SHA512 69431e146e8aa01823ae1583c6a5e7753436cecee37c3da3064a836c20cf8c6b9033248412203406d03bd4efdd957b2e118ea5c5866e3bd1f668d8c4fd48777f
 EBUILD parmap-1.2.1.ebuild 608 BLAKE2B 92d88cdfa1a4b8d99d84592c40953d3188669e6b5720d4bb18b5fcf27e35477244085b841968cfdb612668c7447e2e77791a83e877339f8567080738899de8a6 SHA512 ebabf3baff2fa3ebc2776e280bfb6fbead79d5f0f4f4f476fe2de10d38d7e64af6896d315e2eb77488352441a3fc0d87d4267a3cdadbfb38a8047d1899845712
+EBUILD parmap-1.2.3.ebuild 608 BLAKE2B 92d88cdfa1a4b8d99d84592c40953d3188669e6b5720d4bb18b5fcf27e35477244085b841968cfdb612668c7447e2e77791a83e877339f8567080738899de8a6 SHA512 ebabf3baff2fa3ebc2776e280bfb6fbead79d5f0f4f4f476fe2de10d38d7e64af6896d315e2eb77488352441a3fc0d87d4267a3cdadbfb38a8047d1899845712
 EBUILD parmap-1.2.ebuild 602 BLAKE2B f818b95d8edfc4e83b56569ab59392fc0a142b224fa7df50b6b08e0fa1ee7df8633c36c563923b3000a2b38bc82d1976731ceca541d72ce9c24fa4e3cab109aa SHA512 4efeda43e48ddad028e583f8ebe3df12bcdf96e802de2555162569178298be87b5ce815537cefdc42c55c92eaa60f962d5ffc423f08b9087f68cdfa8c21e0f11
 MISC metadata.xml 322 BLAKE2B ce1a2f61e9f4fd4fd8286835af805812ab1fddb8cba9e85401f0967ed03ef6be8507868ef292accb826332b47f800b32229a0dc2ae62c2e8f44bae20bfcd9de4 SHA512 7d752bdbddf86b905a475ba3243f4bedfb1b07ecd70fe36f73671dd197c1bba4d1abcd8c44d4ffc94301417c33bb30e15d819645f63390d3c9ffc4f9a8fb6cd6
diff --git a/dev-ml/parmap/parmap-1.2.3.ebuild b/dev-ml/parmap/parmap-1.2.3.ebuild
new file mode 100644
index 000000000000..44ada0a27777
--- /dev/null
+++ b/dev-ml/parmap/parmap-1.2.3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+MY_PV="${PV/_/-}"
+DESCRIPTION="Library to exploit multicore architectures for OCaml programs"
+HOMEPAGE="https://www.dicosmo.org/code/parmap/"
+SRC_URI="https://github.com/rdicosmo/parmap/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV/+/-}"
+
+LICENSE="LGPL-2-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+BDEPEND="dev-ml/dune-configurator"
+RDEPEND=">=dev-lang/ocaml-4.03:=[ocamlopt?]"
+DEPEND="${RDEPEND}"
diff --git a/dev-ml/ppx_tools/Manifest b/dev-ml/ppx_tools/Manifest
index 3161f1b306bc..212305c95301 100644
--- a/dev-ml/ppx_tools/Manifest
+++ b/dev-ml/ppx_tools/Manifest
@@ -1,3 +1,5 @@
 DIST ppx_tools-6.2.tar.gz 46150 BLAKE2B f8af2a1eee81d5a1e73ac606ab79d285c8c226533bcf715ed22386aecfaf51260fb9a5075d270675f1b601cb174b68d8c85556f418031a7b6bda06c4376fe443 SHA512 fc3943c69901ef46843355c3482d5a1481d05ee94fb0a344ec04101059a02cbaa76fed5742cfae82730edf378f2e140d859a5cf590653f85359255d451f07dc8
-EBUILD ppx_tools-6.2.ebuild 502 BLAKE2B 6a1d63c8438455ab861e9442642d4f74aae65669791c74e9ac821e532fbcff27e0073a90a4bc787dec7e5ffaa19bec2aeded22c525fc68905567ece9007d8826 SHA512 28057bdec60fd7213fc656a77d780035049188fd7b98e9d45c7cfe0e35a045a9ad2199ec0701b6f317493fa6c35d33187015f8473fb6fa839de266e3b3f52367
+DIST ppx_tools-6.3.tar.gz 18811 BLAKE2B b1389dbe0c6fd855cafc8d64a9db550866317172909c2731f01acd412c6f8147f07e19a82d527187d0b211fca9eb2f2ad63bb53e8f375b0b8107c4e723710000 SHA512 6a88f6f877f49ea8736aeca60673a19c52d5104ad9e2a3e56db3f71cd557d39df9c709c4e678ccf10263ff1f3e0504f4676227bd05ceba1e0294453a988a736c
+EBUILD ppx_tools-6.2.ebuild 505 BLAKE2B 690649eab5fc48940936171e98bcf51edb1c0dafeebfe378a88b2c646f8df488270baed8845d480dfb47523819d6bc02daec4f9fd7265c4899cdd1bb4ffb5749 SHA512 c4cab13bb3694fad4c39300d31a9a81487f873eb45e0af9b243c891f646a505a2c33641cf25ddf084ae295f6577700cec8fcf478dce3c7f1b5391dee90d50b45
+EBUILD ppx_tools-6.3.ebuild 471 BLAKE2B 8eb9d070efc1b625c6f1d5e1b80babe69018e5626e1a45d37c0233f01b526707e90fae71501a227e16f3eda16ed22010ebafbf2c6fcd75df860cd6f80190786c SHA512 0cbc257b617cfd5383fdb42b130233993dc201836ea2dd29556d60e2915456b0d84bf34c5eb26f8e433af4e9ac7bd4c34560ba76e5eacffd27a9046aafca1a31
 MISC metadata.xml 330 BLAKE2B 52495fb4974c24c4cc083ea661dc08c13f4bcee587270fd157cc92d14a2abdf0272fff8f521cb010a893e47b44ac311fa06275b7ecabeed8a212495206460cd0 SHA512 1a3847e8e4675cdbe31ca7d176ac94ddb9ee3584d2b5dfc09798071a7bc10ca92bbe0e759684025563831b5e8b2f11bc51728a8b5422780c50a756e00d3ea7c5
diff --git a/dev-ml/ppx_tools/ppx_tools-6.2.ebuild b/dev-ml/ppx_tools/ppx_tools-6.2.ebuild
index 9ae7a2184389..79491ecf97b1 100644
--- a/dev-ml/ppx_tools/ppx_tools-6.2.ebuild
+++ b/dev-ml/ppx_tools/ppx_tools-6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,12 +9,11 @@ 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"
 
-DEPEND=""
-RDEPEND="${DEPEND}"
-S="${WORKDIR}/${PN}-$(ver_rs 2 '-')"
+BDEPEND="<dev-lang/ocaml-4.12.0"
diff --git a/dev-ml/ppx_tools/ppx_tools-6.3.ebuild b/dev-ml/ppx_tools/ppx_tools-6.3.ebuild
new file mode 100644
index 000000000000..1d025b5dacda
--- /dev/null
+++ b/dev-ml/ppx_tools/ppx_tools-6.3.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/topkg/Manifest b/dev-ml/topkg/Manifest
index 4c6cf42da9e4..3a14c7b38673 100644
--- a/dev-ml/topkg/Manifest
+++ b/dev-ml/topkg/Manifest
@@ -1,3 +1,3 @@
 DIST topkg-1.0.3.tar.gz 122302 BLAKE2B c3c583fe6d9c6602c9eeae6ba76f0b8e1eda754cb2ffed8f6a9b51eeea53a2d16ad0af5bf3bf1f257233481efd1e7fecfca7185773dcb4258f6a0a8195aaf61f SHA512 b4f3393b142c5c2d71bb4a25f5af020831bd48ad5c354b68cf5a2df2044b534024f0568da93ad26ca383c97ba4277b4878dba7ce9267146f3805c67f52950cbf
-EBUILD topkg-1.0.3.ebuild 916 BLAKE2B 7dd8e37be175b40619bb839898bdf718f512c40b9da5dcf161ae2450686e69ac4fbcea35dba3d76d529dcc7e31b31fc6aad4ebddf7e636d6067dc10cd2c5c9eb SHA512 142e65e46aff6ea85e88c2eca3a855d1f53510d7200256fa595b7f8dcfa9bf060fb05b456adc234196041c35d8051f4c8ab7ad6ad4e001b2bdc9a99f24e571eb
+EBUILD topkg-1.0.3.ebuild 976 BLAKE2B 0289324149c3a3c009222e436f25cd926957563db7f20486eaae4b08dc86f114b4a39dce137a6624d243a474f95e8207aa96b3acf4b1b74109cb0c5832bd82c2 SHA512 71b84b60aabb2ff9d2c9a139dd838394a47f52f36d742e21bdb2151cffe103dcf9ac0ce505acde463d1a10e1d6728052b0fdc37fa19ff683c3972c14392a67f8
 MISC metadata.xml 323 BLAKE2B f100a88587e1fed61b21439574a4ab40316daf7389f6ccc48d58dd2c3c52dc78945bfdb68b04759cf27b27ee4830f8f58ed88fb13f1d3b250931cced000f0449 SHA512 d2a20e5e628dc479e33282f2ebd612004040ff05208916aa695db6393f762ab88e3bd19814c25a532b825a0720b6974f9c726d5153d668dca34ac528e4f51bff
diff --git a/dev-ml/topkg/topkg-1.0.3.ebuild b/dev-ml/topkg/topkg-1.0.3.ebuild
index 15977974d687..6afcb25f56be 100644
--- a/dev-ml/topkg/topkg-1.0.3.ebuild
+++ b/dev-ml/topkg/topkg-1.0.3.ebuild
@@ -12,12 +12,12 @@ SRC_URI="https://github.com/dbuenzli/topkg/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="ISC"
 SLOT="0/${PV}"
 KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
-IUSE=""
+IUSE="+ocamlopt"
 
 RDEPEND="dev-ml/result:=
 	dev-ml/ocamlbuild:=
 	dev-ml/findlib:=
-	dev-lang/ocaml:="
+	dev-lang/ocaml:=[ocamlopt?]"
 DEPEND="${RDEPEND}"
 
 src_compile() {
@@ -27,7 +27,12 @@ src_compile() {
 src_install() {
 	# Can't use opam-installer here as it is an opam dep...
 	findlib_src_preinst
-	local nativelibs="$(echo _build/src/${PN}*.cm{x,xa,xs,ti} _build/src/${PN}.a)"
+
+	local nativelibs
+	if use ocamlopt; then
+		nativelibs=$(echo _build/src/${PN}*.cm{x,xa,xs,ti} _build/src/${PN}.a)
+	fi
+
 	ocamlfind install ${PN} _build/pkg/META _build/src/${PN}.mli _build/src/${PN}.cm{a,i} ${nativelibs} || die
 	dodoc CHANGES.md DEVEL.md README.md
 }
diff --git a/dev-ml/uuidm/Manifest b/dev-ml/uuidm/Manifest
index 8f55db9c7e19..8edeefd71f4a 100644
--- a/dev-ml/uuidm/Manifest
+++ b/dev-ml/uuidm/Manifest
@@ -1,3 +1,3 @@
 DIST uuidm-0.9.7.tar.gz 9258 BLAKE2B 37867ee562fcf5c44e0f40df53707a5066d74c185037049b4b4034326e1efa93543d518f6c9d5d27e9663f18d824f951d27952c844e1169d951abb7b91caeebb SHA512 7048e467bbd9eefd19ca057caadcc8f634d4eae7642665a84df88f726df3fb849085613d75a485272b0d0e19c9041c560a8c864e780dbed29ff68e3cfa8ba3d4
-EBUILD uuidm-0.9.7.ebuild 539 BLAKE2B 7ecf4c8fac51d9736fadb476f6a02525d79168e1be229ff287397cb03528564b0a9ca86e386ee56227ad40712afafe0c6c821251c0247d2be3f3cf911c135796 SHA512 260f52476552078ccc6f312359ff8b1467bcd5a9124a5b68accd583bb77126d455569b2923fab0593e1964852bdd8e11878a9a4a773c3b2f697c38e84f01674f
+EBUILD uuidm-0.9.7.ebuild 538 BLAKE2B 73d291820e57a98b32aad5fd8aef8c2224633613c3874414192a86028a22d1510e4ad09b26881caeb3bb3a0d6209efa3786dff6129d4bb5af9ea6ae7fea3adcc SHA512 891c684017a857457d89f292e3a68825b7da2e41a5490b10d6f2b4929b6c2320ff4a3736c1d6ad53da1a26c50f0ac9eec898210297b4c6dfe7cc0b71a8ab45e0
 MISC metadata.xml 311 BLAKE2B 75a1f9b63ac21f0a74bc7fafcdd6917c54bb97983c39e56de05c4b07611ce2011f635376453fb8493cf5d29714defabe2d67193ab03f6a8fc5a917700e171cf3 SHA512 87a9ab7d29495118af3ad93e9a231e6f1c204a744c570fa7896a44d7982e737cb96cb6233b0fe4ac6137d34af145323fe0a5d7d86ac44c5037f003a2ae9358f8
diff --git a/dev-ml/uuidm/uuidm-0.9.7.ebuild b/dev-ml/uuidm/uuidm-0.9.7.ebuild
index 8e3ae67156f2..2fa0da124426 100644
--- a/dev-ml/uuidm/uuidm-0.9.7.ebuild
+++ b/dev-ml/uuidm/uuidm-0.9.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/dbuenzli/uuidm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt"
 
 BDEPEND="