allow to build without ocamlopt

Package-Manager: portage-2.1.4_rc14

3 files changed, 39 insertions, 19 deletions

diff --git a/dev-util/omake/ChangeLog b/dev-util/omake/ChangeLog
index 2ccbd5a4ff92..6047b905472b 100644
--- a/dev-util/omake/ChangeLog
+++ b/dev-util/omake/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-util/omake
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/omake/ChangeLog,v 1.15 2007/08/23 09:16:48 aballier Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/omake/ChangeLog,v 1.16 2008/01/04 02:35:06 aballier Exp $
+
+  04 Jan 2008; Alexis Ballier <aballier@gentoo.org> omake-0.9.8.5.ebuild:
+  allow to build without ocamlopt
 
 *omake-0.9.8.5 (23 Aug 2007)
 
diff --git a/dev-util/omake/Manifest b/dev-util/omake/Manifest
index 7b7d6bda333b..420ac5b8f917 100644
--- a/dev-util/omake/Manifest
+++ b/dev-util/omake/Manifest
@@ -16,14 +16,14 @@ EBUILD omake-0.9.8.4.ebuild 1693 RMD160 07e512b729af0252b79f3d28196ad9d4838b1622
 MD5 242a94331de59c62ae60bd2c58ea7301 omake-0.9.8.4.ebuild 1693
 RMD160 07e512b729af0252b79f3d28196ad9d4838b1622 omake-0.9.8.4.ebuild 1693
 SHA256 a6d348f3feab47f2c1e6c50a960727d7ffb4ff4652072fc6ba95ee0b8738c7d2 omake-0.9.8.4.ebuild 1693
-EBUILD omake-0.9.8.5.ebuild 1693 RMD160 2da6625f62c32239312a2a08c8efd82ca3652de5 SHA1 7b7cc4fcda9040f9e1a0cf84410d963405df60c6 SHA256 28f670e3290455b07eeaf927198d8af5750738eb1f62e4ec47e88b44ba825e85
-MD5 f813d60c77221cb4076aa03ef216fcfe omake-0.9.8.5.ebuild 1693
-RMD160 2da6625f62c32239312a2a08c8efd82ca3652de5 omake-0.9.8.5.ebuild 1693
-SHA256 28f670e3290455b07eeaf927198d8af5750738eb1f62e4ec47e88b44ba825e85 omake-0.9.8.5.ebuild 1693
-MISC ChangeLog 2358 RMD160 b84115cc3f2c3c7d7e32cbad4063c44445147519 SHA1 1c2ccd98766d2f94fa6be00d76ff33133d9321a2 SHA256 460a0b98c0b90a6fb15e3d811b4dc47a6dfed301367fcba547bc67cf060b07a5
-MD5 816d41a43efc81487798d6c91e7b8cf5 ChangeLog 2358
-RMD160 b84115cc3f2c3c7d7e32cbad4063c44445147519 ChangeLog 2358
-SHA256 460a0b98c0b90a6fb15e3d811b4dc47a6dfed301367fcba547bc67cf060b07a5 ChangeLog 2358
+EBUILD omake-0.9.8.5.ebuild 2237 RMD160 5d9fc221ed0fabff5ef144ee2df9f3b676919f0c SHA1 2be9aa12c2dfe2907c16c8f2754b6ed547b260a4 SHA256 02059fba0cc3403b6b5d0fda15696995545c70f11dfacf353485c3ba6e5240fe
+MD5 da5a50b6eb916afd8f74d4d2ebcd1b33 omake-0.9.8.5.ebuild 2237
+RMD160 5d9fc221ed0fabff5ef144ee2df9f3b676919f0c omake-0.9.8.5.ebuild 2237
+SHA256 02059fba0cc3403b6b5d0fda15696995545c70f11dfacf353485c3ba6e5240fe omake-0.9.8.5.ebuild 2237
+MISC ChangeLog 2467 RMD160 950947f30de74fc152c8e5ae7e4c14c905ec70a8 SHA1 939e6907a09ffb8e747362b57f71f789e3f453a6 SHA256 3df254d719ed9fd5c286799af7977750d0eb4a40a22c85601a6cf3373a6a1b50
+MD5 ccc387a503656d3616e9a1711b59bf2f ChangeLog 2467
+RMD160 950947f30de74fc152c8e5ae7e4c14c905ec70a8 ChangeLog 2467
+SHA256 3df254d719ed9fd5c286799af7977750d0eb4a40a22c85601a6cf3373a6a1b50 ChangeLog 2467
 MISC metadata.xml 155 RMD160 dfaa057e679b01302a807c75a32a910098b26809 SHA1 94024f83dcacbb53e92be090dd0f994ec93dc90d SHA256 118048376ebb76f57628b0819f3de4856e73959c2578c88715d37ea2d1e0af81
 MD5 8b350f19c06fcabf1053b0421b7c3f5a metadata.xml 155
 RMD160 dfaa057e679b01302a807c75a32a910098b26809 metadata.xml 155
