From b9a307b91a72104f340aebc967368b49d84a5af5 Mon Sep 17 00:00:00 2001
From: Pierre-Nicolas Clauss <pinicarus@protonmail.com>
Date: Sat, 19 Jun 2021 19:36:25 +0200
Subject: dev-ml/merlin: remove unneeded emacs dependencies

Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Pierre-Nicolas Clauss <pinicarus@protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/21332
Signed-off-by: Sam James <sam@gentoo.org>
---
 dev-ml/merlin/merlin-4.1-r1.ebuild | 72 --------------------------------------
 dev-ml/merlin/merlin-4.1-r2.ebuild | 70 ++++++++++++++++++++++++++++++++++++
 2 files changed, 70 insertions(+), 72 deletions(-)
 delete mode 100644 dev-ml/merlin/merlin-4.1-r1.ebuild
 create mode 100644 dev-ml/merlin/merlin-4.1-r2.ebuild

(limited to 'dev-ml/merlin')

diff --git a/dev-ml/merlin/merlin-4.1-r1.ebuild b/dev-ml/merlin/merlin-4.1-r1.ebuild
deleted file mode 100644
index 7bd1055d4404..000000000000
--- a/dev-ml/merlin/merlin-4.1-r1.ebuild
+++ /dev/null
@@ -1,72 +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-ml/menhir:=
-	=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-r2.ebuild b/dev-ml/merlin/merlin-4.1-r2.ebuild
new file mode 100644
index 000000000000..70e3b0b53a56
--- /dev/null
+++ b/dev-ml/merlin/merlin-4.1-r2.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-ml/menhir:=
+	=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
+}
-- 
cgit v1.2.3-65-gdbad