From 56767705335e747c2a8b3f3282e5c1a393352d54 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 29 Nov 2022 01:18:33 +0000 Subject: gentoo auto-resync : 29:11:2022 - 01:18:33 --- dev-ml/merlin/Manifest | 2 +- dev-ml/merlin/merlin-4.6.ebuild | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'dev-ml/merlin') diff --git a/dev-ml/merlin/Manifest b/dev-ml/merlin/Manifest index 258e91c5d33e..4498f7692114 100644 --- a/dev-ml/merlin/Manifest +++ b/dev-ml/merlin/Manifest @@ -19,5 +19,5 @@ EBUILD merlin-4.2-r2.ebuild 1635 BLAKE2B 2db7c065259db06f7ebacf0cd1445641488bc0d EBUILD merlin-4.3.1-r3.ebuild 1656 BLAKE2B bced8c8869f0d778725278c453a6e51000f2dcc7fba7d11efb2dc5d9cd078c476be421e257b04c3d0a9ecfa0412f3365b0d7e5b29ec15b22805d7f55d6930c10 SHA512 b05d0384e63d940213e5789b4bc29cbb7fe09de48d31abbd3e94032750152fca57ecf539b6e38f4a11cb9af6dfd1b2d48112b002dc6b21a0454a9da345ee7db5 EBUILD merlin-4.4-r3.ebuild 1927 BLAKE2B 1cd4b4b75b017f7dd04f19dc7dbcea349717d52e3c9106342d30a1294d165d629dc3fb8bfe37944b04284a06e9782ddb667347f1dc88e8060e749d4fb9d4133a SHA512 058e859dbff209604b0fd6b9929b4bf3401349eff1cd242a973728f8dc5090c17cc1b119add9db5f073d8c32ebc2b1900cf8f023665a633b8a68092bf7a2bd7c EBUILD merlin-4.5-r3.ebuild 2175 BLAKE2B 2673f32fff876100b2a3649e169b13d28d80647c8c1d6b928a8114c4ed70c7c4312337e606cff7253ca321363e5ea296b1a4c84c0b22531a7007b9ac6771e83c SHA512 2dd3ce00635e0d8bc32e5810f8661ccc1738fa1c44d8f14257d1f5900ab863be3994d2e3bcee2eb2a83b48b5859239e98a11ff95f2b5abb920d534781004e5be -EBUILD merlin-4.6.ebuild 2300 BLAKE2B 48a0991133b0972629fb93c6f4f3d8665fc59fe03e1ca05ad7742d9937e30d9c14136dd90ba35d4502073f14e44d6718ba58b43a63bedaf683454aeee4e35449 SHA512 88b67a0edb195eb788e650e6bf27e5cb94b45127674606e6e1367c3f935021ab1bb534cb256863bc6ab589ff6cfdf47e3cd4679b17ed0dd850289b204864697d +EBUILD merlin-4.6.ebuild 2418 BLAKE2B 6742961957e55ba5f34f7af4a4a5ac1906efdc0202ee2a63da2d16e57a3858656a0261296d97b1b38afeb9b3053f10b7a736034c9df1b41bee5d19abf3184a55 SHA512 f9eb8e699d311949cda3eb381f81fdaafc1a29bedd95b31595cf8f3165760bde53f4da4c397db0da6a205bc6601c633ac4683f64712ab0037de8d1673037b52c MISC metadata.xml 310 BLAKE2B f1255dfdcb6984112e896735ea40f1171a8d52149fa7e8ed279efc1fe08de9b071554f5168bc3f8c0e432bd8344c69f5c5716c5c689ff4ff4edbc27569546246 SHA512 06710c33027574e4c13259e30ca5e862b7bbda0442013676020d00dd1114e92ebee92fa19d2993fc3881c10f9db7b51dd2710fcfbcf9ca7564f8f96e5065705e diff --git a/dev-ml/merlin/merlin-4.6.ebuild b/dev-ml/merlin/merlin-4.6.ebuild index 8086c63f9c25..f7843381a666 100644 --- a/dev-ml/merlin/merlin-4.6.ebuild +++ b/dev-ml/merlin/merlin-4.6.ebuild @@ -63,7 +63,7 @@ src_unpack() { src_prepare() { default - # Handle installation via the eclass + # Handle ELisp installation via the Emacs Eclass. rm emacs/dune || die # This test runs only inside a git repo, @@ -72,6 +72,9 @@ src_prepare() { rm tests/test-dirs/occurrences/issue1404.t || die fi rm -r tests/test-dirs/locate/context-detection/cd-mod_constr.t || die + + # Remove seq references from dune build files. + sed -i 's|seq||g' src/frontend/ocamlmerlin/dune || die } src_compile() { -- cgit v1.2.3