From ee2b32a8b891eb4c4c0bb853761f09400ee4e459 Mon Sep 17 00:00:00 2001 From: Sam James Date: Sat, 20 Mar 2021 01:15:02 +0000 Subject: dev-ml/merlin: fix emacs dependencies Signed-off-by: Sam James --- dev-ml/merlin/merlin-3.4.2-r1.ebuild | 70 +++++++++++++++++++++++++++++++++++ dev-ml/merlin/merlin-3.4.2.ebuild | 68 ---------------------------------- dev-ml/merlin/merlin-4.1-r1.ebuild | 71 ++++++++++++++++++++++++++++++++++++ dev-ml/merlin/merlin-4.1.ebuild | 67 ---------------------------------- 4 files changed, 141 insertions(+), 135 deletions(-) create mode 100644 dev-ml/merlin/merlin-3.4.2-r1.ebuild delete mode 100644 dev-ml/merlin/merlin-3.4.2.ebuild create mode 100644 dev-ml/merlin/merlin-4.1-r1.ebuild delete mode 100644 dev-ml/merlin/merlin-4.1.ebuild (limited to 'dev-ml/merlin') diff --git a/dev-ml/merlin/merlin-3.4.2-r1.ebuild b/dev-ml/merlin/merlin-3.4.2-r1.ebuild new file mode 100644 index 000000000000..d14be4876eb1 --- /dev/null +++ b/dev-ml/merlin/merlin-3.4.2-r1.ebuild @@ -0,0 +1,70 @@ +# 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=" + dev-ml/csexp:= + dev-ml/yojson:= + >=dev-lang/ocaml-4.09:= + =app-editors/emacs-23.1:* + app-emacs/auto-complete + app-emacs/company-mode + ) +" +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 +} diff --git a/dev-ml/merlin/merlin-3.4.2.ebuild b/dev-ml/merlin/merlin-3.4.2.ebuild deleted file mode 100644 index 6a56c013b530..000000000000 --- a/dev-ml/merlin/merlin-3.4.2.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# 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.09:= - =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 -} diff --git a/dev-ml/merlin/merlin-4.1-r1.ebuild b/dev-ml/merlin/merlin-4.1-r1.ebuild new file mode 100644 index 000000000000..2197e4695f95 --- /dev/null +++ b/dev-ml/merlin/merlin-4.1-r1.ebuild @@ -0,0 +1,71 @@ +# 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:* + app-emacs/auto-complete + app-emacs/company-mode + ) +" +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 +} diff --git a/dev-ml/merlin/merlin-4.1.ebuild b/dev-ml/merlin/merlin-4.1.ebuild deleted file mode 100644 index 44da757af904..000000000000 --- a/dev-ml/merlin/merlin-4.1.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# 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 -} -- cgit v1.2.3-65-gdbad