Add support to not build with ocamlopt

Package-Manager: portage-2.1.4_rc14

3 files changed, 35 insertions, 18 deletions

diff --git a/dev-ml/lablgtk/ChangeLog b/dev-ml/lablgtk/ChangeLog
index ce3f261379c7..fdea729d4d30 100644
--- a/dev-ml/lablgtk/ChangeLog
+++ b/dev-ml/lablgtk/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-ml/lablgtk
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/lablgtk/ChangeLog,v 1.54 2007/10/30 22:41:25 aballier Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/lablgtk/ChangeLog,v 1.55 2008/01/02 20:50:47 aballier Exp $
+
+  02 Jan 2008; Alexis Ballier <aballier@gentoo.org> lablgtk-2.10.0.ebuild:
+  Add support to not build with ocamlopt
 
 *lablgtk-2.10.0 (30 Oct 2007)
 
diff --git a/dev-ml/lablgtk/Manifest b/dev-ml/lablgtk/Manifest
index d663965723b0..335780f5bbfa 100644
--- a/dev-ml/lablgtk/Manifest
+++ b/dev-ml/lablgtk/Manifest
@@ -8,10 +8,10 @@ SHA256 6d087ccc994d25782c05d7ef7d666abd8147483b7a236ecc5f51f59ad96051bd files/la
 DIST lablgtk-2.10.0.tar.gz 742009 RMD160 c149acc683c43b846347aeb3454966fd6ce1cce8 SHA1 47cca75028a7a03dbcd3f22c1b73519e0e22384e SHA256 c0565648caaeb302d32941835c69decf279121ac7e10fd52951991cf876448e5
 DIST lablgtk-2.4.0.tar.gz 637739 RMD160 7d27e9e6f9ba329441085073dff4f5617c6fbfeb SHA1 28606d4ad6f4c798b544d227c26ca3dfb2239472 SHA256 e4763b4b92edf342093729d11525a976c6ce705c63733a51bc488fbb468993dd
 DIST lablgtk-2.6.0.tar.gz 658095 RMD160 cc3bf61170f69bc43e5420bdd28e111744200384 SHA1 99aecd26360c5ba8f0d17fb0cdae42ff083732ce SHA256 3694bc1e288ce0903af6c96a2790d2340ba38fa51b18090062ede75137d97876
-EBUILD lablgtk-2.10.0.ebuild 1919 RMD160 078f6c5059c4aff21b7e2541235c1cd0091030cb SHA1 3664c8ae7237a93bbf13f6bc8d444476ac188795 SHA256 28a6faf12574f3830f281906e2175a1ffc5466bb7aea87a0e531c937d58fe38e
-MD5 97a1f8054248ac97b30c5ecf5534a638 lablgtk-2.10.0.ebuild 1919
-RMD160 078f6c5059c4aff21b7e2541235c1cd0091030cb lablgtk-2.10.0.ebuild 1919
-SHA256 28a6faf12574f3830f281906e2175a1ffc5466bb7aea87a0e531c937d58fe38e lablgtk-2.10.0.ebuild 1919
+EBUILD lablgtk-2.10.0.ebuild 2377 RMD160 b820e96803843b34ef3ac846dbe3596f2f369968 SHA1 1e8277333efdb6b915537c2a54e954d0160d3ed6 SHA256 ccd49b942621472b1ebb4691e7aaaeeb9a2b9c28728a1f9195906bc39b92421b
+MD5 08da3e421787ebf3d0df031ffd8d86ce lablgtk-2.10.0.ebuild 2377
+RMD160 b820e96803843b34ef3ac846dbe3596f2f369968 lablgtk-2.10.0.ebuild 2377
+SHA256 ccd49b942621472b1ebb4691e7aaaeeb9a2b9c28728a1f9195906bc39b92421b lablgtk-2.10.0.ebuild 2377
 EBUILD lablgtk-2.4.0.ebuild 2168 RMD160 332f78cd853a2d4db9ff8a18b710d93f063ca220 SHA1 83e7415a9b206c7c5ee65331111ddc0cb1821b92 SHA256 99ff5037bc66072ddce5ef81fc74612d64f8c407e4559f221680f417f0120acf
 MD5 f29a1501d2a0f727d30b254463b283a1 lablgtk-2.4.0.ebuild 2168
 RMD160 332f78cd853a2d4db9ff8a18b710d93f063ca220 lablgtk-2.4.0.ebuild 2168
@@ -20,10 +20,10 @@ EBUILD lablgtk-2.6.0.ebuild 2148 RMD160 4be13893ce3aad0c6f525924d383fd9eea4fb143
 MD5 f2af4adb587e36ec1a1b16e6271fafb4 lablgtk-2.6.0.ebuild 2148
 RMD160 4be13893ce3aad0c6f525924d383fd9eea4fb143 lablgtk-2.6.0.ebuild 2148
 SHA256 3b70157b3bcf16d07f17ef42566031ab2c8591ad41cb17f2413173599e07d7e8 lablgtk-2.6.0.ebuild 2148
