commit: 7e142e23eeca668737b95d59e0f21930b6ebbb30 Author: Maciej Barć <xgqt <AT> gentoo <DOT> org> AuthorDate: Thu Feb 8 10:23:16 2024 +0000 Commit: Maciej Barć <xgqt <AT> gentoo <DOT> 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ć <xgqt <AT> 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=" - !!<dev-ml/seq-0.3 - test? ( app-misc/jq ) -" - -SITEFILE="50${PN}-gentoo.el" - -src_unpack() { - default - - if has_version "dev-lang/ocaml:0/4.12" ; then - mv ${P}-412 "${S}" || die - elif has_version "dev-lang/ocaml:0/4.13" ; then - 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 -} - -src_prepare() { - default - - # Handle ELisp installation via the Emacs Eclass. - rm emacs/dune || die - - # This test runs only inside a git repo, - # it is not included in merlin release for ocaml 4.12. - if [[ -f tests/test-dirs/occurrences/issue1404.t ]] ; then - rm tests/test-dirs/occurrences/issue1404.t || die - fi - rm -r tests/test-dirs/locate/context-detection/cd-mod_constr.t || die - - # Remove seq references from dune build files. - sed -i 's|seq||g' src/frontend/ocamlmerlin/dune || die -} - -src_compile() { - dune build @install || die - - if use emacs ; then - # iedit isn't packaged yet - rm emacs/merlin-iedit.el || die - - BYTECOMPFLAGS="-L emacs" elisp-compile emacs/*.el - fi -} - -src_install() { - dune_src_install - - if use emacs ; then - elisp-install ${PN} emacs/*.el{,c} - elisp-site-file-install "${FILESDIR}/${SITEFILE}" - fi -} - -pkg_postinst() { - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -}
