[gentoo-commits] proj/sci:master commit in: sci-visualization/paraview/, sci-visualization/paraview/files/

[Francois Bissey]

commit:     aa300c09883d4ae22b9bfb411ccf782ce7f82d1c
Author:     François Bissey <francois.bissey <AT> canterbury <DOT> ac <DOT> nz>
AuthorDate: Fri Aug 31 10:37:05 2012 +0000
Commit:     Francois Bissey <f.r.bissey <AT> massey <DOT> ac <DOT> nz>
CommitDate: Fri Aug 31 10:37:05 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=aa300c09

unbundle netcdf from paraview

---
 sci-visualization/paraview/ChangeLog               |    7 ++
 .../paraview/files/paraview-3.14.1-vtknetcd.patch  |   75 ++++++++++++++++++++
 ...-3.14.1-r1.ebuild => paraview-3.14.1-r2.ebuild} |    3 +
 3 files changed, 85 insertions(+), 0 deletions(-)

diff --git a/sci-visualization/paraview/ChangeLog b/sci-visualization/paraview/ChangeLog
index 0c76587..67889a1 100644
--- a/sci-visualization/paraview/ChangeLog
+++ b/sci-visualization/paraview/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*paraview-3.14.1-r2 (31 Aug 2012)
+
+  31 Aug 2012; François Bissey <francois.bissey@×××××××××××××.nz>
+  -paraview-3.14.1-r1.ebuild, +paraview-3.14.1-r2.ebuild,
+  +files/paraview-3.14.1-vtknetcd.patch:
+  netcdf dealt with
+
 *paraview-3.14.1-r1 (30 Aug 2012)
 
   30 Aug 2012; François Bissey <francois.bissey@×××××××××××××.nz>

