summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2014-11-28 17:32:24 +0000
committerAlexis Ballier <aballier@gentoo.org>2014-11-28 17:32:24 +0000
commit68e8216bc68a038fa3f4d2c878d5182a7edd05f5 (patch)
treef0a0182b2d40a35c7ec1c0624bc74896f77593f5 /dev-ml/extlib
parentupdate deps for ocaml 4.02 (diff)
downloadgentoo-2-68e8216bc68a038fa3f4d2c878d5182a7edd05f5.tar.gz
gentoo-2-68e8216bc68a038fa3f4d2c878d5182a7edd05f5.tar.bz2
gentoo-2-68e8216bc68a038fa3f4d2c878d5182a7edd05f5.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/extlib')
-rw-r--r--dev-ml/extlib/ChangeLog5
-rw-r--r--dev-ml/extlib/extlib-1.6.1.ebuild7
2 files changed, 9 insertions, 3 deletions
diff --git a/dev-ml/extlib/ChangeLog b/dev-ml/extlib/ChangeLog
index 1da4e2286cec..7cf90b092ecb 100644
--- a/dev-ml/extlib/ChangeLog
+++ b/dev-ml/extlib/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-ml/extlib
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/extlib/ChangeLog,v 1.32 2014/04/13 16:20:44 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/extlib/ChangeLog,v 1.33 2014/11/28 17:32:24 aballier Exp $
+
+ 28 Nov 2014; Alexis Ballier <aballier@gentoo.org> extlib-1.6.1.ebuild:
+ update deps for ocaml 4.02
13 Apr 2014; Agostino Sarubbo <ago@gentoo.org> extlib-1.6.1.ebuild:
Stable for ppc, wrt bug #502730
diff --git a/dev-ml/extlib/extlib-1.6.1.ebuild b/dev-ml/extlib/extlib-1.6.1.ebuild
index 995e32dd707d..0a1d963bf279 100644
--- a/dev-ml/extlib/extlib-1.6.1.ebuild
+++ b/dev-ml/extlib/extlib-1.6.1.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/extlib/extlib-1.6.1.ebuild,v 1.4 2014/04/13 16:20:44 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/extlib/extlib-1.6.1.ebuild,v 1.5 2014/11/28 17:32:24 aballier Exp $
EAPI=5
@@ -10,7 +10,10 @@ DESCRIPTION="Standard library extensions for O'Caml"
HOMEPAGE="http://code.google.com/p/ocaml-extlib/"
SRC_URI="http://ocaml-extlib.googlecode.com/files/${P}.tar.gz"
LICENSE="LGPL-2.1"
-DEPEND=">=dev-lang/ocaml-3.10.2:=[ocamlopt?]"
+DEPEND="
+ >=dev-lang/ocaml-3.10.2:=[ocamlopt?]
+ || ( dev-ml/camlp4:= <dev-lang/ocaml-4.02.0 )
+"
RDEPEND="${DEPEND}"
SLOT="0/${PV}"
KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"