Add support to not build with ocamlopt

Package-Manager: portage-2.1.4_rc14

3 files changed, 34 insertions, 18 deletions

diff --git a/dev-ml/camlzip/ChangeLog b/dev-ml/camlzip/ChangeLog
index 01ba13ae3f28..dccf1ca3883a 100644
--- a/dev-ml/camlzip/ChangeLog
+++ b/dev-ml/camlzip/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-ml/camlzip
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/camlzip/ChangeLog,v 1.9 2007/11/10 14:35:46 aballier Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/camlzip/ChangeLog,v 1.10 2008/01/02 19:56:51 aballier Exp $
+
+  02 Jan 2008; Alexis Ballier <aballier@gentoo.org> camlzip-1.03-r1.ebuild:
+  Add support to not build with ocamlopt
 
   10 Nov 2007; Alexis Ballier <aballier@gentoo.org>
   files/camlzip-1.03-Makefile-findlib.patch:
diff --git a/dev-ml/camlzip/Manifest b/dev-ml/camlzip/Manifest
index bd5c64cee01b..d0a79ee3de1c 100644
--- a/dev-ml/camlzip/Manifest
+++ b/dev-ml/camlzip/Manifest
@@ -19,14 +19,14 @@ EBUILD camlzip-1.01-r1.ebuild 885 RMD160 f4f77fd32aa56fba6649a2a3f9b0863c00d14d5
 MD5 02e14b29641fd54ba8fa7fe422d63fba camlzip-1.01-r1.ebuild 885
 RMD160 f4f77fd32aa56fba6649a2a3f9b0863c00d14d5d camlzip-1.01-r1.ebuild 885
 SHA256 52906a3e3f8aa0fe875831ac074d55761e764d1a5b5b4b5ae4ef46b309dbdf58 camlzip-1.01-r1.ebuild 885
-EBUILD camlzip-1.03-r1.ebuild 894 RMD160 bbbe2b11c371eb0bfeb4c18b87c4cb6850a2ea5f SHA1 8b31aaf1f33bd9a6865db0f7a61a8c25b8cb386e SHA256 66721b93934d6d590301d70e4db92e7ed76d6260aee4e65b4150697f84fac5f1
-MD5 56606066e32c2e02ab79d6b93c710686 camlzip-1.03-r1.ebuild 894
-RMD160 bbbe2b11c371eb0bfeb4c18b87c4cb6850a2ea5f camlzip-1.03-r1.ebuild 894
-SHA256 66721b93934d6d590301d70e4db92e7ed76d6260aee4e65b4150697f84fac5f1 camlzip-1.03-r1.ebuild 894
-MISC ChangeLog 1689 RMD160 eca0c1fdcf5af98efbbdb0993c82fcbecffe516c SHA1 d2a51e67119e821090bb09b9981743d656b5fe49 SHA256 8c85a84d3814a46b85957279f76d7fdfa2182c7b1c0d33c605d746f11b7a7906
-MD5 c367c5d144abf81d31ff3c296fd7abad ChangeLog 1689
-RMD160 eca0c1fdcf5af98efbbdb0993c82fcbecffe516c ChangeLog 1689
-SHA256 8c85a84d3814a46b85957279f76d7fdfa2182c7b1c0d33c605d746f11b7a7906 ChangeLog 1689
+EBUILD camlzip-1.03-r1.ebuild 1302 RMD160 15821cdb391d99edb955433f8c513587a891359f SHA1 824e00f84f0c393b924470b186ee6e9a57f0b140 SHA256 598898e3f82e4f49bc30ce6b32cea42e228e0537ad70028306ce1b08e688436a
+MD5 9fcb0ef923eae65422ad81192d22297f camlzip-1.03-r1.ebuild 1302
+RMD160 15821cdb391d99edb955433f8c513587a891359f camlzip-1.03-r1.ebuild 1302
+SHA256 598898e3f82e4f49bc30ce6b32cea42e228e0537ad70028306ce1b08e688436a camlzip-1.03-r1.ebuild 1302
+MISC ChangeLog 1808 RMD160 8cca1d983d4ffcadcb523a9474e8ce1bbe577bce SHA1 181df6b263f52937d5a394f9787619d78b3e80a7 SHA256 810ac9779ba8ea092b14d536992dbfbb0a8351e17a416fc16f438f1cfc2ba3f7
+MD5 ae8e4f88b6a9fc363ddea88b25986742 ChangeLog 1808
+RMD160 8cca1d983d4ffcadcb523a9474e8ce1bbe577bce ChangeLog 1808
+SHA256 810ac9779ba8ea092b14d536992dbfbb0a8351e17a416fc16f438f1cfc2ba3f7 ChangeLog 1808
 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 907060b90504a47a42407b865c49e840 files/digest-camlzip-1.03-r1 235
 RMD160 febd23f1420c182c8b55d29b019250461387416a files/digest-camlzip-1.03-r1 235
 SHA256 4c3a12a27bdcdfd9e65fafb4a0ef13e86ffa27ea926ff78c49351b47d0bb9e6b files/digest-camlzip-1.03-r1 235
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.8 (GNU/Linux)
 
-iD8DBQFHNcHTvFcC4BYPU0oRAhqMAKC6DR+vhTvTlmPkWCsOeIOEVyPPKACgqpIy
-ez3Unv9a6gILF0SLJROwgm0=
-=0LtS
+iEYEARECAAYFAkd77IoACgkQvFcC4BYPU0qBawCdGIVbsppogPF6WwxkFo/lZ3B2
+ickAnA5A2tt7xl1027CXs692rslwKu+/
+=M6WW
 -----END PGP SIGNATURE-----
diff --git a/dev-ml/camlzip/camlzip-1.03-r1.ebuild b/dev-ml/camlzip/camlzip-1.03-r1.ebuild
index 645cebe040b6..c6623de3ea01 100644
--- a/dev-ml/camlzip/camlzip-1.03-r1.ebuild
+++ b/dev-ml/camlzip/camlzip-1.03-r1.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/camlzip/camlzip-1.03-r1.ebuild,v 1.1 2007/11/10 14:18:20 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/camlzip/camlzip-1.03-r1.ebuild,v 1.2 2008/01/02 19:56:51 aballier Exp $
 
 inherit findlib eutils
 
-IUSE=""
+EAPI="1"
+
+IUSE="+ocamlopt"
 
 DESCRIPTION="Compressed file access ML library (ZIP, GZIP and JAR)"
 HOMEPAGE="http://cristal.inria.fr/~xleroy/software.html#camlzip"
@@ -17,6 +19,15 @@ KEYWORDS="~amd64 ~ppc ~x86"
 DEPEND=">=dev-lang/ocaml-3.04 \
 		>=sys-libs/zlib-1.1.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
+}
+
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
@@ -26,7 +37,9 @@ src_unpack() {
 
 src_compile() {
 	emake all || die "Failed at compilation step !!!"
-	emake allopt || die "Failed at ML compilation step !!!"
+	if use ocamlopt; then
+		emake allopt || die "Failed at ML compilation step !!!"
+	fi
 }
 
 src_install() {