Add support to not build with ocamlopt

Package-Manager: portage-2.1.4_rc14

3 files changed, 32 insertions, 18 deletions

diff --git a/dev-ml/lablgl/ChangeLog b/dev-ml/lablgl/ChangeLog
index df8371499028..b0242987d9a8 100644
--- a/dev-ml/lablgl/ChangeLog
+++ b/dev-ml/lablgl/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-ml/lablgl
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/lablgl/ChangeLog,v 1.41 2007/12/11 10:12:47 aballier Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/lablgl/ChangeLog,v 1.42 2008/01/02 20:13:06 aballier Exp $
+
+  02 Jan 2008; Alexis Ballier <aballier@gentoo.org> lablgl-1.03.ebuild:
+  Add support to not build with ocamlopt
 
 *lablgl-1.03 (11 Dec 2007)
 
diff --git a/dev-ml/lablgl/Manifest b/dev-ml/lablgl/Manifest
index 3651d841024e..39178a5310ab 100644
--- a/dev-ml/lablgl/Manifest
+++ b/dev-ml/lablgl/Manifest
@@ -11,14 +11,14 @@ EBUILD lablgl-1.00.ebuild 2240 RMD160 c835af0dcf830c14b332344ca6014a58d5603c7b S
 MD5 f42e1acc32bbbe2599cb3a7c0164a522 lablgl-1.00.ebuild 2240
 RMD160 c835af0dcf830c14b332344ca6014a58d5603c7b lablgl-1.00.ebuild 2240
 SHA256 9ca8815ad99d7ca679325034acb74401191917367bb3296dc1aead6a354ca439 lablgl-1.00.ebuild 2240
-EBUILD lablgl-1.03.ebuild 2084 RMD160 910553a9b6448e9047485bb14b3d4c04a8b2c478 SHA1 8ed771aa946753934cfd2d415670048efdb5b649 SHA256 d8b35ceefe361ba1e334bef71b05234947bf5135cc94765543f37fd7e15d181f
-MD5 6c8d8df3d542df5a3f8896705f3b9e9c lablgl-1.03.ebuild 2084
-RMD160 910553a9b6448e9047485bb14b3d4c04a8b2c478 lablgl-1.03.ebuild 2084
-SHA256 d8b35ceefe361ba1e334bef71b05234947bf5135cc94765543f37fd7e15d181f lablgl-1.03.ebuild 2084
-MISC ChangeLog 5813 RMD160 b155e233d0995a8ad55663d29e00738ed333ea1f SHA1 35e3e4248cc89fa0b0d1398b0043ddf17c4fdb9a SHA256 661006d7a3a8699d452ca737e87b3fd988676c1620be093b022a5c3160727b39
-MD5 e7b14a9fa724a1a89134708fa9177a63 ChangeLog 5813
-RMD160 b155e233d0995a8ad55663d29e00738ed333ea1f ChangeLog 5813
-SHA256 661006d7a3a8699d452ca737e87b3fd988676c1620be093b022a5c3160727b39 ChangeLog 5813
+EBUILD lablgl-1.03.ebuild 2477 RMD160 5285553b1208b9d385b2f9912920f9bcd6a394ab SHA1 511698eb623dc8168423d16dbdd00b5734b9dc35 SHA256 c13cf4fda046f875dd6a9d996b35b1e7cac155c12c99b41a8e894ede17d4c9cf
+MD5 c6f5660c98e4e95faee2cd7418672a96 lablgl-1.03.ebuild 2477
+RMD160 5285553b1208b9d385b2f9912920f9bcd6a394ab lablgl-1.03.ebuild 2477
+SHA256 c13cf4fda046f875dd6a9d996b35b1e7cac155c12c99b41a8e894ede17d4c9cf lablgl-1.03.ebuild 2477
+MISC ChangeLog 5927 RMD160 851538719a1dc99ba449e6b6d15e4acc72c2b116 SHA1 48cbcc20703ca9a49c3f08126c38d5f4aa0ef323 SHA256 ec09804c6f4ea93061f1fbab8a5a2a27ec17274dceb19f4aa42c8362799b4859
+MD5 f0da21897fae4c7e6d465cd1d5ba9d9b ChangeLog 5927
+RMD160 851538719a1dc99ba449e6b6d15e4acc72c2b116 ChangeLog 5927
+SHA256 ec09804c6f4ea93061f1fbab8a5a2a27ec17274dceb19f4aa42c8362799b4859 ChangeLog 5927
 MISC metadata.xml 157 RMD160 30153301a2a5cca5547a6e47941aae2895837613 SHA1 66e87d50f913856e703f3ee29841b03332af40db SHA256 d14b8b08774f2a40f42d70ff40b1b4f1c4725e7095d702143a32909553eac799
 MD5 648a541494aceee26dbcfd76164f37ea metadata.xml 157
 RMD160 30153301a2a5cca5547a6e47941aae2895837613 metadata.xml 157
