gentoo resync : 12.05.2022

7 files changed, 10 insertions, 10 deletions

diff --git a/dev-ml/merlin/Manifest b/dev-ml/merlin/Manifest
index b315bb52d5d6..0c00ca419e57 100644
--- a/dev-ml/merlin/Manifest
+++ b/dev-ml/merlin/Manifest
@@ -1,4 +1,4 @@
-AUX 50merlin-gentoo.el 195 BLAKE2B a5bcca9e3af1810b18337680b4878dcfc41296b98a4b949293367935a741b0ab8dcf9f40cfbab2042fc4afd95f09b3ac9980f7daa371dab93fe39cf56245c111 SHA512 7dfbbccee288d91c010cf0bd18d490ac2fdb8c5a2f6cb5ae55697f196ba9e4965ed6c0b0140aadc0685a3bfde58a4b30ca85658876c22c9f91b456aa1753ba4b
+AUX 50merlin-gentoo.el 169 BLAKE2B 97dca8debe038783d44200315f883f4918cee1cca9f1d53df1c70b8fbd6e922b38c43b436ac73854970f1438eb837cbcbff4e07d12054fc0d0222b5222b95970 SHA512 00db283dffe923971fe451bcbea687bf35152e9c09783d307d9dec4ac0f273d27edfcc0e1ac74db3885bdeec98e7d60f1d46fa381d3b2c813e2f55fb5d4adbb5
 DIST merlin-3.4.2.tar.gz 11016272 BLAKE2B 6fa55423df7ae8f7a8056e90be630f148dd101194de1921605843caf805bd6c9694fa3fe5b8c2f8eff5d57d7d0e9d8653036b6165a49af655158925c7af87d2f SHA512 8225366ebf27ca656ca89fe00d5aec581487ae332aeab81568e7606eaf575648a7614d4d2de8e0757a4e69c6f4014fefa4574c95da13d42acb310c9dd58a468a
 DIST merlin-4.2-411.tar.gz 1601588 BLAKE2B 348b48ccf2b209bb511450e4ba46ceb3639b1a5facd70bec4519369907e162e95575fa101aa1b79c56719927272a4feebf981692ea2bcb2299fc2c284833b1be SHA512 9ca8d3690621019b8213abcc1a32e1d754b93849f0bbd79bcab3a14915acc295eb60a7b68e997a75e777daaef83d5ca3e81944b7baf352dc4cce8480905ea2d7
 DIST merlin-4.2-ocaml-4.12.patch.gz 816740 BLAKE2B d96ab1059683799312fc8828e8a46bccaae9279b6d711eb7ed47b6e8631d80e09f236bf6f726bafb37ae243457df3220a9948f4f6de6da20c2a6c66a1edb8f3f SHA512 4eef08ac8a7f240596395d8460a4d3195c1483fb686aa7d5231d7ea28c9c6996196890f76feae951d2539ac7abc1f16ee3c453031e6d19af554ff27d67a63229