-MISC ChangeLog 7167 RMD160 5a16c8b84958c445f3b5fe4336b5e53aa8af0e5e SHA1 7f9a805a6f3dc3f1d41d6deef43b9bf16cdccdde SHA256 df90e636793b3f470f1816ae3ae47d629458eae44896ef14c33a0015f72f8a36
-MD5 21e48e8809540949b3e8fd47ebc10313 ChangeLog 7167
-RMD160 5a16c8b84958c445f3b5fe4336b5e53aa8af0e5e ChangeLog 7167
-SHA256 df90e636793b3f470f1816ae3ae47d629458eae44896ef14c33a0015f72f8a36 ChangeLog 7167
+MISC ChangeLog 7284 RMD160 ef5c8361f01489d0adb687c15a3f76f222350877 SHA1 6dad599e703eedf00174e7379628bb58a7452d1f SHA256 f1c991414e7d0d2898e710ed9d6ded83e09d94fb4454dc04277689786c7ee888
+MD5 b3dc29e449eb35a18c281d552f8bbe70 ChangeLog 7284
+RMD160 ef5c8361f01489d0adb687c15a3f76f222350877 ChangeLog 7284
+SHA256 f1c991414e7d0d2898e710ed9d6ded83e09d94fb4454dc04277689786c7ee888 ChangeLog 7284
 MISC metadata.xml 156 RMD160 b85f5bc80861e3fb890d0c87457a549d5bdaa191 SHA1 3be740773dec616d1c3969afaf1571348e455fef SHA256 40d721e2107cc8aac043b574fdae94c9e31ae133bc8e275fbc0a56329b3f5cee
 MD5 59ea40b8187e7995ddaf227a834ceb5f metadata.xml 156
 RMD160 b85f5bc80861e3fb890d0c87457a549d5bdaa191 metadata.xml 156
@@ -38,9 +38,9 @@ MD5 327835d3ae5050daa4d659380eef8022 files/digest-lablgtk-2.6.0 241
 RMD160 ac45428976c452c50d67b79400ffaa8bdbd9483c files/digest-lablgtk-2.6.0 241
 SHA256 3d494a1625a2d3b2849d44179881e54c019510c0a8717832ad684c8a462da985 files/digest-lablgtk-2.6.0 241
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.8 (GNU/Linux)
 
-iD8DBQFHJ7MivFcC4BYPU0oRAvTUAKCcFN6UdDnYL//VYYD/Vbl7rdrQSgCfQGfy
-OO8vQo0So3AUBdoVLvq2e3k=
-=bHRr
+iEYEARECAAYFAkd7+S8ACgkQvFcC4BYPU0qVIgCglgF3BuGBWceDi3nNYuMaaney
+59EAn1l5A0f8mExvnYtfYTQME8q33Ids
+=f/qj
 -----END PGP SIGNATURE-----
diff --git a/dev-ml/lablgtk/lablgtk-2.10.0.ebuild b/dev-ml/lablgtk/lablgtk-2.10.0.ebuild
index 1ecda2bdc356..48079bc97359 100644
--- a/dev-ml/lablgtk/lablgtk-2.10.0.ebuild
+++ b/dev-ml/lablgtk/lablgtk-2.10.0.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/lablgtk/lablgtk-2.10.0.ebuild,v 1.1 2007/10/30 22:41:25 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/lablgtk/lablgtk-2.10.0.ebuild,v 1.2 2008/01/02 20:50:47 aballier Exp $
 
 inherit eutils multilib
 
-IUSE="debug doc glade gnome gnomecanvas sourceview opengl spell svg"
+EAPI="1"
+
+IUSE="debug doc glade gnome gnomecanvas sourceview +ocamlopt opengl spell svg"
 
 DESCRIPTION="Objective CAML interface for Gtk+2"
 HOMEPAGE="http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgtk.html"
@@ -28,6 +30,15 @@ DEPEND=">=x11-libs/gtk+-2.10
 SLOT="2"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd"
 
+pkg_setup() {
+	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() {
 	econf $(use_enable debug) \
 		$(use_with svg rsvg) \
@@ -40,7 +51,10 @@ src_compile() {
 		$(use_with gnomecanvas) \
 		|| die "configure failed"
 
-	emake -j1 all opt || die "make failed"
+	emake -j1 all || die "make failed"
+	if use ocamlopt; then
+		emake -j1 opt || die "Compiling native code failed"
+	fi
 }
 
 install_examples() {