commit: ee2b32a8b891eb4c4c0bb853761f09400ee4e459 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sat Mar 20 01:15:02 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Mar 20 01:15:02 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee2b32a8
dev-ml/merlin: fix emacs dependencies Signed-off-by: Sam James <sam <AT> gentoo.org> dev-ml/merlin/{merlin-3.4.2.ebuild => merlin-3.4.2-r1.ebuild} | 8 +++++--- dev-ml/merlin/{merlin-4.1.ebuild => merlin-4.1-r1.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 similarity index 92% rename from dev-ml/merlin/merlin-3.4.2.ebuild rename to dev-ml/merlin/merlin-3.4.2-r1.ebuild index 6a56c013b53..d14be4876eb 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 similarity index 92% rename from dev-ml/merlin/merlin-4.1.ebuild rename to dev-ml/merlin/merlin-4.1-r1.ebuild index 44da757af90..2197e4695f9 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}"