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 25B3C15801B for ; Sun, 27 Aug 2023 12:42:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 66AED2BC0E9; Sun, 27 Aug 2023 12:42:55 +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 494602BC0E9 for ; Sun, 27 Aug 2023 12:42: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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3BC0A335CE9 for ; Sun, 27 Aug 2023 12:42:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 103FE10BA for ; Sun, 27 Aug 2023 12:42:51 +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: <1693140168.0f5e162b212b4449c9a70e32fa9bb155708e62ff.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.6.ebuild X-VCS-Directories: dev-ml/merlin/ X-VCS-Committer: xgqt X-VCS-Committer-Name: Maciej Barć X-VCS-Revision: 0f5e162b212b4449c9a70e32fa9bb155708e62ff X-VCS-Branch: master Date: Sun, 27 Aug 2023 12:42:51 +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: 06117b83-35f4-4d69-b608-dc9e9470f44f X-Archives-Hash: e96654fdacf54e6ff89e1c49bba79efa commit: 0f5e162b212b4449c9a70e32fa9bb155708e62ff Author: Maciej Barć gentoo org> AuthorDate: Sun Aug 27 12:40:44 2023 +0000 Commit: Maciej Barć gentoo org> CommitDate: Sun Aug 27 12:42:48 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f5e162b dev-ml/merlin: drop old 4.6 Signed-off-by: Maciej Barć gentoo.org> dev-ml/merlin/Manifest | 3 -- dev-ml/merlin/merlin-4.6.ebuild | 106 ---------------------------------------- 2 files changed, 109 deletions(-) diff --git a/dev-ml/merlin/Manifest b/dev-ml/merlin/Manifest index 425ce511f87f..12f69e065f7d 100644 --- a/dev-ml/merlin/Manifest +++ b/dev-ml/merlin/Manifest @@ -1,7 +1,4 @@ DIST merlin-4.10-414.tbz 1989927 BLAKE2B 9a65e9c1a2d5795e1e0235d5c8b0274bd9d8ef052ed421e8809224de73f577da273c9f1ca0f071d6ea0accd349b9b6d59b2e1fb5561effe483ebb0de89a4c766 SHA512 7805b99c2a73b2e3f70d26fd7183a90f97657d66946e2a4b58563f00fd3ed8d82da1fb0597b033b8c8c9e8db415d66e51720c972d34db4b66b71bb8f0c9ee08c -DIST merlin-4.6-412.tbz 1767545 BLAKE2B 95b4f4e53accf55f4d2bc381779fa31bb5db39c21fa2cd8dc0b1d5b0e4a4acf484f2eb58327bce1c990cbbb2205bb87215aeba1b923ba6a62c82862d884dd410 SHA512 4362482ecd7c8af1c4e740e3816100cd5408eba3aebc01b867b45bdd1dcc237819cb0640e0f618b6ecf00aa8d55e58e55ecfeb176ed7b358c404ea71302443b0 -DIST merlin-4.6-413.tbz 2292506 BLAKE2B ec61d3b9cbfd9cddbb27fed70ebf7b69816244afb8a6c36347fbb762fc6aee1e6dd2b728db0687cd984603c3847ba3fe858b9663a7b3dcd17aedede662848299 SHA512 fe88a52c4c3c94505da142fbb7d400fce11bfafe6e47ec7cd39437308baa7122399a008bb6d0ef7b8f29636c2a51f4d49e3535136010fec198a1188293914a56 -DIST merlin-4.6-414.tbz 1969647 BLAKE2B fdb55f7ba9a597fb03bb377556238dedc2a5d60bdc772a479a9ad98c0feb243a7fc61dd47a65194ddba9afb8509858d8956a87ca5af9fc68597ba746b0d56d60 SHA512 7373fadf05c692c9f054c7fe6a7d4bdfeefe237b9df432024ef9923782ee72e09021c0c3fba869da8347728105cb2d3ff0aa94b0c5eb09811bb25aa8da9fb520 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.6.ebuild b/dev-ml/merlin/merlin-4.6.ebuild deleted file mode 100644 index f7843381a666..000000000000 --- a/dev-ml/merlin/merlin-4.6.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2022 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-4.12:=[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 - ) - 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=" - !!