commit: f839dbde90cb4c7efaed2b599613fb830ba1b53b Author: Maciej Barć <xgqt <AT> gentoo <DOT> org> AuthorDate: Mon Jun 6 20:20:53 2022 +0000 Commit: Maciej Barć <xgqt <AT> gentoo <DOT> org> CommitDate: Wed Jun 8 20:25:48 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f839dbde
dev-ml/merlin: use <yojson-2 Bug: https://github.com/ocaml/merlin/pull/1475 Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org> dev-ml/merlin/{merlin-3.4.2-r2.ebuild => merlin-3.4.2-r3.ebuild} | 2 +- dev-ml/merlin/{merlin-4.2-r1.ebuild => merlin-4.2-r2.ebuild} | 2 +- dev-ml/merlin/{merlin-4.3.1-r1.ebuild => merlin-4.3.1-r2.ebuild} | 2 +- dev-ml/merlin/{merlin-4.4-r1.ebuild => merlin-4.4-r2.ebuild} | 2 +- dev-ml/merlin/{merlin-4.5-r1.ebuild => merlin-4.5-r2.ebuild} | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dev-ml/merlin/merlin-3.4.2-r2.ebuild b/dev-ml/merlin/merlin-3.4.2-r3.ebuild similarity index 98% rename from dev-ml/merlin/merlin-3.4.2-r2.ebuild rename to dev-ml/merlin/merlin-3.4.2-r3.ebuild index bf15b8d8aaef..c4d43185b391 100644 --- a/dev-ml/merlin/merlin-3.4.2-r2.ebuild +++ b/dev-ml/merlin/merlin-3.4.2-r3.ebuild @@ -17,7 +17,7 @@ IUSE="emacs +ocamlopt" RDEPEND=" dev-ml/csexp:= - dev-ml/yojson:= + <dev-ml/yojson-2:= >=dev-lang/ocaml-4.09:= <dev-lang/ocaml-4.12:= emacs? ( diff --git a/dev-ml/merlin/merlin-4.2-r1.ebuild b/dev-ml/merlin/merlin-4.2-r2.ebuild similarity index 98% rename from dev-ml/merlin/merlin-4.2-r1.ebuild rename to dev-ml/merlin/merlin-4.2-r2.ebuild index d6a09238ac2f..ec4d4384818f 100644 --- a/dev-ml/merlin/merlin-4.2-r1.ebuild +++ b/dev-ml/merlin/merlin-4.2-r2.ebuild @@ -19,7 +19,7 @@ RESTRICT="!test? ( test )" RDEPEND=" dev-ml/csexp:= - dev-ml/yojson:= + <dev-ml/yojson-2:= dev-ml/menhir:= || ( dev-lang/ocaml:0/4.11 diff --git a/dev-ml/merlin/merlin-4.3.1-r1.ebuild b/dev-ml/merlin/merlin-4.3.1-r2.ebuild similarity index 98% rename from dev-ml/merlin/merlin-4.3.1-r1.ebuild rename to dev-ml/merlin/merlin-4.3.1-r2.ebuild index 0ddc350e9d9b..3ba67542cafd 100644 --- a/dev-ml/merlin/merlin-4.3.1-r1.ebuild +++ b/dev-ml/merlin/merlin-4.3.1-r2.ebuild @@ -19,7 +19,7 @@ RESTRICT="!test? ( test )" RDEPEND=" dev-ml/csexp:= - dev-ml/yojson:= + <dev-ml/yojson-2:= dev-ml/menhir:= >=dev-ml/dune-2.9 || ( diff --git a/dev-ml/merlin/merlin-4.4-r1.ebuild b/dev-ml/merlin/merlin-4.4-r2.ebuild similarity index 98% rename from dev-ml/merlin/merlin-4.4-r1.ebuild rename to dev-ml/merlin/merlin-4.4-r2.ebuild index 2975d266d475..33b8e14ab23b 100644 --- a/dev-ml/merlin/merlin-4.4-r1.ebuild +++ b/dev-ml/merlin/merlin-4.4-r2.ebuild @@ -20,7 +20,7 @@ RESTRICT="!test? ( test )" RDEPEND=" dev-ml/csexp:= - dev-ml/yojson:= + <dev-ml/yojson-2:= dev-ml/menhir:= >=dev-ml/dune-2.9 || ( diff --git a/dev-ml/merlin/merlin-4.5-r1.ebuild b/dev-ml/merlin/merlin-4.5-r2.ebuild similarity index 99% rename from dev-ml/merlin/merlin-4.5-r1.ebuild rename to dev-ml/merlin/merlin-4.5-r2.ebuild index 52caa02ed44d..fe9006bed302 100644 --- a/dev-ml/merlin/merlin-4.5-r1.ebuild +++ b/dev-ml/merlin/merlin-4.5-r2.ebuild @@ -21,7 +21,7 @@ RESTRICT="!test? ( test )" RDEPEND=" dev-ml/csexp:= - dev-ml/yojson:= + <dev-ml/yojson-2:= dev-ml/menhir:= >=dev-ml/dune-2.9 || (
