Version bump. This new ebuild fully utilizes the cmake-utils eclass and adds desktop entries for both paraview and OverView (this fixes bugs #299627, #287589, #273117).

(Portage version: 2.1.7.16/cvs/Linux x86_64)

10 files changed, 596 insertions, 2 deletions

diff --git a/sci-visualization/paraview/ChangeLog b/sci-visualization/paraview/ChangeLog
index 63cfbabda593..91708bcc7a30 100644
--- a/sci-visualization/paraview/ChangeLog
+++ b/sci-visualization/paraview/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for sci-visualization/paraview
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/ChangeLog,v 1.43 2009/11/24 04:05:41 markusle Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/ChangeLog,v 1.44 2010/01/16 19:58:32 markusle Exp $
+
+*paraview-3.6.2 (16 Jan 2010)
+
+  16 Jan 2010; Markus Dittrich <markusle@gentoo.org> +paraview-3.6.2.ebuild,
+  +files/paraview-3.6.2-assistant.patch,
+  +files/paraview-3.6.2-findcg-cmake.patch,
+  +files/paraview-3.6.2-hdf-1.8.3.patch,
+  +files/paraview-3.6.2-no-doc-finder.patch,
+  +files/paraview-3.6.2-pointsprite-disable.patch,
+  +files/paraview-3.6.2-about.html.patch,
+  +files/paraview-3.6.2-qt.patch, metadata.xml:
+  Version bump. This new ebuild fully utilizes the cmake-utils eclass and
+  adds desktop entries for both paraview and OverView (this fixes bugs 
+  #299627, #287589, #273117). Thanks much to Francois Bissey 
+  <f.r.bissey@massey.ac.nz> for his great help with the ebuild.
 
   24 Nov 2009; Markus Dittrich <markusle@gentoo.org>
   paraview-3.6.1-r1.ebuild:
diff --git a/sci-visualization/paraview/files/paraview-3.6.2-about.html.patch b/sci-visualization/paraview/files/paraview-3.6.2-about.html.patch
new file mode 100644
index 000000000000..80ac406c9a28
--- /dev/null
+++ b/sci-visualization/paraview/files/paraview-3.6.2-about.html.patch
@@ -0,0 +1,12 @@
+diff -Naur ParaView3/Documentation/CMakeLists.txt ParaView3.new/Documentation/CMakeLists.txt
+--- ParaView3/Documentation/CMakeLists.txt	2008-12-22 16:06:00.000000000 -0500
++++ ParaView3.new/Documentation/CMakeLists.txt	2010-01-16 11:02:15.000000000 -0500
+@@ -155,7 +155,7 @@
+ 
+ install(
+     FILES "${ParaView_BINARY_DIR}/about.html"
+-    DESTINATION ${PV_INSTALL_BIN_DIR}
++    DESTINATION ${PV_EXE_INSTALL}/Documentation
+     COMPONENT Runtime)
+ 
+ configure_file(
diff --git a/sci-visualization/paraview/files/paraview-3.6.2-assistant.patch b/sci-visualization/paraview/files/paraview-3.6.2-assistant.patch
new file mode 100644
index 000000000000..e1540db5b30f
--- /dev/null
+++ b/sci-visualization/paraview/files/paraview-3.6.2-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-05-06 16:01:51.000000000 -0400
++++ ParaView3.new/Applications/OverView/Core/MainWindow.cxx	2010-01-14 18:52:54.000000000 -0500
+@@ -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-09-22 13:37:21.000000000 -0400
++++ ParaView3.new/Qt/Components/pqClientMainWindow.cxx	2010-01-14 18:53:18.000000000 -0500
+@@ -1041,7 +1041,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.2-findcg-cmake.patch b/sci-visualization/paraview/files/paraview-3.6.2-findcg-cmake.patch
new file mode 100644
index 000000000000..3ec474ad9e59
--- /dev/null
+++ b/sci-visualization/paraview/files/paraview-3.6.2-findcg-cmake.patch
@@ -0,0 +1,35 @@
+diff -Naur ParaView3/VTK/CMake/FindCg.cmake ParaView3.new/VTK/CMake/FindCg.cmake
+--- ParaView3/VTK/CMake/FindCg.cmake	2005-10-04 11:25:51.000000000 -0400
++++ ParaView3.new/VTK/CMake/FindCg.cmake	2010-01-15 09:39:17.000000000 -0500
+@@ -82,6 +82,7 @@
+     FIND_PROGRAM( CG_COMPILER cgc
+       /usr/bin
+       /usr/local/bin
++      /opt/nvidia-cg-toolkit/bin
+       DOC "The Cg Compiler"
+       )
+     GET_FILENAME_COMPONENT(CG_COMPILER_DIR "${CG_COMPILER}" PATH)
+@@ -89,6 +90,7 @@
+     FIND_PATH( CG_INCLUDE_PATH Cg/cg.h
+       /usr/include
+       /usr/local/include
++      /opt/nvidia-cg-toolkit/include
+       ${CG_COMPILER_SUPER_DIR}/include
+       DOC "The directory where Cg/cg.h resides"
+       )
+@@ -98,6 +100,7 @@
+       /usr/lib
+       /usr/local/lib64
+       /usr/local/lib
++      /opt/nvidia-cg-toolkit/lib
+       ${CG_COMPILER_SUPER_DIR}/lib64
+       ${CG_COMPILER_SUPER_DIR}/lib
+       DOC "The Cg runtime library"
+@@ -108,6 +111,7 @@
+       /usr/lib
+       /usr/local/lib64
+       /usr/local/lib
++      /opt/nvidia-cg-toolkit/lib
+       ${CG_COMPILER_SUPER_DIR}/lib64
+       ${CG_COMPILER_SUPER_DIR}/lib
+       DOC "The Cg runtime library"
diff --git a/sci-visualization/paraview/files/paraview-3.6.2-hdf-1.8.3.patch b/sci-visualization/paraview/files/paraview-3.6.2-hdf-1.8.3.patch
new file mode 100644
index 000000000000..5499bdfc2291
--- /dev/null
+++ b/sci-visualization/paraview/files/paraview-3.6.2-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-06-17 17:00:28.000000000 -0400
++++ ParaView3.new/Utilities/Xdmf2/libsrc/XdmfH5Driver.cxx	2010-01-16 10:09:22.000000000 -0500
+@@ -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.2-no-doc-finder.patch b/sci-visualization/paraview/files/paraview-3.6.2-no-doc-finder.patch
new file mode 100644
index 000000000000..4681c2517ffd
--- /dev/null
+++ b/sci-visualization/paraview/files/paraview-3.6.2-no-doc-finder.patch
@@ -0,0 +1,18 @@
+diff -Naur ParaView3/Applications/Client/CMakeLists.txt ParaView3.new/Applications/Client/CMakeLists.txt
+--- ParaView3/Applications/Client/CMakeLists.txt	2010-01-04 10:24:37.000000000 -0500
++++ ParaView3.new/Applications/Client/CMakeLists.txt	2010-01-14 21:03:25.000000000 -0500
+@@ -128,10 +128,10 @@
+       "${CMAKE_CURRENT_BINARY_DIR}/CMake/tmp/pqClientDocFinder.txt"
+       @ONLY 
+       IMMEDIATE)
+-  INSTALL(
+-      FILES "${CMAKE_CURRENT_BINARY_DIR}/CMake/tmp/pqClientDocFinder.txt"
+-      DESTINATION ${PV_INSTALL_BIN_DIR}
+-      COMPONENT Runtime)
++    #  INSTALL(
++    #  FILES "${CMAKE_CURRENT_BINARY_DIR}/CMake/tmp/pqClientDocFinder.txt"
++    #  DESTINATION ${PV_INSTALL_BIN_DIR}
++    #  COMPONENT Runtime)
+ ENDIF(NOT PV_INSTALL_NO_RUNTIME)
+ 
+ IF(BUILD_TESTING)
diff --git a/sci-visualization/paraview/files/paraview-3.6.2-pointsprite-disable.patch b/sci-visualization/paraview/files/paraview-3.6.2-pointsprite-disable.patch
new file mode 100644
index 000000000000..0c66b358d9f2
--- /dev/null
+++ b/sci-visualization/paraview/files/paraview-3.6.2-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-06-15 09:02:06.000000000 -0400
++++ ParaView3.new/Plugins/PointSprite/Examples/Rendering/Cxx/CMakeLists.txt	2010-01-16 09:59:21.000000000 -0500
+@@ -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.2-qt.patch b/sci-visualization/paraview/files/paraview-3.6.2-qt.patch
new file mode 100644
index 000000000000..f2ea294ed871
--- /dev/null
+++ b/sci-visualization/paraview/files/paraview-3.6.2-qt.patch
@@ -0,0 +1,145 @@
+diff -Naur ParaView3/Applications/Client/CMakeLists.txt ParaView3.new/Applications/Client/CMakeLists.txt
+--- ParaView3/Applications/Client/CMakeLists.txt	2010-01-04 10:24:37.000000000 -0500
++++ ParaView3.new/Applications/Client/CMakeLists.txt	2010-01-14 18:43:52.000000000 -0500
+@@ -564,54 +564,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)
++#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-03-04 09:24:27.000000000 -0500
++++ ParaView3.new/Applications/StreamingParaView/CMakeLists.txt	2010-01-14 18:44:44.000000000 -0500
+@@ -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)
++#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 --git a/sci-visualization/paraview/metadata.xml b/sci-visualization/paraview/metadata.xml
index 9c2b0e6361c2..55e4b5ee7a05 100644
--- a/sci-visualization/paraview/metadata.xml
+++ b/sci-visualization/paraview/metadata.xml
@@ -9,5 +9,9 @@
 	<use>
 		<flag name='plugins'>Build and install additional plugins</flag>
 		<flag name='boost'>Enable the usage of dev-libs/boost</flag>
