commit: 07a78d1076046c03eed1553954237b684f74e68b Author: Maciej Barć <xgqt <AT> gentoo <DOT> org> AuthorDate: Mon Jul 14 18:49:39 2025 +0000 Commit: Maciej Barć <xgqt <AT> gentoo <DOT> org> CommitDate: Mon Jul 14 21:13:10 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07a78d10
dev-ml/merlin: bump to 5.5 Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org> dev-ml/merlin/Manifest | 1 + dev-ml/merlin/merlin-5.5.ebuild | 123 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 124 insertions(+) diff --git a/dev-ml/merlin/Manifest b/dev-ml/merlin/Manifest index 5cfc92bcb128..7521d770ddf3 100644 --- a/dev-ml/merlin/Manifest +++ b/dev-ml/merlin/Manifest @@ -1 +1,2 @@ DIST merlin-5.4.1-503.gh.tar.gz 4715209 BLAKE2B a6a2067e8e12d20b99e378f67ecedf72a2a85577d49ebf499bda7d7fc7f1f5d54957a6bc87bf7d3f18ab0f683c49f444af357a7d7bc4e43b4e408fe85768ed90 SHA512 5a4c29dc3ceee0968c91375b3abf746c74137a117784faaf9209daf9d7efebe2501b16f6c6baa93140c0ee959fef1e3b2ccbcb42135bbe8fe870bb4927ede7e1 +DIST merlin-5.5-503.tbz 3847507 BLAKE2B 012c97efea28b55397103af14dc134f2942ad3354f25ea02418ab9bf5b6790c420da79274ba1f22edf1221761b6ecbdd2802ab06fe3d7a3e43a0bd6cd4161797 SHA512 1fb3b5180d36aa82b82a319e15b743b802b6888f0dc67645baafdb4e18dfc23a7b90064ec9bc42f7424061cf8cde7f8839178d8a8537bf4596759f3ff4891873 diff --git a/dev-ml/merlin/merlin-5.5.ebuild b/dev-ml/merlin/merlin-5.5.ebuild new file mode 100644 index 000000000000..871e406d1656 --- /dev/null +++ b/dev-ml/merlin/merlin-5.5.ebuild @@ -0,0 +1,123 @@ +# Copyright 1999-2025 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 edo + +DESCRIPTION="Context sensitive completion for OCaml in Vim and Emacs" +HOMEPAGE="https://github.com/ocaml/merlin/"; +SRC_URI="https://github.com/ocaml/${PN}/releases/download/v${PV}-503/${P}-503.tbz"; + +LICENSE="MIT" +SLOT="0/${PV}" +KEYWORDS="~amd64" +IUSE="emacs +ocamlopt test" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-lang/ocaml-5.3.0 <dev-lang/ocaml-5.4.0 + dev-ml/csexp:= + dev-ml/yojson:= + 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/findlib + test? ( + app-misc/jq + dev-ml/alcotest + dev-ml/ppxlib + ) +" + +SITEFILE="50${PN}-gentoo.el" + +DUNE_PKG_NAMES_OTHER=( + dot-merlin-reader + ocaml-index + merlin-lib +) + +src_unpack() { + default + + if has_version "=dev-lang/ocaml-5.3*" ; then + edo mv "${P}-503" "${S}" + else + die "The installed version of OCaml is not yet supported" + 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 + + # Remove Menhir requirement. + # > MenhirLib.StaticVersion.require_20201216 + sed -i src/ocaml/preprocess/parser_raw.ml \ + -e "s|MenhirLib.StaticVersion.require_.*|()|g" \ + || die +} + +src_compile() { + # This is a minimal compilation set to avoid the "menhir" dependency. + # See the readme: https://github.com/ocaml/merlin/blob/main/README.md + dune-compile "${DUNE_PKG_NAMES_OTHER[@]}" "${PN}" + + if use emacs ; then + # iedit isn't packaged yet + rm emacs/merlin-iedit.el || die + + local -x BYTECOMPFLAGS="-L emacs" + elisp-compile ./emacs/*.el + fi +} + +src_test() { + dune-test "${DUNE_PKG_NAMES_OTHER[@]}" + + # Dune test dance: + # Testing not all packages removes some needed files for the install step. + # We have to compile again, luckily this time most of the build is cached. + dune-compile "${DUNE_PKG_NAMES_OTHER[@]}" "${PN}" +} + +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 +}
