gentoo resync : 09.07.2022

36 files changed, 271 insertions, 148 deletions

diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index db03b7165123..f6f3a9ce6e91 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/batteries/Manifest b/dev-ml/batteries/Manifest
index a0569da2dc24..aff6ff6a9b98 100644
--- a/dev-ml/batteries/Manifest
+++ b/dev-ml/batteries/Manifest
@@ -1,3 +1,3 @@
 DIST batteries-3.4.0.tar.gz 827778 BLAKE2B 569ce623ceb4272de784400540969a08d569a9b42e281f8001f046733a0fab6f50f4c195b8a8eec7f2e63209a1b882d6703843f76ec9adbfeb42d11e09b31f81 SHA512 e7a6e258430ec5bb97a1e83c7eb666c970db8bce82de4bf809797cf5e330ea987fe685008c4adb0ac4787c4cc6a1be06f6eae5a7ca856a1a0f83aa35716c23bd
-EBUILD batteries-3.4.0.ebuild 616 BLAKE2B e32aff29c535e0709d5753c599486560a817cd55d90929b3b3f1282621fba0870c8502582d44b74e82042ec37f9689047b4304bcdcea23b21cc29e46ea297f67 SHA512 ae94afdc30cfca552af14c5a2d082d5ef05f92052c403aa16d28957fbbc5c29e302364bcb3ba6b334c2103a5db7b213683a6bb9e8d934d2a6333b3ff6474a76a
+EBUILD batteries-3.4.0.ebuild 683 BLAKE2B a2a4cfce89cfd05378a536456718a6f530cfe7bc99027bec248a4b796db1e5ae8662b06e90d93f60ec89f6b5a8d878b521785ebb8a5058fb82a16aae066f2908 SHA512 95363d9c15012a6816c80246842a0aeecf2e45e88372ee77268eebbe49ff101500ec8c00935037b4eb94dc2dfa650868b1b311b4c8dddb68af2a96797f596830
 MISC metadata.xml 337 BLAKE2B 2cb7f9b54ec498c0b25f3f6cb2011046c38c0103341f22dea799e2fe501c46336950040fcfb8fe3fd4723aa5f499e00e6b0dae364a8fc06b84aa348ddebea0c2 SHA512 88a13f02eead4f3c06bdfa1850ee53ee6d309181d89a0625a89dfa3e421f3f7cb3d896cc2f69f4ddf6cef05f1bff932b6c2d79b791d69b65a21afed822637ded
diff --git a/dev-ml/batteries/batteries-3.4.0.ebuild b/dev-ml/batteries/batteries-3.4.0.ebuild
index c2f48c5b9535..7ed00dd97cf9 100644
--- a/dev-ml/batteries/batteries-3.4.0.ebuild
+++ b/dev-ml/batteries/batteries-3.4.0.ebuild
@@ -22,6 +22,10 @@ BDEPEND="dev-ml/ocamlbuild"
 
 S="${WORKDIR}"/batteries-included-${PV}
 
+src_compile() {
+	emake BATTERIES_NATIVE=$(usex ocamlopt yes no)
+}
+
 src_install() {
 	findlib_src_install
 }
diff --git a/dev-ml/dune-configurator/Manifest b/dev-ml/dune-configurator/Manifest
index 0e8ebaf6432e..7d1a65111221 100644
--- a/dev-ml/dune-configurator/Manifest
+++ b/dev-ml/dune-configurator/Manifest
@@ -3,9 +3,9 @@ DIST dune-2.8.4.tar.gz 1372925 BLAKE2B 5b6d6738a0dc701d852e6cc59a1998f64c006d233
 DIST dune-2.9.0.tar.gz 1385143 BLAKE2B c973e4b2c5780a3e4902c31c030b2560fe5be313338a5188edc9b7ff97b63968baba267966d095076bed4f1527a8b8b5a0f980e74f53476d70ec53f20dc661a6 SHA512 1c3b64746b00215cd97b36c0f1c6e2416c9d15c795265634240e9da37e2c2fce02ab3c309a0cb967f9f20a5c6df14e943c3c2942c1a8f4743c3a19c699f4eb24
 DIST dune-2.9.1.tar.gz 1385381 BLAKE2B 27224f803547d02f7110dcfc486ef41f9a4586f6f862ef7f8bbf05cc1f3f6dc8ea03fca99c01842f4226ea3d08f4127daa0e5811dd46cc00f1b96ad7eaafe43d SHA512 4fcff34de4acc4429dd73864ca90e695d8ba436839fd679608f7db292e44be70c3db455a58f59477f2055f84ce497bfa8e90e485ed9536acad3c1b3be3d4be77
 DIST dune-2.9.3.tar.gz 1387667 BLAKE2B 3db54c780b9d13f40c774f53c3fe471dba4a640e7cb5aa5d70ef1dc20a217b95a66149ca5f99f07f3a20450577d622e0cda149f656f06f5a42231b89667c1152 SHA512 df6e06a9beebf41f3ed375384be781b5c87c7949048995cc0bbad13dd65c96bd8b27415cd41e43b1112bd86524a59a7dd418e14b5c72b4f1f8fd4ac5ca2d1494
-EBUILD dune-configurator-2.8.2-r1.ebuild 3674 BLAKE2B a8a1136d194372e2dfed3129ea25bb676af3f2ccd3fd2a62cb5fddebee66e1edd989ee3e8a15b16ccb63a5ca6466b3a47dd831d5bbb3e52dcde20be28df6f0d9 SHA512 2f84754ab2cbb092a5aea3c5a4af6bc7c1e901218f575b198e441425b7504b39b63ffc45418d5ba578b544efaa9269dcb2f5c3200caa8b1f00958430f7f37e73
-EBUILD dune-configurator-2.8.4.ebuild 4096 BLAKE2B ad857a5c93561b6558ca871b39ea8e304307e196d21b823d3bcee666f44a3eeb160482357305e013cfaa08d4c5e01e18d710d6eee4b96e6f326aff5b99dfc8b1 SHA512 5831e1c93e88cb4438019319e219c07cf90c3f2cc7ef8d25b4b126ffdc1bbbe8d138460f8318913647224ef4ee9949e055760c1d0e3de6f153f1a626defcff23
-EBUILD dune-configurator-2.9.0.ebuild 4101 BLAKE2B fa84f951fac3a9e4882c3542cdbcbe0b8e0ef5ce6bc8835481a33e95dc216b29b662b4c4d995f7ad17b10a68ed53f422973c82d355a41f12c9ad00758bb5cc17 SHA512 d98dd50f8d1a1624aaf7b76d1a3827560324f0eff3e5040643794ed0f6385c8ddaefbed05f471b7119fb757b15673a6907f622891ef11ae8c71e233c45a82f6c
-EBUILD dune-configurator-2.9.1.ebuild 4097 BLAKE2B 8f1426be7f8513b3bc962a2d0fc4540442513375e3fe71d07eda106db0665c2e735ffb48f2205e3bbd8e8b146c8ad6db6b1e14ae08a2f7a67773ef7538da24a3 SHA512 d16f4bf7c9841b1ab41b21deb90c8456b085bb5f642899e7eceea44a7dc4d92b5897d8bd7657eb0e2dc3a64fb07ee318b5f0a7e407730f7b41c32bd86d3d9f56
-EBUILD dune-configurator-2.9.3.ebuild 4108 BLAKE2B 4f1f6514390fc26aee77ce6871bb3747e54c3f5939be8d89300a6706fd8f32e401583b8439009ef17e0c9a28b5ea90848ff3c2352830c2b24d9a52a747ecb6ec SHA512 bee524af372b0ed01cded8b005d1f12df5f95f361c4373dbd23fca5b05e0b2213bdf2049f0669e78518befb6b65732f6681e5870bbfd81cd12ae8999f044cd5c
+EBUILD dune-configurator-2.8.2-r1.ebuild 3674 BLAKE2B a10101174b47a78f7d43b519a3f9c679195bf3018d9f5c10028193c1b336d7685dbfe165bbdd5808ee7f33afb6539355275bab1870b24fe79ffc1bc8e922959e SHA512 74c42ce3aeac5166b883c1d49e848e3bfc9aa4be55cec867aad5a13ff84072540cf3562c9738551667bb9679fca2952df25ce7712c7e3d50d70b4a50bf76c06d
+EBUILD dune-configurator-2.8.4.ebuild 4096 BLAKE2B e5a5aa47665e30b13f1a158149f235156ec8e0b0e3172fb4629532f991b9bc86080d1d303f734e0fb215502151911d41fbed9cddd53d86ae13e7e70e11c8d7ab SHA512 bb7f6f2acb81a18fc9e0c3c67819a1724cbc2f643405c447e67d1bc17ea3e3a9e9194cdceeff0cf04dcf38bc154d31650a203beefc87dea9b8fa74e9f5d17873
+EBUILD dune-configurator-2.9.0.ebuild 4101 BLAKE2B 8bb4f675f20f90488fc5a1a0091bd7460d41750994e2d0a6f12d167ae28a58358c50aeb67b797330269531c410a3ece9e9578dc3cfd59fdec3abb34f95edf2e7 SHA512 6d3aae408b0a8f25af446f03bfdb0a49a6ff661a211aec5d85cdecf7bc2f5fb71feebe69f9422c78d8666af78d0e03d0e28fd33717d61a2972c9b6b74cd3a9d8
+EBUILD dune-configurator-2.9.1.ebuild 4097 BLAKE2B 00fd8af27ed27321fc506d177f4ac3f822783f30fc612bb97891192ca4cc046aed50da0a87878a5a7dfd8dee1ad24b68acada59a55ed7b733290222723e4c86a SHA512 dae9de72741c9f5e1e3c48e32727d4779e9ccc739df6c6d2fbfd3b526406eff78fa2cf42217d0b99ee0fae6109abee0cc71990619fa56ab5b5f8ae039bc29a4e
+EBUILD dune-configurator-2.9.3.ebuild 4108 BLAKE2B b8a4f5272c4233c2240c45cd9b91cd24ed090a05c8ab86c119c9451c4b145517db3fb32760cdf5610a578a2d8afd88702183fd9a9c81ac08cd99f0c245e1ea7b SHA512 03087f5418c27bc21d1785c943ba44356c0b90d565ef24a9734e300c0ff74c1b7ce4842fe5eb7321f503a443a80460fd3276630af5a7a68ca3161927dde96823
 MISC metadata.xml 413 BLAKE2B 68bcbe6d091780d3ea48707a42b402cfcc075b1ca0c58a8e145bc8ae6e89806361325f772e9e8b05484fc258f09e33c18fa329a494881e3275f534c65b283c15 SHA512 6520ccff6f2071125a07d0e6bc365c8a919ff32791af97fc633ef68b351de8295454884126334e182da7233744d489acfeb2519c3935990ad21eb20da3f5a1f9
