public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/sci:master commit in: sci-visualization/paraview/, sci-visualization/paraview/files/
@ 2011-08-24  9:46 Kacper Kowalik
  0 siblings, 0 replies; 7+ messages in thread
From: Kacper Kowalik @ 2011-08-24  9:46 UTC (permalink / raw
  To: gentoo-commits

commit:     f65e1c8f0b3b11959e1bbd9d8fa6114e2fc0c263
Author:     Kacper Kowalik (Xarthisius) <xarthisius.kk <AT> gmail <DOT> com>
AuthorDate: Wed Aug 24 09:46:09 2011 +0000
Commit:     Kacper Kowalik <xarthisius <AT> gentoo <DOT> org>
CommitDate: Wed Aug 24 09:46:09 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=f65e1c8f

[sci-visualization/paraview] Drop old, fix building with gcc-4.6, add missing dependency on PyQt4

---
 sci-visualization/paraview/ChangeLog               |    4 +
 .../paraview/files/paraview-3.10.1-gcc46.patch     |   20 ++
 sci-visualization/paraview/paraview-3.10.1.ebuild  |   17 +-
 sci-visualization/paraview/paraview-3.8.1.ebuild   |  200 --------------------
 4 files changed, 35 insertions(+), 206 deletions(-)

diff --git a/sci-visualization/paraview/ChangeLog b/sci-visualization/paraview/ChangeLog
index 43e3d2d..58f3331 100644
--- a/sci-visualization/paraview/ChangeLog
+++ b/sci-visualization/paraview/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  24 Aug 2011; Kacper Kowalik <xarthisius@gentoo.org> -paraview-3.8.1.ebuild,
+  paraview-3.10.1.ebuild, +files/paraview-3.10.1-gcc46.patch:
+  Drop old, fix building with gcc-4.6, add missing dependency on PyQt4
+
 *paraview-3.10.1 (16 Jun 2011)
 
   16 Jun 2011; François Bissey <francois.bissey@canterbury.ac.nz>

diff --git a/sci-visualization/paraview/files/paraview-3.10.1-gcc46.patch b/sci-visualization/paraview/files/paraview-3.10.1-gcc46.patch
new file mode 100644
index 0000000..20be721
--- /dev/null
+++ b/sci-visualization/paraview/files/paraview-3.10.1-gcc46.patch
@@ -0,0 +1,20 @@
+--- a/VTK/Utilities/vtkmetaio/metaUtils.cxx
++++ b/VTK/Utilities/vtkmetaio/metaUtils.cxx
+@@ -29,6 +29,7 @@
+ #include <arpa/inet.h>
+ #endif
+ 
++#include <stddef.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #include <string>
+--- a/VTK/Wrapping/Python/PyVTKObject.cxx
++++ b/VTK/Wrapping/Python/PyVTKObject.cxx
+@@ -33,6 +33,7 @@
+ #include "vtkObjectBase.h"
+ #include "vtkDataArray.h"
+ 
++#include <vtksys/cstddef>
+ #include <vtksys/ios/sstream>
+ 
+ //--------------------------------------------------------------------

diff --git a/sci-visualization/paraview/paraview-3.10.1.ebuild b/sci-visualization/paraview/paraview-3.10.1.ebuild
index f17fcfc..4dd9f3a 100644
--- a/sci-visualization/paraview/paraview-3.10.1.ebuild
+++ b/sci-visualization/paraview/paraview-3.10.1.ebuild
@@ -40,7 +40,10 @@ RDEPEND="
 		webkit? ( x11-libs/qt-webkit:4 ) )
 	mysql? ( virtual/mysql )
 	coprocessing? ( plugins? ( x11-libs/qt-gui:4 ) )
-	python? ( dev-python/sip )
+	python? ( 
+		dev-python/sip
+		dev-python/PyQt4
+	)
 	dev-libs/libxml2:2
 	media-libs/libpng
 	virtual/jpeg
@@ -72,12 +75,14 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-3.8.0-pointsprite-example-install.patch
 	# mpi + hdf5 fix
 	#epatch "${FILESDIR}"/${PN}-3.8.0-h5part.patch
+	# gcc fix for vtk
+	epatch "${FILESDIR}"/${P}-gcc46.patch
 
 	# lib64 fixes
 	sed -i "s:/usr/lib:/usr/$(get_libdir):g" \
-		Utilities/Xdmf2/libsrc/CMakeLists.txt || die "sed failed"
+		Utilities/Xdmf2/libsrc/CMakeLists.txt || die
 	sed -i "s:\/lib\/python:\/$(get_libdir)\/python:g" \
-		Utilities/Xdmf2/CMake/setup_install_paths.py || die "sed failed"
+		Utilities/Xdmf2/CMake/setup_install_paths.py || die
 
 	# Install internal vtk binaries inside /usr/${PVLIBDIR}
 	sed -e 's:VTK_INSTALL_BIN_DIR \"/${PV_INSTALL_BIN_DIR}\":VTK_INSTALL_BIN_DIR \"/${PV_INSTALL_LIB_DIR}\":' \
@@ -95,7 +100,7 @@ src_configure() {
 	mycmakeargs=(
 		-DPV_INSTALL_LIB_DIR="${PVLIBDIR}"
 		-DCMAKE_INSTALL_PREFIX=/usr
-		-DPV_INSTALL_DOC_DIR="/usr/share/doc/${P}"
+		-DPV_INSTALL_DOC_DIR="/usr/share/doc/${PF}"
 		-DEXPAT_INCLUDE_DIR=/usr/include
 		-DEXPAT_LIBRARY=/usr/$(get_libdir)/libexpat.so
 		-DOPENGL_gl_LIBRARY=/usr/$(get_libdir)/libGL.so
@@ -110,7 +115,7 @@ src_configure() {
 		-DVTK_USE_SYSTEM_ZLIB=ON
 		-DVTK_USE_SYSTEM_EXPAT=ON
 		-DPARAVIEW_USE_SYSTEM_HDF5=ON
-		-DCMAKE_VERBOSE_MAKEFILE=OFF
+		-DCMAKE_VERBOSE_MAKEFILE=ON
 		-DCMAKE_COLOR_MAKEFILE=TRUE
 		-DVTK_USE_SYSTEM_LIBXML2=ON
 		-DVTK_USE_OFFSCREEN=TRUE
@@ -138,7 +143,7 @@ src_configure() {
 		$(cmake-utils_use mysql XDMF_USE_MYSQL)
 		$(cmake-utils_use coprocessing PARAVIEW_ENABLE_COPROCESSING))
 
-	if ( use  gui  || use adaptive ); then
+	if ( use gui || use adaptive ); then
 		mycmakeargs+=(-DVTK_INSTALL_QT_DIR=/${PVLIBDIR}/plugins/designer
 			$(cmake-utils_use webkit VTK_QT_USE_WEBKIT))
 		if use python ; then

diff --git a/sci-visualization/paraview/paraview-3.8.1.ebuild b/sci-visualization/paraview/paraview-3.8.1.ebuild
deleted file mode 100644
index 5057b42..0000000
--- a/sci-visualization/paraview/paraview-3.8.1.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=2
-
-PYTHON_DEPEND="python? 2:2.6"
-
-inherit cmake-utils eutils flag-o-matic multilib python qt4-r2 toolchain-funcs versionator
-
-MAIN_PV=$(get_major_version)
-MAJOR_PV=$(get_version_component_range 1-2)
-MY_P="ParaView-${PV}"
-
-DESCRIPTION="ParaView is a powerful scientific data visualization application"
-HOMEPAGE="http://www.paraview.org"
-SRC_URI="http://www.paraview.org/files/v3.8/${MY_P}.tar.gz"
-RESTRICT="mirror"
-
-LICENSE="paraview GPL-2"
-KEYWORDS="~x86 ~amd64"
-SLOT="0"
-IUSE="adaptive cg -coprocessing doc examples +gui mpi mysql plugins +python streaming"
-
-RDEPEND="
-	sci-libs/hdf5[mpi=]
-	mpi? ( virtual/mpi[cxx,romio] )
-	gui? (
-		x11-libs/qt-gui:4
-		x11-libs/qt-qt3support:4
-		x11-libs/qt-opengl:4
-		|| ( >=x11-libs/qt-assistant-4.7.0:4[compat] <x11-libs/qt-assistant-4.7.0:4 )
-		x11-libs/qt-sql:4 )
-	adaptive? (
-		x11-libs/qt-gui:4
-		x11-libs/qt-qt3support:4
-		x11-libs/qt-opengl:4
-		x11-libs/qt-assistant:4 )
-	mysql? ( virtual/mysql )
-	coprocessing? ( plugins? ( x11-libs/qt-gui:4 ) )
-	dev-libs/libxml2:2
-	media-libs/libpng
-	virtual/jpeg
-	media-libs/tiff
-	dev-libs/expat
-	sys-libs/zlib
-	media-libs/freetype
-	>=app-admin/eselect-opengl-1.0.6-r1
-	virtual/opengl
-	sci-libs/netcdf
-	x11-libs/libXmu"
-DEPEND="${RDEPEND}
-		doc? ( app-doc/doxygen )
-		>=dev-util/cmake-2.6.4"
-
-PVLIBDIR=$(get_libdir)/${PN}-${MAJOR_PV}
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	use python && python_set_active_version 2
-}
-
-src_prepare() {
-	# gcc header fix
-	epatch "${FILESDIR}"/${PN}-3.8.0-xdmf-cstring.patch
-	# disable automatic byte compiling that act directly on the live system
-	epatch "${FILESDIR}"/${PN}-3.8.0-xdmf-bc.patch
-	# Install properly pointspritedemo without duplicate DESTDIR
-	epatch "${FILESDIR}"/${PN}-3.8.0-pointsprite-example-install.patch
-	# mpi + hdf5 fix
-	epatch "${FILESDIR}"/${PN}-3.8.0-h5part.patch
-
-	# lib64 fixes
-	sed -i "s:/usr/lib:/usr/$(get_libdir):g" \
-		Utilities/Xdmf2/libsrc/CMakeLists.txt || die "sed failed"
-	sed -i "s:\/lib\/python:\/$(get_libdir)\/python:g" \
-		Utilities/Xdmf2/CMake/setup_install_paths.py || die "sed failed"
-
-	# Install internal vtk binaries inside /usr/${PVLIBDIR}
-	sed -e 's:VTK_INSTALL_BIN_DIR \"/${PV_INSTALL_BIN_DIR}\":VTK_INSTALL_BIN_DIR \"/${PV_INSTALL_LIB_DIR}\":' \
-		-i CMake/ParaViewCommon.cmake || die "failed to patch vtk install location"
-
-	cd VTK
-	epatch "${FILESDIR}"/vtk-5.6.0-cg-path.patch
-	epatch "${FILESDIR}"/vtk-5.6.0-libpng14.patch
-	# Fix sure buffer overflow on some processors as reported by Flameyes in #338819
-	sed -e "s:CHIPNAME_STRING_LENGTH    (48 + 1):CHIPNAME_STRING_LENGTH    (79 + 1):" \
-		-i Utilities/kwsys/SystemInformation.cxx \
-		|| die "Failed to fix SystemInformation.cxx buffer overflow"
-	# Patch FindPythonLibs.cmake for python-2.7, removing it does more harm than good.
-	sed -e "s:2.6 2.5 2.4 2.3 2.2 2.1 2.0:2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0:" \
-		-i CMake/FindPythonLibs.cmake || die "failed to patch for python 2.7"
-}
-
-src_configure() {
-	mycmakeargs=(
-		-DPV_INSTALL_LIB_DIR="${PVLIBDIR}"
-		-DCMAKE_INSTALL_PREFIX=/usr
-		-DPV_INSTALL_DOC_DIR="/usr/share/doc/${P}"
-		-DEXPAT_INCLUDE_DIR=/usr/include
-		-DEXPAT_LIBRARY=/usr/$(get_libdir)/libexpat.so
-		-DOPENGL_gl_LIBRARY=/usr/$(get_libdir)/libGL.so
-		-DOPENGL_glu_LIBRARY=/usr/$(get_libdir)/libGLU.so
-		-DCMAKE_SKIP_RPATH=YES
-		-DVTK_USE_RPATH=OFF
-		-DBUILD_SHARED_LIBS=ON
-		-DVTK_USE_SYSTEM_FREETYPE=ON
-		-DVTK_USE_SYSTEM_JPEG=ON
-		-DVTK_USE_SYSTEM_PNG=ON
-		-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
-		-DVTK_USE_OFFSCREEN=TRUE
-		-DCMAKE_USE_PTHREADS=ON
-		-DBUILD_TESTING=OFF
-		-DVTK_USE_FFMPEG_ENCODER=OFF
-		-DPARAVIEW_INSTALL_THIRD_PARTY_LIBRARIES=OFF)
-
-	# use flag triggered options
-	mycmakeargs+=(
-		$(cmake-utils_use gui PARAVIEW_BUILD_QT_GUI)
-		$(cmake-utils_use gui VTK_USE_QVTK)
-		$(cmake-utils_use gui VTK_USE_QVTK_QTOPENGL)
-		$(cmake-utils_use mpi PARAVIEW_USE_MPI)
-		$(cmake-utils_use python PARAVIEW_ENABLE_PYTHON)
-		$(cmake-utils_use python XDMF_WRAP_PYTHON)
-		$(cmake-utils_use doc BUILD_DOCUMENTATION)
-		$(cmake-utils_use examples BUILD_EXAMPLES)
-		$(cmake-utils_use cg VTK_USE_CG_SHADERS)
-		$(cmake-utils_use adaptive PARAVIEW_BUILD_AdaptiveParaView)
-		$(cmake-utils_use streaming PARAVIEW_BUILD_StreamingParaView)
-		$(cmake-utils_use mysql XDMF_USE_MYSQL)
-		$(cmake-utils_use coprocessing PARAVIEW_ENABLE_COPROCESSING) )
-
-	if use gui; then
-		mycmakeargs+=(-DVTK_INSTALL_QT_DIR=/${PVLIBDIR}/plugins/designer)
-	fi
-
-	# the rest of the plugins
-	mycmakeargs+=(
-		$(cmake-utils_use plugins PARAVIEW_INSTALL_DEVELOPMENT)
-		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_ClientChartView)
-		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_CosmoFilters)
-		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_H5PartReader)
-		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_Moments)
-		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_PointSprite)
-		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_Prism)
-		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_SLACTools)
-		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_AnalyzeNIfTIReaderWriter)
-		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_SurfaceLIC))
-
-	if use python; then
-		mycmakeargs+=($(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_pvblot))
-	fi
-
-	if use coprocessing; then
-		mycmakeargs+=($(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_CoProcessingScriptGenerator))
-	fi
-
-	# ParaView actually ship hdf5-1.6.2 and uses its API.
-	append-flags -DH5_USE_16_API -DH5_USE_16_API_DEFAULT
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# set up the environment
-	echo "LDPATH=/usr/${PVLIBDIR}" >> "${T}"/40${PN}
-	echo "PYTHONPATH=/usr/${PVLIBDIR}:/usr/${PVLIBDIR}/site-packages" >> "${T}"/40${PN}
-	doenvd "${T}"/40${PN}
-
-	# last but not least lets make a desktop entry
-	newicon "${S}"/Applications/ParaView/pvIcon.png paraview.png \
-		|| die "Failed to create paraview icon."
-	make_desktop_entry paraview "Paraview" paraview \
-		|| die "Failed to install Paraview desktop entry"
-
-}
-
-pkg_postinst() {
-	# with Qt4.5 there seem to be issues reading data files
-	# under certain locales. Setting LC_ALL=C should fix these.
-	echo
-	elog "If you experience data corruption during parsing of"
-	elog "data files with paraview please try setting your"
-	elog "locale to LC_ALL=C."
-	echo
-}
-
-pkg_postrm() {
-	if use python ; then
-		python_mod_cleanup /usr/$(get_libdir)/"${PN}-${MAJOR_PV}"/site-packages
-	fi
-}



