media-libs/jpeg -> virtual/jpeg. Drop old. Sort KEYWORDS and USE.

Package-Manager: portage-2.1.9.24/cvs/Linux x86_64

10 files changed, 15 insertions, 859 deletions

diff --git a/sci-visualization/paraview/ChangeLog b/sci-visualization/paraview/ChangeLog
index 22073cf38e10..7313847c0761 100644
--- a/sci-visualization/paraview/ChangeLog
+++ b/sci-visualization/paraview/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sci-visualization/paraview
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/ChangeLog,v 1.51 2010/06/17 22:41:56 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/ChangeLog,v 1.52 2010/11/08 18:00:51 xarthisius Exp $
+
+  08 Nov 2010; Kacper Kowalik <xarthisius@gentoo.org>
+  -paraview-3.6.1.ebuild, -paraview-3.6.1-r1.ebuild,
+  -files/paraview-3.6.1-assistant.patch,
+  -files/paraview-3.6.1-hdf-1.8.3.patch,
+  -files/paraview-3.6.1-install-fix.patch,
+  -files/paraview-3.6.1-no-doc-finder.patch,
+  -files/paraview-3.6.1-pointsprite-disable.patch,
+  -files/paraview-3.6.1-qt.patch, paraview-3.6.2.ebuild:
+  media-libs/jpeg -> virtual/jpeg. Drop old. Sort KEYWORDS and USE.
 
   17 Jun 2010; Patrick Lauer <patrick@gentoo.org> paraview-3.6.2.ebuild:
   Migrating away from deprecated postgres virtuals
diff --git a/sci-visualization/paraview/files/paraview-3.6.1-assistant.patch b/sci-visualization/paraview/files/paraview-3.6.1-assistant.patch
deleted file mode 100644
index a48c9b53a80a..000000000000
--- a/sci-visualization/paraview/files/paraview-3.6.1-assistant.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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
deleted file mode 100644
index 0b966a724c18..000000000000
--- a/sci-visualization/paraview/files/paraview-3.6.1-hdf-1.8.3.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-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
deleted file mode 100644
index f61627138e42..000000000000
--- a/sci-visualization/paraview/files/paraview-3.6.1-install-fix.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-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-no-doc-finder.patch b/sci-visualization/paraview/files/paraview-3.6.1-no-doc-finder.patch
deleted file mode 100644
index a98d004197d0..000000000000
--- a/sci-visualization/paraview/files/paraview-3.6.1-no-doc-finder.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -Naur ParaView3.old/Applications/Client/CMakeLists.txt ParaView3/Applications/Client/CMakeLists.txt
---- ParaView3.old/Applications/Client/CMakeLists.txt	2009-07-20 15:36:01.000000000 -0400
-+++ ParaView3/Applications/Client/CMakeLists.txt	2009-07-28 09:28:12.000000000 -0400
-@@ -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.1-pointsprite-disable.patch b/sci-visualization/paraview/files/paraview-3.6.1-pointsprite-disable.patch
deleted file mode 100644
index 5d6cdd053fa8..000000000000
--- a/sci-visualization/paraview/files/paraview-3.6.1-pointsprite-disable.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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
deleted file mode 100644
index bca40bc4a00f..000000000000
--- a/sci-visualization/paraview/files/paraview-3.6.1-qt.patch
+++ /dev/null
@@ -1,147 +0,0 @@
-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