diff --git a/dev-ml/dune-configurator/dune-configurator-2.8.2-r1.ebuild b/dev-ml/dune-configurator/dune-configurator-2.8.2-r1.ebuild
index 1dd2e0cac8b3..7e06d1ff65d3 100644
--- a/dev-ml/dune-configurator/dune-configurator-2.8.2-r1.ebuild
+++ b/dev-ml/dune-configurator/dune-configurator-2.8.2-r1.ebuild
@@ -17,9 +17,9 @@ IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	~dev-ml/dune-private-libs-${PV}:=[ocamlopt=]
-	dev-ml/csexp:=[ocamlopt=]
-	dev-ml/result:=[ocamlopt=]
+	~dev-ml/dune-private-libs-${PV}:=[ocamlopt?]
+	dev-ml/csexp:=[ocamlopt?]
+	dev-ml/result:=[ocamlopt?]
 "
 DEPEND="${RDEPEND}
 	test? (
diff --git a/dev-ml/dune-configurator/dune-configurator-2.8.4.ebuild b/dev-ml/dune-configurator/dune-configurator-2.8.4.ebuild
index 8a3d59cf3d8b..17c58e633847 100644
--- a/dev-ml/dune-configurator/dune-configurator-2.8.4.ebuild
+++ b/dev-ml/dune-configurator/dune-configurator-2.8.4.ebuild
@@ -17,9 +17,9 @@ IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	~dev-ml/dune-private-libs-${PV}:=[ocamlopt=]
-	dev-ml/csexp:=[ocamlopt=]
-	dev-ml/result:=[ocamlopt=]
+	~dev-ml/dune-private-libs-${PV}:=[ocamlopt?]
+	dev-ml/csexp:=[ocamlopt?]
+	dev-ml/result:=[ocamlopt?]
 "
 DEPEND="${RDEPEND}
 	test? (
diff --git a/dev-ml/dune-configurator/dune-configurator-2.9.0.ebuild b/dev-ml/dune-configurator/dune-configurator-2.9.0.ebuild
index a8a42765fa98..9872ea859a4f 100644
--- a/dev-ml/dune-configurator/dune-configurator-2.9.0.ebuild
+++ b/dev-ml/dune-configurator/dune-configurator-2.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,8 +18,8 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	~dev-ml/dune-private-libs-${PV}:=[ocamlopt=]
-	dev-ml/csexp:=[ocamlopt=]
-	dev-ml/result:=[ocamlopt=]
+	dev-ml/csexp:=[ocamlopt?]
+	dev-ml/result:=[ocamlopt?]
 "
 DEPEND="${RDEPEND}
 	test? (
diff --git a/dev-ml/dune-configurator/dune-configurator-2.9.1.ebuild b/dev-ml/dune-configurator/dune-configurator-2.9.1.ebuild
index b781e0525f03..e2e67518ea4c 100644
--- a/dev-ml/dune-configurator/dune-configurator-2.9.1.ebuild
+++ b/dev-ml/dune-configurator/dune-configurator-2.9.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,9 +17,9 @@ IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	~dev-ml/dune-private-libs-${PV}:=[ocamlopt=]
-	dev-ml/csexp:=[ocamlopt=]
-	dev-ml/result:=[ocamlopt=]
+	~dev-ml/dune-private-libs-${PV}:=[ocamlopt?]
+	dev-ml/csexp:=[ocamlopt?]
+	dev-ml/result:=[ocamlopt?]
 "
 DEPEND="${RDEPEND}
 	test? (
diff --git a/dev-ml/dune-configurator/dune-configurator-2.9.3.ebuild b/dev-ml/dune-configurator/dune-configurator-2.9.3.ebuild
index 53d42345b564..289317f1072a 100644
--- a/dev-ml/dune-configurator/dune-configurator-2.9.3.ebuild
+++ b/dev-ml/dune-configurator/dune-configurator-2.9.3.ebuild
@@ -17,9 +17,9 @@ IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	~dev-ml/dune-private-libs-${PV}:=[ocamlopt=]
-	dev-ml/csexp:=[ocamlopt=]
-	dev-ml/result:=[ocamlopt=]
+	~dev-ml/dune-private-libs-${PV}:=[ocamlopt?]
+	dev-ml/csexp:=[ocamlopt?]
+	dev-ml/result:=[ocamlopt?]
 "
 DEPEND="${RDEPEND}
 	test? (
diff --git a/dev-ml/dune-private-libs/Manifest b/dev-ml/dune-private-libs/Manifest
index 09dbec1d3538..d83fa7f4e519 100644
--- a/dev-ml/dune-private-libs/Manifest
+++ b/dev-ml/dune-private-libs/Manifest
@@ -3,9 +3,9 @@ DIST dune-2.8.4.tar.gz 1372925 BLAKE2B 5b6d6738a0dc701d852e6cc59a1998f64c006d233
 DIST dune-2.9.0.tar.gz 1385143 BLAKE2B c973e4b2c5780a3e4902c31c030b2560fe5be313338a5188edc9b7ff97b63968baba267966d095076bed4f1527a8b8b5a0f980e74f53476d70ec53f20dc661a6 SHA512 1c3b64746b00215cd97b36c0f1c6e2416c9d15c795265634240e9da37e2c2fce02ab3c309a0cb967f9f20a5c6df14e943c3c2942c1a8f4743c3a19c699f4eb24
 DIST dune-2.9.1.tar.gz 1385381 BLAKE2B 27224f803547d02f7110dcfc486ef41f9a4586f6f862ef7f8bbf05cc1f3f6dc8ea03fca99c01842f4226ea3d08f4127daa0e5811dd46cc00f1b96ad7eaafe43d SHA512 4fcff34de4acc4429dd73864ca90e695d8ba436839fd679608f7db292e44be70c3db455a58f59477f2055f84ce497bfa8e90e485ed9536acad3c1b3be3d4be77
 DIST dune-2.9.3.tar.gz 1387667 BLAKE2B 3db54c780b9d13f40c774f53c3fe471dba4a640e7cb5aa5d70ef1dc20a217b95a66149ca5f99f07f3a20450577d622e0cda149f656f06f5a42231b89667c1152 SHA512 df6e06a9beebf41f3ed375384be781b5c87c7949048995cc0bbad13dd65c96bd8b27415cd41e43b1112bd86524a59a7dd418e14b5c72b4f1f8fd4ac5ca2d1494
-EBUILD dune-private-libs-2.8.2-r1.ebuild 3692 BLAKE2B 7984b06ad342635ee569ca5cc31a974e88abf3114e740ad98c6232812449c59dec4e9606fd0c348a747e3078b4a10a2d853a610441edb5e5a2c6aa95b5ba62e0 SHA512 7bafbb705d9ce7d4e300d17bf71ae70d37caa50f336fa0d08561c3ae9fb55ec6199dd12c054d359f9a3ff2f9880d0dd8fca4694dd1843dc6c855e7830bd9a507
-EBUILD dune-private-libs-2.8.4.ebuild 4114 BLAKE2B 5d5ef298efd15cda72681fc9a3b7d9e0baed02b6c3ef382a33d1c9eac12e107a9249dda6cbb826610f9bdbcd3dee1863c2f6427f418f69da25e095448c7add16 SHA512 747ac92df9cacfbc7ce23aafbe753d800b9487b9ba706adfe91ea047b21e3b01d22403d78e916a8eb6126a401f1db5b3ecd9a06e3addecf71c265e60103a1a3b
-EBUILD dune-private-libs-2.9.0.ebuild 4119 BLAKE2B eaea1ebab708adcbd6d1807cb2a14010e3cac7d7dbaeaa12c291ea2d2c4dc804a5e34a4a2c02ac342f73d98f09156ceb5bee510fe0d15dc91bbfdf7afd70dc2e SHA512 458293150214b84f21c2aa64923bf04fe49e7f7d1bd075219e12bed6ccf989bc2af492c15e0b18979e85483c15e13a35d481c3a1f18540b27a14d3302105f49a
-EBUILD dune-private-libs-2.9.1.ebuild 4115 BLAKE2B f11748a476cf78bc630d0672a9e94d5c7a2e3a7ae0ddc85ddb6489fdcae825faeb13587fdcfd8e04899fd26e3d35138ba62ac695cdcd859c0e02edba1a47e34a SHA512 cf4f33ccdbcaaec6ae90b2a4fbf6c0d0830a50c98dc2de49d492fad1838b61fcb0b295133e88c2017aea77e6484a69ae308af3eeed9820612ae5e255828e55c1
-EBUILD dune-private-libs-2.9.3.ebuild 4126 BLAKE2B c416f8e27554cac82a27f12e7cdbbd6065f58954b9a15ff287dcceac8a580666ef58a12d5a7cee83a1883bcf4442ff5e7f79455fab60273a039608a4c525726a SHA512 9bec16e2c04c3dcd9e66bc112b28e09796a956343d618a5f28fcdec13aac42852ac9237a973d0b1f7fceada8fafb03af7518bb9af769b1f402a6acb9d670ed5c
+EBUILD dune-private-libs-2.8.2-r1.ebuild 3692 BLAKE2B 3caa65aff8a2dd76617da19bd8fce451e40edb14c2032c30e28146477f908818928bdf5b360812e040bb5ac549838eaddf8e1aad82eee1cf9778c905027ad8b7 SHA512 57756b54dd487210cb39c089aea6485e5fb2cf0be186b2569a170bcf17157f9722a705b10e6aaf17c3f78a38b9b58a885804fb5639150ba75729ab02f18aa53b
+EBUILD dune-private-libs-2.8.4.ebuild 4114 BLAKE2B fade94617c408e800bcc4abbf6adf312307d620172a8dfd39215add9b487c559f83829d442d9da4763e6f33e68011518751ff6fa7222b410953e42aa5377d94a SHA512 76da3dd2a3c2d6fb9ca5f3433cf0315c9cd7664f5f0cb57daffaabf87b2f12eca779fa5feddf5483c59aa90b091c3715a1e49e3b61eb1e03297ccec655d0c0ca
+EBUILD dune-private-libs-2.9.0.ebuild 4119 BLAKE2B 045bfdc56dc597cf9e44cf28bbbc2945caec36d4b6488522485f1bf21dc874bb7c8840a809f4b1fb1667b19d55960b876752a631e2f1ca391fdde32d64c6598c SHA512 e5188bb3e2f4041510dab4d185cdab9318cf5b900be90a42a219b0793343a976b14173acca68e9f2429643e0ff0b440a77251f3e2c0113975a7afc7066f9b629
+EBUILD dune-private-libs-2.9.1.ebuild 4115 BLAKE2B 6af9fcd40c24f75a11decb2f5d51250af5ab97b50449989910e3248cb3e4b4ef0196b1c9d2f0a9c2ac4b9ddf90f09b4179d763caf60ea7ac7fe6dc84140860f6 SHA512 5d4c3930f84b78f4ca45de2f220cf3dda10eb818decb7cc8a6fb0fb75988a763adfb036c8d8dc834254d733faad506f3be5662d6dcba581af4278205b296ee12
+EBUILD dune-private-libs-2.9.3.ebuild 4126 BLAKE2B 973f7b286d6dd062c716ef178b65f17c6fd0d2dbad3dfd025238a2ad3510509de5b77fa9d084ccf94f2d334460787fa917a48496000962d46ba63660af6e77d0 SHA512 54a424e4c581273613cfd198721687a9d70bda83dd63a4aa6bc86959ef4d3c44e3fd4138387ab4b67fdb7ac74c06a23956beaf3d8aaa8087fe9401c9d2313ade
 MISC metadata.xml 413 BLAKE2B 68bcbe6d091780d3ea48707a42b402cfcc075b1ca0c58a8e145bc8ae6e89806361325f772e9e8b05484fc258f09e33c18fa329a494881e3275f534c65b283c15 SHA512 6520ccff6f2071125a07d0e6bc365c8a919ff32791af97fc633ef68b351de8295454884126334e182da7233744d489acfeb2519c3935990ad21eb20da3f5a1f9
diff --git a/dev-ml/dune-private-libs/dune-private-libs-2.8.2-r1.ebuild b/dev-ml/dune-private-libs/dune-private-libs-2.8.2-r1.ebuild
index 4e6004bcf68c..60315eb2cadf 100644
--- a/dev-ml/dune-private-libs/dune-private-libs-2.8.2-r1.ebuild
+++ b/dev-ml/dune-private-libs/dune-private-libs-2.8.2-r1.ebuild
@@ -26,8 +26,8 @@ BDEPEND="
 	)
 "
 DEPEND="
-	dev-ml/csexp:=[ocamlopt=]
-	dev-ml/findlib:=[ocamlopt=]
+	dev-ml/csexp:=[ocamlopt?]
+	dev-ml/findlib:=[ocamlopt?]
 	>=dev-lang/ocaml-4.09:=
 "
 RDEPEND="${DEPEND}"
diff --git a/dev-ml/dune-private-libs/dune-private-libs-2.8.4.ebuild b/dev-ml/dune-private-libs/dune-private-libs-2.8.4.ebuild
index 2bdd028a84ed..17169982c7f9 100644
--- a/dev-ml/dune-private-libs/dune-private-libs-2.8.4.ebuild
+++ b/dev-ml/dune-private-libs/dune-private-libs-2.8.4.ebuild
@@ -26,8 +26,8 @@ BDEPEND="
 	)
 "
 DEPEND="
-	dev-ml/csexp:=[ocamlopt=]
-	dev-ml/findlib:=[ocamlopt=]
+	dev-ml/csexp:=[ocamlopt?]
+	dev-ml/findlib:=[ocamlopt?]
 	>=dev-lang/ocaml-4.09:=
 "
 RDEPEND="${DEPEND}"
diff --git a/dev-ml/dune-private-libs/dune-private-libs-2.9.0.ebuild b/dev-ml/dune-private-libs/dune-private-libs-2.9.0.ebuild
index 7b6b59feb352..ab2072885f70 100644
--- a/dev-ml/dune-private-libs/dune-private-libs-2.9.0.ebuild
+++ b/dev-ml/dune-private-libs/dune-private-libs-2.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -26,8 +26,8 @@ BDEPEND="
 	)
 "
 DEPEND="
-	dev-ml/csexp:=[ocamlopt=]
-	dev-ml/findlib:=[ocamlopt=]
+	dev-ml/csexp:=[ocamlopt?]
+	dev-ml/findlib:=[ocamlopt?]
 	>=dev-lang/ocaml-4.09:=
 "
 RDEPEND="${DEPEND}"
diff --git a/dev-ml/dune-private-libs/dune-private-libs-2.9.1.ebuild b/dev-ml/dune-private-libs/dune-private-libs-2.9.1.ebuild
index 2fac15d055e9..9ad9f342b922 100644
--- a/dev-ml/dune-private-libs/dune-private-libs-2.9.1.ebuild
+++ b/dev-ml/dune-private-libs/dune-private-libs-2.9.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -26,8 +26,8 @@ BDEPEND="
 	)
 "
 DEPEND="
-	dev-ml/csexp:=[ocamlopt=]
-	dev-ml/findlib:=[ocamlopt=]
+	dev-ml/csexp:=[ocamlopt?]
+	dev-ml/findlib:=[ocamlopt?]
 	>=dev-lang/ocaml-4.09:=
 "
 RDEPEND="${DEPEND}"
diff --git a/dev-ml/dune-private-libs/dune-private-libs-2.9.3.ebuild b/dev-ml/dune-private-libs/dune-private-libs-2.9.3.ebuild
index 4a135c14f509..051a8304752e 100644
--- a/dev-ml/dune-private-libs/dune-private-libs-2.9.3.ebuild
+++ b/dev-ml/dune-private-libs/dune-private-libs-2.9.3.ebuild
@@ -26,8 +26,8 @@ BDEPEND="
 	)
 "
 DEPEND="
