Add support to build without ocamlopt

Package-Manager: portage-2.1.4_rc14

3 files changed, 35 insertions, 18 deletions

diff --git a/dev-ml/findlib/ChangeLog b/dev-ml/findlib/ChangeLog
index 0a6580e76a28..9513a204a956 100644
--- a/dev-ml/findlib/ChangeLog
+++ b/dev-ml/findlib/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-ml/findlib
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/findlib/ChangeLog,v 1.26 2007/11/13 13:49:15 aballier Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/findlib/ChangeLog,v 1.27 2008/01/02 19:24:38 aballier Exp $
+
+  02 Jan 2008; Alexis Ballier <aballier@gentoo.org> findlib-1.2.1.ebuild:
+  Add support to build without ocamlopt
 
 *findlib-1.2.1 (13 Nov 2007)
 
diff --git a/dev-ml/findlib/Manifest b/dev-ml/findlib/Manifest
index b243985c197a..ba2422aded76 100644
--- a/dev-ml/findlib/Manifest
+++ b/dev-ml/findlib/Manifest
@@ -16,14 +16,14 @@ EBUILD findlib-1.1.2_p1.ebuild 1903 RMD160 93a2585e1a0b9064a557a173f0b2027a0cbfa
 MD5 6f084bcb986198dc51cc60ccabb9f484 findlib-1.1.2_p1.ebuild 1903
 RMD160 93a2585e1a0b9064a557a173f0b2027a0cbfa1f7 findlib-1.1.2_p1.ebuild 1903
 SHA256 31b132206f8411e32622b303863cd80a42ac9fa55c354b069af5dc37d62208bd findlib-1.1.2_p1.ebuild 1903
-EBUILD findlib-1.2.1.ebuild 1770 RMD160 efe9fdf3edfba0035c83cdcb13c75a8ca63b9ad6 SHA1 48176d383dbdc76d909b89bad6e4276feea67001 SHA256 9d275a2577e3d226a8f942cc92aacf7fd78a9f0a922c7d94efa65b288353f1f5
-MD5 1dab5c5de318c4fe3d36461932e69e1e findlib-1.2.1.ebuild 1770
-RMD160 efe9fdf3edfba0035c83cdcb13c75a8ca63b9ad6 findlib-1.2.1.ebuild 1770
-SHA256 9d275a2577e3d226a8f942cc92aacf7fd78a9f0a922c7d94efa65b288353f1f5 findlib-1.2.1.ebuild 1770
-MISC ChangeLog 3239 RMD160 e29449305e373bf11cf4c3f7944d89b4b42f076d SHA1 fb58f4224a038627529045b0c02325ed7d5cbcf0 SHA256 213c0cbe13066347e698fa9f92363865db6fce1e226929fcf64c86f04d81e0c7
-MD5 7d423d9320aa97f7b2213fffb10e9f1c ChangeLog 3239
-RMD160 e29449305e373bf11cf4c3f7944d89b4b42f076d ChangeLog 3239
-SHA256 213c0cbe13066347e698fa9f92363865db6fce1e226929fcf64c86f04d81e0c7 ChangeLog 3239
+EBUILD findlib-1.2.1.ebuild 2316 RMD160 1fa3e0aa56da5a41a56809a4054e1d110e74052b SHA1 91d713337afe2784ee61ec2c1161656aa329b7ec SHA256 9af9bbea8f08900f95539f984334fd9e37a4a14cfc45aaa80ff8fc8d3f5cb2ca
+MD5 a3601a8e7ca784e5662fded2259c56df findlib-1.2.1.ebuild 2316
+RMD160 1fa3e0aa56da5a41a56809a4054e1d110e74052b findlib-1.2.1.ebuild 2316
+SHA256 9af9bbea8f08900f95539f984334fd9e37a4a14cfc45aaa80ff8fc8d3f5cb2ca findlib-1.2.1.ebuild 2316
+MISC ChangeLog 3354 RMD160 c0f66077887f885ede2d40e1f666fe3dc07e1dd7 SHA1 82ce84d212c4caadb618ae48fd3794d5b6263f89 SHA256 3e07f1bfe56cfe4d762a2ac00c7db3c399ff2fdb7c25db024c47ec8e55f6d4dd
+MD5 9661561f9d783188028c15383ac7298a ChangeLog 3354
+RMD160 c0f66077887f885ede2d40e1f666fe3dc07e1dd7 ChangeLog 3354
+SHA256 3e07f1bfe56cfe4d762a2ac00c7db3c399ff2fdb7c25db024c47ec8e55f6d4dd ChangeLog 3354
 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 58cf1f8fe26e9a2b30d84ff45c6d4558 files/digest-findlib-1.2.1 241
 RMD160 5d4c077a65f6bc03feb022b446810124c90a47e8 files/digest-findlib-1.2.1 241
 SHA256 57cfd15a19b4129976089cff90781fc77d21758a19aabb7cb3e91cd3ab6787c7 files/digest-findlib-1.2.1 241
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.8 (GNU/Linux)
 
-iD8DBQFHOauNvFcC4BYPU0oRAqi6AJwNrTb+ygL1d6iGCNYUKodpRxSh9QCeI5Ty
-cRmG83jIRbMFdt8ay6TH+DM=
-=qWnB
+iEYEARECAAYFAkd75PwACgkQvFcC4BYPU0qRfgCghcodR8GZyMCpi4KodiXYv/ea
+LdUAn1EYNzAhqkrJtTFUnbFJEI94gvJf
+=MH7L
 -----END PGP SIGNATURE-----
diff --git a/dev-ml/findlib/findlib-1.2.1.ebuild b/dev-ml/findlib/findlib-1.2.1.ebuild
index e50801d7c491..bba03b990be4 100644
--- a/dev-ml/findlib/findlib-1.2.1.ebuild
+++ b/dev-ml/findlib/findlib-1.2.1.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/findlib/findlib-1.2.1.ebuild,v 1.1 2007/11/13 13:49:15 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/findlib/findlib-1.2.1.ebuild,v 1.2 2008/01/02 19:24:38 aballier Exp $
 
 inherit multilib eutils
 
-IUSE="doc tk"
+EAPI="1"
+
+IUSE="doc +ocamlopt tk"
 
 DESCRIPTION="OCaml tool to find/use non-standard packages."
 HOMEPAGE="http://www.ocaml-programming.de/packages/"
@@ -29,6 +31,12 @@ pkg_setup()
 		eerror ""
 		die "Please make sure that ocaml is installed with tk support or remove the 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_compile() {
@@ -37,7 +45,13 @@ src_compile() {
 		-config ${ocamlfind_destdir}/findlib/findlib.conf || die "configure failed"
 
 	emake all || die
-	emake opt || die # optimized code
+	if use ocamlopt; then
+		emake opt || die # optimized code
+	else
+		# If using bytecode we dont want to strip the binary as it would remove the
+		# bytecode and only leave ocamlrun...
+		export STRIP_MASK="*/bin/*"
+	fi
 }
 
 src_install() {