Version bump (fixes bug #183192).

(Portage version: 2.1.4_rc9)

6 files changed, 293 insertions, 5 deletions

diff --git a/sci-visualization/paraview/ChangeLog b/sci-visualization/paraview/ChangeLog
index 8ba2c8ed9bdb..222deacecb6b 100644
--- a/sci-visualization/paraview/ChangeLog
+++ b/sci-visualization/paraview/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-visualization/paraview
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/ChangeLog,v 1.9 2007/08/19 04:09:45 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/ChangeLog,v 1.10 2007/12/14 19:59:46 markusle Exp $
+
+*paraview-3.2.1 (14 Dec 2007)
+
+  14 Dec 2007; Markus Dittrich <markusle@gentoo.org>
+  +files/paraview-3.2-libxml2-fix.patch,
+  +files/paraview-3.2-support-qt4.3.patch, +paraview-3.2.1.ebuild:
+  Version bump (fixes bug #183192).
 
   19 Aug 2007; Markus Dittrich <markusle@gentoo.org>
   -files/paraview-2.4.4-hdf5-zlib.patch, -files/paraview-2.4.4-png.patch,
diff --git a/sci-visualization/paraview/files/digest-paraview-3.2.1 b/sci-visualization/paraview/files/digest-paraview-3.2.1
new file mode 100644
index 000000000000..1893330f965f
--- /dev/null
+++ b/sci-visualization/paraview/files/digest-paraview-3.2.1
@@ -0,0 +1,3 @@
+MD5 050830112537c477a1cb20370caded50 paraview-3.2.1.tar.gz 21360301
+RMD160 f7df024f4668901900b7633cf6dbe78337991b49 paraview-3.2.1.tar.gz 21360301
+SHA256 d613d6a86f8a9173f42333760c9f0c29b5fcaa85554ba4b9bf61b6fddfae0cb9 paraview-3.2.1.tar.gz 21360301
diff --git a/sci-visualization/paraview/files/paraview-3.2-libxml2-fix.patch b/sci-visualization/paraview/files/paraview-3.2-libxml2-fix.patch
new file mode 100644
index 000000000000..d3e69bc351d5
--- /dev/null
+++ b/sci-visualization/paraview/files/paraview-3.2-libxml2-fix.patch
@@ -0,0 +1,46 @@
+diff -Naur ParaView3.2.old/Utilities/Xdmf2/CMakeLists.txt ParaView3.2.new/Utilities/Xdmf2/CMakeLists.txt
+--- ParaView3.2.old/Utilities/Xdmf2/CMakeLists.txt	2007-10-15 14:15:47.000000000 -0400
++++ ParaView3.2.new/Utilities/Xdmf2/CMakeLists.txt	2007-11-17 17:51:51.000000000 -0500
+@@ -14,7 +14,7 @@
+ ENDIF(NOT BUILD_SHARED_LIBS)
+ 
+ SET(XDMF_BUILD_VTK 1)
+-SET(LIBXML2_LIBRARY vtklibxml2)
++SET(LIBXML2_LIBRARY xml2)
+ 
+ SET(HDF5_LIBRARY ${PARAVIEW_HDF5_LIBRARIES})
+ IF(VTK_USE_SYSTEM_EXPAT)
+@@ -91,6 +91,7 @@
+   ${ParaView_BINARY_DIR}/VTK/Utilities
+   ${ParaView_BINARY_DIR}/VTK/Utilities/vtklibxml2
+   ${HDF5_INCLUDE_DIR}
++  /usr/include/libxml2
+   )
+ SUBDIRS(Ice)
+ SUBDIRS(libsrc)
+diff -Naur ParaView3.2.old/VTK/Infovis/CMakeLists.txt ParaView3.2.new/VTK/Infovis/CMakeLists.txt
+--- ParaView3.2.old/VTK/Infovis/CMakeLists.txt	2007-10-15 14:16:13.000000000 -0400
++++ ParaView3.2.new/VTK/Infovis/CMakeLists.txt	2007-11-17 17:45:18.000000000 -0500
+@@ -3,7 +3,7 @@
+ SET(KIT_TCL_LIBS vtkWidgetsTCL)
+ SET(KIT_PYTHON_LIBS vtkWidgetsPythonD)
+ SET(KIT_JAVA_LIBS vtkWidgetsJava)
+-SET(KIT_LIBS vtkWidgets vtklibxml2)
++SET(KIT_LIBS vtkWidgets xml2)
+ 
+ SET( Kit_SRCS
+ vtkCommunity2DLayoutStrategy.cxx
+diff -Naur ParaView3.2.old/VTK/Infovis/vtkXMLTreeReader.cxx ParaView3.2.new/VTK/Infovis/vtkXMLTreeReader.cxx
+--- ParaView3.2.old/VTK/Infovis/vtkXMLTreeReader.cxx	2007-10-15 14:16:13.000000000 -0400
++++ ParaView3.2.new/VTK/Infovis/vtkXMLTreeReader.cxx	2007-11-17 15:22:10.000000000 -0500
+@@ -27,8 +27,8 @@
+ #include "vtkStringArray.h"
+ #include "vtkTree.h"
+ 
+-#include <vtklibxml2/libxml/parser.h>
+-#include <vtklibxml2/libxml/tree.h>
++#include <libxml/parser.h>
++#include <libxml/tree.h>
+ 
+ vtkCxxRevisionMacro(vtkXMLTreeReader, "$Revision: 1.1 $");
+ vtkStandardNewMacro(vtkXMLTreeReader);
diff --git a/sci-visualization/paraview/files/paraview-3.2-support-qt4.3.patch b/sci-visualization/paraview/files/paraview-3.2-support-qt4.3.patch
new file mode 100644
index 000000000000..afffbcd0bdf2
--- /dev/null
+++ b/sci-visualization/paraview/files/paraview-3.2-support-qt4.3.patch
@@ -0,0 +1,78 @@
+diff -Naur ParaView3.2.1/Applications/Client/CMakeLists.txt ParaView3.2.1.new/Applications/Client/CMakeLists.txt
+--- ParaView3.2.1/Applications/Client/CMakeLists.txt	2007-11-07 15:52:05.000000000 -0500
++++ ParaView3.2.1.new/Applications/Client/CMakeLists.txt	2007-11-27 18:07:41.000000000 -0500
+@@ -469,34 +469,34 @@
+   ENDIF(FFMPEG_${fmpglib}_LIBRARY)
+ ENDFOREACH(fmpglib)
+ 
+-SET (QTLIBLIST QTCORE QTGUI QTNETWORK QTXML QTTEST)
++#SET (QTLIBLIST QTCORE QTGUI QTNETWORK QTXML QTTEST)
+ # the variable and library names are not the same
+-IF (WIN32)
+-  SET (QTLIBLIST ${QTLIBLIST} QTASSISTANTCLIENT)
+-ELSE (WIN32)
+-  SET (QTLIBLIST ${QTLIBLIST} QTASSISTANT)
+-ENDIF (WIN32)
++#IF (WIN32)
++#  SET (QTLIBLIST ${QTLIBLIST} QTASSISTANTCLIENT)
++#ELSE (WIN32)
++#  SET (QTLIBLIST ${QTLIBLIST} QTASSISTANT)
++#ENDIF (WIN32)
+ 
+-IF(NOT Q_WS_MAC)
+-  FOREACH(qtlib ${QTLIBLIST})
+-    IF (NOT WIN32)
+-      #INSTALL(FILES ${QT_${qtlib}_LIBRARY_RELEASE} DESTINATION ${PV_INSTALL_LIB_DIR_CM24})
+-      GET_FILENAME_COMPONENT(QT_LIB_DIR_tmp ${QT_${qtlib}_LIBRARY_RELEASE} PATH)
+-      GET_FILENAME_COMPONENT(QT_LIB_NAME_tmp ${QT_${qtlib}_LIBRARY_RELEASE} NAME)
+-      FILE(GLOB QT_LIB_LIST RELATIVE ${QT_LIB_DIR_tmp} "${QT_${qtlib}_LIBRARY_RELEASE}*")
+-      INSTALL(CODE "
+-MESSAGE(STATUS \"Installing \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR_CM24}/${QT_LIB_NAME_tmp}\")
+-EXECUTE_PROCESS (WORKING_DIRECTORY ${QT_LIB_DIR_tmp}
+-                 COMMAND tar c ${QT_LIB_LIST}
+-                 COMMAND tar -xC \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR_CM24})
+-        " COMPONENT Runtime)
+-    ELSE (NOT WIN32)
+-      GET_FILENAME_COMPONENT(QT_DLL_PATH_tmp ${QT_QMAKE_EXECUTABLE} PATH)
+-      INSTALL(FILES ${QT_DLL_PATH_tmp}/${qtlib}4.dll DESTINATION ${PV_INSTALL_BIN_DIR_CM24} COMPONENT Runtime)
+-    ENDIF (NOT WIN32)
+-    
+-  ENDFOREACH(qtlib)
+-ENDIF(NOT Q_WS_MAC)
++#IF(NOT Q_WS_MAC)
++#  FOREACH(qtlib ${QTLIBLIST})
++#    IF (NOT WIN32)
++#      #INSTALL(FILES ${QT_${qtlib}_LIBRARY_RELEASE} DESTINATION ${PV_INSTALL_LIB_DIR_CM24})
++#      GET_FILENAME_COMPONENT(QT_LIB_DIR_tmp ${QT_${qtlib}_LIBRARY_RELEASE} PATH)
++#      GET_FILENAME_COMPONENT(QT_LIB_NAME_tmp ${QT_${qtlib}_LIBRARY_RELEASE} NAME)
++#      FILE(GLOB QT_LIB_LIST RELATIVE ${QT_LIB_DIR_tmp} "${QT_${qtlib}_LIBRARY_RELEASE}*")
++#      INSTALL(CODE "
++#MESSAGE(STATUS \"Installing \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR_CM24}/${QT_LIB_NAME_tmp}\")
++#EXECUTE_PROCESS (WORKING_DIRECTORY ${QT_LIB_DIR_tmp}
++#                 COMMAND tar c ${QT_LIB_LIST}
++#                 COMMAND tar -xC \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR_CM24})
++#        " COMPONENT Runtime)
++#    ELSE (NOT WIN32)
++#      GET_FILENAME_COMPONENT(QT_DLL_PATH_tmp ${QT_QMAKE_EXECUTABLE} PATH)
++#      INSTALL(FILES ${QT_DLL_PATH_tmp}/${qtlib}4.dll DESTINATION ${PV_INSTALL_BIN_DIR_CM24} COMPONENT Runtime)
++#    ENDIF (NOT WIN32)
++#    
++#  ENDFOREACH(qtlib)
++#ENDIF(NOT Q_WS_MAC)
+ 
+ # Hard-coded install rules for anything left to install. These should
+ # probably go to a local cmake file. Change to match the build system's
+diff -Naur ParaView3.2.1/Qt/CMakeLists.txt ParaView3.2.1.new/Qt/CMakeLists.txt
+--- ParaView3.2.1/Qt/CMakeLists.txt	2007-11-07 15:51:44.000000000 -0500
++++ ParaView3.2.1.new/Qt/CMakeLists.txt	2007-11-27 18:06:19.000000000 -0500
+@@ -13,10 +13,6 @@
+ # To make support of ParaView tractable, we only support a single version
+ # of Qt at one time.  If you really want to use a newer version of Qt, you
+ # can delete this check, but you are on your own.
+-STRING(REGEX MATCH "^4\\.2\\.[0-9]+" qt_version_tmp "${QTVERSION}")
+-IF (NOT qt_version_tmp)
+-  MESSAGE(SEND_ERROR "Qt ${QTVERSION} not supported.  Please use Qt 4.2.")
+-ENDIF (NOT qt_version_tmp)
+ 
+ # help CMake fine QtUiTools on Mac (binary install)
+ IF(Q_WS_MAC AND QT4_FOUND AND QT_QTCORE_FOUND AND NOT QT_QTUITOOLS_FOUND)
diff --git a/sci-visualization/paraview/paraview-2.6.2.ebuild b/sci-visualization/paraview/paraview-2.6.2.ebuild
index d570c0604c85..ec166988ed55 100644
--- a/sci-visualization/paraview/paraview-2.6.2.ebuild
+++ b/sci-visualization/paraview/paraview-2.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/paraview-2.6.2.ebuild,v 1.1 2007/07/25 21:14:45 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/paraview-2.6.2.ebuild,v 1.2 2007/12/14 19:59:46 markusle Exp $
 
 inherit distutils eutils flag-o-matic toolchain-funcs versionator python
 
@@ -94,7 +94,7 @@ src_compile() {
 		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DCMAKE_USE_PTHREADS:BOOL=OFF"
 	fi
 
-	cmake ${CMAKE_VARIABLES} ${S} \
+	cmake ${CMAKE_VARIABLES} "${S}" \
 		|| die "cmake configuration failed"
 
 	emake || die "emake failed"
@@ -106,6 +106,6 @@ src_install() {
 	emake DESTDIR="${D}" install || die "make install failed"
 
 	# set up the environment
-	echo "LDPATH=/usr/${PVLIBDIR}" >> ${T}/40${PN}
-	doenvd ${T}/40${PN}
+	echo "LDPATH=/usr/${PVLIBDIR}" >> "${T}"/40${PN}
+	doenvd "${T}"/40${PN}
 }
diff --git a/sci-visualization/paraview/paraview-3.2.1.ebuild b/sci-visualization/paraview/paraview-3.2.1.ebuild
new file mode 100644
index 000000000000..d8a41f9087b9
--- /dev/null
+++ b/sci-visualization/paraview/paraview-3.2.1.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/paraview-3.2.1.ebuild,v 1.1 2007/12/14 19:59:46 markusle Exp $
+
+inherit distutils eutils flag-o-matic toolchain-funcs versionator python
+
+MY_PV=3.2.1
+MY_MAJOR_PV=$(get_version_component_range 1-2)
+
+DESCRIPTION="ParaView is a powerful scientific data visualization application"
+HOMEPAGE="http://www.paraview.org"
+SRC_URI="http://www.${PN}.org/files/v3.2/${PN}-${MY_PV}.tar.gz"
+
+LICENSE="paraview"
+KEYWORDS="~x86 ~amd64"
+SLOT="0"
+IUSE="mpi python hdf5 doc examples threads qt4"
+RDEPEND="hdf5? ( sci-libs/hdf5 )
+	doc? ( app-doc/doxygen )
+	mpi? ( sys-cluster/mpich )
+	python? ( >=dev-lang/python-2.0 )
+	qt4? ( >=x11-libs/qt-4.3.0 )
+	dev-libs/libxml2
+	media-libs/libpng
+	media-libs/jpeg
+	media-libs/tiff
+	dev-libs/expat
+	sys-libs/zlib
+	media-libs/freetype
+	virtual/opengl
+	sci-libs/netcdf
+	x11-libs/libXmu"
+
+DEPEND="${RDEPEND}
+		>=dev-util/cmake-2.4.5"
+
+PVLIBDIR="$(get_libdir)/${PN}-${MY_MAJOR_PV}"
+BUILDDIR="${WORKDIR}/build"
+S="${WORKDIR}"/ParaView${MY_PV}
+
+src_unpack() {
+	unpack ${A}
+	mkdir "${BUILDDIR}" || die "Failed to generate build directory"
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-${MY_MAJOR_PV}-support-qt4.3.patch
+	epatch "${FILESDIR}"/${PN}-${MY_MAJOR_PV}-libxml2-fix.patch
+
+	# rename paraview's assistant wrapper
+	if use qt4; then
+
+		# make sure we have qt3 support
+		if ! built_with_use =x11-libs/qt-4* qt3support; then
+			echo
+			eerror 'Please emerge qt4 with USE="qt3support"!'
+			die "qt4 setup error"
+		fi
+
+		sed -e "s:\"assistant\":\"paraview-assistant\":" \
+			-i Applications/Client/MainWindow.cxx \
+			|| die "Failed to fix assistant wrapper call"
+	fi
+
+	# fix GL issues
+	sed -e "s:DEPTH_STENCIL_EXT:DEPTH_COMPONENT24:" \
+		-i VTK/Rendering/vtkOpenGLRenderWindow.cxx \
+		|| die "Failed to fix GL issues."
+}
+
+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"
+	# paraview uses a non exisiting call to boost's graph library
+	# maybe upstream needs to update
+	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_BOOST:BOOL=OFF"
+
+	# paraview used the deprecated img_convert(..) call; hence disable
+	# until upstream has switched to swscale
+	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_FFMPEG_ENCODER:BOOL=OFF"
+	if use hdf5; then
+		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_USE_SYSTEM_HDF5:BOOL=ON"
+	fi
+
+	if use mpi; then
+		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_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
+
+	if use qt4; then
+		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_BUILD_QT_GUI:BOOL=ON"
+	else
+		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_BUILD_QT_GUI:BOOL=OFF"
+	fi
+
+	if use threads; then
+		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DCMAKE_USE_PTHREADS:BOOL=ON"
+	else
+		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DCMAKE_USE_PTHREADS: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/$(get_libdir)/${PN}-${MY_MAJOR_PV}/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}
+}
+