@@ -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-r1.ebuild 1265 BLAKE2B a12e5b68da2899f57ecb73de9ff4558a2069fef7056f7a6775616801bd809d058e8c457afe7c659e16f31861786311871860ce2ef58460f50a738939ffab9750 SHA512 355c89138e3838407d9f05d1d393411307700deb38fca7f17efb6cce553f2a4d159fb2b13568704bca3c655dfb975e50afa52f314f7c8815370f3ebf1cf74188
-EBUILD merlin-4.2.ebuild 1625 BLAKE2B f684cb80ec4dc21471f3e80bc526c1d7b7241ce259230318e25cdda710b50ad6f58ce6485642a867889f1d4b34f60a102bd614f548b903024cb99e58df6b4fbe SHA512 2682e471f6e59d12ca02909c15aa9855a65d8aad4d91d001b34980bcc147dc3a1a641ee91262aa577ae1ef8616ef3feda6f00c0a568f667dde47a32bf09a037f
-EBUILD merlin-4.3.1.ebuild 1644 BLAKE2B 504f8244a7f427889b8bbb1ffa3e8621762c6295f8b4e5a58a26cf762c251d3a839116dae269e47aeea3788ebfef98641f54525b469c45c596d955141347685a SHA512 ad6f2b092e00f0be513a03652371bbb58e855e084240ff2ed0d672e9f70260b921570aa4d59ad1a8289710ed05777710d4cf4c108ad3c3c592e2440b80b992a4
-EBUILD merlin-4.4.ebuild 1915 BLAKE2B 0786eec8eb7d7875d02eab3da652b5b1ec6d78affa475c9b1a26351f63784d6b134fe0e18bc0601abd4e25b04d177aa0b3bf1497328f6b6d084111a314c76138 SHA512 b728e873834436432ef019f4a9c722f55b82cabe0f7cf85491303424b313301489a8b93f12d8c7b70e2f10565f19923043bcbdcfeeadb69a3c19a15df8ca54a5
-EBUILD merlin-4.5.ebuild 2044 BLAKE2B 30d79639a59d381e3f49f95dfca47cb12ef842e754b1890ff6f0bd54e894fa4132213495095711761268c26feffa76fec921c6ac74077e95c3e0483f01dcc5f8 SHA512 e9eefafcd9447a455f1e70ce7d7d4592fa7dfd1bfc6dafcc05663e5114546b3cfd1f47981eaf18a5065c2e76fd504caef6a70466a54687aaa43a54e18cad84e5
+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
 MISC metadata.xml 310 BLAKE2B f1255dfdcb6984112e896735ea40f1171a8d52149fa7e8ed279efc1fe08de9b071554f5168bc3f8c0e432bd8344c69f5c5716c5c689ff4ff4edbc27569546246 SHA512 06710c33027574e4c13259e30ca5e862b7bbda0442013676020d00dd1114e92ebee92fa19d2993fc3881c10f9db7b51dd2710fcfbcf9ca7564f8f96e5065705e
diff --git a/dev-ml/merlin/files/50merlin-gentoo.el b/dev-ml/merlin/files/50merlin-gentoo.el
index fbbbf2019411..1da1f56402a5 100644
--- a/dev-ml/merlin/files/50merlin-gentoo.el
+++ b/dev-ml/merlin/files/50merlin-gentoo.el
@@ -1,4 +1,4 @@
-(push "@SLITELISP@" load-path) ; directory containing merlin.el
+(add-to-list 'load-path "@SITELISP@")
 (autoload 'merlin-mode "merlin" "Merlin mode" t)
 (add-hook 'tuareg-mode-hook 'merlin-mode)
 (add-hook 'caml-mode-hook 'merlin-mode)
diff --git a/dev-ml/merlin/merlin-3.4.2-r1.ebuild b/dev-ml/merlin/merlin-3.4.2-r2.ebuild
index d14be4876eb1..bf15b8d8aaef 100644
--- a/dev-ml/merlin/merlin-3.4.2-r1.ebuild
+++ b/dev-ml/merlin/merlin-3.4.2-r2.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
diff --git a/dev-ml/merlin/merlin-4.2.ebuild b/dev-ml/merlin/merlin-4.2-r1.ebuild
index ba04028ea42c..d6a09238ac2f 100644
--- a/dev-ml/merlin/merlin-4.2.ebuild
+++ b/dev-ml/merlin/merlin-4.2-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
diff --git a/dev-ml/merlin/merlin-4.3.1.ebuild b/dev-ml/merlin/merlin-4.3.1-r1.ebuild
index d269247a3728..0ddc350e9d9b 100644
--- a/dev-ml/merlin/merlin-4.3.1.ebuild
+++ b/dev-ml/merlin/merlin-4.3.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
diff --git a/dev-ml/merlin/merlin-4.4.ebuild b/dev-ml/merlin/merlin-4.4-r1.ebuild
index 2975d266d475..2975d266d475 100644
--- a/dev-ml/merlin/merlin-4.4.ebuild
+++ b/dev-ml/merlin/merlin-4.4-r1.ebuild
diff --git a/dev-ml/merlin/merlin-4.5.ebuild b/dev-ml/merlin/merlin-4.5-r1.ebuild
index 52caa02ed44d..52caa02ed44d 100644
--- a/dev-ml/merlin/merlin-4.5.ebuild
+++ b/dev-ml/merlin/merlin-4.5-r1.ebuild