-	dev-ml/csexp:=[ocamlopt=]
-	dev-ml/findlib:=[ocamlopt=]
+	dev-ml/csexp:=[ocamlopt?]
+	dev-ml/findlib:=[ocamlopt?]
 	>=dev-lang/ocaml-4.09:=
 "
 RDEPEND="${DEPEND}"
diff --git a/dev-ml/luv/Manifest b/dev-ml/luv/Manifest
index 486137375c30..eaaa6ad238c6 100644
--- a/dev-ml/luv/Manifest
+++ b/dev-ml/luv/Manifest
@@ -1,5 +1,5 @@
 DIST luv-0.5.10.tar.gz 805333 BLAKE2B 23edd2bc870a2886e560d330d9a20b205a77ea7bc8ed631e00e43819474eeb75246b407113b59ed9c5f74462ad5f721338ac5a157a1fe0e443abf9ff88771089 SHA512 c50a0def366944b4ef6038503ecefe75d8e45f542311198531f01a355675c08b00370480141b455616429a883c3232d34628e6a67846db5864a1b0eabfe6311f
 DIST luv-0.5.11.tar.gz 809549 BLAKE2B 932bf48cb2d9ca32777d3c3d7457db5f4fb9dbfd51a8efbdf9282a9ebd941c53c56d7c17cf5e502c0e742dea1d1d76623d4adad32476fb36a0c08efded331f98 SHA512 8d1d7842583b02b906d89fe14bda5a66809d8ef7185efbe95e0fe7df619b795ad89fcbf16bfe1c3e92cef8721fe3d4e6192cabe215f3fe13b33de7335783e5f3
 EBUILD luv-0.5.10-r3.ebuild 769 BLAKE2B a708d2d80c8c0e8bd6e1c2103096b77cbf72b1dfb69c0c920217adf7ff63bd6d43b7d7977cb1ad0978b1b8f775dd8833f8d81cb3e868922848465e2cadacaa0a SHA512 d00aff7e5a8bb84080ca886f004867470afe3d0c25523a3105932088551bd94f004d0f0328533c5dd2bcdd80bda03c0d57fb3b438915fed99b8d41fb16881db7
