allow building without ocamlopt

Package-Manager: portage-2.1.4_rc14

3 files changed, 36 insertions, 19 deletions

diff --git a/dev-ml/ounit/ChangeLog b/dev-ml/ounit/ChangeLog
index 60e6f03a4882..4c83fd3f5ff8 100644
--- a/dev-ml/ounit/ChangeLog
+++ b/dev-ml/ounit/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-ml/ounit
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/ounit/ChangeLog,v 1.7 2007/05/12 22:41:01 aballier Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ounit/ChangeLog,v 1.8 2008/01/04 01:38:29 aballier Exp $
+
+  04 Jan 2008; Alexis Ballier <aballier@gentoo.org> ounit-1.0.2.ebuild:
+  allow building without ocamlopt
 
 *ounit-1.0.2 (12 May 2007)
 
diff --git a/dev-ml/ounit/Manifest b/dev-ml/ounit/Manifest
index cca9130f1966..e805d54d0140 100644
--- a/dev-ml/ounit/Manifest
+++ b/dev-ml/ounit/Manifest
@@ -12,14 +12,14 @@ EBUILD ounit-1.0.1.ebuild 654 RMD160 dcf250aab69d099789125f48c99c0f9472367fbd SH
 MD5 d5a08b6e20f8bc00783fface85cdbae1 ounit-1.0.1.ebuild 654
 RMD160 dcf250aab69d099789125f48c99c0f9472367fbd ounit-1.0.1.ebuild 654
 SHA256 d3b798f9fe5ed60470b117c5a5490550b18ce3bd80c5904125d9578abd40f856 ounit-1.0.1.ebuild 654
-EBUILD ounit-1.0.2.ebuild 620 RMD160 e1effca7bf8313d85064b8cd8e876a86ad49eab4 SHA1 9a041c65406a370a56cdff997d31c491dd82a12f SHA256 5e8bc3683e235ef1c5690fdbe4bd7b12c3470c660f21559fc8209b1de70cc9d6
-MD5 d1f19ab8340dac9191944482f283ad3c ounit-1.0.2.ebuild 620
-RMD160 e1effca7bf8313d85064b8cd8e876a86ad49eab4 ounit-1.0.2.ebuild 620
-SHA256 5e8bc3683e235ef1c5690fdbe4bd7b12c3470c660f21559fc8209b1de70cc9d6 ounit-1.0.2.ebuild 620
-MISC ChangeLog 1130 RMD160 a16464f88e92e2c3fef513437fc5c8ae827aa8fb SHA1 f29614f6609506112f3188f7ea3e4dc7d04282bc SHA256 02e414a84f28840ac1ea401816def29b9b1bedc637985e094c80f4298c61a449
-MD5 9766dfe551f32f402cc3636e777ed824 ChangeLog 1130
-RMD160 a16464f88e92e2c3fef513437fc5c8ae827aa8fb ChangeLog 1130
-SHA256 02e414a84f28840ac1ea401816def29b9b1bedc637985e094c80f4298c61a449 ChangeLog 1130
+EBUILD ounit-1.0.2.ebuild 1079 RMD160 22d441467254763542c476a662d9c246450a97d0 SHA1 04ec0b817a22ed193d605e8395a00bd29703d71b SHA256 a45efb2e40dcb496339b5b09a216d5c9e60745f5de6467a71ef245b26cb7e04a
+MD5 7ecf3e42aeae4693a73c14c16e6865d6 ounit-1.0.2.ebuild 1079
+RMD160 22d441467254763542c476a662d9c246450a97d0 ounit-1.0.2.ebuild 1079
+SHA256 a45efb2e40dcb496339b5b09a216d5c9e60745f5de6467a71ef245b26cb7e04a ounit-1.0.2.ebuild 1079
+MISC ChangeLog 1237 RMD160 87c0c384bcf18172aec05e2a26d76aad6ebaf2f6 SHA1 b729ce2293a36ff76325713a9e377c1cdd257ae0 SHA256 43bf9e31fb7a7eb202e8effd8e0d158e00218908828da77d345f1ff595bd2528
+MD5 4177a87b41c4ea78a8c513d7c0700033 ChangeLog 1237
+RMD160 87c0c384bcf18172aec05e2a26d76aad6ebaf2f6 ChangeLog 1237
+SHA256 43bf9e31fb7a7eb202e8effd8e0d158e00218908828da77d345f1ff595bd2528 ChangeLog 1237
 MISC metadata.xml 155 RMD160 dfaa057e679b01302a807c75a32a910098b26809 SHA1 94024f83dcacbb53e92be090dd0f994ec93dc90d SHA256 118048376ebb76f57628b0819f3de4856e73959c2578c88715d37ea2d1e0af81
 MD5 8b350f19c06fcabf1053b0421b7c3f5a metadata.xml 155
 RMD160 dfaa057e679b01302a807c75a32a910098b26809 metadata.xml 155
@@ -34,9 +34,9 @@ MD5 8607325eb4e596e7c91f14f99f58dff4 files/digest-ounit-1.0.2 229
 RMD160 a394ee3ae3f999d81067dc47e784b3b5ddd6a0d5 files/digest-ounit-1.0.2 229
 SHA256 c0f8e4ff4ce8c9a2def24b09fd78ea93c4398a70745cdd06086a7a6f06efba61 files/digest-ounit-1.0.2 229
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
+Version: GnuPG v2.0.8 (GNU/Linux)
 
-iD8DBQFGRkH/vFcC4BYPU0oRAutOAJ464kQfNRrCJ8cg3POsmwJJgSBgjACfT62F
-lfo4VcDbrXBP701KHVl+mUY=
-=rbwG
+iEYEARECAAYFAkd9jiEACgkQvFcC4BYPU0qHLACfUiih9EFMeeO7ESofLw6CwyV/
+B8AAoLU04+4rJN5wdS50lTy3Rcfuh0vb
+=b1lG
 -----END PGP SIGNATURE-----
diff --git a/dev-ml/ounit/ounit-1.0.2.ebuild b/dev-ml/ounit/ounit-1.0.2.ebuild
index cc529ca8e622..e5c5717b3123 100644
--- a/dev-ml/ounit/ounit-1.0.2.ebuild
+++ b/dev-ml/ounit/ounit-1.0.2.ebuild
@@ -1,8 +1,10 @@
-# 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/ounit/ounit-1.0.2.ebuild,v 1.1 2007/05/12 22:41:01 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ounit/ounit-1.0.2.ebuild,v 1.2 2008/01/04 01:38:29 aballier Exp $
 
-inherit findlib
+inherit findlib eutils
+
+EAPI="1"
 
 DESCRIPTION="Unit testing framework for OCaml"
 HOMEPAGE="http://www.xs4all.nl/~mmzeeman/ocaml/"
@@ -11,10 +13,22 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~amd64"
 DEPEND="dev-lang/ocaml"
-IUSE=""
+IUSE="+ocamlopt"
+
+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() {
-	emake all allopt || die "emake failed"
+	emake all || die "emake failed"
+	if use ocamlopt; then
+		emake allopt || die "failed to build native code"
+	fi
 }
 
 src_install() {