commit: 7a139ada42140c43077e53b8dffa21904ac42d21 Author: Maciej Barć <xgqt <AT> gentoo <DOT> org> AuthorDate: Mon Jul 14 18:07:41 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=7a139ada
dev-ml/merlin: drop old 4.14-r1 Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org> dev-ml/merlin/Manifest | 2 - dev-ml/merlin/merlin-4.14-r1.ebuild | 116 ------------------------------------ 2 files changed, 118 deletions(-) diff --git a/dev-ml/merlin/Manifest b/dev-ml/merlin/Manifest index 64254222bd99..5cfc92bcb128 100644 --- a/dev-ml/merlin/Manifest +++ b/dev-ml/merlin/Manifest @@ -1,3 +1 @@ -DIST merlin-4.14-414.tar.gz 2463721 BLAKE2B 07d3fae8a4115b39bf035b8550d65447fee0758adb802ce1efa6e2a9ca2a64d433154e48c6d54af125e11ce8d65b7d4e30f1bf2f4414ac3e37cf05bd9b0ded03 SHA512 aad9a9937c53ede4bc45912ef03b9eb655f5a8a25c9893588baab6aec06a0ed7b4827a5228fe8f4495f7b66067b87adf917e6c868c9ff6a88d34982e7db84240 -DIST merlin-4.14-502.tar.gz 3872595 BLAKE2B 81c85101a696e85dd66f5ebc155c578715d30a8abf49e222c50ae09bfa2cc7086cfbcd1a89e611edd2382a844063bfd8ffd7c07c381b94e56db5576a6029fbea SHA512 92120a6b2d7d833519afee223b59980516828ff25d3df24edf64af3ba2f2f38395bb61440d9171d746b287f2de538643e38f8ada5f21ff1a0a56b365a39f814d DIST merlin-5.4.1-503.gh.tar.gz 4715209 BLAKE2B a6a2067e8e12d20b99e378f67ecedf72a2a85577d49ebf499bda7d7fc7f1f5d54957a6bc87bf7d3f18ab0f683c49f444af357a7d7bc4e43b4e408fe85768ed90 SHA512 5a4c29dc3ceee0968c91375b3abf746c74137a117784faaf9209daf9d7efebe2501b16f6c6baa93140c0ee959fef1e3b2ccbcb42135bbe8fe870bb4927ede7e1 diff --git a/dev-ml/merlin/merlin-4.14-r1.ebuild b/dev-ml/merlin/merlin-4.14-r1.ebuild deleted file mode 100644 index 5a667612cdd4..000000000000 --- a/dev-ml/merlin/merlin-4.14-r1.ebuild +++ /dev/null @@ -1,116 +0,0 @@ -# Copyright 1999-2024 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/merlin/archive/refs/tags/v${PV}-414.tar.gz - -> ${P}-414.tar.gz - https://github.com/ocaml/merlin/archive/refs/tags/${PV}-502_preview2.tar.gz - -> ${P}-502.tar.gz -" - -LICENSE="MIT" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="emacs +ocamlopt test" - -# Tests fail unexpectedly on Tinderbox. See https://bugs.gentoo.org/933857 -# RESTRICT="!test? ( test )" -RESTRICT="test" - -RDEPEND=" - >=dev-lang/ocaml-4.14.1 - >=dev-ml/dune-2.9:= - >=dev-ml/yojson-2.0.0:= - dev-ml/csexp:= - dev-ml/menhir:= - 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 - dev-ml/findlib - test? ( - app-misc/jq - ) -" - -SITEFILE="50${PN}-gentoo.el" - -src_unpack() { - default - - if has_version "=dev-lang/ocaml-4.14*" ; then - edo mv "${P}-414" "${S}" - elif has_version "=dev-lang/ocaml-5.2*" ; then - edo mv "${P}-502_preview2" "${S}" - else - die "Currently 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() { - dune_src_compile - - 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 -}