-EBUILD luv-0.5.11.ebuild 769 BLAKE2B ab85f4b6d16366ec08ebe52b3ee35ef97c5eb3c3dc66306a5e4afd8ef1923aaf289944e4fe7f0babf8718e7cd3bd336b092019b2ed190087381bfd8dd23b28e3 SHA512 bc26bcacc4535c0a751a50327c9750d7c0365825544dffa1bb742b72f1acc093dbc6cd5a9624b6fbd0e2a23519eba0e9e76527a865ccd9555c134b23dd26f1b9
+EBUILD luv-0.5.11-r1.ebuild 831 BLAKE2B e737221be9f5701d66c921c9802fcf37830fd25fbaa00f68828d8a9380f7341c1c5eb1c5d524f8496c37095f29311d6c9cde285453d12db358fb7da15cb9fe79 SHA512 6124310798f457cd32e91a0ceab5207db663247d362ed2e8b6b791ea77435e9eeb266e7a39674b9872a630413a9a96a0ed5af9016d7ff1580795563c0798cc5c
 MISC metadata.xml 309 BLAKE2B 2571e139ee75123b88f05751d493805433dd5f22ac3f06e82adf97017f53fa54c1870ee947b4e98ed55d4f134b837e1850d86fb10e6db43f0c37f1d54a2a07db SHA512 a917d2ea07601ed6c8d9386ce92deb19dfa0a37e3cf42b7808cb9e6e47ad57b1a9495f4b5f43695bd13d1a09837e40ae265bcb1b6bac30e62fec39bee1728456
diff --git a/dev-ml/luv/luv-0.5.11.ebuild b/dev-ml/luv/luv-0.5.11-r1.ebuild
index 8e33c29ce697..a9991c67df1d 100644
--- a/dev-ml/luv/luv-0.5.11.ebuild
+++ b/dev-ml/luv/luv-0.5.11-r1.ebuild
@@ -30,3 +30,7 @@ src_prepare() {
 
 	cp "${BROOT}"/usr/share/gnuconfig/config.{guess,sub} src/c/vendor/configure/ || die
 }
+
+src_compile() {
+	LUV_USE_SYSTEM_LIBUV=yes dune_src_compile
+}
diff --git a/dev-ml/ocaml-ctypes/Manifest b/dev-ml/ocaml-ctypes/Manifest
index a782025ff45b..97df180c9337 100644
--- a/dev-ml/ocaml-ctypes/Manifest
+++ b/dev-ml/ocaml-ctypes/Manifest
@@ -1,7 +1,7 @@
 DIST ocaml-ctypes-0.17.1.tar.gz 208101 BLAKE2B b9fe6632058a670c988ba9f1ae81b75aa5373de7231cef04d5e2ede61a44cbaa0324c04197a0a202847599a9bbe7dccd18fd3279f3f351493aaec4959caf3ada SHA512 1e197009f7e6b29b43944f757e987934337ebfa11bb2ff2ca8ba3ebc607e37cf1259d07a90d7faf4b91b49ee20d5c65357ad305f34ada0a8d336a3904233150e
 DIST ocaml-ctypes-0.19.1.tar.gz 206762 BLAKE2B 29b4636e711b9b3ecf3de5d66b796d4d8ddf1109fd7b065666577ce9412e0ef3712f704729dac3b9467ac7ace8f501b90bfc1dc82b86dbe1668e5d13be46741f SHA512 cbf422a2c457b215815a04122d0522ed0f274c5927cecd25951472de6cc6fcd1151b67f95d6bbfeeb3b5f15a9fe9bdedb8861e77bd0de9902418962065e4dfc0
 DIST ocaml-ctypes-0.20.0.tar.gz 206559 BLAKE2B d9bf1c3f5ae7544e3950766f7eb9bac2c9dbf84130f69b2b8807e55c6a7d659c46d9ba2227d53d578e4e49283730932213eea4c7487beffe4540432b3e700c81 SHA512 605ae95b0233f1157749475526ef00ade2f97649d06a782e8fcf97b604cb86a0dcc8f27c4ac6baec11a41b9ef5becb0e5ae55e30f1ee61b30d4ae17a0d1545c2
