diff options
| author |   Markus Dittrich <markusle@gentoo.org> | 2009-08-05 14:41:56 +0000 |
|---|---|---|
| committer | Markus Dittrich <markusle@gentoo.org> | 2009-08-05 14:41:56 +0000 |
| commit | 98f2544035fcf823f2ba4c9047e778a9e6f5cf7f (patch) | |
| tree | f90efbc74b3a3d6db0981e6eb61e7d9be9761a9f /sci-visualization | |
| parent | Version bump (diff) | |
| download | historical-98f2544035fcf823f2ba4c9047e778a9e6f5cf7f.tar.gz historical-98f2544035fcf823f2ba4c9047e778a9e6f5cf7f.tar.bz2 historical-98f2544035fcf823f2ba4c9047e778a9e6f5cf7f.zip | |
Removed old ebuilds and patches.
Package-Manager: portage-2.1.6.13/cvs/Linux x86_64
Diffstat (limited to 'sci-visualization')
9 files changed, 10 insertions, 1508 deletions
diff --git a/sci-visualization/paraview/ChangeLog b/sci-visualization/paraview/ChangeLog index d4971672f4e9..0fc5a49eda6a 100644 --- a/sci-visualization/paraview/ChangeLog +++ b/sci-visualization/paraview/ChangeLog @@ -1,6 +1,14 @@ # 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.40 2009/07/30 14:13:04 markusle Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/ChangeLog,v 1.41 2009/08/05 14:41:55 markusle Exp $ + + 05 Aug 2009; Markus Dittrich <markusle@gentoo.org> + -files/paraview-3.2.1-openmpi.patch, -paraview-3.3_pre20080514.ebuild, + -files/paraview-3.3_pre20080514-gcc4.3.patch, + -files/paraview-3.3_pre20080514-hdf5.patch, + -files/paraview-3.3_pre20080514-qt4.4.patch, -paraview-3.4.0.ebuild, + -files/paraview-3.4.0-qt4.4-5.patch: + Removed old ebuilds and patches. *paraview-3.6.1-r1 (29 Jul 2009) diff --git a/sci-visualization/paraview/Manifest b/sci-visualization/paraview/Manifest index 55ba30f137d9..7dca1b69e6a8 100644 --- a/sci-visualization/paraview/Manifest +++ b/sci-visualization/paraview/Manifest @@ -1,24 +1,13 @@ -AUX paraview-3.2.1-openmpi.patch 1651 RMD160 64025fcb74f62939e0b71f4cfc0de09e83aa38fb SHA1 f3863c718d8c2d9da4201b194b24fb75c2794269 SHA256 148d4e22419b31af9f1c357b478820a09bffff0eada0acd3758e6dca7da3209b -AUX paraview-3.3_pre20080514-gcc4.3.patch 2242 RMD160 3a088e61318bf4e3faaedc401e678b0ff1fd0569 SHA1 9027ecbb8f984fa9eac950c22e46cd3f6a5bd258 SHA256 c5e6651134ce95fed5be4d3a3d3751aeaf936cc0b31977e1abbb9f38048c1052 -AUX paraview-3.3_pre20080514-hdf5.patch 631 RMD160 d6832c1faac44cf6844c9fca7583fe546526b160 SHA1 49ac4b398cd56d766491843ad8e8310992b9a17d SHA256 be0097fb23d7c600f1642586dbd18c5fd0e9db50ee3539ce4fe637e066ce2721 -AUX paraview-3.3_pre20080514-qt4.4.patch 3750 RMD160 1115e784a8e9dbafc65f2be11e277350ab0f4760 SHA1 a813195455b97c83d6b0ea50753c0003d0a955eb SHA256 34fdc79f8f52669a7285b5d0b12d6567b8b5489397f739571f1ef6094e0fda92 -AUX paraview-3.4.0-qt4.4-5.patch 36215 RMD160 b30c7a14deabed70421af8e1a50041778e7cc116 SHA1 96793e34bacb51ed8c6b62cfeaa5ad57b6bb2709 SHA256 8371cf372464913e050d08518d467b72f9158872e4bf865be744b41a2e2b9058 AUX paraview-3.6.1-assistant.patch 1122 RMD160 4f6ecb6bd6105b3b4a5a7848782cfe92e6741d18 SHA1 81b47c0a30336fbfb45d55f2480474c994d7f820 SHA256 62fbe1310ee8f0c2405ff12cfe9edb50100e654678e7fb823f78084f284130d3 AUX paraview-3.6.1-hdf-1.8.3.patch 2763 RMD160 f6a557565e75541e74b7052cdbd797e56e39f85b SHA1 d70f2b2715b3cebecb2db82d8c05b60fbb0220d1 SHA256 97247cc3fcb887de3bbf73a80ecda270c7f282802c365b21f20c518b76f2d3be AUX paraview-3.6.1-install-fix.patch 6861 RMD160 4c65e8f95670a740b67146cbf943e8d6340e4857 SHA1 17d02c81884f5a1c56832a26026265e53aa18566 SHA256 aa991a873f3f692981df75ff20dc67d55ab38fc8de2ee3b11d05326419d4b2c1 AUX paraview-3.6.1-no-doc-finder.patch 787 RMD160 e3669d31061d69cb2007be0aa9be2d83de465745 SHA1 591e47194d9a02bc0277906cb3aac1742a6bee37 SHA256 7c264e9ab359928f5d3d23369b07ea9a698554434357744622f1267a2df732b6 AUX paraview-3.6.1-pointsprite-disable.patch 617 RMD160 bef259c2e5edf7b3a8af32a204432d2761ac0834 SHA1 624f682127a5b382475bd0e7a65cab1b9c51c228 SHA256 fb413c38df3461c8840de776442de37171bfeabc42d83be8699d205d41b7b4d6 AUX paraview-3.6.1-qt.patch 7544 RMD160 0396a656029cc1f9562e6b16eb739a8e7960565a SHA1 409c19532bc2ed48cb22c344e1d9db0960147e9a SHA256 d678173f19a393010949582e8353b3e9436fd02bea940a0df49cda90ed4874a4 -DIST paraview-3.3_pre20080514-OpenFOAM-1.5.patch.bz2 55771 RMD160 4b40990c5180157ddb7b4945d77de6f8a8ed52ee SHA1 6a673c78222e0f58c36c0d99c604216301960daf SHA256 a85a9011d67c9a3f6ed0b0f7c5c5bf6a6ade8c9989dc48a48cb552ebbed4dcd6 -DIST paraview-3.3_pre20080514.tar.bz2 19931958 RMD160 bcca09c71c84deaa721261fcb514897af052f360 SHA1 fcd8061d7a7679f635c06a1940a34d62acb77c23 SHA256 a1e75e5342bb95c18033ba2906514ba34693515b81a94d157a5928719fb9e4de -DIST paraview-3.4.0-OpenFOAM-48.patch.bz2 58127 RMD160 f74f4596c62d6bdbfe72908c285168ab9ce9acff SHA1 e2c9859439868c6aefe767f742347e2530c54570 SHA256 2aa0289abd62fec9cf6fe9d8621779b6967a47c895e14d0c1e65420849be0c27 -DIST paraview-3.4.0.tar.gz 25066839 RMD160 992c90712c057e1802fb55817ca2d7d49e526afb SHA1 08aca4cac9e557b763206ba6a5496487e335bcbc SHA256 27544f442e957e9aa60b32c674f2dcd84fffeecc9a40071ef6e305333413187d DIST paraview-3.6.1-openfoam-gpl-r120.patch.bz2 3180 RMD160 224b93d767864043c26eff12fe8843d82a9c8d54 SHA1 683d29cb4e05641928435685abcf96aa296e8794 SHA256 b05e3c9ce20d149ad40f7f3e9bc63f7e197f83eeae7fca6aad6e060c3d585fc4 DIST paraview-3.6.1-openfoam-r120.patch.bz2 58046 RMD160 dec759a9d0bebd83bee6d998cefb25ab0b74ead2 SHA1 83dad388583da99600876055424df3cf7f87b4a5 SHA256 047a1908b7995ef5569c8fcf0b4e2c7aa8239b11b08f0854bbee7cabf9ac026a DIST paraview-3.6.1.tar.gz 27119089 RMD160 8892434c1096d18e83bce6c62f1a7b07a8be1f0a SHA1 aedbe3bf8d831816972129c185565b582e331b53 SHA256 df71c052a4f85a568d3e4a4b55abb257c976795492d3991e32fe4100c3fd8a4e -EBUILD paraview-3.3_pre20080514.ebuild 5811 RMD160 a9d6d865780f1186d87681bedc80e9c14183224c SHA1 98ab4cf8ed0b47678007c9d98d035c4922eeccb6 SHA256 33b3e81eec889e84fd582fe878a24664137c134d95f535ccbe6756992b348a04 -EBUILD paraview-3.4.0.ebuild 5365 RMD160 032b9da72489a5c737178265705cabd47859e710 SHA1 afe3da6fba526a1b071fbbd229879b6d682e669b SHA256 90dad827174b7e8e254aee4425c7daa4b3432ac9490ab1ae3b6496a98cfe15ed EBUILD paraview-3.6.1-r1.ebuild 9833 RMD160 c3e663a01ee8ca2d013e2f63a15b3b1a509a6cd7 SHA1 77bf699412f689e9aeee056a1a1947fedf3ac38d SHA256 2614998da39c89c2d9f17cc630bbb2db8f27b981c8da2d25246844d745139203 EBUILD paraview-3.6.1.ebuild 9491 RMD160 f7677e326122f8303452f2e04be6b5594d63d685 SHA1 7150ec41d01de82c381e4335d048b09bf7b04f6a SHA256 79c2ad8a1b7ebc7f3abe2f628c7ee15fc304a161c307f042b9e4ad631410c970 -MISC ChangeLog 8188 RMD160 77ad6d2d38675519d133a47f3b6b13fe198ec513 SHA1 ab7a0d2923d3f583e3f6afeb5779fa601a0fe9c8 SHA256 cdec8dc6065cf14a9a3af594d01b332e0fe0fb6bfaf5de037009e41f29bd0eb2 +MISC ChangeLog 8554 RMD160 bbffe873b167cad6054a8642db4cf34f9ee5bce0 SHA1 d81fe53eecba5f1d18515db2736facc5cb255914 SHA256 dacb4bc636a5a879d3981d648d9b48d0d6e6a2d4c7e80a1c27c08ce3b807173a MISC metadata.xml 399 RMD160 131a5c96291217e416af0d726c40ed5624e3bf7b SHA1 f4b99deaa2bb2bf39c32b16fb8bfff81fb14759d SHA256 8c9a511c364dce29e73c21df5a6e51e94817e33e16a27127bba8f4ec9f3ba9cb diff --git a/sci-visualization/paraview/files/paraview-3.2.1-openmpi.patch b/sci-visualization/paraview/files/paraview-3.2.1-openmpi.patch deleted file mode 100644 index ba40c8d6ec22..000000000000 --- a/sci-visualization/paraview/files/paraview-3.2.1-openmpi.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff -Naur ParaView3.2.1/VTK/Parallel/CMakeLists.txt ParaView3.2.1.new/VTK/Parallel/CMakeLists.txt ---- ParaView3.2.1/VTK/Parallel/CMakeLists.txt 2007-11-07 15:51:57.000000000 -0500 -+++ ParaView3.2.1.new/VTK/Parallel/CMakeLists.txt 2008-02-20 08:51:14.000000000 -0500 -@@ -104,6 +104,7 @@ - - IF (VTK_USE_MPI) - INCLUDE (${CMAKE_ROOT}/Modules/FindMPI.cmake) -+ INCLUDE(${VTK_SOURCE_DIR}/Parallel/FindOpenmpi.cmake) - SET ( Kit_SRCS - ${Kit_SRCS} - vtkMPICommunicator.cxx -@@ -138,6 +139,12 @@ - IF (MPI_EXTRA_LIBRARY) - SET(KIT_LIBS ${KIT_LIBS} "${MPI_EXTRA_LIBRARY}") - ENDIF (MPI_EXTRA_LIBRARY) -+ IF (OPENMPI_LIBRARY) -+ SET(KIT_LIBS ${KIT_LIBS} "${OPENMPI_LIBRARY}") -+ ENDIF (OPENMPI_LIBRARY) -+ IF (OPENMPI_EXTRA_LIBRARY) -+ SET(KIT_LIBS ${KIT_LIBS} "${OPENMPI_EXTRA_LIBRARY}") -+ ENDIF (OPENMPI_EXTRA_LIBRARY) - ENDIF (VTK_USE_MPI) - - SET(Kit_EXTRA_SRCS) -diff -Naur ParaView3.2.1/VTK/Parallel/FindOpenmpi.cmake ParaView3.2.1.new/VTK/Parallel/FindOpenmpi.cmake ---- ParaView3.2.1/VTK/Parallel/FindOpenmpi.cmake 1969-12-31 19:00:00.000000000 -0500 -+++ ParaView3.2.1.new/VTK/Parallel/FindOpenmpi.cmake 2008-02-20 09:35:06.000000000 -0500 -@@ -0,0 +1,18 @@ -+# - Find openmpi -+FIND_PATH(MPI_INCLUDE_PATH mpi.h -+ /usr/include -+ /usr/include/openmpi -+) -+ -+FIND_LIBRARY(OPENMPI_LIBRARY -+ NAMES mpi -+ PATHS /usr/lib /usr/lib64 -+) -+ -+FIND_LIBRARY(OPENMPI_EXTRA_LIBRARY -+ NAMES mpi_cxx -+ PATHS /usr/lib /usr/lib64 -+ DOC "If a second mpi library is necessary, specify it here.") -+ -+MARK_AS_ADVANCED(OPENMPI_LIBRARY OPENMPI_EXTRA_LIBRARY) -+ diff --git a/sci-visualization/paraview/files/paraview-3.3_pre20080514-gcc4.3.patch b/sci-visualization/paraview/files/paraview-3.3_pre20080514-gcc4.3.patch deleted file mode 100644 index 1f6e3176f0c8..000000000000 --- a/sci-visualization/paraview/files/paraview-3.3_pre20080514-gcc4.3.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff -Naur ParaView3/Utilities/Xdmf2/libsrc/XdmfArray.h ParaView3.new/Utilities/Xdmf2/libsrc/XdmfArray.h ---- ParaView3/Utilities/Xdmf2/libsrc/XdmfArray.h 2008-02-21 11:55:28.000000000 -0500 -+++ ParaView3.new/Utilities/Xdmf2/libsrc/XdmfArray.h 2008-10-15 18:02:17.000000000 -0400 -@@ -26,6 +26,7 @@ - #define __XdmfArray_h - - #include "XdmfDataDesc.h" -+#include <cstdlib> - - #define XDMF_LONGEST_LENGTH (XdmfInt64)~0 - #define XDMF_ARRAY_TAG_LENGTH 80 -diff -Naur ParaView3/Utilities/Xdmf2/libsrc/XdmfDataDesc.h ParaView3.new/Utilities/Xdmf2/libsrc/XdmfDataDesc.h ---- ParaView3/Utilities/Xdmf2/libsrc/XdmfDataDesc.h 2008-02-21 11:55:28.000000000 -0500 -+++ ParaView3.new/Utilities/Xdmf2/libsrc/XdmfDataDesc.h 2008-10-15 18:02:17.000000000 -0400 -@@ -27,6 +27,7 @@ - - #include "XdmfObject.h" - #include "XdmfHDFSupport.h" -+#include <cstdlib> - - #define XDMF_SELECTALL 0 - #define XDMF_HYPERSLAB 1 -diff -Naur ParaView3/Utilities/Xdmf2/libsrc/XdmfH5Driver.cxx ParaView3.new/Utilities/Xdmf2/libsrc/XdmfH5Driver.cxx ---- ParaView3/Utilities/Xdmf2/libsrc/XdmfH5Driver.cxx 2007-07-12 15:10:04.000000000 -0400 -+++ ParaView3.new/Utilities/Xdmf2/libsrc/XdmfH5Driver.cxx 2008-10-15 18:02:49.000000000 -0400 -@@ -34,6 +34,7 @@ - #include "XdmfDsmComm.h" - #include "assert.h" - #include "hdf5.h" -+#include <cstdlib> - - #define HDF_IO_DEBUG 1 - #undef HDF_IO_DEBUG -diff -Naur ParaView3/Utilities/Xdmf2/libsrc/XdmfObject.h ParaView3.new/Utilities/Xdmf2/libsrc/XdmfObject.h ---- ParaView3/Utilities/Xdmf2/libsrc/XdmfObject.h 2008-02-08 10:25:42.000000000 -0500 -+++ ParaView3.new/Utilities/Xdmf2/libsrc/XdmfObject.h 2008-10-15 18:02:17.000000000 -0400 -@@ -121,6 +121,9 @@ - #define __DEPRECATED - # include <fstream> - # include <iomanip> -+ -+#include <cstring> -+ - using std::cerr; - using std::cout; - using std::cin; -diff -Naur ParaView3/Utilities/Xdmf2/libsrc/XdmfRoot.h ParaView3.new/Utilities/Xdmf2/libsrc/XdmfRoot.h ---- ParaView3/Utilities/Xdmf2/libsrc/XdmfRoot.h 2007-04-25 15:23:59.000000000 -0400 -+++ ParaView3.new/Utilities/Xdmf2/libsrc/XdmfRoot.h 2008-10-15 18:02:17.000000000 -0400 -@@ -26,7 +26,7 @@ - #define __XdmfRoot_h - - #include "XdmfElement.h" -- -+#include <cstdlib> - - /*! XdmfRoot represents the Root Element in - Xdmf. In XML it is the Element : diff --git a/sci-visualization/paraview/files/paraview-3.3_pre20080514-hdf5.patch b/sci-visualization/paraview/files/paraview-3.3_pre20080514-hdf5.patch deleted file mode 100644 index 1349fdc8dd2c..000000000000 --- a/sci-visualization/paraview/files/paraview-3.3_pre20080514-hdf5.patch +++ /dev/null @@ -1,13 +0,0 @@ -# adjust function signature to changed hdf-1.6.7 API -diff -Naur ParaView3/Utilities/Xdmf2/libsrc/XdmfDataDesc.cxx ParaView3.new/Utilities/Xdmf2/libsrc/XdmfDataDesc.cxx ---- ParaView3/Utilities/Xdmf2/libsrc/XdmfDataDesc.cxx 2008-02-21 17:20:24.000000000 -0500 -+++ ParaView3.new/Utilities/Xdmf2/libsrc/XdmfDataDesc.cxx 2008-10-15 16:02:08.000000000 -0400 -@@ -350,7 +350,7 @@ - status = H5Sselect_elements( this->DataSpace, - H5S_SELECT_SET, - NElements, -- ( const hsize_t **)HCoordinates); -+ ( const hsize_t *)HCoordinates); - #else - status = H5Sselect_elements( this->DataSpace, - H5S_SELECT_SET, diff --git a/sci-visualization/paraview/files/paraview-3.3_pre20080514-qt4.4.patch b/sci-visualization/paraview/files/paraview-3.3_pre20080514-qt4.4.patch deleted file mode 100644 index fcf0591b5ad8..000000000000 --- a/sci-visualization/paraview/files/paraview-3.3_pre20080514-qt4.4.patch +++ /dev/null @@ -1,74 +0,0 @@ -diff -Naur ParaView3/Applications/Client/CMakeLists.txt ParaView3.new/Applications/Client/CMakeLists.txt ---- ParaView3/Applications/Client/CMakeLists.txt 2008-04-01 12:47:19.000000000 -0400 -+++ ParaView3.new/Applications/Client/CMakeLists.txt 2008-05-25 21:13:29.000000000 -0400 -@@ -516,34 +516,34 @@ - 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(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_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) -+ # 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) -+ # 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/CMakeLists.txt ParaView3.new/CMakeLists.txt ---- ParaView3/CMakeLists.txt 2008-04-16 13:06:41.000000000 -0400 -+++ ParaView3.new/CMakeLists.txt 2008-05-25 21:01:03.000000000 -0400 -@@ -89,7 +89,7 @@ - MESSAGE(SEND_ERROR "Qt ${QT_MIN_VERSION} or greater not found. Please check the QT_QMAKE_EXECUTABLE variable.") - ELSE(NOT QT4_FOUND) - # don't go greater than supported version -- STRING(REGEX MATCH "^4\\.3\\.[0-9]+" qt_version_tmp "${QTVERSION}") -+ STRING(REGEX MATCH "^4\\.[3-4]\\.[0-9]+" qt_version_tmp "${QTVERSION}") - IF (NOT qt_version_tmp) - MESSAGE(SEND_ERROR "Qt ${QTVERSION} not supported. Please use Qt 4.3 (you may need to clean your dirtied cache).") - ENDIF (NOT qt_version_tmp) diff --git a/sci-visualization/paraview/files/paraview-3.4.0-qt4.4-5.patch b/sci-visualization/paraview/files/paraview-3.4.0-qt4.4-5.patch deleted file mode 100644 index c945cb2aca50..000000000000 --- a/sci-visualization/paraview/files/paraview-3.4.0-qt4.4-5.patch +++ /dev/null @@ -1,978 +0,0 @@ -diff -Naur ParaView-3.4.0/Applications/Client/CMakeLists.txt ParaView-3.4.0.new/Applications/Client/CMakeLists.txt ---- ParaView-3.4.0/Applications/Client/CMakeLists.txt 2008-09-09 14:48:15.000000000 -0400 -+++ ParaView-3.4.0.new/Applications/Client/CMakeLists.txt 2009-07-14 10:19:28.000000000 -0400 -@@ -538,34 +538,34 @@ - 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(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_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) -+ # 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) -+ # 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 ParaView-3.4.0/Applications/Client/CMakeLists.txt.orig ParaView-3.4.0.new/Applications/Client/CMakeLists.txt.orig ---- ParaView-3.4.0/Applications/Client/CMakeLists.txt.orig 1969-12-31 19:00:00.000000000 -0500 -+++ ParaView-3.4.0.new/Applications/Client/CMakeLists.txt.orig 2008-09-09 14:48:15.000000000 -0400 -@@ -0,0 +1,604 @@ -+PROJECT(pqClient) -+ -+MACRO(GET_IMAGE_THRESHOLD_ARG variable testname) -+# Macro used to obtain the command argument to set the image threshold. -+ SET (${variable}) -+ IF (${testname}_THRESHOLD) -+ SET (${variable} --image-threshold=${${testname}_THRESHOLD}) -+ ENDIF (${testname}_THRESHOLD) -+ENDMACRO(GET_IMAGE_THRESHOLD_ARG) -+ -+MACRO(GET_REVERSE_CONNECT_ARG variable testname) -+# Macro used to obtain when this test must use reverse connection -+ SET (${variable}) -+ IF (${testname}_REVERSE_CONNECT) -+ SET (${variable} --test-rc) -+ ENDIF (${testname}_REVERSE_CONNECT) -+ENDMACRO(GET_REVERSE_CONNECT_ARG) -+ -+SET(QT_USE_QTASSISTANT TRUE) -+SET(QT_USE_QTNETWORK TRUE) # QtAssistant depends on it (only for linking) -+SET(QT_USE_QTUITOOLS TRUE) -+INCLUDE(${QT_USE_FILE}) -+ -+IF(VTK_USE_MPI) -+ INCLUDE_DIRECTORIES(${MPI_INCLUDE_PATH}) -+ENDIF(VTK_USE_MPI) -+ -+INCLUDE_DIRECTORIES( -+ ${pqClient_SOURCE_DIR} -+ ${pqClient_BINARY_DIR} -+) -+ -+# Reduce the number of dirs that get included on moc command line -+# since it causes issues on Windows 2000. -+GET_DIRECTORY_PROPERTY(include_dirs_tmp INCLUDE_DIRECTORIES) -+SET_DIRECTORY_PROPERTIES(PROPERTIES INCLUDE_DIRECTORIES "${MOC_INCLUDE_DIRS}") -+ -+QT4_WRAP_CPP(MOC_BUILT_SOURCES -+ AboutDialog.h -+ MainWindow.h -+) -+ -+SET_DIRECTORY_PROPERTIES(PROPERTIES INCLUDE_DIRECTORIES "${include_dirs_tmp}") -+ -+SET(UI_FORMS -+ AboutDialog.ui -+ MainWindow.ui -+) -+ -+QT4_WRAP_UI(UI_BUILT_SOURCES -+ ${UI_FORMS} -+) -+ -+SET(UI_RESOURCES -+ Resources.qrc -+) -+ -+QT4_ADD_RESOURCES(RCS_SOURCES -+ ${UI_RESOURCES} -+) -+ -+IF(WIN32) -+ SET(EXE_ICON pqClient.rc) -+ENDIF(WIN32) -+ -+SOURCE_GROUP("Resources" FILES -+ ${UI_RESOURCES} -+ ${UI_FORMS} -+ ${EXE_ICON} -+) -+ -+SOURCE_GROUP("Generated" FILES -+ ${MOC_BUILT_SOURCES} -+ ${RCS_SOURCES} -+ ${UI_BUILT_SOURCES} -+) -+ -+IF(WIN32) -+ LINK_DIRECTORIES(${QT_LIBRARY_DIR}) -+ENDIF(WIN32) -+ -+IF(Q_WS_MAC) -+ SET(apple_bundle_sources "MacIcon.icns") -+ SET_SOURCE_FILES_PROPERTIES( -+ "MacIcon.icns" -+ PROPERTIES -+ MACOSX_PACKAGE_LOCATION Resources -+ ) -+ SET(MACOSX_BUNDLE_ICON_FILE MacIcon.icns) -+ SET(MAKE_BUNDLE MACOSX_BUNDLE) -+ENDIF(Q_WS_MAC) -+ -+# Add main server executables. -+IF(NOT Q_WS_MAC) -+ SET(PV_EXE_LIST paraview) -+ENDIF(NOT Q_WS_MAC) -+# Add Qt assistant to the list of shared lib. forwarded executables. -+# If this is enabled, the build system will create an executable -+# call assistant. This executable will set the appropriate ld library -+# path and execute assistant-real. It is the installation's requirement -+# to install assistant-real -+SET(PV_EXE_LIST ${PV_EXE_LIST} assistant) -+ -+SET(MACOSX_BUNDLE_BUNDLE_NAME "ParaView") -+IF(NOT Q_WS_MAC) -+ SET(PV_EXE_NAME paraview${PV_EXE_SUFFIX}) -+ELSE(NOT Q_WS_MAC) -+ SET(PV_EXE_NAME paraview) -+ENDIF(NOT Q_WS_MAC) -+ -+ADD_EXECUTABLE(${PV_EXE_NAME} WIN32 ${MAKE_BUNDLE} -+ AboutDialog.cxx -+ AboutDialog.h -+ MainWindow.cxx -+ MainWindow.h -+ main.cxx -+ ProcessModuleGUIHelper.cxx -+ ProcessModuleGUIHelper.h -+ ${MOC_BUILT_SOURCES} -+ ${RCS_SOURCES} -+ ${UI_BUILT_SOURCES} -+ ${EXE_ICON} -+ ${apple_bundle_sources} -+) -+ -+TARGET_LINK_LIBRARIES(${PV_EXE_NAME} -+ pqComponents -+ pqCore -+ pqWidgets -+ QtChart -+ QtTesting -+ ${QT_LIBRARIES} -+) -+ -+IF(Q_WS_MAC) -+ CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/CompleteBundle.cmake.in" -+ "${CMAKE_CURRENT_BINARY_DIR}/CompleteBundle.cmake" -+ @ONLY IMMEDIATE) -+ CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/CreateBundle.sh.in" -+ "${CMAKE_CURRENT_BINARY_DIR}/CreateBundle.sh" -+ @ONLY IMMEDIATE) -+ CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/CreateBundleDuringMakeInstall.cmake.in" -+ "${CMAKE_CURRENT_BINARY_DIR}/CreateBundleDuringMakeInstall.cmake" -+ @ONLY IMMEDIATE) -+ENDIF(Q_WS_MAC) -+ -+IF(WIN32) -+ TARGET_LINK_LIBRARIES(${PV_EXE_NAME} ${QT_QTMAIN_LIBRARY} ) -+ENDIF(WIN32) -+ -+FIND_PROGRAM(QT_ASSISTANT_EXECUTABLE -+ NAMES assistant_adp assistant -+ PATHS ${QT_BINARY_DIR} -+ DOC "path to assistant executable for documentation" -+ NO_DEFAULT_PATH) -+FILE(TO_NATIVE_PATH "${QT_ASSISTANT_EXECUTABLE}" PV_ASSISTANT) -+MARK_AS_ADVANCED(QT_ASSISTANT_EXECUTABLE) -+ -+FILE(TO_NATIVE_PATH "${ParaView_BINARY_DIR}/pqClient.adp" PV_CLIENT_DOC) -+ -+CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/pqClientDocFinder.txt.in" -+ "${EXECUTABLE_OUTPUT_PATH}/pqClientDocFinder.txt" -+ @ONLY IMMEDIATE) -+ -+IF(BUILD_TESTING) -+ IF(Q_WS_MAC) -+ SET(TEST_BINARY ${EXECUTABLE_OUTPUT_PATH}/paraview.app/Contents/MacOS/paraview --test-directory=${PARAVIEW_TEST_DIR}) -+ ELSE(Q_WS_MAC) -+ SET(TEST_BINARY ${EXECUTABLE_OUTPUT_PATH}/paraview --test-directory=${PARAVIEW_TEST_DIR}) -+ ENDIF(Q_WS_MAC) -+ -+ SET(TEST_XML ${pqClient_SOURCE_DIR}/Testing/XML) -+ SET(TEST_PYTHON ${pqClient_SOURCE_DIR}/Testing/Python) -+ SET(TEST_IMAGE ${PARAVIEW_DATA_ROOT}/Baseline) -+ -+ SET (XML_TESTS_WITH_BASELINES -+ # ColorEditor3 doesn't work in client/server mode -+ ColorEditor3 -+ CreateSourceWithoutConnect -+# LoadStateSelection -+ OpenFile -+# SelectionUndo -+ ) -+ -+ SET (TESTS_WITHOUT_BASELINES -+ AboutDialog -+ ChartOptions -+ ) -+ IF(PARAVIEW_DATA_ROOT) -+ SET (TESTS_WITHOUT_BASELINES -+ ${TESTS_WITHOUT_BASELINES} -+ LoadStateHistogram -+ ) -+ ENDIF(PARAVIEW_DATA_ROOT) -+ -+ IF(QT_TESTING_WITH_PYTHON) -+ SET(XML_TESTS_WITH_BASELINES ${XML_TESTS_WITH_BASELINES} -+ PythonProgrammableFilter -+ ) -+ SET(PYTHON_TESTS -+ OpenHelp -+ ToolBarAndMenus -+ TestContourWidget -+ ) -+ IF(PARAVIEW_DATA_ROOT) -+ SET(PYTHON_TESTS ${PYTHON_TESTS} -+ #HistogramChart -+ LoadStateMultiView -+ FileSeries -+ SaveLargeScreenshot -+ #SaveAnimationMultiView -- need to fix race condition on Mac -+ VCRAnimation -+ ) -+ # Set image threshold overrides for the tests. -+ SET(SaveLargeScreenshot_THRESHOLD 10000) -+ -+ SET(PYTHON_TESTS_REMOTE_ONLY -+ DisconnectAndSaveAnimation) -+ ENDIF(PARAVIEW_DATA_ROOT) -+ ENDIF(QT_TESTING_WITH_PYTHON) -+ -+ FOREACH(test ${TESTS_WITHOUT_BASELINES}) -+ ADD_TEST(pqClient${test} -+ ${TEST_BINARY} -dr -+ --test-directory=${PARAVIEW_TEST_DIR} -+ --run-test=${TEST_XML}/${test}.xml --exit) -+ ENDFOREACH(test) -+ -+ IF(PARAVIEW_DATA_ROOT) -+ FOREACH(test ${XML_TESTS_WITH_BASELINES}) -+ GET_IMAGE_THRESHOLD_ARG(THRESHOLD_CMD ${test}) -+ ADD_TEST(pqClient${test} -+ ${TEST_BINARY} -dr --run-test=${TEST_XML}/${test}.xml -+ --test-directory=${PARAVIEW_TEST_DIR} -+ --compare-view=${TEST_IMAGE}/${test}.png -+ ${THRESHOLD_CMD} -+ --exit) -+ ENDFOREACH(test) -+ ENDIF(PARAVIEW_DATA_ROOT) -+ -+ FOREACH(test ${PYTHON_TESTS}) -+ GET_IMAGE_THRESHOLD_ARG(THRESHOLD_CMD ${test}) -+ ADD_TEST(pqClient${test}-Python -+ ${TEST_BINARY} -dr --run-test=${TEST_PYTHON}/${test}.py -+ --test-directory=${PARAVIEW_TEST_DIR} -+ ${THRESHOLD_CMD} -+ --exit) -+ ENDFOREACH(test) -+ -+ # test the plugins -+ IF(BUILD_SHARED_LIBS AND BUILD_EXAMPLES) -+ SET(DOLLAR "$") -+ IF(CMAKE_CONFIGURATION_TYPES) -+ SET(TEST_BINARY ${EXECUTABLE_OUTPUT_PATH}/${DOLLAR}{CTEST_CONFIGURATION_TYPE}/paraview --test-directory=${PARAVIEW_TEST_DIR}) -+ SET(RUN_PATH ${EXECUTABLE_OUTPUT_PATH}/${DOLLAR}{CTEST_CONFIGURATION_TYPE}) -+ ELSE(CMAKE_CONFIGURATION_TYPES) -+ SET(RUN_PATH ${EXECUTABLE_OUTPUT_PATH}) -+ IF(Q_WS_MAC) -+ SET(TEST_BINARY ${EXECUTABLE_OUTPUT_PATH}/paraview.app/Contents/MacOS/paraview --test-directory=${PARAVIEW_TEST_DIR}) -+ ELSE(Q_WS_MAC) -+ SET(TEST_BINARY ${EXECUTABLE_OUTPUT_PATH}/paraview --test-directory=${PARAVIEW_TEST_DIR}) -+ ENDIF(Q_WS_MAC) -+ ENDIF(CMAKE_CONFIGURATION_TYPES) -+ -+ -+ IF (QT_TESTING_WITH_PYTHON) -+ # Since these tests need python, it's essential to verify that testing -+ # with python is enabled. -+ SET(PLUGIN_TESTS -+ ToolBarPlugin -+ ObjectPanelPlugin -+ ) -+ -+ FOREACH(test ${PLUGIN_TESTS}) -+ ADD_TEST(pqClient${test} -+ ${CMAKE_COMMAND} -E chdir ${RUN_PATH} -+ ${TEST_BINARY} -dr --run-test=${TEST_PYTHON}/${test}.py -+ --exit) -+ ENDFOREACH(test) -+ ENDIF (QT_TESTING_WITH_PYTHON) -+ -+ ENDIF(BUILD_SHARED_LIBS AND BUILD_EXAMPLES) -+ -+ -+# Now we add tests that use the pvTestDriver for running. -+ SET(XML_TESTS_WITH_BASELINES -+ 3DWidgetInCustomFilter -+ AnimatePipelineTime -+ CalcParens -+ Calculator -+ CameraLink -+ Clip -+ ClipHidden -+ ClipPlaneLink -+ ClipUndo -+ ColorEditor1 -+ ColorEditor2 -+ ColorEditor4 -+ Contour -+ ContourRange -+ CreateAndLoadLookmark -+ CreateCustomFilter -+ CreateSource -+ CustomFilter -+ Cut -+ CutMulti -+ D3SmallCells -+ DualSphereAnimation -+ ExodusIIPanel -+ ExodusModeShapes -+ ExodusPanel -+# ExodusWriter -- ENABLE WHEN WRITER IS ADDED -+ ExodusXML -+ ExTimeseries -+ ExtractBlock -+ ExtractLevel -+ Flow -+ Flow2 -+ Fractal2D -+ Fractal3D -+ LinePlot -+ LoadSaveStateAnimation -+ LoadState -+ NormalGlyphs -+ ObjectInspectorSphere -+ OpenSaveData -+ Plot3DReader -+ PropertyLink -+ ReadXMLPolyDataFileSeries -+ RectilinearFractal -+ RepresentationSelector -+ SaveAnimationGeometry -+ SaveColorMap -+ SelectReader -+ SimpleInteraction -+ Slice -+ SPTimeseries -+ StreamTracer -+ StreamTracerUpdates -+ TemporalInterpolator -+ TemporalShiftScale -+ Tessellate -+ TextWidget -+ Threshold -+ UndoRedo -+ UndoRedo1 -+ UndoRedo2 -+ UndoRedo3 -+ UndoRedo4 -+ UndoRedo5 -+ UndoRedo6 -+ UndoRedo7 -+ UnstructuredOutline -+ VariableSelector -+ ViewSettingsDialog -+ XdmfRead -+ XdmfReadImageData -+ XdmfReadImageDataCollection -+ XdmfReadRectilinearGrid -+ XdmfReadRectilinearGridCollection -+ XdmfReadStructuredGrid -+ XdmfReadStructuredGridCollection -+ ) -+ -+ # Add image threshold overrides for tests. -+ # Generally all tests with wireframes need higher thresholds. -+ SET (Flow2_THRESHOLD 15) -+ SET (UndoRedo4_THRESHOLD 15) -+ -+ # These Xdmf tests have wireframes, hence the increased thresholds. -+ SET (XdmfReadImageData_THRESHOLD 20) -+ SET (XdmfReadRectilinearGrid_THRESHOLD 20) -+ SET (XdmfReadRectilinearGridCollection_THRESHOLD 20) -+ SET (XdmfReadStructuredGrid_THRESHOLD 20) -+ SET (XdmfReadStructuredGridCollection_THRESHOLD 20) -+ SET (XdmfReadImageDataCollection_THRESHOLD 20) -+ -+ # Make these tests use reverse connection. -+ SET (CutMulti_REVERSE_CONNECT TRUE) -+ -+ # Test compositing for a few client server and client render server tests. -+ SET(COMPOSITING_XML_TESTS_WITH_BASELINES -+ Calculator -+ CameraLink -+ ColorEditor1 -+ ContourRange -+ D3SmallCells -+ Fractal3D -+ StreamTracer -+ UndoRedo2 -+ ) -+ -+ SET(TEST_BINARY ${EXECUTABLE_OUTPUT_PATH}/pvTestDriver) -+ -+ IF(PARAVIEW_DATA_ROOT) -+ OPTION(PARAVIEW_CLIENT_RENDER_SERVER_TESTS -+ "Turn on/off client tests that involve separate data and render servers." -+ ON) -+ MARK_AS_ADVANCED(PARAVIEW_CLIENT_RENDER_SERVER_TESTS) -+ FOREACH(test ${XML_TESTS_WITH_BASELINES}) -+ GET_IMAGE_THRESHOLD_ARG(THRESHOLD_CMD ${test}) -+ GET_REVERSE_CONNECT_ARG(REVERSE_CONNECTION_CMD ${test}) -+ -+ ADD_TEST(pqClient${test}-Builtin -+ ${TEST_BINARY} -+ --test-directory=${PARAVIEW_TEST_DIR} -+ -dr -+ --run-test=${TEST_XML}/${test}.xml -+ --compare-view=${TEST_IMAGE}/${test}.png -+ ${THRESHOLD_CMD} -+ --exit) -+ -+ ADD_TEST(pqClient${test}-ClientServer -+ ${TEST_BINARY} --test-server -+ ${REVERSE_CONNECTION_CMD} -+ --test-directory=${PARAVIEW_TEST_DIR} -+ -dr -+ --run-test=${TEST_XML}/${test}.xml -+ --compare-view=${TEST_IMAGE}/${test}.png -+ ${THRESHOLD_CMD} -+ --exit) -+ -+ IF (PARAVIEW_CLIENT_RENDER_SERVER_TESTS) -+ ADD_TEST(pqClient${test}-ClientRenderServer -+ ${TEST_BINARY} --test-render-server -+ ${REVERSE_CONNECTION_CMD} -+ --test-directory=${PARAVIEW_TEST_DIR} -+ -dr -+ --run-test=${TEST_XML}/${test}.xml -+ --compare-view=${TEST_IMAGE}/${test}.png -+ ${THRESHOLD_CMD} -+ --exit) -+ ENDIF (PARAVIEW_CLIENT_RENDER_SERVER_TESTS) -+ ENDFOREACH(test) -+ -+ FOREACH(test ${COMPOSITING_XML_TESTS_WITH_BASELINES}) -+ GET_IMAGE_THRESHOLD_ARG(THRESHOLD_CMD ${test}) -+ ADD_TEST(pqClient${test}-ClientServerRemoteRender -+ ${TEST_BINARY} --test-server --test-remote-rendering -+ --test-directory=${PARAVIEW_TEST_DIR} -+ -dr -+ --run-test=${TEST_XML}/${test}.xml -+ --compare-view=${TEST_IMAGE}/${test}.png -+ ${THRESHOLD_CMD} -+ --exit) -+ -+ IF (PARAVIEW_CLIENT_RENDER_SERVER_TESTS) -+ ADD_TEST(pqClient${test}-ClientRenderServerRemoteRender -+ ${TEST_BINARY} --test-render-server --test-remote-rendering -+ --test-directory=${PARAVIEW_TEST_DIR} -+ -dr -+ --run-test=${TEST_XML}/${test}.xml -+ --compare-view=${TEST_IMAGE}/${test}.png -+ ${THRESHOLD_CMD} -+ --exit) -+ ENDIF (PARAVIEW_CLIENT_RENDER_SERVER_TESTS) -+ ENDFOREACH(test) -+ -+ FOREACH(test ${PYTHON_TESTS_REMOTE_ONLY}) -+ GET_IMAGE_THRESHOLD_ARG(THRESHOLD_CMD ${test}) -+ ADD_TEST(pqClient${test}-ClientServer-Python -+ ${TEST_BINARY} --test-server -+ --test-directory=${PARAVIEW_TEST_DIR} -+ -dr -+ --run-test=${TEST_PYTHON}/${test}.py -+ ${THRESHOLD_CMD} -+ --exit) -+ -+ #FIXME -+ #IF (PARAVIEW_CLIENT_RENDER_SERVER_TESTS) -+ # ADD_TEST(pqClient${test}-ClientRenderServer-Python -+ # ${TEST_BINARY} --test-render-server -+ # --test-directory=${PARAVIEW_TEST_DIR} -+ # -dr -+ # --run-test=${TEST_PYTHON}/${test}.py -+ # --exit) -+ #ENDIF (PARAVIEW_CLIENT_RENDER_SERVER_TESTS) -+ ENDFOREACH(test) -+ -+ ADD_TEST(StructuredVolumeRender-ClientServerRemoteRender -+ ${TEST_BINARY} --test-server --test-remote-rendering -+ --test-directory=${PARAVIEW_TEST_DIR} -+ -dr -+ --run-test=${TEST_XML}/StructuredVolumeRender.xml -+ --compare-view=${TEST_IMAGE}/StructuredVolumeRender.png -+ --exit) -+ ADD_TEST(UnstructuredVolumeRender-ClientServerRemoteRender -+ ${TEST_BINARY} --test-server --test-remote-rendering -+ --test-directory=${PARAVIEW_TEST_DIR} -+ -dr -+ --run-test=${TEST_XML}/UnstructuredVolumeRender.xml -+ --compare-view=${TEST_IMAGE}/UnstructuredVolumeRender.png -+ --exit) -+ -+ ENDIF(PARAVIEW_DATA_ROOT) -+ -+ ADD_SUBDIRECTORY(Testing/Cxx) -+ -+ # Do the link forwarding for the test driver as well. -+ SET(PV_EXE_LIST ${PV_EXE_LIST} pvTestDriver) -+ENDIF(BUILD_TESTING) -+ -+# Add shared link forwarding executables if necessary. -+IF(PV_NEED_SHARED_FORWARD) -+ FOREACH(pvexe ${PV_EXE_LIST}) -+ SET(PV_FORWARD_EXE ${pvexe}${PV_EXE_SUFFIX}) -+ CONFIGURE_FILE( -+ ${ParaView_SOURCE_DIR}/Servers/Executables/pv-forward.c.in -+ ${CMAKE_CURRENT_BINARY_DIR}/${pvexe}-forward.c -+ @ONLY IMMEDIATE) -+ ADD_EXECUTABLE(${pvexe} ${CMAKE_CURRENT_BINARY_DIR}/${pvexe}-forward.c) -+ ADD_DEPENDENCIES(${pvexe} ${pvexe}${PV_EXE_SUFFIX}) -+ INSTALL(TARGETS ${pvexe} DESTINATION ${PV_INSTALL_BIN_DIR_CM24} COMPONENT Runtime) -+ ENDFOREACH(pvexe) -+ENDIF(PV_NEED_SHARED_FORWARD) -+ -+IF(NOT Q_WS_MAC) -+ INSTALL(TARGETS ${PV_EXE_NAME} -+ DESTINATION ${PV_EXE_INSTALL_CM24} -+ COMPONENT Runtime) -+ENDIF(NOT Q_WS_MAC) -+ -+# 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_CM24}/${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_CM24}) -+ " COMPONENT Runtime) -+ #INSTALL(FILES ${FFMPEG_${fmpglib}_LIBRARY} DESTINATION ${PV_INSTALL_LIB_DIR_CM24}) -+ -+ ENDIF(FFMPEG_${fmpglib}_LIBRARY) -+ENDFOREACH(fmpglib) -+ -+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(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 -+# libraries -+# INSTALL(FILES /usr/lib/libstdc++.so.5 /lib/libgcc_s.so.1 /usr/lib/libpng.so.3 /usr/lib/libexpat.so.0 /usr/lib/libfontconfig.so.1 /usr/lib/libfreetype.so.6 /lib/libz.so.1 DESTINATION ${PV_INSTALL_LIB_DIR_CM24} COMPONENT Runtime) -+ -+# We also need Qt assistant -+IF(WIN32) -+ INSTALL(FILES ${QT_ASSISTANT_EXECUTABLE} -+ DESTINATION ${PV_EXE_INSTALL_CM24} -+ PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ -+ COMPONENT Runtime -+ RENAME assistant) -+ELSE(WIN32) -+ IF (NOT Q_WS_MAC) -+ IF(PV_NEED_SHARED_FORWARD) -+ INSTALL(FILES ${QT_ASSISTANT_EXECUTABLE} -+ DESTINATION ${PV_EXE_INSTALL_CM24} -+ PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ -+ COMPONENT Runtime -+ RENAME assistant-real) -+ ELSE(PV_NEED_SHARED_FORWARD) -+ INSTALL(FILES ${QT_ASSISTANT_EXECUTABLE} -+ DESTINATION ${PV_EXE_INSTALL_CM24} -+ PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ -+ COMPONENT Runtime -+ RENAME assistant) -+ ENDIF(PV_NEED_SHARED_FORWARD) -+ ENDIF (NOT Q_WS_MAC) -+ENDIF(WIN32) -+ -+# Call this one last so that it happens after the above targets are all installed: -+# -+IF(Q_WS_MAC) -+ INSTALL(SCRIPT "${CMAKE_CURRENT_BINARY_DIR}/CreateBundleDuringMakeInstall.cmake") -+ENDIF(Q_WS_MAC) -diff -Naur ParaView-3.4.0/CMakeLists.txt ParaView-3.4.0.new/CMakeLists.txt ---- ParaView-3.4.0/CMakeLists.txt 2008-09-12 09:33:51.000000000 -0400 -+++ ParaView-3.4.0.new/CMakeLists.txt 2009-07-14 10:19:48.000000000 -0400 -@@ -89,7 +89,7 @@ - MESSAGE(SEND_ERROR "Qt ${QT_MIN_VERSION} or greater not found. Please check the QT_QMAKE_EXECUTABLE variable.") - ELSE(NOT QT4_FOUND) - # don't go greater than supported version -- STRING(REGEX MATCH "^4\\.3\\.[0-9]+" qt_version_tmp "${QTVERSION}") -+ STRING(REGEX MATCH "^4\\.[3-5]\\.[0-9]+" qt_version_tmp "${QTVERSION}") - IF (NOT qt_version_tmp) - STRING(REGEX MATCH "^4\\.4\\.[0-9]+" qt_version4_4_tmp "${QTVERSION}") - IF (NOT qt_version4_4_tmp) -diff -Naur ParaView-3.4.0/CMakeLists.txt.orig ParaView-3.4.0.new/CMakeLists.txt.orig ---- ParaView-3.4.0/CMakeLists.txt.orig 1969-12-31 19:00:00.000000000 -0500 -+++ ParaView-3.4.0.new/CMakeLists.txt.orig 2008-09-12 09:33:51.000000000 -0400 -@@ -0,0 +1,292 @@ -+PROJECT(ParaView) -+CMAKE_MINIMUM_REQUIRED(VERSION 2.4.5) -+IF(COMMAND CMAKE_POLICY) -+ CMAKE_POLICY(SET CMP0003 NEW) -+ENDIF(COMMAND CMAKE_POLICY) -+ -+IF(CMAKE_CROSSCOMPILING) -+ FIND_PACKAGE(ParaView3CompileTools REQUIRED) -+ENDIF(CMAKE_CROSSCOMPILING) -+ -+SET(EXPORT_EXECUTABLES_FILE "${CMAKE_BINARY_DIR}/ParaView3CompileToolsConfig.cmake") -+SET(EXPORT_EXECUTABLES_NAMESPACE "") -+FILE(WRITE "${EXPORT_EXECUTABLES_FILE}" "#generated by Paraview, do not edit\n") -+IF("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" GREATER 2.5) -+ # Host tools are for cross compiling, need at least cmake 2.6 -+ ADD_CUSTOM_TARGET(pvHostTools) -+ SET(COMPILE_TOOLS_TARGET pvHostTools) -+ENDIF("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" GREATER 2.5) -+ -+# EXPORT() will be in cmake 2.6, add an empty macro so cmake 2.4 is still able to build ParaView3 -+IF(NOT COMMAND EXPORT) -+ MACRO(EXPORT) -+ ENDMACRO(EXPORT) -+ENDIF(NOT COMMAND EXPORT) -+ -+# GET_PROPERTY() will be in cmake 2.6 -+IF(COMMAND GET_PROPERTY) -+ GET_PROPERTY(PV_TARGET_SUPPORTS_SHARED_LIBS -+ GLOBAL PROPERTY TARGET_SUPPORTS_SHARED_LIBS) -+ELSE(COMMAND GET_PROPERTY) -+ SET(PV_TARGET_SUPPORTS_SHARED_LIBS TRUE) -+ENDIF(COMMAND GET_PROPERTY) -+ -+######################################################################### -+# Warn about ParaQ -+SET(PARAVIEW_WARN_ABOUT_PARAQ) -+IF(EXISTS "${ParaView_SOURCE_DIR}/CVS/Root") -+ FILE(READ "${ParaView_SOURCE_DIR}/CVS/Root" paraview_cvs_root) -+ IF("${paraview_cvs_root}" MATCHES ParaQ) -+ SET(PARAVIEW_WARN_ABOUT_PARAQ 1) -+ ENDIF("${paraview_cvs_root}" MATCHES ParaQ) -+ENDIF(EXISTS "${ParaView_SOURCE_DIR}/CVS/Root") -+IF("${ParaView_SOURCE_DIR}" MATCHES "ParaQ") -+ SET(PARAVIEW_WARN_ABOUT_PARAQ 1) -+ENDIF("${ParaView_SOURCE_DIR}" MATCHES "ParaQ") -+IF(PARAVIEW_WARN_ABOUT_PARAQ) -+ MESSAGE(SEND_ERROR "ParaView 3 should be checked out from ParaView3 repository. ParaQ repository is deprecated and will be removed") -+ENDIF(PARAVIEW_WARN_ABOUT_PARAQ) -+ -+######################################################################### -+# Disallow in-source build -+IF("${ParaView_SOURCE_DIR}" STREQUAL "${ParaView_BINARY_DIR}") -+ MESSAGE(FATAL_ERROR "ParaView requires an out of source Build. Please create a separate binary directory and run CMake there.") -+ENDIF("${ParaView_SOURCE_DIR}" STREQUAL "${ParaView_BINARY_DIR}") -+ -+######################################################################### -+SET(PARAVIEW_VERSION_MAJOR 3) -+SET(PARAVIEW_VERSION_MINOR 4) -+SET(PARAVIEW_VERSION_PATCH 0) -+SET(PARAVIEW_VERSION "${PARAVIEW_VERSION_MAJOR}.${PARAVIEW_VERSION_MINOR}") -+SET(PARAVIEW_VERSION_FULL "${PARAVIEW_VERSION}.${PARAVIEW_VERSION_PATCH}") -+ -+# See VTK/CMakeLists.txt for an explanation of this default selection. -+IF(PARAVIEW_VERSION_MINOR MATCHES "[02468]$") -+ # This is a release version. Default to not use rpath. -+ SET(VTK_USE_RPATH_DEFAULT OFF) -+ELSE(PARAVIEW_VERSION_MINOR MATCHES "[02468]$") -+ # This is a development version. Default to use rpath. -+ SET(VTK_USE_RPATH_DEFAULT ON) -+ENDIF(PARAVIEW_VERSION_MINOR MATCHES "[02468]$") -+ -+######################################################################### -+# build VTK/Qt support -+OPTION(PARAVIEW_BUILD_QT_GUI "Build ParaView Qt Client. This requires Qt." ON) -+IF (PARAVIEW_BUILD_QT_GUI) -+ # need to set up Qt stuff here because there are Qt dependencies before -+ # CMake traverses the Qt directory (VTK/GUISupport/Qt). -+ -+ # set vars to build the QVTK library -+ SET(VTK_USE_GUISUPPORT ON CACHE BOOL "Build VTK with GUI Support" FORCE) -+ SET(VTK_USE_QVTK ON CACHE BOOL "Build VTK with Qt Support" FORCE) -+ SET(DESIRED_QT_VERSION 4 CACHE STRING "Use Qt4" FORCE) -+ # ParaView requires this minimum version of Qt, and let's do it here before -+ # our first call to FindQt4.cmake -+ SET(QT_MIN_VERSION "4.3.0") -+ SET(QT_REQUIRED TRUE) -+ FIND_PACKAGE(Qt4) -+ IF(NOT QT4_FOUND) -+ MESSAGE(SEND_ERROR "Qt ${QT_MIN_VERSION} or greater not found. Please check the QT_QMAKE_EXECUTABLE variable.") -+ ELSE(NOT QT4_FOUND) -+ # don't go greater than supported version -+ STRING(REGEX MATCH "^4\\.3\\.[0-9]+" qt_version_tmp "${QTVERSION}") -+ IF (NOT qt_version_tmp) -+ STRING(REGEX MATCH "^4\\.4\\.[0-9]+" qt_version4_4_tmp "${QTVERSION}") -+ IF (NOT qt_version4_4_tmp) -+ MESSAGE(SEND_ERROR "Qt ${QTVERSION} not supported. Please use Qt 4.3 (you may need to clean your dirtied cache).") -+ ELSE (NOT qt_version4_4_tmp) -+ MESSAGE("WARNING: You are using Qt ${QTVERSION}. Officially supported version is Qt 4.3") -+ ENDIF (NOT qt_version4_4_tmp) -+ ENDIF (NOT qt_version_tmp) -+ # enforce Carbon in VTK for Qt/Mac -+ IF(Q_WS_MAC) -+ SET(VTK_USE_CARBON ON CACHE BOOL "Build VTK with Carbon" FORCE) -+ SET(VTK_USE_COCOA OFF CACHE BOOL "Build VTK with Cocoa" FORCE) -+ ENDIF(Q_WS_MAC) -+ # Mark these Qt variables as advanced. Users don't really have to set them. -+ MARK_AS_ADVANCED(DESIRED_QT_VERSION VTK_USE_QVTK VTK_USE_GUISUPPORT) -+ MARK_AS_ADVANCED(QT_MKSPECS_DIR QT_PLUGINS_DIR QT_X11_X11_LIBRARY QT_X11_Xext_LIBRARY QT_X11_m_LIBRARY) -+ ENDIF(NOT QT4_FOUND) -+ELSE (PARAVIEW_BUILD_QT_GUI) -+ SET(VTK_USE_QVTK OFF CACHE BOOL "Build VTK with Qt Support" FORCE) -+ENDIF (PARAVIEW_BUILD_QT_GUI) -+ -+ -+# Work around CMake 2.2.x FindPythonLibs bug. -+# Do not find Python subdirectory as python debug library. -+SET(PYTHON_DEBUG_LIBRARY "" CACHE FILEPATH "Purposely empty: work around CMake FindPythonLibs bug") -+MARK_AS_ADVANCED(PYTHON_DEBUG_LIBRARY) -+ -+######################################################################### -+# Define a PARAVIEW_USE_MPI that is not advanced -+SET(PARAVIEW_USE_MPI OFF CACHE BOOL "Build ParaView with MPI support") -+SET(VTK_USE_MPI ${PARAVIEW_USE_MPI} CACHE INTERNAL "Build VTK with MPI support" FORCE) -+# define this variable so that VTK_DEPENDENT_OPTION in the VTK -+# CMakeLists.txt does not turn VTK_USE_MPI back to a regular cache -+# variable -+# set it to PARAVIEW_USE_MPI so that VTK_USE_MPI is slaved to it. -+SET(VTK_USE_MPI_ISSET ${PARAVIEW_USE_MPI}) -+ -+######################################################################### -+# Force Infovis support on -+SET(VTK_USE_INFOVIS ON CACHE BOOL "Build VTK with Infovis Support" FORCE) -+MARK_AS_ADVANCED(VTK_USE_INFOVIS) -+ -+######################################################################### -+# Configure Testing -+OPTION(BUILD_TESTING "Build ParaView Testing" ON) -+IF(BUILD_TESTING) -+ SET(PARAVIEW_TEST_DIR ${ParaView_BINARY_DIR}/Testing/Temporary) -+ MAKE_DIRECTORY(${PARAVIEW_TEST_DIR}) -+ ENABLE_TESTING() -+ INCLUDE (CTest) -+ENDIF(BUILD_TESTING) -+ -+######################################################################### -+# Configure data directory -+IF(NOT PARAVIEW_DATA_ROOT AND PARAQ_DATA_ROOT) -+ SET(PARAVIEW_DATA_ROOT "${PARAQ_DATA_ROOT}") -+ENDIF(NOT PARAVIEW_DATA_ROOT AND PARAQ_DATA_ROOT) -+FIND_PATH(PARAVIEW_DATA_ROOT ParaViewData.readme -+ ${ParaView_SOURCE_DIR}/ParaViewData -+ ${ParaView_SOURCE_DIR}/../ParaViewData -+ ${ParaView_SOURCE_DIR}/ParaQData -+ ${ParaView_SOURCE_DIR}/../ParaQData -+ $ENV{PARAVIEW_DATA_ROOT} -+ ) -+ -+######################################################################### -+# Configure Python -+OPTION(PARAVIEW_ENABLE_PYTHON "Enable/Disable Python scripting support." OFF) -+ -+# PARAVIEW_TESTING_WITH_PYTHON must be used only when PARAVIEW_ENABLE_PYTHON -+# is ON. If PARAVIEW_ENABLE_PYTHON is OFF, PARAVIEW_TESTING_WITH_PYTHON -+# is ignored and treated as disabled. -+OPTION(PARAVIEW_TESTING_WITH_PYTHON -+ "Build Python Testing support if PARAVIEW_ENABLE_PYTHON is ON" -+ ON) -+MARK_AS_ADVANCED(PARAVIEW_TESTING_WITH_PYTHON) -+ -+IF (PARAVIEW_TESTING_WITH_PYTHON AND PARAVIEW_ENABLE_PYTHON) -+ SET (QT_TESTING_WITH_PYTHON ON) -+ELSE (PARAVIEW_TESTING_WITH_PYTHON AND PARAVIEW_ENABLE_PYTHON) -+ SET (QT_TESTING_WITH_PYTHON OFF) -+ENDIF (PARAVIEW_TESTING_WITH_PYTHON AND PARAVIEW_ENABLE_PYTHON) -+ -+IF (PARAVIEW_ENABLE_PYTHON AND PV_TARGET_SUPPORTS_SHARED_LIBS) -+ SET(BUILD_SHARED_LIBS ON CACHE BOOL "Build ParaView using shared libraries" FORCE) -+ENDIF (PARAVIEW_ENABLE_PYTHON AND PV_TARGET_SUPPORTS_SHARED_LIBS) -+ -+IF (PARAVIEW_ENABLE_PYTHON) -+ SET(VTK_WRAP_PYTHON ON CACHE INTERNAL "" FORCE) -+ -+ # ParaView python uses NewInterpretor API, which cannot be used with the -+ # python's thread support API (PyGIL*). Hence, we disable all thread support. -+ # No mutiple threads in paraview. Sorry. -+ SET(VTK_NO_PYTHON_THREADS 1 CACHE INTERNAL "Build VTK with MPI support" FORCE) -+ELSE (PARAVIEW_ENABLE_PYTHON) -+ SET(VTK_WRAP_PYTHON OFF CACHE INTERNAL "" FORCE) -+ENDIF (PARAVIEW_ENABLE_PYTHON) -+ -+######################################################################### -+# Set the ServerManager test data dir, -+SET(PVServerManagerTestData ${PARAVIEW_DATA_ROOT}) -+ -+# Find hints file for the client/server wrapping -+FIND_FILE(VTK_WRAP_HINTS hints ${ParaView_SOURCE_DIR}/VTK/Wrapping NO_CMAKE_FIND_ROOT_PATH) -+MARK_AS_ADVANCED(VTK_WRAP_HINTS) -+ -+######################################################################### -+CONFIGURE_FILE(${ParaView_SOURCE_DIR}/vtkPQConfig.h.in -+ ${ParaView_BINARY_DIR}/vtkPQConfig.h -+ ESCAPE_QUOTES) -+ -+ -+######################################################################### -+# -+# add directories -+# -+######################################################################### -+ -+######################################################################### -+# Include the file that most of the environment setup (except GUI) -+# It also adds the VTK directories -+INCLUDE(${ParaView_SOURCE_DIR}/CMake/ParaViewCommon.cmake) -+ -+######################################################################### -+IF(BUILD_DOCUMENTATION) -+ ADD_SUBDIRECTORY(Utilities/Doxygen) -+ENDIF(BUILD_DOCUMENTATION) -+ADD_SUBDIRECTORY(Documentation) -+ -+######################################################################### -+IF (PARAVIEW_BUILD_QT_GUI) -+ ADD_SUBDIRECTORY(Qt) -+ENDIF (PARAVIEW_BUILD_QT_GUI) -+ -+######################################################################### -+IF (PARAVIEW_BUILD_QT_GUI) -+ ADD_SUBDIRECTORY(Applications) -+ENDIF (PARAVIEW_BUILD_QT_GUI) -+ -+######################################################################### -+OPTION(BUILD_EXAMPLES "Build ParaView examples." OFF) -+IF (BUILD_EXAMPLES) -+ ADD_SUBDIRECTORY(Examples) -+ENDIF (BUILD_EXAMPLES) -+ -+######################################################################### -+# Setup CPack -+ -+INCLUDE(ParaView3CPack.cmake) -+ -+######################################################################### -+# Additional definitions for ParaViewConfig.cmake -+ -+SET(PARAVIEW_USE_FILE "${ParaView_SOURCE_DIR}/ParaViewUse.cmake") -+SET(PARAVIEW_VTK_DIR "${ParaView_BINARY_DIR}/VTK") -+ -+SET(PARAVIEW_CMAKE_EXTENSIONS "${ParaView_SOURCE_DIR}/VTK/CMake") -+SET(PARAVIEW_CMAKE_CLIENT_SERVER_EXTENSION -+ "${ParaView_SOURCE_DIR}/Utilities/VTKClientServer/CMake/vtkWrapClientServer.cmake") -+GET_TARGET_PROPERTY(VTK_WRAP_ClientServer_EXE_CONFIG vtkWrapClientServer LOCATION) -+ -+SET(PARAVIEW_LIBRARY_DIRS -+ ${LIBRARY_OUTPUT_PATH} ${PARAVIEW_EXTRA_LINK_DIRECTORIES}) -+ -+SET(PARAVIEW_GUI_INCLUDE_DIRS ${ParaView_SOURCE_DIR}/Qt/Widgets -+ ${ParaView_BINARY_DIR}/Qt/Widgets -+ ${ParaView_SOURCE_DIR}/Qt/Core -+ ${ParaView_BINARY_DIR}/Qt/Core -+ ${ParaView_SOURCE_DIR}/Qt/Components -+ ${ParaView_BINARY_DIR}/Qt/Components ) -+SET(PARAVIEW_KWSYS_INCLUDE_DIRS ${PARAVIEW_INCLUDE_DIRS}) -+ -+GET_TARGET_PROPERTY(PARAVIEW_GUI_CLIENT_EXECUTABLE paraview${PV_EXE_SUFFIX} LOCATION) -+GET_TARGET_PROPERTY(PARAVIEW_BATCH_EXECUTABLE pvbatch${PV_EXE_SUFFIX} LOCATION) -+GET_TARGET_PROPERTY(PARAVIEW_PROCESS_XML_EXECUTABLE kwProcessXML LOCATION) -+SET(PARAVIEW_SERVER_MANAGER_RESOURCES_DIRECTORY -+ "${ParaView_SOURCE_DIR}/Servers/ServerManager/Resources") -+SET(VTKCS_SOURCE_DIR -+ "${ParaView_SOURCE_DIR}/Utilities/VTKClientServer") -+ -+# The ParaView library dependencies. -+SET(PARAVIEW_LIBRARY_DEPENDS_FILE -+ "${ParaView_BINARY_DIR}/ParaViewLibraryDepends.cmake") -+EXPORT_LIBRARY_DEPENDENCIES(${PARAVIEW_LIBRARY_DEPENDS_FILE}) -+ -+# Perform configuration. -+CONFIGURE_FILE(${ParaView_SOURCE_DIR}/ParaViewConfig.cmake.in -+ ${ParaView_BINARY_DIR}/ParaViewConfig.cmake @ONLY IMMEDIATE) -+ -+ -+######################################################################### -+IF(BUILD_SHARED_LIBS) -+ ADD_SUBDIRECTORY(Plugins) -+ENDIF(BUILD_SHARED_LIBS) -+ -+# Mark certain VTK variables as advanced. Users do not really have to set these. -+IF (APPLE) -+ MARK_AS_ADVANCED(CMAKE_OSX_ARCHITECTURES CMAKE_OSX_SYSROOT VTK_USE_CARBON VTK_USE_COCOA VTK_APPLE_RESOURCE) -+ENDIF(APPLE) -+MARK_AS_ADVANCED(VTK_USE_MPEG2_ENCODER QT_PLUGINS_DIR QT_MKSPECS_DIR VTK_USE_MFC) diff --git a/sci-visualization/paraview/paraview-3.3_pre20080514.ebuild b/sci-visualization/paraview/paraview-3.3_pre20080514.ebuild deleted file mode 100644 index 50dcaac9cba1..000000000000 --- a/sci-visualization/paraview/paraview-3.3_pre20080514.ebuild +++ /dev/null @@ -1,171 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/paraview-3.3_pre20080514.ebuild,v 1.6 2008/10/22 15:24:11 markusle Exp $ - -EAPI="1" - -inherit distutils eutils flag-o-matic toolchain-funcs versionator python qt4 - -MY_PV=3.3 - -DESCRIPTION="ParaView is a powerful scientific data visualization application" -HOMEPAGE="http://www.paraview.org" -SRC_URI="mirror://gentoo/${P}.tar.bz2 - mirror://gentoo/${P}-OpenFOAM-1.5.patch.bz2" - -LICENSE="paraview" -KEYWORDS="~x86 ~amd64" -SLOT="0" -IUSE="mpi python hdf5 doc examples threads qt4" -RDEPEND="hdf5? ( >=sci-libs/hdf5-1.6.7 ) - mpi? ( || ( - sys-cluster/openmpi - sys-cluster/mpich2 ) ) - python? ( >=dev-lang/python-2.0 ) - qt4? ( || ( ( x11-libs/qt-gui:4 x11-libs/qt-qt3support:4 - x11-libs/qt-assistant:4 ) - =x11-libs/qt-4.3*:4 ) ) - dev-libs/libxml2 - media-libs/libpng - media-libs/jpeg - media-libs/tiff - 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 ) - >=dev-util/cmake-2.4.5" - -PVLIBDIR="$(get_libdir)/${PN}-${MY_PV}" -BUILDDIR="${WORKDIR}/build" -S="${WORKDIR}"/ParaView3 - -#QT4_BUILT_WITH_USE_CHECK="qt3support" - -pkg_setup() { - use qt4 && qt4_pkg_setup - if use mpi && has_version sys-cluster/mpich2; then - if ! built_with_use sys-cluster/mpich2 cxx; then - die "Please re-emerge sys-cluster/mpich2 with USE=\"cxx\"" - fi - fi -} - -src_unpack() { - unpack ${A} - mkdir "${BUILDDIR}" || die "Failed to generate build directory" - cd "${S}" - epatch "${FILESDIR}"/${P}-gcc4.3.patch - epatch "${FILESDIR}"/${P}-qt4.4.patch - epatch "${FILESDIR}"/${PN}-3.2.1-openmpi.patch - use hdf5 && epatch "${FILESDIR}"/${P}-hdf5.patch - epatch "${DISTDIR}"/${P}-OpenFOAM-1.5.patch.bz2 - - # rename paraview's assistant wrapper - if use qt4; then - sed -e "s:\"assistant\":\"paraview-assistant\":" \ - -i Applications/Client/MainWindow.cxx \ - || die "Failed to fix assistant wrapper call" - fi - - # fix GL issues - sed -e "s:DEPTH_STENCIL_EXT:DEPTH_COMPONENT24:" \ - -i VTK/Rendering/vtkOpenGLRenderWindow.cxx \ - || die "Failed to fix GL issues." -} - -src_compile() { - cd "${BUILDDIR}" - local CMAKE_VARIABLES="" - CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPV_INSTALL_LIB_DIR:PATH=/${PVLIBDIR}" - CMAKE_VARIABLES="${CMAKE_VARIABLES} -DCMAKE_SKIP_RPATH:BOOL=YES" - CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_RPATH:BOOL=OFF" - CMAKE_VARIABLES="${CMAKE_VARIABLES} -DCMAKE_INSTALL_PREFIX:PATH=/usr" - CMAKE_VARIABLES="${CMAKE_VARIABLES} -DBUILD_SHARED_LIBS:BOOL=ON" - CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_SYSTEM_FREETYPE:BOOL=ON" - CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_SYSTEM_JPEG:BOOL=ON" - CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_SYSTEM_PNG:BOOL=ON" - CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_SYSTEM_TIFF:BOOL=ON" - CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_SYSTEM_ZLIB:BOOL=ON" - CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_SYSTEM_EXPAT:BOOL=ON" - CMAKE_VARIABLES="${CMAKE_VARIABLES} -DCMAKE_VERBOSE_MAKEFILE:BOOL=OFF" - CMAKE_VARIABLES="${CMAKE_VARIABLES} -DEXPAT_INCLUDE_DIR:PATH=/usr/include" - CMAKE_VARIABLES="${CMAKE_VARIABLES} -DEXPAT_LIBRARY=/usr/$(get_libdir)/libexpat.so" - CMAKE_VARIABLES="${CMAKE_VARIABLES} -DOPENGL_gl_LIBRARY=/usr/$(get_libdir)/libGL.so" - CMAKE_VARIABLES="${CMAKE_VARIABLES} -DOPENGL_glu_LIBRARY=/usr/$(get_libdir)/libGLU.so" - CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_GLEXT_FILE=/usr/include/GL/glext.h" - CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_GLXEXT_FILE=/usr/include/GL/glxext.h" - CMAKE_VARIABLES="${CMAKE_VARIABLES} -DCMAKE_COLOR_MAKEFILE:BOOL=TRUE" - CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_SYSTEM_LIBXML2:BOOL=ON" - # paraview uses a non exisiting call to boost's graph library - # maybe upstream needs to update - CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_BOOST:BOOL=OFF" - CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_OFFSCREEN=TRUE" - - # paraview used the deprecated img_convert(..) call; hence disable - # until upstream has switched to swscale - CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_FFMPEG_ENCODER:BOOL=OFF" - if use hdf5; then - CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_USE_SYSTEM_HDF5:BOOL=ON" - fi - - if use mpi; then - CMAKE_VARIABLES="${CMAKE_VARIABLES} -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 - - 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 - - if use threads; then - CMAKE_VARIABLES="${CMAKE_VARIABLES} -DCMAKE_USE_PTHREADS:BOOL=ON" - else - CMAKE_VARIABLES="${CMAKE_VARIABLES} -DCMAKE_USE_PTHREADS:BOOL=OFF" - fi - - cmake ${CMAKE_VARIABLES} "${S}" \ - || die "cmake configuration failed" - - emake || die "emake failed" - -} - -src_install() { - cd "${BUILDDIR}" - make DESTDIR="${D}" install || die "make install failed" - - # rename the assistant wrapper - if use qt4; then - mv "${D}"/usr/bin/assistant "${D}"/usr/bin/paraview-assistant \ - || die "Failed to rename assistant wrapper" - chmod 0755 "${D}"/usr/$(get_libdir)/${PN}-${MY_PV}/assistant-real \ - || die "Failed to change permissions on assistant wrapper" - fi - - # add release note for the OpenFOAM-1.5 patch - dodoc "${S}"/ReleaseNotes_OpenFOAMReader20080730 - - # set up the environment - echo "LDPATH=/usr/${PVLIBDIR}" >> "${T}"/40${PN} - doenvd "${T}"/40${PN} -} diff --git a/sci-visualization/paraview/paraview-3.4.0.ebuild b/sci-visualization/paraview/paraview-3.4.0.ebuild deleted file mode 100644 index e7b7cc4ad6f0..000000000000 --- a/sci-visualization/paraview/paraview-3.4.0.ebuild +++ /dev/null @@ -1,155 +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.4.0.ebuild,v 1.8 2009/07/17 06:21:06 mr_bones_ Exp $ - -EAPI="2" - -inherit distutils eutils flag-o-matic toolchain-funcs versionator python qt4 - -PATCH_V="3.3_pre20080514" -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-48.patch.bz2" - -LICENSE="paraview" -KEYWORDS="~x86 ~amd64" -SLOT="0" -IUSE="mpi python hdf5 doc examples threads qt4" -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 - 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 ) - >=dev-util/cmake-2.4.5" - -PVLIBDIR="$(get_libdir)/${PN}-${MAJOR_PV}" -BUILDDIR="${WORKDIR}/build" -S="${WORKDIR}"/ParaView-${PV} - -src_prepare() { - mkdir "${BUILDDIR}" || die "Failed to generate build directory" - cd "${S}" - epatch "${FILESDIR}"/${PN}-${PATCH_V}-gcc4.3.patch - epatch "${FILESDIR}"/${P}-qt4.4-5.patch - epatch "${DISTDIR}"/${P}-OpenFOAM-48.patch.bz2 - - # rename paraview's assistant wrapper - if use qt4; then - sed -e "s:\"assistant\":\"paraview-assistant\":" \ - -i Applications/Client/MainWindow.cxx \ - || die "Failed to fix assistant wrapper call" - fi - - # fix GL issues - sed -e "s:DEPTH_STENCIL_EXT:DEPTH_COMPONENT24:" \ - -i VTK/Rendering/vtkOpenGLRenderWindow.cxx \ - || die "Failed to fix GL issues." -} - -src_compile() { - cd "${BUILDDIR}" - local CMAKE_VARIABLES="" - CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPV_INSTALL_LIB_DIR:PATH=/${PVLIBDIR}" - CMAKE_VARIABLES="${CMAKE_VARIABLES} -DCMAKE_SKIP_RPATH:BOOL=YES" - CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_RPATH:BOOL=OFF" - CMAKE_VARIABLES="${CMAKE_VARIABLES} -DCMAKE_INSTALL_PREFIX:PATH=/usr" - CMAKE_VARIABLES="${CMAKE_VARIABLES} -DBUILD_SHARED_LIBS:BOOL=ON" - CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_SYSTEM_FREETYPE:BOOL=ON" - CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_SYSTEM_JPEG:BOOL=ON" - CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_SYSTEM_PNG:BOOL=ON" - CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_SYSTEM_TIFF:BOOL=ON" - CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_SYSTEM_ZLIB:BOOL=ON" - CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_SYSTEM_EXPAT:BOOL=ON" - CMAKE_VARIABLES="${CMAKE_VARIABLES} -DCMAKE_VERBOSE_MAKEFILE:BOOL=OFF" - CMAKE_VARIABLES="${CMAKE_VARIABLES} -DEXPAT_INCLUDE_DIR:PATH=/usr/include" - CMAKE_VARIABLES="${CMAKE_VARIABLES} -DEXPAT_LIBRARY=/usr/$(get_libdir)/libexpat.so" - CMAKE_VARIABLES="${CMAKE_VARIABLES} -DOPENGL_gl_LIBRARY=/usr/$(get_libdir)/libGL.so" - CMAKE_VARIABLES="${CMAKE_VARIABLES} -DOPENGL_glu_LIBRARY=/usr/$(get_libdir)/libGLU.so" - CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_GLEXT_FILE=/usr/include/GL/glext.h" - CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_GLXEXT_FILE=/usr/include/GL/glxext.h" - CMAKE_VARIABLES="${CMAKE_VARIABLES} -DCMAKE_COLOR_MAKEFILE:BOOL=TRUE" - CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_SYSTEM_LIBXML2:BOOL=ON" - # paraview uses a non exisiting call to boost's graph library - # maybe upstream needs to update - CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_BOOST:BOOL=OFF" - CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_OFFSCREEN=TRUE" - - # paraview used the deprecated img_convert(..) call; hence disable - # until upstream has switched to swscale - CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_FFMPEG_ENCODER:BOOL=OFF" - if use hdf5; then - CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_USE_SYSTEM_HDF5:BOOL=ON" - fi - - if use mpi; then - CMAKE_VARIABLES="${CMAKE_VARIABLES} -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 - - 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 - - if use threads; then - CMAKE_VARIABLES="${CMAKE_VARIABLES} -DCMAKE_USE_PTHREADS:BOOL=ON" - else - CMAKE_VARIABLES="${CMAKE_VARIABLES} -DCMAKE_USE_PTHREADS:BOOL=OFF" - fi - - cmake ${CMAKE_VARIABLES} "${S}" \ - || die "cmake configuration failed" - - emake || die "emake failed" - -} - -src_install() { - cd "${BUILDDIR}" - make DESTDIR="${D}" install || die "make install failed" - - # rename the assistant wrapper - if use qt4; then - mv "${D}"/usr/bin/assistant "${D}"/usr/bin/paraview-assistant \ - || die "Failed to rename assistant wrapper" - chmod 0755 "${D}"/usr/${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} -} |