Version bump (bug #278563) and big cleanup.

(Portage version: 2.1.6.13/cvs/Linux x86_64)

10 files changed, 382 insertions, 183 deletions

diff --git a/sci-visualization/paraview/files/paraview-2.6.0-hdf5-zlib.patch b/sci-visualization/paraview/files/paraview-2.6.0-hdf5-zlib.patch
deleted file mode 100644
index 31a4c1166c4c..000000000000
--- a/sci-visualization/paraview/files/paraview-2.6.0-hdf5-zlib.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -Naur ParaView-2.6.0/CMake/ParaViewCommon.cmake ParaView-2.6.0-new/CMake/ParaViewCommon.cmake
---- ParaView-2.6.0/CMake/ParaViewCommon.cmake	2006-10-24 11:12:48.000000000 -0400
-+++ ParaView-2.6.0-new/CMake/ParaViewCommon.cmake	2007-02-19 09:42:19.000000000 -0500
-@@ -293,7 +293,11 @@
-   SET(VTKHDF5_INSTALL_NO_RUNTIME ${PV_INSTALL_NO_RUNTIME})
-   SET(VTKHDF5_INSTALL_LIB_DIR ${PV_INSTALL_LIB_DIR})
-   SET(PARAVIEW_HDF5_LIBRARIES vtkhdf5)
--  SET(HDF5_ZLIB_HEADER "vtk_zlib.h")
-+  IF(VTK_USE_SYSTEM_ZLIB)
-+    SET(HDF5_ZLIB_HEADER "zlib.h")
-+  ELSE(VTK_USE_SYSTEM_ZLIB)
-+    SET(HDF5_ZLIB_HEADER "vtk_zlib.h")
-+  ENDIF(VTK_USE_SYSTEM_ZLIB)
-   SET(HDF5_INCLUDE_DIR 
-     ${ParaView_SOURCE_DIR}/Utilities/hdf5
-     ${ParaView_BINARY_DIR}/Utilities/hdf5)
diff --git a/sci-visualization/paraview/files/paraview-2.6.0-include.patch b/sci-visualization/paraview/files/paraview-2.6.0-include.patch
deleted file mode 100644
index 35ac11719393..000000000000
--- a/sci-visualization/paraview/files/paraview-2.6.0-include.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur ParaView-2.6.0/Utilities/VTKClientServer/CMakeLists.txt ParaView-2.6.0-new/Utilities/VTKClientServer/CMakeLists.txt
---- ParaView-2.6.0/Utilities/VTKClientServer/CMakeLists.txt	2006-10-24 11:12:49.000000000 -0400
-+++ ParaView-2.6.0-new/Utilities/VTKClientServer/CMakeLists.txt	2007-02-19 15:28:51.000000000 -0500
-@@ -21,6 +21,7 @@
-   ${VTKCS_SOURCE_DIR}
-   ${VTKCS_BINARY_DIR}
-   ${VTK_INCLUDE_DIR}
-+  ${VTK_SOURCE_DIR}/Infovis
-   )
- 
- # OpenGL include directories.
diff --git a/sci-visualization/paraview/files/paraview-2.6.2-tkImgGIF.patch b/sci-visualization/paraview/files/paraview-2.6.2-tkImgGIF.patch
deleted file mode 100644
index 966d5d79d04c..000000000000
--- a/sci-visualization/paraview/files/paraview-2.6.2-tkImgGIF.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -Naur ParaView-2.6.2/Utilities/TclTk/tk8.4.13/generic/tkImgGIF.c ParaView-2.6.2.new/Utilities/TclTk/tk8.4.13/generic/tkImgGIF.c
---- ParaView-2.6.2/Utilities/TclTk/tk8.4.13/generic/tkImgGIF.c	2006-05-06 13:33:55.000000000 -0500
-+++ ParaView-2.6.2.new/Utilities/TclTk/tk8.4.13/generic/tkImgGIF.c	2008-02-15 06:01:43.000000000 -0500
-@@ -826,6 +826,12 @@
-     Tcl_PosixError(interp), (char *) NULL);
-   return TCL_ERROR;
-     }
-+
-+    if (initialCodeSize > MAX_LWZ_BITS) {
-+       Tcl_SetResult(interp, "malformed image", TCL_STATIC);
-+       return TCL_ERROR;
-+    }
-+
-     if (transparent != -1) {
-   cmap[transparent][CM_RED] = 0;
-   cmap[transparent][CM_GREEN] = 0;
-diff -Naur ParaView-2.6.2/Utilities/TclTk/tk8.4.5/generic/tkImgGIF.c ParaView-2.6.2.new/Utilities/TclTk/tk8.4.5/generic/tkImgGIF.c
---- ParaView-2.6.2/Utilities/TclTk/tk8.4.5/generic/tkImgGIF.c	2003-12-19 10:38:18.000000000 -0500
-+++ ParaView-2.6.2.new/Utilities/TclTk/tk8.4.5/generic/tkImgGIF.c	2008-02-15 06:01:32.000000000 -0500
-@@ -824,6 +824,12 @@
- 		Tcl_PosixError(interp), (char *) NULL);
- 	return TCL_ERROR;
-     }
-+
-+    if (initialCodeSize > MAX_LWZ_BITS) {
-+       Tcl_SetResult(interp, "malformed image", TCL_STATIC);
-+       return TCL_ERROR;
-+    }
-+
-     if (transparent != -1) {
- 	cmap[transparent][CM_RED] = 0;
- 	cmap[transparent][CM_GREEN] = 0;
diff --git a/sci-visualization/paraview/files/paraview-3.2-libxml2-fix.patch b/sci-visualization/paraview/files/paraview-3.2-libxml2-fix.patch
deleted file mode 100644
index d3e69bc351d5..000000000000
--- a/sci-visualization/paraview/files/paraview-3.2-libxml2-fix.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-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
deleted file mode 100644
index afffbcd0bdf2..000000000000
--- a/sci-visualization/paraview/files/paraview-3.2-support-qt4.3.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-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/files/paraview-3.6.1-assistant.patch b/sci-visualization/paraview/files/paraview-3.6.1-assistant.patch
new file mode 100644
index 000000000000..a48c9b53a80a
--- /dev/null
+++ b/sci-visualization/paraview/files/paraview-3.6.1-assistant.patch
@@ -0,0 +1,24 @@
+diff -Naur ParaView3/Applications/OverView/Core/MainWindow.cxx ParaView3.new/Applications/OverView/Core/MainWindow.cxx
+--- ParaView3/Applications/OverView/Core/MainWindow.cxx	2009-07-20 15:36:12.000000000 -0400
++++ ParaView3.new/Applications/OverView/Core/MainWindow.cxx	2009-07-22 23:42:53.000000000 -0400
+@@ -933,7 +933,7 @@
+   QString assistantExe;

+   QString profileFile;

+ 

+-  const char* assistantName = "assistant";

++  const char* assistantName = "paraview-assistant";

+ #if defined(Q_WS_WIN)

+   const char* binDir = "\\";

+   const char* binDir1 = "\\..\\";

+diff -Naur ParaView3/Qt/Components/pqClientMainWindow.cxx ParaView3.new/Qt/Components/pqClientMainWindow.cxx
+--- ParaView3/Qt/Components/pqClientMainWindow.cxx	2009-07-20 15:37:39.000000000 -0400
++++ ParaView3.new/Qt/Components/pqClientMainWindow.cxx	2009-07-22 23:44:37.000000000 -0400
+@@ -989,7 +989,7 @@
+   QString assistantExe;

+   QString profileFile;

+ 

+-  const char* assistantName = "assistant";

++  const char* assistantName = "paraview-assistant";

+ #if defined(Q_WS_WIN)

+   const char* extString = ".exe";

+   const char* binDir = "\\";

diff --git a/sci-visualization/paraview/files/paraview-3.6.1-hdf-1.8.3.patch b/sci-visualization/paraview/files/paraview-3.6.1-hdf-1.8.3.patch
new file mode 100644
index 000000000000..0b966a724c18
--- /dev/null
+++ b/sci-visualization/paraview/files/paraview-3.6.1-hdf-1.8.3.patch
@@ -0,0 +1,71 @@
+diff -Naur ParaView3/Utilities/Xdmf2/libsrc/XdmfH5Driver.cxx ParaView3.new/Utilities/Xdmf2/libsrc/XdmfH5Driver.cxx
+--- ParaView3/Utilities/Xdmf2/libsrc/XdmfH5Driver.cxx	2009-07-20 15:39:10.000000000 -0400
++++ ParaView3.new/Utilities/Xdmf2/libsrc/XdmfH5Driver.cxx	2009-07-22 16:05:22.000000000 -0400
+@@ -132,9 +132,15 @@
+ static herr_t H5FD_dsm_flush(H5FD_t *_file);

+ #endif

+ static int H5FD_dsm_cmp(const H5FD_t *_f1, const H5FD_t *_f2);

++#ifdef H5_USE_16_API

++static haddr_t H5FD_dsm_get_eoa(const H5FD_t *_file, H5FD_mem_t);

++static herr_t H5FD_dsm_set_eoa(H5FD_t *_file, H5FD_mem_t, haddr_t addr);

++static haddr_t H5FD_dsm_get_eof(const H5FD_t *_file);

++#else

+ static haddr_t H5FD_dsm_get_eoa(H5FD_t *_file);

+ static herr_t H5FD_dsm_set_eoa(H5FD_t *_file, haddr_t addr);

+ static haddr_t H5FD_dsm_get_eof(H5FD_t *_file);

++#endif

+ static herr_t H5FD_dsm_read(H5FD_t *_file, H5FD_mem_t type, hid_t fapl_id, haddr_t addr,

+            DSM_HSIZE_T size, void *buf);

+ static herr_t H5FD_dsm_write(H5FD_t *_file, H5FD_mem_t type, hid_t fapl_id, haddr_t addr,

+@@ -159,6 +165,7 @@
+     H5FD_dsm_close,             /*close         */

+     H5FD_dsm_cmp,               /*cmp           */

+     NULL,                       /*query         */

++    NULL,                       /*type map      */

+     NULL,                       /*alloc         */

+     NULL,                       /*free          */

+     H5FD_dsm_get_eoa,           /*get_eoa       */

+@@ -168,6 +175,7 @@
+     H5FD_dsm_read,              /*read          */

+     H5FD_dsm_write,             /*write         */

+     NULL,                       /*flush         */

++    NULL,                       /*truncate      */

+     NULL,                       /*lock          */

+     NULL,                       /*unlock        */

+     H5FD_FLMAP_SINGLE           /*fl_map        */

+@@ -594,7 +602,11 @@
+  *-------------------------------------------------------------------------

+  */

+ static haddr_t

++#ifdef H5_USE_16_API

++H5FD_dsm_get_eoa(const H5FD_t *_file, H5FD_mem_t)

++#else

+ H5FD_dsm_get_eoa(H5FD_t *_file)

++#endif

+ {

+     H5FD_dsm_t  *file = (H5FD_dsm_t*)_file;

+ 

+@@ -622,7 +634,11 @@
+  *-------------------------------------------------------------------------

+  */

+ static herr_t

++#ifdef H5_USE_16_API

++H5FD_dsm_set_eoa(H5FD_t *_file, H5FD_mem_t, haddr_t addr)

++#else

+ H5FD_dsm_set_eoa(H5FD_t *_file, haddr_t addr)

++#endif

+ {

+     H5FD_dsm_t  *file = (H5FD_dsm_t*)_file;

+ 

+@@ -663,7 +679,11 @@
+  *-------------------------------------------------------------------------

+  */

+ static haddr_t

++#ifdef H5_USE_16_API

++H5FD_dsm_get_eof(const H5FD_t *_file)

++#else

+ H5FD_dsm_get_eof(H5FD_t *_file)

++#endif

+ {

+     H5FD_dsm_t  *file = (H5FD_dsm_t*)_file;

+ 

diff --git a/sci-visualization/paraview/files/paraview-3.6.1-install-fix.patch b/sci-visualization/paraview/files/paraview-3.6.1-install-fix.patch
new file mode 100644
index 000000000000..f61627138e42
--- /dev/null
+++ b/sci-visualization/paraview/files/paraview-3.6.1-install-fix.patch
@@ -0,0 +1,127 @@
+diff -ru ParaView3/Applications/Client/CMakeLists.txt ParaView3.new/Applications/Client/CMakeLists.txt
+--- ParaView3/Applications/Client/CMakeLists.txt	2009-07-20 15:36:01.000000000 -0400
++++ ParaView3.new/Applications/Client/CMakeLists.txt	2009-07-22 18:35:55.000000000 -0400
+@@ -499,17 +499,17 @@
+ 

+ # Install system libraries on Linux (will not work on any other Unix

+ # yet)

+-FOREACH(fmpglib avcodec avformat avutil)

+-  IF(FFMPEG_${fmpglib}_LIBRARY)

+-    GET_FILENAME_COMPONENT(FFMPEG_LIB_DIR_tmp ${FFMPEG_${fmpglib}_LIBRARY} PATH)

+-    GET_FILENAME_COMPONENT(FFMPEG_LIB_NAME_tmp ${FFMPEG_${fmpglib}_LIBRARY} NAME)

+-    FILE(GLOB FFMPEG_LIB_LIST RELATIVE ${FFMPEG_LIB_DIR_tmp} "${FFMPEG_${fmpglib}_LIBRARY}*")

+-    INSTALL(CODE "

+-MESSAGE(STATUS \"Installing \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR}/${FFMPEG_LIB_NAME_tmp}\")

+-EXECUTE_PROCESS (WORKING_DIRECTORY ${FFMPEG_LIB_DIR_tmp}

+-                 COMMAND tar c ${FFMPEG_LIB_LIST}

+-                 COMMAND tar -xC \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR})

+-        " COMPONENT Runtime)

++#FOREACH(fmpglib avcodec avformat avutil)

++#  IF(FFMPEG_${fmpglib}_LIBRARY)

++#    GET_FILENAME_COMPONENT(FFMPEG_LIB_DIR_tmp ${FFMPEG_${fmpglib}_LIBRARY} PATH)

++#    GET_FILENAME_COMPONENT(FFMPEG_LIB_NAME_tmp ${FFMPEG_${fmpglib}_LIBRARY} NAME)

++#    FILE(GLOB FFMPEG_LIB_LIST RELATIVE ${FFMPEG_LIB_DIR_tmp} "${FFMPEG_${fmpglib}_LIBRARY}*")

++#    INSTALL(CODE "

++#MESSAGE(STATUS \"Installing \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR}/${FFMPEG_LIB_NAME_tmp}\")

++#EXECUTE_PROCESS (WORKING_DIRECTORY ${FFMPEG_LIB_DIR_tmp}

++#                 COMMAND tar c ${FFMPEG_LIB_LIST}

++#                 COMMAND tar -xC \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR})

++#        " COMPONENT Runtime)

+     #INSTALL(FILES ${FFMPEG_${fmpglib}_LIBRARY} DESTINATION ${PV_INSTALL_LIB_DIR})

+     

+   ENDIF(FFMPEG_${fmpglib}_LIBRARY)

+@@ -527,26 +527,26 @@
+   SET (QTLIBLIST ${QTLIBLIST} QTOPENGL)

+ ENDIF (VTK_USE_QVTK_QTOPENGL)

+ 

+-IF(NOT Q_WS_MAC)

+-  FOREACH(qtlib ${QTLIBLIST})

+-    IF (NOT WIN32)

+-      #INSTALL(FILES ${QT_${qtlib}_LIBRARY_RELEASE} DESTINATION ${PV_INSTALL_LIB_DIR})

+-      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}/${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})

+-        " 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} 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})

++#      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}/${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})

++#        " 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} 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 -ru ParaView3/Applications/StreamingParaView/CMakeLists.txt ParaView3.new/Applications/StreamingParaView/CMakeLists.txt
+--- ParaView3/Applications/StreamingParaView/CMakeLists.txt	2009-07-20 15:36:15.000000000 -0400
++++ ParaView3.new/Applications/StreamingParaView/CMakeLists.txt	2009-07-22 18:36:49.000000000 -0400
+@@ -198,26 +198,26 @@
+   SET (QTLIBLIST ${QTLIBLIST} QTASSISTANT)

+ ENDIF (WIN32)

+ 

+-IF(NOT Q_WS_MAC)

+-  FOREACH(qtlib ${QTLIBLIST})

+-    IF (NOT WIN32)

++#IF(NOT Q_WS_MAC)

++#  FOREACH(qtlib ${QTLIBLIST})

++#    IF (NOT WIN32)

+       #INSTALL(FILES ${QT_${qtlib}_LIBRARY_RELEASE} DESTINATION ${PV_INSTALL_LIB_DIR})

+-      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}/${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})

+-        " 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} COMPONENT Runtime)

+-    ENDIF (NOT WIN32)

++      #      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}/${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})

++      #  " 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} COMPONENT Runtime)

++      # ENDIF (NOT WIN32)

+     

+-  ENDFOREACH(qtlib)

+-ENDIF(NOT Q_WS_MAC)

++      #  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 --git a/sci-visualization/paraview/files/paraview-3.6.1-pointsprite-disable.patch b/sci-visualization/paraview/files/paraview-3.6.1-pointsprite-disable.patch
new file mode 100644
index 000000000000..5d6cdd053fa8
--- /dev/null
+++ b/sci-visualization/paraview/files/paraview-3.6.1-pointsprite-disable.patch
@@ -0,0 +1,13 @@
+diff -Naur ParaView3/Plugins/PointSprite/Examples/Rendering/Cxx/CMakeLists.txt ParaView3.new/Plugins/PointSprite/Examples/Rendering/Cxx/CMakeLists.txt
+--- ParaView3/Plugins/PointSprite/Examples/Rendering/Cxx/CMakeLists.txt	2009-07-20 15:37:07.000000000 -0400
++++ ParaView3.new/Plugins/PointSprite/Examples/Rendering/Cxx/CMakeLists.txt	2009-07-21 11:42:56.000000000 -0400
+@@ -5,6 +5,6 @@
+ 

+ target_link_libraries(${exe} CSCS_PointSprite_Rendering vtkIO)

+ 

+-install(TARGETS ${exe} 

+-    RUNTIME DESTINATION ${PROJECT_BINARY_DIR}

+-)

++#install(TARGETS ${exe} 

++#    RUNTIME DESTINATION ${PROJECT_BINARY_DIR}

++#)

diff --git a/sci-visualization/paraview/files/paraview-3.6.1-qt.patch b/sci-visualization/paraview/files/paraview-3.6.1-qt.patch
new file mode 100644
index 000000000000..bca40bc4a00f
--- /dev/null
+++ b/sci-visualization/paraview/files/paraview-3.6.1-qt.patch
@@ -0,0 +1,147 @@
+diff -Naur ParaView3/Applications/Client/CMakeLists.txt ParaView3.new/Applications/Client/CMakeLists.txt
+--- ParaView3/Applications/Client/CMakeLists.txt	2009-07-20 15:36:01.000000000 -0400
++++ ParaView3.new/Applications/Client/CMakeLists.txt	2009-07-22 22:38:09.000000000 -0400
+@@ -499,54 +499,54 @@
+ 

+ # Install system libraries on Linux (will not work on any other Unix

+ # yet)

+-FOREACH(fmpglib avcodec avformat avutil)

+-  IF(FFMPEG_${fmpglib}_LIBRARY)

+-    GET_FILENAME_COMPONENT(FFMPEG_LIB_DIR_tmp ${FFMPEG_${fmpglib}_LIBRARY} PATH)

+-    GET_FILENAME_COMPONENT(FFMPEG_LIB_NAME_tmp ${FFMPEG_${fmpglib}_LIBRARY} NAME)

+-    FILE(GLOB FFMPEG_LIB_LIST RELATIVE ${FFMPEG_LIB_DIR_tmp} "${FFMPEG_${fmpglib}_LIBRARY}*")

+-    INSTALL(CODE "

+-MESSAGE(STATUS \"Installing \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR}/${FFMPEG_LIB_NAME_tmp}\")

+-EXECUTE_PROCESS (WORKING_DIRECTORY ${FFMPEG_LIB_DIR_tmp}

+-                 COMMAND tar c ${FFMPEG_LIB_LIST}

+-                 COMMAND tar -xC \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR})

+-        " COMPONENT Runtime)

+-    #INSTALL(FILES ${FFMPEG_${fmpglib}_LIBRARY} DESTINATION ${PV_INSTALL_LIB_DIR})

++#FOREACH(fmpglib avcodec avformat avutil)

++#  IF(FFMPEG_${fmpglib}_LIBRARY)

++#    GET_FILENAME_COMPONENT(FFMPEG_LIB_DIR_tmp ${FFMPEG_${fmpglib}_LIBRARY} PATH)

++#    GET_FILENAME_COMPONENT(FFMPEG_LIB_NAME_tmp ${FFMPEG_${fmpglib}_LIBRARY} NAME)

++#    FILE(GLOB FFMPEG_LIB_LIST RELATIVE ${FFMPEG_LIB_DIR_tmp} "${FFMPEG_${fmpglib}_LIBRARY}*")

++#    INSTALL(CODE "

++#MESSAGE(STATUS \"Installing \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR}/${FFMPEG_LIB_NAME_tmp}\")

++#EXECUTE_PROCESS (WORKING_DIRECTORY ${FFMPEG_LIB_DIR_tmp}

++#                 COMMAND tar c ${FFMPEG_LIB_LIST}

++#                 COMMAND tar -xC \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR})

++#        " COMPONENT Runtime)

++#    #INSTALL(FILES ${FFMPEG_${fmpglib}_LIBRARY} DESTINATION ${PV_INSTALL_LIB_DIR})

+     

+-  ENDIF(FFMPEG_${fmpglib}_LIBRARY)

+-ENDFOREACH(fmpglib)

++#  ENDIF(FFMPEG_${fmpglib}_LIBRARY)

++#ENDFOREACH(fmpglib)

+ 

+-SET (QTLIBLIST QTCORE QTGUI QTNETWORK QTXML QTTEST QTSQL)

++#SET (QTLIBLIST QTCORE QTGUI QTNETWORK QTXML QTTEST QTSQL)

+ # 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 (VTK_USE_QVTK_QTOPENGL)

+   SET (QTLIBLIST ${QTLIBLIST} QTOPENGL)

+ ENDIF (VTK_USE_QVTK_QTOPENGL)

+ 

+-IF(NOT Q_WS_MAC)

+-  FOREACH(qtlib ${QTLIBLIST})

+-    IF (NOT WIN32)

+-      #INSTALL(FILES ${QT_${qtlib}_LIBRARY_RELEASE} DESTINATION ${PV_INSTALL_LIB_DIR})

+-      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}/${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})

+-        " 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} COMPONENT Runtime)

+-    ENDIF (NOT WIN32)

++#IF(NOT Q_WS_MAC)

++#  FOREACH(qtlib ${QTLIBLIST})

++#    IF (NOT WIN32)

++#      #INSTALL(FILES ${QT_${qtlib}_LIBRARY_RELEASE} DESTINATION ${PV_INSTALL_LIB_DIR})

++#      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}/${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})

++#        " 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} COMPONENT Runtime)

++#    ENDIF (NOT WIN32)

+     

+-  ENDFOREACH(qtlib)

+-ENDIF(NOT Q_WS_MAC)

++#  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/Applications/StreamingParaView/CMakeLists.txt ParaView3.new/Applications/StreamingParaView/CMakeLists.txt
+--- ParaView3/Applications/StreamingParaView/CMakeLists.txt	2009-07-20 15:36:15.000000000 -0400
++++ ParaView3.new/Applications/StreamingParaView/CMakeLists.txt	2009-07-22 22:39:14.000000000 -0400
+@@ -198,26 +198,26 @@
+   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})

+-      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}/${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})

+-        " 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} 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})

++#      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}/${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})

++#        " 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} 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