^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-visualization/paraview/, sci-visualization/paraview/files/
@ 2012-02-08  1:15 Francois Bissey
  0 siblings, 0 replies; 7+ messages in thread
From: Francois Bissey @ 2012-02-08  1:15 UTC (permalink / raw
  To: gentoo-commits

commit:     31468e24e9f3e312b3251b4e240f9e5883ccdbac
Author:     François Bissey <francois.bissey <AT> canterbury <DOT> ac <DOT> nz>
AuthorDate: Tue Feb  7 03:00:41 2012 +0000
Commit:     Francois Bissey <f.r.bissey <AT> massey <DOT> ac <DOT> nz>
CommitDate: Wed Feb  8 01:15:09 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=31468e24

Paraview 3.12.0 is in. ugly right now will shape it a bit better.

(Portage version: 2.2.0_alpha85/git/Linux x86_64, unsigned Manifest commit)

---
 sci-visualization/paraview/ChangeLog               |    9 +-
 .../paraview/files/paraview-3.12.0-gcc46.patch     |   10 +
 .../paraview/files/paraview-3.12.0-protobuf.patch  |   23 ++
 sci-visualization/paraview/paraview-3.12.0.ebuild  |  219 ++++++++++++++++++++
 4 files changed, 260 insertions(+), 1 deletions(-)

diff --git a/sci-visualization/paraview/ChangeLog b/sci-visualization/paraview/ChangeLog
index 58f3331..8a71db8 100644
--- a/sci-visualization/paraview/ChangeLog
+++ b/sci-visualization/paraview/ChangeLog
@@ -1,7 +1,14 @@
 # ChangeLog for sci-visualization/paraview
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*paraview-3.12.0 (07 Feb 2012)
+
+  07 Feb 2012; François Bissey <francois.bissey@canterbury.ac.nz>
+  +paraview-3.12.0.ebuild, +files/paraview-3.12.0-gcc46.patch,
+  +files/paraview-3.12.0-protobuf.patch:
+  introducing paraview-3.12.0
+
   24 Aug 2011; Kacper Kowalik <xarthisius@gentoo.org> -paraview-3.8.1.ebuild,
   paraview-3.10.1.ebuild, +files/paraview-3.10.1-gcc46.patch:
   Drop old, fix building with gcc-4.6, add missing dependency on PyQt4

diff --git a/sci-visualization/paraview/files/paraview-3.12.0-gcc46.patch b/sci-visualization/paraview/files/paraview-3.12.0-gcc46.patch
new file mode 100644
index 0000000..15ff5d0
--- /dev/null
+++ b/sci-visualization/paraview/files/paraview-3.12.0-gcc46.patch
@@ -0,0 +1,10 @@
+--- a/VTK/Utilities/vtkmetaio/metaUtils.cxx
++++ b/VTK/Utilities/vtkmetaio/metaUtils.cxx
+@@ -29,6 +29,7 @@
+ #include <arpa/inet.h>
+ #endif
+ 
++#include <stddef.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #include <string>

diff --git a/sci-visualization/paraview/files/paraview-3.12.0-protobuf.patch b/sci-visualization/paraview/files/paraview-3.12.0-protobuf.patch
new file mode 100644
index 0000000..a724e1b
--- /dev/null
+++ b/sci-visualization/paraview/files/paraview-3.12.0-protobuf.patch
@@ -0,0 +1,23 @@
+--- CMake/ParaViewCommon.cmake.orig	2012-02-03 15:31:08.531644115 +1300
++++ CMake/ParaViewCommon.cmake	2012-02-03 15:30:36.420633741 +1300
+@@ -526,13 +526,13 @@
+ 
+ #########################################################################
+ # Configure protobuf
+-SET (PROTOBUF_INSTALL_BIN_DIR ${PV_INSTALL_BIN_DIR})
+-SET (PROTOBUF_INSTALL_LIB_DIR ${PV_INSTALL_LIB_DIR})
+-SET (PROTOBUF_INSTALL_EXPORT_NAME ${PV_INSTALL_EXPORT_NAME})
+-IF (NOT PV_INSTALL_NO_LIBRARIES)
+-  SET_PROPERTY(GLOBAL APPEND PROPERTY VTK_TARGETS protobuf)
+-ENDIF (NOT PV_INSTALL_NO_LIBRARIES)
+-ADD_SUBDIRECTORY(Utilities/protobuf)
++# SET (PROTOBUF_INSTALL_BIN_DIR ${PV_INSTALL_BIN_DIR})
++# SET (PROTOBUF_INSTALL_LIB_DIR ${PV_INSTALL_LIB_DIR})
++# SET (PROTOBUF_INSTALL_EXPORT_NAME ${PV_INSTALL_EXPORT_NAME})
++# IF (NOT PV_INSTALL_NO_LIBRARIES)
++#   SET_PROPERTY(GLOBAL APPEND PROPERTY VTK_TARGETS protobuf)
++# ENDIF (NOT PV_INSTALL_NO_LIBRARIES)
++# ADD_SUBDIRECTORY(Utilities/protobuf)
+ 
+ #########################################################################
+ # Configure mpeg2 encoding

diff --git a/sci-visualization/paraview/paraview-3.12.0.ebuild b/sci-visualization/paraview/paraview-3.12.0.ebuild
new file mode 100644
index 0000000..fbc6984
--- /dev/null
+++ b/sci-visualization/paraview/paraview-3.12.0.ebuild
@@ -0,0 +1,219 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=2
+
+PYTHON_DEPEND="python? 2:2.6"
+
+inherit cmake-utils eutils flag-o-matic multilib python qt4-r2 toolchain-funcs versionator
+
+MAIN_PV=$(get_major_version)
+MAJOR_PV=$(get_version_component_range 1-2)
+MY_P="ParaView-${PV}"
+
+DESCRIPTION="ParaView is a powerful scientific data visualization application"
+HOMEPAGE="http://www.paraview.org"
+SRC_URI="http://www.paraview.org/files/v${MAJOR_PV}/${MY_P}.tar.gz"
+RESTRICT="mirror"
+
+LICENSE="paraview GPL-2"
+KEYWORDS="~x86 ~amd64"
+SLOT="0"
+IUSE="adaptive cg -coprocessing doc examples +gui mpi mysql nvcontrol plugins +python streaming webkit"
+
+RDEPEND="
+	sci-libs/hdf5[mpi=]
+	mpi? ( virtual/mpi[cxx,romio] )
+	gui? (
+		x11-libs/qt-gui:4
+		x11-libs/qt-qt3support:4
+		x11-libs/qt-opengl:4
+		|| ( >=x11-libs/qt-assistant-4.7.0:4[compat] <x11-libs/qt-assistant-4.7.0:4 )
+		x11-libs/qt-sql:4
+		webkit? ( x11-libs/qt-webkit:4 ) )
+	adaptive? (
+		x11-libs/qt-gui:4
+		x11-libs/qt-qt3support:4
+		x11-libs/qt-opengl:4
+		x11-libs/qt-assistant:4
+		webkit? ( x11-libs/qt-webkit:4 ) )
+	mysql? ( virtual/mysql )
+	coprocessing? ( plugins? ( x11-libs/qt-gui:4 ) )
+	python? (
+		dev-python/sip
+		dev-python/PyQt4
+	)
+	dev-libs/libxml2:2
+	media-libs/libpng
+	virtual/jpeg
+	media-libs/tiff
+	dev-libs/expat
+	sys-libs/zlib
+	media-libs/freetype
+	>=app-admin/eselect-opengl-1.0.6-r1
+	virtual/opengl
+	sci-libs/netcdf
+	x11-libs/libXmu"
+DEPEND="${RDEPEND}
+		doc? ( app-doc/doxygen )
+		dev-libs/protobuf
+		>=dev-util/cmake-2.6.4"
+
+PVLIBDIR=$(get_libdir)/${PN}-${MAJOR_PV}
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	use python && python_set_active_version 2
+}
+
+src_prepare() {
+	# gcc header fix
+	epatch "${FILESDIR}"/${PN}-3.8.0-xdmf-cstring.patch
+	# disable automatic byte compiling that act directly on the live system
+	epatch "${FILESDIR}"/${PN}-3.8.0-xdmf-bc.patch
+	# mpi + hdf5 fix
+	#epatch "${FILESDIR}"/${PN}-3.8.0-h5part.patch
+	# gcc fix for vtk
+	epatch "${FILESDIR}"/${P}-gcc46.patch
+
+	epatch "${FILESDIR}"/${P}-protobuf.patch
+
+	# lib64 fixes
+	sed -i "s:/usr/lib:${EPREFIX}/usr/$(get_libdir):g" \
+		Utilities/Xdmf2/libsrc/CMakeLists.txt || die
+	sed -i "s:\/lib\/python:\/$(get_libdir)\/python:g" \
+		Utilities/Xdmf2/CMake/setup_install_paths.py || die
+
+	# Install internal vtk binaries inside /usr/${PVLIBDIR}
+	sed -e 's:VTK_INSTALL_BIN_DIR \"/${PV_INSTALL_BIN_DIR}\":VTK_INSTALL_BIN_DIR \"/${PV_INSTALL_LIB_DIR}\":' \
+		-i CMake/ParaViewCommon.cmake || die "failed to patch vtk install location"
+	sed -e "s:get_target_property(PROTOC_LOCATION protoc_compiler LOCATION):SET(PROTOC_LOCATION \${SYSTEM_PB}):" \
+		-e "s:protoc_compiler::" \
+		-i ParaViewCore/ServerImplementation/CMakeLists.txt
+	sed -i "s:DEPENDS \${in_proto_file} protoc_compiler:DEPENDS \${in_proto_file}:" \
+		CMake/ParaViewMacros.cmake
+
+	cd VTK
+	epatch "${FILESDIR}"/vtk-5.6.0-cg-path.patch
+}
+
+src_configure() {
+	mycmakeargs=(
+		-DPV_INSTALL_LIB_DIR="${PVLIBDIR}"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
+		-DPV_INSTALL_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
+		-DEXPAT_INCLUDE_DIR="${EPREFIX}"/usr/include
+		-DEXPAT_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libexpat.so
+		-DOPENGL_gl_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libGL.so
+		-DOPENGL_glu_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libGLU.so
+		-DCMAKE_SKIP_RPATH=YES
+		-DVTK_USE_RPATH=OFF
+		-DBUILD_SHARED_LIBS=ON
+		-DVTK_USE_SYSTEM_FREETYPE=ON
+		-DVTK_USE_SYSTEM_JPEG=ON
+		-DVTK_USE_SYSTEM_PNG=ON
+		-DVTK_USE_SYSTEM_TIFF=ON
+		-DVTK_USE_SYSTEM_ZLIB=ON
+		-DVTK_USE_SYSTEM_EXPAT=ON
+		-DPARAVIEW_USE_SYSTEM_HDF5=ON
+		-DCMAKE_VERBOSE_MAKEFILE=ON
+		-DCMAKE_COLOR_MAKEFILE=TRUE
+		-DVTK_USE_SYSTEM_LIBXML2=ON
+		-DVTK_USE_OFFSCREEN=TRUE
+		-DCMAKE_USE_PTHREADS=ON
+		-DBUILD_TESTING=OFF
+		-DVTK_USE_FFMPEG_ENCODER=OFF
+		-DPARAVIEW_INSTALL_THIRD_PARTY_LIBRARIES=OFF
+		-DSYSTEM_PB=$(which protoc))
+
+	# use flag triggered options
+	mycmakeargs+=(
+		$(cmake-utils_use gui PARAVIEW_BUILD_QT_GUI)
+		$(cmake-utils_use gui VTK_USE_QVTK)
+		$(cmake-utils_use gui VTK_USE_QVTK_QTOPENGL)
+		$(cmake-utils_use mpi PARAVIEW_USE_MPI)
+		$(cmake-utils_use mpi PARAVIEW_USE_MPI_SSEND)
+		$(cmake-utils_use python PARAVIEW_ENABLE_PYTHON)
+		$(cmake-utils_use python VTK_WRAP_PYTHON_SIP)
+		$(cmake-utils_use python XDMF_WRAP_PYTHON)
+		$(cmake-utils_use doc BUILD_DOCUMENTATION)
+		$(cmake-utils_use examples BUILD_EXAMPLES)
+		$(cmake-utils_use cg VTK_USE_CG_SHADERS)
+		$(cmake-utils_use nvcontrol VTK_USE_NVCONTROL)
+		$(cmake-utils_use adaptive PARAVIEW_BUILD_AdaptiveParaView)
+		$(cmake-utils_use streaming PARAVIEW_BUILD_StreamingParaView)
+		$(cmake-utils_use mysql XDMF_USE_MYSQL)
+		$(cmake-utils_use coprocessing PARAVIEW_ENABLE_COPROCESSING))
+
+	if ( use gui || use adaptive ); then
+		mycmakeargs+=(-DVTK_INSTALL_QT_DIR=/${PVLIBDIR}/plugins/designer
+			$(cmake-utils_use webkit VTK_QT_USE_WEBKIT))
+		if use python ; then
+			# paraview cannot guess sip directory right probably because a path is not propagated properly
+			mycmakeargs+=(
+				-DSIP_PYQT_DIR="${EPREFIX}/usr/share/sip"
+				-DSIP_INCLUDE_DIR="${EPREFIX}$(python_get_includedir)")
+		fi
+	fi
+
+	# the rest of the plugins
+	mycmakeargs+=(
+		$(cmake-utils_use plugins PARAVIEW_INSTALL_DEVELOPMENT)
+		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_ClientChartView)
+		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_CosmoFilters)
+		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_H5PartReader)
+		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_Moments)
+		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_PointSprite)
+		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_Prism)
+		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_SLACTools)
+		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_AnalyzeNIfTIReaderWriter)
+		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_SurfaceLIC)
+		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_EyeDomeLighting)
+		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_ForceTime)
+		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_SierraPlotTools)
+		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_StreamingView)
+		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_VisTrailPlugin))
+
+	if use python; then
+		mycmakeargs+=($(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_pvblot))
+	fi
+
+	if use coprocessing; then
+		mycmakeargs+=($(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_CoProcessingScriptGenerator))
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# set up the environment
+	echo "LDPATH=${EPREFIX}/usr/${PVLIBDIR}" >> "${T}"/40${PN}
+	echo "PYTHONPATH="${EPREFIX}"/usr/${PVLIBDIR}:/usr/${PVLIBDIR}/site-packages" >> "${T}"/40${PN}
+	doenvd "${T}"/40${PN}
+
+	# last but not least lets make a desktop entry
+	newicon "${S}"/Applications/ParaView/pvIcon.png paraview.png \
+		|| die "Failed to create paraview icon."
+	make_desktop_entry paraview "Paraview" paraview \
+		|| die "Failed to install Paraview desktop entry"
+
+}
+
+pkg_postinst() {
+	# with Qt4.5 there seem to be issues reading data files
+	# under certain locales. Setting LC_ALL=C should fix these.
+	echo
+	elog "If you experience data corruption during parsing of"
+	elog "data files with paraview please try setting your"
+	elog "locale to LC_ALL=C."
+	echo
+}
+
+pkg_postrm() {
+	if use python ; then
+		python_mod_cleanup "${EPREFIX}"/usr/$(get_libdir)/"${PN}-${MAJOR_PV}"/site-packages
+	fi
+}



