diff options
| author |   Alfredo Tupone <tupone@gentoo.org> | 2023-02-12 10:23:53 +0100 |
|---|---|---|
| committer | Alfredo Tupone <tupone@gentoo.org> | 2023-02-12 14:28:34 +0100 |
| commit | da6978e56be698805a0fac2efa92c645f0b823fe (patch) | |
| tree | 77b3213fca20912b3cb9466c0774c0811ab50ed4 /dev-ml | |
| parent | app-editors/emacs: Allow either of webkit-gtk:4.1 and :4 (diff) | |
| download | gentoo-da6978e56be698805a0fac2efa92c645f0b823fe.tar.gz gentoo-da6978e56be698805a0fac2efa92c645f0b823fe.tar.bz2 gentoo-da6978e56be698805a0fac2efa92c645f0b823fe.zip | |
dev-ml/merlin: fix build with ocaml-4.14.1
Signed-off-by: Alfredo Tupone <tupone@gentoo.org>
Diffstat (limited to 'dev-ml')
| -rw-r--r-- | dev-ml/merlin/merlin-4.7-r1.ebuild (renamed from dev-ml/merlin/merlin-4.7.ebuild) | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/dev-ml/merlin/merlin-4.7.ebuild b/dev-ml/merlin/merlin-4.7-r1.ebuild index f7843381a666..55c9b7015515 100644 --- a/dev-ml/merlin/merlin-4.7.ebuild +++ b/dev-ml/merlin/merlin-4.7-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -21,7 +21,7 @@ IUSE="emacs +ocamlopt test" RESTRICT="!test? ( test )" RDEPEND=" - >=dev-lang/ocaml-4.12:=[ocamlopt?] + dev-lang/ocaml:=[ocamlopt?] dev-ml/csexp:= >=dev-ml/yojson-2.0.0:= dev-ml/menhir:= @@ -30,6 +30,7 @@ RDEPEND=" dev-lang/ocaml:0/4.12 dev-lang/ocaml:0/4.13 dev-lang/ocaml:0/4.14 + dev-lang/ocaml:0/4.14.1 ) emacs? ( >=app-editors/emacs-23.1:* @@ -57,6 +58,8 @@ src_unpack() { mv ${P}-413 "${S}" || die elif has_version "dev-lang/ocaml:0/4.14" ; then mv ${P}-414 "${S}" || die + elif has_version "dev-lang/ocaml:0/4.14.1" ; then + mv ${P}-414 "${S}" || die fi } |