Add a check for native code ocaml compiler and facile library

Package-Manager: portage-2.1.4_rc14

3 files changed, 36 insertions, 17 deletions

diff --git a/kde-base/kalzium/ChangeLog b/kde-base/kalzium/ChangeLog
index 5bd509342316..25273dbb739b 100644
--- a/kde-base/kalzium/ChangeLog
+++ b/kde-base/kalzium/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kalzium
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kalzium/ChangeLog,v 1.75 2007/10/19 21:54:55 philantrop Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kalzium/ChangeLog,v 1.76 2008/01/06 18:23:28 aballier Exp $
+
+  06 Jan 2008; Alexis Ballier <aballier@gentoo.org> kalzium-3.5.8.ebuild:
+  Add a check for native code ocaml compiler and facile library
 
 *kalzium-3.5.8 (19 Oct 2007)
 
diff --git a/kde-base/kalzium/Manifest b/kde-base/kalzium/Manifest
index d78ed4cc4f83..723d1619c647 100644
--- a/kde-base/kalzium/Manifest
+++ b/kde-base/kalzium/Manifest
@@ -21,14 +21,14 @@ EBUILD kalzium-3.5.7.ebuild 722 RMD160 7d338bc1829d80b2675a0c045d737daf3181e1ea
 MD5 b8daf7e079be06eb6cb827abeb958c13 kalzium-3.5.7.ebuild 722
 RMD160 7d338bc1829d80b2675a0c045d737daf3181e1ea kalzium-3.5.7.ebuild 722
 SHA256 529070ea141ed087094bb91ad75480c28c70c68dc172084a00d0bce9508fb01e kalzium-3.5.7.ebuild 722
-EBUILD kalzium-3.5.8.ebuild 999 RMD160 bd12719b1167c24919a3e978cf87b6f09d931e79 SHA1 e14bbdcc7ee8579222932754d29601aa4fed8cda SHA256 1db6bc99ba1b6d360a7723d39d961972bad4db283dda125d1055a72f2bc68527
-MD5 5d54cdee118e876ea0f5fcf490de6b34 kalzium-3.5.8.ebuild 999
-RMD160 bd12719b1167c24919a3e978cf87b6f09d931e79 kalzium-3.5.8.ebuild 999
-SHA256 1db6bc99ba1b6d360a7723d39d961972bad4db283dda125d1055a72f2bc68527 kalzium-3.5.8.ebuild 999
-MISC ChangeLog 8993 RMD160 25fb00a92c96ab066d5a67dd9261dcca3e0bc093 SHA1 eb2a6cbd2f9af3919e175952c88dcfd37d95573b SHA256 c0968b34f52b09947f6f442e9095d0a5defcb5596d755f1bf73189fd2746d767
-MD5 656ff94ecfd8e178bb7193143b25a184 ChangeLog 8993
-RMD160 25fb00a92c96ab066d5a67dd9261dcca3e0bc093 ChangeLog 8993
-SHA256 c0968b34f52b09947f6f442e9095d0a5defcb5596d755f1bf73189fd2746d767 ChangeLog 8993
+EBUILD kalzium-3.5.8.ebuild 1692 RMD160 50656e80e90f68e94f9190896ef55b87e5ad12bc SHA1 72ea7e014c3427dd7fda654dba4946dd1b2471b6 SHA256 b4cfe67d2ea39a66af7add1c4d7fa2297ed6a0338fe51aac3def738596ada1e6
+MD5 620f8dbf685c80492390c9ed45f33a2a kalzium-3.5.8.ebuild 1692
+RMD160 50656e80e90f68e94f9190896ef55b87e5ad12bc kalzium-3.5.8.ebuild 1692
+SHA256 b4cfe67d2ea39a66af7add1c4d7fa2297ed6a0338fe51aac3def738596ada1e6 kalzium-3.5.8.ebuild 1692
+MISC ChangeLog 9130 RMD160 956237db1ab0507d521c39566c469fd92e2c4ca4 SHA1 e38ed5d749eb8c72cd842009b1b397233fb97f6c SHA256 c42793b5b1d1e44e211af722bbadd42864a92f3a3ee2efb8b0727c40a35af3ea
+MD5 05c41df5541fae5126d549652fc87c32 ChangeLog 9130
+RMD160 956237db1ab0507d521c39566c469fd92e2c4ca4 ChangeLog 9130
+SHA256 c42793b5b1d1e44e211af722bbadd42864a92f3a3ee2efb8b0727c40a35af3ea ChangeLog 9130
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -46,9 +46,9 @@ MD5 5484ccc30043075426937f14d11f88fd files/digest-kalzium-3.5.8 247
 RMD160 791421a5ab7fd2d85121e253e20bd0a7ff1497dc files/digest-kalzium-3.5.8 247
 SHA256 4f40ebcf2b46f22bb6712d559d81040c6c20c0a0257afd0b5becc1bf3e138dca files/digest-kalzium-3.5.8 247
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.8 (GNU/Linux)
 
-iD8DBQFHGSfGCkvF58q80IkRAjs+AJ0caHkBwv4OJ8DioWazWuKwwsHPPACfXMpf
-ST3pvEZFes9JjVmgZKAeRss=
-=D32I
+iEYEARECAAYFAkeBHLgACgkQvFcC4BYPU0orogCgrxMDNvGO8u++O9HysIpRHw1m
+fsEAn2cMcyNd4jMzoLk467G1Gcwtu3ds
+=Ms/x
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kalzium/kalzium-3.5.8.ebuild b/kde-base/kalzium/kalzium-3.5.8.ebuild
index d7d075e09b59..c83ac13d57bb 100644
--- a/kde-base/kalzium/kalzium-3.5.8.ebuild
+++ b/kde-base/kalzium/kalzium-3.5.8.ebuild
@@ -1,10 +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/kde-base/kalzium/kalzium-3.5.8.ebuild,v 1.1 2007/10/19 21:54:55 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kalzium/kalzium-3.5.8.ebuild,v 1.2 2008/01/06 18:23:28 aballier Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
-inherit flag-o-matic kde-meta
+inherit flag-o-matic kde-meta eutils
 
 DESCRIPTION="KDE: periodic table of the elements"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
@@ -21,6 +21,22 @@ KMCOPYLIB="libkdeeduplot libkdeedu/kdeeduplot
 
 PATCHES="${FILESDIR}/${PN}-3.5.7-copy_string.patch"
 
+pkg_setup() {
+	if use solver && ! built_with_use --missing true dev-lang/ocaml ocamlopt; then
+		eerror "In order to build the solver for ${PN}, you first need"
+		eerror "to have dev-lang/ocaml built with the ocamlopt useflag"
+		eerror "in order to get a native code ocaml compiler"
+		die "Please install dev-lang/ocaml with ocamlopt support"
+	fi
+	if use solver && ! built_with_use --missing true dev-ml/facile ocamlopt; then
+		eerror "In order to build the solver for ${PN}, you first need"
+		eerror "to have dev-ml/facile built with the ocamlopt useflag"
+		eerror "in order to get the native code library"
+		die "Please install dev-ml/facile with ocamlopt support"
+	fi
+	kde_pkg_setup
+}
+
 src_compile() {
 	append-ldflags -Wl,-z,noexecstack