summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Ospald <hasufell@gentoo.org>2013-02-11 21:29:24 +0000
committerJulian Ospald <hasufell@gentoo.org>2013-02-11 21:29:24 +0000
commitbc75358256d1dc52820b3a1a780c596a6bf61ee2 (patch)
tree56b128bfa1288bfe84900e667020cd23160f777f /sci-visualization
parentStable on amd64, wrt bug #456374 (diff)
downloadhistorical-bc75358256d1dc52820b3a1a780c596a6bf61ee2.tar.gz
historical-bc75358256d1dc52820b3a1a780c596a6bf61ee2.tar.bz2
historical-bc75358256d1dc52820b3a1a780c596a6bf61ee2.zip
version bump wrt #317345
Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64 Manifest-Sign-Key: 0xE73C35B3
Diffstat (limited to 'sci-visualization')
-rw-r--r--sci-visualization/paraview/ChangeLog24
-rw-r--r--sci-visualization/paraview/Manifest51
-rw-r--r--sci-visualization/paraview/files/paraview-3.6.2-about.html.patch12
-rw-r--r--sci-visualization/paraview/files/paraview-3.6.2-assistant.patch24
-rw-r--r--sci-visualization/paraview/files/paraview-3.6.2-boost-property_map.patch24
-rw-r--r--sci-visualization/paraview/files/paraview-3.6.2-h5part.patch12
-rw-r--r--sci-visualization/paraview/files/paraview-3.6.2-hdf-1.8.3.patch71
-rw-r--r--sci-visualization/paraview/files/paraview-3.6.2-libpng14.patch45
-rw-r--r--sci-visualization/paraview/files/paraview-3.6.2-libpng15.patch20
-rw-r--r--sci-visualization/paraview/files/paraview-3.6.2-no-doc-finder.patch18
-rw-r--r--sci-visualization/paraview/files/paraview-3.6.2-odbc.patch12
-rw-r--r--sci-visualization/paraview/files/paraview-3.6.2-pointsprite-disable.patch13
-rw-r--r--sci-visualization/paraview/files/paraview-3.6.2-qt.patch145
-rw-r--r--sci-visualization/paraview/files/paraview-3.98.0-gcc-4.7.patch28
-rw-r--r--sci-visualization/paraview/files/paraview-3.98.0-mpi4py.patch12
-rw-r--r--sci-visualization/paraview/files/paraview-3.98.0-pvblot.patch55
-rw-r--r--sci-visualization/paraview/files/paraview-3.98.0-removesqlite.patch517
-rw-r--r--sci-visualization/paraview/files/paraview-3.98.0-vtk-cg-path.patch (renamed from sci-visualization/paraview/files/paraview-3.6.2-findcg-cmake.patch)11
-rw-r--r--sci-visualization/paraview/files/paraview-3.98.0-vtknetcd.patch79
-rw-r--r--sci-visualization/paraview/files/paraview-3.98.0-xdmf-cstring.patch12
-rw-r--r--sci-visualization/paraview/metadata.xml7
-rw-r--r--sci-visualization/paraview/paraview-3.6.2.ebuild266
-rw-r--r--sci-visualization/paraview/paraview-3.98.0.ebuild245
23 files changed, 998 insertions, 705 deletions
diff --git a/sci-visualization/paraview/ChangeLog b/sci-visualization/paraview/ChangeLog
index fdb18a304e3b..86192f8a6808 100644
--- a/sci-visualization/paraview/ChangeLog
+++ b/sci-visualization/paraview/ChangeLog
@@ -1,6 +1,26 @@
# ChangeLog for sci-visualization/paraview
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/ChangeLog,v 1.61 2012/05/06 23:13:07 pesa Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/ChangeLog,v 1.62 2013/02/11 21:29:20 hasufell Exp $
+
+*paraview-3.98.0 (11 Feb 2013)
+
+ 11 Feb 2013; Julian Ospald <hasufell@gentoo.org> -paraview-3.6.2.ebuild,
+ -files/paraview-3.6.2-about.html.patch,
+ -files/paraview-3.6.2-assistant.patch,
+ -files/paraview-3.6.2-boost-property_map.patch,
+ -files/paraview-3.6.2-findcg-cmake.patch, -files/paraview-3.6.2-h5part.patch,
+ -files/paraview-3.6.2-hdf-1.8.3.patch, -files/paraview-3.6.2-libpng14.patch,
+ -files/paraview-3.6.2-libpng15.patch,
+ -files/paraview-3.6.2-no-doc-finder.patch, -files/paraview-3.6.2-odbc.patch,
+ -files/paraview-3.6.2-pointsprite-disable.patch,
+ -files/paraview-3.6.2-qt.patch, +paraview-3.98.0.ebuild,
+ +files/paraview-3.98.0-gcc-4.7.patch, +files/paraview-3.98.0-mpi4py.patch,
+ +files/paraview-3.98.0-pvblot.patch,
+ +files/paraview-3.98.0-removesqlite.patch,
+ +files/paraview-3.98.0-vtk-cg-path.patch,
+ +files/paraview-3.98.0-vtknetcd.patch,
+ +files/paraview-3.98.0-xdmf-cstring.patch:
+ version bump wrt #317345
06 May 2012; Davide Pesavento <pesa@gentoo.org> paraview-3.6.2.ebuild:
Stop inheriting deprecated qt4 eclass (it wasn't used anyway).
diff --git a/sci-visualization/paraview/Manifest b/sci-visualization/paraview/Manifest
index e1fceccf5b4f..7c2cdce2777d 100644
--- a/sci-visualization/paraview/Manifest
+++ b/sci-visualization/paraview/Manifest
@@ -1,38 +1,25 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
-AUX paraview-3.6.2-about.html.patch 465 RMD160 741b41273da14ef18ac660dc9ce55e463a16576b SHA1 fd640d5a700feca67df8a7b3fdf7e0f80b62f01f SHA256 5a1701f2839eefc552cd66d52863d6993e6cc18e02084e633c3c6971ab27e88c
-AUX paraview-3.6.2-assistant.patch 1108 RMD160 5852514c1c79c56b4a24a4e20cf4735a7ab33f39 SHA1 bf1fa7b628f62d49aba7658462fe76911f7534f9 SHA256 dd5777aadefd960eee1cdc8fb08b838a1229e67cf27c6431dd19986ab654b01e
-AUX paraview-3.6.2-boost-property_map.patch 1212 RMD160 7f7c37cf57fee96774d10104de44ed321b9bf5cb SHA1 0afff55c791aec3a73ad31487585e6ca1f814920 SHA256 b0e1b3569c4b7e2f47a6b550925eeb47c3cb0d3c2296fe3f7b933a9ee4e1b709
-AUX paraview-3.6.2-findcg-cmake.patch 1152 RMD160 d32da54534c104ca6b3e9bd088b4644590c24f8d SHA1 ab89deef0fb2760cf52c299298f511dd4e43cd92 SHA256 6f51bf693800e8d1d8112f15a793283d4672617c0f7385ad908af97f7f067db0
-AUX paraview-3.6.2-h5part.patch 467 RMD160 bd34e8bf02a1855dcfeabdc77cac39bd78a41492 SHA1 8416ef8a782425624b04c28c379d383e8f924c44 SHA256 ea46a024d8cb398c93dabee22ac2bef66af3771477811551275bfa85a765cc3f
-AUX paraview-3.6.2-hdf-1.8.3.patch 2701 RMD160 0c6399a18041597c53a856f20e986587b0a9d334 SHA1 c10beace922a3c2566ca7e38c3bf28c746211d96 SHA256 7a283a8ce1d03ddbe93e1d0aae5b26e4b7034607e40472620dbd51869c6015da
-AUX paraview-3.6.2-libpng14.patch 2228 RMD160 fb238b1a097ba97ca722d1c4a838707c43efaa97 SHA1 d4ebe66a41b60bfca41857e2fc2bed54a5d5b676 SHA256 9e8b69475c71e3c7465a12447cae4f5a963fc373c84eebefb11bce9e230a8df2
-AUX paraview-3.6.2-libpng15.patch 655 RMD160 d893024c30d215206694ef18c2971ba1b0933d27 SHA1 e0af2199f13c8e20f27b3abac8159439fa1de5ca SHA256 f2c09793028bf2e12dbb3536cf85053eabb5addab0a06c9ac6524ef962dae6c7
-AUX paraview-3.6.2-no-doc-finder.patch 773 RMD160 0d76cb7cbd73049473fcd82244b6f4e3766b4276 SHA1 68e0e162f9ebb4bf3d231dbed62ecd53647457b3 SHA256 c90134760ea0995d69f35dc4f5e1d3c43faa4288c2b35cec03a5ece809b6675b
-AUX paraview-3.6.2-odbc.patch 382 RMD160 5df235adc6298466bccab6f2acd9f9eda002deb2 SHA1 f3b3da241342cbf042d0801912b6881d2f9899aa SHA256 ea7ef1df1ed3319f996f1318579c87d362ccfd78f3c4c094ed80aa226b56a1f3
-AUX paraview-3.6.2-pointsprite-disable.patch 608 RMD160 07f18332dc7d1313d0909ef7c2bcdfaf9c7d8ec4 SHA1 6602447fc07dacddd7a89ce163213fad1eb76386 SHA256 066559838cbe54408e3d5f17c5ca132e76757ea371a055def27ec710c2df2048
-AUX paraview-3.6.2-qt.patch 7324 RMD160 e5038a2642eee257008181ee3bcba0b1fb95dc62 SHA1 5660eba6e25ecb0e04a171143e6478de9c029ea0 SHA256 1b8b5af8a39e9e50eeb6ddd0cf357c6d3848084c36ffc549c633d06253ad3f65
-DIST paraview-3.6.2-openfoam-gpl-r173.patch.bz2 3402 RMD160 2ceb036486b2757eeeed8eae36593be2a70a3a36 SHA1 ea2ac1f92b529973164469c5fc3fdbc0407f8ccd SHA256 3e8751f7747a0067b8532d399a4dc253c71ce50d39fc3b17d38e16060196fc99
-DIST paraview-3.6.2-openfoam-r173.patch.bz2 54275 RMD160 930785f07883a2fc952569a2908600d911627b24 SHA1 ca255ec222e9f8884f4e090df8e860946246b249 SHA256 87c62931de1484dd71fe2f1b36eafdb85eb27127cb42825819a67730118ae6ce
-DIST paraview-3.6.2.tar.gz 28323172 RMD160 0f14419100d6d7fd7cc0ca3d385da41397a96da8 SHA1 5a2fad2bd2eaa39dbcbd3f592edfaedb780f63ff SHA256 062f581a6f3fda5cead647fb32b0fab6d9bb3be38aace5e4080dab38a9eaea04
-EBUILD paraview-3.6.2.ebuild 9696 RMD160 f252c41a6d6dc4dddaf432645aefe84ac55bd253 SHA1 5cefcbb74f68ee557e45e5f6d6d6227e210a1ec8 SHA256 4ca67b6f900d1377fe86a63f44b0c3398e8da4f4752bf9ad9d91a600030b8569
-MISC ChangeLog 12529 RMD160 fe8e75c76af3fec621c616b12c1f35687f914c90 SHA1 9f0b1f78909e080896306fdb3b7adcb7d85574a9 SHA256 88153e520df4eee3013e93873ac0069c507584ad7d4cc6905089c2a125fd7294
-MISC metadata.xml 568 RMD160 d44613fcc6b3dc955197867f9e93fcfc9620a7aa SHA1 5818b0ac73fdb158a6d0cf010df85663a1219132 SHA256 2e7d9258b0f11c618647bea07ebb91f84c8cac7ee830640d80c2a5fe03959b66
+AUX paraview-3.98.0-gcc-4.7.patch 759 SHA256 5f3b7b2cd25fb09004b5820ffb554a5fec21100f8048db257a67708d8abf04e0 SHA512 85164dc2931d960114d23b697022b2e1939513ccb32a0c5af588d980f919a112653b170f076265bea692f6aae0d2efd89ed08597cf13dbfc5c3b8a2292980e02 WHIRLPOOL e4fd9d14ae2065be600f6ed3b00ced9bb1273f5a32fc4eb46d6ccf160d4003abb805a81d06080339c1dba255ac9d702e0c94d8596c6fc1de07d35161b62cc1a9
+AUX paraview-3.98.0-mpi4py.patch 395 SHA256 070e1d79e2a22f971950d8f08f4bfab28cb07b450060f8dd2c4bfc28f4d6fd96 SHA512 2bd09384bc88c5182466465c2b513ec0461d792b36b7d0be608693c557c3fc2a2b7d401c1453c14149748343ac9f7f5d57c26c92f6e7eff240efcc50811e4ed9 WHIRLPOOL 86ecbc391883e7b5b4908fffc800811dcac148833bbe6202d8b8141ea7f1ed06e72ec7f03ca43e8585eaeebe6f9680493d0f0501cffcef89b056fcb61dc78ad3
+AUX paraview-3.98.0-pvblot.patch 1857 SHA256 52e13e52ba6f4fdef67bd6fbfbbb93e093813a3242b4052ffe682943d161ad6f SHA512 2dc629cedfdd28c5f20232a6b0e0cd83ed10a9310dc2f12e4fde0ed189f3c3e478bf21340d398e52029a7c9c4e17fd0d129fcfa854a804b63a82428c6c3af3a7 WHIRLPOOL 044b413988a7fb631790a13c6794a5a20f173d4fc6643bfeb7b59db025519709de63669b3852196a35e216857b3be35913c5d0544897069273b619dc97187b72
+AUX paraview-3.98.0-removesqlite.patch 16403 SHA256 e7fee0cd7e0cd08a4de35451add15fceae1775dd8a6898744917e7d9c76006d7 SHA512 d869d00f0060c48c4675ca831855b0d1813b2b96dd5f216db634495096c2f51aa9a82986a8cb6eb8e31030bc85af643d364bf89c50d22568332afdef7a6144a9 WHIRLPOOL bc9f104a9dc726039f368e7b808e828c9a11e7fbcc1509748da2b0565d924305045a1d7f130018437f18f103ad25154695df3dff2b9d3928dc20b866d9145a97
+AUX paraview-3.98.0-vtk-cg-path.patch 1087 SHA256 291e1dd64351dcac5c1595a10f9c83080b073ce91f0bc8e2f463b855d6920645 SHA512 e1a9bb371af3c57e02de4c22c8cad6c0564bc7a85e9fbb2c0784bc610b81216f183983c70d1c7a5c8cbbe35a84577c9987878876b8b78df3bfbc75fef07614a3 WHIRLPOOL e83e0f5e99004b52ff5a0bac0c1446aabcc77f30653a8b26c0c18a78baea99d81ee84d65f88f1b890c457418cc3b234f99cd35d42286a050fd2d9b35f2396d70
+AUX paraview-3.98.0-vtknetcd.patch 2775 SHA256 b972d38d99c43db18c92b5423d06f542eae843028e1f37dff102ea10979dfea1 SHA512 3da1cd798307059e3e4dd3da876da5579384c7fe8c41301b73540f8bc653457186f956505272bb20fafb12d5f756c79ae7c31d8e5b361e0f7f86de2f480ed61b WHIRLPOOL bbf8bba64eeb0d1830f5da7285ea3c848dccf7dbef6e2663bbadea37059d10f89af676e0b44b42f8283193ccbf36895a83981206767d401094dca3113396b544
+AUX paraview-3.98.0-xdmf-cstring.patch 360 SHA256 4505a480b3775d20cde98f724a20c8b0dbf4f3baf6068013bf69b0e54c1f8473 SHA512 5577b7bae26959546795721d712c4e4f6a5403b35c0871040f6c74c07cd3aecd5b03e9f7a07ef49714b8adb4c7cc880385215b8742895006d2ad3dfeccc50472 WHIRLPOOL e0d0c1603ba4ca66fc05dd5049215f2c988f3452763772df35c7fd6a8cb6fa779fd4efbccd20a01f19778f7c0b1db78e0af12716137976ae7bf54923a6bc0642
+DIST ParaView-3.98.0-src.tgz 42160789 SHA256 582ac0d87360a05c471164c718d95f718388edf8b9349cf544c09f8a87660d2a SHA512 6fb31ce501f252b0e7f72c25a7e5e0b2f663819d44d6abf71b8aa3f78215e2bb5bfebc5fe336747f1cd35a2a42aa608d36c301025b9d761ad43be648a8a8abd5 WHIRLPOOL 4de683db37d6ed3f93cd6199b5e6e362bb43576b91d8567144602e88c424f7a87e2f6e53781f3958446bf6b0f025a0f0ecb61cc0bef945afb974fa4a1d625e3d
+EBUILD paraview-3.98.0.ebuild 8102 SHA256 106b8296014099d5e87d5a6c9bc20b0d1ca070a6ac15a7257e3c8a86808652b1 SHA512 e29da92dd8e9211db73bc96b3e329280f3622363d0e632569bbd367ed98c1314b1b050f114d5565d1a3903cf62f25c2ce7f3ec0dca15f6729fdb1f81ac22e839 WHIRLPOOL 6d68b70c8e6d6aeadb60a8435984cf84034b265b7903cace0b6f8f1952263efbf87b7400f9a566643f63d14961c89d32b7679d375071ad989407c1d8d5ca4383
+MISC ChangeLog 13480 SHA256 319e279adb4c8192bebdec4d77571b62617bf584667508dda8d4e10bcfef0e56 SHA512 28b08985b2f2ed9ebcbaec303647e854682e8e12c7ccb9d466958671937f821eae797f16dbf663bd3dad4cd091e787436ef25433800ffa48adfc55f50ae36875 WHIRLPOOL 21ce76c615353fd97b26e0016622a0eeac99a4de2c67a22e308cd786b2c013ce1fa8cc91262691e8a96b8d8af2a85f0a49169c84fec447ff55ad52ba0f7e509d
+MISC metadata.xml 560 SHA256 ea503cda93e1d63d4582996e3dd500c5a2c90e28e8ff5413a3927d8c6a39c337 SHA512 d6ed91abf23af3562353878effbfe449c20b037482379e9bdd48741f217cd8fad4c71d8d17581f2dd1f8f74629a85f8bde294d2b647efc579903bdc680d914bf WHIRLPOOL 9a1a2b02cff21575c20868e4a4952d53595bfe9e97bff4bcbf0646d1cf1999a9ebd69d542222cc6fce4663026ead030d78266eb7612c0b130ddb3d9ca4ad0292
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iQIcBAEBCgAGBQJPpwWNAAoJENXLsxwXqFxy1EUP/RISJv2XqXN6SUcNPw910s1L
-Ghzzqce0U6nE0SWJhaieP207X8so4jnG8cg7+5fLsjap+UYecioHz5+/WM0Emuyu
-ef7dJejbvwf8sRWU+rVuW1jRc88NjlJ1ljw7V3mpPM1kzI4SkYKaMoO9oGyMUcWd
-lLKeX7l9yWW1ilyk86nf4dlx+T6NTfLCDFafsPTdVq5O2brWiUgI0ihrvjmqDKvN
-UcPJVm+b/UOepd9UoLK8n74xE91gSdIsFEp0qtIvxUknFvUw1KAo9iq5AGCEeDwy
-6cdYXdugqSww4ir0KsY1qwbNQrO+VAWpTp+fInHR/HggZZRGlV1u0oBZR/BOSGjT
-qiXb2du4TqbU5vSnMi/eHbbbW9/f7CqtA5KOPCXoBTx5d8HAjEre7e394lI1VXg8
-BwHGtwdbLzY3niIJ2I/ud7IhswePJRSVK1qLlpatMG3ioIA2K7nedZ8/WbIsxKDG
-iZfgwlFs5OAzvF5XL+yzAmx4qEvxYtNLrnP/PBgcKTpTMKFrjBthPfQMejFvNDAC
-kBcX/0lB/On+HQS2uJGTtGRfmHVM3ADlZjZ/mRUqqnTWHdszn9y1LQxcQSZ7Yxts
-wlNhuTXTYVHXYDSUy/IuWAEdt7YRcHny2QvRvShyP6KYWH1FbGauJ5rroyd5J8gE
-B4TF+1WgUy+YM9A3oV8a
-=svSN
+iQEcBAEBCAAGBQJRGWK0AAoJEFpvPKfnPDWzhb0H+QFO/tsYx2a8kRgB1tkOT8zw
+La8R5jXv3RxOp6v9BHMM0op8OX4YkFJdgTsA6D2BqIkiVAw74pPrQh7hoMRs1o+b
+vSeqUD/w73k9uCcLmA1NupFdoKZKvp3OUykpspZ0T6RIFX4/d/diFQplfHRC58hR
+2aioca78TlPuz2yoUohcuibOMWkn1SueSxe9wXap/RwuYvVlxloAia7pVEMQjOKZ
+uh/anH6loENrrup/lets1smeP7Lxb7ukqVJL6D44p4TubV/bI5CcATP/JW7ETzbI
+Za2yYltHwnIbbUONHiA6nOCFQcYPJuzdpaLXMf7dqX6iHv3vYJa6eWFhwwZV4Yc=
+=Zlh2
-----END PGP SIGNATURE-----
diff --git a/sci-visualization/paraview/files/paraview-3.6.2-about.html.patch b/sci-visualization/paraview/files/paraview-3.6.2-about.html.patch
deleted file mode 100644
index 80ac406c9a28..000000000000
--- a/sci-visualization/paraview/files/paraview-3.6.2-about.html.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur ParaView3/Documentation/CMakeLists.txt ParaView3.new/Documentation/CMakeLists.txt
---- ParaView3/Documentation/CMakeLists.txt 2008-12-22 16:06:00.000000000 -0500
-+++ ParaView3.new/Documentation/CMakeLists.txt 2010-01-16 11:02:15.000000000 -0500
-@@ -155,7 +155,7 @@
-
- install(
- FILES "${ParaView_BINARY_DIR}/about.html"
-- DESTINATION ${PV_INSTALL_BIN_DIR}
-+ DESTINATION ${PV_EXE_INSTALL}/Documentation
- COMPONENT Runtime)
-
- configure_file(
diff --git a/sci-visualization/paraview/files/paraview-3.6.2-assistant.patch b/sci-visualization/paraview/files/paraview-3.6.2-assistant.patch
deleted file mode 100644
index e1540db5b30f..000000000000
--- a/sci-visualization/paraview/files/paraview-3.6.2-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-05-06 16:01:51.000000000 -0400
-+++ ParaView3.new/Applications/OverView/Core/MainWindow.cxx 2010-01-14 18:52:54.000000000 -0500
-@@ -933,7 +933,7 @@
- QString assistantExe;
- QString profileFile;
-
-- const char* assistantName = "assistant";
-+ const char* assistantName = "paraview-assistant";
- #if defined(Q_WS_WIN)
- const char* binDir = "\\";
- const char* binDir1 = "\\..\\";
-diff -Naur ParaView3/Qt/Components/pqClientMainWindow.cxx ParaView3.new/Qt/Components/pqClientMainWindow.cxx
---- ParaView3/Qt/Components/pqClientMainWindow.cxx 2009-09-22 13:37:21.000000000 -0400
-+++ ParaView3.new/Qt/Components/pqClientMainWindow.cxx 2010-01-14 18:53:18.000000000 -0500
-@@ -1041,7 +1041,7 @@
- QString assistantExe;
- QString profileFile;
-
-- const char* assistantName = "assistant";
-+ const char* assistantName = "paraview-assistant";
- #if defined(Q_WS_WIN)
- const char* extString = ".exe";
- const char* binDir = "\\";
diff --git a/sci-visualization/paraview/files/paraview-3.6.2-boost-property_map.patch b/sci-visualization/paraview/files/paraview-3.6.2-boost-property_map.patch
deleted file mode 100644
index e6919c549570..000000000000
--- a/sci-visualization/paraview/files/paraview-3.6.2-boost-property_map.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur ParaView3/VTK/Infovis/Testing/Cxx/TestBoostAdapter.cxx ParaView3.new/VTK/Infovis/Testing/Cxx/TestBoostAdapter.cxx
---- ParaView3/VTK/Infovis/Testing/Cxx/TestBoostAdapter.cxx 2008-11-01 15:22:38.000000000 -0400
-+++ ParaView3.new/VTK/Infovis/Testing/Cxx/TestBoostAdapter.cxx 2010-01-21 18:43:37.000000000 -0500
-@@ -36,7 +36,7 @@
- #include <boost/graph/strong_components.hpp>
- #include <boost/graph/dijkstra_shortest_paths.hpp>
- #include <boost/graph/transitive_closure.hpp>
--#include <boost/property_map.hpp>
-+#include <boost/property_map/property_map.hpp>
- #include <boost/vector_property_map.hpp>
-
- #include "vtkGraph.h"
-diff -Naur ParaView3/VTK/Infovis/vtkBoostBreadthFirstSearch.cxx ParaView3.new/VTK/Infovis/vtkBoostBreadthFirstSearch.cxx
---- ParaView3/VTK/Infovis/vtkBoostBreadthFirstSearch.cxx 2009-03-13 12:11:50.000000000 -0400
-+++ ParaView3.new/VTK/Infovis/vtkBoostBreadthFirstSearch.cxx 2010-01-21 18:43:16.000000000 -0500
-@@ -46,7 +46,7 @@
-
- #include <boost/graph/visitors.hpp>
- #include <boost/graph/breadth_first_search.hpp>
--#include <boost/property_map.hpp>
-+#include <boost/property_map/property_map.hpp>
- #include <boost/vector_property_map.hpp>
- #include <boost/pending/queue.hpp>
-
diff --git a/sci-visualization/paraview/files/paraview-3.6.2-h5part.patch b/sci-visualization/paraview/files/paraview-3.6.2-h5part.patch
deleted file mode 100644
index 59f27d0bb6ab..000000000000
--- a/sci-visualization/paraview/files/paraview-3.6.2-h5part.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur ParaView3/Plugins/H5PartReader/H5Part/src/H5PartTypes.h ParaView3.new/Plugins/H5PartReader/H5Part/src/H5PartTypes.h
---- ParaView3/Plugins/H5PartReader/H5Part/src/H5PartTypes.h 2009-10-01 15:19:59.000000000 -0400
-+++ ParaView3.new/Plugins/H5PartReader/H5Part/src/H5PartTypes.h 2010-01-30 09:40:22.000000000 -0500
-@@ -17,7 +17,7 @@
- #endif
- ;
-
--#ifndef H5PART_HAS_MPI
-+#if !defined(H5PART_HAS_MPI) && !defined(MPI_BOTTOM)
- typedef int MPI_Comm;
- #endif
-
diff --git a/sci-visualization/paraview/files/paraview-3.6.2-hdf-1.8.3.patch b/sci-visualization/paraview/files/paraview-3.6.2-hdf-1.8.3.patch
deleted file mode 100644
index 5499bdfc2291..000000000000
--- a/sci-visualization/paraview/files/paraview-3.6.2-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-06-17 17:00:28.000000000 -0400
-+++ ParaView3.new/Utilities/Xdmf2/libsrc/XdmfH5Driver.cxx 2010-01-16 10:09:22.000000000 -0500
-@@ -132,9 +132,15 @@
- static herr_t H5FD_dsm_flush(H5FD_t *_file);
- #endif
- static int H5FD_dsm_cmp(const H5FD_t *_f1, const H5FD_t *_f2);
-+#ifdef H5_USE_16_API
-+static haddr_t H5FD_dsm_get_eoa(const H5FD_t *_file, H5FD_mem_t);
-+static herr_t H5FD_dsm_set_eoa(H5FD_t *_file, H5FD_mem_t, haddr_t addr);
-+static haddr_t H5FD_dsm_get_eof(const H5FD_t *_file);
-+#else
- static haddr_t H5FD_dsm_get_eoa(H5FD_t *_file);
- static herr_t H5FD_dsm_set_eoa(H5FD_t *_file, haddr_t addr);
- static haddr_t H5FD_dsm_get_eof(H5FD_t *_file);
-+#endif
- static herr_t H5FD_dsm_read(H5FD_t *_file, H5FD_mem_t type, hid_t fapl_id, haddr_t addr,
- DSM_HSIZE_T size, void *buf);
- static herr_t H5FD_dsm_write(H5FD_t *_file, H5FD_mem_t type, hid_t fapl_id, haddr_t addr,
-@@ -159,6 +165,7 @@
- H5FD_dsm_close, /*close */
- H5FD_dsm_cmp, /*cmp */
- NULL, /*query */
-+ NULL, /*type map */
- NULL, /*alloc */
- NULL, /*free */
- H5FD_dsm_get_eoa, /*get_eoa */
-@@ -168,6 +175,7 @@
- H5FD_dsm_read, /*read */
- H5FD_dsm_write, /*write */
- NULL, /*flush */
-+ NULL, /*truncate */
- NULL, /*lock */
- NULL, /*unlock */
- H5FD_FLMAP_SINGLE /*fl_map */
-@@ -594,7 +602,11 @@
- *-------------------------------------------------------------------------
- */
- static haddr_t
-+#ifdef H5_USE_16_API
-+H5FD_dsm_get_eoa(const H5FD_t *_file, H5FD_mem_t)
-+#else
- H5FD_dsm_get_eoa(H5FD_t *_file)
-+#endif
- {
- H5FD_dsm_t *file = (H5FD_dsm_t*)_file;
-
-@@ -622,7 +634,11 @@
- *-------------------------------------------------------------------------
- */
- static herr_t
-+#ifdef H5_USE_16_API
-+H5FD_dsm_set_eoa(H5FD_t *_file, H5FD_mem_t, haddr_t addr)
-+#else
- H5FD_dsm_set_eoa(H5FD_t *_file, haddr_t addr)
-+#endif
- {
- H5FD_dsm_t *file = (H5FD_dsm_t*)_file;
-
-@@ -663,7 +679,11 @@
- *-------------------------------------------------------------------------
- */
- static haddr_t
-+#ifdef H5_USE_16_API
-+H5FD_dsm_get_eof(const H5FD_t *_file)
-+#else
- H5FD_dsm_get_eof(H5FD_t *_file)
-+#endif
- {
- H5FD_dsm_t *file = (H5FD_dsm_t*)_file;
-
diff --git a/sci-visualization/paraview/files/paraview-3.6.2-libpng14.patch b/sci-visualization/paraview/files/paraview-3.6.2-libpng14.patch
deleted file mode 100644
index 30947a82eb0a..000000000000
--- a/sci-visualization/paraview/files/paraview-3.6.2-libpng14.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -ur ParaView3.orig/VTK/IO/vtkPNGReader.cxx ParaView3/VTK/IO/vtkPNGReader.cxx
---- ParaView3.orig/VTK/IO/vtkPNGReader.cxx 2006-09-22 00:23:24.000000000 +0300
-+++ ParaView3/VTK/IO/vtkPNGReader.cxx 2010-05-12 15:28:30.000000000 +0300
-@@ -116,7 +116,7 @@
- // minimum of a byte per pixel
- if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8)
- {
-- png_set_gray_1_2_4_to_8(png_ptr);
-+ png_set_expand_gray_1_2_4_to_8(png_ptr);
- }
-
- // add alpha if any alpha found
-@@ -225,7 +225,7 @@
- // minimum of a byte per pixel
- if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8)
- {
-- png_set_gray_1_2_4_to_8(png_ptr);
-+ png_set_expand_gray_1_2_4_to_8(png_ptr);
- }
-
- // add alpha if any alpha found
-diff -ur ParaView3.orig/VTK/Utilities/vtkpng/png.h ParaView3/VTK/Utilities/vtkpng/png.h
---- ParaView3.orig/VTK/Utilities/vtkpng/png.h 2004-04-28 18:49:22.000000000 +0300
-+++ ParaView3/VTK/Utilities/vtkpng/png.h 2010-05-12 15:28:00.000000000 +0300
-@@ -1330,7 +1330,7 @@
- #if defined(PNG_READ_EXPAND_SUPPORTED)
- /* Expand data to 24-bit RGB, or 8-bit grayscale, with alpha if available. */
- extern PNG_EXPORT(void,png_set_expand) PNGARG((png_structp png_ptr));
--extern PNG_EXPORT(void,png_set_gray_1_2_4_to_8) PNGARG((png_structp png_ptr));
-+extern PNG_EXPORT(void,png_set_expand_gray_1_2_4_to_8) PNGARG((png_structp png_ptr));
- extern PNG_EXPORT(void,png_set_palette_to_rgb) PNGARG((png_structp png_ptr));
- extern PNG_EXPORT(void,png_set_tRNS_to_alpha) PNGARG((png_structp png_ptr));
- #endif
-diff -ur ParaView3.orig/VTK/Utilities/vtkpng/vtk_png_mangle.h ParaView3/VTK/Utilities/vtkpng/vtk_png_mangle.h
---- ParaView3.orig/VTK/Utilities/vtkpng/vtk_png_mangle.h 2004-10-26 19:56:45.000000000 +0300
-+++ ParaView3/VTK/Utilities/vtkpng/vtk_png_mangle.h 2010-05-12 15:27:25.000000000 +0300
-@@ -229,7 +229,7 @@
- #define png_set_gAMA vtk_png_set_gAMA
- #define png_set_gAMA_fixed vtk_png_set_gAMA_fixed
- #define png_set_gamma vtk_png_set_gamma
--#define png_set_gray_1_2_4_to_8 vtk_png_set_gray_1_2_4_to_8
-+#define png_set_expand_gray_1_2_4_to_8 vtk_png_set_gray_1_2_4_to_8
- #define png_set_gray_to_rgb vtk_png_set_gray_to_rgb
- #define png_set_hIST vtk_png_set_hIST
- #define png_set_iCCP vtk_png_set_iCCP
diff --git a/sci-visualization/paraview/files/paraview-3.6.2-libpng15.patch b/sci-visualization/paraview/files/paraview-3.6.2-libpng15.patch
deleted file mode 100644
index db910b709891..000000000000
--- a/sci-visualization/paraview/files/paraview-3.6.2-libpng15.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- VTK/IO/vtkPNGWriter.cxx
-+++ VTK/IO/vtkPNGWriter.cxx
-@@ -148,7 +148,7 @@
- void vtkPNGWriteErrorFunction(png_structp png_ptr,
- png_const_charp vtkNotUsed(error_msg))
- {
-- longjmp(png_ptr->jmpbuf, 1);
-+ longjmp(png_jmpbuf(png_ptr), 1);
- }
- }
-
-@@ -224,7 +224,7 @@
- png_init_io(png_ptr, this->TempFP);
- png_set_error_fn(png_ptr, png_ptr,
- vtkPNGWriteErrorFunction, vtkPNGWriteWarningFunction);
-- if (setjmp(png_ptr->jmpbuf))
-+ if (setjmp(png_jmpbuf(png_ptr)))
- {
- fclose(this->TempFP);
- this->SetErrorCode(vtkErrorCode::OutOfDiskSpaceError);
diff --git a/sci-visualization/paraview/files/paraview-3.6.2-no-doc-finder.patch b/sci-visualization/paraview/files/paraview-3.6.2-no-doc-finder.patch
deleted file mode 100644
index 4681c2517ffd..000000000000
--- a/sci-visualization/paraview/files/paraview-3.6.2-no-doc-finder.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -Naur ParaView3/Applications/Client/CMakeLists.txt ParaView3.new/Applications/Client/CMakeLists.txt
---- ParaView3/Applications/Client/CMakeLists.txt 2010-01-04 10:24:37.000000000 -0500
-+++ ParaView3.new/Applications/Client/CMakeLists.txt 2010-01-14 21:03:25.000000000 -0500
-@@ -128,10 +128,10 @@
- "${CMAKE_CURRENT_BINARY_DIR}/CMake/tmp/pqClientDocFinder.txt"
- @ONLY
- IMMEDIATE)
-- INSTALL(
-- FILES "${CMAKE_CURRENT_BINARY_DIR}/CMake/tmp/pqClientDocFinder.txt"
-- DESTINATION ${PV_INSTALL_BIN_DIR}
-- COMPONENT Runtime)
-+ # INSTALL(
-+ # FILES "${CMAKE_CURRENT_BINARY_DIR}/CMake/tmp/pqClientDocFinder.txt"
-+ # DESTINATION ${PV_INSTALL_BIN_DIR}
-+ # COMPONENT Runtime)
- ENDIF(NOT PV_INSTALL_NO_RUNTIME)
-
- IF(BUILD_TESTING)
diff --git a/sci-visualization/paraview/files/paraview-3.6.2-odbc.patch b/sci-visualization/paraview/files/paraview-3.6.2-odbc.patch
deleted file mode 100644
index 309b3ee06acd..000000000000
--- a/sci-visualization/paraview/files/paraview-3.6.2-odbc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur ParaView3/VTK/CMake/FindODBC.cmake ParaView3.new/VTK/CMake/FindODBC.cmake
---- ParaView3/VTK/CMake/FindODBC.cmake 2008-10-08 13:51:36.000000000 -0400
-+++ ParaView3.new/VTK/CMake/FindODBC.cmake 2010-01-21 22:11:26.000000000 -0500
-@@ -30,7 +30,7 @@
- )
-
- FIND_LIBRARY( ODBC_LIBRARY
-- NAMES iodbc unixodbc
-+ NAMES iodbc unixodbc odbc
- PATHS
- /usr/lib
- /usr/lib/odbc
diff --git a/sci-visualization/paraview/files/paraview-3.6.2-pointsprite-disable.patch b/sci-visualization/paraview/files/paraview-3.6.2-pointsprite-disable.patch
deleted file mode 100644
index 0c66b358d9f2..000000000000
--- a/sci-visualization/paraview/files/paraview-3.6.2-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-06-15 09:02:06.000000000 -0400
-+++ ParaView3.new/Plugins/PointSprite/Examples/Rendering/Cxx/CMakeLists.txt 2010-01-16 09:59:21.000000000 -0500
-@@ -5,6 +5,6 @@
-
- target_link_libraries(${exe} CSCS_PointSprite_Rendering vtkIO)
-
--install(TARGETS ${exe}
-- RUNTIME DESTINATION ${PROJECT_BINARY_DIR}
--)
-+#install(TARGETS ${exe}
-+# RUNTIME DESTINATION ${PROJECT_BINARY_DIR}
-+#)
diff --git a/sci-visualization/paraview/files/paraview-3.6.2-qt.patch b/sci-visualization/paraview/files/paraview-3.6.2-qt.patch
deleted file mode 100644
index f2ea294ed871..000000000000
--- a/sci-visualization/paraview/files/paraview-3.6.2-qt.patch
+++ /dev/null
@@ -1,145 +0,0 @@
-diff -Naur ParaView3/Applications/Client/CMakeLists.txt ParaView3.new/Applications/Client/CMakeLists.txt
---- ParaView3/Applications/Client/CMakeLists.txt 2010-01-04 10:24:37.000000000 -0500
-+++ ParaView3.new/Applications/Client/CMakeLists.txt 2010-01-14 18:43:52.000000000 -0500
-@@ -564,54 +564,54 @@
-
- # Install system libraries on Linux (will not work on any other Unix
- # yet)
--FOREACH(fmpglib avcodec avformat avutil)
-- IF(FFMPEG_${fmpglib}_LIBRARY)
-- GET_FILENAME_COMPONENT(FFMPEG_LIB_DIR_tmp ${FFMPEG_${fmpglib}_LIBRARY} PATH)
-- GET_FILENAME_COMPONENT(FFMPEG_LIB_NAME_tmp ${FFMPEG_${fmpglib}_LIBRARY} NAME)
-- FILE(GLOB FFMPEG_LIB_LIST RELATIVE ${FFMPEG_LIB_DIR_tmp} "${FFMPEG_${fmpglib}_LIBRARY}*")
-- INSTALL(CODE "
--MESSAGE(STATUS \"Installing \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR}/${FFMPEG_LIB_NAME_tmp}\")
--EXECUTE_PROCESS (WORKING_DIRECTORY ${FFMPEG_LIB_DIR_tmp}
-- COMMAND tar c ${FFMPEG_LIB_LIST}
-- COMMAND tar -xC \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR})
-- " COMPONENT Runtime)
-+#FOREACH(fmpglib avcodec avformat avutil)
-+# IF(FFMPEG_${fmpglib}_LIBRARY)
-+# GET_FILENAME_COMPONENT(FFMPEG_LIB_DIR_tmp ${FFMPEG_${fmpglib}_LIBRARY} PATH)
-+# GET_FILENAME_COMPONENT(FFMPEG_LIB_NAME_tmp ${FFMPEG_${fmpglib}_LIBRARY} NAME)
-+# FILE(GLOB FFMPEG_LIB_LIST RELATIVE ${FFMPEG_LIB_DIR_tmp} "${FFMPEG_${fmpglib}_LIBRARY}*")
-+# INSTALL(CODE "
-+#MESSAGE(STATUS \"Installing \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR}/${FFMPEG_LIB_NAME_tmp}\")
-+#EXECUTE_PROCESS (WORKING_DIRECTORY ${FFMPEG_LIB_DIR_tmp}
-+# COMMAND tar c ${FFMPEG_LIB_LIST}
-+# COMMAND tar -xC \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR})
-+# " COMPONENT Runtime)
- #INSTALL(FILES ${FFMPEG_${fmpglib}_LIBRARY} DESTINATION ${PV_INSTALL_LIB_DIR})
-
-- ENDIF(FFMPEG_${fmpglib}_LIBRARY)
--ENDFOREACH(fmpglib)
-+ # ENDIF(FFMPEG_${fmpglib}_LIBRARY)
-+ #ENDFOREACH(fmpglib)
-
--SET (QTLIBLIST QTCORE QTGUI QTNETWORK QTXML QTTEST QTSQL)
-+ #SET (QTLIBLIST QTCORE QTGUI QTNETWORK QTXML QTTEST QTSQL)
- # the variable and library names are not the same
--IF (WIN32)
-- SET (QTLIBLIST ${QTLIBLIST} QTASSISTANTCLIENT)
--ELSE (WIN32)
-- SET (QTLIBLIST ${QTLIBLIST} QTASSISTANT)
--ENDIF (WIN32)
-+#IF (WIN32)
-+# SET (QTLIBLIST ${QTLIBLIST} QTASSISTANTCLIENT)
-+#ELSE (WIN32)
-+# SET (QTLIBLIST ${QTLIBLIST} QTASSISTANT)
-+#ENDIF (WIN32)
-
- IF (VTK_USE_QVTK_QTOPENGL)
- SET (QTLIBLIST ${QTLIBLIST} QTOPENGL)
- ENDIF (VTK_USE_QVTK_QTOPENGL)
-
--IF(NOT Q_WS_MAC)
-- FOREACH(qtlib ${QTLIBLIST})
-- IF (NOT WIN32)
-- #INSTALL(FILES ${QT_${qtlib}_LIBRARY_RELEASE} DESTINATION ${PV_INSTALL_LIB_DIR})
-- GET_FILENAME_COMPONENT(QT_LIB_DIR_tmp ${QT_${qtlib}_LIBRARY_RELEASE} PATH)
-- GET_FILENAME_COMPONENT(QT_LIB_NAME_tmp ${QT_${qtlib}_LIBRARY_RELEASE} NAME)
-- FILE(GLOB QT_LIB_LIST RELATIVE ${QT_LIB_DIR_tmp} "${QT_${qtlib}_LIBRARY_RELEASE}*")
-- INSTALL(CODE "
--MESSAGE(STATUS \"Installing \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR}/${QT_LIB_NAME_tmp}\")
--EXECUTE_PROCESS (WORKING_DIRECTORY ${QT_LIB_DIR_tmp}
-- COMMAND tar c ${QT_LIB_LIST}
-- COMMAND tar -xC \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR})
-- " COMPONENT Runtime)
-- ELSE (NOT WIN32)
-- GET_FILENAME_COMPONENT(QT_DLL_PATH_tmp ${QT_QMAKE_EXECUTABLE} PATH)
-- INSTALL(FILES ${QT_DLL_PATH_tmp}/${qtlib}4.dll DESTINATION ${PV_INSTALL_BIN_DIR} COMPONENT Runtime)
-- ENDIF (NOT WIN32)
-+#IF(NOT Q_WS_MAC)
-+# FOREACH(qtlib ${QTLIBLIST})
-+# IF (NOT WIN32)
-+# #INSTALL(FILES ${QT_${qtlib}_LIBRARY_RELEASE} DESTINATION ${PV_INSTALL_LIB_DIR})
-+# GET_FILENAME_COMPONENT(QT_LIB_DIR_tmp ${QT_${qtlib}_LIBRARY_RELEASE} PATH)
-+# GET_FILENAME_COMPONENT(QT_LIB_NAME_tmp ${QT_${qtlib}_LIBRARY_RELEASE} NAME)
-+# FILE(GLOB QT_LIB_LIST RELATIVE ${QT_LIB_DIR_tmp} "${QT_${qtlib}_LIBRARY_RELEASE}*")
-+# INSTALL(CODE "
-+#MESSAGE(STATUS \"Installing \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR}/${QT_LIB_NAME_tmp}\")
-+#EXECUTE_PROCESS (WORKING_DIRECTORY ${QT_LIB_DIR_tmp}
-+# COMMAND tar c ${QT_LIB_LIST}
-+# COMMAND tar -xC \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR})
-+# " COMPONENT Runtime)
-+# ELSE (NOT WIN32)
-+# GET_FILENAME_COMPONENT(QT_DLL_PATH_tmp ${QT_QMAKE_EXECUTABLE} PATH)
-+# INSTALL(FILES ${QT_DLL_PATH_tmp}/${qtlib}4.dll DESTINATION ${PV_INSTALL_BIN_DIR} COMPONENT Runtime)
-+# ENDIF (NOT WIN32)
-
-- ENDFOREACH(qtlib)
--ENDIF(NOT Q_WS_MAC)
-+# ENDFOREACH(qtlib)
-+#ENDIF(NOT Q_WS_MAC)
-
- # Hard-coded install rules for anything left to install. These should
- # probably go to a local cmake file. Change to match the build system's
-diff -Naur ParaView3/Applications/StreamingParaView/CMakeLists.txt ParaView3.new/Applications/StreamingParaView/CMakeLists.txt
---- ParaView3/Applications/StreamingParaView/CMakeLists.txt 2009-03-04 09:24:27.000000000 -0500
-+++ ParaView3.new/Applications/StreamingParaView/CMakeLists.txt 2010-01-14 18:44:44.000000000 -0500
-@@ -198,26 +198,26 @@
- SET (QTLIBLIST ${QTLIBLIST} QTASSISTANT)
- ENDIF (WIN32)
-
--IF(NOT Q_WS_MAC)
-- FOREACH(qtlib ${QTLIBLIST})
-- IF (NOT WIN32)
-- #INSTALL(FILES ${QT_${qtlib}_LIBRARY_RELEASE} DESTINATION ${PV_INSTALL_LIB_DIR})
-- GET_FILENAME_COMPONENT(QT_LIB_DIR_tmp ${QT_${qtlib}_LIBRARY_RELEASE} PATH)
-- GET_FILENAME_COMPONENT(QT_LIB_NAME_tmp ${QT_${qtlib}_LIBRARY_RELEASE} NAME)
-- FILE(GLOB QT_LIB_LIST RELATIVE ${QT_LIB_DIR_tmp} "${QT_${qtlib}_LIBRARY_RELEASE}*")
-- INSTALL(CODE "
--MESSAGE(STATUS \"Installing \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR}/${QT_LIB_NAME_tmp}\")
--EXECUTE_PROCESS (WORKING_DIRECTORY ${QT_LIB_DIR_tmp}
-- COMMAND tar c ${QT_LIB_LIST}
-- COMMAND tar -xC \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR})
-- " COMPONENT Runtime)
-- ELSE (NOT WIN32)
-- GET_FILENAME_COMPONENT(QT_DLL_PATH_tmp ${QT_QMAKE_EXECUTABLE} PATH)
-- INSTALL(FILES ${QT_DLL_PATH_tmp}/${qtlib}4.dll DESTINATION ${PV_INSTALL_BIN_DIR} COMPONENT Runtime)
-- ENDIF (NOT WIN32)
-+#IF(NOT Q_WS_MAC)
-+# FOREACH(qtlib ${QTLIBLIST})
-+# IF (NOT WIN32)
-+# #INSTALL(FILES ${QT_${qtlib}_LIBRARY_RELEASE} DESTINATION ${PV_INSTALL_LIB_DIR})
-+# GET_FILENAME_COMPONENT(QT_LIB_DIR_tmp ${QT_${qtlib}_LIBRARY_RELEASE} PATH)
-+# GET_FILENAME_COMPONENT(QT_LIB_NAME_tmp ${QT_${qtlib}_LIBRARY_RELEASE} NAME)
-+# FILE(GLOB QT_LIB_LIST RELATIVE ${QT_LIB_DIR_tmp} "${QT_${qtlib}_LIBRARY_RELEASE}*")
-+# INSTALL(CODE "
-+#MESSAGE(STATUS \"Installing \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR}/${QT_LIB_NAME_tmp}\")
-+#EXECUTE_PROCESS (WORKING_DIRECTORY ${QT_LIB_DIR_tmp}
-+# COMMAND tar c ${QT_LIB_LIST}
-+# COMMAND tar -xC \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR})
-+# " COMPONENT Runtime)
-+# ELSE (NOT WIN32)
-+# GET_FILENAME_COMPONENT(QT_DLL_PATH_tmp ${QT_QMAKE_EXECUTABLE} PATH)
-+# INSTALL(FILES ${QT_DLL_PATH_tmp}/${qtlib}4.dll DESTINATION ${PV_INSTALL_BIN_DIR} COMPONENT Runtime)
-+# ENDIF (NOT WIN32)
-
-- ENDFOREACH(qtlib)
--ENDIF(NOT Q_WS_MAC)
-+# ENDFOREACH(qtlib)
-+#ENDIF(NOT Q_WS_MAC)
-
- # Hard-coded install rules for anything left to install. These should
- # probably go to a local cmake file. Change to match the build system's
diff --git a/sci-visualization/paraview/files/paraview-3.98.0-gcc-4.7.patch b/sci-visualization/paraview/files/paraview-3.98.0-gcc-4.7.patch
new file mode 100644
index 000000000000..1b941cfa9431
--- /dev/null
+++ b/sci-visualization/paraview/files/paraview-3.98.0-gcc-4.7.patch
@@ -0,0 +1,28 @@
+Description: fix FTBFS with gcc-4.7
+Author: Mathieu Malaterre <malat@debian.org>
+Origin: http://anonscm.debian.org/gitweb/?p=collab-maint/vtk.git;a=commitdiff;h=428e763c995bb303805e07da70c1a34fc103d208
+Reviewed-by: Anton Gladky <gladky.anton@gmail.com>
+Last-Update: 2012-05-08
+
+--- a/VTK/Rendering/FreeType/vtkFreeTypeTools.cxx
++++ b/VTK/Rendering/FreeType/vtkFreeTypeTools.cxx
+@@ -35,6 +35,8 @@
+ using namespace ftgl;
+ #endif
+
++#include <stdint.h>
++
+ // Print debug info
+ #define VTK_FTFC_DEBUG 0
+ #define VTK_FTFC_DEBUG_CD 0
+--- a/VTK/Rendering/FreeType/vtkFreeTypeUtilities.cxx
++++ b/VTK/Rendering/FreeType/vtkFreeTypeUtilities.cxx
+@@ -36,6 +36,8 @@
+ using namespace ftgl;
+ #endif
+
++#include <stdint.h>
++
+ // Print debug info
+
+ #define VTK_FTFC_DEBUG 0
diff --git a/sci-visualization/paraview/files/paraview-3.98.0-mpi4py.patch b/sci-visualization/paraview/files/paraview-3.98.0-mpi4py.patch
new file mode 100644
index 000000000000..7017694a2770
--- /dev/null
+++ b/sci-visualization/paraview/files/paraview-3.98.0-mpi4py.patch
@@ -0,0 +1,12 @@
+disable internal mpi4py copy
+
+--- ParaView-3.98.0-src/CMakeLists.txt
++++ ParaView-3.98.0-src/CMakeLists.txt
+@@ -555,7 +555,6 @@
+
+ add_subdirectory(CommandLineExecutables)
+ add_subdirectory(Applications)
+-add_subdirectory(Utilities/mpi4py)
+
+ #------------------------------------------------------------------------------
+ # We add a mechanism to incorporate arbitrary install rules into the
diff --git a/sci-visualization/paraview/files/paraview-3.98.0-pvblot.patch b/sci-visualization/paraview/files/paraview-3.98.0-pvblot.patch
new file mode 100644
index 000000000000..9fe24e174652
--- /dev/null
+++ b/sci-visualization/paraview/files/paraview-3.98.0-pvblot.patch
@@ -0,0 +1,55 @@
+From 970710b6b57a14762881a83c2e20d0db067fd1b4 Mon Sep 17 00:00:00 2001
+From: Nikhil Shetty <nikhil.shetty@kitware.com>
+Date: Tue, 11 Dec 2012 15:56:16 -0500
+Subject: [PATCH] BUGFIX: Fixing cmake error configuring pvblot plugin
+
+- There are duplicate configure step below in the CMakeLists.txt
+file.
+- One with the ${EXECUTABLE_OUTPUT_PATH} is unpredictable and deleted.
+- One with ${ParaView_BINARY_DIR} is preferred.
+- Also there was a small bug with the $script_ext variable.
+- $script_exe should actuall be $script_ext
+
+Change-Id: Ice9419ea80e5be9b8506900ebdf9e40174055d51
+---
+ Plugins/pvblot/CMakeLists.txt | 13 +++----------
+ 1 files changed, 3 insertions(+), 10 deletions(-)
+
+diff --git a/Plugins/pvblot/CMakeLists.txt b/Plugins/pvblot/CMakeLists.txt
+index 5b1120d..29a3924 100644
+--- a/Plugins/pvblot/CMakeLists.txt
++++ b/Plugins/pvblot/CMakeLists.txt
+@@ -69,18 +69,11 @@ ENDIF (PARAVIEW_BUILD_QT_GUI)
+ GET_TARGET_PROPERTY(PVBLOT_PVPYTHON_EXECUTABLE pvpython LOCATION)
+ SET(PVBLOT_BLOTISH_PATH "${CMAKE_CURRENT_SOURCE_DIR}")
+
+-SET(script_extension)
++SET(script_ext)
+ IF(WIN32 AND NOT CYGWIN)
+ SET(script_ext ".bat")
+ ENDIF(WIN32 AND NOT CYGWIN)
+
+-CONFIGURE_FILE(
+- "${CMAKE_CURRENT_SOURCE_DIR}/pvblot${script_exe}.in"
+- "${EXECUTABLE_OUTPUT_PATH}/pvblot${script_exe}"
+- @ONLY
+- )
+-
+-
+ #############################################################################
+ # Set up pvblot script for when ParaView is installed. This includes
+ # installing the Python source files.
+@@ -94,8 +87,8 @@ SET(PVBLOT_BLOTISH_PATH "${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR}")
+
+
+ CONFIGURE_FILE(
+- "${CMAKE_CURRENT_SOURCE_DIR}/pvblot${script_exe}.in"
+- "${ParaView_BINARY_DIR}/CMake/tmp/pvblot${script_exe}"
++ "${CMAKE_CURRENT_SOURCE_DIR}/pvblot${script_ext}.in"
++ "${ParaView_BINARY_DIR}/CMake/tmp/pvblot${script_ext}"
+ @ONLY
+ )
+
+--
+1.7.0
+
diff --git a/sci-visualization/paraview/files/paraview-3.98.0-removesqlite.patch b/sci-visualization/paraview/files/paraview-3.98.0-removesqlite.patch
new file mode 100644
index 000000000000..be495b4fbb3a
--- /dev/null
+++ b/sci-visualization/paraview/files/paraview-3.98.0-removesqlite.patch
@@ -0,0 +1,517 @@
+Description: Import patch from VTK to remove sqlite
+Author: Mathieu Malaterre <mathieu.malaterre@gmail.com>
+Last-Update: Mon Feb 11 14:58:03 UTC 2013
+
+remove the internal copy of sqlite (vtksqlite)
+http://patch-tracker.debian.org/patch/series/view/paraview/3.14.1-7/removesqlite.patch
+
+--- VTK/IO/SQL/vtkSQLiteDatabase.cxx
++++ VTK/IO/SQL/vtkSQLiteDatabase.cxx
+@@ -29,7 +29,7 @@
+ #include <vtksys/ios/fstream>
+ #include <vtksys/ios/sstream>
+
+-#include <vtksqlite/vtk_sqlite3.h>
++#include <sqlite3.h>
+
+ vtkStandardNewMacro(vtkSQLiteDatabase);
+
+@@ -307,15 +307,15 @@
+ }
+ }
+
+- int result = vtk_sqlite3_open(this->DatabaseFileName, & (this->SQLiteInstance));
++ int result = sqlite3_open(this->DatabaseFileName, & (this->SQLiteInstance));
+
+- if (result != VTK_SQLITE_OK)
++ if (result != SQLITE_OK)
+ {
+ vtkDebugMacro(<<"SQLite open() failed. Error code is "
+ << result << " and message is "
+- << vtk_sqlite3_errmsg(this->SQLiteInstance) );
++ << sqlite3_errmsg(this->SQLiteInstance) );
+
+- vtk_sqlite3_close(this->SQLiteInstance);
++ sqlite3_close(this->SQLiteInstance);
+ return false;
+ }
+ else
+@@ -334,8 +334,8 @@
+ }
+ else
+ {
+- int result = vtk_sqlite3_close(this->SQLiteInstance);
+- if (result != VTK_SQLITE_OK)
++ int result = sqlite3_close(this->SQLiteInstance);
++ if (result != SQLITE_OK)
+ {
+ vtkWarningMacro(<< "Close(): SQLite returned result code " << result);
+ }
+@@ -374,7 +374,7 @@
+ if (!status)
+ {
+ vtkErrorMacro(<< "GetTables(): Database returned error: "
+- << vtk_sqlite3_errmsg(this->SQLiteInstance) );
++ << sqlite3_errmsg(this->SQLiteInstance) );
+ query->Delete();
+ return this->Tables;
+ }
+@@ -403,7 +403,7 @@
+ if (!status)
+ {
+ vtkErrorMacro(<< "GetRecord(" << table << "): Database returned error: "
+- << vtk_sqlite3_errmsg(this->SQLiteInstance) );
++ << sqlite3_errmsg(this->SQLiteInstance) );
+ query->Delete();
+ return NULL;
+ }
+@@ -467,10 +467,10 @@
+ // ----------------------------------------------------------------------
+ bool vtkSQLiteDatabase::HasError()
+ {
+- return (vtk_sqlite3_errcode(this->SQLiteInstance)!=VTK_SQLITE_OK);
++ return (sqlite3_errcode(this->SQLiteInstance)!=SQLITE_OK);
+ }
+
+ const char* vtkSQLiteDatabase::GetLastErrorText()
+ {
+- return vtk_sqlite3_errmsg(this->SQLiteInstance);
++ return sqlite3_errmsg(this->SQLiteInstance);
+ }
+--- VTK/IO/SQL/vtkSQLiteQuery.cxx
++++ VTK/IO/SQL/vtkSQLiteQuery.cxx
+@@ -25,7 +25,7 @@
+ #include "vtkVariant.h"
+ #include "vtkVariantArray.h"
+
+-#include <vtksqlite/vtk_sqlite3.h>
++#include <sqlite3.h>
+
+ #include <assert.h>
+
+@@ -43,7 +43,7 @@
+ {
+ this->Statement = NULL;
+ this->InitialFetch = true;
+- this->InitialFetchResult=VTK_SQLITE_DONE;
++ this->InitialFetchResult=SQLITE_DONE;
+ this->LastErrorText = NULL;
+ this->TransactionInProgress = false;
+ }
+@@ -61,7 +61,7 @@
+ {
+ if (this->Database != NULL)
+ {
+- vtk_sqlite3_finalize(this->Statement);
++ sqlite3_finalize(this->Statement);
+ this->Statement = NULL;
+ }
+ }
+@@ -131,8 +131,8 @@
+ if (this->Statement)
+ {
+ vtkDebugMacro(<<"Finalizing old statement");
+- int finalizeStatus = vtk_sqlite3_finalize(this->Statement);
+- if (finalizeStatus != VTK_SQLITE_OK)
++ int finalizeStatus = sqlite3_finalize(this->Statement);
++ if (finalizeStatus != SQLITE_OK)
+ {
+ vtkWarningMacro(<<"SetQuery(): Finalize returned unexpected code "
+ << finalizeStatus);
+@@ -151,19 +151,19 @@
+ return false;
+ }
+
+- vtk_sqlite3 *db = dbContainer->SQLiteInstance;
++ sqlite3 *db = dbContainer->SQLiteInstance;
+ const char *unused_statement;
+
+- int prepareStatus = vtk_sqlite3_prepare_v2(db,
++ int prepareStatus = sqlite3_prepare_v2(db,
+ this->Query,
+ static_cast<int>(strlen(this->Query)),
+ &this->Statement,
+ &unused_statement);
+
+- if (prepareStatus != VTK_SQLITE_OK)
++ if (prepareStatus != SQLITE_OK)
+ {
+- this->SetLastErrorText(vtk_sqlite3_errmsg(db));
+- vtkWarningMacro(<<"SetQuery(): vtk_sqlite3_prepare_v2() failed with error message "
++ this->SetLastErrorText(sqlite3_errmsg(db));
++ vtkWarningMacro(<<"SetQuery(): sqlite3_prepare_v2() failed with error message "
+ << this->GetLastErrorText()
+ << " on statement: '"
+ << this->Query << "'");
+@@ -194,31 +194,31 @@
+ }
+ else
+ {
+- vtk_sqlite3_reset(this->Statement);
++ sqlite3_reset(this->Statement);
+ }
+
+ vtkDebugMacro(<<"Execute(): Query ready to execute.");
+
+ this->InitialFetch = true;
+- int result = vtk_sqlite3_step(this->Statement);
++ int result = sqlite3_step(this->Statement);
+ this->InitialFetchResult = result;
+
+- if (result == VTK_SQLITE_DONE)
++ if (result == SQLITE_DONE)
+ {
+ this->SetLastErrorText(NULL);
+ this->Active = true;
+ return true;
+ }
+- else if (result != VTK_SQLITE_ROW)
++ else if (result != SQLITE_ROW)
+ {
+ vtkSQLiteDatabase *dbContainer =
+ vtkSQLiteDatabase::SafeDownCast(this->Database);
+ assert(dbContainer != NULL);
+
+- vtk_sqlite3 *db = dbContainer->SQLiteInstance;
++ sqlite3 *db = dbContainer->SQLiteInstance;
+
+- this->SetLastErrorText(vtk_sqlite3_errmsg(db));
+- vtkDebugMacro(<< "Execute(): vtk_sqlite3_step() returned error message "
++ this->SetLastErrorText(sqlite3_errmsg(db));
++ vtkDebugMacro(<< "Execute(): sqlite3_step() returned error message "
+ << this->GetLastErrorText());
+ this->Active = false;
+ return false;
+@@ -239,7 +239,7 @@
+ }
+ else
+ {
+- return vtk_sqlite3_column_count(this->Statement);
++ return sqlite3_column_count(this->Statement);
+ }
+ }
+
+@@ -259,7 +259,7 @@
+ }
+ else
+ {
+- return vtk_sqlite3_column_name(this->Statement, column);
++ return sqlite3_column_name(this->Statement, column);
+ }
+ }
+
+@@ -279,22 +279,22 @@
+ }
+ else
+ {
+- switch (vtk_sqlite3_column_type(this->Statement, column))
++ switch (sqlite3_column_type(this->Statement, column))
+ {
+- case VTK_SQLITE_INTEGER:
++ case SQLITE_INTEGER:
+ return VTK_INT;
+- case VTK_SQLITE_FLOAT:
++ case SQLITE_FLOAT:
+ return VTK_FLOAT;
+- case VTK_SQLITE_TEXT:
++ case SQLITE_TEXT:
+ return VTK_STRING;
+- case VTK_SQLITE_BLOB:
++ case SQLITE_BLOB:
+ return VTK_STRING; // until we have a BLOB type of our own
+- case VTK_SQLITE_NULL:
++ case SQLITE_NULL:
+ return VTK_VOID; // ??? what makes sense here?
+ default:
+ {
+ vtkErrorMacro(<<"GetFieldType(): Unknown data type "
+- << vtk_sqlite3_column_type(this->Statement, column)
++ << sqlite3_column_type(this->Statement, column)
+ <<" from SQLite.");
+ return VTK_VOID;
+ }
+@@ -315,7 +315,7 @@
+ {
+ vtkDebugMacro(<<"NextRow(): Initial fetch being handled.");
+ this->InitialFetch = false;
+- if (this->InitialFetchResult == VTK_SQLITE_DONE)
++ if (this->InitialFetchResult == SQLITE_DONE)
+ {
+ return false;
+ }
+@@ -326,12 +326,12 @@
+ }
+ else
+ {
+- int result = vtk_sqlite3_step(this->Statement);
+- if (result == VTK_SQLITE_DONE)
++ int result = sqlite3_step(this->Statement);
++ if (result == SQLITE_DONE)
+ {
+ return false;
+ }
+- else if (result == VTK_SQLITE_ROW)
++ else if (result == SQLITE_ROW)
+ {
+ return true;
+ }
+@@ -339,8 +339,8 @@
+ {
+ vtkSQLiteDatabase *dbContainer = vtkSQLiteDatabase::SafeDownCast( this->Database );
+ assert(dbContainer != NULL);
+- vtk_sqlite3 *db = dbContainer->SQLiteInstance;
+- this->SetLastErrorText(vtk_sqlite3_errmsg(db));
++ sqlite3 *db = dbContainer->SQLiteInstance;
++ this->SetLastErrorText(sqlite3_errmsg(db));
+ vtkErrorMacro(<<"NextRow(): Database returned error code "
+ << result << " with the following message: "
+ << this->GetLastErrorText());
+@@ -366,33 +366,33 @@
+ }
+ else
+ {
+- switch (vtk_sqlite3_column_type(this->Statement, column))
++ switch (sqlite3_column_type(this->Statement, column))
+ {
+- case VTK_SQLITE_INTEGER:
+- return vtkVariant(vtk_sqlite3_column_int(this->Statement, column));
++ case SQLITE_INTEGER:
++ return vtkVariant(sqlite3_column_int(this->Statement, column));
+
+- case VTK_SQLITE_FLOAT:
+- return vtkVariant(vtk_sqlite3_column_double(this->Statement, column));
++ case SQLITE_FLOAT:
++ return vtkVariant(sqlite3_column_double(this->Statement, column));
+
+- case VTK_SQLITE_TEXT:
++ case SQLITE_TEXT:
+ {
+ vtksys_ios::ostringstream str;
+- str << vtk_sqlite3_column_text(this->Statement, column);
++ str << sqlite3_column_text(this->Statement, column);
+ return vtkVariant(vtkStdString(str.str()));
+ }
+
+- case VTK_SQLITE_BLOB:
++ case SQLITE_BLOB:
+ {
+ // This is a hack ... by passing the BLOB to vtkStdString with an explicit
+ // byte count, we ensure that the string will store all of the BLOB's bytes,
+ // even if there are NULL values.
+
+ return vtkVariant(vtkStdString(
+- static_cast<const char*>(vtk_sqlite3_column_blob(this->Statement, column)),
+- vtk_sqlite3_column_bytes(this->Statement, column)));
++ static_cast<const char*>(sqlite3_column_blob(this->Statement, column)),
++ sqlite3_column_bytes(this->Statement, column)));
+ }
+
+- case VTK_SQLITE_NULL:
++ case SQLITE_NULL:
+ default:
+ return vtkVariant();
+ }
+@@ -423,11 +423,11 @@
+ vtkSQLiteDatabase *dbContainer = vtkSQLiteDatabase::SafeDownCast( this->Database );
+ assert(dbContainer != NULL);
+
+- vtk_sqlite3 *db = dbContainer->SQLiteInstance;
++ sqlite3 *db = dbContainer->SQLiteInstance;
+ char *errorMessage = NULL;
+- int result = vtk_sqlite3_exec(db, BEGIN_TRANSACTION, NULL, NULL, &errorMessage);
++ int result = sqlite3_exec(db, BEGIN_TRANSACTION, NULL, NULL, &errorMessage);
+
+- if (result == VTK_SQLITE_OK)
++ if (result == SQLITE_OK)
+ {
+ this->TransactionInProgress = true;
+ this->SetLastErrorText(NULL);
+@@ -451,7 +451,7 @@
+ {
+ if (this->Statement)
+ {
+- vtk_sqlite3_finalize(this->Statement);
++ sqlite3_finalize(this->Statement);
+ this->Statement = NULL;
+ }
+
+@@ -463,11 +463,11 @@
+
+ vtkSQLiteDatabase *dbContainer = vtkSQLiteDatabase::SafeDownCast( this->Database );
+ assert(dbContainer != NULL);
+- vtk_sqlite3 *db = dbContainer->SQLiteInstance;
++ sqlite3 *db = dbContainer->SQLiteInstance;
+ char *errorMessage = NULL;
+- int result = vtk_sqlite3_exec(db, COMMIT_TRANSACTION, NULL, NULL, &errorMessage);
++ int result = sqlite3_exec(db, COMMIT_TRANSACTION, NULL, NULL, &errorMessage);
+
+- if (result == VTK_SQLITE_OK)
++ if (result == SQLITE_OK)
+ {
+ this->TransactionInProgress = false;
+ this->SetLastErrorText(NULL);
+@@ -499,11 +499,11 @@
+
+ vtkSQLiteDatabase *dbContainer = vtkSQLiteDatabase::SafeDownCast( this->Database );
+ assert(dbContainer != NULL);
+- vtk_sqlite3 *db = dbContainer->SQLiteInstance;
++ sqlite3 *db = dbContainer->SQLiteInstance;
+ char *errorMessage = NULL;
+- int result = vtk_sqlite3_exec(db, ROLLBACK_TRANSACTION, NULL, NULL, &errorMessage);
++ int result = sqlite3_exec(db, ROLLBACK_TRANSACTION, NULL, NULL, &errorMessage);
+
+- if (result == VTK_SQLITE_OK)
++ if (result == SQLITE_OK)
+ {
+ this->TransactionInProgress = false;
+ this->SetLastErrorText(NULL);
+@@ -647,11 +647,11 @@
+ if (this->Active)
+ {
+ this->Active = false;
+- vtk_sqlite3_reset(this->Statement);
++ sqlite3_reset(this->Statement);
+ }
+- int status = vtk_sqlite3_bind_int(this->Statement, index+1, value);
++ int status = sqlite3_bind_int(this->Statement, index+1, value);
+
+- if (status != VTK_SQLITE_OK)
++ if (status != SQLITE_OK)
+ {
+ vtksys_ios::ostringstream errormessage;
+ errormessage << "sqlite_bind_int returned error: " << status;
+@@ -676,11 +676,11 @@
+ if (this->Active)
+ {
+ this->Active = false;
+- vtk_sqlite3_reset(this->Statement);
++ sqlite3_reset(this->Statement);
+ }
+- int status = vtk_sqlite3_bind_int(this->Statement, index+1, static_cast<vtk_sqlite_int64>(value));
++ int status = sqlite3_bind_int(this->Statement, index+1, static_cast<sqlite_int64>(value));
+
+- if (status != VTK_SQLITE_OK)
++ if (status != SQLITE_OK)
+ {
+ vtksys_ios::ostringstream errormessage;
+ errormessage << "sqlite_bind_int64 returned error: " << status;
+@@ -705,12 +705,12 @@
+ if (this->Active)
+ {
+ this->Active = false;
+- vtk_sqlite3_reset(this->Statement);
++ sqlite3_reset(this->Statement);
+ }
+
+- int status = vtk_sqlite3_bind_double(this->Statement, index+1, value);
++ int status = sqlite3_bind_double(this->Statement, index+1, value);
+
+- if (status != VTK_SQLITE_OK)
++ if (status != SQLITE_OK)
+ {
+ vtksys_ios::ostringstream errormessage;
+ errormessage << "sqlite_bind_double returned error: " << status;
+@@ -734,12 +734,12 @@
+ if (this->Active)
+ {
+ this->Active = false;
+- vtk_sqlite3_reset(this->Statement);
++ sqlite3_reset(this->Statement);
+ }
+
+- int status = vtk_sqlite3_bind_text(this->Statement, index+1, value, length, VTK_SQLITE_TRANSIENT);
++ int status = sqlite3_bind_text(this->Statement, index+1, value, length, SQLITE_TRANSIENT);
+
+- if (status != VTK_SQLITE_OK)
++ if (status != SQLITE_OK)
+ {
+ vtksys_ios::ostringstream errormessage;
+ errormessage << "sqlite_bind_text returned error: " << status;
+@@ -763,17 +763,17 @@
+ if (this->Active)
+ {
+ this->Active = false;
+- vtk_sqlite3_reset(this->Statement);
++ sqlite3_reset(this->Statement);
+ }
+
+ int status =
+- vtk_sqlite3_bind_blob(this->Statement,
++ sqlite3_bind_blob(this->Statement,
+ index+1,
+ data,
+ length,
+- VTK_SQLITE_TRANSIENT);
++ SQLITE_TRANSIENT);
+
+- if (status != VTK_SQLITE_OK)
++ if (status != SQLITE_OK)
+ {
+ vtksys_ios::ostringstream errormessage;
+ errormessage << "sqlite_bind_blob returned error: " << status;
+@@ -797,12 +797,12 @@
+ if (this->Active)
+ {
+ this->Active = false;
+- vtk_sqlite3_reset(this->Statement);
++ sqlite3_reset(this->Statement);
+ }
+
+- int status = vtk_sqlite3_clear_bindings(this->Statement);
++ int status = sqlite3_clear_bindings(this->Statement);
+
+- if (status != VTK_SQLITE_OK)
++ if (status != SQLITE_OK)
+ {
+ vtksys_ios::ostringstream errormessage;
+ errormessage << "sqlite_clear_bindings returned error: " << status;
+--- VTK/IO/SQL/vtkSQLiteDatabase.h
++++ VTK/IO/SQL/vtkSQLiteDatabase.h
+@@ -49,7 +49,7 @@
+ class vtkSQLQuery;
+ class vtkSQLiteQuery;
+ class vtkStringArray;
+-struct vtk_sqlite3;
++struct sqlite3;
+
+ class VTKIOSQL_EXPORT vtkSQLiteDatabase : public vtkSQLDatabase
+ {
+@@ -147,7 +147,7 @@
+ virtual bool ParseURL(const char* url);
+
+ private:
+- vtk_sqlite3 *SQLiteInstance;
++ sqlite3 *SQLiteInstance;
+
+ // We want this to be private, a user of this class
+ // should not be setting this for any reason
+--- VTK/IO/SQL/vtkSQLiteQuery.h
++++ VTK/IO/SQL/vtkSQLiteQuery.h
+@@ -47,7 +47,7 @@
+ class vtkSQLiteDatabase;
+ class vtkVariant;
+ class vtkVariantArray;
+-struct vtk_sqlite3_stmt;
++struct sqlite3_stmt;
+
+ class VTKIOSQL_EXPORT vtkSQLiteQuery : public vtkSQLQuery
+ {
+@@ -155,7 +155,7 @@
+ vtkSQLiteQuery(const vtkSQLiteQuery &); // Not implemented.
+ void operator=(const vtkSQLiteQuery &); // Not implemented.
+
+- vtk_sqlite3_stmt *Statement;
++ sqlite3_stmt *Statement;
+ bool InitialFetch;
+ int InitialFetchResult;
+ char *LastErrorText;
+--- VTK/ThirdParty/sqlite/CMakeLists.txt
++++ VTK/ThirdParty/sqlite/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-set(vtksqlite_THIRD_PARTY 1)
+-set(vtksqlite_LIBRARIES vtksqlite)
++#set(vtksqlite_THIRD_PARTY 1)
++set(vtksqlite_LIBRARIES sqlite3)
+ vtk_module_export_info()
+-add_subdirectory(vtksqlite)
++#add_subdirectory(vtksqlite)
diff --git a/sci-visualization/paraview/files/paraview-3.6.2-findcg-cmake.patch b/sci-visualization/paraview/files/paraview-3.98.0-vtk-cg-path.patch
index 3ec474ad9e59..58ddde97d4fb 100644
--- a/sci-visualization/paraview/files/paraview-3.6.2-findcg-cmake.patch
+++ b/sci-visualization/paraview/files/paraview-3.98.0-vtk-cg-path.patch
@@ -1,6 +1,5 @@
-diff -Naur ParaView3/VTK/CMake/FindCg.cmake ParaView3.new/VTK/CMake/FindCg.cmake
---- ParaView3/VTK/CMake/FindCg.cmake 2005-10-04 11:25:51.000000000 -0400
-+++ ParaView3.new/VTK/CMake/FindCg.cmake 2010-01-15 09:39:17.000000000 -0500
+--- ParaView-3.98.0-src/VTK/CMake/FindCg.cmake
++++ ParaView-3.98.0-src/VTK/CMake/FindCg.cmake
@@ -82,6 +82,7 @@
FIND_PROGRAM( CG_COMPILER cgc
/usr/bin
@@ -17,18 +16,20 @@ diff -Naur ParaView3/VTK/CMake/FindCg.cmake ParaView3.new/VTK/CMake/FindCg.cmake
${CG_COMPILER_SUPER_DIR}/include
DOC "The directory where Cg/cg.h resides"
)
-@@ -98,6 +100,7 @@
+@@ -98,6 +100,8 @@
/usr/lib
/usr/local/lib64
/usr/local/lib
++ /opt/nvidia-cg-toolkit/lib64
+ /opt/nvidia-cg-toolkit/lib
${CG_COMPILER_SUPER_DIR}/lib64
${CG_COMPILER_SUPER_DIR}/lib
DOC "The Cg runtime library"
-@@ -108,6 +111,7 @@
+@@ -108,6 +112,8 @@
/usr/lib
/usr/local/lib64
/usr/local/lib
++ /opt/nvidia-cg-toolkit/lib64
+ /opt/nvidia-cg-toolkit/lib
${CG_COMPILER_SUPER_DIR}/lib64
${CG_COMPILER_SUPER_DIR}/lib
diff --git a/sci-visualization/paraview/files/paraview-3.98.0-vtknetcd.patch b/sci-visualization/paraview/files/paraview-3.98.0-vtknetcd.patch
new file mode 100644
index 000000000000..a478b7dfc2d4
--- /dev/null
+++ b/sci-visualization/paraview/files/paraview-3.98.0-vtknetcd.patch
@@ -0,0 +1,79 @@
+adapted from debian patch need to be applied after paraview-3.14.1-removesqlite.patch
+
+--- ParaView-3.98.0-src/VTK/ThirdParty/netcdf/CMakeLists.txt
++++ ParaView-3.98.0-src/VTK/ThirdParty/netcdf/CMakeLists.txt
+@@ -1,8 +1,8 @@
+-set(vtknetcdf_THIRD_PARTY 1)
+-set(vtknetcdf_LIBRARIES vtkNetCDF vtkNetCDF_cxx)
+-set(vtknetcdf_INCLUDE_DIRS
+- ${vtknetcdf_SOURCE_DIR}/vtknetcdf/include
+- ${vtknetcdf_BINARY_DIR}/vtknetcdf
+- )
++#set(vtknetcdf_THIRD_PARTY 1)
++set(vtknetcdf_LIBRARIES netcdf netcdf_c++)
++#set(vtknetcdf_INCLUDE_DIRS
++# ${vtknetcdf_SOURCE_DIR}/vtknetcdf/include
++# ${vtknetcdf_BINARY_DIR}/vtknetcdf
++# )
+ vtk_module_export_info()
+-add_subdirectory(vtknetcdf)
++#add_subdirectory(vtknetcdf)
+--- ParaView-3.98.0-src/VTK/ThirdParty/netcdf/vtk_netcdf.h
++++ ParaView-3.98.0-src/VTK/ThirdParty/netcdf/vtk_netcdf.h
+@@ -16,6 +16,6 @@
+ #define __vtk_netcdf_h
+
+ /* Use the netcdf library configured for VTK. */
+-#include <vtknetcdf/include/netcdf.h>
++#include <netcdf.h>
+
+ #endif
+--- ParaView-3.98.0-src/VTK/ThirdParty/netcdf/vtk_netcdfcpp.h
++++ ParaView-3.98.0-src/VTK/ThirdParty/netcdf/vtk_netcdfcpp.h
+@@ -16,6 +16,6 @@
+ #define __vtk_netcdfcpp_h
+
+ /* Use the netcdf library configured for VTK. */
+-#include <vtknetcdf/cxx/netcdfcpp.h>
++#include <netcdfcpp.h>
+
+ #endif
+--- ParaView-3.98.0-src/VTK/ThirdParty/exodusII/vtkexodusII/test/CMakeLists.txt
++++ ParaView-3.98.0-src/VTK/ThirdParty/exodusII/vtkexodusII/test/CMakeLists.txt
+@@ -21,7 +21,7 @@
+ )
+
+ add_executable(ExoIICTests ${ExoIICTests})
+-target_link_libraries(ExoIICTests vtkCommon vtkexoIIc vtkNetCDF)
++target_link_libraries(ExoIICTests vtkCommon vtkexoIIc netcdf)
+
+ set(TestsToRun ${ExoIICTests})
+ remove(TestsToRun ExoIICTests.cxx)
+--- ParaView-3.98.0-src/VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt
++++ ParaView-3.98.0-src/VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt
+@@ -241,7 +241,7 @@
+
+
+ VTK_ADD_LIBRARY(vtkexoIIc ${cbind_SRCS})
+-TARGET_LINK_LIBRARIES(vtkexoIIc vtkNetCDF)
++TARGET_LINK_LIBRARIES(vtkexoIIc netcdf)
+
+ IF(NOT VTK_INSTALL_NO_DEVELOPMENT)
+ # INSTALL_FILES(${VTK_INSTALL_INCLUDE_DIR}/vtkexodus2 .h
+--- ParaView-3.98.0-src/VTK/IO/NetCDF/CMakeLists.txt
++++ ParaView-3.98.0-src/VTK/IO/NetCDF/CMakeLists.txt
+@@ -10,5 +10,5 @@
+
+ vtk_module_library(vtkIONetCDF ${Module_SRCS})
+
+-target_link_libraries(vtkIONetCDF vtkNetCDF_cxx)
++target_link_libraries(vtkIONetCDF netcdf netcdf_c++)
+ set_target_properties(vtkIONetCDF PROPERTIES LINK_INTERFACE_LIBRARIES "")
+--- ParaView-3.98.0-src/VTK/IO/ParallelNetCDF/CMakeLists.txt
++++ ParaView-3.98.0-src/VTK/IO/ParallelNetCDF/CMakeLists.txt
+@@ -8,4 +8,4 @@
+
+ vtk_module_library(vtkIOParallelNetCDF ${Module_SRCS})
+
+-target_link_libraries(vtkIOParallelNetCDF vtkNetCDF_cxx)
++target_link_libraries(vtkIOParallelNetCDF netcdf netcdf_c++)
diff --git a/sci-visualization/paraview/files/paraview-3.98.0-xdmf-cstring.patch b/sci-visualization/paraview/files/paraview-3.98.0-xdmf-cstring.patch
new file mode 100644
index 000000000000..665f40ad4fa7
--- /dev/null
+++ b/sci-visualization/paraview/files/paraview-3.98.0-xdmf-cstring.patch
@@ -0,0 +1,12 @@
+gcc header fix
+
+--- ParaView-3.98.0-src/VTK/ThirdParty/xdmf2/vtkxdmf2/libsrc/XdmfObject.h
++++ ParaView-3.98.0-src/VTK/ThirdParty/xdmf2/vtkxdmf2/libsrc/XdmfObject.h
+@@ -82,6 +82,7 @@
+ # ifdef UNIX
+ # include "sys/file.h"
+ # include "strings.h"
++# include <cstring>
+ # define STRCASECMP strcasecmp
+ # define STRNCASECMP strncasecmp
+ # define STRCMP strcmp
diff --git a/sci-visualization/paraview/metadata.xml b/sci-visualization/paraview/metadata.xml
index 15a2b39d26a3..e852a0334c91 100644
--- a/sci-visualization/paraview/metadata.xml
+++ b/sci-visualization/paraview/metadata.xml
@@ -3,11 +3,10 @@
<pkgmetadata>
<herd>sci</herd>
<use>
- <flag name='plugins'>Build and install additional plugins</flag>
<flag name='boost'>Enable the usage of dev-libs/boost</flag>
- <flag name='gui'>Build paraview's gui not just the server</flag>
+ <flag name='coprocessing'>Enable the coprocessing infrastructure which is mainly useful in the context of clusters</flag>
<flag name='cg'>Add support for nvidia's cg shaders</flag>
- <flag name='streaming'>Enable streaming paraview application</flag>
- <flag name='overview'>Enable the OverView plugin framework</flag>
+ <flag name='nvcontrol'>Add NVCONTROL support for OpenGL options</flag>
+ <flag name='plugins'>Build and install additional plugins</flag>
</use>
</pkgmetadata>
diff --git a/sci-visualization/paraview/paraview-3.6.2.ebuild b/sci-visualization/paraview/paraview-3.6.2.ebuild
deleted file mode 100644
index b3faf841fb3f..000000000000
--- a/sci-visualization/paraview/paraview-3.6.2.ebuild
+++ /dev/null
@@ -1,266 +0,0 @@
-# Copyright 1999-2012 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.18 2012/05/06 23:13:07 pesa Exp $
-
-EAPI="3"
-
-PYTHON_DEPEND="python? 2:2.6"
-
-inherit eutils flag-o-matic toolchain-funcs versionator python cmake-utils
-
-MAIN_PV=$(get_major_version)
-MAJOR_PV=$(get_version_component_range 1-2)
-
-DESCRIPTION="ParaView is a powerful scientific data visualization application"
-HOMEPAGE="http://www.paraview.org"
-SRC_URI="mirror://gentoo/${P}.tar.gz
- mirror://gentoo/${P}-openfoam-gpl-r173.patch.bz2
- mirror://gentoo/${P}-openfoam-r173.patch.bz2"
-
-LICENSE="paraview GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
-SLOT="0"
-IUSE="boost cg doc examples +gui mpi mysql plugins +python postgres streaming odbc overview"
-RDEPEND="sci-libs/hdf5[mpi=]
- mpi? ( || (
- sys-cluster/openmpi
- sys-cluster/mpich2[cxx] ) )
- gui? ( x11-libs/qt-gui:4
- x11-libs/qt-qt3support:4
- x11-libs/qt-opengl:4
- || ( >=x11-libs/qt-assistant-4.7.0:4[compat]
- <x11-libs/qt-assistant-4.7.0:4 ) )
- mysql? ( virtual/mysql )
- postgres? ( dev-db/postgresql-base )
- odbc? ( dev-db/unixODBC )
- dev-libs/libxml2:2
- media-libs/libpng
- virtual/jpeg
- media-libs/tiff
- virtual/ffmpeg
- dev-libs/expat
- sys-libs/zlib
- media-libs/freetype
- >=app-admin/eselect-opengl-1.0.6-r1
- virtual/opengl
- sci-libs/netcdf
- x11-libs/libXmu"
-
-DEPEND="${RDEPEND}
- boost? ( >=dev-libs/boost-1.40.0 )
- doc? ( app-doc/doxygen )
- >=dev-util/cmake-2.6.4"
-
-PVLIBDIR="$(get_libdir)/${PN}-${MAJOR_PV}"
-S="${WORKDIR}"/ParaView${MAIN_PV}
-
-pkg_setup() {
- if (use overview) && (! use gui); then
- die "the overview plugin requires the USE='gui'"
- fi
- use python && python_set_active_version 2
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-qt.patch
- epatch "${FILESDIR}"/${P}-findcg-cmake.patch
- epatch "${FILESDIR}"/${P}-assistant.patch
- epatch "${DISTDIR}"/${P}-openfoam-r173.patch.bz2
- epatch "${DISTDIR}"/${P}-openfoam-gpl-r173.patch.bz2
- epatch "${FILESDIR}"/${P}-no-doc-finder.patch
- epatch "${FILESDIR}"/${P}-pointsprite-disable.patch
- epatch "${FILESDIR}"/${P}-about.html.patch
- epatch "${FILESDIR}"/${P}-boost-property_map.patch
- epatch "${FILESDIR}"/${P}-odbc.patch
- epatch "${FILESDIR}"/${P}-h5part.patch
- epatch "${FILESDIR}"/${P}-libpng14.patch
- epatch "${FILESDIR}"/${P}-libpng15.patch
-
- if 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"
-
- # bug 348151
- sed -e 's/CURRENT_VERSION 2.6/CURRENT_VERSION 2.7 2.6/' \
- -i VTK/CMake/FindPythonLibs.cmake || die
-}
-
-src_configure() {
- mycmakeargs=(
- -DPV_INSTALL_LIB_DIR="${PVLIBDIR}"
- -DCMAKE_INSTALL_PREFIX=/usr
- -DEXPAT_INCLUDE_DIR=/usr/include
- -DEXPAT_LIBRARY=/usr/$(get_libdir)/libexpat.so
- -DOPENGL_gl_LIBRARY=/usr/$(get_libdir)/libGL.so
- -DOPENGL_glu_LIBRARY=/usr/$(get_libdir)/libGLU.so
- -DCMAKE_SKIP_RPATH=YES
- -DVTK_USE_RPATH=OFF
- -DBUILD_SHARED_LIBS=ON
- -DVTK_USE_SYSTEM_FREETYPE=ON
- -DVTK_USE_SYSTEM_JPEG=ON
- -DVTK_USE_SYSTEM_PNG=ON
- -DVTK_USE_SYSTEM_TIFF=ON
- -DVTK_USE_SYSTEM_ZLIB=ON
- -DVTK_USE_SYSTEM_EXPAT=ON
- -DPARAVIEW_USE_SYSTEM_HDF5=ON
- -DCMAKE_VERBOSE_MAKEFILE=OFF
- -DCMAKE_COLOR_MAKEFILE=TRUE
- -DVTK_USE_SYSTEM_LIBXML2=ON
- -DVTK_USE_OFFSCREEN=TRUE
- -DCMAKE_USE_PTHREADS=ON
- -DBUILD_TESTING=OFF
- -DVTK_USE_FFMPEG_ENCODER=OFF)
-
- # use flag triggered options
- mycmakeargs+=(
- $(cmake-utils_use gui PARAVIEW_BUILD_QT_GUI)
- $(cmake-utils_use gui VTK_USE_QVTK)
- $(cmake-utils_use gui VTK_USE_QVTK_QTOPENGL)
- $(cmake-utils_use boost VTK_USE_BOOST)
- $(cmake-utils_use mpi PARAVIEW_USE_MPI)
- $(cmake-utils_use python PARAVIEW_ENABLE_PYTHON)
- $(cmake-utils_use doc BUILD_DOCUMENTATION)
- $(cmake-utils_use examples BUILD_EXAMPLES)
- $(cmake-utils_use cg VTK_USE_CG_SHADERS)
- $(cmake-utils_use streaming PARAVIEW_BUILD_StreamingParaView)
- $(cmake-utils_use odbc VTK_USE_ODBC)
- $(cmake-utils_use mysql VTK_USE_MYSQL)
- $(cmake-utils_use mysql XDMF_USE_MYSQL)
- $(cmake-utils_use postgres VTK_USE_POSTGRES))
-
- if use gui; then
- mycmakeargs+=(-DVTK_INSTALL_QT_DIR=/${PVLIBDIR}/plugins/designer)
- fi
-
- # all the logic needed for overview
- # we enable all plugins that are either required by overview
- # or require overview to work
- mycmakeargs+=(
- $(cmake-utils_use overview VTK_USE_N_WAY_ARRAYS)
- $(cmake-utils_use overview PARAVIEW_BUILD_OverView)
- $(cmake-utils_use overview PARAVIEW_BUILD_PLUGIN_ClientGraphView)
- $(cmake-utils_use overview PARAVIEW_BUILD_PLUGIN_ClientGraphViewFrame)
- $(cmake-utils_use overview PARAVIEW_BUILD_PLUGIN_ClientRecordView)
- $(cmake-utils_use overview PARAVIEW_BUILD_PLUGIN_ClientTableView)
- $(cmake-utils_use overview PARAVIEW_BUILD_PLUGIN_ClientTreeView)
- $(cmake-utils_use overview PARAVIEW_BUILD_PLUGIN_Infovis)
- $(cmake-utils_use overview PARAVIEW_BUILD_PLUGIN_SQLDatabaseGraphSourcePanel)
- $(cmake-utils_use overview PARAVIEW_BUILD_PLUGIN_SQLDatabaseTableSourcePanel)
- $(cmake-utils_use overview PARAVIEW_BUILD_PLUGIN_TableToGraphPanel)
- $(cmake-utils_use overview PARAVIEW_BUILD_PLUGIN_Array)
- $(cmake-utils_use overview PARAVIEW_BUILD_PLUGIN_ClientGeoView)
- $(cmake-utils_use overview PARAVIEW_BUILD_PLUGIN_ClientGeoView2D)
- $(cmake-utils_use overview PARAVIEW_BUILD_PLUGIN_ClientGraphViewFrame)
- $(cmake-utils_use overview PARAVIEW_BUILD_PLUGIN_ClientHierarchyView)
- $(cmake-utils_use overview PARAVIEW_BUILD_PLUGIN_CommonToolbar)
- $(cmake-utils_use overview PARAVIEW_BUILD_PLUGIN_GraphLayoutFilterPanel)
- $(cmake-utils_use overview PARAVIEW_BUILD_PLUGIN_SplitTableFieldPanel)
- $(cmake-utils_use overview PARAVIEW_BUILD_PLUGIN_StatisticsToolbar)
- $(cmake-utils_use overview PARAVIEW_BUILD_PLUGIN_TableToSparseArrayPanel)
- $(cmake-utils_use overview PARAVIEW_BUILD_PLUGIN_ThresholdTablePanel))
-
- # the rest of the plugins
- mycmakeargs+=(
- $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_ChartViewFrame)
- $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_ClientAttributeView)
- $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_ClientChartView)
- $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_CosmoFilters)
- $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_H5PartReader)
- $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_Moments)
- $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_PointSprite)
- $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_Prism)
- $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_SLACTools)
- $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_Streaming)
- $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_netCDFReaders))
-
- if use python; then
- mycmakeargs+=($(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_pvblot))
- fi
-
- # we also need to append -DH5Tget_array_dims_vers=1 to our CFLAGS
- # to make sure we can compile against >=hdf5-1.8.3
- append-flags -DH5_USE_16_API
-
- cmake-utils_src_configure
- # overview needs a second configure to pick things up
- use overview && cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
-
- # rename the assistant wrapper
- if use gui; then
- mv "${D}"/usr/bin/assistant "${D}"/usr/bin/paraview-assistant \
- || die "Failed to rename assistant wrapper"
- chmod 0755 "${D}"/usr/${PVLIBDIR}/assistant-real \
- || die "Failed to change permissions on assistant wrapper"
- fi
-
- # since there is no install target for OverView we have to
- # do things manually
- if use overview; then
- exeinto /usr/"${PVLIBDIR}"
- newexe "${CMAKE_BUILD_DIR}"/bin/OverView OverView-real \
- || die "Failed to install OverView binary"
- dolib.so "${CMAKE_BUILD_DIR}"/bin/libOverViewCore.so \
- || die "Failed to install OverViewCore shared object"
-
- insinto /usr/"${PVLIBDIR}"/OverView-startup
- insopts -m0744
- doins "${CMAKE_BUILD_DIR}"/bin/OverView-startup/lib*.so \
- || die "Failed to install OverView libraries"
-
- dosym /usr/"${PVLIBDIR}"/OverView-real /usr/bin/OverView \
- || die "Failed to create OverView symlink"
-
- newicon "${S}"/Applications/OverView/Icon.png overview.png \
- || die "Failed to create OverView icon"
- make_desktop_entry OverView "OverView" overview \
- || die "Failed to install OverView desktop icon"
- fi
-
- # set up the environment
- echo "LDPATH=/usr/${PVLIBDIR}" >> "${T}"/40${PN}
- echo "PYTHONPATH=/usr/${PVLIBDIR}" >> "${T}"/40${PN}
- doenvd "${T}"/40${PN}
-
- # this binary does not work and probably should not be installed
- rm -f "${D}/usr/bin/vtkSMExtractDocumentation" \
- || die "Failed to remove vtkSMExtractDocumentation"
-
- # rename /usr/bin/lproj to /usr/bin/lproj_paraview to avoid
- # a file collision with vtk which installs the same file
- mv "${D}/usr/bin/lproj" "${D}/usr/bin/lproj_paraview" \
- || die "Failed to rename /usr/bin/lproj"
-
- # last but not least lets make a desktop entry
- newicon "${S}"/Applications/Client/ParaViewLogo.png paraview.png \
- || die "Failed to create paraview icon."
- make_desktop_entry paraview "Paraview" paraview \
- || die "Failed to install Paraview desktop entry"
-
-}
-
-pkg_postinst() {
- # with Qt4.5 there seem to be issues reading data files
- # under certain locales. Setting LC_ALL=C should fix these.
- echo
- elog "If you experience data corruption during parsing of"
- elog "data files with paraview please try setting your"
- elog "locale to LC_ALL=C."
- elog "The binary /usr/bin/lproj has been renamed to"
- elog "/usr/bin/lproj_paraview to avoid a file collision"
- elog "with vtk."
- echo
-}
diff --git a/sci-visualization/paraview/paraview-3.98.0.ebuild b/sci-visualization/paraview/paraview-3.98.0.ebuild
new file mode 100644
index 000000000000..53868201424d
--- /dev/null
+++ b/sci-visualization/paraview/paraview-3.98.0.ebuild
@@ -0,0 +1,245 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/paraview-3.98.0.ebuild,v 1.1 2013/02/11 21:29:20 hasufell Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_6 python2_7 )
+inherit eutils multilib versionator python-single-r1 cmake-utils
+
+MAIN_PV=$(get_major_version)
+MAJOR_PV=$(get_version_component_range 1-2)
+MY_P="ParaView-${PV}-src"
+
+DESCRIPTION="ParaView is a powerful scientific data visualization application"
+HOMEPAGE="http://www.paraview.org"
+SRC_URI="http://www.paraview.org/files/v${MAJOR_PV}/${MY_P}.tgz"
+RESTRICT="mirror"
+
+LICENSE="paraview GPL-2"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="boost cg coprocessing doc examples ffmpeg mpi mysql nvcontrol plugins python qt4 sqlite tcl test tk"
+
+RDEPEND="
+ dev-db/sqlite:3
+ dev-libs/expat
+ dev-libs/libxml2:2
+ dev-libs/protobuf
+ media-libs/freetype
+ media-libs/libpng:0
+ media-libs/libtheora
+ media-libs/tiff
+ sci-libs/hdf5[mpi=]
+ ~sci-libs/netcdf-4.1.3[cxx,hdf5]
+ sys-libs/zlib
+ virtual/jpeg
+ virtual/opengl
+ x11-libs/gl2ps
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXmu
+ x11-libs/libXt
+ coprocessing? (
+ plugins? (
+ dev-python/PyQt4
+ x11-libs/qt-gui:4
+ )
+ )
+ ffmpeg? ( virtual/ffmpeg )
+ mpi? ( virtual/mpi[cxx,romio] )
+ mysql? ( virtual/mysql )
+ python? (
+ ${PYTHON_DEPS}
+ dev-python/matplotlib[${PYTHON_USEDEP}]
+ dev-python/numpy[${PYTHON_USEDEP}]
+ dev-python/sip[${PYTHON_USEDEP}]
+ mpi? ( dev-python/mpi4py )
+ qt4? ( dev-python/PyQt4[opengl,webkit,${PYTHON_USEDEP}] )
+ )
+ qt4? (
+ x11-libs/qt-gui:4
+ x11-libs/qt-opengl:4
+ x11-libs/qt-assistant:4[compat]
+ x11-libs/qt-sql:4
+ x11-libs/qt-webkit:4
+ )
+ sqlite? ( dev-db/sqlite )
+ tcl? ( dev-lang/tcl )
+ tk? ( dev-lang/tk )"
+DEPEND="${RDEPEND}
+ boost? ( >=dev-libs/boost-1.40.0[mpi?,${PYTHON_USEDEP}] )
+ doc? ( app-doc/doxygen )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+ PVLIBDIR=$(get_libdir)/${PN}-${MAJOR_PV}
+}
+
+src_prepare() {
+ # see patch headers for description
+ epatch "${FILESDIR}"/${P}-xdmf-cstring.patch \
+ "${FILESDIR}"/${P}-mpi4py.patch \
+ "${FILESDIR}"/${P}-removesqlite.patch \
+ "${FILESDIR}"/${P}-gcc-4.7.patch \
+ "${FILESDIR}"/${P}-vtknetcd.patch \
+ "${FILESDIR}"/${P}-vtk-cg-path.patch \
+ "${FILESDIR}"/${P}-pvblot.patch
+
+ # lib64 fixes
+ sed -i \
+ -e "s:/usr/lib:${EPREFIX}/usr/$(get_libdir):g" \
+ VTK/ThirdParty/xdmf2/vtkxdmf2/libsrc/CMakeLists.txt || die
+ sed -i \
+ -e "s:\/lib\/python:\/$(get_libdir)\/python:g" \
+ VTK/ThirdParty/xdmf2/vtkxdmf2/CMake/setup_install_paths.py || die
+ sed -i \
+ -e "s:lib/paraview-:$(get_libdir)/paraview-:g" \
+ {,Plugins/SciberQuestToolKit/}CMakeLists.txt \
+ ParaViewCore/PythonSupport/vtkPVPythonInterpretor.cxx || die
+
+ # no proper switch
+ use nvcontrol || {
+ sed -i \
+ -e '/VTK_USE_NVCONTROL/s#1#0#' \
+ VTK/Rendering/OpenGL/CMakeLists.txt || die
+ }
+}
+
+src_configure() {
+ # TODO: use system protobuf
+ local mycmakeargs=(
+ -DPV_INSTALL_LIB_DIR="${PVLIBDIR}"
+ -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
+ -DEXPAT_INCLUDE_DIR="${EPREFIX}"/usr/include
+ -DEXPAT_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libexpat.so
+ -DOPENGL_gl_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libGL.so
+ -DOPENGL_glu_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libGLU.so
+ -DBUILD_SHARED_LIBS=ON
+ -DVTK_USE_SYSTEM_EXPAT=ON
+ -DVTK_USE_SYSTEM_FREETYPE=ON
+ -DVTK_USE_SYSTEM_GL2PS=ON
+ -DVTK_USE_SYSTEM_HDF5=ON
+ -DVTK_USE_SYSTEM_JPEG=ON
+ -DVTK_USE_SYSTEM_LIBXML2=ON
+ -DVTK_USE_SYSTEM_OGGTHEORA=ON
+ -DVTK_USE_SYSTEM_PNG=ON
+ -DVTK_USE_SYSTEM_PROTOBUF=OFF
+ -DVTK_USE_SYSTEM_TIFF=ON
+ -DVTK_USE_SYSTEM_XDMF2=OFF
+ -DVTK_USE_SYSTEM_ZLIB=ON
+ -DCMAKE_VERBOSE_MAKEFILE=ON
+ -DCMAKE_COLOR_MAKEFILE=TRUE
+ -DVTK_USE_OFFSCREEN=TRUE
+ -DCMAKE_USE_PTHREADS=ON
+ -DVTK_USE_FFMPEG_ENCODER=OFF
+ -DPROTOC_LOCATION=$(type -P protoc)
+ -DVTK_Group_StandAlone=ON
+ )
+
+ # TODO: XDMF_USE_MYSQL?
+ mycmakeargs+=(
+ $(cmake-utils_use qt4 PARAVIEW_BUILD_QT_GUI)
+ $(cmake-utils_use qt4 Module_vtkGUISupportQtOpenGL)
+ $(cmake-utils_use qt4 Module_vtkGUISupportQtSQL)
+ $(cmake-utils_use qt4 Module_vtkGUISupportQtWebkit)
+ $(cmake-utils_use qt4 Module_vtkRenderingQt)
+ $(cmake-utils_use qt4 Module_vtkViewsQt)
+ $(cmake-utils_use qt4 VTK_Group_ParaViewQt)
+ $(cmake-utils_use qt4 VTK_Group_Qt)
+ $(cmake-utils_use boost Module_vtkInfovisBoost)
+ $(cmake-utils_use boost Module_vtkInfovisBoostGraphAlg)
+ $(cmake-utils_use mpi PARAVIEW_USE_MPI)
+ $(cmake-utils_use mpi PARAVIEW_USE_MPI_SSEND)
+ $(cmake-utils_use mpi PARAVIEW_USE_ICE_T)
+ $(cmake-utils_use mpi VTK_Group_MPI)
+ $(cmake-utils_use mpi VTK_XDMF_USE_MPI)
+ $(cmake-utils_use mpi XDMF_BUILD_MPI)
+ $(cmake-utils_use python PARAVIEW_ENABLE_PYTHON)
+ $(cmake-utils_use python VTK_Group_ParaViewPython)
+ $(cmake-utils_use python XDMF_WRAP_PYTHON)
+ $(cmake-utils_use python Module_pqPython)
+ $(cmake-utils_use python Module_vtkWrappingPython)
+ $(cmake-utils_use python Module_vtkPVPythonSupport)
+ $(cmake-utils_use doc BUILD_DOCUMENTATION)
+ $(cmake-utils_use examples BUILD_EXAMPLES)
+ $(cmake-utils_use cg VTK_USE_CG_SHADERS)
+ $(cmake-utils_use mysql Module_vtkIOMySQL)
+ $(cmake-utils_use sqlite Module_vtksqlite)
+ $(cmake-utils_use coprocessing PARAVIEW_ENABLE_COPROCESSING)
+ $(cmake-utils_use coprocessing VTK_Group_CoProcessing)
+ $(cmake-utils_use ffmpeg PARAVIEW_ENABLE_FFMPEG)
+ $(cmake-utils_use ffmpeg VTK_USE_FFMPEG_ENCODER)
+ $(cmake-utils_use ffmpeg Module_vtkIOFFMPEG)
+ $(cmake-utils_use tk VTK_Group_Tk)
+ $(cmake-utils_use tk VTK_USE_TK)
+ $(cmake-utils_use tk Module_vtkRenderingTk)
+ $(cmake-utils_use tcl Module_vtkTclTk)
+ $(cmake-utils_use test BUILD_TESTING)
+ )
+
+ if use qt4 ; then
+ mycmakeargs+=( -DVTK_INSTALL_QT_DIR=/${PVLIBDIR}/plugins/designer )
+ if use python ; then
+ # paraview cannot guess sip directory properly
+ mycmakeargs+=( -DSIP_INCLUDE_DIR="${EPREFIX}$(python_get_includedir)" )
+ fi
+ fi
+
+ # TODO: MantaView VaporPlugin VRPlugin
+ mycmakeargs+=(
+ $(cmake-utils_use plugins PARAVIEW_INSTALL_DEVELOPMENT)
+ $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_AdiosReader)
+ $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_AnalyzeNIfTIReaderWriter)
+ $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_ArrowGlyph)
+ $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_EyeDomeLighting)
+ $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_ForceTime)
+ $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_GMVReader)
+ $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_H5PartReader)
+ $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_Moments)
+ $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_NonOrthogonalSource)
+ $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_Pacman)
+ $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_PointSprite)
+ $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_PrismPlugin)
+ $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_QuadView)
+ $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_SLACTools)
+ $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_SciberQuestToolKit)
+ $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_SierraPlotTools)
+ $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_SurfaceLIC)
+ $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_UnvertaintyRendering)
+ )
+
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ cmake-utils_src_compile
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ # set up the environment
+ echo "LDPATH=${EPREFIX}/usr/${PVLIBDIR}" > "${T}"/40${PN}
+ echo "PYTHONPATH="${EPREFIX}"/usr/${PVLIBDIR}:/usr/${PVLIBDIR}/site-packages" >> "${T}"/40${PN}
+ doenvd "${T}"/40${PN}
+
+ newicon "${S}"/Applications/ParaView/pvIcon.png paraview.png
+ make_desktop_entry paraview "Paraview" paraview
+
+ use python && python_optimize "${D}"/usr/$(get_libdir)/${PN}-${MAJOR_PV}
+}
+
+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 "If you plan to use paraview component from an existing shell"
+ elog "you should run env-update and . /etc/profile first"
+ echo
+}