Several fix for paraview, drop old.

4 files changed, 16 insertions, 203 deletions

diff --git a/sci-visualization/paraview/ChangeLog b/sci-visualization/paraview/ChangeLog
index b8a245416..39c923fe8 100644
--- a/sci-visualization/paraview/ChangeLog
+++ b/sci-visualization/paraview/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  29 Dec 2010; François Bissey <f.r.bissey@massey.ac.nz>
+  -paraview-3.8.0.ebuild, paraview-3.8.1.ebuild:
+  "patch" for python-2.7, add pkg_postrm to deal with left over python files,
+  drop old.
+
   03 Dec 2010; Oliver Borm (boroli) <oli.borm@web.de> paraview-3.8.1.ebuild:
   sci-visualization/paraview: fixed python path
 
diff --git a/sci-visualization/paraview/Manifest b/sci-visualization/paraview/Manifest
index 9743d1bb7..fb14b3540 100644
--- a/sci-visualization/paraview/Manifest
+++ b/sci-visualization/paraview/Manifest
@@ -6,10 +6,8 @@ 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
 DIST paraview-3.8.1-OFF.patch.bz2 73798 RMD160 1adc86f42d86b165f2bee4a822f556bfb604986d SHA1 fff976c7cd9785c73030e84b0bb702cb11d7ba82 SHA256 a753253a7ecfdb0ca9a05726bb39affb826c867a9dd746eebf7d61d07ba1ba84
-EBUILD paraview-3.8.0.ebuild 6455 RMD160 063522aaab5f7ab70aee9f255f89f21f2c841365 SHA1 6aa25f0d01477f9dc8944cac3f4b089de7658e5a SHA256 7464a778c3ba2a62d57389e00f1f58d805a45cd28ab50544e597e1764a0ce567
-EBUILD paraview-3.8.1.ebuild 6773 RMD160 c9bf0a3d9f6e55e5ce99b979457d781c86e05c4d SHA1 aa41c9dfc7361c3b18a1ed7691a1650d473a0b07 SHA256 3ddb733a04ecc6ec5a1524100983bff738e7c2bad7a0dcc6cbbf08c7dd9bdda1
-MISC ChangeLog 2060 RMD160 632ed0b2e50e89283608cc7180ad096dac7c4858 SHA1 cd4e30b272e389f30f7a6477d7da1cd32119ec15 SHA256 bc0a292c3cb6462423b12f50560a42eead0ccd6d8d964a0f0eae6d53d1ba2f3c
+EBUILD paraview-3.8.1.ebuild 6995 RMD160 c8914b9d6ff2e0f394524461929d73a55e6c224c SHA1 707aead152dfdc58dc8487bf13c8c280270b74c5 SHA256 302f4177e7644613ba4db3e466eba8d18f86df0afd20bf53e8bbf4c2f70fa523
+MISC ChangeLog 2258 RMD160 f72037943176fb20ecdb5e3f8fde38fa53d7d15d SHA1 3ac5ca0caa1d86208c95545f94d0dcd8ae4fce16 SHA256 c85b8a11d4cfcc4308e3bd22cd7ea72e0f21822846532a55a891445fb9bdf3dd
 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
deleted file mode 100644
index 033df08cf..000000000
--- a/sci-visualization/paraview/paraview-3.8.0.ebuild
+++ /dev/null
@@ -1,198 +0,0 @@
-# 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
-	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}"/${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
-}
diff --git a/sci-visualization/paraview/paraview-3.8.1.ebuild b/sci-visualization/paraview/paraview-3.8.1.ebuild
index 6f3b9d929..74f4e08b7 100644
--- a/sci-visualization/paraview/paraview-3.8.1.ebuild
+++ b/sci-visualization/paraview/paraview-3.8.1.ebuild
@@ -6,7 +6,7 @@ EAPI="2"
 
 PYTHON_DEPEND="python? 2:2.6"
 
-inherit distutils eutils flag-o-matic toolchain-funcs versionator python qt4-r2 cmake-utils
+inherit distutils 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)
@@ -88,6 +88,8 @@ src_prepare() {
 	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"
+	# Remove FindPythonLibs.cmake to use the patched one from cmake
+	rm CMake/FindPythonLibs.cmake
 }
 
 src_configure() {
@@ -200,3 +202,9 @@ pkg_postinst() {
 	elog "with vtk."
 	echo
 }
+
+pkg_postrm() {
+	if use python ; then
+		python_mod_cleanup /usr/$(get_libdir)/"${PN}-${MAJOR_PV}"/site-packages
+	fi
+}
\ No newline at end of file