Allow to disable ocamlopt via an useflag

(Portage version: 2.1.4_rc14)

2 files changed, 22 insertions, 6 deletions

diff --git a/dev-ml/ocamlnet/ChangeLog b/dev-ml/ocamlnet/ChangeLog
index 8b65f5133933..84108af7b870 100644
--- a/dev-ml/ocamlnet/ChangeLog
+++ b/dev-ml/ocamlnet/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ml/ocamlnet
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlnet/ChangeLog,v 1.25 2007/12/31 19:35:50 mabi Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlnet/ChangeLog,v 1.26 2008/01/03 18:31:37 aballier Exp $
+
+  03 Jan 2008; Alexis Ballier <aballier@gentoo.org>
+  ocamlnet-2.2.9-r1.ebuild:
+  Allow to disable ocamlopt via an useflag
 
   31 Dec 2007; Matti Bickel <mabi@gentoo.org> ocamlnet-2.2.8.1.ebuild:
   ppc stable (bug #195535)
diff --git a/dev-ml/ocamlnet/ocamlnet-2.2.9-r1.ebuild b/dev-ml/ocamlnet/ocamlnet-2.2.9-r1.ebuild
index 8899ae4518fe..9974e3f24f5d 100644
--- a/dev-ml/ocamlnet/ocamlnet-2.2.9-r1.ebuild
+++ b/dev-ml/ocamlnet/ocamlnet-2.2.9-r1.ebuild
@@ -1,9 +1,11 @@
-# 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/ocamlnet/ocamlnet-2.2.9-r1.ebuild,v 1.1 2007/12/17 18:00:58 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlnet/ocamlnet-2.2.9-r1.ebuild,v 1.2 2008/01/03 18:31:37 aballier Exp $
 
 inherit eutils findlib
 
+EAPI="1"
+
 DESCRIPTION="Modules for OCaml application-level Internet protocols"
 HOMEPAGE="http://ocamlnet.sourceforge.net"
 SRC_URI="mirror://sourceforge/ocamlnet/${P}.tar.gz"
@@ -11,7 +13,7 @@ SRC_URI="mirror://sourceforge/ocamlnet/${P}.tar.gz"
 LICENSE="as-is GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="gtk ssl tk httpd"
+IUSE="gtk ssl tk httpd +ocamlopt"
 
 # the auth-dh compile flag has been disabled as well, since it depends on
 # ocaml-cryptgps, which is not available.
@@ -30,6 +32,12 @@ pkg_setup() {
 	if use tk && ! built_with_use 'dev-lang/ocaml' tk ;
 		 then die "If you want to enable tcl/tk, you need to rebuild dev-lang/ocaml with the 'tk' USE flag";
 	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_unpack() {
@@ -65,9 +73,13 @@ src_compile() {
 		$(ocamlnet_use_with httpd nethttpd) \
 		|| die "Error : econf failed!"
 
-	emake -j1 all opt || die "make failed"
+	emake -j1 all || die "make failed"
+	if use ocamlopt; then
+		emake -j1 opt || die "make failed"
+	fi
 }
 
 src_install() {
+	export STRIP_MASK="*/bin/*"
 	findlib_src_install
 }