From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1262725-garchives=archives.gentoo.org@lists.gentoo.org>
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 250351382C5
for <garchives@archives.gentoo.org>; Sat, 20 Mar 2021 01:15:31 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 3A99EE08A0;
Sat, 20 Mar 2021 01:15:30 +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 1E768E08A0
for <gentoo-commits@lists.gentoo.org>; Sat, 20 Mar 2021 01:15:30 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(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 E0F3C340BE2
for <gentoo-commits@lists.gentoo.org>; Sat, 20 Mar 2021 01:15:28 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 5B9ED5C4
for <gentoo-commits@lists.gentoo.org>; Sat, 20 Mar 2021 01:15:27 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
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" <sam@gentoo.org>
Message-ID: <1616202902.ee2b32a8b891eb4c4c0bb853761f09400ee4e459.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-3.4.2-r1.ebuild dev-ml/merlin/merlin-3.4.2.ebuild dev-ml/merlin/merlin-4.1-r1.ebuild 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: ee2b32a8b891eb4c4c0bb853761f09400ee4e459
X-VCS-Branch: master
Date: Sat, 20 Mar 2021 01:15:27 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 59cbcbf4-93e6-4bf3-b420-2be48281612d
X-Archives-Hash: f2b23e2634e612ce043938f6a9fe1820
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}"