From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 64A4C15817D for ; Sat, 8 Jun 2024 23:11:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A008BE2AB2; Sat, 8 Jun 2024 23:11:55 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 775B0E2AB2 for ; Sat, 8 Jun 2024 23:11:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6A28F340A12 for ; Sat, 8 Jun 2024 23:11:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CD48F1610 for ; Sat, 8 Jun 2024 23:11:52 +0000 (UTC) From: "Maciej Barć" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Maciej Barć" Message-ID: <1717888309.6e5b6388a5e82b62c4d4de64c075193ffd9a2cf5.xgqt@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ml/merlin/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-ml/merlin/merlin-4.13-r1.ebuild dev-ml/merlin/merlin-4.13.ebuild X-VCS-Directories: dev-ml/merlin/ X-VCS-Committer: xgqt X-VCS-Committer-Name: Maciej Barć X-VCS-Revision: 6e5b6388a5e82b62c4d4de64c075193ffd9a2cf5 X-VCS-Branch: master Date: Sat, 8 Jun 2024 23:11:52 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 4596dbba-d00e-4bb6-8d7a-d943eeed2c32 X-Archives-Hash: 5df2e062c4813fae2f295354b14d7122 commit: 6e5b6388a5e82b62c4d4de64c075193ffd9a2cf5 Author: Maciej Barć gentoo org> AuthorDate: Sat Jun 8 22:21:01 2024 +0000 Commit: Maciej Barć gentoo org> CommitDate: Sat Jun 8 23:11:49 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e5b6388 dev-ml/merlin: bump ocaml compat to 4.14.2 Signed-off-by: Maciej Barć gentoo.org> dev-ml/merlin/{merlin-4.13.ebuild => merlin-4.13-r1.ebuild} | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dev-ml/merlin/merlin-4.13.ebuild b/dev-ml/merlin/merlin-4.13-r1.ebuild similarity index 95% rename from dev-ml/merlin/merlin-4.13.ebuild rename to dev-ml/merlin/merlin-4.13-r1.ebuild index 80b96bc1404a..92bd8816e400 100644 --- a/dev-ml/merlin/merlin-4.13.ebuild +++ b/dev-ml/merlin/merlin-4.13-r1.ebuild @@ -25,6 +25,7 @@ RDEPEND=" || ( dev-lang/ocaml:0/4.14 dev-lang/ocaml:0/4.14.1 + dev-lang/ocaml:0/4.14.2 ) emacs? ( >=app-editors/emacs-23.1:* @@ -52,6 +53,8 @@ src_unpack() { mv ${P}-414 "${S}" || die elif has_version "dev-lang/ocaml:0/4.14.1" ; then mv ${P}-414 "${S}" || die + elif has_version "dev-lang/ocaml:0/4.14.2" ; then + mv ${P}-414 "${S}" || die fi }