Version bump (fixes bug #183192).

(Portage version: 2.1.4_rc9)

3 files changed, 127 insertions, 0 deletions

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)