[gentoo-commits] repo/gentoo:master commit in: dev-ml/merlin/

[Alfredo Tupone]

commit:     da6978e56be698805a0fac2efa92c645f0b823fe
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 12 09:23:53 2023 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sun Feb 12 13:28:34 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da6978e5

dev-ml/merlin: fix build with ocaml-4.14.1

Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>

 dev-ml/merlin/{merlin-4.7.ebuild => merlin-4.7-r1.ebuild} | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/dev-ml/merlin/merlin-4.7.ebuild 
b/dev-ml/merlin/merlin-4.7-r1.ebuild
similarity index 93%
rename from dev-ml/merlin/merlin-4.7.ebuild
rename to 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
 }