summaryrefslogtreecommitdiff
path: root/dev-ml
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2023-02-13 08:16:09 +0000
committerV3n3RiX <venerix@koprulu.sector>2023-02-13 08:16:09 +0000
commit4a74938e510c0dad732ae4c48f815dd0f0cabb46 (patch)
treee8c52cd3619bba6cf0a5c367f6c9d2cff0ac9d80 /dev-ml
parentebc282ef4dfa408accac685565b8ee5f6faec119 (diff)
gentoo auto-resync : 13:02:2023 - 08:16:09
Diffstat (limited to 'dev-ml')
-rw-r--r--dev-ml/Manifest.gzbin37155 -> 37153 bytes
-rw-r--r--dev-ml/merlin/Manifest2
-rw-r--r--dev-ml/merlin/merlin-4.7-r1.ebuild (renamed from dev-ml/merlin/merlin-4.7.ebuild)7
3 files changed, 6 insertions, 3 deletions
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 629d8931a92a..f0ea5aa40152 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
Binary files differ
diff --git a/dev-ml/merlin/Manifest b/dev-ml/merlin/Manifest
index 7496192bfd07..2def957c6c1d 100644
--- a/dev-ml/merlin/Manifest
+++ b/dev-ml/merlin/Manifest
@@ -11,5 +11,5 @@ DIST merlin-4.7-413.tbz 2296558 BLAKE2B 2e6d9918c911eab017bb3491cab97f2b0362d13e
DIST merlin-4.7-414.tbz 1976276 BLAKE2B 91fc5221b536d20174e36c4fdf4bc32f125f2af0f23c95c2e917f425826b0c58fe65b1b849eded570b8f4aece0fb00f1bdf7d0a00fa67f6c4e58892a095e1466 SHA512 c325c29bea91699739d7cb7df12876b7ffb8edf685deabb5dce5553b570a6bf8ff415c45e3295b674edbc7711f69f4be202b866d157516380f888e80dcee1082
EBUILD merlin-4.5-r3.ebuild 2175 BLAKE2B 2673f32fff876100b2a3649e169b13d28d80647c8c1d6b928a8114c4ed70c7c4312337e606cff7253ca321363e5ea296b1a4c84c0b22531a7007b9ac6771e83c SHA512 2dd3ce00635e0d8bc32e5810f8661ccc1738fa1c44d8f14257d1f5900ab863be3994d2e3bcee2eb2a83b48b5859239e98a11ff95f2b5abb920d534781004e5be
EBUILD merlin-4.6.ebuild 2418 BLAKE2B 6742961957e55ba5f34f7af4a4a5ac1906efdc0202ee2a63da2d16e57a3858656a0261296d97b1b38afeb9b3053f10b7a736034c9df1b41bee5d19abf3184a55 SHA512 f9eb8e699d311949cda3eb381f81fdaafc1a29bedd95b31595cf8f3165760bde53f4da4c397db0da6a205bc6601c633ac4683f64712ab0037de8d1673037b52c
-EBUILD merlin-4.7.ebuild 2418 BLAKE2B 6742961957e55ba5f34f7af4a4a5ac1906efdc0202ee2a63da2d16e57a3858656a0261296d97b1b38afeb9b3053f10b7a736034c9df1b41bee5d19abf3184a55 SHA512 f9eb8e699d311949cda3eb381f81fdaafc1a29bedd95b31595cf8f3165760bde53f4da4c397db0da6a205bc6601c633ac4683f64712ab0037de8d1673037b52c
+EBUILD merlin-4.7-r1.ebuild 2516 BLAKE2B b65537f90d5d6033910882aa070f9e15dbbf533307d2c8f86910d063cf9e3772c1c56f6b0ed2b08b948f2e0c85d5ea451cd9a5d84dafaa15d84773846dabbb83 SHA512 e695eae2d024bc5eeedb871acea24d17faffbfcac7606e4e0c483eba5cebf2d12165135bb13119daed0a5fc0c016fe5079932eaf644995c92e539db388e4f322
MISC metadata.xml 310 BLAKE2B f1255dfdcb6984112e896735ea40f1171a8d52149fa7e8ed279efc1fe08de9b071554f5168bc3f8c0e432bd8344c69f5c5716c5c689ff4ff4edbc27569546246 SHA512 06710c33027574e4c13259e30ca5e862b7bbda0442013676020d00dd1114e92ebee92fa19d2993fc3881c10f9db7b51dd2710fcfbcf9ca7564f8f96e5065705e
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
}