summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2021-03-20 01:15:02 +0000
committerSam James <sam@gentoo.org>2021-03-20 01:15:02 +0000
commitee2b32a8b891eb4c4c0bb853761f09400ee4e459 (patch)
tree393e85234b475371f7c0de1e8fee92d7f3fec743 /dev-ml/merlin
parentdev-libs/libpcre: add bugs-to (diff)
downloadgentoo-ee2b32a8b891eb4c4c0bb853761f09400ee4e459.tar.gz
gentoo-ee2b32a8b891eb4c4c0bb853761f09400ee4e459.tar.bz2
gentoo-ee2b32a8b891eb4c4c0bb853761f09400ee4e459.zip
dev-ml/merlin: fix emacs dependencies
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'dev-ml/merlin')
-rw-r--r--dev-ml/merlin/merlin-3.4.2-r1.ebuild (renamed from dev-ml/merlin/merlin-3.4.2.ebuild)8
-rw-r--r--dev-ml/merlin/merlin-4.1-r1.ebuild (renamed from dev-ml/merlin/merlin-4.1.ebuild)6
2 files changed, 10 insertions, 4 deletions
diff --git a/dev-ml/merlin/merlin-3.4.2.ebuild b/dev-ml/merlin/merlin-3.4.2-r1.ebuild
index 6a56c013b530..d14be4876eb1 100644
--- a/dev-ml/merlin/merlin-3.4.2.ebuild
+++ b/dev-ml/merlin/merlin-3.4.2-r1.ebuild
@@ -16,13 +16,15 @@ 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:=
<dev-lang/ocaml-4.12:=
- emacs? ( >=app-editors/emacs-23.1:* )
+ emacs? (
+ >=app-editors/emacs-23.1:*
+ app-emacs/auto-complete
+ app-emacs/company-mode
+ )
"
DEPEND="${RDEPEND}"
diff --git a/dev-ml/merlin/merlin-4.1.ebuild b/dev-ml/merlin/merlin-4.1-r1.ebuild
index 44da757af904..2197e4695f95 100644
--- a/dev-ml/merlin/merlin-4.1.ebuild
+++ b/dev-ml/merlin/merlin-4.1-r1.ebuild
@@ -21,7 +21,11 @@ RDEPEND="
dev-ml/csexp:=
dev-ml/yojson:=
=dev-lang/ocaml-4.11*:=
- emacs? ( >=app-editors/emacs-23.1:* )
+ emacs? (
+ >=app-editors/emacs-23.1:*
+ app-emacs/auto-complete
+ app-emacs/company-mode
+ )
"
DEPEND="${RDEPEND}"