Allow to disable ocamlopt via an useflag

Package-Manager: portage-2.1.4_rc14

3 files changed, 38 insertions, 21 deletions

diff --git a/dev-ml/camomile/ChangeLog b/dev-ml/camomile/ChangeLog
index 17979944d188..6a269147ac14 100644
--- a/dev-ml/camomile/ChangeLog
+++ b/dev-ml/camomile/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-ml/camomile
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/camomile/ChangeLog,v 1.9 2007/05/26 21:19:46 aballier Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/camomile/ChangeLog,v 1.10 2008/01/03 21:10:25 aballier Exp $
+
+  03 Jan 2008; Alexis Ballier <aballier@gentoo.org> camomile-0.7.1.ebuild:
+  Allow to disable ocamlopt via an useflag
 
 *camomile-0.7.1 (26 May 2007)
 
diff --git a/dev-ml/camomile/Manifest b/dev-ml/camomile/Manifest
index d928b1aab9d3..eefdc0e91b62 100644
--- a/dev-ml/camomile/Manifest
+++ b/dev-ml/camomile/Manifest
@@ -12,14 +12,14 @@ EBUILD camomile-0.6.0.ebuild 600 RMD160 f100a8464dbb96d75edd126a1dd6d25f6588854f
 MD5 58133a9de964829ac8159130519e3a7a camomile-0.6.0.ebuild 600
 RMD160 f100a8464dbb96d75edd126a1dd6d25f6588854f camomile-0.6.0.ebuild 600
 SHA256 7a421898d3cb6dfc39bc97cc749c221c140a3f6f90363ae95dfb35c7104dfc3a camomile-0.6.0.ebuild 600
-EBUILD camomile-0.7.1.ebuild 681 RMD160 ff57a53bce0e4f43a69fbd6f24f6c06afc433662 SHA1 c9a26e5b0e86279e2d942a9bc23308e01db2bb8f SHA256 d2b626d7924cf655bb78fe3242309dcf20f1266545b73297dbcd83025959276c
-MD5 c3aa756af82a6c744dede1923f64f244 camomile-0.7.1.ebuild 681
-RMD160 ff57a53bce0e4f43a69fbd6f24f6c06afc433662 camomile-0.7.1.ebuild 681
-SHA256 d2b626d7924cf655bb78fe3242309dcf20f1266545b73297dbcd83025959276c camomile-0.7.1.ebuild 681
-MISC ChangeLog 1262 RMD160 fd7cc650c18bf386c778c071d7dc3b2f17c50254 SHA1 a521133c75ac655adc74e360ca4b1f36d2c2fb8d SHA256 d80fa2adc867f1f7da8b7b38f3b5670d6e78f343800d65c79bea0c876ad3f6a6
-MD5 677d486526ad6d9bc5cec327c1e64832 ChangeLog 1262
-RMD160 fd7cc650c18bf386c778c071d7dc3b2f17c50254 ChangeLog 1262
-SHA256 d80fa2adc867f1f7da8b7b38f3b5670d6e78f343800d65c79bea0c876ad3f6a6 ChangeLog 1262
+EBUILD camomile-0.7.1.ebuild 1204 RMD160 7db24ad6aff6bcee3bb02a55ac34568c4ad97fe0 SHA1 10a8d848f563f63b1f6150124ce9b54df6feade5 SHA256 d7eb62da8cb3a39f04c827106d64c7da4efe9321c56a39d9366ed02b818a99ee
+MD5 594d40449c5c08eb02fce5503b9c85c4 camomile-0.7.1.ebuild 1204
+RMD160 7db24ad6aff6bcee3bb02a55ac34568c4ad97fe0 camomile-0.7.1.ebuild 1204
+SHA256 d7eb62da8cb3a39f04c827106d64c7da4efe9321c56a39d9366ed02b818a99ee camomile-0.7.1.ebuild 1204
+MISC ChangeLog 1382 RMD160 ac09894d5820acd2c5037464376932da52fa6c2e SHA1 8be513ba06b876faccf930cab5aab12c84eeec14 SHA256 bdb1f02675e5ac165ab85ea8d4004232f82f9ff0b06ca8ac5207bb2f26081147
+MD5 75f4cd16e79e1f3a764db32d0411c810 ChangeLog 1382
+RMD160 ac09894d5820acd2c5037464376932da52fa6c2e ChangeLog 1382
+SHA256 bdb1f02675e5ac165ab85ea8d4004232f82f9ff0b06ca8ac5207bb2f26081147 ChangeLog 1382
 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 d84fc6df016543c52dbf8fbcbc31066f files/digest-camomile-0.7.1 250
 RMD160 950788f6f2988ca8c724f8fc535895a9787afd94 files/digest-camomile-0.7.1 250
 SHA256 c13883fab48b602a57f5db24bf199acb21ebfd599aea7c358f2e960f9e3850f0 files/digest-camomile-0.7.1 250
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
+Version: GnuPG v2.0.8 (GNU/Linux)
 
-iD8DBQFGWKR7vFcC4BYPU0oRAkfLAJ9cigWOdZvAALyAOW4hApkGDqHdgQCfTCyC
-AIizrYOCzXHhEXJIVXxFF3I=
-=r5aX
+iEUEARECAAYFAkd9T0sACgkQvFcC4BYPU0ofHACdG3TPOBwurCrHkBqhVj+OzYQ4
+v9kAlRVQvE0kSIPfvyZFWtmSdxkxisk=
+=i5br
 -----END PGP SIGNATURE-----
diff --git a/dev-ml/camomile/camomile-0.7.1.ebuild b/dev-ml/camomile/camomile-0.7.1.ebuild
index 143148123e6c..9df365f6f2d5 100644
--- a/dev-ml/camomile/camomile-0.7.1.ebuild
+++ b/dev-ml/camomile/camomile-0.7.1.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/camomile/camomile-0.7.1.ebuild,v 1.1 2007/05/26 21:19:46 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/camomile/camomile-0.7.1.ebuild,v 1.2 2008/01/03 21:10:25 aballier Exp $
 
-inherit findlib
+inherit findlib eutils
+
+EAPI="1"
 
 DESCRIPTION="Camomile is a comprehensive Unicode library for ocaml."
 HOMEPAGE="http://camomile.sourceforge.net/"
@@ -11,16 +13,28 @@ SRC_URI="mirror://sourceforge/camomile/${P}.tar.bz2"
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug"
+IUSE="debug +ocamlopt"
 
 DEPEND=">=dev-lang/ocaml-3.07"
 
+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() {
-	econf $(use_enable debug) || die
-	emake -j1
+	econf $(use_enable debug)
+	emake -j1 byte unidata unimaps charmap_data locale_data || die "failed to build"
+	if use ocamlopt; then
+		emake -j1 opt || die "failed to build native code"
+	fi
 }
 
 src_install() {
-	mkdir -p "${D}/usr/bin"
+	dodir /usr/bin
 	findlib_src_install DATADIR="${D}/usr/share" BINDIR="${D}/usr/bin"
 }