allow building without ocamlopt

Package-Manager: portage-2.1.4_rc14

3 files changed, 39 insertions, 20 deletions

diff --git a/dev-ml/ocamlduce/ChangeLog b/dev-ml/ocamlduce/ChangeLog
index 52f80a9fccdd..605bd688b3b0 100644
--- a/dev-ml/ocamlduce/ChangeLog
+++ b/dev-ml/ocamlduce/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-ml/ocamlduce
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlduce/ChangeLog,v 1.4 2007/05/26 18:42:28 aballier Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlduce/ChangeLog,v 1.5 2008/01/03 23:43:12 aballier Exp $
+
+  03 Jan 2008; Alexis Ballier <aballier@gentoo.org> ocamlduce-3.10.0.ebuild:
+  allow building without ocamlopt
 
 *ocamlduce-3.10.0 (26 May 2007)
 
diff --git a/dev-ml/ocamlduce/Manifest b/dev-ml/ocamlduce/Manifest
index a210f6afd437..2b6edf51dc8f 100644
--- a/dev-ml/ocamlduce/Manifest
+++ b/dev-ml/ocamlduce/Manifest
@@ -7,14 +7,14 @@ EBUILD ocamlduce-3.09.3_p1.ebuild 766 RMD160 9886996b0cbc0ef0747e5d3723cd994d133
 MD5 56d3ceaa7e35d51cfa6fd39cf2aa865f ocamlduce-3.09.3_p1.ebuild 766
 RMD160 9886996b0cbc0ef0747e5d3723cd994d133b37cd ocamlduce-3.09.3_p1.ebuild 766
 SHA256 843a62772b69f6349c4fa29af7df9c6016ad4554f9eb31e3326a24f29e5906d5 ocamlduce-3.09.3_p1.ebuild 766
-EBUILD ocamlduce-3.10.0.ebuild 763 RMD160 c3ed498c08e8483b43fa553738141cfaf16e1f58 SHA1 2ea2082f9942042dd051235c974fcc91de9e74c7 SHA256 c2c4864ecf1ac8117e69e09ed82bf6e5db3d670086c5a46d28dc025240c40530
-MD5 ac1c56227f19c62fc8258862565ae603 ocamlduce-3.10.0.ebuild 763
-RMD160 c3ed498c08e8483b43fa553738141cfaf16e1f58 ocamlduce-3.10.0.ebuild 763
-SHA256 c2c4864ecf1ac8117e69e09ed82bf6e5db3d670086c5a46d28dc025240c40530 ocamlduce-3.10.0.ebuild 763
-MISC ChangeLog 759 RMD160 2be89c2356a77aa789fc5680df4e082678795606 SHA1 bf496a106b2a139b699b184c8873588167af2a20 SHA256 5864767b12847bb21f7ece5e9ef493f6bfa0efeecf40d458d079d679d75a5736
-MD5 39ea89f45d1eb755d754550fc081970f ChangeLog 759
-RMD160 2be89c2356a77aa789fc5680df4e082678795606 ChangeLog 759
-SHA256 5864767b12847bb21f7ece5e9ef493f6bfa0efeecf40d458d079d679d75a5736 ChangeLog 759
+EBUILD ocamlduce-3.10.0.ebuild 1365 RMD160 2a1c895052d63a22cdf1ae5096c7c0ca92364593 SHA1 241376f95a455bba992b4e4952a2e15d98dce918 SHA256 6b09e8cfb22b64e785323349853237fcf78bbf8327022428b47950f917e2eb07
+MD5 4399a34a69a643d772ccc4cb90786f70 ocamlduce-3.10.0.ebuild 1365
+RMD160 2a1c895052d63a22cdf1ae5096c7c0ca92364593 ocamlduce-3.10.0.ebuild 1365
+SHA256 6b09e8cfb22b64e785323349853237fcf78bbf8327022428b47950f917e2eb07 ocamlduce-3.10.0.ebuild 1365
+MISC ChangeLog 871 RMD160 378762ed7bf0877867d2036886d51196bf2cc46e SHA1 5529c203d7fffda406c218340572640249587f7e SHA256 3d40f32a87e912de686f9333596e3d4df9491624060f2c1db766ba7bb4de800e
+MD5 203bd234575034e8f81de0e1e0586ddd ChangeLog 871
+RMD160 378762ed7bf0877867d2036886d51196bf2cc46e ChangeLog 871
+SHA256 3d40f32a87e912de686f9333596e3d4df9491624060f2c1db766ba7bb4de800e ChangeLog 871
 MISC metadata.xml 596 RMD160 1b88beb573543cf7b16a9287535e628b342441dd SHA1 cf8f0204da2e16dcb83d837fa5916747a589f8cf SHA256 88c57d0b9cfb5ddde09162a1b25f7412df877e030bc80bb9433089f2dee9f0ea
 MD5 ed12be9429855fda4657bbb2c96e3082 metadata.xml 596
 RMD160 1b88beb573543cf7b16a9287535e628b342441dd metadata.xml 596