^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-visualization/paraview/, sci-visualization/paraview/files/
@ 2012-02-09  0:22 Francois Bissey
  0 siblings, 0 replies; 7+ messages in thread
From: Francois Bissey @ 2012-02-09  0:22 UTC (permalink / raw
  To: gentoo-commits

commit:     ea9f184fd9aab283ca255f6e663b2b18e778d107
Author:     François Bissey <francois.bissey <AT> canterbury <DOT> ac <DOT> nz>
AuthorDate: Thu Feb  9 00:20:43 2012 +0000
Commit:     Francois Bissey <f.r.bissey <AT> massey <DOT> ac <DOT> nz>
CommitDate: Thu Feb  9 00:21:59 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=ea9f184f

some clean up in paraview 3.12.0

(Portage version: 2.2.0_alpha85/git/Linux x86_64, unsigned Manifest commit)

---
 sci-visualization/paraview/ChangeLog               |    4 ++
 .../paraview/files/paraview-3.12.0-protobuf.patch  |   30 ++++++++++++++++++++
 sci-visualization/paraview/paraview-3.12.0.ebuild  |    9 +----
 3 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/sci-visualization/paraview/ChangeLog b/sci-visualization/paraview/ChangeLog
index 8a71db8..85732fb 100644
--- a/sci-visualization/paraview/ChangeLog
+++ b/sci-visualization/paraview/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  09 Feb 2012; François Bissey <francois.bissey@canterbury.ac.nz>
+  paraview-3.12.0.ebuild, files/paraview-3.12.0-protobuf.patch:
+  clean up protobuf mess, go to EAPI 3 (for python QA)
+
 *paraview-3.12.0 (07 Feb 2012)
 
   07 Feb 2012; François Bissey <francois.bissey@canterbury.ac.nz>

diff --git a/sci-visualization/paraview/files/paraview-3.12.0-protobuf.patch b/sci-visualization/paraview/files/paraview-3.12.0-protobuf.patch
index a724e1b..fe8f4b4 100644
--- a/sci-visualization/paraview/files/paraview-3.12.0-protobuf.patch
+++ b/sci-visualization/paraview/files/paraview-3.12.0-protobuf.patch
@@ -21,3 +21,33 @@
  
  #########################################################################
  # Configure mpeg2 encoding
+--- CMake/ParaViewMacros.cmake.orig	2012-02-09 13:12:07.518350208 +1300
++++ CMake/ParaViewMacros.cmake	2012-02-09 13:12:16.863356368 +1300
+@@ -214,6 +214,6 @@
+     COMMAND protoc_compiler
+       --cpp_out=dllexport_decl=VTK_PROTOBUF_EXPORT:${CMAKE_CURRENT_BINARY_DIR}
+       --proto_path ${path} ${absolute}
+-    DEPENDS ${in_proto_file} protoc_compiler
++    DEPENDS ${in_proto_file}
+   )
+ ENDFUNCTION (protobuf_generate)
+--- ParaViewCore/ServerImplementation/CMakeLists.txt.orig	2012-02-09 13:14:15.230434986 +1300
++++ ParaViewCore/ServerImplementation/CMakeLists.txt	2012-02-09 13:15:04.214467797 +1300
+@@ -86,7 +86,7 @@
+ #------------------------------------------------------------------------------
+ # Compile protobuf resources.
+ # run it from a script so we can set necessary paths.
+-get_target_property(PROTOC_LOCATION protoc_compiler LOCATION)
++SET(PROTOC_LOCATION ${SYSTEM_PB})
+ if (WIN32)
+   get_filename_component(PROTOC_DIR ${PROTOC_LOCATION} PATH)
+   get_filename_component(PROTOC_PDIR ${PROTOC_DIR} PATH)
+@@ -101,7 +101,7 @@
+            ${CMAKE_CURRENT_BINARY_DIR}/vtkPVMessage.pb.cc
+     COMMAND ${CMAKE_COMMAND}
+     ARGS    -DOutDir=${CMAKE_CFG_INTDIR} -P ${CMAKE_CURRENT_BINARY_DIR}/ExecuteProtoC.cmake
+-    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/Resources/vtkPVMessage.proto protoc_compiler ${ParaView_CMAKE_DIR}/ExecuteProtoC.cmake.in
++    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/Resources/vtkPVMessage.proto ${ParaView_CMAKE_DIR}/ExecuteProtoC.cmake.in
+     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+ )
+ 

diff --git a/sci-visualization/paraview/paraview-3.12.0.ebuild b/sci-visualization/paraview/paraview-3.12.0.ebuild
index fbc6984..8f59eff 100644
--- a/sci-visualization/paraview/paraview-3.12.0.ebuild
+++ b/sci-visualization/paraview/paraview-3.12.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=2
+EAPI=3
 
 PYTHON_DEPEND="python? 2:2.6"
 