+		<flag name='gui'>Build paraview's gui not just the server</flag>
+		<flag name='cg'>Add support for nvidia's cg shaders</flag>
+		<flag name='streaming'>Enable streaming paraview application</flag>
+		<flag name='overview'>Enable the OverView plugin framework</flag>
 	</use>
 </pkgmetadata>
diff --git a/sci-visualization/paraview/paraview-3.6.2.ebuild b/sci-visualization/paraview/paraview-3.6.2.ebuild
new file mode 100644
index 000000000000..1b0115e0d109
--- /dev/null
+++ b/sci-visualization/paraview/paraview-3.6.2.ebuild
@@ -0,0 +1,257 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/paraview-3.6.2.ebuild,v 1.1 2010/01/16 19:58:32 markusle Exp $
+
+EAPI="2"
+
+inherit distutils eutils flag-o-matic toolchain-funcs versionator python qt4 cmake-utils
+
+MAIN_PV=$(get_major_version)
+MAJOR_PV=$(get_version_component_range 1-2)
+
+DESCRIPTION="ParaView is a powerful scientific data visualization application"
+HOMEPAGE="http://www.paraview.org"
+SRC_URI="mirror://gentoo/${P}.tar.gz
+	mirror://gentoo/${P}-openfoam-gpl-r173.patch.bz2
+	mirror://gentoo/${P}-openfoam-r173.patch.bz2"
+
+LICENSE="paraview GPL-2"
+KEYWORDS="~x86 ~amd64"
+SLOT="0"
+IUSE="mpi +python hdf5 doc examples +gui plugins boost streaming cg overview mysql postgres odbc"
+RDEPEND="hdf5? ( sci-libs/hdf5 )
+	mpi? ( || (
+				sys-cluster/openmpi
+				sys-cluster/mpich2[cxx] ) )
+	python? ( dev-lang/python:2.6 )
+	gui? ( x11-libs/qt-gui:4
+			x11-libs/qt-qt3support:4
+			x11-libs/qt-opengl:4
+			x11-libs/qt-assistant:4 )
+	mysql? ( virtual/mysql )
+	postgres? ( virtual/postgresql-base )
+	odbc? ( dev-db/unixODBC )
+	dev-libs/libxml2
+	media-libs/libpng
+	media-libs/jpeg
+	media-libs/tiff
+	media-video/ffmpeg
+	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}
+		boost? ( >=dev-libs/boost-1.37 )
+		doc? ( app-doc/doxygen )
+		>=dev-util/cmake-2.6.4"
+
+PVLIBDIR="$(get_libdir)/${PN}-${MAJOR_PV}"
+S="${WORKDIR}"/ParaView${MAIN_PV}
+
+pkg_setup() {
+	if (use overview) && (! use gui); then
+		die "the overview plugin requires the USE='gui'"
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-qt.patch
+	epatch "${FILESDIR}"/${P}-findcg-cmake.patch
+	epatch "${FILESDIR}"/${P}-assistant.patch
+	epatch "${DISTDIR}"/${P}-openfoam-r173.patch.bz2
+	epatch "${DISTDIR}"/${P}-openfoam-gpl-r173.patch.bz2
+	epatch "${FILESDIR}"/${P}-no-doc-finder.patch
+	epatch "${FILESDIR}"/${P}-pointsprite-disable.patch
+	epatch "${FILESDIR}"/${P}-about.html.patch
+
+	if use hdf5 && has_version '>=sci-libs/hdf5-1.8.0'; then
+		epatch "${FILESDIR}"/${P}-hdf-1.8.3.patch
+	fi
+
+	# fix GL issues
+	sed -e "s:DEPTH_STENCIL_EXT:DEPTH_COMPONENT24:" \
+		-i VTK/Rendering/vtkOpenGLRenderWindow.cxx \
+		|| die "Failed to fix GL issues."
+
+	# fix plugin install directory
+	sed -e "s:\${PV_INSTALL_BIN_DIR}/plugins:/usr/${PVLIBDIR}/plugins:" \
+		-i CMake/ParaViewPlugins.cmake \
+		|| die "Failed to fix plugin install directories"
+}
+
+src_configure() {
+	python_version
+	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
+	  -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 boost VTK_USE_BOOST)
+	  $(cmake-utils_use hdf5 PARAVIEW_USE_SYSTEM_HDF5)
+	  $(cmake-utils_use mpi PARAVIEW_USE_MPI)
+	  $(cmake-utils_use python PARAVIEW_ENABLE_PYTHON)
+	  $(cmake-utils_use doc BUILD_DOCUMENTATION)
+	  $(cmake-utils_use examples BUILD_EXAMPLES)
+	  $(cmake-utils_use cg VTK_USE_CG_SHADERS)
+	  $(cmake-utils_use streaming PARAVIEW_BUILD_StreamingParaView)
+	  $(cmake-utils_use odbc VTK_USE_ODBC)
+	  $(cmake-utils_use mysql VTK_USE_MYSQL)
+	  $(cmake-utils_use mysql XDMF_USE_MYSQL)
+	  $(cmake-utils_use postgres VTK_USE_POSTGRES))
+
+	if use gui; then
+		mycmakeargs+=(-DVTK_INSTALL_QT_DIR=/${PVLIBDIR}/plugins/designer)
+	fi
+
+	# all the logic needed for overview
+	# we enable all plugins that are either required by overview
+	# or require overview to work
+	mycmakeargs+=(
+	  $(cmake-utils_use overview VTK_USE_N_WAY_ARRAYS)
+	  $(cmake-utils_use overview PARAVIEW_BUILD_OverView)
+	  $(cmake-utils_use overview PARAVIEW_BUILD_PLUGIN_ClientGraphView)
+	  $(cmake-utils_use overview PARAVIEW_BUILD_PLUGIN_ClientGraphViewFrame)
+	  $(cmake-utils_use overview PARAVIEW_BUILD_PLUGIN_ClientRecordView)
+	  $(cmake-utils_use overview PARAVIEW_BUILD_PLUGIN_ClientTableView)
+	  $(cmake-utils_use overview PARAVIEW_BUILD_PLUGIN_ClientTreeView)
+	  $(cmake-utils_use overview PARAVIEW_BUILD_PLUGIN_Infovis)
+	  $(cmake-utils_use overview PARAVIEW_BUILD_PLUGIN_SQLDatabaseGraphSourcePanel)
+	  $(cmake-utils_use overview PARAVIEW_BUILD_PLUGIN_SQLDatabaseTableSourcePanel)
+	  $(cmake-utils_use overview PARAVIEW_BUILD_PLUGIN_TableToGraphPanel)
+	  $(cmake-utils_use overview PARAVIEW_BUILD_PLUGIN_Array)
+	  $(cmake-utils_use overview PARAVIEW_BUILD_PLUGIN_ClientGeoView)
+	  $(cmake-utils_use overview PARAVIEW_BUILD_PLUGIN_ClientGeoView2D)
+	  $(cmake-utils_use overview PARAVIEW_BUILD_PLUGIN_ClientGraphViewFrame)
+	  $(cmake-utils_use overview PARAVIEW_BUILD_PLUGIN_ClientHierarchyView)
+	  $(cmake-utils_use overview PARAVIEW_BUILD_PLUGIN_CommonToolbar)
+	  $(cmake-utils_use overview PARAVIEW_BUILD_PLUGIN_GraphLayoutFilterPanel)
+	  $(cmake-utils_use overview PARAVIEW_BUILD_PLUGIN_SplitTableFieldPanel)
+	  $(cmake-utils_use overview PARAVIEW_BUILD_PLUGIN_StatisticsToolbar)
+	  $(cmake-utils_use overview PARAVIEW_BUILD_PLUGIN_TableToSparseArrayPanel)
+	  $(cmake-utils_use overview PARAVIEW_BUILD_PLUGIN_ThresholdTablePanel))
+
+	# the rest of the plugins
+	mycmakeargs+=(
+	  $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_ChartViewFrame)
+	  $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_ClientAttributeView)
+	  $(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_Streaming)
+	  $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_netCDFReaders))
+
+	if use python; then
+	  mycmakeargs+=($(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_pvblot))
+	fi
+
+	# we also need to append -DH5Tget_array_dims_vers=1 to our CFLAGS
+	# to make sure we can compile against >=hdf5-1.8.3
+	if use hdf5; then
+		append-flags -DH5_USE_16_API
+	fi
+
+	cmake-utils_src_configure
+	# overview needs a second configure to pick things up
+	use overview && cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# rename the assistant wrapper
+	if use gui; then
+		mv "${D}"/usr/bin/assistant "${D}"/usr/bin/paraview-assistant \
+			|| die "Failed to rename assistant wrapper"
+		chmod 0755 "${D}"/usr/${PVLIBDIR}/assistant-real \
+			|| die "Failed to change permissions on assistant wrapper"
+	fi
+
+	# since there is no install target for OverView we have to 
+	# do things manually
+	if use overview; then
+		exeinto /usr/"${PVLIBDIR}"
+		newexe "${CMAKE_BUILD_DIR}"/bin/OverView OverView-real \
+			|| die "Failed to install OverView binary"
+		dolib.so "${CMAKE_BUILD_DIR}"/bin/libOverViewCore.so \
+			|| die "Failed to install OverViewCore shared object"
+
+		insinto /usr/"${PVLIBDIR}"/OverView-startup
+		insopts -m0744
+		doins "${CMAKE_BUILD_DIR}"/bin/OverView-startup/lib*.so \
+			|| die "Failed to install OverView libraries"
+
+		dosym /usr/"${PVLIBDIR}"/OverView-real /usr/bin/OverView \
+			|| die "Failed to create OverView symlink"
+
+		newicon "${S}"/Applications/OverView/Icon.png overview.png \
+			|| die "Failed to create OverView icon"
+		make_desktop_entry OverView "OverView" overview.png \
+			|| die "Failed to install OverView desktop icon"
+	fi
+
+	# 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/Client/ParaViewLogo.png paraview.png \
+		|| die "Failed to create paraview icon."
+	make_desktop_entry paraview "Paraview" paraview.png \
+		|| 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
+}