New revision. paraview-3.6.1 should now be able to coexist with vtk (#(#279264).

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

3 files changed, 243 insertions, 2 deletions

diff --git a/sci-visualization/paraview/ChangeLog b/sci-visualization/paraview/ChangeLog
index 04afc6ad5dec..d4971672f4e9 100644
--- a/sci-visualization/paraview/ChangeLog
+++ b/sci-visualization/paraview/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-visualization/paraview
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/ChangeLog,v 1.39 2009/07/28 15:16:45 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/ChangeLog,v 1.40 2009/07/30 14:13:04 markusle Exp $
+
+*paraview-3.6.1-r1 (29 Jul 2009)
+
+  29 Jul 2009; Markus Dittrich <markusle@gentoo.org>
+  +paraview-3.6.1-r1.ebuild:
+  New revision. paraview-3.6.1 should now be able to coexist with vtk
+  (#279264).
 
   28 Jul 2009; Markus Dittrich <markusle@gentoo.org> paraview-3.6.1.ebuild,
   +files/paraview-3.6.1-no-doc-finder.patch:
diff --git a/sci-visualization/paraview/Manifest b/sci-visualization/paraview/Manifest
index b6b3ee35ac4a..55ba30f137d9 100644
--- a/sci-visualization/paraview/Manifest
+++ b/sci-visualization/paraview/Manifest
@@ -18,6 +18,7 @@ DIST paraview-3.6.1-openfoam-r120.patch.bz2 58046 RMD160 dec759a9d0bebd83bee6d99
 DIST paraview-3.6.1.tar.gz 27119089 RMD160 8892434c1096d18e83bce6c62f1a7b07a8be1f0a SHA1 aedbe3bf8d831816972129c185565b582e331b53 SHA256 df71c052a4f85a568d3e4a4b55abb257c976795492d3991e32fe4100c3fd8a4e
 EBUILD paraview-3.3_pre20080514.ebuild 5811 RMD160 a9d6d865780f1186d87681bedc80e9c14183224c SHA1 98ab4cf8ed0b47678007c9d98d035c4922eeccb6 SHA256 33b3e81eec889e84fd582fe878a24664137c134d95f535ccbe6756992b348a04
 EBUILD paraview-3.4.0.ebuild 5365 RMD160 032b9da72489a5c737178265705cabd47859e710 SHA1 afe3da6fba526a1b071fbbd229879b6d682e669b SHA256 90dad827174b7e8e254aee4425c7daa4b3432ac9490ab1ae3b6496a98cfe15ed
+EBUILD paraview-3.6.1-r1.ebuild 9833 RMD160 c3e663a01ee8ca2d013e2f63a15b3b1a509a6cd7 SHA1 77bf699412f689e9aeee056a1a1947fedf3ac38d SHA256 2614998da39c89c2d9f17cc630bbb2db8f27b981c8da2d25246844d745139203
 EBUILD paraview-3.6.1.ebuild 9491 RMD160 f7677e326122f8303452f2e04be6b5594d63d685 SHA1 7150ec41d01de82c381e4335d048b09bf7b04f6a SHA256 79c2ad8a1b7ebc7f3abe2f628c7ee15fc304a161c307f042b9e4ad631410c970
-MISC ChangeLog 7988 RMD160 bed96f203b6387fd40982a54cb0c07bd6bc8e872 SHA1 8ea21b54ef96afa2d3c33ef3d45c75b8f2cef3a5 SHA256 47ff07bcb838ffa36e935135c4a6762fe6ade9e63633330967c0ac5c98b6fce1
+MISC ChangeLog 8188 RMD160 77ad6d2d38675519d133a47f3b6b13fe198ec513 SHA1 ab7a0d2923d3f583e3f6afeb5779fa601a0fe9c8 SHA256 cdec8dc6065cf14a9a3af594d01b332e0fe0fb6bfaf5de037009e41f29bd0eb2
 MISC metadata.xml 399 RMD160 131a5c96291217e416af0d726c40ed5624e3bf7b SHA1 f4b99deaa2bb2bf39c32b16fb8bfff81fb14759d SHA256 8c9a511c364dce29e73c21df5a6e51e94817e33e16a27127bba8f4ec9f3ba9cb
diff --git a/sci-visualization/paraview/paraview-3.6.1-r1.ebuild b/sci-visualization/paraview/paraview-3.6.1-r1.ebuild
new file mode 100644
index 000000000000..15304b0f24d3
--- /dev/null
+++ b/sci-visualization/paraview/paraview-3.6.1-r1.ebuild
@@ -0,0 +1,233 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/paraview-3.6.1-r1.ebuild,v 1.1 2009/07/30 14:13:04 markusle Exp $
+
+EAPI="2"
+
+inherit distutils eutils flag-o-matic toolchain-funcs versionator python qt4
+
+MAIN_PV=$(get_major_version)
+MAJOR_PV=$(get_version_component_range 1-2)
+
+DESCRIPTION="ParaView is a powerful scientific data visualization application"
+HOMEPAGE="http://www.paraview.org"
+SRC_URI="mirror://gentoo/${P}.tar.gz
+	mirror://gentoo/${P}-openfoam-gpl-r120.patch.bz2
+	mirror://gentoo/${P}-openfoam-r120.patch.bz2"
+
+LICENSE="paraview GPL-2"
+KEYWORDS="~x86 ~amd64"
+SLOT="0"
+IUSE="mpi python hdf5 doc examples qt4 plugins boost"
+RDEPEND="hdf5? ( sci-libs/hdf5 )
+	mpi? ( || (
+				sys-cluster/openmpi
+				sys-cluster/mpich2[cxx] ) )
+	python? ( >=dev-lang/python-2.0 )
+	qt4? ( x11-libs/qt-gui:4
+			x11-libs/qt-qt3support:4
+			x11-libs/qt-assistant:4 )
+	boost? ( >=dev-libs/boost-1.37 )
+	dev-libs/libxml2
+	media-libs/libpng
+	media-libs/jpeg
+	media-libs/tiff
+	media-video/ffmpeg
+	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"
+
+# NOTE: vtk and paraview currently don't get along well
+# (#279264, #212947) hence we need to block it
+DEPEND="${RDEPEND}
+		doc? ( app-doc/doxygen )
+		>=dev-util/cmake-2.6.4"
+
+PVLIBDIR="$(get_libdir)/${PN}-${MAJOR_PV}"
+BUILDDIR="${WORKDIR}/build"
+S="${WORKDIR}"/ParaView${MAIN_PV}
+
+src_prepare() {
+	mkdir "${BUILDDIR}" || die "Failed to generate build directory"
+	epatch "${FILESDIR}"/${P}-qt.patch
+	epatch "${FILESDIR}"/${P}-pointsprite-disable.patch
+	epatch "${FILESDIR}"/${P}-assistant.patch
+	epatch "${DISTDIR}"/${P}-openfoam-r120.patch.bz2
+	epatch "${DISTDIR}"/${P}-openfoam-gpl-r120.patch.bz2
+	epatch "${FILESDIR}"/${P}-no-doc-finder.patch
+
+	if use hdf5 && has_version '>=sci-libs/hdf5-1.8.0'; then
+		epatch "${FILESDIR}"/${P}-hdf-1.8.3.patch
+	fi
+
+	# fix GL issues
+	sed -e "s:DEPTH_STENCIL_EXT:DEPTH_COMPONENT24:" \
+		-i VTK/Rendering/vtkOpenGLRenderWindow.cxx \
+		|| die "Failed to fix GL issues."
+
+	# fix plugin install directory
+	sed -e "s:\${PV_INSTALL_BIN_DIR}/plugins:/usr/${PVLIBDIR}/plugins:" \
+		-i CMake/ParaViewPlugins.cmake \
+		|| die "Failed to fix plugin install directories"
+}
+
+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=OFF"
+	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"
+	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DCMAKE_VERBOSE_MAKEFILE:BOOL=OFF"
+	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DEXPAT_INCLUDE_DIR:PATH=/usr/include"
+	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DEXPAT_LIBRARY=/usr/$(get_libdir)/libexpat.so"
+	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DOPENGL_gl_LIBRARY=/usr/$(get_libdir)/libGL.so"
+	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DOPENGL_glu_LIBRARY=/usr/$(get_libdir)/libGLU.so"
+	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_GLEXT_FILE=/usr/include/GL/glext.h"
+	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_GLXEXT_FILE=/usr/include/GL/glxext.h"
+	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DCMAKE_COLOR_MAKEFILE:BOOL=TRUE"
+	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_SYSTEM_LIBXML2:BOOL=ON"
+	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_BUILD_StreamingParaView:BOOL=ON"
+	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_OFFSCREEN=TRUE"
+	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DCMAKE_USE_PTHREADS:BOOL=ON"
+	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DBUILD_TESTING:BOOL=OFF"
+
+	# FIXME: compiling against ffmpeg is currently broken
+	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_FFMPEG_ENCODER:BOOL=OFF"
+
+	if use boost; then
+		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_BOOST:BOOL=ON"
+	else
+		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_BOOST:BOOL=OFF"
+	fi
+
+	if use hdf5; then
+		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_USE_SYSTEM_HDF5:BOOL=ON"
+
+		# we also need to append -DH5Tget_array_dims_vers=1 to our CFLAGS
+		# to make sure we can compile against >=hdf5-1.8.3
+		append-flags -DH5_USE_16_API
+	fi
+
+	if use mpi; then
+		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_USE_MPI:BOOL=ON"
+	fi
+
+	if use python; then
+		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_ENABLE_PYTHON:BOOL=ON"
+	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
+
+	local plugin_toggle="OFF"
+	if use plugins; then
+		plugin_toggle="ON"
+	fi
+	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_BUILD_OverView:BOOL=${plugin_toggle}"
+	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_BUILD_PLUGIN_ARRAY:BOOL=${plugin_toggle}"
+	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_BUILD_PLUGIN_ClientGraphViewFrame:BOOL=${plugin_toggle}"
+	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_BUILD_PLUGIN_CosmoFilters:BOOL=${plugin_toggle}"
+	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_BUILD_PLUGIN_Infovis:BOOL=${plugin_toggle}"
+	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_BUILD_PLUGIN_Moments,:BOOL=${plugin_toggle}"
+	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_BUILD_PLUGIN_PointSprite:BOOL=${plugin_toggle}"
+	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_BUILD_PLUGIN_Prism:BOOL=${plugin_toggle}"
+	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_BUILD_PLUGIN_SLACTools:BOOL=${plugin_toggle}"
+	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_BUILD_PLUGIN_Streaming:BOOL=${plugin_toggle}"
+	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_BUILD_PLUGIN_netCDFReaders:BOOL=${plugin_toggle}"
+	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_BUILD_PLUGIN_pvblot:BOOL=${plugin_toggle}"
+
+	# these plugins currently don't configure so turn them off for now
+	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_BUILD_PLUGIN_VisItReaderPlugin:BOOL=OFF"
+	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_BUILD_PLUGIN_TableToSparseArrayPanel:BOOL=OFF"
+
+	# these plugins currently don't compile so turn them off for now
+	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_BUILD_PLUGIN_ClientGraphView:BOOL=OFF"
+	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_BUILD_PLUGIN_SplitTableFieldPanel:BOOL=OFF"
+	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_BUILD_PLUGIN_SQLDatabaseGraphSourcePanel:BOOL=OFF"
+	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_BUILD_PLUGIN_SQLDatabaseTableSourcePanel:BOOL=OFF"
+	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_BUILD_PLUGIN_TableToGraphPanel:BOOL=OFF"
+	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_BUILD_PLUGIN_ThresholdTablePanel:BOOL=OFF"
+	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_BUILD_PLUGIN_StatisticsToolbar:BOOL=OFF"
+	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_BUILD_PLUGIN_ClientGeoView2D:BOOL=OFF"
+	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_BUILD_PLUGIN_ClientGeoView:BOOL=OFF"
+	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_BUILD_PLUGIN_ClientTableView:BOOL=OFF"
+	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_BUILD_PLUGIN_ClientHierarchyView:BOOL=OFF"
+	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_BUILD_PLUGIN_ClientRecordView:BOOL=OFF"
+	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_BUILD_PLUGIN_CommonToolbar:BOOL=OFF"
+	CMAKE_VARIABLES="${CMAKE_VARIABLES}	-DPARAVIEW_BUILD_PLUGIN_ClientTreeView:BOOL=no"
+	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_BUILD_PLUGIN_GraphLayoutFilterPanel:BOOL=OFF"
+
+	if use qt4; then
+		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_BUILD_QT_GUI:BOOL=ON"
+		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_INSTALL_QT_DIR=/${PVLIBDIR}/plugins/designer"
+	else
+		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_BUILD_QT_GUI: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"
+
+	# rename the assistant wrapper
+	if use qt4; then
+		mv "${D}"/usr/bin/assistant "${D}"/usr/bin/paraview-assistant \
+			|| die "Failed to rename assistant wrapper"
+		chmod 0755 "${D}"/usr/${PVLIBDIR}/assistant-real \
+			|| die "Failed to change permissions on assistant wrapper"
+	fi
+
+	# set up the environment
+	echo "LDPATH=/usr/${PVLIBDIR}" >> "${T}"/40${PN}
+	doenvd "${T}"/40${PN}
+
+	# move and remove some of the files that should not be
+	# in /usr/bin
+	dohtml "${D}/usr/bin/about.html" && rm -f "${D}/usr/bin/about.html" \
+		|| die "Failed to move about.html into doc dir"
+
+	# this binary does not work and probably should not be installed
+	rm -f "${D}/usr/bin/vtkSMExtractDocumentation" \
+		|| die "Failed to remove vtkSMExtractDocumentation"
+
+	# rename /usr/bin/lproj to /usr/bin/lproj_paraview to avoid
+	# a file collision with vtk which installs the same file
+	mv "${D}/usr/bin/lproj" "${D}/usr/bin/lproj_paraview"  \
+		|| die "Failed to rename /usr/bin/lproj"
+}
+
+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."
+	elog "The binary /usr/bin/lproj has been renamed to"
+	elog "/usr/bin/lproj_paraview to avoid a file collision"
+	elog "with vtk."
+	echo
+}