summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2014-11-28 17:20:50 +0000
committerAlexis Ballier <aballier@gentoo.org>2014-11-28 17:20:50 +0000
commitbb5924d870ab5a970cfd0411d39fc3d45a8f4e88 (patch)
treea9987059b3c66c87f483f9caf7e907f41c628aec /dev-ml/lablgl
parentEAPI=5 (diff)
downloadgentoo-2-bb5924d870ab5a970cfd0411d39fc3d45a8f4e88.tar.gz
gentoo-2-bb5924d870ab5a970cfd0411d39fc3d45a8f4e88.tar.bz2
gentoo-2-bb5924d870ab5a970cfd0411d39fc3d45a8f4e88.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/lablgl')
-rw-r--r--dev-ml/lablgl/ChangeLog5
-rw-r--r--dev-ml/lablgl/lablgl-1.05.ebuild11
2 files changed, 12 insertions, 4 deletions
diff --git a/dev-ml/lablgl/ChangeLog b/dev-ml/lablgl/ChangeLog
index 7d6a6e781432..45fe7e3755e7 100644
--- a/dev-ml/lablgl/ChangeLog
+++ b/dev-ml/lablgl/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-ml/lablgl
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/lablgl/ChangeLog,v 1.80 2014/06/22 13:17:05 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/lablgl/ChangeLog,v 1.81 2014/11/28 17:20:50 aballier Exp $
+
+ 28 Nov 2014; Alexis Ballier <aballier@gentoo.org> lablgl-1.05.ebuild:
+ update deps for ocaml 4.02
22 Jun 2014; Agostino Sarubbo <ago@gentoo.org> lablgl-1.05.ebuild:
Stable for ppc64, wrt bug #510670
diff --git a/dev-ml/lablgl/lablgl-1.05.ebuild b/dev-ml/lablgl/lablgl-1.05.ebuild
index e38ac487b35a..b074dde56e5f 100644
--- a/dev-ml/lablgl/lablgl-1.05.ebuild
+++ b/dev-ml/lablgl/lablgl-1.05.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/lablgl/lablgl-1.05.ebuild,v 1.10 2014/06/22 13:17:05 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/lablgl/lablgl-1.05.ebuild,v 1.11 2014/11/28 17:20:50 aballier Exp $
EAPI="5"
@@ -13,14 +13,19 @@ HOMEPAGE="http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgl.html"
LICENSE="BSD"
RDEPEND="
- >=dev-lang/ocaml-3.10.2:=[tk?,ocamlopt?]
+ >=dev-lang/ocaml-3.10.2:=[ocamlopt?]
x11-libs/libXext
x11-libs/libXmu
x11-libs/libX11
virtual/opengl
virtual/glu
+ || ( dev-ml/camlp4:= <dev-lang/ocaml-4.02.0 )
glut? ( media-libs/freeglut )
- tk? ( >=dev-lang/tcl-8.3 >=dev-lang/tk-8.3 )
+ tk? (
+ >=dev-lang/tcl-8.3
+ >=dev-lang/tk-8.3
+ || ( dev-ml/labltk:= <dev-lang/ocaml-4.02[tk] )
+ )
"
DEPEND="${RDEPEND}"