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

5 files changed, 38 insertions, 220 deletions

diff --git a/sci-visualization/paraview/ChangeLog b/sci-visualization/paraview/ChangeLog
index 43e3d2d59..58f33310b 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/Manifest b/sci-visualization/paraview/Manifest
index c319bc148..f3b02f472 100644
--- a/sci-visualization/paraview/Manifest
+++ b/sci-visualization/paraview/Manifest
@@ -1,6 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX paraview-3.10.1-gcc46.patch 513 RMD160 d9a1a8d7ce2746d376c645e020df0024fa4b266b SHA1 a8684f5e8c07726b903eec9441dfa211a6a01ed2 SHA256 23416471150decc89294dc4c24294d2204ef570c2d79466634079f14014ba1c8
 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
@@ -10,15 +8,6 @@ AUX paraview-3.8.0-xdmf-cstring.patch 353 RMD160 3866f7d3ea997099b566386956aa69b
 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 6bb0af48a22901a61c23376deadab81c84a49fa0 SHA1 b0544ae5f6368dc78bb58e57bad0e0ad694ffdf7 SHA256 d1406c1871e26610cd49b82a71d95d52ce9247a268585e3082395e0bd887d47a
-EBUILD paraview-3.8.1.ebuild 6586 RMD160 fae939107adbc9976502ca7cfd9bf5b049ae5839 SHA1 aec4247b1a4d55aafb4f3207f5208f63d1dbfa4e SHA256 a735f01a84a98096df3bf26ad7f2c66b1aa16391493222b565413e01403661c0
-MISC ChangeLog 3244 RMD160 ef7f8ac239910f993306ef1ea9e135dd4bc33f06 SHA1 9dae3bd092a465d044caefc77a7acaa6ef6d6fe1 SHA256 3e08dbf16cb37fa5568091887b4fda85ca21e03fa91d2e0f1aaff1a49dd62cf9
+EBUILD paraview-3.10.1.ebuild 6954 RMD160 eedabe8b1082ebb985000a34f37b8f6c73796cea SHA1 536a4802334341d35d976e6bcc7c33664b851950 SHA256 914d515c4b0d260ca146abe30db0a8dabcc97f30aac6da0db3ac56d1ec10d8d1
+MISC ChangeLog 3456 RMD160 307844743d5ac7e6e063bbd0c695e125565134de SHA1 864549c5e8cd4a49b32d527f6c464ca29babdf29 SHA256 9d01e99ef654d83b7b98ff14d0ef5c3264eb262011625dc3259eedd9234c2fcc
 MISC metadata.xml 948 RMD160 acd3fba24e9ce5a26d1e83eafd8ae2216ad5fdfa SHA1 f5dd4382e30821876edac2d40073dac7b7b1f51a SHA256 b76a387976f54894ee55f5dd310070810b5c7d7cc6b0aad3bd0e0d3e7265af90
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk4EsDoACgkQgAnW8HDreRanqQCgsyu4XyjmwghPYz6kcGrbePYo
-5M4An17CRUJnoC1uua/JUUws3eOVZvH5
-=xLpZ
------END PGP SIGNATURE-----
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 000000000..20be721ec
--- /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 f17fcfced..4dd9f3aa3 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 5057b42e8..000000000
--- 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
-}