# ChangeLog for sci-visualization/visit
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/visit/ChangeLog,v 1.2 2015/01/09 12:02:13 slis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/visit/ChangeLog,v 1.3 2015/03/16 08:29:05 slis Exp $
+
+*visit-2.9.0 (16 Mar 2015)
+
+ 16 Mar 2015; Sławek Lis <slis@gentoo.org>
+ +files/visit-2.9.0-dont_symlink_visit_dir.patch,
+ +files/visit-2.9.0-findpython.patch, +files/visit-2.9.0-findsilo.patch,
+ +files/visit-2.9.0-findvtk.patch, +files/visit-2.9.0-vtklibs.patch,
+ +files/visit-2.9.0-vtkmpi.patch, +visit-2.9.0.ebuild:
+ version bump (543212), thanks to Andreas Schafer
*visit-2.8.2 (09 Jan 2015)
AUX visit-2.8.2-findsilo.patch 585 SHA256 bd97818df6eaaf5b160c982439f17223c5b0d7c35c830a551a7aeac380c3e29e SHA512 76bec5fd134318724d0d2ad59a345d78652867a9680abaca7504af11ddd818a678338afd10bdf9385295f672d265439a1341c1c71697c7a98aae6406abe4565d WHIRLPOOL ef5200ff51dd3d856c504d4ef54f78f8f507f8239834023de01654451f8fb34d63bede72b5883f0cbcf0e7616f843a62ef29ca7c6be136539adc13f24df0f674
AUX visit-2.8.2-findvtk.patch 1175 SHA256 05ebbbfb6cec054009bb02ed28f79cfe0c992b41c1874dc6b87cf6ed6ebcee4e SHA512 8c45db6d8f00031afc5710109e744af6abc9808cbd86e1c3115047c21f23ad840f76f8d4ff245838075753952f3268e6f753c638ed58e3d6e338e8e1898b0fbd WHIRLPOOL 09be0c2cd445e142a1cbd0dc1d334d23149c688a635a5fc734e2ff4ed506e761a789163e95741442cee94fcc7fb22a7fb52f13208fb53e30a8dae3201172df71
AUX visit-2.8.2-vtklibs.patch 4727 SHA256 32aefb78c5e5fff7a379f592792ec87048b56c442b08d9d862d78eb14277efcf SHA512 5ff42cd456818fc9086d43e1a2af3eedb2a90a8e4dbfabadc51aaf01e649024658ae6bff58a086dc732f9058a5e04099babc2b000bd089a470a047c709dcc85f WHIRLPOOL 4c7cdc497403718814d4c27ceb2b2d93178d0244c6449a2d64f3d84e47f8b78d1eef5e6ffcbfd965ddf376826a73e53470b3dcb36be09199795ae3615c8e8d90
+AUX visit-2.9.0-dont_symlink_visit_dir.patch 743 SHA256 bab48080e92a83b339298ca10c45dc32bb0953476d90e9cc772db92da3d02a6d SHA512 c385a3e6fa6c5856223df8c5aea329ba01dd625980257c3cd7d2784eb9e1aca3640e50d2afb0af0e02553dc6f72bb23bec666f3dc726706690c7bd45c6cc5336 WHIRLPOOL bc7bc88200913a44144e45a64f35a2c07aa20bac17572a888ed0f3c71d833e2fb3f7c313930475d84b1fa08d9e67602b1317a25bb1d01153fa8f0a81b21e0791
+AUX visit-2.9.0-findpython.patch 833 SHA256 eb134490d6519b3f8c1eab3bf3eb45471fcb367df47fe042ddce93b9bedcff50 SHA512 9b73e00e7884fed34e63ea51aa14483212227f05c83412a1638a31a56a0685bf7fdfdf511a1a53c9f1a55289ae8d4a0bac8ff92d3380d9c989502d2cb95e8679 WHIRLPOOL 4a6471dc5996e5db1f90f397c2d2de0f55caf50e526a0855972bae3e2428f0a36df22bf63a30f413095ccafdc40252dae27e10b00c756c4d088ae9642e31b4af
+AUX visit-2.9.0-findsilo.patch 585 SHA256 bd97818df6eaaf5b160c982439f17223c5b0d7c35c830a551a7aeac380c3e29e SHA512 76bec5fd134318724d0d2ad59a345d78652867a9680abaca7504af11ddd818a678338afd10bdf9385295f672d265439a1341c1c71697c7a98aae6406abe4565d WHIRLPOOL ef5200ff51dd3d856c504d4ef54f78f8f507f8239834023de01654451f8fb34d63bede72b5883f0cbcf0e7616f843a62ef29ca7c6be136539adc13f24df0f674
+AUX visit-2.9.0-findvtk.patch 1175 SHA256 05ebbbfb6cec054009bb02ed28f79cfe0c992b41c1874dc6b87cf6ed6ebcee4e SHA512 8c45db6d8f00031afc5710109e744af6abc9808cbd86e1c3115047c21f23ad840f76f8d4ff245838075753952f3268e6f753c638ed58e3d6e338e8e1898b0fbd WHIRLPOOL 09be0c2cd445e142a1cbd0dc1d334d23149c688a635a5fc734e2ff4ed506e761a789163e95741442cee94fcc7fb22a7fb52f13208fb53e30a8dae3201172df71
+AUX visit-2.9.0-vtklibs.patch 4727 SHA256 32aefb78c5e5fff7a379f592792ec87048b56c442b08d9d862d78eb14277efcf SHA512 5ff42cd456818fc9086d43e1a2af3eedb2a90a8e4dbfabadc51aaf01e649024658ae6bff58a086dc732f9058a5e04099babc2b000bd089a470a047c709dcc85f WHIRLPOOL 4c7cdc497403718814d4c27ceb2b2d93178d0244c6449a2d64f3d84e47f8b78d1eef5e6ffcbfd965ddf376826a73e53470b3dcb36be09199795ae3615c8e8d90
+AUX visit-2.9.0-vtkmpi.patch 3824 SHA256 e224344d8cf577772f0a3defe8547237353cd6726972ddb24911bc56c3297709 SHA512 b12395b397374311f005545b8c18ef85d331533c8a4d8092c0731cc8697523a8be2dfa46307e4566e68b518841df5eb1dd21453db3adba529248a238ff955e40 WHIRLPOOL 6c6e1d023bc45c57458363903215f25015df46b5f0b63d852cbbfd8312e21004da815a05aa85a7196166bb5abd2dfa7c2479f94129b1886563c4d2d2ab8cf8f1
DIST visit2.7.3.tar.gz 82475238 SHA256 e4ed7b20c4c0fb5aac49181f8ddeae3d2d5a73b1662756ddcaa9d08776a7c39f SHA512 5eea2667482a9b70cf4794446da69595c1145839dfae0afdf961589a09b0f3ad41c44b607f96dbb3e4a3c1ba77161d77a1e0342d6a4e2df8bc73040110c7e8f1 WHIRLPOOL a1157d2424d93037e1ffd8dd10ebc47ae9f3d074a63a811bcadf6db5349dea348432e63d414d4a62a156c9423a1d5fdb240f34b2ec4262e8647def40d999759a
DIST visit2.8.2.tar.gz 88008002 SHA256 43d652dde540e3a5db34a2105d89432fa1d018b104ed0508dfb18f4287a43eb3 SHA512 1c2c2b6cad49b32b5cbc7f7ffba5c6ffb98ee88dfeae5c51af5e581ad53fb1efb8fc222b796696e607abd4b748855141de072414bdec1b1ad4e7ac01a928db8d WHIRLPOOL dadfd48bf9522fc67547f2d7fc4332f300d06e3f04f1bd23189f4a6d806286b46420e4caecaba616bf9f954ea3e202efcee7e899d10444304f7f79809e8fc6d9
+DIST visit2.9.0.tar.gz 87058013 SHA256 98d7a80d95f4083fffc23a65cff28abd126e2eb0fff43591663818aaa1338fcf SHA512 889a6ff6f0c45064c0705a8a41fd268ad865619e42eb7a3302a520bcb2a3c182a40bc6870ec80c0994fa649f3030f6283b9783fab37b938d4b77fd3c1ab10d15 WHIRLPOOL 8d6e9370fddda7d28c16882a04ac2c196b0c42ffd72436ca601413b7483c72d4b33691a9dc7340d71d536fead3d6692f1491c2bed32ed27ceba0c745b9555380
EBUILD visit-2.7.3.ebuild 2402 SHA256 4d4610195742a68a847bb7ec4269b5d76721ef002e1c222627de13379401f490 SHA512 8a6d10d6d77de341e94e159c10d61d2d537c41213c2564a80d44fd0a2c3fbad2ab0b9b551c2af51ff34748292ae743d38483f49b0db6825dc6b249a8e776e00f WHIRLPOOL 67ea1401fe509d1f9fef08a1bbb0849ed2cf1645382aa36c44c022f06b1233fd7231f50c41372a3d4e02affa352d0bf35dc9417606527f705ae35fe5d5d26be7
EBUILD visit-2.8.2.ebuild 2411 SHA256 b6ccac9ec33ec62a22d397e7a3e339fa7a487525b1a3a4ce2aeb635e376169db SHA512 01332b2e6e4ba5cc7656ee5871cbae5120d1331eb430a0507f89c9bfb6a4108fe412162db407d2f94f94ffe4776afa51022a63da8bd7969a2933662882919b1c WHIRLPOOL 0ea38465f048a1159f57a7401052353ad1e067d934454217b3ecf1e159ad61372c5658e3ed2582f5db7927b8104fc42ab71a033bd9d64366b85e0a517133182a
-MISC ChangeLog 852 SHA256 55c58004182b7dc426d43e282458283b58d7fb26653f74378b2eefa67fbe93f1 SHA512 44a8168c081641623cf10c2ea123ee0933c682fa41b602e4fa9dde6f3bb8e6737fe6a667d6ada37b8ca851dc7b2356208ddde03da0814921092bfc9e636138ed WHIRLPOOL 43078ee23fa09ff95d27ba7cf0d79eeb5e11c410f617cdeda52b77a185ffef82347db627a61dded48c6845287fb31b42f6cda877c6c22ee7fa37368c0d01b42e
+EBUILD visit-2.9.0.ebuild 2546 SHA256 78a1b860f1fefd081f4b2bbb3b250f6d4ea9d7ebf3df1f89e951bd0c75a5bff0 SHA512 a50ca2afa3f60adb36bc4c8837e805af13dac71276f7325c339924c30ca8cc0b9e94c7bb658b49669b767944bf5a9a7198d5e14165581b035d1094b9ddd44c33 WHIRLPOOL 8ecb08a31f5b9df904f9d43a2bb73718d808cde551b35a8c5102003f75d816a6997f99fc8f2f22214c96eaff3189b422e56c9796e2e981259471605827a2beba
+MISC ChangeLog 1228 SHA256 577a2e970124340f5cf30cd8d3d3fbb3ccbf14e315fd84b3f04bfc60527307d3 SHA512 a0545b7be0448a7ade8c789526a7b8b8fc63d091a603d877b24814fc169651b847a607637d9c214fa84d1d241ae24495b7b6ee101b80c764d806e0e55cf3d484 WHIRLPOOL ef00b467b9c2197faafba265e7d604198d03b366a212ac1cac6e86248bc5f88cdc8d7cb8ae0e90da3a1a020dec0eb6ceb86ef7f64056ab6c96152b5d3da7f7eb
MISC metadata.xml 651 SHA256 871077793d318b6f1eeeb050f03e0b837e83003d88f8e51c586843cd0b4a0adc SHA512 0dea2d275c25b59ec3040cfe62bd093f44e8fd0011a71ce233d04ea933147662a53493e61d424cfd0cb37be24eb2fddc5bb6b6ab134ae4aa11af0305eb02de0a WHIRLPOOL 68b806cebb5f18af212546d6f309efec5d85a6de74857bb923aa656d9907c4ddf8cf57a46236e2280927caefc399b18465b4402d9d14ab49d90d0cd22d9f4df1
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iQEcBAEBCAAGBQJUr8KmAAoJEO1RxJ84ipLkYnoH/jtuwgh1jOYcSVhSdmNx0kgC
-X80Uuc7vr524+sjtDiZAOhAtmV7hQTqd82mVinOt/XlCiIoK9CW41q766DynCM0H
-a/h61tByUfI2kTjsCPShY1UuSWcGYRsbuOqjxRTooq0eAT87OaZVCv5lmHGupGeX
-yAmCPQecg0ne74i8i3aDs2XzHMzLo9JSxAxsCzWgBDqJIaYdZyaxJSa+UJTq/o8q
-fGl0p83Pxd12lgZjrte/a1aOBEsCwrAA/zE2mCCfby5IfIxqaATCn5HVMxiS7U5K
-ccAdX6/cvv4KTAX+zD9r79PQ3MAVXubr7Cka1q/Uq5n5yFBD1bvuUNetUGwyln8=
-=imxb
+iQEcBAEBCAAGBQJVBpNwAAoJEO1RxJ84ipLkCKUH/A+kGTki39nxMu8UrZ2TfRyp
+v5uHCpgQQqoJCRS6l3ptgdug4CguwoGgzz4mXXtG1SVp/4XEfv5tqArpTZSjcbMC
+XpAfIcPvEpAzN+HzdvzLPLj0SMPmobXso2wJBuLsMz0GgrY5IsTqXtYHWh5LdFdP
+Ha3fi+lOV1AXSMe+zWGFXAbQHaGwo8orQkgjc/28htQUsZr8vrwZLx641/9cGG0H
+o6yNvD74CptZloHh/b1a+0YdLsK8oXbPH+YMzTdcnt3cV6oHdj1wVTsgdsvMjnDM
+iSCx32NRgDX34+YeWh11FH6+g0d6Y1NnOJL18ohGlGSm4d3GIJHao9hYK2XwmXk=
+=TXM0
-----END PGP SIGNATURE-----
--- /dev/null
+diff -ru visit2.7.1.old2/src/CMakeLists.txt visit2.7.1/src/CMakeLists.txt
+--- visit2.7.1.old2/src/CMakeLists.txt 2014-01-27 22:10:06.520297262 +0100
++++ visit2.7.1/src/CMakeLists.txt 2014-01-27 22:11:30.520298002 +0100
+@@ -807,14 +807,6 @@
+ \"${VISIT_VERSION}\"
+ \"${CMAKE_INSTALL_PREFIX}/beta\")
+ ")
+- ELSE(VISIT_INSTALL_AS_BETA)
+- INSTALL(CODE "
+- MESSAGE(\"Symlinking current to ${VISIT_VERSION}\")
+- EXECUTE_PROCESS(WORKING_DIRECTORY \${CMAKE_INSTALL_PREFIX}
+- COMMAND \${CMAKE_COMMAND} -E create_symlink
+- \"${VISIT_VERSION}\"
+- \"${CMAKE_INSTALL_PREFIX}/current\")
+- ")
+ ENDIF(VISIT_INSTALL_AS_BETA)
+ ENDIF(WIN32)
+ MARK_AS_ADVANCED(
--- /dev/null
+diff -ru visit2.7.1.old/src/CMake/FindVisItPython.cmake visit2.7.1.new/src/CMake/FindVisItPython.cmake
+--- visit2.7.1.old/src/CMake/FindVisItPython.cmake 2013-09-13 21:06:57.000000000 +0200
++++ visit2.7.1.new/src/CMake/FindVisItPython.cmake 2014-01-25 20:30:06.948654123 +0100
+@@ -141,11 +141,12 @@
+ FIND_LIBRARY(PYTHON_LIBRARY
+ NAMES python${_CURRENT_VERSION_NO_DOTS} python${_CURRENT_VERSION}
+ PATHS
+- ${PYTHON_DIR}/lib
+- ${PYTHON_DIR}/libs
+- [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/libs
++ ${PYTHON_DIR}/lib
++ ${PYTHON_DIR}/lib64
++ ${PYTHON_DIR}/libs
++ [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/libs
+ NO_DEFAULT_PATH
+ NO_CMAKE_ENVIRONMENT_PATH
+ NO_CMAKE_PATH
+ NO_SYSTEM_ENVIRONMENT_PATH)
+
--- /dev/null
+diff -ru visit2.7.1-old/src/CMake/FindSilo.cmake visit2.7.1-new/src/CMake/FindSilo.cmake
+--- visit2.7.1-old/src/CMake/FindSilo.cmake 2013-11-20 20:30:44.000000000 +0100
++++ visit2.7.1-new/src/CMake/FindSilo.cmake 2014-02-01 02:22:29.410541850 +0100
+@@ -90,7 +90,7 @@
+ NO_CMAKE_PATH
+ NO_SYSTEM_ENVIRONMENT_PATH)
+ IF(SILOH5_LIBRARY_EXISTS)
+- SET_UP_THIRD_PARTY(SILO lib include siloh5)
++ SET_UP_THIRD_PARTY(SILO lib include siloh5 hdf5 z)
+ ELSE(SILOH5_LIBRARY_EXISTS)
+ SET_UP_THIRD_PARTY(SILO lib include silo)
+ ENDIF(SILOH5_LIBRARY_EXISTS)
--- /dev/null
+--- visit2.8.2/src/CMake/FindVisItVTK.cmake.orig 2015-01-09 12:18:54.467780216 +0100
++++ visit2.8.2/src/CMake/FindVisItVTK.cmake 2015-01-09 12:19:59.737780932 +0100
+@@ -234,15 +234,22 @@
+
+ # check for python wrappers
+ IF (NOT WIN32)
+- FILE(GLOB VTK_PY_WRAPPERS_DIR ${VTK_LIBRARY_DIRS}/python*/)
++ FILE(GLOB VTK_PY_WRAPPERS_DIRECTORIES ${VTK_LIBRARY_DIRS}/python*/)
+ ELSE (NOT WIN32)
+ IF(${VTK_VERSION} VERSION_LESS "6.1.0")
+- FILE(GLOB VTK_PY_WRAPPERS_DIR ${VISIT_VTK_DIR}/lib)
++ FILE(GLOB VTK_PY_WRAPPERS_DIRECTORIES ${VISIT_VTK_DIR}/lib)
+ ELSE()
+- FILE(GLOB VTK_PY_WRAPPERS_DIR ${VISIT_VTK_DIR}/lib/python*)
++ FILE(GLOB VTK_PY_WRAPPERS_DIRECTORIES ${VISIT_VTK_DIR}/lib/python*)
+ ENDIF()
+ ENDIF (NOT WIN32)
+-MESSAGE(STATUS " VTK_PY_WRAPPERS_DIR=${VTK_PY_WRAPPERS_DIR}")
++MESSAGE(STATUS " VTK_PY_WRAPPERS_DIRECTORIES=${VTK_PY_WRAPPERS_DIRECTORIES}")
++
++FOREACH(X ${VTK_PY_WRAPPERS_DIRECTORIES})
++ IF(EXISTS "${X}/site-packages/vtk")
++ SET(VTK_PY_WRAPPERS_DIR "${X}")
++ ENDIF()
++ENDFOREACH(X)
++
+
+ IF(EXISTS ${VTK_PY_WRAPPERS_DIR}/site-packages/vtk)
+ MESSAGE(STATUS "Found VTK Python Wrappers - ${VTK_PY_WRAPPERS_DIR}")
--- /dev/null
+diff -ur visit2.8.2-old/src/engine/main/CMakeLists.txt visit2.8.2-new/src/engine/main/CMakeLists.txt
+--- visit2.8.2-old/src/engine/main/CMakeLists.txt 2014-10-01 00:28:19.000000000 +0200
++++ visit2.8.2-new/src/engine/main/CMakeLists.txt 2015-01-05 15:14:43.850783973 +0100
+@@ -188,8 +188,8 @@
+ ${engine_ser_exe_EPlot_ser}
+ engine_ser
+ visit_verdict
+- vtkjpeg
+- vtkpng
++ jpeg
++ png
+ ${VTKZLIB_LIB}
+ ${VTK_FREETYPE_LIBRARIES}
+ vtkftgl
+@@ -273,8 +273,8 @@
+ ${engine_par_exe_EPlot_par}
+ engine_par
+ visit_verdict
+- vtkjpeg
+- vtkpng
++ jpeg
++ png
+ ${VTKZLIB_LIB}
+ ${VTK_FREETYPE_LIBRARIES}
+ vtkftgl
+diff -ur visit2.8.2-old/src/mdserver/main/CMakeLists.txt visit2.8.2-new/src/mdserver/main/CMakeLists.txt
+--- visit2.8.2-old/src/mdserver/main/CMakeLists.txt 2014-08-11 23:45:16.000000000 +0200
++++ visit2.8.2-new/src/mdserver/main/CMakeLists.txt 2015-01-05 15:15:41.810784062 +0100
+@@ -119,10 +119,10 @@
+ visit_verdict
+ vtkCommonCore
+ vtkIOCore
+- vtktiff
++ tiff
+ ${VTKZLIB_LIB}
+- vtkpng
+- vtkjpeg
++ png
++ jpeg
+ ${ZLIB_LIB}
+ ${CMAKE_THREAD_LIBS}
+ ${DL_LIB}
+diff -ur visit2.8.2-old/src/tools/convert/CMakeLists.txt visit2.8.2-new/src/tools/convert/CMakeLists.txt
+--- visit2.8.2-old/src/tools/convert/CMakeLists.txt 2014-08-11 23:46:08.000000000 +0200
++++ visit2.8.2-new/src/tools/convert/CMakeLists.txt 2015-01-05 15:14:28.880783951 +0100
+@@ -105,8 +105,8 @@
+ )
+
+ SET(VTK_EXTRA_LIBS
+-vtkjpeg
+-vtkpng
++jpeg
++png
+ ${VTKZLIB_LIB}
+ ${VTK_FREETYPE_LIBRARIES}
+ vtkftgl
+diff -ur visit2.8.2-old/src/tools/dataserver/CMakeLists.txt visit2.8.2-new/src/tools/dataserver/CMakeLists.txt
+--- visit2.8.2-old/src/tools/dataserver/CMakeLists.txt 2014-08-11 23:46:12.000000000 +0200
++++ visit2.8.2-new/src/tools/dataserver/CMakeLists.txt 2015-01-05 15:13:02.000783818 +0100
+@@ -70,9 +70,9 @@
+ )
+
+ SET(VTK_EXTRA_LIBS
+-vtktiff
+-vtkjpeg
+-vtkpng
++tiff
++jpeg
++png
+ ${VTKZLIB_LIB}
+ ${VTK_FREETYPE_LIBRARIES}
+ vtkftgl
+diff -ur visit2.8.2-old/src/tools/mcurvit/CMakeLists.txt visit2.8.2-new/src/tools/mcurvit/CMakeLists.txt
+--- visit2.8.2-old/src/tools/mcurvit/CMakeLists.txt 2014-08-11 23:46:11.000000000 +0200
++++ visit2.8.2-new/src/tools/mcurvit/CMakeLists.txt 2015-01-05 15:16:02.400784093 +0100
+@@ -104,9 +104,9 @@
+ )
+
+ SET(VTK_EXTRA_LIBS
+-vtktiff
+-vtkjpeg
+-vtkpng
++tiff
++jpeg
++png
+ ${VTKZLIB_LIB}
+ ${VTK_FREETYPE_LIBRARIES}
+ vtkftgl
+diff -ur visit2.8.2-old/src/tools/protocol/CMakeLists.txt visit2.8.2-new/src/tools/protocol/CMakeLists.txt
+--- visit2.8.2-old/src/tools/protocol/CMakeLists.txt 2014-08-11 23:46:14.000000000 +0200
++++ visit2.8.2-new/src/tools/protocol/CMakeLists.txt 2015-01-05 15:12:46.480783795 +0100
+@@ -76,9 +76,9 @@
+ )
+
+ SET(VTK_EXTRA_LIBS
+-vtktiff
+-vtkjpeg
+-vtkpng
++tiff
++jpeg
++png
+ ${VTKZLIB_LIB}
+ ${VTK_FREETYPE_LIBRARIES}
+ vtkftgl
+diff -ur visit2.8.2-old/src/viewer/main/CMakeLists.txt visit2.8.2-new/src/viewer/main/CMakeLists.txt
+--- visit2.8.2-old/src/viewer/main/CMakeLists.txt 2014-08-11 23:46:26.000000000 +0200
++++ visit2.8.2-new/src/viewer/main/CMakeLists.txt 2015-01-05 15:12:11.380783741 +0100
+@@ -279,8 +279,8 @@
+ ${viewer_exe_IPlot}
+ ${viewer_exe_VPlot}
+ viewer
+- vtkpng
+- vtkjpeg
++ png
++ jpeg
+ ${VTKZLIB_LIB}
+ ${VTK_FREETYPE_LIBRARIES}
+ vtkftgl
+diff -ur visit2.8.2-old/src/visit_vtk/full/CMakeLists.txt visit2.8.2-new/src/visit_vtk/full/CMakeLists.txt
+--- visit2.8.2-old/src/visit_vtk/full/CMakeLists.txt 2014-08-11 23:45:14.000000000 +0200
++++ visit2.8.2-new/src/visit_vtk/full/CMakeLists.txt 2015-01-05 15:11:17.680783659 +0100
+@@ -125,9 +125,9 @@
+ ADD_LIBRARY(visit_vtk ${VISIT_VTK_SOURCES})
+
+ IF(HAVE_LIB_R)
+- TARGET_LINK_LIBRARIES(visit_vtk lightweight_visit_vtk vtkFiltersExtraction vtkFiltersFlowPaths vtkImagingHybrid vtkRenderingOpenGL vtkRenderingFreeType vtkRenderingFreeTypeOpenGL vtkInteractionStyle vtktiff vtkFiltersStatisticsGnuR)
++ TARGET_LINK_LIBRARIES(visit_vtk lightweight_visit_vtk vtkFiltersExtraction vtkFiltersFlowPaths vtkImagingHybrid vtkRenderingOpenGL vtkRenderingFreeType vtkRenderingFreeTypeOpenGL vtkInteractionStyle vtkFiltersStatisticsGnuR)
+ ELSE(HAVE_LIB_R)
+- TARGET_LINK_LIBRARIES(visit_vtk lightweight_visit_vtk vtkFiltersExtraction vtkFiltersFlowPaths vtkImagingHybrid vtkRenderingOpenGL vtkRenderingFreeType vtkRenderingFreeTypeOpenGL vtkInteractionStyle vtktiff)
++ TARGET_LINK_LIBRARIES(visit_vtk lightweight_visit_vtk vtkFiltersExtraction vtkFiltersFlowPaths vtkImagingHybrid vtkRenderingOpenGL vtkRenderingFreeType vtkRenderingFreeTypeOpenGL vtkInteractionStyle)
+ ENDIF(HAVE_LIB_R)
+ # Add vtk definitions
+ ADD_TARGET_DEFINITIONS(visit_vtk "${VTK_DEFINITIONS}")
--- /dev/null
+diff -ru visit2.8.2-old/src/tools/annotations/CMakeLists.txt visit2.8.2-new/src/tools/annotations/CMakeLists.txt
+--- visit2.8.2-old/src/tools/annotations/CMakeLists.txt 2014-08-11 23:46:11.000000000 +0200
++++ visit2.8.2-new/src/tools/annotations/CMakeLists.txt 2015-01-07 08:19:35.000735956 +0100
+@@ -54,9 +54,9 @@
+ # Specify the libraries to link against
+ TARGET_LINK_LIBRARIES(text2polys vtkIOLegacy)
+ IF(HAVE_LIB_R)
+-TARGET_LINK_LIBRARIES(time_annotation vtkRenderingOpenGL vtkRenderingFreeType vtkRenderingFreeTypeOpenGL vtkInteractionStyle vtkFiltersStatisticsGnuR vtksys vtkIOImage)
++TARGET_LINK_LIBRARIES(time_annotation vtkRenderingOpenGL vtkRenderingFreeType vtkRenderingFreeTypeOpenGL vtkInteractionStyle vtkFiltersStatisticsGnuR vtksys vtkIOMPIImage)
+ ELSE(HAVE_LIB_R)
+-TARGET_LINK_LIBRARIES(time_annotation vtkRenderingOpenGL vtkRenderingFreeType vtkRenderingFreeTypeOpenGL vtkInteractionStyle vtksys vtkIOImage)
++TARGET_LINK_LIBRARIES(time_annotation vtkRenderingOpenGL vtkRenderingFreeType vtkRenderingFreeTypeOpenGL vtkInteractionStyle vtksys vtkIOMPIImage)
+ ENDIF(HAVE_LIB_R)
+ # add vtk definitions
+ ADD_TARGET_DEFINITIONS(time_annotation "${VTK_DEFINITIONS}")
+diff -ru visit2.8.2-old/src/vtkqt/CMakeLists.txt visit2.8.2-new/src/vtkqt/CMakeLists.txt
+--- visit2.8.2-old/src/vtkqt/CMakeLists.txt 2014-08-11 23:46:46.000000000 +0200
++++ visit2.8.2-new/src/vtkqt/CMakeLists.txt 2015-01-07 08:19:00.950735904 +0100
+@@ -64,9 +64,9 @@
+
+ # Specify the libraries to link against on Windows & Mac
+ IF(HAVE_LIB_R)
+- TARGET_LINK_LIBRARIES(vtkqt vtkCommonCore vtkGUISupportQtOpenGL vtkIOImage vtkRenderingOpenGL vtkRenderingFreeTypeOpenGL ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTOPENGL_LIBRARY} ${OPENGL_gl_LIBRARY} vtkFiltersStatisticsGnuR)
++ TARGET_LINK_LIBRARIES(vtkqt vtkCommonCore vtkGUISupportQtOpenGL vtkIOMPIImage vtkRenderingOpenGL vtkRenderingFreeTypeOpenGL ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTOPENGL_LIBRARY} ${OPENGL_gl_LIBRARY} vtkFiltersStatisticsGnuR)
+ ELSE(HAVE_LIB_R)
+- TARGET_LINK_LIBRARIES(vtkqt vtkCommonCore vtkGUISupportQtOpenGL vtkIOImage vtkRenderingOpenGL vtkRenderingFreeTypeOpenGL ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTOPENGL_LIBRARY} ${OPENGL_gl_LIBRARY})
++ TARGET_LINK_LIBRARIES(vtkqt vtkCommonCore vtkGUISupportQtOpenGL vtkIOMPIImage vtkRenderingOpenGL vtkRenderingFreeTypeOpenGL ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTOPENGL_LIBRARY} ${OPENGL_gl_LIBRARY})
+ ENDIF(HAVE_LIB_R)
+ # Add vtk definitions
+ ADD_TARGET_DEFINITIONS(vtkqt "${VTK_DEFINITIONS}")
+--- visit2.8.2-old/src/visit_vtk/full/CMakeLists.txt 2015-01-14 13:08:53.249224731 +0100
++++ visit2.8.2-new/src/visit_vtk/full/CMakeLists.txt 2015-01-14 13:08:28.569224460 +0100
+@@ -125,9 +125,11 @@
+ ADD_LIBRARY(visit_vtk ${VISIT_VTK_SOURCES})
+
+ IF(HAVE_LIB_R)
+- TARGET_LINK_LIBRARIES(visit_vtk lightweight_visit_vtk vtkFiltersExtraction vtkFiltersFlowPaths vtkImagingHybrid vtkRenderingOpenGL vtkRenderingFreeType vtkRenderingFreeTypeOpenGL vtkInteractionStyle vtkFiltersStatisticsGnuR)
++ TARGET_LINK_LIBRARIES(visit_vtk lightweight_visit_vtk vtkFiltersExtraction
++ vtkFiltersFlowPaths vtkIOMPIImage vtkImagingHybrid vtkRenderingOpenGL vtkRenderingFreeType vtkRenderingFreeTypeOpenGL vtkInteractionStyle vtkFiltersStatisticsGnuR)
+ ELSE(HAVE_LIB_R)
+- TARGET_LINK_LIBRARIES(visit_vtk lightweight_visit_vtk vtkFiltersExtraction vtkFiltersFlowPaths vtkImagingHybrid vtkRenderingOpenGL vtkRenderingFreeType vtkRenderingFreeTypeOpenGL vtkInteractionStyle)
++ TARGET_LINK_LIBRARIES(visit_vtk lightweight_visit_vtk vtkFiltersExtraction
++ vtkFiltersFlowPaths vtkIOMPIImage vtkImagingHybrid vtkRenderingOpenGL vtkRenderingFreeType vtkRenderingFreeTypeOpenGL vtkInteractionStyle)
+ ENDIF(HAVE_LIB_R)
+ # Add vtk definitions
+ ADD_TARGET_DEFINITIONS(visit_vtk "${VTK_DEFINITIONS}")
--- /dev/null
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/visit/visit-2.9.0.ebuild,v 1.1 2015/03/16 08:29:05 slis Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils python-single-r1
+
+DESCRIPTION="A software that delivers parallel interactive visualizations"
+HOMEPAGE="https://wci.llnl.gov/codes/visit/home.html"
+SRC_URI="http://portal.nersc.gov/svn/visit/trunk/releases/${PV}/${PN}${PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cgns debug hdf5 mpi netcdf silo tcmalloc threads"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+ ${PYTHON_DEPS}
+ tcmalloc? ( dev-util/google-perftools )
+ cgns? ( sci-libs/cgnslib )
+ hdf5? ( sci-libs/hdf5 )
+ netcdf? ( sci-libs/netcdf )
+ silo? ( sci-libs/silo )
+ >=sci-libs/vtk-6.0.0[imaging,mpi=,python,rendering,${PYTHON_USEDEP}]
+ sys-libs/zlib"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${PN}${PV}/src"
+PATCHES=(
+ "${FILESDIR}/${P}-findpython.patch"
+ "${FILESDIR}/${P}-findsilo.patch"
+ "${FILESDIR}/${P}-findvtk.patch"
+ "${FILESDIR}/${P}-vtklibs.patch"
+ "${FILESDIR}/${P}-dont_symlink_visit_dir.patch"
+)
+
+src_prepare() {
+ for p in ${PATCHES[@]} ; do
+ epatch "${p}"
+ done
+ if use mpi ; then
+ epatch "${FILESDIR}/${P}-vtkmpi.patch"
+ fi
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DCMAKE_INSTALL_PREFIX=/opt/visit
+ -DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+ -DPYTHON_DIR="${EPREFIX}/usr"
+ -DVISIT_PYTHON_SKIP_INSTALL=true
+ -DVISIT_VTK_SKIP_INSTALL=true
+ -DQT_BIN="${EPREFIX}/usr/bin"
+ -DVISIT_ZLIB_DIR="${EPREFIX}/usr"
+ $(cmake-utils_use threads VISIT_THREAD)
+ )
+ if use hdf5; then
+ mycmakeargs+=( -DHDF5_DIR="${EPREFIX}/usr" )
+ fi
+ if use tcmalloc; then
+ mycmakeargs+=( -DTCMALLOC_DIR="${EPREFIX}/usr" )
+ fi
+ if use cgns; then
+ mycmakeargs+=( -DCGNS_DIR="${EPREFIX}/usr" )
+ fi
+ if use silo; then
+ mycmakeargs+=( -DSILO_DIR="${EPREFIX}/usr" )
+ fi
+ if use netcdf; then
+ mycmakeargs+=( -DNETCDF_DIR="${EPREFIX}/usr" )
+ fi
+
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ PACKAGES_DIR="${ROOT}opt/${PN}/${PV}/linux-$(arch)/lib/site-packages"
+ cd "${ED}${PACKAGES_DIR}"
+ for i in *; do
+ dosym "${PACKAGES_DIR}/${i}" "$(python_get_sitedir)/$i"
+ done
+
+ cat > "${T}"/99visit <<- EOF
+ PATH=${EPREFIX}/opt/${PN}/bin
+ LDPATH=${EPREFIX}/opt/${PN}/${PV}/linux-$(arch)/lib/
+ EOF
+ doenvd "${T}"/99visit
+}
+
+pkg_postinst () {
+ ewarn "Remember to run "
+ ewarn "env-update && source /etc/profile"
+ ewarn "if you want to use visit in already opened session"
+}
projects / gentoo.git / commitdiff