-EBUILD ocaml-ctypes-0.17.1-r1.ebuild 800 BLAKE2B 4df19810dd960c6d51525dde9dc2b374e7ffed06102bdb6622c847b621e699caba711e3b1ca06ea4daeeb87fb7ec05c0c3a41c8b58120ce658633ffeacd8fd09 SHA512 2239d8cef4ce0c401be0422dd8daf73de29322228ad7764c5d0e2d558bdbfc65d77728a97ff2a7987bb502a45ba8774108ec7f18f247d8dd31d22af4068b4786
-EBUILD ocaml-ctypes-0.19.1.ebuild 841 BLAKE2B a13472220bd45c00cab17a197e067a1b9861147ddb9019ca209f998eff0f77a91bd701bf391aab793c0c350fb6c5e75cda0329a9b8bfdcda30e6d8890d6544c7 SHA512 52f29832455b171d001393a03e211c98f665fb828c43c8922cb0a814620d2d2ab6d9f3e1458e7c940652e59c2c9d4fb598ea27e4db3d971883a67a007eae6db9
-EBUILD ocaml-ctypes-0.20.0.ebuild 848 BLAKE2B 48d42fabd8cca56db6c50a418af381b517e4852ad2c74dadb9de2fdf1b35d2c6aaebf8d7c5c29a9a685a810b4a5316b623bbf753311efacdd4d99ebcb8cf9c04 SHA512 338d4ff8743f3f1ef6f29e9db8535b17f2889b855ed8716809ff82bf158227c60184f9b1f465de4459cefb854d1e6d91201c81782e7aeb20bf572f2994848e6e
+EBUILD ocaml-ctypes-0.17.1-r1.ebuild 814 BLAKE2B 3a5bab91cdb4045286fd81c2fa5e6665eee9563de65008100d1f12c7930763ce0c32829cc908d1d9fe58ce6384267378a70a413b8c66368c89a0b9d21c9f4626 SHA512 b855d0975c4faef9516d0ea261f53cd913c314ce58a2dc18183686f2de17e8ec8e33be7b5529b933d070c8c6afaf00561fa5011e406688367be782ddbf555dfe
+EBUILD ocaml-ctypes-0.19.1.ebuild 855 BLAKE2B d8aecb84a61dda79cb3f1c9ff77677362e1b6c269642c1e787a4d9ddd19d7fa54648f4a48375a34a028e65082c1b17c9545c1997af871756282822954a774588 SHA512 666f5583ac7fd77f9a997d9fb759120c315f366e4f21a36148df4690b759f273b33edb625b9ca50796777a77d012cdb272a828693f1de9ea17a475b21429aa71
+EBUILD ocaml-ctypes-0.20.0.ebuild 862 BLAKE2B ab245d24be123751eee7d1e6f8114eed2ac5c004abd2387da3ae13ef3cb9a52c70541a18e7cdd81c041e354c377be4c9728fe8a524d27e827117f2cbc0dfeb13 SHA512 7eb381777d9144c30af6cf39715fafc17829f4fe63db42d49e077847ee34b86374636f50026b2e622249fa97d57871c4e37109cb58faa17e4fc921010edae8dc
 MISC metadata.xml 425 BLAKE2B 3bdffed177ca8fc13a9f6428824f1a97e646449037b4fa5b8053b68edd66c7c8c6bef3c7bb1135e4d76ec42812059408195c3a9cdd45573e571576175e3c9add SHA512 6bd73ddc160b2c5ba8f0630e7aa1045992ff77ece38df06538a2b6b49206c51b14abbcd27367d1b7fe9b192ebf11736e6f0e60dce8df6d475d7a4986edd2547b
diff --git a/dev-ml/ocaml-ctypes/ocaml-ctypes-0.17.1-r1.ebuild b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.17.1-r1.ebuild
index a473cbada2f3..673fa173a3a8 100644
--- a/dev-ml/ocaml-ctypes/ocaml-ctypes-0.17.1-r1.ebuild
+++ b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.17.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,12 +16,13 @@ IUSE="test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	>=dev-lang/ocaml-4.02:=[ocamlopt]
+	>=dev-lang/ocaml-4.02:=
 	>=dev-libs/libffi-3.3_rc0:=
 	dev-ml/integers:=
 "
 DEPEND="${RDEPEND}
 	test? ( dev-ml/ounit2 dev-ml/lwt )"
