aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'sci-libs/vtk')
-rw-r--r--sci-libs/vtk/ChangeLog7
-rw-r--r--sci-libs/vtk/Manifest4
-rw-r--r--sci-libs/vtk/vtk-5.6.1.ebuild5
3 files changed, 11 insertions, 5 deletions
diff --git a/sci-libs/vtk/ChangeLog b/sci-libs/vtk/ChangeLog
index eb1c19d09..4aede00fc 100644
--- a/sci-libs/vtk/ChangeLog
+++ b/sci-libs/vtk/ChangeLog
@@ -1,7 +1,12 @@
# ChangeLog for sci-libs/vtk
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.78 2010/07/24 18:25:18 jlec Exp $
+ 29 Jan 2011; François Bissey <francois.bissey@canterbury.ac.nz>
+ vtk-5.6.1.ebuild:
+ Complete the removal of FindPythonLibs.cmake, so we don't have a failure at
+ install.
+
29 Dec 2010; François Bissey <f.r.bissey@massey.ac.nz> vtk-5.6.1.ebuild:
Patch for python-2.7 as in paraview-3.8.1
diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest
index 794c46530..d4038de39 100644
--- a/sci-libs/vtk/Manifest
+++ b/sci-libs/vtk/Manifest
@@ -7,6 +7,6 @@ AUX vtk-5.6.0-odbc.patch 328 RMD160 888680f3e503f8ce624c73df9bb0402309c1384b SHA
DIST vtk-5.6.1.tar.gz 20780311 RMD160 ac1864c9604d843ab9c654c67109f4f1487acaee SHA1 6d4d0de3b468828f21f70c5af5e37f9412ee59c5 SHA256 007be00bae6c7c96f78ca9709516c993a4e3221d0b1762a7fe70e2abe407e86d
DIST vtkDocHtml-5.6.1.tar.gz 103469987 RMD160 ca6790ab0542fc91db53cc31f4ad9c3c025442d3 SHA1 9ade3dbfa76a2ac5e48dcb89398d2ffe85096a76 SHA256 2b035356743c36d982074078b2298d987e62c908285333a588addfb126f89dbe
DIST vtkdata-5.6.1.tar.gz 77991728 RMD160 b77b5f6919beae406712b93cd333dd4fad5ff3d1 SHA1 7350863d6351a961c4813ad6e73f74428307cd35 SHA256 ad2f8c99940f07f3edcbf71d838717c5c55d252cc8a67e705620858adaaa66f2
-EBUILD vtk-5.6.1.ebuild 7567 RMD160 a823b952b35acfd10b5ff3d127e71d429bf11180 SHA1 8965e614815da5dbc639038fc90a2acf641f13d5 SHA256 9161dc6d95ba3ffa692bb88ce05f8cfe62c1b1a2e020114c0685eaf32a97bf78
-MISC ChangeLog 14366 RMD160 9c5f75dc25ba6d246f5764ffdc2f70feb737f499 SHA1 7400781f382359bbdab89886783b8fac38c92f67 SHA256 4b67d21b8b32fd5dc89a02f8ab4eb040177cfdc5baf8130ed875998360fab29b
+EBUILD vtk-5.6.1.ebuild 7642 RMD160 7b381ec992d1201e17bcb4b6aef05cd68f445fbf SHA1 88abab5cc383d2945732332194376f4a45f93075 SHA256 7fc90e31b482e0926855f13f66adf64d9f495f4c1bb8d10cdd0b16e565588876
+MISC ChangeLog 14543 RMD160 608e58ee64b721a13ada0c9432c260d98ea921f0 SHA1 b3c1ace82abf01d7de70ba3a1cab47d7d7a1a050 SHA256 0f58d3c7996131b819ed8dcae47a80654ea5c8841c94cf55c422f57c3780328d
MISC metadata.xml 574 RMD160 ccd927f3a387710bbf53f3f0f88c971dc814c605 SHA1 8160c080306039e0b3b18ced75ae6b81b8590ddc SHA256 9a3ca872da01db519865e7753e9c0922fe56972f4d6e27cbf5622afd41d23300
diff --git a/sci-libs/vtk/vtk-5.6.1.ebuild b/sci-libs/vtk/vtk-5.6.1.ebuild
index 11c99272a..4cd5ba2b3 100644
--- a/sci-libs/vtk/vtk-5.6.1.ebuild
+++ b/sci-libs/vtk/vtk-5.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -72,7 +72,6 @@ pkg_setup() {
java-pkg-opt-2_pkg_setup
use python && python_set_active_version 2
- use qt4 && qt4_pkg_setup
append-cppflags -D__STDC_CONSTANT_MACROS
}
@@ -92,6 +91,8 @@ src_prepare() {
|| die "Failed to fix tcl pkgIndex file"
# Remove FindPythonLibs.cmake to use the patched one from cmake
rm CMake/FindPythonLibs.cmake
+ # Also remove it from the list of files to install
+ sed -i "/FindPythonLibs.cmake/d" CMakeLists.txt
}
src_configure() {