summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2014-11-28 19:09:56 +0000
committerAlexis Ballier <aballier@gentoo.org>2014-11-28 19:09:56 +0000
commit208d94d265e84006f50301d6110ce11930245489 (patch)
treef00147efb7ede6443c3d1078b4e8a55426cf4ab4 /dev-ml/ocamldsort
parentforce build with -j1, bug #527098 (diff)
downloadgentoo-2-208d94d265e84006f50301d6110ce11930245489.tar.gz
gentoo-2-208d94d265e84006f50301d6110ce11930245489.tar.bz2
gentoo-2-208d94d265e84006f50301d6110ce11930245489.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/ocamldsort')
-rw-r--r--dev-ml/ocamldsort/ChangeLog7
-rw-r--r--dev-ml/ocamldsort/ocamldsort-0.16.0.ebuild7
2 files changed, 9 insertions, 5 deletions
diff --git a/dev-ml/ocamldsort/ChangeLog b/dev-ml/ocamldsort/ChangeLog
index dff6256b8632..52ea8c52a3a5 100644
--- a/dev-ml/ocamldsort/ChangeLog
+++ b/dev-ml/ocamldsort/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-ml/ocamldsort
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamldsort/ChangeLog,v 1.16 2013/08/19 13:43:16 aballier Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamldsort/ChangeLog,v 1.17 2014/11/28 19:09:56 aballier Exp $
+
+ 28 Nov 2014; Alexis Ballier <aballier@gentoo.org> ocamldsort-0.16.0.ebuild:
+ update deps for ocaml 4.02
19 Aug 2013; Alexis Ballier <aballier@gentoo.org> -ocamldsort-0.15.0.ebuild:
remove old
diff --git a/dev-ml/ocamldsort/ocamldsort-0.16.0.ebuild b/dev-ml/ocamldsort/ocamldsort-0.16.0.ebuild
index 67859c559bc0..e369384b1ec7 100644
--- a/dev-ml/ocamldsort/ocamldsort-0.16.0.ebuild
+++ b/dev-ml/ocamldsort/ocamldsort-0.16.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamldsort/ocamldsort-0.16.0.ebuild,v 1.4 2013/03/19 10:34:08 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamldsort/ocamldsort-0.16.0.ebuild,v 1.5 2014/11/28 19:09:56 aballier Exp $
EAPI=5
@@ -13,7 +13,8 @@ SLOT="0"
KEYWORDS="~amd64 ppc x86"
IUSE=""
-DEPEND=">=dev-lang/ocaml-3.12:="
+DEPEND=">=dev-lang/ocaml-3.12:=
+ || ( dev-ml/camlp4:= <dev-lang/ocaml-4.02.0 )"
RDEPEND="${DEPEND}"
src_compile() {