From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id AA4B613835A for ; Fri, 19 Mar 2021 10:24:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D2EF8E091B; Fri, 19 Mar 2021 10:24:03 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B9EE5E091B for ; Fri, 19 Mar 2021 10:24:03 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 26881340D96 for ; Fri, 19 Mar 2021 10:24:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7722B5BA for ; Fri, 19 Mar 2021 10:24:00 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1616149426.e90cd3a78292328d6011bb750cadf46c8bef72b8.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ml/merlin/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-ml/merlin/merlin-4.1.ebuild X-VCS-Directories: dev-ml/merlin/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: e90cd3a78292328d6011bb750cadf46c8bef72b8 X-VCS-Branch: master Date: Fri, 19 Mar 2021 10:24:00 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 175c7e00-d1d9-4028-aa4a-94bd4ea7636e X-Archives-Hash: 7095af7640535f195f67bedcca2c7dc3 commit: e90cd3a78292328d6011bb750cadf46c8bef72b8 Author: Sam James gentoo org> AuthorDate: Fri Mar 19 09:51:42 2021 +0000 Commit: Sam James gentoo org> CommitDate: Fri Mar 19 10:23:46 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e90cd3a7 dev-ml/merlin: add 4.1 Signed-off-by: Sam James gentoo.org> dev-ml/merlin/merlin-4.1.ebuild | 67 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/dev-ml/merlin/merlin-4.1.ebuild b/dev-ml/merlin/merlin-4.1.ebuild new file mode 100644 index 00000000000..44da757af90 --- /dev/null +++ b/dev-ml/merlin/merlin-4.1.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +# 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/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/${PV}" +KEYWORDS="~amd64" +IUSE="emacs +ocamlopt" + +RDEPEND=" + app-emacs/auto-complete + app-emacs/company-mode + dev-ml/csexp:= + dev-ml/yojson:= + =dev-lang/ocaml-4.11*:= + emacs? ( >=app-editors/emacs-23.1:* ) +" +DEPEND="${RDEPEND}" + +SITEFILE="50${PN}-gentoo.el" + +src_prepare() { + default + + # Handle installation via the eclass + rm emacs/dune || die +} + +src_compile() { + dune_src_compile + + if use emacs ; then + # Build the emacs integration + cd emacs || die + + # iedit isn't packaged yet + rm merlin-iedit.el || die + + elisp-compile *.el + fi +} + +src_install() { + dune_src_install + + if use emacs ; then + cd "${S}/emacs" || die + elisp-install ${PN} *.el *.elc + elisp-site-file-install "${FILESDIR}/${SITEFILE}" + fi +} + +pkg_postinst() { + use emacs && elisp-site-regen +} + +pkg_postrm() { + use emacs && elisp-site-regen +}