diff --git a/sci-visualization/paraview/files/paraview-3.14.1-vtknetcd.patch b/sci-visualization/paraview/files/paraview-3.14.1-vtknetcd.patch
new file mode 100644
index 0000000..eb40466
--- /dev/null
+++ b/sci-visualization/paraview/files/paraview-3.14.1-vtknetcd.patch
@@ -0,0 +1,75 @@
+--- Utilities/CMakeLists.txt.orig	2012-08-31 13:55:56.616827748 +1200
++++ Utilities/CMakeLists.txt	2012-08-31 13:56:43.487830247 +1200
+@@ -47,7 +47,7 @@
+ SET( verdict_INSTALL_LIB_DIR ${VTK_INSTALL_LIB_DIR_CM24})
+ ADD_SUBDIRECTORY(verdict)
+ 
+-ADD_SUBDIRECTORY(vtknetcdf)
++#ADD_SUBDIRECTORY(vtknetcdf)
+ IF(VTK_USE_METAIO)
+   SET(METAIO_FOR_VTK 1)
+   ADD_SUBDIRECTORY(vtkmetaio)
+--- Utilities/vtk_netcdf.h.orig	2012-08-31 13:57:25.704832693 +1200
++++ Utilities/vtk_netcdf.h	2012-08-31 13:57:59.823834877 +1200
+@@ -16,6 +16,6 @@
+ #define __vtk_netcdf_h
+ 
+ /* Use the netcdf library configured for VTK.  */
+-#include <vtknetcdf/include/netcdf.h>
++#include <netcdf.h>
+ 
+ #endif
+--- Utilities/vtk_netcdfcpp.h.orig	2012-08-31 13:58:48.800838210 +1200
++++ Utilities/vtk_netcdfcpp.h	2012-08-31 13:59:31.223841343 +1200
+@@ -16,6 +16,6 @@
+ #define __vtk_netcdfcpp_h
+ 
+ /* Use the netcdf library configured for VTK.  */
+-#include <vtknetcdf/cxx/netcdfcpp.h>
++#include <netcdfcpp.h>
+ 
+ #endif
+--- Utilities/vtkexodus2/CMakeLists.txt.orig	2012-08-31 14:01:26.536856845 +1200
++++ Utilities/vtkexodus2/CMakeLists.txt	2012-08-31 14:02:11.503872711 +1200
+@@ -241,7 +241,7 @@
+ 
+ 
+ VTK_ADD_LIBRARY(vtkexoIIc ${cbind_SRCS})
+-TARGET_LINK_LIBRARIES(vtkexoIIc vtkNetCDF)
++TARGET_LINK_LIBRARIES(vtkexoIIc netcdf)
+ 
+ # Apply user-defined properties to the library target.
+ IF(VTK_LIBRARY_PROPERTIES)
+--- Utilities/vtkexodus2/test/CMakeLists.txt.orig	2012-08-31 14:02:39.696882673 +1200
++++ Utilities/vtkexodus2/test/CMakeLists.txt	2012-08-31 14:02:59.743889790 +1200
+@@ -21,7 +21,7 @@
+   )
+ 
+ ADD_EXECUTABLE( ExoIICTests ${ExoIICTests} )
+-TARGET_LINK_LIBRARIES( ExoIICTests vtkCommon vtkexoIIc vtkNetCDF )
++TARGET_LINK_LIBRARIES( ExoIICTests vtkCommon vtkexoIIc netcdf )
+ 
+ SET( TestsToRun ${ExoIICTests} )
+ REMOVE( TestsToRun ExoIICTests.cxx )
+--- IO/CMakeLists.txt.orig	2012-08-31 14:05:00.657933170 +1200
++++ IO/CMakeLists.txt	2012-08-31 14:06:18.024961299 +1200
+@@ -18,7 +18,7 @@
+ SET(KIT_PYTHON_LIBS vtkFilteringPythonD)
+ SET(KIT_JAVA_LIBS vtkFilteringJava)
+ SET(KIT_INTERFACE_LIBRARIES vtkFiltering)
+-SET(KIT_LIBS vtkDICOMParser vtkNetCDF vtkNetCDF_cxx LSDyna
++SET(KIT_LIBS vtkDICOMParser netcdf netcdf_c++ LSDyna
+   ${_VTK_METAIO_LIB} sqlite3
+   ${VTK_PNG_LIBRARIES} ${VTK_ZLIB_LIBRARIES} ${VTK_JPEG_LIBRARIES}
+   ${VTK_TIFF_LIBRARIES} ${VTK_EXPAT_LIBRARIES} ${VTK_OGGTHEORA_LIBRARIES}
+--- vtkIncludeDirectories.cmake.orig	2012-08-31 15:36:06.599955661 +1200
++++ vtkIncludeDirectories.cmake	2012-08-31 15:37:35.759045094 +1200
+@@ -193,7 +193,7 @@
+ VTK_THIRD_PARTY_INCLUDE2(TIFF)
+ VTK_THIRD_PARTY_INCLUDE2(EXPAT)
+ VTK_THIRD_PARTY_INCLUDE2(LIBXML2)
+-VTK_THIRD_PARTY_INCLUDE(NETCDF vtknetcdf/include)
++#VTK_THIRD_PARTY_INCLUDE(NETCDF vtknetcdf/include)
+ VTK_THIRD_PARTY_INCLUDE2(Exodus2)
+ IF(VTK_USE_GL2PS)
+   VTK_THIRD_PARTY_INCLUDE2(GL2PS)

diff --git a/sci-visualization/paraview/paraview-3.14.1-r1.ebuild b/sci-visualization/paraview/paraview-3.14.1-r2.ebuild
similarity index 98%
rename from sci-visualization/paraview/paraview-3.14.1-r1.ebuild
rename to sci-visualization/paraview/paraview-3.14.1-r2.ebuild
index d916c53..30bbe33 100644
--- a/sci-visualization/paraview/paraview-3.14.1-r1.ebuild
+++ b/sci-visualization/paraview/paraview-3.14.1-r2.ebuild
@@ -23,6 +23,7 @@ SLOT="0"
 IUSE="boost cg -coprocessing doc examples +gui mpi mysql nvcontrol +plugins +python webkit ffmpeg theora"
 
 RDEPEND="
+	~sci-libs/netcdf-4.1.3[cxx,hdf5]
 	sci-libs/hdf5[mpi=]
 	mpi? ( virtual/mpi[cxx,romio] )
 	gui? (
@@ -108,6 +109,8 @@ src_prepare() {
 	epatch "${FILESDIR}"/vtk-5.6.1-libav-0.8.patch
 	# debian patch for recent boost should work with 1.48 too
 	epatch "${FILESDIR}"/vtk-boost1.49.patch
+	# adapted from debian patch need to be applied after paraview-3.14.1-removesqlite.patch
+	epatch "${FILESDIR}"/${PN}-3.14.1-vtknetcd.patch
 }
 
 src_configure() {