Added patch to allow compilation against boost-1.42 (fixes #301684). Also forced the use of system HDF5 (fixes #301668) and fixed a problem with finding the proper odbc libs (#301538).

(Portage version: 2.1.7.16/cvs/Linux x86_64)

4 files changed, 53 insertions, 10 deletions

diff --git a/sci-visualization/paraview/ChangeLog b/sci-visualization/paraview/ChangeLog
index 91708bcc7a30..2d3435c61f01 100644
--- a/sci-visualization/paraview/ChangeLog
+++ b/sci-visualization/paraview/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-visualization/paraview
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/ChangeLog,v 1.44 2010/01/16 19:58:32 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/ChangeLog,v 1.45 2010/01/22 03:40:02 markusle Exp $
+
+  21 Jan 2010; Markus Dittrich <markusle@gentoo.org> paraview-3.6.2.ebuild,
+  +files/paraview-3.6.2-boost-property_map.patch,
+  +files/paraview-3.6.2-odbc.patch:
+  Added patch to allow compilation against boost-1.42 (fixes #301684).
+  Also forced the use of system HDF5 (fixes #301668) and fixed a problem
+  with finding the proper odbc libs (#301538).
 
 *paraview-3.6.2 (16 Jan 2010)
 
diff --git a/sci-visualization/paraview/files/paraview-3.6.2-boost-property_map.patch b/sci-visualization/paraview/files/paraview-3.6.2-boost-property_map.patch
new file mode 100644
index 000000000000..e6919c549570
--- /dev/null
+++ b/sci-visualization/paraview/files/paraview-3.6.2-boost-property_map.patch
@@ -0,0 +1,24 @@
+diff -Naur ParaView3/VTK/Infovis/Testing/Cxx/TestBoostAdapter.cxx ParaView3.new/VTK/Infovis/Testing/Cxx/TestBoostAdapter.cxx
+--- ParaView3/VTK/Infovis/Testing/Cxx/TestBoostAdapter.cxx	2008-11-01 15:22:38.000000000 -0400
++++ ParaView3.new/VTK/Infovis/Testing/Cxx/TestBoostAdapter.cxx	2010-01-21 18:43:37.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 ParaView3/VTK/Infovis/vtkBoostBreadthFirstSearch.cxx ParaView3.new/VTK/Infovis/vtkBoostBreadthFirstSearch.cxx
+--- ParaView3/VTK/Infovis/vtkBoostBreadthFirstSearch.cxx	2009-03-13 12:11:50.000000000 -0400
++++ ParaView3.new/VTK/Infovis/vtkBoostBreadthFirstSearch.cxx	2010-01-21 18:43:16.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 --git a/sci-visualization/paraview/files/paraview-3.6.2-odbc.patch b/sci-visualization/paraview/files/paraview-3.6.2-odbc.patch
new file mode 100644
index 000000000000..309b3ee06acd
--- /dev/null
+++ b/sci-visualization/paraview/files/paraview-3.6.2-odbc.patch
@@ -0,0 +1,12 @@
+diff -Naur ParaView3/VTK/CMake/FindODBC.cmake ParaView3.new/VTK/CMake/FindODBC.cmake
+--- ParaView3/VTK/CMake/FindODBC.cmake	2008-10-08 13:51:36.000000000 -0400
++++ ParaView3.new/VTK/CMake/FindODBC.cmake	2010-01-21 22:11:26.000000000 -0500
+@@ -30,7 +30,7 @@
+ )
+ 
+ FIND_LIBRARY( ODBC_LIBRARY 
+-  NAMES iodbc unixodbc
++  NAMES iodbc unixodbc odbc
+   PATHS
+   /usr/lib
+   /usr/lib/odbc
diff --git a/sci-visualization/paraview/paraview-3.6.2.ebuild b/sci-visualization/paraview/paraview-3.6.2.ebuild
index 56ce93b14d44..52b54be18f3d 100644
--- a/sci-visualization/paraview/paraview-3.6.2.ebuild
+++ b/sci-visualization/paraview/paraview-3.6.2.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-visualization/paraview/paraview-3.6.2.ebuild,v 1.2 2010/01/17 22:14:02 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/paraview-3.6.2.ebuild,v 1.3 2010/01/22 03:40:02 markusle Exp $
 
 EAPI="2"
 
@@ -18,8 +18,8 @@ SRC_URI="mirror://gentoo/${P}.tar.gz
 LICENSE="paraview GPL-2"
 KEYWORDS="~x86 ~amd64"
 SLOT="0"
-IUSE="mpi +python hdf5 doc examples +gui plugins boost streaming cg overview mysql postgres odbc"
-RDEPEND="hdf5? ( sci-libs/hdf5 )
+IUSE="mpi +python doc examples +gui plugins boost streaming cg overview mysql postgres odbc"
+RDEPEND="sci-libs/hdf5
 	mpi? ( || (
 				sys-cluster/openmpi
 				sys-cluster/mpich2[cxx] ) )
@@ -45,7 +45,7 @@ RDEPEND="hdf5? ( sci-libs/hdf5 )
 	x11-libs/libXmu"
 
 DEPEND="${RDEPEND}
-		boost? ( >=dev-libs/boost-1.37 )
+		boost? (  >=dev-libs/boost-1.40.0 )
 		doc? ( app-doc/doxygen )
 		>=dev-util/cmake-2.6.4"
 
@@ -67,8 +67,10 @@ src_prepare() {
 	epatch "${FILESDIR}"/${P}-no-doc-finder.patch
 	epatch "${FILESDIR}"/${P}-pointsprite-disable.patch
 	epatch "${FILESDIR}"/${P}-about.html.patch
+	epatch "${FILESDIR}"/${P}-boost-property_map.patch
+	epatch "${FILESDIR}"/${P}-odbc.patch
 
-	if use hdf5 && has_version '>=sci-libs/hdf5-1.8.0'; then
+	if has_version '>=sci-libs/hdf5-1.8.0'; then
 		epatch "${FILESDIR}"/${P}-hdf-1.8.3.patch
 	fi
 
@@ -101,6 +103,7 @@ src_configure() {
 	  -DVTK_USE_SYSTEM_TIFF=ON
 	  -DVTK_USE_SYSTEM_ZLIB=ON
 	  -DVTK_USE_SYSTEM_EXPAT=ON
+	  -DPARAVIEW_USE_SYSTEM_HDF5=ON
 	  -DCMAKE_VERBOSE_MAKEFILE=OFF
 	  -DCMAKE_COLOR_MAKEFILE=TRUE
 	  -DVTK_USE_SYSTEM_LIBXML2=ON
@@ -115,7 +118,6 @@ src_configure() {
 	  $(cmake-utils_use gui VTK_USE_QVTK)
 	  $(cmake-utils_use gui VTK_USE_QVTK_QTOPENGL)
 	  $(cmake-utils_use boost VTK_USE_BOOST)
-	  $(cmake-utils_use hdf5 PARAVIEW_USE_SYSTEM_HDF5)
 	  $(cmake-utils_use mpi PARAVIEW_USE_MPI)
 	  $(cmake-utils_use python PARAVIEW_ENABLE_PYTHON)
 	  $(cmake-utils_use doc BUILD_DOCUMENTATION)
@@ -178,9 +180,7 @@ src_configure() {
 
 	# we also need to append -DH5Tget_array_dims_vers=1 to our CFLAGS
 	# to make sure we can compile against >=hdf5-1.8.3
-	if use hdf5; then
-		append-flags -DH5_USE_16_API
-	fi
+	append-flags -DH5_USE_16_API
 
 	cmake-utils_src_configure
 	# overview needs a second configure to pick things up