Restore paraview-3.8.0 while problems with 3.8.1 are sorted out.

3 files changed, 205 insertions, 1 deletions

diff --git a/sci-visualization/paraview/ChangeLog b/sci-visualization/paraview/ChangeLog
index 4a89a1eeb..a11addf0b 100644
--- a/sci-visualization/paraview/ChangeLog
+++ b/sci-visualization/paraview/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  29 Oct 2010; François Bissey <f.r.bissey@massey.ac.nz>
+  +paraview-3.8.0.ebuild:
+  Restore paraview-3.8.0 while working on several issues with 3.8.1
+
   27 Oct 2010; François Bissey <f.r.bissey@massey.ac.nz>
   paraview-3.8.1.ebuild:
   Fix installation of copies of Qt and ffmpeg and so on.
diff --git a/sci-visualization/paraview/Manifest b/sci-visualization/paraview/Manifest
index 4c245eaad..3b7b4067b 100644
--- a/sci-visualization/paraview/Manifest
+++ b/sci-visualization/paraview/Manifest
@@ -6,7 +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.8.0.tar.gz 31703024 RMD160 8eb8fc590cf723848ef18b368b1e0e46dd38de8d SHA1 410d421fc32fd43a46ac6f48d6404954cc592597 SHA256 fe26c5aab225e804a9d890007d3963988c5f1000bdb270576dc9c2549c6a4078
 DIST ParaView-3.8.1.tar.gz 33123181 RMD160 66dff2b84bb4d17b9d44142be79d08bc84c76fa0 SHA1 2cffb622f8b991a36df39bf260a1752de9036eb4 SHA256 37647172af0ac7fc3b677cc2d1e2e825cf364cb4915190da74f19992d84e263c
+EBUILD paraview-3.8.0.ebuild 6458 RMD160 c5f1c506317e2627546cb02cc15934325b6e7e84 SHA1 e9a010b5c88d856c5a440c212ba2ca69ff38d68e SHA256 d0b69a0117ae04d34f21bcc0975f041417179d534524901c954994e41a2e7af3
 EBUILD paraview-3.8.1.ebuild 6679 RMD160 943e8880f9f2e765b408525b5ce1abe591509f99 SHA1 43d6e7e9b9a547964ab80bd3b45f25e6d2ce33ac SHA256 fe8312ac918d9ea071005cde3b6889a894d3fd6d22de28ecf010e93a4f1c5263
-MISC ChangeLog 1515 RMD160 ec83a5055caac1030ac10d4dc54f47c2a48653f5 SHA1 73c0898e4640aa8bfb91265ad95fdfb5b55d9131 SHA256 09a82e25fa351ab6fbcd61c5fb9f6c8046c2db5a7713334da79bc9508e5a9f8e
+MISC ChangeLog 1668 RMD160 1f3c7031f7e20da222ed8662babbf19df4c9e45f SHA1 73e5b3d515608deffaacafb878da10ff3fb3cd8e SHA256 4346a750e8ee92be6a8b7d2d9194711821d0f9165ba53f0781a6744c9cc6df51
 MISC metadata.xml 811 RMD160 f0af97f0b2ef863ad26006ebeba0ae2000f82d2d SHA1 2c90bde6bfb680006a609c6ec6a7b8d3dbb35494 SHA256 75badcaa670d70e163a608a5cb0ae5184ed6e0b2cf96e15413e92ce91627118d
diff --git a/sci-visualization/paraview/paraview-3.8.0.ebuild b/sci-visualization/paraview/paraview-3.8.0.ebuild
new file mode 100644
index 000000000..2deffd45a
--- /dev/null
+++ b/sci-visualization/paraview/paraview-3.8.0.ebuild
@@ -0,0 +1,198 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+PYTHON_DEPEND="python? 2:2.6"
+
+inherit distutils eutils flag-o-matic toolchain-funcs versionator 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/v3.8/${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 -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
+			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
+	media-libs/libpng
+	media-libs/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}"/${P}-xdmf-cstring.patch
+	# disable automatic byte compiling that act directly on the live system
+	epatch "${FILESDIR}"/${P}-xdmf-bc.patch
+	# respect lib64
+	# http://paraview.org/gitweb?p=ParaView.git;a=commitdiff;h=07ba5364f3ab16d33e7ae7c67f64c4b25e2de11f
+	epatch "${FILESDIR}"/${P}-installpath.patch
+	# pointsprite example was always built
+	# http://paraview.org/gitweb?p=ParaView.git;a=commitdiff;h=c9af0d884532cbe472993d19a2ef6327aa9be5d8
+	epatch "${FILESDIR}"/${P}-pointsprite-example.patch
+	# Install properly pointspritedemo without duplicate DESTDIR
+	epatch "${FILESDIR}"/${P}-pointsprite-example-install.patch
+	# mpi + hdf5 fix
+	epatch "${FILESDIR}"/${P}-h5part.patch
+
+	# prevent the installation of duplicates of QT libraries.
+	sed -i "s:SET(_install_qt_libs ON):SET(_install_qt_libs OFF):g" \
+		Applications/ParaView/CMakeLists.txt || die "sed failed"
+
+	if use amd64; then
+		sed -i "s:/usr/lib:/usr/lib64:g" \
+			Utilities/Xdmf2/libsrc/CMakeLists.txt || die "sed failed"
+	fi
+
+	cd VTK
+	epatch "${FILESDIR}"/vtk-5.6.0-cg-path.patch
+	epatch "${FILESDIR}"/vtk-5.6.0-libpng14.patch
+}
+
+src_configure() {
+	mycmakeargs=(
+	  -DPV_INSTALL_LIB_DIR="${PVLIBDIR}"
+	  -DCMAKE_INSTALL_PREFIX=/usr
+	  -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)
+
+	# 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_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}" >> "${T}"/40${PN}
+	doenvd "${T}"/40${PN}
+
+#	# 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"
+
+	# 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."
+	elog "The binary /usr/bin/lproj has been renamed to"
+	elog "/usr/bin/lproj_paraview to avoid a file collision"
+	elog "with vtk."
+	echo
+}