Version bump.

Package-Manager: portage-2.1.2-r9

6 files changed, 173 insertions, 6 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/Manifest b/sci-visualization/paraview/Manifest
index 1383302b9e8b..492c061ad011 100644
--- a/sci-visualization/paraview/Manifest
+++ b/sci-visualization/paraview/Manifest
@@ -10,15 +10,28 @@ AUX paraview-2.4.4-python-wrap.patch 1238 RMD160 8e4d18a7d270cae4b6bfd40a31a82b2
 MD5 95935ec06af359c9926e24daed88889a files/paraview-2.4.4-python-wrap.patch 1238
 RMD160 8e4d18a7d270cae4b6bfd40a31a82b2857d01977 files/paraview-2.4.4-python-wrap.patch 1238
 SHA256 9753b8d5f2cc4af9bdb58d6087c59195400d5db91b1ddce300a9f7c7c5d9e0db files/paraview-2.4.4-python-wrap.patch 1238
+AUX paraview-2.6.0-hdf5-zlib.patch 754 RMD160 6cfe179aae58f40d424e797384d0931e6c618721 SHA1 6431e39fa027f64abcf43a5c298d9ab0dd02a8b4 SHA256 535bc330528f61c62a6dac45395e704beb94a7dbdc687ed28e1f17ed47dbc69c
+MD5 9eeeaa3e1b4775fe14a0db9dd937a516 files/paraview-2.6.0-hdf5-zlib.patch 754
+RMD160 6cfe179aae58f40d424e797384d0931e6c618721 files/paraview-2.6.0-hdf5-zlib.patch 754
+SHA256 535bc330528f61c62a6dac45395e704beb94a7dbdc687ed28e1f17ed47dbc69c files/paraview-2.6.0-hdf5-zlib.patch 754
+AUX paraview-2.6.0-include.patch 476 RMD160 9f44a83f73da1accd7ea3d8c353f4de50849b654 SHA1 57d67067fae5124b30dcce8317e0e7ae4a5a4976 SHA256 b8ebb52e9181c992561974de39d43a4c20398bed6760dda495dc82d45376fe77
+MD5 7ca34646cb286751c3ed73d9844cf426 files/paraview-2.6.0-include.patch 476
+RMD160 9f44a83f73da1accd7ea3d8c353f4de50849b654 files/paraview-2.6.0-include.patch 476
+SHA256 b8ebb52e9181c992561974de39d43a4c20398bed6760dda495dc82d45376fe77 files/paraview-2.6.0-include.patch 476
+DIST ParaView-2.6.0.tar.gz 73577038 RMD160 1667d19c73e6dffa4e659941aea618271b308b73 SHA1 01d805aced25a798487d11ddbf7cb1571844faea SHA256 f379f790589dedc10d8c894a9b458fcec15a81a20a785679a784d9568f15bcc6
 DIST paraview-2.4.4.tar.gz 45431692 RMD160 21877872a56ffa44a5cc15232fe58bdcb4c94c2d SHA1 a5fa3263a8baf427ce0c1d587da1095e1cbb417e SHA256 2af388f046ceeff87fa6241ce91bfb55ac090c47f817486f130b7c8714aa8b1e
 EBUILD paraview-2.4.4.ebuild 3403 RMD160 3520593a08235bb565b42040b6cfec095acfd530 SHA1 2bec51af92c4ff3c556026730cca036be3a910f3 SHA256 a55a1188652f765e140c0d380d9da8e78ecc455adb883835af25737aac4c8aa2
 MD5 e55fcb1639035a2b0eb202b73e4d13b3 paraview-2.4.4.ebuild 3403
 RMD160 3520593a08235bb565b42040b6cfec095acfd530 paraview-2.4.4.ebuild 3403
 SHA256 a55a1188652f765e140c0d380d9da8e78ecc455adb883835af25737aac4c8aa2 paraview-2.4.4.ebuild 3403
-MISC ChangeLog 910 RMD160 40d43d06e1e1cce7c4809fd7b2a7e01d8ee4b57f SHA1 6dcc44205588e2f5c69343752019922a623af762 SHA256 6f81bf9de6356d4f3e3f5be73334f88ce43eb5cf3fb5f358bc8f62869eb21202
-MD5 20684cb9bfc82a6ff863a4a118d4f090 ChangeLog 910
-RMD160 40d43d06e1e1cce7c4809fd7b2a7e01d8ee4b57f ChangeLog 910
-SHA256 6f81bf9de6356d4f3e3f5be73334f88ce43eb5cf3fb5f358bc8f62869eb21202 ChangeLog 910
+EBUILD paraview-2.6.0.ebuild 3518 RMD160 630682a5065fd833ed0a4159d87b25d86daac0eb SHA1 1e687fb1f73f2d012864b1653f4ab0b72077fa17 SHA256 db5c27387ef66dc5cd05c55806b30ae999a6a2e779c998544d9f8de909b46ade
+MD5 69d6c2998aeaf928a2334863f8acd2bd paraview-2.6.0.ebuild 3518
+RMD160 630682a5065fd833ed0a4159d87b25d86daac0eb paraview-2.6.0.ebuild 3518
+SHA256 db5c27387ef66dc5cd05c55806b30ae999a6a2e779c998544d9f8de909b46ade paraview-2.6.0.ebuild 3518
+MISC ChangeLog 1115 RMD160 d6151c03fefb533dc4b39f76fd8335c1d8d19d88 SHA1 68a8498a2d39c3b7db56a5f68e6e1110ef99729a SHA256 99ea11f1b898f365a59e58e87da7c539ff31a443dca0b84cbf644ac0ac656f1b
+MD5 656f423d14ed9c97f02c24e559d08723 ChangeLog 1115
+RMD160 d6151c03fefb533dc4b39f76fd8335c1d8d19d88 ChangeLog 1115
+SHA256 99ea11f1b898f365a59e58e87da7c539ff31a443dca0b84cbf644ac0ac656f1b ChangeLog 1115
 MISC metadata.xml 254 RMD160 8e9562c9dd3bd05fdf2dd40bcc5b2ed3dbe9ab75 SHA1 53acb8f334765223c1030a8eb242d584ad376706 SHA256 131c089c8a699c3fb7e8b914f68af259e0b0ad341fba3a8f87827871fc7be701
 MD5 faca3b9ef12d38400a0b53e1818ce89d metadata.xml 254
 RMD160 8e9562c9dd3bd05fdf2dd40bcc5b2ed3dbe9ab75 metadata.xml 254
@@ -26,3 +39,6 @@ SHA256 131c089c8a699c3fb7e8b914f68af259e0b0ad341fba3a8f87827871fc7be701 metadata
 MD5 b309956e3e4dbeef4fe9ced4c207239c files/digest-paraview-2.4.4 250
 RMD160 329fce13819ea910f848e506834d67a5212e607e files/digest-paraview-2.4.4 250
 SHA256 8570b4f543e3efc6f150426f2963110622db9c4730e17cb98c492adc1a1171e8 files/digest-paraview-2.4.4 250
+MD5 4b06c1481b09c0dcd7f806e47bc39596 files/digest-paraview-2.6.0 250
+RMD160 a5c270e9d7094da9f2188742ba7eec9c96980744 files/digest-paraview-2.6.0 250
+SHA256 7c86c73da59dab29e17129b248944b7b674f347f8de7e0da04ce7fd7ecc86bcb files/digest-paraview-2.6.0 250
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}
+}