gentoo resync : 29.12.2022

6 files changed, 13 insertions, 13 deletions

diff --git a/dev-ml/merlin/Manifest b/dev-ml/merlin/Manifest
index 0c00ca419e57..fed063eac95a 100644
--- a/dev-ml/merlin/Manifest
+++ b/dev-ml/merlin/Manifest
@@ -11,9 +11,9 @@ DIST merlin-4.5-411.tbz 1316537 BLAKE2B 8850ea6b15819a178f763d8b55fecca9104cec50
 DIST merlin-4.5-412.tbz 1765436 BLAKE2B eaed065a2814f4c1bfc5337d026c7c42287b8cbbe50097415a983f7fdd7323f4c88f3b8c8cff4ca88a0813204617f39807709a6703fd618269eca6063b3c47b1 SHA512 f9edc3e1c9f753d7bacbdf1b92c118b54f9e9eff0bf752a2b44f39a2f7ecc76c4cd3bbe9227e910aea8b5ea947e8fe1b8d92ba0245fe47bc8cc2f45404cca973
 DIST merlin-4.5-413.tbz 2290507 BLAKE2B 32aeda63caec645da8043c49ceaa0ea54d095b3e286f687b5f3da1b44d54bbc291d0358768d2180825cb620a91765da83d90b645151a694a4131788ab4438fbf SHA512 b1db98c38a97ca0eef3051ab2b5d1b158e757863de6908a830308e7ea7f960eebd64b1a60bf51b10b7ea2eea3141ee0917a7c3570b63f9faa2e3f69c5d6fe0c2
 DIST merlin-4.5-414.tbz 1964688 BLAKE2B 41cb76fb367545af3b5ac7d62f5b69ae031ed99956aca947dc8b91e2fa906d500bed272f7f46a7ad9e57bf3cb5620893072b52ac7f2246d6ae3be1ae22e99406 SHA512 cc2cf2c208091b3ae435a8124617e56f2002b7091532002ab49a1f817d90a5c4f9cf0bc5741dc7f2526e0352c3ca95b42c3b3a17c6cbfb80ad73d42310a25d22
-EBUILD merlin-3.4.2-r2.ebuild 1265 BLAKE2B c4c2261e45087f063a242e03455a2479b834885dda69451428633208455f57acf2e11476a69873b79d68b986453f58547a3969edf3dbe30568efc1e2fb26cfbd SHA512 b94892109e8a49b8088f492db5d0f61ae5c552f09406c98eb10738d82e9249dddcb6e524f83e85264ee6f9d1f14b510757f27f8f2eab40f2d5a0ce3af822e1c7
-EBUILD merlin-4.2-r1.ebuild 1625 BLAKE2B d1911be09e49d0ef2c2d5345189c07aeb37506eb5365447ca28beeb69157beda2c0411fd748e787d6f5aff36688f7454ee70a2d75b9e890f736f70f253b4ac6e SHA512 163e89b309d910425830ae8f39c0375fab219e0d2bcf1a7aaf3fa46d5cd4b403936c79af737ca06cbc1d8189f2b7aac9e47125513f9e53ca9cb7ede5daa5629b
-EBUILD merlin-4.3.1-r1.ebuild 1644 BLAKE2B 792c0048444ade0ac617146ea99830bd7a442f0a90d2699dc06879f471e03e8e51f95a8ec7666154b9b41eaf5008988d6df8f2a332e22543e0547e43a85decb8 SHA512 04ec59b71d9c94a3b05f2297333cc1da3747bb4ddd6fa78ad7896c639c01cf9052c4a0004a041007e635de51c9f3875e1b9e3934ccc212e7d8bc931dd4303eee
-EBUILD merlin-4.4-r1.ebuild 1915 BLAKE2B 0786eec8eb7d7875d02eab3da652b5b1ec6d78affa475c9b1a26351f63784d6b134fe0e18bc0601abd4e25b04d177aa0b3bf1497328f6b6d084111a314c76138 SHA512 b728e873834436432ef019f4a9c722f55b82cabe0f7cf85491303424b313301489a8b93f12d8c7b70e2f10565f19923043bcbdcfeeadb69a3c19a15df8ca54a5
-EBUILD merlin-4.5-r1.ebuild 2044 BLAKE2B 30d79639a59d381e3f49f95dfca47cb12ef842e754b1890ff6f0bd54e894fa4132213495095711761268c26feffa76fec921c6ac74077e95c3e0483f01dcc5f8 SHA512 e9eefafcd9447a455f1e70ce7d7d4592fa7dfd1bfc6dafcc05663e5114546b3cfd1f47981eaf18a5065c2e76fd504caef6a70466a54687aaa43a54e18cad84e5
+EBUILD merlin-3.4.2-r3.ebuild 1268 BLAKE2B 76951d30c4572bb3b2a1560df586fe917c418b2c264023a6bb6fb4d2d2c81e221e37953bd817445ba9cbddf734c2314bce9b1e1cae168ae6daeed553c6d504c2 SHA512 671cb8164f78319a4dd69e609507e0fc3d7399729dcb9b0e7a16ad21496cd9ac54946a152e7a61c3a21ae3071d330dc853ee7aef6408b42ce2812320d9ef763f
+EBUILD merlin-4.2-r2.ebuild 1628 BLAKE2B 69695d9b83e47ea4d537babdb77334a0c66789c0d26250d88fd96f4a09a668d8462ea2305df69b84bd3795074534f115c6cfa710c80623dad38d541565ffe958 SHA512 f07995eebc4983643a50edd8bd92555a5347c714660c59239b14bc3483b39456c29ed100f01f21c9443d682fe30c9876632a0f1e80a122262bf3f6c1abb7151c
+EBUILD merlin-4.3.1-r3.ebuild 1649 BLAKE2B 0caada03840c4a9c823c45dcac31658e91262e4c68449aa8af58d7f04c328ad6d8d729e93e61d93351a50df620a7b628f8adbfa246161ba7b7d2deeb7462be79 SHA512 cef79fd3bcb317e6d05374cbe4d34708c9ac9a6f9aace1c8f349256cd3888615496aeb44ba0b229805cf5f0dc5e5a16bac2188bb7666e7f77309596597f77bbd
+EBUILD merlin-4.4-r3.ebuild 1920 BLAKE2B 7f510f03d1c0f3aab87152cd55471ebe842c6119cdff6d7ea9eb447fbddfd0cab14aae545f3a68912f546429e89c09a394914a56e11966ef7ba6fbca4469d20a SHA512 89da2d2b46ba36d7e1df53deb89554f7fe33ddd2c9c46a461fe063692712f0db74312eafdc33effbba79baa454fe5a398e0e1209f22b9438ff50502ce1bb9bd6
+EBUILD merlin-4.5-r3.ebuild 2049 BLAKE2B 1e74babad7df27750fcc6060637a2a27f9b238968b973ce83e128650ce712d232f62eede1f0bf521ca113e2503ae4901275bd2ed7d3f602f55793c310c226e42 SHA512 c50af01b60c9e2d69fb862f137a335ac5b1b14b1b2203147a7434e656f082b4a663f16e86d46a8b9aec336caaf19f1847391c7ce2b6e6d9137d43d3dd851e1aa
 MISC metadata.xml 310 BLAKE2B f1255dfdcb6984112e896735ea40f1171a8d52149fa7e8ed279efc1fe08de9b071554f5168bc3f8c0e432bd8344c69f5c5716c5c689ff4ff4edbc27569546246 SHA512 06710c33027574e4c13259e30ca5e862b7bbda0442013676020d00dd1114e92ebee92fa19d2993fc3881c10f9db7b51dd2710fcfbcf9ca7564f8f96e5065705e