@@ -76,7 +76,7 @@ src_prepare() {
 	#epatch "${FILESDIR}"/${PN}-3.8.0-h5part.patch
 	# gcc fix for vtk
 	epatch "${FILESDIR}"/${P}-gcc46.patch
-
+	# use system provided protobuf and avoid http://paraview.org/Bug/view.php?id=12852
 	epatch "${FILESDIR}"/${P}-protobuf.patch
 
 	# lib64 fixes
@@ -88,11 +88,6 @@ src_prepare() {
 	# Install internal vtk binaries inside /usr/${PVLIBDIR}
 	sed -e 's:VTK_INSTALL_BIN_DIR \"/${PV_INSTALL_BIN_DIR}\":VTK_INSTALL_BIN_DIR \"/${PV_INSTALL_LIB_DIR}\":' \
 		-i CMake/ParaViewCommon.cmake || die "failed to patch vtk install location"
-	sed -e "s:get_target_property(PROTOC_LOCATION protoc_compiler LOCATION):SET(PROTOC_LOCATION \${SYSTEM_PB}):" \
-		-e "s:protoc_compiler::" \
-		-i ParaViewCore/ServerImplementation/CMakeLists.txt
-	sed -i "s:DEPENDS \${in_proto_file} protoc_compiler:DEPENDS \${in_proto_file}:" \
-		CMake/ParaViewMacros.cmake
 
 	cd VTK
 	epatch "${FILESDIR}"/vtk-5.6.0-cg-path.patch



^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-visualization/paraview/, sci-visualization/paraview/files/
@ 2012-08-28 10:38 Francois Bissey
  0 siblings, 0 replies; 7+ messages in thread
From: Francois Bissey @ 2012-08-28 10:38 UTC (permalink / raw
  To: gentoo-commits

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

paraview 3.14.1 initial import to greater masses

(Portage version: 2.2.0_alpha122/git/Linux x86_64, unsigned Manifest commit)

---
 sci-visualization/paraview/ChangeLog               |    9 +
 .../files/paraview-3.14.1-ffmpeg-noinstall.patch   |   27 +++
 .../files/paraview-3.14.1-xdmf-linking.patch       |   16 ++
 .../paraview/files/vtk-5.6.0-odbc.patch            |   12 +
 .../paraview/files/vtk-5.6.1-ffmpeg.patch          |   42 ++++
 .../paraview/files/vtk-5.6.1-libav-0.8.patch       |   66 ++++++
 .../paraview/files/vtk-boost1.49.patch             |   27 +++
 sci-visualization/paraview/metadata.xml            |    1 +
 sci-visualization/paraview/paraview-3.14.1.ebuild  |  224 ++++++++++++++++++++
 9 files changed, 424 insertions(+), 0 deletions(-)

diff --git a/sci-visualization/paraview/ChangeLog b/sci-visualization/paraview/ChangeLog
index 85732fb..4db958d 100644
--- a/sci-visualization/paraview/ChangeLog
+++ b/sci-visualization/paraview/ChangeLog
@@ -2,6 +2,15 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*paraview-3.14.1 (28 Aug 2012)
+
+  28 Aug 2012; François Bissey <francois.bissey@canterbury.ac.nz>
+  +paraview-3.14.1.ebuild, +files/paraview-3.14.1-ffmpeg-noinstall.patch,
+  +files/paraview-3.14.1-xdmf-linking.patch, +files/vtk-5.6.0-odbc.patch,
+  +files/vtk-5.6.1-ffmpeg.patch, +files/vtk-boost1.49.patch,
+  +files/vtk-5.6.1-libav-0.8.patch:
+  3.14.1
+
   09 Feb 2012; François Bissey <francois.bissey@canterbury.ac.nz>
   paraview-3.12.0.ebuild, files/paraview-3.12.0-protobuf.patch:
   clean up protobuf mess, go to EAPI 3 (for python QA)

diff --git a/sci-visualization/paraview/files/paraview-3.14.1-ffmpeg-noinstall.patch b/sci-visualization/paraview/files/paraview-3.14.1-ffmpeg-noinstall.patch
new file mode 100644
index 0000000..9157252
--- /dev/null
+++ b/sci-visualization/paraview/files/paraview-3.14.1-ffmpeg-noinstall.patch
@@ -0,0 +1,27 @@
+--- CommandLineExecutables/CMakeLists.txt.orig	2012-08-28 14:29:41.472454000 +1200
++++ CommandLineExecutables/CMakeLists.txt	2012-08-28 14:30:07.959473756 +1200
+@@ -69,15 +69,15 @@
+ 
+ #------------------------------------------------------------------------
+ # Install ffmpeg, if used.
+-IF (VTK_USE_FFMPEG_ENCODER)
+-  FOREACH(fmpglib avcodec avformat avutil)
+-    IF (FFMPEG_${fmpglib}_LIBRARY)
+-      pv_install_library(${FFMPEG_${fmpglib}_LIBRARY}
+-        ${PV_INSTALL_LIB_DIR}
+-        BrandedRuntime)
+-    ENDIF(FFMPEG_${fmpglib}_LIBRARY)
+-  ENDFOREACH(fmpglib)
+-ENDIF (VTK_USE_FFMPEG_ENCODER)
++#IF (VTK_USE_FFMPEG_ENCODER)
++#  FOREACH(fmpglib avcodec avformat avutil)
++#    IF (FFMPEG_${fmpglib}_LIBRARY)
++#      pv_install_library(${FFMPEG_${fmpglib}_LIBRARY}
++#        ${PV_INSTALL_LIB_DIR}
++#        BrandedRuntime)
++#    ENDIF(FFMPEG_${fmpglib}_LIBRARY)
++#  ENDFOREACH(fmpglib)
++#ENDIF (VTK_USE_FFMPEG_ENCODER)
+ 
+ IF (NOT PV_INSTALL_NO_RUNTIME)
+   INSTALL(TARGETS smTestDriver

diff --git a/sci-visualization/paraview/files/paraview-3.14.1-xdmf-linking.patch b/sci-visualization/paraview/files/paraview-3.14.1-xdmf-linking.patch
new file mode 100644
index 0000000..1157931
--- /dev/null
+++ b/sci-visualization/paraview/files/paraview-3.14.1-xdmf-linking.patch
@@ -0,0 +1,16 @@
+Description: rusr/lib/paraview/libvtkXdmf.so contains an unresolvable 
+ reference to symbol XtDispatchEvent.
+Author: Mathieu Malaterre <mathieu.malaterre@gmail.com>
+Bug: http://paraview.org/Bug/view.php?id=12576
+Last-Update: 2011-09-07
+
+--- a/Utilities/Xdmf2/vtk/CMakeLists.txt
++++ b/Utilities/Xdmf2/vtk/CMakeLists.txt
+@@ -105,6 +105,7 @@
+   ELSE(VTK_USE_PARALLEL)
+     TARGET_LINK_LIBRARIES(vtkXdmf vtkIO Xdmf vtkRendering)
+   ENDIF(VTK_USE_PARALLEL)
++  TARGET_LINK_LIBRARIES(${X11_Xt_LIB})
+ 
+   IF (VTK_USE_MPI)
+     # Needed for mpich 2

diff --git a/sci-visualization/paraview/files/vtk-5.6.0-odbc.patch b/sci-visualization/paraview/files/vtk-5.6.0-odbc.patch
new file mode 100644
index 0000000..be24af1
--- /dev/null
+++ b/sci-visualization/paraview/files/vtk-5.6.0-odbc.patch
@@ -0,0 +1,12 @@
+diff -Naur CMake/FindODBC.cmake.orig CMake/FindODBC.cmake
+--- CMake/FindODBC.cmake.orig	2008-10-08 13:51:36.000000000 -0400
++++ 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/files/vtk-5.6.1-ffmpeg.patch b/sci-visualization/paraview/files/vtk-5.6.1-ffmpeg.patch
new file mode 100644
index 0000000..34ec528
--- /dev/null
+++ b/sci-visualization/paraview/files/vtk-5.6.1-ffmpeg.patch
@@ -0,0 +1,42 @@
+ CMake/vtkFFMPEGTestAvAlloc.cxx   |    2 +-
+ CMake/vtkFFMPEGTestURLFClose.cxx |    2 +-
+ IO/vtkFFMPEGWriter.cxx           |    2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/CMake/vtkFFMPEGTestAvAlloc.cxx b/CMake/vtkFFMPEGTestAvAlloc.cxx
+index ad691e3..32489d5 100644
+--- a/CMake/vtkFFMPEGTestAvAlloc.cxx
++++ b/CMake/vtkFFMPEGTestAvAlloc.cxx
+@@ -1,6 +1,6 @@
+ extern "C" {
+ #ifdef HAS_OLD_HEADER
+-# include <ffmpeg/avformat.h>
++# include <libavformat/avformat.h>
+ #else
+ # include <libavformat/avformat.h>
+ #endif
+diff --git a/CMake/vtkFFMPEGTestURLFClose.cxx b/CMake/vtkFFMPEGTestURLFClose.cxx
+index 0bf4314..1c10a93 100644
+--- a/CMake/vtkFFMPEGTestURLFClose.cxx
++++ b/CMake/vtkFFMPEGTestURLFClose.cxx
+@@ -1,6 +1,6 @@
+ extern "C" {
+ #ifdef HAS_OLD_HEADER
+-# include <ffmpeg/avformat.h>
++# include <libavformat/avformat.h>
+ #else
+ # include <libavformat/avformat.h>
+ #endif
+diff --git a/IO/vtkFFMPEGWriter.cxx b/IO/vtkFFMPEGWriter.cxx
+index 52673ef..ffbb78f 100644
+--- a/IO/vtkFFMPEGWriter.cxx
++++ b/IO/vtkFFMPEGWriter.cxx
+@@ -22,7 +22,7 @@
+ 
+ extern "C" {
+ #ifdef VTK_FFMPEG_HAS_OLD_HEADER
+-# include <ffmpeg/avformat.h>
++# include <libavformat/avformat.h>
+ #else
+ # include <libavformat/avformat.h>
+ #endif

diff --git a/sci-visualization/paraview/files/vtk-5.6.1-libav-0.8.patch b/sci-visualization/paraview/files/vtk-5.6.1-libav-0.8.patch
new file mode 100644
index 0000000..523919d
--- /dev/null
+++ b/sci-visualization/paraview/files/vtk-5.6.1-libav-0.8.patch
@@ -0,0 +1,66 @@
+Description: Upstream changes introduced in version 5.6.1-6.1
+ This patch has been created by dpkg-source during the package build.
+ Here's the last changelog entry, hopefully it gives details on why
+ those changes were made:
+ .
+ vtk (5.6.1-6.1) unstable; urgency=low
+ .
+   [ Michael Schutte ]
+   * Non-maintainer upload.
+   * Remove absolute paths to required libraries from
+     /usr/lib/vtk-5.6/VTKLibraryDepends.cmake after building, closes:
+     #506992.  Due to the multiarch transition, the original behavior
+     frequently causes reverse build-deps to FTBFS.  This change should
+     probably be reverted once all required libraries are multiarched.
+ .
+   [ Steve M. Robbins ]
+   * Override lintian diagnostic about embedded libraries ftgl and sqlite.
+   * IO/vtkFFMPEGWriter.cxx: Applied fix from #638246 to build with libav
+     0.7.
+ .
+ The person named in the Author field signed this changelog entry.
+Author: Steve M. Robbins <smr@debian.org>
+Bug-Debian: http://bugs.debian.org/506992
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- vtk-5.6.1.orig/IO/vtkFFMPEGWriter.cxx
++++ vtk-5.6.1/IO/vtkFFMPEGWriter.cxx
+@@ -123,7 +123,7 @@ int vtkFFMPEGWriterInternal::Start()
+     }
+ 
+   //choose avi media file format
+-  this->avOutputFormat = guess_format("avi", NULL, NULL);
++  this->avOutputFormat = av_guess_format("avi", NULL, NULL);
+   if (!this->avOutputFormat) 
+     {
+     vtkGenericWarningMacro (<< "Could not open the avi media file format.");
+@@ -150,7 +150,7 @@ int vtkFFMPEGWriterInternal::Start()
+   //Set up the codec.
+   AVCodecContext *c = this->avStream->codec;
+   c->codec_id = (CodecID)this->avOutputFormat->video_codec;
+-  c->codec_type = CODEC_TYPE_VIDEO;
++  c->codec_type = AVMEDIA_TYPE_VIDEO;
+   c->width = this->Dim[0];
+   c->height = this->Dim[1];
+   c->pix_fmt = PIX_FMT_YUVJ420P;
+@@ -329,7 +329,7 @@ int vtkFFMPEGWriterInternal::Write(vtkIm
+     pkt.stream_index = this->avStream->index;
+     if (cc->coded_frame->key_frame) //treat keyframes well
+       {
+-      pkt.flags |= PKT_FLAG_KEY;
++      pkt.flags |= AV_PKT_FLAG_KEY;
+       }
+     pkt.duration = 0; //presentation duration in time_base units or 0 if NA
+     pkt.pos = -1; //byte position in stream or -1 if NA

diff --git a/sci-visualization/paraview/files/vtk-boost1.49.patch b/sci-visualization/paraview/files/vtk-boost1.49.patch
new file mode 100644
index 0000000..b04d391
--- /dev/null
+++ b/sci-visualization/paraview/files/vtk-boost1.49.patch
@@ -0,0 +1,27 @@
+Description: fix FTBFS with boost 1.49
+Author: Dominique Belhachemi <domibel@debian.org>
+Origin: http://anonscm.debian.org/gitweb/?p=collab-maint/vtk.git;a=commitdiff;h=55084a11b450e53b2e8786e23dd64a6a6b846e6b
+Last-Update: 2012-05-07
+
+--- a/VTK/Infovis/vtkBoostBreadthFirstSearchTree.cxx
++++ b/VTK/Infovis/vtkBoostBreadthFirstSearchTree.cxx
+@@ -49,11 +49,17 @@
+ 
+ #if BOOST_VERSION >= 104800      // Boost 1.48.x
+ namespace {
+-  vtkIdType unwrap_edge_id(vtkEdgeType const &e) {
++  vtkIdType unwrap_edge_id(vtkEdgeType const &e) 
++  {
+     return e.Id;
+   }
+-  vtkIdType unwrap_edge_id(boost::detail::reverse_graph_edge_descriptor<vtkEdgeType> const &e) {
++  vtkIdType unwrap_edge_id(boost::detail::reverse_graph_edge_descriptor<vtkEdgeType> const &e) 
++  {
++# if BOOST_VERSION == 104800
+     return e.underlying_desc.Id;
++# else
++    return e.underlying_descx.Id;
++# endif
+   }
+ }
+ #endif

diff --git a/sci-visualization/paraview/metadata.xml b/sci-visualization/paraview/metadata.xml
index fbac1bb..c123608 100644
--- a/sci-visualization/paraview/metadata.xml
+++ b/sci-visualization/paraview/metadata.xml
@@ -10,6 +10,7 @@
 		<flag name='plugins'>Build and install additional plugins</flag>
 		<flag name='gui'>Build paraview's gui not just the server</flag>
 		<flag name='cg'>Add support for nvidia's cg shaders</flag>
+                <flag name="boost">Add support for boost</flag>
 		<flag name='streaming'>Enable streaming paraview application</flag>
 		<flag name='adaptive'>Enable the adaptive paraview application</flag>
 		<flag name='mysql'>Build support for MySQL data item in the XDMF format</flag>

diff --git a/sci-visualization/paraview/paraview-3.14.1.ebuild b/sci-visualization/paraview/paraview-3.14.1.ebuild
new file mode 100644
index 0000000..3afa0f3
--- /dev/null
+++ b/sci-visualization/paraview/paraview-3.14.1.ebuild
@@ -0,0 +1,224 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=3
+
+PYTHON_DEPEND="python? 2:2.6"
+
+inherit cmake-utils eutils flag-o-matic multilib python qt4-r2 toolchain-funcs versionator
+
+MAIN_PV=$(get_major_version)
+MAJOR_PV=$(get_version_component_range 1-2)
+MY_P="ParaView-${PV}-Source"
+
+DESCRIPTION="ParaView is a powerful scientific data visualization application"
+HOMEPAGE="http://www.paraview.org"
+SRC_URI="http://www.paraview.org/files/v${MAJOR_PV}/${MY_P}.tar.gz"
+RESTRICT="mirror"
+
+LICENSE="paraview GPL-2"
+KEYWORDS="~x86 ~amd64"
+SLOT="0"
+IUSE="boost cg -coprocessing doc examples +gui mpi mysql nvcontrol +plugins +python webkit ffmpeg theora"
+
+RDEPEND="
+	sci-libs/hdf5[mpi=]
+	mpi? ( virtual/mpi[cxx,romio] )
+	gui? (
+		x11-libs/qt-gui:4
+		x11-libs/qt-qt3support:4
+		x11-libs/qt-opengl:4
+		|| ( >=x11-libs/qt-assistant-4.7.0:4[compat] <x11-libs/qt-assistant-4.7.0:4 )
+		x11-libs/qt-sql:4
+		webkit? ( x11-libs/qt-webkit:4 ) )
+	mysql? ( virtual/mysql )
+	coprocessing? ( plugins? (
+			x11-libs/qt-gui:4
+			dev-python/PyQt4 ) )
+	python? (
+		dev-python/sip
+		gui? ( dev-python/PyQt4 )
+		dev-python/numpy )
+	ffmpeg? ( virtual/ffmpeg )
+	theora? ( media-libs/libtheora )
+	dev-libs/libxml2:2
+	media-libs/libpng
+	virtual/jpeg
+	media-libs/tiff
+	dev-libs/expat
+	sys-libs/zlib
+	media-libs/freetype
+	>=app-admin/eselect-opengl-1.0.6-r1
+	virtual/opengl
+	sci-libs/netcdf
+	x11-libs/libXmu"
+DEPEND="${RDEPEND}
+		doc? ( app-doc/doxygen )
+		boost? ( >=dev-libs/boost-1.40.0[mpi?] )
+		dev-libs/protobuf
+		>=dev-util/cmake-2.6.4"
+
+PVLIBDIR=$(get_libdir)/${PN}-${MAJOR_PV}
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	use python && python_set_active_version 2
+}
+
+src_prepare() {
+	# gcc header fix
+	epatch "${FILESDIR}"/${PN}-3.8.0-xdmf-cstring.patch
+	# disable automatic byte compiling that act directly on the live system
+	epatch "${FILESDIR}"/${PN}-3.8.0-xdmf-bc.patch
+	# Do not install ffmpeg libraries if used
+	epatch "${FILESDIR}"/${PN}-3.14.1-ffmpeg-noinstall.patch
+	# patch from debian for some underlinking in xdmf
+	epatch "${FILESDIR}"/${PN}-3.14.1-xdmf-linking.patch
+
+	# lib64 fixes
+	sed -i "s:/usr/lib:${EPREFIX}/usr/$(get_libdir):g" \
+		Utilities/Xdmf2/libsrc/CMakeLists.txt || die
+	sed -i "s:\/lib\/python:\/$(get_libdir)\/python:g" \
+		Utilities/Xdmf2/CMake/setup_install_paths.py || die
+
+	# Install internal vtk binaries inside /usr/${PVLIBDIR}
+	sed -e 's:VTK_INSTALL_BIN_DIR \"/${PV_INSTALL_BIN_DIR}\":VTK_INSTALL_BIN_DIR \"/${PV_INSTALL_LIB_DIR}\":' \
+		-i CMake/ParaViewCommon.cmake || die "failed to patch vtk install location"
+
+	cd VTK
+	epatch "${FILESDIR}"/vtk-5.6.0-cg-path.patch
+	epatch "${FILESDIR}"/vtk-5.6.0-odbc.patch
+	epatch "${FILESDIR}"/vtk-5.6.1-ffmpeg.patch
+	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
+}
+
+src_configure() {
+	mycmakeargs=(
+		-DPV_INSTALL_LIB_DIR="${PVLIBDIR}"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
+		-DPV_INSTALL_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
+		-DEXPAT_INCLUDE_DIR="${EPREFIX}"/usr/include
+		-DEXPAT_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libexpat.so
+		-DOPENGL_gl_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libGL.so
+		-DOPENGL_glu_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libGLU.so
+		-DCMAKE_SKIP_RPATH=YES
+		-DVTK_USE_RPATH=OFF
+		-DBUILD_SHARED_LIBS=ON
+		-DVTK_USE_SYSTEM_FREETYPE=ON
+		-DVTK_USE_SYSTEM_JPEG=ON
+		-DVTK_USE_SYSTEM_PNG=ON
+		-DVTK_USE_SYSTEM_TIFF=ON
+		-DVTK_USE_SYSTEM_ZLIB=ON
+		-DVTK_USE_SYSTEM_EXPAT=ON
+		-DPARAVIEW_USE_SYSTEM_HDF5=ON
+		-DCMAKE_VERBOSE_MAKEFILE=ON
+		-DCMAKE_COLOR_MAKEFILE=TRUE
+		-DVTK_USE_SYSTEM_LIBXML2=ON
+		-DVTK_USE_OFFSCREEN=TRUE
+		-DCMAKE_USE_PTHREADS=ON
+		-DBUILD_TESTING=OFF
+		-DVTK_USE_FFMPEG_ENCODER=OFF
+		-DPARAVIEW_INSTALL_THIRD_PARTY_LIBRARIES=OFF
+		-DPROTOC_LOCATION=$(which protoc))
+
+	# use flag triggered options
+	mycmakeargs+=(
+		$(cmake-utils_use gui PARAVIEW_BUILD_QT_GUI)
+		$(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 boost VTK_USE_TEXT_ANALYSIS)
+		$(cmake-utils_use mpi PARAVIEW_USE_MPI)
+		$(cmake-utils_use mpi PARAVIEW_USE_MPI_SSEND)
+		$(cmake-utils_use python PARAVIEW_ENABLE_PYTHON)
+		$(cmake-utils_use python VTK_WRAP_PYTHON_SIP)
+		$(cmake-utils_use python XDMF_WRAP_PYTHON)
+		$(cmake-utils_use doc BUILD_DOCUMENTATION)
+		$(cmake-utils_use examples BUILD_EXAMPLES)
+		$(cmake-utils_use cg VTK_USE_CG_SHADERS)
+		$(cmake-utils_use nvcontrol VTK_USE_NVCONTROL)
+		$(cmake-utils_use mysql XDMF_USE_MYSQL)
+		$(cmake-utils_use mysql VTK_USE_MYSQL)
+		$(cmake-utils_use coprocessing PARAVIEW_ENABLE_COPROCESSING)
+		$(cmake-utils_use ffmpeg VTK_USE_FFMPEG_ENCODER)
+		$(cmake-utils_use theora VTK_USE_THEORA_ENCODER)
+		$(cmake-utils_use theora VTK_USE_SYSTEM_OGGTHEORA))
+
+	if ( use gui ); then
+		mycmakeargs+=(-DVTK_INSTALL_QT_DIR=/${PVLIBDIR}/plugins/designer
+			$(cmake-utils_use webkit VTK_QT_USE_WEBKIT))
+		if use python ; then
+			# paraview cannot guess sip directory right probably because a path is not propagated properly
+			mycmakeargs+=(
+				-DSIP_PYQT_DIR="${EPREFIX}/usr/share/sip"
+				-DSIP_INCLUDE_DIR="${EPREFIX}$(python_get_includedir)")
+		fi
+	fi
+
+	# the rest of the plugins
+	mycmakeargs+=(
+		$(cmake-utils_use plugins PARAVIEW_INSTALL_DEVELOPMENT)
+		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_ClientChartView)
+		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_CosmoFilters)
+		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_H5PartReader)
+		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_Moments)
+		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_PointSprite)
+		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_Prism)
+		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_SLACTools)
+		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_AnalyzeNIfTIReaderWriter)
+		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_SurfaceLIC)
+		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_EyeDomeLighting)
+		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_ForceTime)
+		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_SierraPlotTools)
+		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_StreamingView)
+		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_VisTrailPlugin))
+
+	if use python; then
+		mycmakeargs+=($(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_pvblot))
+	fi
+
+	if use coprocessing; then
+		mycmakeargs+=($(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_CoProcessingScriptGenerator))
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# set up the environment
+	echo "LDPATH=${EPREFIX}/usr/${PVLIBDIR}" >> "${T}"/40${PN}
+	echo "PYTHONPATH="${EPREFIX}"/usr/${PVLIBDIR}:/usr/${PVLIBDIR}/site-packages" >> "${T}"/40${PN}
+	doenvd "${T}"/40${PN}
+
+	# last but not least lets make a desktop entry
+	newicon "${S}"/Applications/ParaView/pvIcon.png paraview.png \
+		|| die "Failed to create paraview icon."
+	make_desktop_entry paraview "Paraview" paraview \
+		|| die "Failed to install Paraview desktop entry"
+
+}
+
+pkg_postinst() {
+	# with Qt4.5 there seem to be issues reading data files
+	# under certain locales. Setting LC_ALL=C should fix these.
+	echo
+	elog "If you experience data corruption during parsing of"
+	elog "data files with paraview please try setting your"
+	elog "locale to LC_ALL=C."
+	echo
+}
+
+pkg_postrm() {
+	if use python ; then
+		python_mod_cleanup "${EPREFIX}"/usr/$(get_libdir)/"${PN}-${MAJOR_PV}"/site-packages
+	fi
+}


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-visualization/paraview/, sci-visualization/paraview/files/
@ 2012-08-30 22:00 Francois Bissey
  0 siblings, 0 replies; 7+ messages in thread
