Version bump.

(Portage version: 2.1.2-r9)

5 files changed, 153 insertions, 2 deletions

diff --git a/sci-visualization/paraview/ChangeLog b/sci-visualization/paraview/ChangeLog
index 9968dac70ff2..1fc03038e73f 100644
--- a/sci-visualization/paraview/ChangeLog
+++ b/sci-visualization/paraview/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-visualization/paraview
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/ChangeLog,v 1.4 2006/11/29 13:41:14 markusle Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/ChangeLog,v 1.5 2007/02/20 14:17:05 markusle Exp $
+
+*paraview-2.6.0 (20 Feb 2007)
+
+  20 Feb 2007; Markus Dittrich <markusle@gentoo.org>
+  +files/paraview-2.6.0-hdf5-zlib.patch,
+  +files/paraview-2.6.0-include.patch, +paraview-2.6.0.ebuild:
+  Version bump.
 
   29 Nov 2006; Markus Dittrich <markusle@gentoo.org>
   +files/paraview-2.4.4-python-wrap.patch, paraview-2.4.4.ebuild:
diff --git a/sci-visualization/paraview/files/digest-paraview-2.6.0 b/sci-visualization/paraview/files/digest-paraview-2.6.0
new file mode 100644
index 000000000000..12b539866e72
--- /dev/null
+++ b/sci-visualization/paraview/files/digest-paraview-2.6.0
@@ -0,0 +1,3 @@
+MD5 7df79f56097230e89666f16ad65590f5 ParaView-2.6.0.tar.gz 73577038
+RMD160 1667d19c73e6dffa4e659941aea618271b308b73 ParaView-2.6.0.tar.gz 73577038
+SHA256 f379f790589dedc10d8c894a9b458fcec15a81a20a785679a784d9568f15bcc6 ParaView-2.6.0.tar.gz 73577038
diff --git a/sci-visualization/paraview/files/paraview-2.6.0-hdf5-zlib.patch b/sci-visualization/paraview/files/paraview-2.6.0-hdf5-zlib.patch
new file mode 100644
index 000000000000..31a4c1166c4c
--- /dev/null
+++ b/sci-visualization/paraview/files/paraview-2.6.0-hdf5-zlib.patch
@@ -0,0 +1,16 @@
+diff -Naur ParaView-2.6.0/CMake/ParaViewCommon.cmake ParaView-2.6.0-new/CMake/ParaViewCommon.cmake
+--- ParaView-2.6.0/CMake/ParaViewCommon.cmake	2006-10-24 11:12:48.000000000 -0400
++++ ParaView-2.6.0-new/CMake/ParaViewCommon.cmake	2007-02-19 09:42:19.000000000 -0500
+@@ -293,7 +293,11 @@
+   SET(VTKHDF5_INSTALL_NO_RUNTIME ${PV_INSTALL_NO_RUNTIME})
+   SET(VTKHDF5_INSTALL_LIB_DIR ${PV_INSTALL_LIB_DIR})
+   SET(PARAVIEW_HDF5_LIBRARIES vtkhdf5)
+-  SET(HDF5_ZLIB_HEADER "vtk_zlib.h")
++  IF(VTK_USE_SYSTEM_ZLIB)
++    SET(HDF5_ZLIB_HEADER "zlib.h")
++  ELSE(VTK_USE_SYSTEM_ZLIB)
++    SET(HDF5_ZLIB_HEADER "vtk_zlib.h")
++  ENDIF(VTK_USE_SYSTEM_ZLIB)
+   SET(HDF5_INCLUDE_DIR 
+     ${ParaView_SOURCE_DIR}/Utilities/hdf5
+     ${ParaView_BINARY_DIR}/Utilities/hdf5)
diff --git a/sci-visualization/paraview/files/paraview-2.6.0-include.patch b/sci-visualization/paraview/files/paraview-2.6.0-include.patch
new file mode 100644
index 000000000000..35ac11719393
--- /dev/null
+++ b/sci-visualization/paraview/files/paraview-2.6.0-include.patch
@@ -0,0 +1,11 @@
+diff -Naur ParaView-2.6.0/Utilities/VTKClientServer/CMakeLists.txt ParaView-2.6.0-new/Utilities/VTKClientServer/CMakeLists.txt
+--- ParaView-2.6.0/Utilities/VTKClientServer/CMakeLists.txt	2006-10-24 11:12:49.000000000 -0400
++++ ParaView-2.6.0-new/Utilities/VTKClientServer/CMakeLists.txt	2007-02-19 15:28:51.000000000 -0500
+@@ -21,6 +21,7 @@
+   ${VTKCS_SOURCE_DIR}
+   ${VTKCS_BINARY_DIR}
+   ${VTK_INCLUDE_DIR}
++  ${VTK_SOURCE_DIR}/Infovis
+   )
+ 
+ # OpenGL include directories.
diff --git a/sci-visualization/paraview/paraview-2.6.0.ebuild b/sci-visualization/paraview/paraview-2.6.0.ebuild
new file mode 100644
index 000000000000..8c42c77cd98f
--- /dev/null
+++ b/sci-visualization/paraview/paraview-2.6.0.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/paraview-2.6.0.ebuild,v 1.1 2007/02/20 14:17:05 markusle Exp $
+
+inherit distutils eutils flag-o-matic toolchain-funcs versionator python
+
+MY_PN="${PN/p/P}"
+MY_PN="${MY_PN/v/V}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="ParaView is a powerful scientific data visualization application"
+HOMEPAGE="http://www.paraview.org"
+SRC_URI="http://www.${MY_PN}.org/files/v2.4/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~x86"
+SLOT="0"
+IUSE="mpi python hdf5 doc examples ffmpeg threads"
+RDEPEND="hdf5? ( sci-libs/hdf5 )
+	doc? ( app-doc/doxygen )
+	mpi? ( sys-cluster/mpich )
+	python? ( >=dev-lang/python-2.0 )
+	ffmpeg? ( media-video/ffmpeg )
+	media-libs/libpng
+	media-libs/jpeg
+	media-libs/tiff
+	dev-libs/expat
+	sys-libs/zlib
+	media-libs/freetype
+	virtual/opengl
+	dev-lang/tcl
+	dev-lang/tk
+	|| ( x11-libs/libXmu virtual/x11 )"
+
+DEPEND="${RDEPEND}
+		>=dev-util/cmake-2.4.3"
+
+PVLIBDIR="$(get_libdir)/${MY_PN}-$(get_version_component_range 1-2)"
+BUILDDIR="${WORKDIR}/build"
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	mkdir "${BUILDDIR}" || die "Failed to generate build directory"
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-hdf5-zlib.patch
+	epatch "${FILESDIR}"/${P}-include.patch
+}
+
+src_compile() {
+	cd "${BUILDDIR}"
+	local CMAKE_VARIABLES=""
+	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPV_INSTALL_LIB_DIR:PATH=/${PVLIBDIR}"
+	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DCMAKE_SKIP_RPATH:BOOL=YES"
+	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_RPATH:BOOL=NO"
+	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DCMAKE_INSTALL_PREFIX:PATH=/usr"
+	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DBUILD_SHARED_LIBS:BOOL=ON"
+	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_SYSTEM_FREETYPE:BOOL=ON"
+	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_SYSTEM_JPEG:BOOL=ON"
+	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_SYSTEM_PNG:BOOL=ON"
+	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_SYSTEM_TIFF:BOOL=ON"
+	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_SYSTEM_ZLIB:BOOL=ON"
+	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_SYSTEM_EXPAT:BOOL=ON"
+
+	if use hdf5; then
+		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_USE_SYSTEM_HDF5:BOOL=ON"
+	fi
+
+	if use mpi; then
+		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_MPI:BOOL=ON"
+	fi
+
+	if use python; then
+		python_version
+		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_WRAP_PYTHON:BOOL=ON"
+		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPYTHON_INCLUDE_PATH:PATH=/usr/include/python${PYVER}"
+		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPYTHON_LIBRARY:PATH=/usr/$(get_libdir)/libpython${PYVER}.so"
+	fi
+
+	if use ffmpeg; then
+		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_FFMPEG_ENCODER:BOOL=ON"
+	else
+		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_FFMPEG_ENCODER:BOOL=OFF"
+	fi
+
+	use doc && CMAKE_VARIABLES="${CMAKE_VARIABLES} -DBUILD_DOCUMENTATION:BOOL=ON"
+
+	if use examples; then
+		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DBUILD_EXAMPLES:BOOL=ON"
+	else
+		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DBUILD_EXAMPLES:BOOL=OFF"
+	fi
+
+	if use threads; then
+		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DCMAKE_USE_PTHREADS:BOOL=ON"
+	else
+		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DCMAKE_USE_PTHREADS:BOOL=OFF"
+	fi
+
+	cmake ${CMAKE_VARIABLES} ${S} \
+		|| die "cmake configuration failed"
+
+	emake || die "emake failed"
+
+}
+
+src_install() {
+	cd ${BUILDDIR}
+	make DESTDIR=${D} install || die "make install failed"
+
+	# set up the environment
+	echo "LDPATH=/usr/${PVLIBDIR}" >> ${T}/40${PN}
+	doenvd ${T}/40${PN}
+}