diff --git a/sci-visualization/paraview/paraview-3.6.1-r1.ebuild b/sci-visualization/paraview/paraview-3.6.1-r1.ebuild
deleted file mode 100644
index 75b54e422dda..000000000000
--- a/sci-visualization/paraview/paraview-3.6.1-r1.ebuild
+++ /dev/null
@@ -1,229 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/paraview-3.6.1-r1.ebuild,v 1.4 2009/11/24 04:05:41 markusle Exp $
-
-EAPI="2"
-
-inherit distutils eutils flag-o-matic toolchain-funcs versionator python qt4
-
-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-r120.patch.bz2
-	mirror://gentoo/${P}-openfoam-r120.patch.bz2"
-
-LICENSE="paraview GPL-2"
-KEYWORDS="~x86 ~amd64"
-SLOT="0"
-IUSE="mpi python hdf5 doc examples qt4 plugins boost"
-RDEPEND="hdf5? ( sci-libs/hdf5 )
-	mpi? ( || (
-				sys-cluster/openmpi
-				sys-cluster/mpich2[cxx] ) )
-	python? ( >=dev-lang/python-2.0 )
-	qt4? ( x11-libs/qt-gui:4
-			x11-libs/qt-qt3support:4
-			x11-libs/qt-assistant:4 )
-	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}
-		doc? ( app-doc/doxygen )
-		boost? ( >=dev-libs/boost-1.37 )
-		>=dev-util/cmake-2.6.4"
-
-PVLIBDIR="$(get_libdir)/${PN}-${MAJOR_PV}"
-BUILDDIR="${WORKDIR}/build"
-S="${WORKDIR}"/ParaView${MAIN_PV}
-
-src_prepare() {
-	mkdir "${BUILDDIR}" || die "Failed to generate build directory"
-	epatch "${FILESDIR}"/${P}-qt.patch
-	epatch "${FILESDIR}"/${P}-pointsprite-disable.patch
-	epatch "${FILESDIR}"/${P}-assistant.patch
-	epatch "${DISTDIR}"/${P}-openfoam-r120.patch.bz2
-	epatch "${DISTDIR}"/${P}-openfoam-gpl-r120.patch.bz2
-	epatch "${FILESDIR}"/${P}-no-doc-finder.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_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} -DCMAKE_COLOR_MAKEFILE:BOOL=TRUE"
-	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_SYSTEM_LIBXML2:BOOL=ON"
-	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_BUILD_StreamingParaView:BOOL=ON"
-	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_OFFSCREEN=TRUE"
-	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DCMAKE_USE_PTHREADS:BOOL=ON"
-	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DBUILD_TESTING:BOOL=OFF"
-
-	# FIXME: compiling against ffmpeg is currently broken
-	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_FFMPEG_ENCODER:BOOL=OFF"
-
-	if use boost; then
-		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_BOOST:BOOL=ON"
-	else
-		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_BOOST:BOOL=OFF"
-	fi
-
-	if use hdf5; then
-		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_USE_SYSTEM_HDF5:BOOL=ON"
-
-		# we also need to append -DH5Tget_array_dims_vers=1 to our CFLAGS
-		# to make sure we can compile against >=hdf5-1.8.3
-		append-flags -DH5_USE_16_API
-	fi
-
-	if use mpi; then
-		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_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
-
-	local plugin_toggle="OFF"
-	if use plugins; then
-		plugin_toggle="ON"
-	fi
-	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_BUILD_OverView:BOOL=${plugin_toggle}"
-	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_BUILD_PLUGIN_ARRAY:BOOL=${plugin_toggle}"
-	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_BUILD_PLUGIN_ClientGraphViewFrame:BOOL=${plugin_toggle}"
-	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_BUILD_PLUGIN_CosmoFilters:BOOL=${plugin_toggle}"
-	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_BUILD_PLUGIN_Infovis:BOOL=${plugin_toggle}"
-	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_BUILD_PLUGIN_Moments,:BOOL=${plugin_toggle}"
-	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_BUILD_PLUGIN_PointSprite:BOOL=${plugin_toggle}"
-	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_BUILD_PLUGIN_Prism:BOOL=${plugin_toggle}"
-	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_BUILD_PLUGIN_SLACTools:BOOL=${plugin_toggle}"
-	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_BUILD_PLUGIN_Streaming:BOOL=${plugin_toggle}"
-	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_BUILD_PLUGIN_netCDFReaders:BOOL=${plugin_toggle}"
-	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_BUILD_PLUGIN_pvblot:BOOL=${plugin_toggle}"
-
-	# these plugins currently don't configure so turn them off for now
-	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_BUILD_PLUGIN_VisItReaderPlugin:BOOL=OFF"
-	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_BUILD_PLUGIN_TableToSparseArrayPanel:BOOL=OFF"
-
-	# these plugins currently don't compile so turn them off for now
-	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_BUILD_PLUGIN_ClientGraphView:BOOL=OFF"
-	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_BUILD_PLUGIN_SplitTableFieldPanel:BOOL=OFF"
-	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_BUILD_PLUGIN_SQLDatabaseGraphSourcePanel:BOOL=OFF"
-	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_BUILD_PLUGIN_SQLDatabaseTableSourcePanel:BOOL=OFF"
-	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_BUILD_PLUGIN_TableToGraphPanel:BOOL=OFF"
-	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_BUILD_PLUGIN_ThresholdTablePanel:BOOL=OFF"
-	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_BUILD_PLUGIN_StatisticsToolbar:BOOL=OFF"
-	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_BUILD_PLUGIN_ClientGeoView2D:BOOL=OFF"
-	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_BUILD_PLUGIN_ClientGeoView:BOOL=OFF"
-	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_BUILD_PLUGIN_ClientTableView:BOOL=OFF"
-	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_BUILD_PLUGIN_ClientHierarchyView:BOOL=OFF"
-	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_BUILD_PLUGIN_ClientRecordView:BOOL=OFF"
-	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_BUILD_PLUGIN_CommonToolbar:BOOL=OFF"
-	CMAKE_VARIABLES="${CMAKE_VARIABLES}	-DPARAVIEW_BUILD_PLUGIN_ClientTreeView:BOOL=no"
-	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_BUILD_PLUGIN_GraphLayoutFilterPanel:BOOL=OFF"
-
-	if use qt4; then
-		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_BUILD_QT_GUI:BOOL=ON"
-		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_INSTALL_QT_DIR=/${PVLIBDIR}/plugins/designer"
-	else
-		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_BUILD_QT_GUI: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/${PVLIBDIR}/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}
-
-	# move and remove some of the files that should not be
-	# in /usr/bin
-	dohtml "${D}/usr/bin/about.html" && rm -f "${D}/usr/bin/about.html" \
-		|| die "Failed to move about.html into doc dir"
-
-	# 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"
-}
-
-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.6.1.ebuild b/sci-visualization/paraview/paraview-3.6.1.ebuild
deleted file mode 100644
index b069b3b27f54..000000000000
--- a/sci-visualization/paraview/paraview-3.6.1.ebuild
+++ /dev/null
@@ -1,225 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/paraview-3.6.1.ebuild,v 1.8 2009/07/29 00:21:31 mr_bones_ Exp $
-
-EAPI="2"
-
-inherit distutils eutils flag-o-matic toolchain-funcs versionator python qt4
-
-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-r120.patch.bz2
-	mirror://gentoo/${P}-openfoam-r120.patch.bz2"
-
-LICENSE="paraview GPL-2"
-KEYWORDS="~x86 ~amd64"
-SLOT="0"
-IUSE="mpi python hdf5 doc examples qt4 plugins boost"
-RDEPEND="hdf5? ( sci-libs/hdf5 )
-	mpi? ( || (
-				sys-cluster/openmpi
-				sys-cluster/mpich2[cxx] ) )
-	python? ( >=dev-lang/python-2.0 )
-	qt4? ( x11-libs/qt-gui:4
-			x11-libs/qt-qt3support:4
-			x11-libs/qt-assistant:4 )
-	boost? ( >=dev-libs/boost-1.37 )
-	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"
-
-# NOTE: vtk and paraview currently don't get along well
-# (#279264, #212947) hence we need to block it
-DEPEND="${RDEPEND}
-		!!sci-libs/vtk
-		doc? ( app-doc/doxygen )
-		>=dev-util/cmake-2.6.4"
-
-PVLIBDIR="$(get_libdir)/${PN}-${MAJOR_PV}"
-BUILDDIR="${WORKDIR}/build"
-S="${WORKDIR}"/ParaView${MAIN_PV}
-
-src_prepare() {
-	mkdir "${BUILDDIR}" || die "Failed to generate build directory"
-	epatch "${FILESDIR}"/${P}-qt.patch
-	epatch "${FILESDIR}"/${P}-pointsprite-disable.patch
-	epatch "${FILESDIR}"/${P}-assistant.patch
-	epatch "${DISTDIR}"/${P}-openfoam-r120.patch.bz2
-	epatch "${DISTDIR}"/${P}-openfoam-gpl-r120.patch.bz2
-	epatch "${FILESDIR}"/${P}-no-doc-finder.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_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"
-	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_BUILD_StreamingParaView:BOOL=ON"
-	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_OFFSCREEN=TRUE"
-	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DCMAKE_USE_PTHREADS:BOOL=ON"
-	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DBUILD_TESTING:BOOL=OFF"
-
-	# FIXME: compiling against ffmpeg is currently broken
-	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_FFMPEG_ENCODER:BOOL=OFF"
-
-	if use boost; then
-		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_BOOST:BOOL=ON"
-	else
-		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_BOOST:BOOL=OFF"
-	fi
-
-	if use hdf5; then
-		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_USE_SYSTEM_HDF5:BOOL=ON"
-
-		# we also need to append -DH5Tget_array_dims_vers=1 to our CFLAGS
-		# to make sure we can compile against >=hdf5-1.8.3
-		append-flags -DH5_USE_16_API
-	fi
-
-	if use mpi; then
-		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_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
-
-	local plugin_toggle="OFF"
-	if use plugins; then
-		plugin_toggle="ON"
-	fi
-	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_BUILD_OverView:BOOL=${plugin_toggle}"
-	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_BUILD_PLUGIN_ARRAY:BOOL=${plugin_toggle}"
-	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_BUILD_PLUGIN_ClientGraphViewFrame:BOOL=${plugin_toggle}"
-	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_BUILD_PLUGIN_CosmoFilters:BOOL=${plugin_toggle}"
-	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_BUILD_PLUGIN_Infovis:BOOL=${plugin_toggle}"
-	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_BUILD_PLUGIN_Moments,:BOOL=${plugin_toggle}"
-	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_BUILD_PLUGIN_PointSprite:BOOL=${plugin_toggle}"
-	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_BUILD_PLUGIN_Prism:BOOL=${plugin_toggle}"
-	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_BUILD_PLUGIN_SLACTools:BOOL=${plugin_toggle}"
-	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_BUILD_PLUGIN_Streaming:BOOL=${plugin_toggle}"
-	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_BUILD_PLUGIN_netCDFReaders:BOOL=${plugin_toggle}"
-	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_BUILD_PLUGIN_pvblot:BOOL=${plugin_toggle}"
-
-	# these plugins currently don't configure so turn them off for now
-	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_BUILD_PLUGIN_VisItReaderPlugin:BOOL=OFF"
-	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_BUILD_PLUGIN_TableToSparseArrayPanel:BOOL=OFF"
-
-	# these plugins currently don't compile so turn them off for now
-	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_BUILD_PLUGIN_ClientGraphView:BOOL=OFF"
-	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_BUILD_PLUGIN_SplitTableFieldPanel:BOOL=OFF"
-	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_BUILD_PLUGIN_SQLDatabaseGraphSourcePanel:BOOL=OFF"
-	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_BUILD_PLUGIN_SQLDatabaseTableSourcePanel:BOOL=OFF"
-	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_BUILD_PLUGIN_TableToGraphPanel:BOOL=OFF"
-	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_BUILD_PLUGIN_ThresholdTablePanel:BOOL=OFF"
-	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_BUILD_PLUGIN_StatisticsToolbar:BOOL=OFF"
-	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_BUILD_PLUGIN_ClientGeoView2D:BOOL=OFF"
-	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_BUILD_PLUGIN_ClientGeoView:BOOL=OFF"
-	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_BUILD_PLUGIN_ClientTableView:BOOL=OFF"
-	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_BUILD_PLUGIN_ClientHierarchyView:BOOL=OFF"
-	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_BUILD_PLUGIN_ClientRecordView:BOOL=OFF"
-	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_BUILD_PLUGIN_CommonToolbar:BOOL=OFF"
-	CMAKE_VARIABLES="${CMAKE_VARIABLES}	-DPARAVIEW_BUILD_PLUGIN_ClientTreeView:BOOL=no"
-	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_BUILD_PLUGIN_GraphLayoutFilterPanel:BOOL=OFF"
-
-	if use qt4; then
-		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_BUILD_QT_GUI:BOOL=ON"
-		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_INSTALL_QT_DIR=/${PVLIBDIR}/plugins/designer"
-	else
-		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_BUILD_QT_GUI: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/${PVLIBDIR}/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}
-
-	# move and remove some of the files that should not be
-	# in /usr/bin
-	dohtml "${D}/usr/bin/about.html" && rm -f "${D}/usr/bin/about.html" \
-		|| die "Failed to move about.html into doc dir"
-
-	# this binary does not work and probably should not be installed
-	rm -f "${D}/usr/bin/vtkSMExtractDocumentation" \
-		|| die "Failed to remove vtkSMExtractDocumentation"
-}
-
-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."
-}
diff --git a/sci-visualization/paraview/paraview-3.6.2.ebuild b/sci-visualization/paraview/paraview-3.6.2.ebuild
index f863d692aac0..7b87f8d07651 100644
--- a/sci-visualization/paraview/paraview-3.6.2.ebuild
+++ b/sci-visualization/paraview/paraview-3.6.2.ebuild
@@ -1,6 +1,6 @@
 # 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.9 2010/06/17 22:41:56 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/paraview-3.6.2.ebuild,v 1.10 2010/11/08 18:00:51 xarthisius Exp $
 
 EAPI="2"
 
@@ -18,9 +18,9 @@ SRC_URI="mirror://gentoo/${P}.tar.gz
 	mirror://gentoo/${P}-openfoam-r173.patch.bz2"
 
 LICENSE="paraview GPL-2"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 SLOT="0"
-IUSE="mpi +python doc examples +gui plugins boost streaming cg overview mysql postgres odbc"
+IUSE="boost cg doc examples +gui mpi mysql plugins +python postgres streaming odbc overview"
 RDEPEND="sci-libs/hdf5[mpi=]
 	mpi? ( || (
 				sys-cluster/openmpi
@@ -34,7 +34,7 @@ RDEPEND="sci-libs/hdf5[mpi=]
 	odbc? ( dev-db/unixODBC )
 	dev-libs/libxml2
 	media-libs/libpng
-	media-libs/jpeg
+	virtual/jpeg
 	media-libs/tiff
 	media-video/ffmpeg
 	dev-libs/expat