summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2014-11-28 17:31:07 +0000
committerAlexis Ballier <aballier@gentoo.org>2014-11-28 17:31:07 +0000
commit8435b2a19e060e6627fcf2d0363b4ff747cf0dba (patch)
treef6a2c90c44883d9bd339d7df16153d79201257f5 /dev-ml/camomile
parentupdate deps for ocaml 4.02 (diff)
downloadgentoo-2-8435b2a19e060e6627fcf2d0363b4ff747cf0dba.tar.gz
gentoo-2-8435b2a19e060e6627fcf2d0363b4ff747cf0dba.tar.bz2
gentoo-2-8435b2a19e060e6627fcf2d0363b4ff747cf0dba.zip
update deps for ocaml 4.02
Signed-off-by: aballier@gentoo.org (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Diffstat (limited to 'dev-ml/camomile')
-rw-r--r--dev-ml/camomile/ChangeLog5
-rw-r--r--dev-ml/camomile/camomile-0.8.4.ebuild7
2 files changed, 9 insertions, 3 deletions
diff --git a/dev-ml/camomile/ChangeLog b/dev-ml/camomile/ChangeLog
index 45fc5dd56377..26f956aaad1c 100644
--- a/dev-ml/camomile/ChangeLog
+++ b/dev-ml/camomile/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-ml/camomile
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/camomile/ChangeLog,v 1.37 2014/08/10 20:42:32 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/camomile/ChangeLog,v 1.38 2014/11/28 17:31:07 aballier Exp $
+
+ 28 Nov 2014; Alexis Ballier <aballier@gentoo.org> camomile-0.8.4.ebuild:
+ update deps for ocaml 4.02
10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> camomile-0.8.4.ebuild:
QA: drop trailing '.' from DESCRIPTION
diff --git a/dev-ml/camomile/camomile-0.8.4.ebuild b/dev-ml/camomile/camomile-0.8.4.ebuild
index 6fec6d377978..220d3d100aa4 100644
--- a/dev-ml/camomile/camomile-0.8.4.ebuild
+++ b/dev-ml/camomile/camomile-0.8.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/camomile/camomile-0.8.4.ebuild,v 1.5 2014/08/10 20:42:32 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/camomile/camomile-0.8.4.ebuild,v 1.6 2014/11/28 17:31:07 aballier Exp $
EAPI="5"
@@ -15,7 +15,10 @@ SLOT="0/${PV}"
KEYWORDS="~amd64 ppc x86"
IUSE="debug +ocamlopt"
-RDEPEND=">=dev-lang/ocaml-3.10.2:=[ocamlopt?]"
+RDEPEND="
+ >=dev-lang/ocaml-3.10.2:=[ocamlopt?]
+ || ( dev-ml/camlp4:= <dev-lang/ocaml-4.02.0 )
+"
DEPEND="${RDEPEND}"
src_configure() {