@@ -38,9 +38,9 @@ MD5 70c5b1b1fd51cd6bb28087190ff4c43f files/digest-omake-0.9.8.5 250
 RMD160 19159a3969a2f64a3ed218b4470d9c304dd0dc9c files/digest-omake-0.9.8.5 250
 SHA256 7c2f57a1a93e42ea96f02917a2d18bc6c2e3c54ec9b9b308d7bb2ee9140a90df files/digest-omake-0.9.8.5 250
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.6 (GNU/Linux)
+Version: GnuPG v2.0.8 (GNU/Linux)
 
-iD8DBQFGzVCGvFcC4BYPU0oRAvLRAJ94VavME9pajOczFt/SXYtSOvhRnACfTNYz
-CiQ4TGO+5BHAmk1zMELFaic=
-=1pWg
+iEYEARECAAYFAkd9m2cACgkQvFcC4BYPU0qKxgCfVIaNVb8lyclGqS61xF0uIX2K
+cdYAoIxkJwYa806lKYYlbqBrRvL9hzU1
+=gpWE
 -----END PGP SIGNATURE-----
diff --git a/dev-util/omake/omake-0.9.8.5.ebuild b/dev-util/omake/omake-0.9.8.5.ebuild
index 92913ed8301e..2423a40af3f7 100644
--- a/dev-util/omake/omake-0.9.8.5.ebuild
+++ b/dev-util/omake/omake-0.9.8.5.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-util/omake/omake-0.9.8.5.ebuild,v 1.1 2007/08/23 09:16:48 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/omake/omake-0.9.8.5.ebuild,v 1.2 2008/01/04 02:35:06 aballier Exp $
 
 inherit eutils toolchain-funcs multilib
 
+EAPI="1"
+
 EXTRAPV="-3"
 DESCRIPTION="Make replacement"
 HOMEPAGE="http://omake.metaprl.org/"
@@ -12,12 +14,21 @@ LICENSE="GPL-2"
 
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc fam ncurses readline"
+IUSE="doc fam ncurses +ocamlopt readline"
 DEPEND=">=dev-lang/ocaml-3.0.8
 	ncurses? ( >=sys-libs/ncurses-5.3 )
 	fam? ( virtual/fam )
 	readline? ( >=sys-libs/readline-4.3 )"
 
+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
+}
+
 use_boolean() {
 	if use $1; then
 		echo "true"
@@ -36,8 +47,13 @@ src_compile() {
 	echo "CC = $(tc-getCC)" >> .config
 	echo "CFLAGS = ${CFLAGS}" >> .config
 
-	echo "NATIVE_ENABLED = true" >> .config
-	echo "BYTE_ENABLED = false" >> .config
+	if use ocamlopt; then
+		echo "NATIVE_ENABLED = true" >> .config
+		echo "BYTE_ENABLED = false" >> .config
+	else
+		echo "NATIVE_ENABLED = false" >> .config
+		echo "BYTE_ENABLED = true" >> .config
+	fi
 
 	echo "NATIVE_PROFILE = false" >> .config
 
@@ -59,4 +75,5 @@ src_install() {
 		dodoc doc/ps/omake-doc.{pdf,ps} doc/txt/omake-doc.txt
 		dohtml -r doc/html/*
 	fi
+	use ocamlopt || export STRIP_MASK="*/bin/*"
 }