[gentoo-commits] repo/gentoo:master commit in: dev-ml/lablgl/

[Michał Górny]

commit:     dd53a48c812d3859e3e5addfa38c0014d509511f
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 29 20:30:23 2016 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Jun 29 21:14:48 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd53a48c

dev-ml/lablgl: Support camlp4/labltk in -r1 only, #586914

Restrict the 1.05 ebuild to support old OCaml only to solve the :=-in-||
problem. 1.05-r1 is stable on all architectures supporting camlp4,
and -r0 is only kept for stable ia64 & sparc users.

 dev-ml/lablgl/lablgl-1.05.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-ml/lablgl/lablgl-1.05.ebuild b/dev-ml/lablgl/lablgl-1.05.ebuild
index bb69c5d..20f1f9e 100644
--- a/dev-ml/lablgl/lablgl-1.05.ebuild
+++ b/dev-ml/lablgl/lablgl-1.05.ebuild
@@ -19,12 +19,12 @@ RDEPEND="
 	x11-libs/libX11
 	virtual/opengl
 	virtual/glu
-	|| ( dev-ml/camlp4:= <dev-lang/ocaml-4.02.0 )
+	<dev-lang/ocaml-4.02.0
 	glut? ( media-libs/freeglut )
 	tk? (
 		>=dev-lang/tcl-8.3:0=
 		>=dev-lang/tk-8.3:0=
-		|| ( dev-ml/labltk:= <dev-lang/ocaml-4.02[tk] )
+		<dev-lang/ocaml-4.02[tk]
 	)
 	"