+REQUIRED_USE="ocamlopt"
 
 src_prepare() {
 	sed -e 's/oUnit/ounit2/g' -i Makefile.tests || die
diff --git a/dev-ml/ocaml-ctypes/ocaml-ctypes-0.19.1.ebuild b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.19.1.ebuild
index 80f7940123ae..b89d84c33e6f 100644
--- a/dev-ml/ocaml-ctypes/ocaml-ctypes-0.19.1.ebuild
+++ b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.19.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,13 +16,14 @@ IUSE="test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	>=dev-lang/ocaml-4.02:=[ocamlopt]
+	>=dev-lang/ocaml-4.02:=
 	>=dev-libs/libffi-3.3_rc0:=
 	dev-ml/bigarray-compat:=
 	dev-ml/integers:=
 "
 DEPEND="${RDEPEND}
 	test? ( dev-ml/ounit2 dev-ml/lwt )"
+REQUIRED_USE="ocamlopt"
 
 src_prepare() {
 	sed -e 's/oUnit/ounit2/g' -i Makefile.tests || die
diff --git a/dev-ml/ocaml-ctypes/ocaml-ctypes-0.20.0.ebuild b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.20.0.ebuild
index b6e2c219acec..a3fbc4c28994 100644
--- a/dev-ml/ocaml-ctypes/ocaml-ctypes-0.20.0.ebuild
+++ b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.20.0.ebuild
@@ -16,13 +16,14 @@ IUSE="test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	>=dev-lang/ocaml-4.02:=[ocamlopt]
+	>=dev-lang/ocaml-4.02:=
 	>=dev-libs/libffi-3.3_rc0:=
 	dev-ml/bigarray-compat:=
 	dev-ml/integers:=
 "
 DEPEND="${RDEPEND}
 	test? ( dev-ml/ounit2 dev-ml/lwt )"
+REQUIRED_USE="ocamlopt"
 
 src_prepare() {
 	sed -e 's/oUnit/ounit2/g' -i Makefile.tests || die
diff --git a/dev-ml/sexplib/Manifest b/dev-ml/sexplib/Manifest
index 5ff4b43fc45d..5e3872a3af65 100644
--- a/dev-ml/sexplib/Manifest
+++ b/dev-ml/sexplib/Manifest
@@ -1,5 +1,5 @@
 DIST sexplib-0.14.0.tar.gz 54055 BLAKE2B d0ee1470fb9d28eb6d6ed3aaf0f6bd63d7c4860183ac287054f08bc54d57d0c52ebf9fe516aa991d8c66967ecc6ad95b6a6d19eb40a9f610a6f91f832d9d2e20 SHA512 e77a9ae8991e6b73de57ab6b7068d6482471dd34ff0af23b93b5ba57bd69493d15db3279d3b328280f716e531c08c2a6c39bfaa886f1934240dcc13724673684
 DIST sexplib-0.15.0.tar.gz 55020 BLAKE2B 250d2d791abab87e18ad363dc2140d436cec90469156c2bd37d3de533dd219891bdc5e518d1a37eb8ee4e34f1ec5e924684f1408487d3080c5cfe4a0f32e2d69 SHA512 c31fed5e5bf48381a9b6a48085e7d8909471e38a8cc7586e3c520fe60c6df7a1eebcca1a0ca93cd4d1cc61c1c3c36211db05572273550f7218eb69dd97d27333
 EBUILD sexplib-0.14.0.ebuild 553 BLAKE2B 25077a84b940047a78f4e68ffa2dda12f5d8f3c65ed61eae5d839ca87df0abcfce113f588ed7b0eb1d4d35811662d63ceb8af7b66bdaafc446db88d0309c11c4 SHA512 59dc6b766e9e6c13a7daa024956cb023c288df82694390380e20ffc08c545c51ff96b8d7c0d03a5ad28a7342e35c729ddca9c5e3b7f6800197954ea7044ec2fd
-EBUILD sexplib-0.15.0-r2.ebuild 566 BLAKE2B 29c578c1d9c1236f008df09df0b28d9c3c8bfeb46a4db92682d27e1e8bb2b7ac50485d8ba8496f871c8f376d43c01a661639090937afbd74b2eec79119f92e10 SHA512 be6d9a7f32303c4e8dcd749aa146c6331b5a958e2b53dee7f0c446b3033a1b2b8da2ab1f8f51f3e1b02b2141652d8284ab3d7ef17953a4919558508dc825259e
+EBUILD sexplib-0.15.0-r2.ebuild 581 BLAKE2B deedbbb3769a8efeec00405da6457e58e2a1460b646e52464cb9edbd835d0d24e463010b5364e83f6ba7df6e568de5785f6cdacad736f3b25aa0f1a179388487 SHA512 68035473a9b50a52c7fb06c4d1826ee653606380e2c6e40a04426854ee87e6d44f3b575c8ec05bf7d3d32047bfaf4d23bc778f66fbef35db122d8c74a2b3bdbf
 MISC metadata.xml 482 BLAKE2B cc8a4f1df9d0f76967f46c4e50af6a3355c99ab0138c3e804b60cc97f456e151431f80da3fbc8ee16d832da7fc529b8d06019f1b0613bf4c4ebaef7200f02d35 SHA512 32f96513ff47e289bb41c5864ff462d60f849c79bfbb796ec59ecb2aa4bfb82e14b32bc7caf1c05d333d963f723d99fd324c12aaeaedaf8f552e1800feac7254
diff --git a/dev-ml/sexplib/sexplib-0.15.0-r2.ebuild b/dev-ml/sexplib/sexplib-0.15.0-r2.ebuild
index bd2b1329a0db..49c7869b3ac2 100644
--- a/dev-ml/sexplib/sexplib-0.15.0-r2.ebuild
+++ b/dev-ml/sexplib/sexplib-0.15.0-r2.ebuild
@@ -15,9 +15,9 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="+ocamlopt"
 
 RDEPEND="
-	dev-ml/parsexp:=
-	dev-ml/base:=
-	dev-ml/sexplib0:=
+	dev-ml/parsexp:0/0.15
+	dev-ml/base:0/0.15
+	dev-ml/sexplib0:0/0.15
 	dev-ml/num:=
 "
 DEPEND="${RDEPEND}"
diff --git a/dev-ml/utop/Manifest b/dev-ml/utop/Manifest
index cd0211dc73da..46a621fbcf7e 100644
--- a/dev-ml/utop/Manifest
+++ b/dev-ml/utop/Manifest
@@ -1,7 +1,8 @@
-DIST utop-2.8.0.tar.gz 414059 BLAKE2B f94cc9a2e87d5341b1d7231574b1e0d8b179e600640281529ecfd2ce8827b9145d73030ea1ec59b20430d34155087f6d910c698c75d7566145c9db3a3ecbf872 SHA512 cf323249aa9a747081b3e39e8e8b99b69557082beb244dd0a28d64c6d11e3c03427c22da4fd364e9ae7f5d83d12ca3d2d48b9f4b6697ec704d486f3c23163dba
+AUX 50utop-gentoo.el 100 BLAKE2B eb2061a156c26f41f06076905e66212743aca67b3692c14f5347006aeda59f05d973f766fd65c97dfd14ab0dca22cac831076c7809e12d509253483cd0ab8bb4 SHA512 80ef89749dc68e7d339bc6fc63984b56913b3d94c22fa38ab82a6d4e4867ea30e94ce116d25212785d00ce721909fbda3cb3ff9e710e617e241b42f8152b18d2
 DIST utop-2.9.0.tar.gz 414953 BLAKE2B 96fbf38d4a638137b73264bc523b8a81e47ddd609a7987073313f4b1d628e4e84c31f98195105911dd0930b8d27007cf5cc1633771bc6d2e975bd169e1e3ba9c SHA512 dd3f52fb915493cb32b5ee722361e884a481d04ef175d5bdf58f4032b70826c38b2f5279b7c64b78961170a86bc80fbd59f03026fac99bb5da2b46a8f341aa45
 DIST utop-2.9.1.tar.gz 421430 BLAKE2B c90a7fe54c5fbf15ce209e9bf850031e0368104c1f8f61a2d982b2b43d87b4bb95c91e3af6da16ae27ebfab71f2b9907e7dec68d34f619597fe8db45ff363bf4 SHA512 10942a4c7d2e13081f2e02c29b767863176fe90ca5baf48d3be47bb0871a12840d873e5d3eb7d7dd9b0362e849f70afb913ff50c07e66c6b7f221c8bb98fa469
-EBUILD utop-2.8.0.ebuild 522 BLAKE2B 60492098157329523c0925fb648af6966a1f73495cd65baff95cec5e7fb13698ab3f81160a89a5be0971a0ead75fdc22e91ba72b1214eafe3032bcd891f12d98 SHA512 ae402dd577415dd451477efa25c8098ed83f502055e8e380cf19e3383b14bc503173f4f49e5c9580d4fc13b8e234b6d98bc02c080c0c8e310e2b3ac1070eaf98
-EBUILD utop-2.9.0.ebuild 522 BLAKE2B 60492098157329523c0925fb648af6966a1f73495cd65baff95cec5e7fb13698ab3f81160a89a5be0971a0ead75fdc22e91ba72b1214eafe3032bcd891f12d98 SHA512 ae402dd577415dd451477efa25c8098ed83f502055e8e380cf19e3383b14bc503173f4f49e5c9580d4fc13b8e234b6d98bc02c080c0c8e310e2b3ac1070eaf98
-EBUILD utop-2.9.1.ebuild 522 BLAKE2B d8f09de5c419e941e671955148c61393d46356b17e3d35f4ee726113a7a10c046cf79a40bad66e4664150b9f4df612f1eaa6c0feee864866fe3786abccfbe2e6 SHA512 0009f7dd2115e40cdb5e8116ecc48f39ec0428af9fb07faa8c3008fb7c9d796e4e963cdb0309039f2915acef0976ae2dece5d72843144a640469410ddec44910
+DIST utop-2.9.2.tar.gz 421512 BLAKE2B 235b4739e644877e4b9eef432a00ba053f42f2b4d4fdd9b0bd925af736d9a351c8f9373031bc4fc23835872034d48a27b8eac99d286f57cb975d2b1368f420c8 SHA512 14dd690b459cfea90c565b397b5d914add7e92b152b476ab58576dc827fa204b3d721955bfc3508bcb953778a8d6fb3b299b0293f8ddf64b3f0155fc9a0e7fda
+EBUILD utop-2.9.0-r1.ebuild 1058 BLAKE2B 716d360a10ee6d376db47ce3d10290b9017c3d12fd32afacfbf744787fe9af29e580dbff16cca21405f9c77949658f05d50634d155e95d79ef59d8f3bbadfefe SHA512 935559adfd42b76320f1f61561e5b3d4bae76ebfd27c8b5ff37c6d3e0ae7b15d73a47a31b6540c6d98aa0fadcfb5123a6d34e84fa83e75aa662326da0b50ff41
+EBUILD utop-2.9.1-r1.ebuild 1058 BLAKE2B 716d360a10ee6d376db47ce3d10290b9017c3d12fd32afacfbf744787fe9af29e580dbff16cca21405f9c77949658f05d50634d155e95d79ef59d8f3bbadfefe SHA512 935559adfd42b76320f1f61561e5b3d4bae76ebfd27c8b5ff37c6d3e0ae7b15d73a47a31b6540c6d98aa0fadcfb5123a6d34e84fa83e75aa662326da0b50ff41
+EBUILD utop-2.9.2.ebuild 1058 BLAKE2B 716d360a10ee6d376db47ce3d10290b9017c3d12fd32afacfbf744787fe9af29e580dbff16cca21405f9c77949658f05d50634d155e95d79ef59d8f3bbadfefe SHA512 935559adfd42b76320f1f61561e5b3d4bae76ebfd27c8b5ff37c6d3e0ae7b15d73a47a31b6540c6d98aa0fadcfb5123a6d34e84fa83e75aa662326da0b50ff41
 MISC metadata.xml 714 BLAKE2B cdcb086ec113872a316e1f98b53802f6faef22a718543527c5cd5d4038ac68a601bb0898532428378ce016e4d018074c043e8dafb4109ac7fcd233cabe1f3c54 SHA512 40468222a996f4b5bebf03ab5d2d7fc639ab00acba23ea98da3a4a7993864946d2327c296806e0106e5d150c90d5286629d9608bc0e04acbd94fc5fd1ba50bf4
diff --git a/dev-ml/utop/files/50utop-gentoo.el b/dev-ml/utop/files/50utop-gentoo.el
new file mode 100644
index 000000000000..958c8398e602
--- /dev/null
+++ b/dev-ml/utop/files/50utop-gentoo.el
@@ -0,0 +1,3 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'utop "utop"
+  "A universal toplevel for OCaml." t)
diff --git a/dev-ml/utop/utop-2.8.0.ebuild b/dev-ml/utop/utop-2.8.0.ebuild
deleted file mode 100644
index d5b493a8c2cf..000000000000
--- a/dev-ml/utop/utop-2.8.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit dune
-
-DESCRIPTION="Universal toplevel for OCaml"
-HOMEPAGE="https://github.com/ocaml-community/utop"
-SRC_URI="https://github.com/ocaml-community/utop/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+ocamlopt"
-
-RDEPEND="
-	dev-ml/camomile:=
-	dev-ml/lambda-term:=
-	dev-ml/lwt:=
-	dev-ml/react:=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-ml/cppo
-	dev-ml/findlib
-"
diff --git a/dev-ml/utop/utop-2.9.0-r1.ebuild b/dev-ml/utop/utop-2.9.0-r1.ebuild
new file mode 100644
index 000000000000..cd05e5fc7a0c
--- /dev/null
+++ b/dev-ml/utop/utop-2.9.0-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune elisp-common
+
+DESCRIPTION="Universal toplevel for OCaml"
+HOMEPAGE="https://github.com/ocaml-community/utop"
+SRC_URI="https://github.com/ocaml-community/utop/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="emacs +ocamlopt"
+
+ELISP_DEPEND="
+	emacs? (
+		>=app-editors/emacs-24:*
+		>=app-emacs/tuareg-mode-2.2.0
+	)
+"
+DEPEND="
+	dev-ml/camomile:=
+	dev-ml/lambda-term:=
+	dev-ml/lwt:=
+	dev-ml/react:=
+"
+RDEPEND="
+	${DEPEND}
+	${ELISP_DEPEND}
+"
+BDEPEND="
+	dev-ml/cppo
+	dev-ml/findlib
+	${ELISP_DEPEND}
+"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+	dune_src_compile
+
+	use emacs &&
+		BYTECOMPFLAGS="-L src/top" elisp-compile src/top/*.el
+}
+
+src_install() {
+	dune_src_install
+
+	if use emacs ; then
+		elisp-install ${PN} src/top/*.el{,c}
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-ml/utop/utop-2.9.0.ebuild b/dev-ml/utop/utop-2.9.0.ebuild
deleted file mode 100644
index d5b493a8c2cf..000000000000
--- a/dev-ml/utop/utop-2.9.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit dune
-
-DESCRIPTION="Universal toplevel for OCaml"
-HOMEPAGE="https://github.com/ocaml-community/utop"
-SRC_URI="https://github.com/ocaml-community/utop/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+ocamlopt"
-
-RDEPEND="
-	dev-ml/camomile:=
-	dev-ml/lambda-term:=
-	dev-ml/lwt:=
-	dev-ml/react:=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-ml/cppo
-	dev-ml/findlib
-"
diff --git a/dev-ml/utop/utop-2.9.1-r1.ebuild b/dev-ml/utop/utop-2.9.1-r1.ebuild
new file mode 100644
index 000000000000..cd05e5fc7a0c
--- /dev/null
+++ b/dev-ml/utop/utop-2.9.1-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune elisp-common
+
+DESCRIPTION="Universal toplevel for OCaml"
+HOMEPAGE="https://github.com/ocaml-community/utop"
+SRC_URI="https://github.com/ocaml-community/utop/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="emacs +ocamlopt"
+
+ELISP_DEPEND="
+	emacs? (
+		>=app-editors/emacs-24:*
+		>=app-emacs/tuareg-mode-2.2.0
+	)
+"
+DEPEND="
+	dev-ml/camomile:=
+	dev-ml/lambda-term:=
+	dev-ml/lwt:=
+	dev-ml/react:=
+"
+RDEPEND="
+	${DEPEND}
+	${ELISP_DEPEND}
+"
+BDEPEND="
+	dev-ml/cppo
+	dev-ml/findlib
+	${ELISP_DEPEND}
+"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+	dune_src_compile
+
+	use emacs &&
+		BYTECOMPFLAGS="-L src/top" elisp-compile src/top/*.el
+}
+
+src_install() {
+	dune_src_install
+
+	if use emacs ; then
+		elisp-install ${PN} src/top/*.el{,c}
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-ml/utop/utop-2.9.1.ebuild b/dev-ml/utop/utop-2.9.1.ebuild
deleted file mode 100644
index 55ec4f6fd152..000000000000
--- a/dev-ml/utop/utop-2.9.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit dune
-
-DESCRIPTION="Universal toplevel for OCaml"
-HOMEPAGE="https://github.com/ocaml-community/utop"
-SRC_URI="https://github.com/ocaml-community/utop/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+ocamlopt"
-
-RDEPEND="
-	dev-ml/camomile:=
-	dev-ml/lambda-term:=
-	dev-ml/lwt:=
-	dev-ml/react:=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-ml/cppo
-	dev-ml/findlib
-"
diff --git a/dev-ml/utop/utop-2.9.2.ebuild b/dev-ml/utop/utop-2.9.2.ebuild
new file mode 100644
index 000000000000..cd05e5fc7a0c
--- /dev/null
+++ b/dev-ml/utop/utop-2.9.2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune elisp-common
+
+DESCRIPTION="Universal toplevel for OCaml"
+HOMEPAGE="https://github.com/ocaml-community/utop"
+SRC_URI="https://github.com/ocaml-community/utop/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="emacs +ocamlopt"
+
+ELISP_DEPEND="
+	emacs? (
+		>=app-editors/emacs-24:*
+		>=app-emacs/tuareg-mode-2.2.0
+	)
+"
+DEPEND="
+	dev-ml/camomile:=
+	dev-ml/lambda-term:=
+	dev-ml/lwt:=
+	dev-ml/react:=
+"
+RDEPEND="
+	${DEPEND}
+	${ELISP_DEPEND}
+"
+BDEPEND="
+	dev-ml/cppo
+	dev-ml/findlib
+	${ELISP_DEPEND}
+"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+	dune_src_compile
+
+	use emacs &&
+		BYTECOMPFLAGS="-L src/top" elisp-compile src/top/*.el
+}
+
+src_install() {
+	dune_src_install
+
+	if use emacs ; then
+		elisp-install ${PN} src/top/*.el{,c}
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-ml/uutf/Manifest b/dev-ml/uutf/Manifest
index db08ac109957..822a6d7e4ec6 100644
--- a/dev-ml/uutf/Manifest
+++ b/dev-ml/uutf/Manifest
@@ -3,5 +3,5 @@ DIST uutf-1.0.2.tbz 22420 BLAKE2B 8391f6c3cde40db3fa86b9243d8ea8fb52409aa958d102
 DIST uutf-1.0.3.tbz 23363 BLAKE2B fe35596a3c3590df38f34219ac577d34c0899c006087cb015e971002fff0d193d7fdc281d0bc3abe2fd440e7da11cc27d10b0356f9eb73e1a2c647fd0b672bf6 SHA512 50cc4486021da46fb08156e9daec0d57b4ca469b07309c508d5a9a41e9dbcf1f32dec2ed7be027326544453dcaf9c2534919395fd826dc7768efc6cc4bfcc9f8
 EBUILD uutf-1.0.1.ebuild 1602 BLAKE2B e034bd86656837aef5f35797ab66db8b976da72e0cdfa108d5a7ca3e60e0c081f45cf9b89132f7da8c315045915f704ae240bf712f95ae5fe489df246ddfa932 SHA512 28eb77dfe9180b17995d518d5b9eb7f487692f0f463039340c4137c9ea668603d89f5a404d0f4d4e2c014ec1cec1e0bc19d3992172280df6778737480679cc18
 EBUILD uutf-1.0.2.ebuild 1602 BLAKE2B e034bd86656837aef5f35797ab66db8b976da72e0cdfa108d5a7ca3e60e0c081f45cf9b89132f7da8c315045915f704ae240bf712f95ae5fe489df246ddfa932 SHA512 28eb77dfe9180b17995d518d5b9eb7f487692f0f463039340c4137c9ea668603d89f5a404d0f4d4e2c014ec1cec1e0bc19d3992172280df6778737480679cc18
-EBUILD uutf-1.0.3.ebuild 1632 BLAKE2B 324fd4c4a19ea2dca76971c8d3ae848d7bbbe7d257314459474f2fdc4b9adc012f21e0b8824a915e91e013c7d206a72fe8151f49735cd931593ff174ebe17cc5 SHA512 4dd74f7a3a304ace0b57d662160b97e28d27b679d3b42769690f9dcb316bd3691bfea32b723f73af26227bf913566d034a4485706f32c00a0a564cf4c0932b00
+EBUILD uutf-1.0.3.ebuild 1654 BLAKE2B 9d9bfd542314f42e745bcfaf47c0dcb08db4ad4dc03c8d8c67b4db73b831ade1ca0bdcbf7462c22127051fdf20d4face18b94ba6c79703f25b66de33cc3ea62e SHA512 16dc86ebc8b8e96c9953f9f24f55d5293ee35b2772c0cb85f8d56f9a8569e4e6351b4be11e122bf7490c6c554c53870f4eb18430266e2bb742f6f71f6810c318
 MISC metadata.xml 391 BLAKE2B 0f8f1c945c9a92d261312c24f4f23e50eb2183ab374e7f72f3e2aadd1678b130f230f39821209ac11156a0bbf3383552ff10552a7657da7c7b76abaa916585f2 SHA512 6953d1cde6c4c779d81b451f762f7aedf2f789aecaf87ac874475003b696546918d8f894cec935bf9cfc4ecdfdc1ec816fb3aa117f90e59fceabaf90d66d5157
diff --git a/dev-ml/uutf/uutf-1.0.3.ebuild b/dev-ml/uutf/uutf-1.0.3.ebuild
index 5faf09387207..a1184fb0a2f1 100644
--- a/dev-ml/uutf/uutf-1.0.3.ebuild
+++ b/dev-ml/uutf/uutf-1.0.3.ebuild
@@ -18,11 +18,11 @@ REQUIRED_USE="utftrip? ( ocamlopt )"
 
 RDEPEND=">=dev-lang/ocaml-3.12:=[ocamlopt?]
 	dev-ml/uchar:=
-	utftrip? ( dev-ml/cmdliner:= )"
+	utftrip? ( dev-ml/cmdliner:=[ocamlopt?] )"
 DEPEND="${RDEPEND}"
 BDEPEND="dev-ml/ocamlbuild
 	dev-ml/topkg
-	test? ( dev-ml/cmdliner )"
+	test? ( dev-ml/cmdliner[ocamlopt?] )"
 
 DOCS=( CHANGES.md README.md )
 
diff --git a/dev-ml/yojson/Manifest b/dev-ml/yojson/Manifest
index b2e3d05f2ce9..4d350929ebcb 100644
--- a/dev-ml/yojson/Manifest
+++ b/dev-ml/yojson/Manifest
@@ -1,5 +1,5 @@
 DIST yojson-1.7.0.tar.gz 29704 BLAKE2B edbd7f66d69a85880fc8ee9bb25a993744a310887024f7af63665ba8f5067f1b9383ec4d6dd5f4ca3376d698665a8f605c078f7597ddd4e71857c1a20143c2e5 SHA512 25eedb64e4bf7c7e8d5a5a115812cd502540afbdeb7c947da3a14e5968aa0a7db8ab402425662571d8935b9cd6a19796ce81dd80a65dc614f156626c60e7036e
 DIST yojson-2.0.0.tar.gz 44446 BLAKE2B 3b221a016ba418cc6a413921f0d7f2bc239b9a84953bbe9bec2601b159442f3e8bebdf48447367660fec3b3929ea0c08453778e491ce17f9044f505e49d587a6 SHA512 9196e117bb712b970351d12a8d7eae345eef2c92e70e627b58bb95ee49cd58e8a51e6eb5746e2468c15133d53a448ccd229a0568227de0cc8d2eed8b1985609b
-EBUILD yojson-1.7.0.ebuild 768 BLAKE2B d7fc71d5d6c18f70f172fa3d3bf39e16d9b206d17ebff4bda65a9a1779a2b32e454e6912d2aa62db5b8bb29b263bab32503c3ded92526951cad7b9bfa732675b SHA512 6ff1bd5e9122cb8e312b29376efa45bd052900b7639a747674a0bc823644cfdd350e82fdf80956b37d73ab1add4975c59ce8943844a52642d6471fb8bf63640e
-EBUILD yojson-2.0.0.ebuild 823 BLAKE2B 4ab5d484807cfaf1cc2557066815c695ff338762396e74d6e7bfd861624279ff61c3fa96efd3e2847ef4527380916ae2b9bf4c7f3a7fdd435553f924abb048d1 SHA512 82fbfca09cfe00bea2defca92e4af05ac24f7ba1648b7f8b7ab8ef9671a6b3bd92385d699b15deeba2908d14a2d740258196757868fe0be60868dfd9a89da120
+EBUILD yojson-1.7.0.ebuild 768 BLAKE2B 2cc607961f2f28807c7f21b4321302cc6815c9a7a1a30074544d7c86bca5a8fc42fdd27df3b0485a382c7ae546e8c4cc14f263c3f884f1c78abb57e280b50e6e SHA512 1fcc4b8b8e577162626d0665a0be6dfc7ec622d7e4d9cb7ee80f468728941da6313575b346aab2f0e37257c5cf9b4733ab438250bc053bf52ed856689cd60f5b
+EBUILD yojson-2.0.0.ebuild 823 BLAKE2B b97fc62e1695f573c13ba4a3e40f3dd4e6a18d2a2e2de95727e1e0190b5c58a08b2e629e378bc8243fa08aa7cbc1607b8e3450fb0fda2a1f9c1ae8144a400771 SHA512 d9187abc288ee0a96dfa286240c845686d5886b25c4b7e62444b4e32622c843342077c84fa4ceb275f4692504af7f6bf1fc8e45c2d962621f17291d0b7fb762d
 MISC metadata.xml 529 BLAKE2B 4cfc5392ca4b4402f01251818c776c63d607c2e1b8d216930db594ffe2e1146ac52f9492823e5ef97ba7b6f89b2ee8eaf367e785120ca5fcabdb36549ffb6ebd SHA512 7c415ac7330d8d3397911ddd213da9a6cd5dfe76fa2530ab22cbd70cd8f411fbfdb9d40aa8ca66dc202227799fe0b8ff81c81e57815f5e206c7f424b6218baf1
diff --git a/dev-ml/yojson/yojson-1.7.0.ebuild b/dev-ml/yojson/yojson-1.7.0.ebuild
index 48357a363ee7..d008ccd1b029 100644
--- a/dev-ml/yojson/yojson-1.7.0.ebuild
+++ b/dev-ml/yojson/yojson-1.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,9 +16,9 @@ IUSE="examples +ocamlopt test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	>=dev-lang/ocaml-4.02.3:=[ocamlopt=]
-	dev-ml/easy-format:=[ocamlopt=]
-	>=dev-ml/biniou-1.2:=[ocamlopt=]
+	>=dev-lang/ocaml-4.02.3:=[ocamlopt?]
+	dev-ml/easy-format:=[ocamlopt?]
+	>=dev-ml/biniou-1.2:=[ocamlopt?]
 "
 DEPEND="
 	${RDEPEND}
diff --git a/dev-ml/yojson/yojson-2.0.0.ebuild b/dev-ml/yojson/yojson-2.0.0.ebuild
index a46bbd313048..23350f1a6c06 100644
--- a/dev-ml/yojson/yojson-2.0.0.ebuild
+++ b/dev-ml/yojson/yojson-2.0.0.ebuild
@@ -16,8 +16,8 @@ IUSE="examples +ocamlopt test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	>=dev-lang/ocaml-4.02.3:=[ocamlopt=]
-	>=dev-ml/seq-0.2.2:=[ocamlopt=]
+	>=dev-lang/ocaml-4.02.3:=[ocamlopt?]
+	>=dev-ml/seq-0.2.2:=[ocamlopt?]
 "
 DEPEND="${RDEPEND}"
 BDEPEND=">=dev-ml/cppo-1.6.1