Gentoo Archives: gentoo-commits

From: "Maciej Barć" <xgqt@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ml/merlin/
Date: Mon, 28 Nov 2022 20:33:24
Message-Id: 1669667598.eb08ef7e5b810912fc1f9f90a5f584fff171af0c.xgqt@gentoo
1 commit: eb08ef7e5b810912fc1f9f90a5f584fff171af0c
2 Author: Maciej Barć <xgqt <AT> gentoo <DOT> org>
3 AuthorDate: Mon Nov 28 20:15:20 2022 +0000
4 Commit: Maciej Barć <xgqt <AT> gentoo <DOT> org>
5 CommitDate: Mon Nov 28 20:33:18 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb08ef7e
7
8 dev-ml/merlin: remove seq reference from dune build file
9
10 Closes: https://bugs.gentoo.org/883433
11 Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>
12
13 dev-ml/merlin/merlin-4.6.ebuild | 5 ++++-
14 1 file changed, 4 insertions(+), 1 deletion(-)
15
16 diff --git a/dev-ml/merlin/merlin-4.6.ebuild b/dev-ml/merlin/merlin-4.6.ebuild
17 index 8086c63f9c25..f7843381a666 100644
18 --- a/dev-ml/merlin/merlin-4.6.ebuild
19 +++ b/dev-ml/merlin/merlin-4.6.ebuild
20 @@ -63,7 +63,7 @@ src_unpack() {
21 src_prepare() {
22 default
23
24 - # Handle installation via the eclass
25 + # Handle ELisp installation via the Emacs Eclass.
26 rm emacs/dune || die
27
28 # This test runs only inside a git repo,
29 @@ -72,6 +72,9 @@ src_prepare() {
30 rm tests/test-dirs/occurrences/issue1404.t || die
31 fi
32 rm -r tests/test-dirs/locate/context-detection/cd-mod_constr.t || die
33 +
34 + # Remove seq references from dune build files.
35 + sed -i 's|seq||g' src/frontend/ocamlmerlin/dune || die
36 }
37
38 src_compile() {