From: Francois Bissey @ 2012-08-30 22:00 UTC (permalink / raw
  To: gentoo-commits

commit:     3460a630d9a4f432614116ef623b12081377ec24
Author:     François Bissey <francois.bissey <AT> canterbury <DOT> ac <DOT> nz>
AuthorDate: Thu Aug 30 21:59:00 2012 +0000
Commit:     Francois Bissey <f.r.bissey <AT> massey <DOT> ac <DOT> nz>
CommitDate: Thu Aug 30 21:59:00 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=3460a630

Bunch of fix and ubundling for paraview 3.14.1

---
 sci-visualization/paraview/ChangeLog               |    9 +
 .../paraview/files/paraview-3.14.1-gcc-4.7.patch   |   28 +
 .../paraview/files/paraview-3.14.1-mpi4py.patch    |   15 +
 .../files/paraview-3.14.1-python-exit.patch        |   46 ++
 .../files/paraview-3.14.1-removesqlite.patch       |  526 ++++++++++++++++++++
 ...iew-3.14.1.ebuild => paraview-3.14.1-r1.ebuild} |   34 ++-
 6 files changed, 653 insertions(+), 5 deletions(-)

diff --git a/sci-visualization/paraview/ChangeLog b/sci-visualization/paraview/ChangeLog
index 4db958d..0c76587 100644
--- a/sci-visualization/paraview/ChangeLog
+++ b/sci-visualization/paraview/ChangeLog
@@ -2,6 +2,15 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*paraview-3.14.1-r1 (30 Aug 2012)
+
+  30 Aug 2012; François Bissey <francois.bissey@canterbury.ac.nz>
+  -paraview-3.14.1.ebuild, +paraview-3.14.1-r1.ebuild,
+  +files/paraview-3.14.1-gcc-4.7.patch, +files/paraview-3.14.1-mpi4py.patch,
+  +files/paraview-3.14.1-python-exit.patch,
+  +files/paraview-3.14.1-removesqlite.patch:
+  fix a number of things
+
 *paraview-3.14.1 (28 Aug 2012)
 
   28 Aug 2012; François Bissey <francois.bissey@canterbury.ac.nz>

diff --git a/sci-visualization/paraview/files/paraview-3.14.1-gcc-4.7.patch b/sci-visualization/paraview/files/paraview-3.14.1-gcc-4.7.patch
new file mode 100644
index 0000000..0da9aab
--- /dev/null
+++ b/sci-visualization/paraview/files/paraview-3.14.1-gcc-4.7.patch
@@ -0,0 +1,28 @@
+Description: fix FTBFS with gcc-4.7
+Author: Mathieu Malaterre <malat@debian.org>
+Origin: http://anonscm.debian.org/gitweb/?p=collab-maint/vtk.git;a=commitdiff;h=428e763c995bb303805e07da70c1a34fc103d208
+Reviewed-by: Anton Gladky <gladky.anton@gmail.com>
+Last-Update: 2012-05-08
+
+--- a/VTK/Rendering/vtkFreeTypeTools.cxx
++++ b/VTK/Rendering/vtkFreeTypeTools.cxx
+@@ -35,6 +35,8 @@
+ using namespace ftgl;
+ #endif
+ 
++#include <stdint.h>
++
+ // Print debug info
+ #define VTK_FTFC_DEBUG 0
+ #define VTK_FTFC_DEBUG_CD 0
+--- a/VTK/Rendering/vtkFreeTypeUtilities.cxx
++++ b/VTK/Rendering/vtkFreeTypeUtilities.cxx
+@@ -36,6 +36,8 @@
+ using namespace ftgl;
+ #endif
+ 
++#include <stdint.h>
++
+ // Print debug info
+ 
+ #define VTK_FTFC_DEBUG 0

diff --git a/sci-visualization/paraview/files/paraview-3.14.1-mpi4py.patch b/sci-visualization/paraview/files/paraview-3.14.1-mpi4py.patch
new file mode 100644
index 0000000..95a0d7a
--- /dev/null
+++ b/sci-visualization/paraview/files/paraview-3.14.1-mpi4py.patch
@@ -0,0 +1,15 @@
+--- CMake/ParaViewCommon.cmake.orig	2012-08-29 13:38:19.392381797 +1200
++++ CMake/ParaViewCommon.cmake	2012-08-29 13:38:47.271407061 +1200
+@@ -497,9 +497,9 @@
+ 
+ #########################################################################
+ # Configure mpi4py
+-IF(PARAVIEW_ENABLE_PYTHON AND PARAVIEW_USE_MPI)
+-  ADD_SUBDIRECTORY(Utilities/mpi4py)
+-ENDIF(PARAVIEW_ENABLE_PYTHON AND PARAVIEW_USE_MPI)
++#IF(PARAVIEW_ENABLE_PYTHON AND PARAVIEW_USE_MPI)
++#  ADD_SUBDIRECTORY(Utilities/mpi4py)
++#ENDIF(PARAVIEW_ENABLE_PYTHON AND PARAVIEW_USE_MPI)
+ 
+ 
+ 

