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 1681715815E for ; Thu, 8 Feb 2024 10:32:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 47233E2A7F; Thu, 8 Feb 2024 10:31:59 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 28BB3E2A7F for ; Thu, 8 Feb 2024 10:31:59 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3D3AC343179 for ; Thu, 8 Feb 2024 10:31:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 58C8614D0 for ; Thu, 8 Feb 2024 10:31:55 +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: <1707388287.7e142e23eeca668737b95d59e0f21930b6ebbb30.xgqt@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ml/merlin/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-ml/merlin/Manifest dev-ml/merlin/merlin-4.7-r1.ebuild X-VCS-Directories: dev-ml/merlin/ X-VCS-Committer: xgqt X-VCS-Committer-Name: Maciej Barć X-VCS-Revision: 7e142e23eeca668737b95d59e0f21930b6ebbb30 X-VCS-Branch: master Date: Thu, 8 Feb 2024 10:31:55 +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: e7aa5916-53f1-4abd-bc23-5701b749b9d1 X-Archives-Hash: d54cf6296a200c9ac3f9ef244da66b0e commit: 7e142e23eeca668737b95d59e0f21930b6ebbb30 Author: Maciej Barć gentoo org> AuthorDate: Thu Feb 8 10:23:16 2024 +0000 Commit: Maciej Barć gentoo org> CommitDate: Thu Feb 8 10:31:27 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e142e23 dev-ml/merlin: drop old 4.7-r1 Signed-off-by: Maciej Barć gentoo.org> dev-ml/merlin/Manifest | 3 - dev-ml/merlin/merlin-4.7-r1.ebuild | 109 ------------------------------------- 2 files changed, 112 deletions(-) diff --git a/dev-ml/merlin/Manifest b/dev-ml/merlin/Manifest index 63f43cc9655b..12b74679d882 100644 --- a/dev-ml/merlin/Manifest +++ b/dev-ml/merlin/Manifest @@ -1,4 +1 @@ DIST merlin-4.12-414.tbz 1991877 BLAKE2B d68a45efb29d7ed2dd8d2e377a7778fad5500064206e5ae27914a0be9f208f919f44f73f14be283aca653adf56462a782c4f5f895282e078478e60f13e9c09f1 SHA512 3bf4f5e4754def9818ce0abbdf2253fe9d5e0abec7e8814012e2ff9de6a174f288c257780eb9f8aa4d794c0b62a524848d579d2a3495a5747a0970ee9fbfff29 -DIST merlin-4.7-412.tbz 1771126 BLAKE2B 1454873ecc1d533a5e82adaa71082339c44b93c2626d46cc5147d1b8049b397ef34e6137256560d6c9b7eaf826155e34617c071d1aae3aa3f02807e73c209cf1 SHA512 d13e307d87b4719b56397e54e6f771a3ea77a766ab38b22414c4b1d4d5828b5f790c82f28d3feaf7fe45be10abd50d9a905ece932f43fdad98c88b73b35dd936 -DIST merlin-4.7-413.tbz 2296558 BLAKE2B 2e6d9918c911eab017bb3491cab97f2b0362d13e072a0c39a6637f25d2a15ac7f3027cec51ab0d66a2239fea055f70b5b1e3294c05985faae5d11c57bff81501 SHA512 71068a6b50628c57003b29de3968e41c24b67394dcc1d1f1a0b335211e9d1ef3e527584b868514bd5489db5a130f2ff6fd145d3665a7d2bca5a117074cb08ce8 -DIST merlin-4.7-414.tbz 1976276 BLAKE2B 91fc5221b536d20174e36c4fdf4bc32f125f2af0f23c95c2e917f425826b0c58fe65b1b849eded570b8f4aece0fb00f1bdf7d0a00fa67f6c4e58892a095e1466 SHA512 c325c29bea91699739d7cb7df12876b7ffb8edf685deabb5dce5553b570a6bf8ff415c45e3295b674edbc7711f69f4be202b866d157516380f888e80dcee1082 diff --git a/dev-ml/merlin/merlin-4.7-r1.ebuild b/dev-ml/merlin/merlin-4.7-r1.ebuild deleted file mode 100644 index 55c9b7015515..000000000000 --- a/dev-ml/merlin/merlin-4.7-r1.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# TODO: vim-plugin, although it's not clear how to make it work here -inherit elisp-common dune - -DESCRIPTION="Context sensitive completion for OCaml in Vim and Emacs" -HOMEPAGE="https://github.com/ocaml/merlin/" -SRC_URI=" - https://github.com/ocaml/merlin/releases/download/v${PV}-412/${P}-412.tbz - https://github.com/ocaml/merlin/releases/download/v${PV}-413/${P}-413.tbz - https://github.com/ocaml/merlin/releases/download/v${PV}-414/${P}-414.tbz -" - -LICENSE="MIT" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="emacs +ocamlopt test" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-lang/ocaml:=[ocamlopt?] - dev-ml/csexp:= - >=dev-ml/yojson-2.0.0:= - dev-ml/menhir:= - >=dev-ml/dune-2.9:= - || ( - 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:* - app-emacs/auto-complete - app-emacs/company-mode - ) -" -DEPEND="${RDEPEND}" -# NOTICE: Block dev-ml/seq (which is a back-port of code to ocaml <4.07) -# because it breaks merlin builds. -# https://github.com/ocaml/merlin/issues/1500 -BDEPEND=" - !!