@@ -26,9 +26,9 @@ MD5 49743462d64f85609fe66f782d71e580 files/digest-ocamlduce-3.10.0 250
 RMD160 f8cb9d179d2adc4714ea72b73dd867a48006e8a4 files/digest-ocamlduce-3.10.0 250
 SHA256 9ab3dd51e570c09ea5ff0d6e9d6c5b1aaa620643b1b771edd81aefabe5526621 files/digest-ocamlduce-3.10.0 250
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
+Version: GnuPG v2.0.8 (GNU/Linux)
 
-iD8DBQFGWH+dvFcC4BYPU0oRAjGkAJ0YKg1O/1yqHirsxh2S/dCZ6D3h9gCfQPnR
-0cmDP6Ec12dOw/ySZPfMiS4=
-=+DCo
+iEYEARECAAYFAkd9cxwACgkQvFcC4BYPU0ogQgCfUX+4YdYEEF6jW+58crFQpKt1
+0BgAnRm8u7Sp0d+RkafObqOWvufNqXdp
+=77Gh
 -----END PGP SIGNATURE-----
diff --git a/dev-ml/ocamlduce/ocamlduce-3.10.0.ebuild b/dev-ml/ocamlduce/ocamlduce-3.10.0.ebuild
index 8f24a9ee96a2..d568ec124377 100644
--- a/dev-ml/ocamlduce/ocamlduce-3.10.0.ebuild
+++ b/dev-ml/ocamlduce/ocamlduce-3.10.0.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/ocamlduce/ocamlduce-3.10.0.ebuild,v 1.1 2007/05/26 18:42:28 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlduce/ocamlduce-3.10.0.ebuild,v 1.2 2008/01/03 23:43:12 aballier Exp $
 
 inherit eutils findlib
 
+EAPI="1"
+
 MY_P="${P/_p/pl}"
 DESCRIPTION="OCamlDuce is a merger between OCaml and CDuce"
 HOMEPAGE="http://www.cduce.org/ocaml.html"
@@ -12,7 +14,7 @@ SRC_URI="http://gallium.inria.fr/~frisch/ocamlcduce/download/${MY_P}.tar.gz"
 LICENSE="QPL-1.0 LGPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="+ocamlopt"
 
 DEPEND=">=dev-lang/ocaml-3.10.0
 	>=dev-ml/findlib-1.1.2"
@@ -21,11 +23,25 @@ RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
+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 -j1 all opt || die "emake failed"
+	if use ocamlopt; then
+		emake -j1 all opt || die "emake failed"
+	else
+		emake CAMLC="ocamlc" CAMLDEP="ocamldep" -j1 all || die "emake failed"
+	fi
 }
 
 src_install() {
-	mkdir -p "${D}/usr/bin"
-	findlib_src_install BINDIR="${D}/usr/bin"
+	dodir /usr/bin
+	use ocamlopt && findlib_src_install BINDIR="${D}/usr/bin"
+	use ocamlopt || findlib_src_install BINDIR="${D}/usr/bin" CAMLC="ocamlc" CAMLDEP="ocamldep" OPT_VARIANTS=""
 }