diff --git a/dev-ml/merlin/merlin-3.4.2-r2.ebuild b/dev-ml/merlin/merlin-3.4.2-r3.ebuild
index bf15b8d8aaef..c4d43185b391 100644
--- a/dev-ml/merlin/merlin-3.4.2-r2.ebuild
+++ b/dev-ml/merlin/merlin-3.4.2-r3.ebuild
@@ -17,7 +17,7 @@ IUSE="emacs +ocamlopt"
 
 RDEPEND="
 	dev-ml/csexp:=
-	dev-ml/yojson:=
+	<dev-ml/yojson-2:=
 	>=dev-lang/ocaml-4.09:=
 	<dev-lang/ocaml-4.12:=
 	emacs? (
diff --git a/dev-ml/merlin/merlin-4.2-r1.ebuild b/dev-ml/merlin/merlin-4.2-r2.ebuild
index d6a09238ac2f..ec4d4384818f 100644
--- a/dev-ml/merlin/merlin-4.2-r1.ebuild
+++ b/dev-ml/merlin/merlin-4.2-r2.ebuild
@@ -19,7 +19,7 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-ml/csexp:=
-	dev-ml/yojson:=
+	<dev-ml/yojson-2:=
 	dev-ml/menhir:=
 	|| (
 		dev-lang/ocaml:0/4.11
diff --git a/dev-ml/merlin/merlin-4.3.1-r1.ebuild b/dev-ml/merlin/merlin-4.3.1-r3.ebuild
index 0ddc350e9d9b..be803860afbb 100644
--- a/dev-ml/merlin/merlin-4.3.1-r1.ebuild
+++ b/dev-ml/merlin/merlin-4.3.1-r3.ebuild
@@ -19,9 +19,9 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-ml/csexp:=
-	dev-ml/yojson:=
+	<dev-ml/yojson-2:=
 	dev-ml/menhir:=
-	>=dev-ml/dune-2.9
+	>=dev-ml/dune-2.9:=
 	|| (
 		dev-lang/ocaml:0/4.11
 		dev-lang/ocaml:0/4.12
diff --git a/dev-ml/merlin/merlin-4.4-r1.ebuild b/dev-ml/merlin/merlin-4.4-r3.ebuild
index 2975d266d475..805435c72192 100644
--- a/dev-ml/merlin/merlin-4.4-r1.ebuild
+++ b/dev-ml/merlin/merlin-4.4-r3.ebuild
@@ -20,9 +20,9 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-ml/csexp:=
-	dev-ml/yojson:=
+	<dev-ml/yojson-2:=
 	dev-ml/menhir:=
-	>=dev-ml/dune-2.9
+	>=dev-ml/dune-2.9:=
 	|| (
 		dev-lang/ocaml:0/4.11
 		dev-lang/ocaml:0/4.12
diff --git a/dev-ml/merlin/merlin-4.5-r1.ebuild b/dev-ml/merlin/merlin-4.5-r3.ebuild
index 52caa02ed44d..0d4848e27208 100644
--- a/dev-ml/merlin/merlin-4.5-r1.ebuild
+++ b/dev-ml/merlin/merlin-4.5-r3.ebuild
@@ -21,9 +21,9 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-ml/csexp:=
-	dev-ml/yojson:=
+	<dev-ml/yojson-2:=
 	dev-ml/menhir:=
-	>=dev-ml/dune-2.9
+	>=dev-ml/dune-2.9:=
 	|| (
 		dev-lang/ocaml:0/4.11
 		dev-lang/ocaml:0/4.12