summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Dittrich <markusle@gentoo.org>2006-03-06 15:35:28 +0000
committerMarkus Dittrich <markusle@gentoo.org>2006-03-06 15:35:28 +0000
commitddb35b8d3847faa425f782b5799e9ad724aac0b5 (patch)
treea9d4da65752ac13b5734328e4b5e6e1915fdf242 /sci-libs
parentDrop virtual/libc dependency. (diff)
downloadgentoo-2-ddb35b8d3847faa425f782b5799e9ad724aac0b5.tar.gz
gentoo-2-ddb35b8d3847faa425f782b5799e9ad724aac0b5.tar.bz2
gentoo-2-ddb35b8d3847faa425f782b5799e9ad724aac0b5.zip
Fixed some QT3 issues and forced -j1 during emake.
(Portage version: 2.1_pre5-r4)
Diffstat (limited to 'sci-libs')
-rw-r--r--sci-libs/vtk/ChangeLog7
-rw-r--r--sci-libs/vtk/Manifest12
-rw-r--r--sci-libs/vtk/vtk-5.0.0.ebuild8
3 files changed, 17 insertions, 10 deletions
diff --git a/sci-libs/vtk/ChangeLog b/sci-libs/vtk/ChangeLog
index b49ca1645711..05ec42179694 100644
--- a/sci-libs/vtk/ChangeLog
+++ b/sci-libs/vtk/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for sci-libs/vtk
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.11 2006/03/06 01:14:31 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.12 2006/03/06 15:35:27 markusle Exp $
+
+ 06 Mar 2006; Markus Dittrich <markusle@gentoo.org> vtk-5.0.0.ebuild:
+ Fixed some QT3 issues and forced -j1 during emake. Thanks
+ much to Sebastiaan <s.breedveld@erasmusmc.nl> for his fixes
+ and testing.
*vtk-5.0.0 (05 Mar 2006)
diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest
index c89715eaea22..390c1220b5aa 100644
--- a/sci-libs/vtk/Manifest
+++ b/sci-libs/vtk/Manifest
@@ -1,6 +1,6 @@
-MD5 f3a6dbd79bb9ed07eef4adb6879248cc ChangeLog 1908
-RMD160 fe8634f59c3ab26f972245f61da29f1a626cd2d0 ChangeLog 1908
-SHA256 2c0a8aa76c493d62263ca0adb2a1d572e8b86ff77eed509434b5f8d85ec30499 ChangeLog 1908
+MD5 aa6da15aa8517a59744b67e16cc25de5 ChangeLog 2117
+RMD160 08126e35a7afe6755e97d4d2b1fc571dd86c38fe ChangeLog 2117
+SHA256 18d8c69ec0077056f4d04f1cab3ce6a13b6948e4e620dc6d2d72929f20e912f0 ChangeLog 2117
MD5 86f6e1d7f2496767255664ba61932a73 files/digest-vtk-4.2.6 759
RMD160 0879e3bfe67d7d6b36190d07c36078b2dcff84a7 files/digest-vtk-4.2.6 759
SHA256 0a311502f00b1cba50cdadff5a55d329ec6fe99441e6360b6e45b580e6fc4d5d files/digest-vtk-4.2.6 759
@@ -16,6 +16,6 @@ SHA256 131c089c8a699c3fb7e8b914f68af259e0b0ad341fba3a8f87827871fc7be701 metadata
MD5 748f5f3854a501ae6f6e0169dbd5dbde vtk-4.2.6.ebuild 5768
RMD160 96a37816b7b28dd87abc6389608b47e9a6a6c477 vtk-4.2.6.ebuild 5768
SHA256 c0b6175c198c86d93fd34a4b01bfe0ab0af8efbe8884e740c389f861f836447f vtk-4.2.6.ebuild 5768
-MD5 abffef214c348cbb7cf709d613a5728d vtk-5.0.0.ebuild 6460
-RMD160 e29c02255b2897267844fc6a5011e643a1eba9e2 vtk-5.0.0.ebuild 6460
-SHA256 34d35be72c75782531c2ac54d2af14a969249fd257e998d21679435fae3b9181 vtk-5.0.0.ebuild 6460
+MD5 bcaf1b3dd88af9c9faef9926b9cb359a vtk-5.0.0.ebuild 6637
+RMD160 f7ed8892f9f4f453e1af6199773813dcf201302d vtk-5.0.0.ebuild 6637
+SHA256 189eb92230d5d66344acaa000e45d6a39a0f85632d581d4a597f006ec4f8aa0f vtk-5.0.0.ebuild 6637
diff --git a/sci-libs/vtk/vtk-5.0.0.ebuild b/sci-libs/vtk/vtk-5.0.0.ebuild
index e09396a040d8..0b777261eee9 100644
--- a/sci-libs/vtk/vtk-5.0.0.ebuild
+++ b/sci-libs/vtk/vtk-5.0.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.0.0.ebuild,v 1.1 2006/03/06 01:14:31 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.0.0.ebuild,v 1.2 2006/03/06 15:35:28 markusle Exp $
# TODO: need to fix Examples/CMakeLists.txt to build other examples
@@ -91,7 +91,9 @@ src_compile() {
CMAKE_VARIABLES="${CMAKE_VARIABLES} -DQT_WRAP_CPP:BOOL=ON"
CMAKE_VARIABLES="${CMAKE_VARIABLES} -DQT_WRAP_UI:BOOL=ON"
CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_INSTALL_QT_DIR:PATH=/qt/3/plugins"
- CMAKE_VARIABLES="${CMAKE_VARIABLES} -DESIRED_QT_VERSION:STRING=3"
+ CMAKE_VARIABLES="${CMAKE_VARIABLES} -DDESIRED_QT_VERSION:STRING=3"
+ CMAKE_VARIABLES="${CMAKE_VARIABLES} -DQT_MOC_EXECUTABLE:FILEPATH=/usr/qt/3/bin/moc"
+ CMAKE_VARIABLES="${CMAKE_VARIABLES} -DQT_UIC_EXECUTABLE:FILEPATH=/usr/qt/3/bin/uic"
fi
@@ -105,7 +107,7 @@ src_compile() {
cmake ${CMAKE_VARIABLES} . && cmake ${CMAKE_VARIABLES} . \
|| die "cmake configuration failed"
- emake || die "emake failed"
+ emake -j1 || die "emake failed"
}
src_install() {