dev-ml/merlin: bump to 5.6

Signed-off-by: Maciej Barć <xgqt@gentoo.org>
This commit is contained in:
Maciej Barć 2025-10-25 21:16:30 +02:00
parent ce1720eea3
commit 8acca55ff2
No known key found for this signature in database
GPG Key ID: 031C9FE65BED714A
2 changed files with 127 additions and 0 deletions

View File

@ -1 +1,3 @@
DIST merlin-5.5-503.tbz 3847507 BLAKE2B 012c97efea28b55397103af14dc134f2942ad3354f25ea02418ab9bf5b6790c420da79274ba1f22edf1221761b6ecbdd2802ab06fe3d7a3e43a0bd6cd4161797 SHA512 1fb3b5180d36aa82b82a319e15b743b802b6888f0dc67645baafdb4e18dfc23a7b90064ec9bc42f7424061cf8cde7f8839178d8a8537bf4596759f3ff4891873
DIST merlin-5.6-503.tbz 3922503 BLAKE2B 7f5f177f12bf6717a27d3d75c90b465e9c72196222baa87ce18b35c2fdcaa181af4b10ce1fc3abbdd90dfa84a3b2ea56883a528125bbbddf5a6fdf64d3537b4c SHA512 9987baf2b2e82bab4c90a328bfcba9945e797e0f3d947156f04435ee84b49542844b379e35a79027c3ffe81f4b7a8f1c60803233999b4c039d4598033371880d
DIST merlin-5.6-504.tbz 4588103 BLAKE2B 06fead7fdc112b48611ab88f83ad34e7f125d61b171efdac9c43a5d52a6201aa7f8459f87ea29bbab7e0ec02b9fddc37d82871baf91e393da9afa63f69282783 SHA512 e21c96db754a289462677e6985181902ddd90bab9e9cebbbb739d92d94b5aee7ef7a134da70ae384291d9bfaccfecd26d37b48f8d75c5d36b9eda18f6e5afd3d

View File

@ -0,0 +1,125 @@
# 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
https://github.com/ocaml/${PN}/releases/download/v${PV}-504/${P}-504.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.5.0
dev-ml/csexp:=
dev-ml/yojson:=
emacs? (
>=app-editors/emacs-23.1:*
app-emacs/auto-complete
app-emacs/company-mode
)
"
DEPEND="
${RDEPEND}
"
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}"
elif has_version "=dev-lang/ocaml-5.4*" ; then
edo mv "${P}-504" "${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
}