Made the ocaml solver compile before the rest of Kalzium because the cmake-based build fails otherwise. Fixes bug 206620.

Package-Manager: portage-2.1.4

3 files changed, 36 insertions, 20 deletions

diff --git a/kde-base/kalzium/ChangeLog b/kde-base/kalzium/ChangeLog
index b0b988846ec5..dcf3e692d0b4 100644
--- a/kde-base/kalzium/ChangeLog
+++ b/kde-base/kalzium/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kalzium
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kalzium/ChangeLog,v 1.77 2008/01/17 23:31:30 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kalzium/ChangeLog,v 1.78 2008/01/20 02:18:01 philantrop Exp $
+
+  20 Jan 2008; Wulf C. Krueger <philantrop@gentoo.org> kalzium-4.0.0.ebuild:
+  Made the ocaml solver compile before the rest of Kalzium because the
+  cmake-based build fails otherwise. Fixes bug 206620.
 
 *kalzium-4.0.0 (17 Jan 2008)
 
diff --git a/kde-base/kalzium/Manifest b/kde-base/kalzium/Manifest
index 5c5621069a5d..60c69b3288b3 100644
--- a/kde-base/kalzium/Manifest
+++ b/kde-base/kalzium/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX kalzium-3.5.7-copy_string.patch 418 RMD160 224df144846b3ff6a45c304dccfcf5b9b738d440 SHA1 dcbde42a2fdf631f3bdc32bb2bdc81d6fc05f1f7 SHA256 c59a1571de5b3ada80cd48c20e74b501ea5b2bb131001ee11ae3023e7cde38f0
 MD5 a58fd570a12935b4e6f25538f4826813 files/kalzium-3.5.7-copy_string.patch 418
 RMD160 224df144846b3ff6a45c304dccfcf5b9b738d440 files/kalzium-3.5.7-copy_string.patch 418
@@ -26,14 +23,14 @@ EBUILD kalzium-3.5.8.ebuild 1692 RMD160 50656e80e90f68e94f9190896ef55b87e5ad12bc
 MD5 620f8dbf685c80492390c9ed45f33a2a kalzium-3.5.8.ebuild 1692
 RMD160 50656e80e90f68e94f9190896ef55b87e5ad12bc kalzium-3.5.8.ebuild 1692
 SHA256 b4cfe67d2ea39a66af7add1c4d7fa2297ed6a0338fe51aac3def738596ada1e6 kalzium-3.5.8.ebuild 1692
