commit: 1dee4d23ef6344427fb704191a6cc24ff8ed7425 Author: Maciej Barć <xgqt <AT> gentoo <DOT> org> AuthorDate: Fri Jul 22 23:03:22 2022 +0000 Commit: Maciej Barć <xgqt <AT> gentoo <DOT> org> CommitDate: Sat Jul 23 00:03:18 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1dee4d23
dev-ml/merlin: bump to 4.6 Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org> dev-ml/merlin/Manifest | 3 ++ dev-ml/merlin/merlin-4.6.ebuild | 100 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 103 insertions(+) diff --git a/dev-ml/merlin/Manifest b/dev-ml/merlin/Manifest index 9e5795e8cf56..536daa402927 100644 --- a/dev-ml/merlin/Manifest +++ b/dev-ml/merlin/Manifest @@ -10,3 +10,6 @@ DIST merlin-4.5-411.tbz 1316537 BLAKE2B 8850ea6b15819a178f763d8b55fecca9104cec50 DIST merlin-4.5-412.tbz 1765436 BLAKE2B eaed065a2814f4c1bfc5337d026c7c42287b8cbbe50097415a983f7fdd7323f4c88f3b8c8cff4ca88a0813204617f39807709a6703fd618269eca6063b3c47b1 SHA512 f9edc3e1c9f753d7bacbdf1b92c118b54f9e9eff0bf752a2b44f39a2f7ecc76c4cd3bbe9227e910aea8b5ea947e8fe1b8d92ba0245fe47bc8cc2f45404cca973 DIST merlin-4.5-413.tbz 2290507 BLAKE2B 32aeda63caec645da8043c49ceaa0ea54d095b3e286f687b5f3da1b44d54bbc291d0358768d2180825cb620a91765da83d90b645151a694a4131788ab4438fbf SHA512 b1db98c38a97ca0eef3051ab2b5d1b158e757863de6908a830308e7ea7f960eebd64b1a60bf51b10b7ea2eea3141ee0917a7c3570b63f9faa2e3f69c5d6fe0c2 DIST merlin-4.5-414.tbz 1964688 BLAKE2B 41cb76fb367545af3b5ac7d62f5b69ae031ed99956aca947dc8b91e2fa906d500bed272f7f46a7ad9e57bf3cb5620893072b52ac7f2246d6ae3be1ae22e99406 SHA512 cc2cf2c208091b3ae435a8124617e56f2002b7091532002ab49a1f817d90a5c4f9cf0bc5741dc7f2526e0352c3ca95b42c3b3a17c6cbfb80ad73d42310a25d22 +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 diff --git a/dev-ml/merlin/merlin-4.6.ebuild b/dev-ml/merlin/merlin-4.6.ebuild new file mode 100644 index 000000000000..54eef9ec4a64 --- /dev/null +++ b/dev-ml/merlin/merlin-4.6.ebuild @@ -0,0 +1,100 @@ +# 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=" + !<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 + fi +} + +src_prepare() { + default + + # Handle installation via the eclass + rm emacs/dune || die + + # This test runs only inside a git repo + rm -r tests/test-dirs/occurrences/issue1404.t || die + rm -r tests/test-dirs/locate/context-detection/cd-mod_constr.t || 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 +}
