Added patch to allow compilation against boost-1.42 (fixes #301684).

Package-Manager: portage-2.1.7.16/cvs/Linux x86_64

4 files changed, 83 insertions, 5 deletions

diff --git a/sci-libs/vtk/ChangeLog b/sci-libs/vtk/ChangeLog
index 65800dd25fc6..c2c2bee4e23a 100644
--- a/sci-libs/vtk/ChangeLog
+++ b/sci-libs/vtk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/vtk
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.60 2010/01/16 20:16:29 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.61 2010/01/21 23:38:26 markusle Exp $
+
+  21 Jan 2010; Markus Dittrich <markusle@gentoo.org> vtk-5.4.2-r1.ebuild,
+  +files/vtk-5.4.2-boost-property_map.patch:
+  Added patch to allow compilation against boost-1.42 (fixes #301684).
 
   16 Jan 2010; Markus Dittrich <markusle@gentoo.org> vtk-5.4.2-r1.ebuild:
   Updated handling of mycmakeargs from cmake-utils.eclass.
diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest
index 6cf850ed0b86..521ebf4bbbd0 100644
--- a/sci-libs/vtk/Manifest
+++ b/sci-libs/vtk/Manifest
@@ -1,11 +1,12 @@
 AUX vtk-5.0.3-mpi.patch 2653 RMD160 16c80c11c88cd4a671968da9ef3a29c67a979648 SHA1 c1979686901883aa05091845c05235ce8e24e89f SHA256 dd03a1e55674e6f0c3740b996e6a81a68a6e253c5dac60cf0f2fd2e3ead1dcf3
 AUX vtk-5.0.4-gcc4.3.patch 1222 RMD160 28a724ce4e999e68482bfcadc3e776ef37a1e6a6 SHA1 5db37dabd42dca1d93e483e2fd3356fb5a2c653e SHA256 66627b05fd0f71a51b1f5645edaaa369d11896245598acdb3a30818ec716806f
 AUX vtk-5.2.0-tcl-install.patch 580 RMD160 e3654b90212a4f48f707cd4cfaf6069b9cbc4d49 SHA1 94269da0a6d83312d0fc00c3f7adf964531a7d20 SHA256 7373a02d9408f59546486b50efb8934fc2fa14067928e27bd46b2691b80d2fc6
+AUX vtk-5.4.2-boost-property_map.patch 3421 RMD160 a46265b2c4d0c4968037be65f2c52b6436c37499 SHA1 09ccc19c0c8503329c42fc8024142d4f632f54d5 SHA256 e905b931bb719c1f94017f0c76b1994aa785ac0a881b4c96bfbaeb6bc95af65b
 AUX vtk-5.4.2-cg-path.patch 1112 RMD160 8b4dca2322f62ed005585ed35cf5e11bc7ea0614 SHA1 903cd304bda40b64825ca0e806cd4d7c738f7165 SHA256 4097db18c46e1e27b6213ef7c82af07144b5a88ac19bdcf645ad7e8264cc9e10
 DIST vtk-5.4.2.tar.gz 18265310 RMD160 607df8babe7413b92a5bd4d8c264fd69798df83f SHA1 508106a15c32326aa9ac737c7f0e7212c150d55f SHA256 037c0582ee7483e0b495e45a00c4f08784691ef82c4ea159ef86731c3beda73d
 DIST vtkDocHtml-5.4.2.tar.gz 229828672 RMD160 d6372984b74ede33713501219fecd6768edcfad3 SHA1 13da1373bb95f34b1f868b307f0e84fef6626020 SHA256 54dfe1c242c488db1d1099bbf9114f49ee2bd07859c067e77e2d6bd3c077ee25
 DIST vtkdata-5.4.2.tar.gz 52810062 RMD160 0cc24fc7a6a9bb80c619a0555eb288cc97554001 SHA1 5030523c0a9e17c47bf94fe9005e5c91069a571a SHA256 84c9895b72aec96977b8043a4be26ff58e14ae04ab2be9f19a02ca613dc3be26
-EBUILD vtk-5.4.2-r1.ebuild 6891 RMD160 5432921a53d1e66cae56d8f697af795ceed77818 SHA1 88fcce3a2cd5e988f82f51758c5e0183a083115b SHA256 685a4f40f802ddbf62b4baec17f7681516ae9a943ef74f36d46132d38db1cc2d
+EBUILD vtk-5.4.2-r1.ebuild 6952 RMD160 1e4f35e47be821ff625e147cc4dd58c9045ac392 SHA1 5ec3199db8878ead9b8b96d90e94aceda885df76 SHA256 e8e8897a2b4ac6ad4495bb334e1ad608b2efddf0f623c6da91e40c019a6fac56
 EBUILD vtk-5.4.2.ebuild 10002 RMD160 3903566411bab7e95766ca0dc71e84d9fcbf8175 SHA1 dc81774ad814bb9d331a014b90bdacd836f589d0 SHA256 8dc7dcd684cb9538f0a7e44e4eb597a01fd5e351f6ac94e56f216143ed3c275b
-MISC ChangeLog 10343 RMD160 31e9f30bb72781ac23e484dd6b2e43bced2a97d3 SHA1 c2fcc9442fc12487a57da3f58d80ef28b4760818 SHA256 65ec7e0e2f09b056de84c39eb9c2973685b394162019c0f303976ba34862190c
+MISC ChangeLog 10534 RMD160 8828ba62463483f42228262416eea5e658e09805 SHA1 248d79d5b43a958d7fd7a538e037f7ef2d4f28ed SHA256 4cae476f1b584e131d4a41ee0ac8424f401ac55dc997c16b46e5bf3da5122bd8
 MISC metadata.xml 432 RMD160 2b5009d16ed172daa9ae089e59ceadabeaab5884 SHA1 4163aa67aa3d1d46b8efc21d2af85a2105f6a77c SHA256 8dadae25a4cdeedb63f94cbaf7fc6a8ce7a1950feae7047e859839d2eee30747
diff --git a/sci-libs/vtk/files/vtk-5.4.2-boost-property_map.patch b/sci-libs/vtk/files/vtk-5.4.2-boost-property_map.patch
new file mode 100644
index 000000000000..abba0d2ff5ae
--- /dev/null
+++ b/sci-libs/vtk/files/vtk-5.4.2-boost-property_map.patch
@@ -0,0 +1,72 @@
+diff -Naur VTK/Infovis/Testing/Cxx/TestBoostAdapter.cxx VTK.new/Infovis/Testing/Cxx/TestBoostAdapter.cxx
+--- VTK/Infovis/Testing/Cxx/TestBoostAdapter.cxx	2008-11-01 15:22:38.000000000 -0400
++++ VTK.new/Infovis/Testing/Cxx/TestBoostAdapter.cxx	2010-01-21 17:53:23.000000000 -0500
+@@ -36,7 +36,7 @@
+ #include <boost/graph/strong_components.hpp>
+ #include <boost/graph/dijkstra_shortest_paths.hpp>
+ #include <boost/graph/transitive_closure.hpp>
+-#include <boost/property_map.hpp>
++#include <boost/property_map/property_map.hpp>
+ #include <boost/vector_property_map.hpp>
+ 
+ #include "vtkGraph.h"
+diff -Naur VTK/Infovis/vtkBoostBreadthFirstSearch.cxx VTK.new/Infovis/vtkBoostBreadthFirstSearch.cxx
+--- VTK/Infovis/vtkBoostBreadthFirstSearch.cxx	2008-12-02 11:42:38.000000000 -0500
++++ VTK.new/Infovis/vtkBoostBreadthFirstSearch.cxx	2010-01-21 17:52:56.000000000 -0500
+@@ -46,7 +46,7 @@
+ 
+ #include <boost/graph/visitors.hpp>
+ #include <boost/graph/breadth_first_search.hpp>
+-#include <boost/property_map.hpp>
++#include <boost/property_map/property_map.hpp>
+ #include <boost/vector_property_map.hpp>
+ #include <boost/pending/queue.hpp>
+ 
+diff -Naur VTK/Parallel/vtkPBGLBreadthFirstSearch.cxx VTK.new/Parallel/vtkPBGLBreadthFirstSearch.cxx
+--- VTK/Parallel/vtkPBGLBreadthFirstSearch.cxx	2008-12-04 16:17:46.000000000 -0500
++++ VTK.new/Parallel/vtkPBGLBreadthFirstSearch.cxx	2010-01-21 17:53:58.000000000 -0500
+@@ -50,7 +50,7 @@
+ #include <boost/graph/distributed/breadth_first_search.hpp>
+ #include <boost/parallel/algorithm.hpp>
+ #include <boost/graph/visitors.hpp>
+-#include <boost/property_map.hpp>
++#include <boost/property_map/property_map.hpp>
+ #include <boost/vector_property_map.hpp>
+ #include <boost/pending/queue.hpp>
+ 
+diff -Naur VTK/Parallel/vtkPBGLMinimumSpanningTree.cxx VTK.new/Parallel/vtkPBGLMinimumSpanningTree.cxx
+--- VTK/Parallel/vtkPBGLMinimumSpanningTree.cxx	2008-12-04 16:17:46.000000000 -0500
++++ VTK.new/Parallel/vtkPBGLMinimumSpanningTree.cxx	2010-01-21 17:54:18.000000000 -0500
+@@ -48,7 +48,7 @@
+ #include <boost/graph/distributed/dehne_gotz_min_spanning_tree.hpp>
+ #include <boost/graph/distributed/vertex_list_adaptor.hpp>
+ #include <boost/parallel/global_index_map.hpp>
+-#include <boost/property_map.hpp>
++#include <boost/property_map/property_map.hpp>
+ #include <boost/vector_property_map.hpp>
+ #include <boost/pending/queue.hpp>
+ 
+diff -Naur VTK/Parallel/vtkPBGLShortestPaths.cxx VTK.new/Parallel/vtkPBGLShortestPaths.cxx
+--- VTK/Parallel/vtkPBGLShortestPaths.cxx	2009-02-23 16:08:57.000000000 -0500
++++ VTK.new/Parallel/vtkPBGLShortestPaths.cxx	2010-01-21 17:54:36.000000000 -0500
+@@ -49,7 +49,7 @@
+ 
+ #include <boost/graph/distributed/delta_stepping_shortest_paths.hpp>
+ #include <boost/parallel/algorithm.hpp>
+-#include <boost/property_map.hpp>
++#include <boost/property_map/property_map.hpp>
+ #include <boost/vector_property_map.hpp>
+ 
+ #include <vtksys/stl/utility> // for pair
+diff -Naur VTK/Parallel/vtkPBGLVertexColoring.cxx VTK.new/Parallel/vtkPBGLVertexColoring.cxx
+--- VTK/Parallel/vtkPBGLVertexColoring.cxx	2008-07-31 13:56:53.000000000 -0400
++++ VTK.new/Parallel/vtkPBGLVertexColoring.cxx	2010-01-21 17:53:40.000000000 -0500
+@@ -47,7 +47,7 @@
+ 
+ #include <boost/graph/distributed/boman_et_al_graph_coloring.hpp>
+ #include <boost/parallel/algorithm.hpp>
+-#include <boost/property_map.hpp>
++#include <boost/property_map/property_map.hpp>
+ 
+ #include <vtksys/stl/utility> // for pair
+ 
diff --git a/sci-libs/vtk/vtk-5.4.2-r1.ebuild b/sci-libs/vtk/vtk-5.4.2-r1.ebuild
index 5f4feeba9dc2..479517e67f02 100644
--- a/sci-libs/vtk/vtk-5.4.2-r1.ebuild
+++ b/sci-libs/vtk/vtk-5.4.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.4.2-r1.ebuild,v 1.2 2010/01/16 20:16:29 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.4.2-r1.ebuild,v 1.3 2010/01/21 23:38:26 markusle Exp $
 
 EAPI="2"
 inherit eutils flag-o-matic toolchain-funcs versionator java-pkg-opt-2 python qt3 qt4 cmake-utils
@@ -44,7 +44,7 @@ RDEPEND="mpi? ( || (
 
 DEPEND="${RDEPEND}
 		java? ( >=virtual/jdk-1.5 )
-		boost? ( dev-libs/boost )
+		boost? ( >=dev-libs/boost-1.40.0 )
 		>=dev-util/cmake-2.6"
 
 S="${WORKDIR}"/VTK
@@ -73,6 +73,7 @@ pkg_setup() {
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-cg-path.patch
 	epatch "${FILESDIR}"/${PN}-5.2.0-tcl-install.patch
+	epatch "${FILESDIR}"/${P}-boost-property_map.patch
 	sed -e "s:@VTK_TCL_LIBRARY_DIR@:/usr/$(get_libdir):" \
 		-i Wrapping/Tcl/pkgIndex.tcl.in \
 		|| die "Failed to fix tcl pkgIndex file"