-EBUILD kalzium-4.0.0.ebuild 1077 RMD160 103462407f618a8bfb81c381492e8124fcf01482 SHA1 d25789e509dc2899672f8614cbe3a84fdd99cb19 SHA256 86d5d9d111d26323266954d807c802776bf1ec3a2ffde892442305c11b049a4f
-MD5 fd96115eb2ecb03aa28297f766267be9 kalzium-4.0.0.ebuild 1077
-RMD160 103462407f618a8bfb81c381492e8124fcf01482 kalzium-4.0.0.ebuild 1077
-SHA256 86d5d9d111d26323266954d807c802776bf1ec3a2ffde892442305c11b049a4f kalzium-4.0.0.ebuild 1077
-MISC ChangeLog 9272 RMD160 8371dcef2caead989437a32c995dd75d09f53f12 SHA1 54eac581014ee56d6bee2a47212ee25784b60fef SHA256 76c8a61aadb80bc901c5aff6ce5965c235c4eca49870702f70e65a4b88ac5c53
-MD5 a3fbe816ec520102a874a64950780fa8 ChangeLog 9272
-RMD160 8371dcef2caead989437a32c995dd75d09f53f12 ChangeLog 9272
-SHA256 76c8a61aadb80bc901c5aff6ce5965c235c4eca49870702f70e65a4b88ac5c53 ChangeLog 9272
+EBUILD kalzium-4.0.0.ebuild 2035 RMD160 03fe9a2413b7d49ab4f4e7045bc970fd5328cc0e SHA1 9ddda43b6ad6bffa49cbd7b3e1fec73c2f7ab4e1 SHA256 f8af626f6d7fcd467d0d06291b0f5bc41d5ada90ee83fd9a0067274e9fad95c9
+MD5 c4e4be52bc14561e31d334692aaaa9cf kalzium-4.0.0.ebuild 2035
+RMD160 03fe9a2413b7d49ab4f4e7045bc970fd5328cc0e kalzium-4.0.0.ebuild 2035
+SHA256 f8af626f6d7fcd467d0d06291b0f5bc41d5ada90ee83fd9a0067274e9fad95c9 kalzium-4.0.0.ebuild 2035
+MISC ChangeLog 9476 RMD160 d89582ea5930e99eb07b82b797f68478f233aa3a SHA1 8dc151280c84d9e0c6185292fe4cafccab51e20e SHA256 16a7270163b5f15f36b63cb69b4b37785c117f2c9221c2b8384bad565b71ee8a
+MD5 69dcb57cf7196e708ab97d92974ef749 ChangeLog 9476
+RMD160 d89582ea5930e99eb07b82b797f68478f233aa3a ChangeLog 9476
+SHA256 16a7270163b5f15f36b63cb69b4b37785c117f2c9221c2b8384bad565b71ee8a ChangeLog 9476
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -53,10 +50,3 @@ SHA256 4f40ebcf2b46f22bb6712d559d81040c6c20c0a0257afd0b5becc1bf3e138dca files/di
 MD5 fa608683f66be0a8b9b00ad3f0fbbae5 files/digest-kalzium-4.0.0 247
 RMD160 bc8eeabe5d2ae3895d2e304be12a55d8eb3fec6c files/digest-kalzium-4.0.0 247
 SHA256 a245b11f6f06334002ed9b23be7d03582f34c310e95f8e0664c6cc662226d835 files/digest-kalzium-4.0.0 247
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFHj+VZCkvF58q80IkRAr8cAJ9csaesTGtjKHDE/wGfuvFmX/gwJgCfamtC
-d1OQb11HjLU125mwlm6Ub+E=
-=bXL9
------END PGP SIGNATURE-----
diff --git a/kde-base/kalzium/kalzium-4.0.0.ebuild b/kde-base/kalzium/kalzium-4.0.0.ebuild
index fbc41e037493..63a24a69a8ea 100644
--- a/kde-base/kalzium/kalzium-4.0.0.ebuild
+++ b/kde-base/kalzium/kalzium-4.0.0.ebuild
@@ -1,6 +1,6 @@
 # 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-4.0.0.ebuild,v 1.1 2008/01/17 23:31:30 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kalzium/kalzium-4.0.0.ebuild,v 1.2 2008/01/20 02:18:01 philantrop Exp $
 
 EAPI="1"
 
@@ -24,10 +24,32 @@ KMEXTRACTONLY="libkdeedu/kdeeduui libkdeedu/libscience"
 pkg_setup() {
 	use cviewer && QT4_BUILT_WITH_USE_CHECK="${QT4_BUILT_WITH_USE_CHECK} opengl"
 
+	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
+
 	kde4-meta_pkg_setup
 }
 
 src_compile() {
+	if use solver ; then
+		# Compile the solver on its own as the cmake-based build is
+		# currently broken. Fixes bug 206620.
+		cd "${S}/${PN}/src/solver"
+		emake || die "compiling the ocaml resolver failed"
+		mkdir -p "${WORKDIR}/${PN}_build/${PN}/src/"
+		cp * "${WORKDIR}/${PN}_build/${PN}/src/"
+	fi
+
 	mycmakeargs="${mycmakeargs}
 		$(cmake-utils_use_with cviewer Eigen)
 		$(cmake-utils_use_with cviewer OpenBabel2)