new version of paraview (3.10.1)

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

4 files changed, 221 insertions, 12 deletions

diff --git a/sci-visualization/paraview/ChangeLog b/sci-visualization/paraview/ChangeLog
index c6ff099c8..43e3d2d59 100644
--- a/sci-visualization/paraview/ChangeLog
+++ b/sci-visualization/paraview/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*paraview-3.10.1 (16 Jun 2011)
+
+  16 Jun 2011; François Bissey <francois.bissey@canterbury.ac.nz>
+  +paraview-3.10.1.ebuild, metadata.xml:
+  New paraview ebuild for 3.10.1
+
   13 Apr 2011; Justin Lecher <jlec@gentoo.org> paraview-3.8.1.ebuild:
   Fix for python ABI stuff
 
diff --git a/sci-visualization/paraview/Manifest b/sci-visualization/paraview/Manifest
index fd60bdea2..ade2bc147 100644
--- a/sci-visualization/paraview/Manifest
+++ b/sci-visualization/paraview/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX paraview-3.8.0-h5part.patch 467 RMD160 bd34e8bf02a1855dcfeabdc77cac39bd78a41492 SHA1 8416ef8a782425624b04c28c379d383e8f924c44 SHA256 ea46a024d8cb398c93dabee22ac2bef66af3771477811551275bfa85a765cc3f
 AUX paraview-3.8.0-installpath.patch 1554 RMD160 c998ba929f32892191161a9ead0572e2afbef817 SHA1 41cc9dc5d83bc67290653997145fe9e1b45411c6 SHA256 b57a10a4a2e299385c581231173e4b2c67a0367cf7d8ce1ca618db4c370a9550
 AUX paraview-3.8.0-pointsprite-example-install.patch 400 RMD160 e7e027393025767748844b13f32499134afd3ef1 SHA1 0a78a35d6f51cefe885b79438a94e655eab562f4 SHA256 217b1f02199fef668201ccc78d2db3fce50730123946b992567f1a925ef764dd
@@ -9,14 +6,9 @@ AUX paraview-3.8.0-xdmf-bc.patch 654 RMD160 cc167eadad9e1fafa0495a8fdb231663127d
 AUX paraview-3.8.0-xdmf-cstring.patch 353 RMD160 3866f7d3ea997099b566386956aa69bde0e649d7 SHA1 35ba74274fe5dda3f8d905d602bd14658fdb2e9d SHA256 293395de913fa0fe6540e47bf8ab8daa4917e2c1c1858790f1f50104acaaaa4d
 AUX vtk-5.6.0-cg-path.patch 1106 RMD160 a6cb9f4855dfe417d83e7bba04a02da88af869a6 SHA1 fa5afd4b1a943f255e2f20fa35f440518f9d9d95 SHA256 7ad4eb9a82664a2e9c51d8763e594634027051b54ce48bb1c2fca6d1a42635c9
 AUX vtk-5.6.0-libpng14.patch 734 RMD160 d54626d332130fe242b3a5b1300a650e45763d29 SHA1 e6480b68a14345d7dfa78f6d37ff7301366d99d8 SHA256 81565709c8cfb4df3c28d69df8094d15923d824345330ab5ba101a9780e6e9f9
+DIST ParaView-3.10.1.tar.gz 40696006 RMD160 411087473102ee9d2daf7dd8b61390b4b120645e SHA1 2e56788c9d27f83b5400ffb3770024cf04fa0e4c SHA256 453deee23b6fa62ecb010d951adbc49e740dcb8875680725f93b8f76b9df5cfc
 DIST ParaView-3.8.1.tar.gz 33123181 RMD160 66dff2b84bb4d17b9d44142be79d08bc84c76fa0 SHA1 2cffb622f8b991a36df39bf260a1752de9036eb4 SHA256 37647172af0ac7fc3b677cc2d1e2e825cf364cb4915190da74f19992d84e263c
+EBUILD paraview-3.10.1.ebuild 6901 RMD160 98caee44076c92f3378a1c83084faebdb4c2075b SHA1 5795fa99ac7739c039ce661ba9ddb1738b61d605 SHA256 6153a7027e9c273fcb5bfce0b3e94f661302c31aa1ab6aab607ee7b530badf77
 EBUILD paraview-3.8.1.ebuild 6586 RMD160 c8dbc56dcee166ebdf2b7a2ce7dd0956beae015c SHA1 79347f619c7123ef31314eba18f0d4b1d60351dc SHA256 7c24824fbfef3370f29fbfbf98b7f30518efcf018cc95b130c183d1f5fd80538
-MISC ChangeLog 3070 RMD160 7b4afe0055d31959a92e52526df40d1498850a61 SHA1 16717abafe73767c6add54787113aa2959a6e424 SHA256 7640d0d615b483db52dd70f728b6123e73d3c33243952ea2b97761854092ff3f
-MISC metadata.xml 811 RMD160 f0af97f0b2ef863ad26006ebeba0ae2000f82d2d SHA1 2c90bde6bfb680006a609c6ec6a7b8d3dbb35494 SHA256 75badcaa670d70e163a608a5cb0ae5184ed6e0b2cf96e15413e92ce91627118d
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk2l2e0ACgkQgAnW8HDreRbeXwCfVCJUwiU94USevaTMA92xX4CE
-VMsAoMAZnh5Ga+FV74J0N6cA8CpD0Ddx
-=7GAJ
------END PGP SIGNATURE-----
+MISC ChangeLog 3244 RMD160 ef7f8ac239910f993306ef1ea9e135dd4bc33f06 SHA1 9dae3bd092a465d044caefc77a7acaa6ef6d6fe1 SHA256 3e08dbf16cb37fa5568091887b4fda85ca21e03fa91d2e0f1aaff1a49dd62cf9
+MISC metadata.xml 948 RMD160 acd3fba24e9ce5a26d1e83eafd8ae2216ad5fdfa SHA1 f5dd4382e30821876edac2d40073dac7b7b1f51a SHA256 b76a387976f54894ee55f5dd310070810b5c7d7cc6b0aad3bd0e0d3e7265af90
diff --git a/sci-visualization/paraview/metadata.xml b/sci-visualization/paraview/metadata.xml
index fc440a807..fbac1bb63 100644
--- a/sci-visualization/paraview/metadata.xml
+++ b/sci-visualization/paraview/metadata.xml
@@ -13,6 +13,8 @@
 		<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>
+		<flag name='nvcontrol'>Add NVCONTROL support for OpenGL options</flag>
+		<flag name='webkit'>Built support for qt-webkit in vtk</flag>
 		<flag name='coprocessing'>Enable the coprocessing infrastructure which is mainly useful in the context of clusters</flag>
 	</use>
 </pkgmetadata>
diff --git a/sci-visualization/paraview/paraview-3.10.1.ebuild b/sci-visualization/paraview/paraview-3.10.1.ebuild
new file mode 100644
index 000000000..923a8c50d
--- /dev/null
+++ b/sci-visualization/paraview/paraview-3.10.1.ebuild
@@ -0,0 +1,209 @@
+# 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 eutils flag-o-matic toolchain-funcs versionator multilib python qt4-r2 cmake-utils
+
+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="mpi +python doc examples +gui plugins adaptive streaming cg mysql nvcontrol webkit -coprocessing"
+
+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-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
+
+	# help vtk to find PyQT4 sip if required
+	sed -e 's:/usr/share/sip/PyQt4:/usr/share/sip:' \
+		-i GUISupport/Qt/CMakeLists.txt
+}
+
+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 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_INCLUDE_DIR=$(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=/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
+}