@@ -30,9 +30,9 @@ MD5 488e0dc9fa972b594e5a858ff85901d4 files/digest-lablgl-1.03 235
 RMD160 5e16b4ac06ff297c38088fabb50627198ebb916c files/digest-lablgl-1.03 235
 SHA256 9ab68e91cf52b83ee9ff62ad4d639f8f0d32a177de138ee2bca1502b36d74d3a files/digest-lablgl-1.03 235
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.8 (GNU/Linux)
 
-iD8DBQFHXmK5vFcC4BYPU0oRAvSIAJ9SYDBbdOcqFCAULf2ixoeNoxHdUwCgxqsM
-14KxcbBQ/b38WiggOmgAd4Y=
-=qWT+
+iEYEARECAAYFAkd78FkACgkQvFcC4BYPU0rFhgCgwRDX+OaOfMGz22xB0CvTkEzA
+R44AniByioosLAXXl89YJAbcEZ9NR6z9
+=OSzw
 -----END PGP SIGNATURE-----
diff --git a/dev-ml/lablgl/lablgl-1.03.ebuild b/dev-ml/lablgl/lablgl-1.03.ebuild
index 8bf3327732cf..eaf71215facd 100644
--- a/dev-ml/lablgl/lablgl-1.03.ebuild
+++ b/dev-ml/lablgl/lablgl-1.03.ebuild
@@ -1,10 +1,12 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/lablgl/lablgl-1.03.ebuild,v 1.1 2007/12/11 10:12:47 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/lablgl/lablgl-1.03.ebuild,v 1.2 2008/01/02 20:13:06 aballier Exp $
 
 inherit multilib eutils toolchain-funcs
 
-IUSE="doc"
+EAPI="1"
+
+IUSE="doc +ocamlopt"
 
 DESCRIPTION="Objective CAML interface for OpenGL"
 HOMEPAGE="http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgl.html"
@@ -32,6 +34,13 @@ pkg_setup() {
 		eerror "Please recompile ocaml with tk useflag enabled."
 		die "Ocaml is missing tk support"
 	fi
+
+	if use ocamlopt && ! built_with_use --missing true dev-lang/ocaml ocamlopt; then
+		eerror "In order to build ${PN} with native code support from ocaml"
+		eerror "You first need to have a native code ocaml compiler."
+		eerror "You need to install dev-lang/ocaml with ocamlopt useflag on."
+		die "Please install ocaml with ocamlopt useflag"
+	fi
 }
 
 src_compile() {
@@ -45,7 +54,9 @@ src_compile() {
 	echo 'INCLUDES = $(TKINCLUDES) $(GLINCLUDES) $(XINCLUDES)' >> Makefile.config
 
 	emake -j1 || die "failed to build"
-	emake -j1 opt || die "failed to build opt"
+	if use ocamlopt; then
+		emake -j1 opt || die "failed to build opt"
+	fi
 }
 
 src_install () {