diff --git a/sci-visualization/paraview/files/paraview-3.14.1-python-exit.patch b/sci-visualization/paraview/files/paraview-3.14.1-python-exit.patch
new file mode 100644
index 0000000..03ae27a
--- /dev/null
+++ b/sci-visualization/paraview/files/paraview-3.14.1-python-exit.patch
@@ -0,0 +1,46 @@
+--- ParaViewCore/ClientServerCore/vtkPythonProgrammableFilter.cxx.orig	2012-08-28 15:42:34.410099857 +1200
++++ ParaViewCore/ClientServerCore/vtkPythonProgrammableFilter.cxx	2012-08-28 15:45:25.731279418 +1200
+@@ -80,6 +80,16 @@
+ }
+ 
+ //----------------------------------------------------------------------------
++void vtkPythonProgrammableFilter::DeleteGlobalPythonInterpretor()
++{
++  if(GlobalPipelineInterpretor)
++    {
++    GlobalPipelineInterpretor->Delete();
++    GlobalPipelineInterpretor = 0;
++    }
++}
++
++//----------------------------------------------------------------------------
+ vtkPythonProgrammableFilter::vtkPythonProgrammableFilter() :
+   Implementation(new vtkPythonProgrammableFilterImplementation())
+ {
+--- ParaViewCore/ClientServerCore/vtkPythonProgrammableFilter.h.orig	2012-08-28 15:42:45.892355278 +1200
++++ ParaViewCore/ClientServerCore/vtkPythonProgrammableFilter.h	2012-08-28 15:45:54.883213682 +1200
+@@ -102,6 +102,7 @@
+ //BTX
+   static vtkPVPythonInterpretor* GetGlobalPipelineInterpretor();
+ //ETX
++static void DeleteGlobalPythonInterpretor();
+ protected:
+   vtkPythonProgrammableFilter();
+   ~vtkPythonProgrammableFilter();
+--- Utilities/VTKPythonWrapping/paraview/servermanager.py.orig	2012-08-28 15:47:14.611830975 +1200
++++ Utilities/VTKPythonWrapping/paraview/servermanager.py	2012-08-28 15:48:11.995520340 +1200
+@@ -40,7 +40,7 @@
+ #     PURPOSE.  See the above copyright notice for more information.
+ #
+ #==============================================================================
+-import paraview, re, os, os.path, new, sys, vtk
++import paraview, re, os, os.path, new, sys, atexit, vtk
+ 
+ if not paraview.compatibility.minor:
+     paraview.compatibility.major = 3
+@@ -3027,3 +3027,5 @@
+ 
+ def GetNumberOfConnections():
+    return len(MultiServerConnections)
++
++atexit.register(vtkPythonProgrammableFilter.DeleteGlobalPythonInterpretor)

diff --git a/sci-visualization/paraview/files/paraview-3.14.1-removesqlite.patch b/sci-visualization/paraview/files/paraview-3.14.1-removesqlite.patch
new file mode 100644
index 0000000..3467fa9
--- /dev/null
+++ b/sci-visualization/paraview/files/paraview-3.14.1-removesqlite.patch
@@ -0,0 +1,526 @@
+Description: Import patch from VTK to remove sqlite
+Author: Mathieu Malaterre <mathieu.malaterre@gmail.com>
+Last-Update: 2011-09-07
+
+--- a/VTK/IO/vtkSQLiteDatabase.cxx
++++ b/VTK/IO/vtkSQLiteDatabase.cxx
+@@ -29,7 +29,7 @@
+ #include <vtksys/ios/fstream>
+ #include <vtksys/ios/sstream>
+ 
+-#include <vtksqlite/vtk_sqlite3.h>
++#include <sqlite3.h>
+ 
+ vtkStandardNewMacro(vtkSQLiteDatabase);
+ 
+@@ -307,15 +307,15 @@
+       }
+     }
+ 
+-  int result = vtk_sqlite3_open(this->DatabaseFileName, & (this->SQLiteInstance));
++  int result = sqlite3_open(this->DatabaseFileName, & (this->SQLiteInstance));
+ 
+-  if (result != VTK_SQLITE_OK)
++  if (result != SQLITE_OK)
+     {
+     vtkDebugMacro(<<"SQLite open() failed.  Error code is "
+                   << result << " and message is "
+-                  << vtk_sqlite3_errmsg(this->SQLiteInstance) );
++                  << sqlite3_errmsg(this->SQLiteInstance) );
+ 
+-    vtk_sqlite3_close(this->SQLiteInstance);
++    sqlite3_close(this->SQLiteInstance);
+     return false;
+     }
+   else
+@@ -334,8 +334,8 @@
+     }
+   else
+     {
+-    int result = vtk_sqlite3_close(this->SQLiteInstance);
+-    if (result != VTK_SQLITE_OK)
++    int result = sqlite3_close(this->SQLiteInstance);
++    if (result != SQLITE_OK)
+       {
+       vtkWarningMacro(<< "Close(): SQLite returned result code " << result);
+       }
+@@ -374,7 +374,7 @@
+   if (!status)
+     {
+     vtkErrorMacro(<< "GetTables(): Database returned error: "
+-                  << vtk_sqlite3_errmsg(this->SQLiteInstance) );
++                  << sqlite3_errmsg(this->SQLiteInstance) );
+     query->Delete();
+     return this->Tables;
+     }
+@@ -403,7 +403,7 @@
+   if (!status)
+     {
+     vtkErrorMacro(<< "GetRecord(" << table << "): Database returned error: "
+-                  << vtk_sqlite3_errmsg(this->SQLiteInstance) );
++                  << sqlite3_errmsg(this->SQLiteInstance) );
+     query->Delete();
+     return NULL;
+     }
+@@ -467,10 +467,10 @@
+ // ----------------------------------------------------------------------
+ bool vtkSQLiteDatabase::HasError()
+ {
+-  return (vtk_sqlite3_errcode(this->SQLiteInstance)!=VTK_SQLITE_OK);
++  return (sqlite3_errcode(this->SQLiteInstance)!=SQLITE_OK);
+ }
+ 
+ const char* vtkSQLiteDatabase::GetLastErrorText()
+ {
+-  return vtk_sqlite3_errmsg(this->SQLiteInstance);
++  return sqlite3_errmsg(this->SQLiteInstance);
+ }
+--- a/VTK/IO/vtkSQLiteQuery.cxx
++++ b/VTK/IO/vtkSQLiteQuery.cxx
+@@ -25,7 +25,7 @@
+ #include "vtkVariant.h"
+ #include "vtkVariantArray.h"
+ 
+-#include <vtksqlite/vtk_sqlite3.h>
++#include <sqlite3.h>
+ 
+ #include <assert.h>
+ 
+@@ -43,7 +43,7 @@
+ {
+   this->Statement = NULL;
+   this->InitialFetch = true;
+-  this->InitialFetchResult=VTK_SQLITE_DONE;
++  this->InitialFetchResult=SQLITE_DONE;
+   this->LastErrorText = NULL;
+   this->TransactionInProgress = false;
+ }
+@@ -61,7 +61,7 @@
+     {
+     if (this->Database != NULL)
+       {
+-      vtk_sqlite3_finalize(this->Statement);
++      sqlite3_finalize(this->Statement);
+       this->Statement = NULL;
+       }
+     }
+@@ -131,8 +131,8 @@
+   if (this->Statement)
+     {
+     vtkDebugMacro(<<"Finalizing old statement");
+-    int finalizeStatus = vtk_sqlite3_finalize(this->Statement);
+-    if (finalizeStatus != VTK_SQLITE_OK)
++    int finalizeStatus = sqlite3_finalize(this->Statement);
++    if (finalizeStatus != SQLITE_OK)
+       {
+       vtkWarningMacro(<<"SetQuery(): Finalize returned unexpected code "
+                       << finalizeStatus);
+@@ -151,19 +151,19 @@
+       return false;
+       }
+     
+-    vtk_sqlite3 *db = dbContainer->SQLiteInstance;
++    sqlite3 *db = dbContainer->SQLiteInstance;
+     const char *unused_statement;
+     
+-    int prepareStatus = vtk_sqlite3_prepare_v2(db, 
++    int prepareStatus = sqlite3_prepare_v2(db, 
+                                                this->Query,
+                                                static_cast<int>(strlen(this->Query)),
+                                                &this->Statement,
+                                                &unused_statement);
+     
+-    if (prepareStatus != VTK_SQLITE_OK)
++    if (prepareStatus != SQLITE_OK)
+       {
+-      this->SetLastErrorText(vtk_sqlite3_errmsg(db));
+-      vtkWarningMacro(<<"SetQuery(): vtk_sqlite3_prepare_v2() failed with error message "
++      this->SetLastErrorText(sqlite3_errmsg(db));
++      vtkWarningMacro(<<"SetQuery(): sqlite3_prepare_v2() failed with error message "
+                     << this->GetLastErrorText()
+                     << " on statement: '"
+                     << this->Query << "'");
+@@ -194,31 +194,31 @@
+     }
+   else
+     {
+-    vtk_sqlite3_reset(this->Statement);
++    sqlite3_reset(this->Statement);
+     }
+ 
+   vtkDebugMacro(<<"Execute(): Query ready to execute.");
+ 
+   this->InitialFetch = true;
+-  int result = vtk_sqlite3_step(this->Statement);
++  int result = sqlite3_step(this->Statement);
+   this->InitialFetchResult = result;
+ 
+-  if (result == VTK_SQLITE_DONE)
++  if (result == SQLITE_DONE)
+     {
+     this->SetLastErrorText(NULL);
+     this->Active = true;
+     return true;
+     }
+-  else if (result != VTK_SQLITE_ROW)
++  else if (result != SQLITE_ROW)
+     {
+     vtkSQLiteDatabase *dbContainer = 
+       vtkSQLiteDatabase::SafeDownCast(this->Database);
+     assert(dbContainer != NULL);
+     
+-    vtk_sqlite3 *db = dbContainer->SQLiteInstance;
++    sqlite3 *db = dbContainer->SQLiteInstance;
+ 
+-    this->SetLastErrorText(vtk_sqlite3_errmsg(db));
+-    vtkDebugMacro(<< "Execute(): vtk_sqlite3_step() returned error message "
++    this->SetLastErrorText(sqlite3_errmsg(db));
++    vtkDebugMacro(<< "Execute(): sqlite3_step() returned error message "
+                   << this->GetLastErrorText());
+     this->Active = false;
+     return false;
+@@ -239,7 +239,7 @@
+     }
+   else
+     {
+-    return vtk_sqlite3_column_count(this->Statement);
++    return sqlite3_column_count(this->Statement);
+     }
+ }
+ 
+@@ -259,7 +259,7 @@
+     }
+   else
+     {
+-    return vtk_sqlite3_column_name(this->Statement, column);
++    return sqlite3_column_name(this->Statement, column);
+     }
+ }
+ 
+@@ -279,22 +279,22 @@
+     }
+   else
+     {
+-    switch (vtk_sqlite3_column_type(this->Statement, column))
++    switch (sqlite3_column_type(this->Statement, column))
+       {
+-      case VTK_SQLITE_INTEGER:
++      case SQLITE_INTEGER:
+         return VTK_INT; 
+-      case VTK_SQLITE_FLOAT:
++      case SQLITE_FLOAT:
+         return VTK_FLOAT;
+-      case VTK_SQLITE_TEXT:
++      case SQLITE_TEXT:
+         return VTK_STRING;
+-      case VTK_SQLITE_BLOB:
++      case SQLITE_BLOB:
+         return VTK_STRING; // until we have a BLOB type of our own
+-      case VTK_SQLITE_NULL:
++      case SQLITE_NULL:
+         return VTK_VOID; // ??? what makes sense here?
+       default:
+       {
+       vtkErrorMacro(<<"GetFieldType(): Unknown data type " 
+-                    << vtk_sqlite3_column_type(this->Statement, column)
++                    << sqlite3_column_type(this->Statement, column)
+                     <<" from SQLite.");
+       return VTK_VOID;
+       }
+@@ -315,7 +315,7 @@
+     {
+     vtkDebugMacro(<<"NextRow(): Initial fetch being handled.");
+     this->InitialFetch = false;
+-    if (this->InitialFetchResult == VTK_SQLITE_DONE)
++    if (this->InitialFetchResult == SQLITE_DONE)
+       {
+       return false;
+       }
+@@ -326,12 +326,12 @@
+     }
+   else
+     {
+-    int result = vtk_sqlite3_step(this->Statement);
+-    if (result == VTK_SQLITE_DONE)
++    int result = sqlite3_step(this->Statement);
++    if (result == SQLITE_DONE)
+       {
+       return false;
+       }
+-    else if (result == VTK_SQLITE_ROW)
++    else if (result == SQLITE_ROW)
+       {
+       return true;
+       }
+@@ -339,8 +339,8 @@
+       {
+       vtkSQLiteDatabase *dbContainer = vtkSQLiteDatabase::SafeDownCast( this->Database );
+       assert(dbContainer != NULL);
+-      vtk_sqlite3 *db = dbContainer->SQLiteInstance;
+-      this->SetLastErrorText(vtk_sqlite3_errmsg(db));
++      sqlite3 *db = dbContainer->SQLiteInstance;
++      this->SetLastErrorText(sqlite3_errmsg(db));
+       vtkErrorMacro(<<"NextRow(): Database returned error code " 
+                     << result << " with the following message: "
+                     << this->GetLastErrorText());
+@@ -366,33 +366,33 @@
+     }
+   else
+     {
+-    switch (vtk_sqlite3_column_type(this->Statement, column))
++    switch (sqlite3_column_type(this->Statement, column))
+       {
+-      case VTK_SQLITE_INTEGER:
+-        return vtkVariant(vtk_sqlite3_column_int(this->Statement, column));
++      case SQLITE_INTEGER:
++        return vtkVariant(sqlite3_column_int(this->Statement, column));
+ 
+-      case VTK_SQLITE_FLOAT:
+-        return vtkVariant(vtk_sqlite3_column_double(this->Statement, column));
++      case SQLITE_FLOAT:
++        return vtkVariant(sqlite3_column_double(this->Statement, column));
+ 
+-      case VTK_SQLITE_TEXT:
++      case SQLITE_TEXT:
+       {
+       vtksys_ios::ostringstream str;
+-      str << vtk_sqlite3_column_text(this->Statement, column);
++      str << sqlite3_column_text(this->Statement, column);
+       return vtkVariant(vtkStdString(str.str()));
+       }
+ 
+-      case VTK_SQLITE_BLOB:
++      case SQLITE_BLOB:
+       {
+       // This is a hack ... by passing the BLOB to vtkStdString with an explicit
+       // byte count, we ensure that the string will store all of the BLOB's bytes,
+       // even if there are NULL values.
+ 
+       return vtkVariant(vtkStdString(
+-        static_cast<const char*>(vtk_sqlite3_column_blob(this->Statement, column)),
+-        vtk_sqlite3_column_bytes(this->Statement, column)));
++        static_cast<const char*>(sqlite3_column_blob(this->Statement, column)),
++        sqlite3_column_bytes(this->Statement, column)));
+       }
+       
+-      case VTK_SQLITE_NULL:
++      case SQLITE_NULL:
+       default:
+         return vtkVariant();
+       }
+@@ -423,11 +423,11 @@
+   vtkSQLiteDatabase *dbContainer = vtkSQLiteDatabase::SafeDownCast( this->Database );
+   assert(dbContainer != NULL);
+ 
+-  vtk_sqlite3 *db = dbContainer->SQLiteInstance;
++  sqlite3 *db = dbContainer->SQLiteInstance;
+   char *errorMessage = NULL;
+-  int result = vtk_sqlite3_exec(db, BEGIN_TRANSACTION, NULL, NULL, &errorMessage);
++  int result = sqlite3_exec(db, BEGIN_TRANSACTION, NULL, NULL, &errorMessage);
+ 
+-  if (result == VTK_SQLITE_OK)
++  if (result == SQLITE_OK)
+     {
+     this->TransactionInProgress = true;
+     this->SetLastErrorText(NULL);
+@@ -451,7 +451,7 @@
+ {
+   if (this->Statement)
+     {
+-    vtk_sqlite3_finalize(this->Statement);
++    sqlite3_finalize(this->Statement);
+     this->Statement = NULL;
+     }
+ 
+@@ -463,11 +463,11 @@
+   
+   vtkSQLiteDatabase *dbContainer = vtkSQLiteDatabase::SafeDownCast( this->Database );
+   assert(dbContainer != NULL);
+-  vtk_sqlite3 *db = dbContainer->SQLiteInstance;
++  sqlite3 *db = dbContainer->SQLiteInstance;
+   char *errorMessage = NULL;
+-  int result = vtk_sqlite3_exec(db, COMMIT_TRANSACTION, NULL, NULL, &errorMessage);
++  int result = sqlite3_exec(db, COMMIT_TRANSACTION, NULL, NULL, &errorMessage);
+ 
+-  if (result == VTK_SQLITE_OK)
++  if (result == SQLITE_OK)
+     {
+     this->TransactionInProgress = false;
+     this->SetLastErrorText(NULL);
+@@ -499,11 +499,11 @@
+ 
+   vtkSQLiteDatabase *dbContainer = vtkSQLiteDatabase::SafeDownCast( this->Database );
+   assert(dbContainer != NULL);
+-  vtk_sqlite3 *db = dbContainer->SQLiteInstance;
++  sqlite3 *db = dbContainer->SQLiteInstance;
+   char *errorMessage = NULL;
+-  int result = vtk_sqlite3_exec(db, ROLLBACK_TRANSACTION, NULL, NULL, &errorMessage);
++  int result = sqlite3_exec(db, ROLLBACK_TRANSACTION, NULL, NULL, &errorMessage);
+ 
+-  if (result == VTK_SQLITE_OK)
++  if (result == SQLITE_OK)
+     {
+     this->TransactionInProgress = false;
+     this->SetLastErrorText(NULL);
+@@ -647,11 +647,11 @@
+   if (this->Active)
+     {
+     this->Active = false;
+-    vtk_sqlite3_reset(this->Statement);
++    sqlite3_reset(this->Statement);
+     }
+-  int status = vtk_sqlite3_bind_int(this->Statement, index+1, value);
++  int status = sqlite3_bind_int(this->Statement, index+1, value);
+ 
+-  if (status != VTK_SQLITE_OK)
++  if (status != SQLITE_OK)
+     {
+     vtksys_ios::ostringstream errormessage;
+     errormessage << "sqlite_bind_int returned error: " << status;
+@@ -676,11 +676,11 @@
+   if (this->Active)
+     {
+     this->Active = false;
+-    vtk_sqlite3_reset(this->Statement);
++    sqlite3_reset(this->Statement);
+     }
+-  int status = vtk_sqlite3_bind_int(this->Statement, index+1, static_cast<vtk_sqlite_int64>(value));
++  int status = sqlite3_bind_int(this->Statement, index+1, static_cast<sqlite_int64>(value));
+ 
+-  if (status != VTK_SQLITE_OK)
++  if (status != SQLITE_OK)
+     {
+     vtksys_ios::ostringstream errormessage;
+     errormessage << "sqlite_bind_int64 returned error: " << status;
+@@ -705,12 +705,12 @@
+   if (this->Active)
+     {
+     this->Active = false;
+-    vtk_sqlite3_reset(this->Statement);
++    sqlite3_reset(this->Statement);
+     }
+ 
+-  int status = vtk_sqlite3_bind_double(this->Statement, index+1, value);
++  int status = sqlite3_bind_double(this->Statement, index+1, value);
+ 
+-  if (status != VTK_SQLITE_OK)
++  if (status != SQLITE_OK)
+     {
+     vtksys_ios::ostringstream errormessage;
+     errormessage << "sqlite_bind_double returned error: " << status;
+@@ -734,12 +734,12 @@
+   if (this->Active)
+     {
+     this->Active = false;
+-    vtk_sqlite3_reset(this->Statement);
++    sqlite3_reset(this->Statement);
+     }
+   
+-  int status = vtk_sqlite3_bind_text(this->Statement, index+1, value, length, VTK_SQLITE_TRANSIENT);
++  int status = sqlite3_bind_text(this->Statement, index+1, value, length, SQLITE_TRANSIENT);
+ 
+-  if (status != VTK_SQLITE_OK)
++  if (status != SQLITE_OK)
+     {
+     vtksys_ios::ostringstream errormessage;
+     errormessage << "sqlite_bind_text returned error: " << status;
+@@ -763,17 +763,17 @@
+   if (this->Active)
+     {
+     this->Active = false;
+-    vtk_sqlite3_reset(this->Statement);
++    sqlite3_reset(this->Statement);
+     }
+   
+   int status = 
+-    vtk_sqlite3_bind_blob(this->Statement, 
++    sqlite3_bind_blob(this->Statement, 
+                           index+1, 
+                           data, 
+                           length, 
+-                          VTK_SQLITE_TRANSIENT);
++                          SQLITE_TRANSIENT);
+ 
+-  if (status != VTK_SQLITE_OK)
++  if (status != SQLITE_OK)
+     {
+     vtksys_ios::ostringstream errormessage;
+     errormessage << "sqlite_bind_blob returned error: " << status;
+@@ -797,12 +797,12 @@
+   if (this->Active)
+     {
+     this->Active = false;
+-    vtk_sqlite3_reset(this->Statement);
++    sqlite3_reset(this->Statement);
+     }
+ 
+-  int status = vtk_sqlite3_clear_bindings(this->Statement);
++  int status = sqlite3_clear_bindings(this->Statement);
+   
+-  if (status != VTK_SQLITE_OK)
++  if (status != SQLITE_OK)
+     {
+     vtksys_ios::ostringstream errormessage;
+     errormessage << "sqlite_clear_bindings returned error: " << status;
+--- a/VTK/IO/vtkSQLiteDatabase.h
++++ b/VTK/IO/vtkSQLiteDatabase.h
+@@ -48,7 +48,7 @@
+ class vtkSQLQuery;
+ class vtkSQLiteQuery;
+ class vtkStringArray;
+-struct vtk_sqlite3;
++struct sqlite3;
+ 
+ class VTK_IO_EXPORT vtkSQLiteDatabase : public vtkSQLDatabase
+ {
+@@ -146,7 +146,7 @@
+   virtual bool ParseURL(const char* url);
+ 
+ private:
+-  vtk_sqlite3 *SQLiteInstance;
++  sqlite3 *SQLiteInstance;
+   
+   // We want this to be private, a user of this class
+   // should not be setting this for any reason
+--- a/VTK/IO/vtkSQLiteQuery.h
++++ b/VTK/IO/vtkSQLiteQuery.h
+@@ -46,7 +46,7 @@
+ class vtkSQLiteDatabase;
+ class vtkVariant;
+ class vtkVariantArray;
+-struct vtk_sqlite3_stmt;
++struct sqlite3_stmt;
+ 
+ class VTK_IO_EXPORT vtkSQLiteQuery : public vtkSQLQuery
+ {
+@@ -154,7 +154,7 @@
+   vtkSQLiteQuery(const vtkSQLiteQuery &); // Not implemented.
+   void operator=(const vtkSQLiteQuery &); // Not implemented.
+ 
+-  vtk_sqlite3_stmt *Statement;
++  sqlite3_stmt *Statement;
+   bool InitialFetch;
+   int InitialFetchResult;
+   char *LastErrorText;
+--- a/VTK/Utilities/CMakeLists.txt
++++ b/VTK/Utilities/CMakeLists.txt
+@@ -55,7 +55,7 @@
+     SET_PROPERTY(GLOBAL APPEND PROPERTY VTK_TARGETS vtkmetaio)
+   ENDIF(NOT VTK_INSTALL_NO_LIBRARIES)
+ ENDIF(VTK_USE_METAIO)
+-ADD_SUBDIRECTORY(vtksqlite)
++#ADD_SUBDIRECTORY(vtksqlite)
+ 
+ IF(VTK_HAS_EXODUS)
+   ADD_SUBDIRECTORY(vtkexodus2)
+--- a/VTK/IO/CMakeLists.txt
++++ b/VTK/IO/CMakeLists.txt
+@@ -19,7 +19,7 @@
+ SET(KIT_JAVA_LIBS vtkFilteringJava)
+ SET(KIT_INTERFACE_LIBRARIES vtkFiltering)
+ SET(KIT_LIBS vtkDICOMParser vtkNetCDF vtkNetCDF_cxx LSDyna
+-  ${_VTK_METAIO_LIB} vtksqlite
++  ${_VTK_METAIO_LIB} sqlite3
+   ${VTK_PNG_LIBRARIES} ${VTK_ZLIB_LIBRARIES} ${VTK_JPEG_LIBRARIES}
+   ${VTK_TIFF_LIBRARIES} ${VTK_EXPAT_LIBRARIES} ${VTK_OGGTHEORA_LIBRARIES}
+   ${KWSYS_NAMESPACE})

diff --git a/sci-visualization/paraview/paraview-3.14.1.ebuild b/sci-visualization/paraview/paraview-3.14.1-r1.ebuild
similarity index 84%
rename from sci-visualization/paraview/paraview-3.14.1.ebuild
rename to sci-visualization/paraview/paraview-3.14.1-r1.ebuild
index 3afa0f3..d916c53 100644
--- a/sci-visualization/paraview/paraview-3.14.1.ebuild
+++ b/sci-visualization/paraview/paraview-3.14.1-r1.ebuild
@@ -39,10 +39,13 @@ RDEPEND="
 	python? (
 		dev-python/sip
 		gui? ( dev-python/PyQt4 )
-		dev-python/numpy )
+		dev-python/numpy
+		mpi? ( dev-python/mpi4py )
+	)
 	ffmpeg? ( virtual/ffmpeg )
 	theora? ( media-libs/libtheora )
 	dev-libs/libxml2:2
+	dev-db/sqlite:3
 	media-libs/libpng
 	virtual/jpeg
 	media-libs/tiff
@@ -75,6 +78,17 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-3.14.1-ffmpeg-noinstall.patch
 	# patch from debian for some underlinking in xdmf
 	epatch "${FILESDIR}"/${PN}-3.14.1-xdmf-linking.patch
+	# upstream http://paraview.org/Bug/view.php?id=13222 and 
+	# commit https://github.com/Kitware/ParaView/commit/559af72e540f418310b6425055348336a48ad557
+	epatch "${FILESDIR}"/${PN}-3.14.1-python-exit.patch
+	# disable internal mpi4py copy
+	epatch "${FILESDIR}"/${PN}-3.14.1-mpi4py.patch
+	# remove the internal copy of sqlite (vtksqlite)
+	# http://patch-tracker.debian.org/patch/series/view/paraview/3.14.1-7/removesqlite.patch
+	epatch "${FILESDIR}"/${PN}-3.14.1-removesqlite.patch
+	# gcc 4.7 fix
+	# http://patch-tracker.debian.org/patch/series/view/paraview/3.14.1-7/fix_FTBFS_gcc-4.7.patch
+	epatch "${FILESDIR}"/${PN}-3.14.1-gcc-4.7.patch
 
 	# lib64 fixes
 	sed -i "s:/usr/lib:${EPREFIX}/usr/$(get_libdir):g" \
@@ -82,7 +96,8 @@ src_prepare() {
 	sed -i "s:\/lib\/python:\/$(get_libdir)\/python:g" \
 		Utilities/Xdmf2/CMake/setup_install_paths.py || die
 
-	# Install internal vtk binaries inside /usr/${PVLIBDIR}
+	# Install internal vtk binaries to PV_INSTALL_LIB_DIR as noted in the comment in the cmake file.
+	# upstream doesn't even do what they say they do.
 	sed -e 's:VTK_INSTALL_BIN_DIR \"/${PV_INSTALL_BIN_DIR}\":VTK_INSTALL_BIN_DIR \"/${PV_INSTALL_LIB_DIR}\":' \
 		-i CMake/ParaViewCommon.cmake || die "failed to patch vtk install location"
 
@@ -114,12 +129,12 @@ src_configure() {
 		-DVTK_USE_SYSTEM_ZLIB=ON
 		-DVTK_USE_SYSTEM_EXPAT=ON
 		-DPARAVIEW_USE_SYSTEM_HDF5=ON
+		-DVTK_USE_SYSTEM_HDF5=ON
 		-DCMAKE_VERBOSE_MAKEFILE=ON
 		-DCMAKE_COLOR_MAKEFILE=TRUE
 		-DVTK_USE_SYSTEM_LIBXML2=ON
 		-DVTK_USE_OFFSCREEN=TRUE
 		-DCMAKE_USE_PTHREADS=ON
-		-DBUILD_TESTING=OFF
 		-DVTK_USE_FFMPEG_ENCODER=OFF
 		-DPARAVIEW_INSTALL_THIRD_PARTY_LIBRARIES=OFF
 		-DPROTOC_LOCATION=$(which protoc))
@@ -147,8 +162,14 @@ src_configure() {
 		$(cmake-utils_use theora VTK_USE_THEORA_ENCODER)
 		$(cmake-utils_use theora VTK_USE_SYSTEM_OGGTHEORA))
 
+	# testing, disabling vtk testing as vtkpython is tested and will fail.
+	mycmakeargs+=(
+		$(cmake-utils_use test BUILD_TESTING)
+		$(cmake-utils_use test PARAVIEW_DISABLE_VTK_TESTING))
+
 	if ( use gui ); then
-		mycmakeargs+=(-DVTK_INSTALL_QT_DIR=/${PVLIBDIR}/plugins/designer
+		mycmakeargs+=(
+			-DVTK_INSTALL_QT_DIR=/${PVLIBDIR}/plugins/designer
 			$(cmake-utils_use webkit VTK_QT_USE_WEBKIT))
 		if use python ; then
 			# paraview cannot guess sip directory right probably because a path is not propagated properly
@@ -177,7 +198,8 @@ src_configure() {
 		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_VisTrailPlugin))
 
 	if use python; then
-		mycmakeargs+=($(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_pvblot))
+		mycmakeargs+=(
+			$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_pvblot))
 	fi
 
 	if use coprocessing; then
@@ -214,6 +236,8 @@ pkg_postinst() {
 	elog "If you experience data corruption during parsing of"
 	elog "data files with paraview please try setting your"
 	elog "locale to LC_ALL=C."
+	elog "If you plan to use paraview component from an existing shell"
+	elog "you should run env-update and . /etc/profile first"
 	echo
 }
 


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-visualization/paraview/, sci-visualization/paraview/files/
@ 2012-08-31 10:38 Francois Bissey
  0 siblings, 0 replies; 7+ messages in thread
From: Francois Bissey @ 2012-08-31 10:38 UTC (permalink / raw
  To: gentoo-commits

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@canterbury.ac.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@canterbury.ac.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() {


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-visualization/paraview/, sci-visualization/paraview/files/
@ 2012-12-19 20:56 Francois Bissey
  0 siblings, 0 replies; 7+ messages in thread
From: Francois Bissey @ 2012-12-19 20:56 UTC (permalink / raw
  To: gentoo-commits

commit:     806e962dbf6a59e628837be978adad0b1433909b
Author:     François Bissey <francois.bissey <AT> canterbury <DOT> ac <DOT> nz>
AuthorDate: Wed Dec 19 20:54:53 2012 +0000
Commit:     Francois Bissey <f.r.bissey <AT> massey <DOT> ac <DOT> nz>
CommitDate: Wed Dec 19 20:55:40 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=806e962d

Remove last instances of vtkNetCDF from paraview-3.14

---
 sci-visualization/paraview/ChangeLog               |    4 ++
 .../paraview/files/paraview-3.14.1-vtknetcd.patch  |   50 ++++++++++++++------
 .../paraview/paraview-3.14.1-r4.ebuild             |    4 +-
 3 files changed, 42 insertions(+), 16 deletions(-)

diff --git a/sci-visualization/paraview/ChangeLog b/sci-visualization/paraview/ChangeLog
index 3e1d906..58ffdf4 100644
--- a/sci-visualization/paraview/ChangeLog
+++ b/sci-visualization/paraview/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  19 Dec 2012; François Bissey <francois.bissey@canterbury.ac.nz>
+  paraview-3.14.1-r4.ebuild, files/paraview-3.14.1-vtknetcd.patch:
+  Fix forgotten instances of vtkNetCDF
+
   17 Dec 2012; François Bissey <francois.bissey@canterbury.ac.nz>
   paraview-3.14.1-r4.ebuild:
   sort webkit dependencies

diff --git a/sci-visualization/paraview/files/paraview-3.14.1-vtknetcd.patch b/sci-visualization/paraview/files/paraview-3.14.1-vtknetcd.patch
index eb40466..f6f9e4e 100644
--- a/sci-visualization/paraview/files/paraview-3.14.1-vtknetcd.patch
+++ b/sci-visualization/paraview/files/paraview-3.14.1-vtknetcd.patch
@@ -1,5 +1,5 @@
---- Utilities/CMakeLists.txt.orig	2012-08-31 13:55:56.616827748 +1200
-+++ Utilities/CMakeLists.txt	2012-08-31 13:56:43.487830247 +1200
+--- VTK/Utilities/CMakeLists.txt.orig	2012-08-31 13:55:56.616827748 +1200
++++ VTK/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)
@@ -9,8 +9,8 @@
  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
+--- VTK/Utilities/vtk_netcdf.h.orig	2012-08-31 13:57:25.704832693 +1200
++++ VTK/Utilities/vtk_netcdf.h	2012-08-31 13:57:59.823834877 +1200
 @@ -16,6 +16,6 @@
  #define __vtk_netcdf_h
  
@@ -19,8 +19,8 @@
 +#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
+--- VTK/Utilities/vtk_netcdfcpp.h.orig	2012-08-31 13:58:48.800838210 +1200
++++ VTK/Utilities/vtk_netcdfcpp.h	2012-08-31 13:59:31.223841343 +1200
 @@ -16,6 +16,6 @@
  #define __vtk_netcdfcpp_h
  
@@ -29,8 +29,8 @@
 +#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
+--- VTK/Utilities/vtkexodus2/CMakeLists.txt.orig	2012-08-31 14:01:26.536856845 +1200
++++ VTK/Utilities/vtkexodus2/CMakeLists.txt	2012-08-31 14:02:11.503872711 +1200
 @@ -241,7 +241,7 @@
  
  
@@ -40,8 +40,8 @@
  
  # 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
+--- VTK/Utilities/vtkexodus2/test/CMakeLists.txt.orig	2012-08-31 14:02:39.696882673 +1200
++++ VTK/Utilities/vtkexodus2/test/CMakeLists.txt	2012-08-31 14:02:59.743889790 +1200
 @@ -21,7 +21,7 @@
    )
  
@@ -51,8 +51,8 @@
  
  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
+--- VTK/IO/CMakeLists.txt.orig	2012-08-31 14:05:00.657933170 +1200
++++ VTK/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)
@@ -62,8 +62,8 @@
    ${_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
+--- VTK/vtkIncludeDirectories.cmake.orig	2012-08-31 15:36:06.599955661 +1200
++++ VTK/vtkIncludeDirectories.cmake	2012-08-31 15:37:35.759045094 +1200
 @@ -193,7 +193,7 @@
  VTK_THIRD_PARTY_INCLUDE2(TIFF)
  VTK_THIRD_PARTY_INCLUDE2(EXPAT)
@@ -73,3 +73,25 @@
  VTK_THIRD_PARTY_INCLUDE2(Exodus2)
  IF(VTK_USE_GL2PS)
    VTK_THIRD_PARTY_INCLUDE2(GL2PS)
+--- Plugins/StreamingView/VTK/CMakeLists.txt.orig	2012-12-20 09:43:26.858734060 +1300
++++ Plugins/StreamingView/VTK/CMakeLists.txt	2012-12-20 09:44:49.472845455 +1300
+@@ -10,7 +10,7 @@
+ INCLUDE ( ${VTK_USE_FILE} )
+ 
+ SET ( VTK_LINK_LIBRARIES
+-  vtkRendering vtkGraphics vtkFiltering vtkCommon vtkIO vtkImaging vtkNetCDF)
++  vtkRendering vtkGraphics vtkFiltering vtkCommon vtkIO vtkImaging netcdf)
+ 
+ INCLUDE_DIRECTORIES(${VTKNETCDF_BINARY_DIR})
+ 
+--- Utilities/VisItBridge/databases/CMakeLists.txt.orig	2012-12-20 09:43:39.257750799 +1300
++++ Utilities/VisItBridge/databases/CMakeLists.txt	2012-12-20 09:45:45.321920591 +1300
+@@ -163,7 +163,7 @@
+ #build all the readers into a single library
+ vtk_add_library(vtk${KIT} ${Kit_SRCS} ${VISIT_DB_SOURCES})
+ 
+-target_link_libraries(vtk${KIT} vtkVisItAVTAlgorithms vtkNetCDF) 
++target_link_libraries(vtk${KIT} vtkVisItAVTAlgorithms netcdf) 
+ if(PARAVIEW_HDF5_LIBRARIES)
+   target_link_libraries(vtk${KIT} ${PARAVIEW_HDF5_LIBRARIES})
+ endif(PARAVIEW_HDF5_LIBRARIES)  

diff --git a/sci-visualization/paraview/paraview-3.14.1-r4.ebuild b/sci-visualization/paraview/paraview-3.14.1-r4.ebuild
index 77c2d5c..2475bcc 100644
--- a/sci-visualization/paraview/paraview-3.14.1-r4.ebuild
+++ b/sci-visualization/paraview/paraview-3.14.1-r4.ebuild
@@ -91,6 +91,8 @@ src_prepare() {
 	# gcc 4.7 fix
 	# http://patch-tracker.debian.org/patch/series/view/paraview/3.14.1-7/fix_FTBFS_gcc-4.7.patch
 	epatch "${FILESDIR}"/${PN}-3.14.1-gcc-4.7.patch
+	# adapted from debian patch need to be applied after paraview-3.14.1-removesqlite.patch
+	epatch "${FILESDIR}"/${PN}-3.14.1-vtknetcd.patch
 
 	# lib64 fixes
 	sed -i "s:/usr/lib:${EPREFIX}/usr/$(get_libdir):g" \
@@ -110,8 +112,6 @@ 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() {


^ permalink raw reply related	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2012-12-19 20:56 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-08-28 10:38 [gentoo-commits] proj/sci:master commit in: sci-visualization/paraview/, sci-visualization/paraview/files/ Francois Bissey
  -- strict thread matches above, loose matches on Subject: below --
2012-12-19 20:56 Francois Bissey
2012-08-31 10:38 Francois Bissey
2012-08-30 22:00 Francois Bissey
2012-02-09  0:22 Francois Bissey
2012-02-08  1:15 Francois Bissey
2011-08-24  9:46 Kacper Kowalik

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox