version bump; define GLX_GLXEXT_LEGACY in 4.0.1, bug #528654; do not use -Wl,--fatal-warnings, bug #526464

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xBD3A97A3

8 files changed, 678 insertions, 39 deletions

diff --git a/sci-visualization/paraview/ChangeLog b/sci-visualization/paraview/ChangeLog
index 10b40ca2e4ce..6754ebd938f9 100644
--- a/sci-visualization/paraview/ChangeLog
+++ b/sci-visualization/paraview/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for sci-visualization/paraview
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/ChangeLog,v 1.83 2014/12/20 10:09:26 tamiko Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/ChangeLog,v 1.84 2014/12/21 23:03:05 tamiko Exp $
+
+*paraview-4.2.0 (21 Dec 2014)
+
+  21 Dec 2014; Matthias Maier <tamiko@gentoo.org>
+  +files/paraview-4.1.0-glxext-legacy.patch,
+  +files/paraview-4.1.0-no-fatal-warnings.patch,
+  +files/paraview-4.2.0-Protobuf.patch,
+  +files/paraview-4.2.0-removesqlite.patch, +paraview-4.2.0.ebuild,
+  -paraview-4.0.1.ebuild, paraview-4.1.0-r1.ebuild:
+  version bump; define GLX_GLXEXT_LEGACY in 4.0.1, bug #528654; do not use -Wl
+  ,--fatal-warnings, bug #526464
 
   20 Dec 2014; Matthias Maier <tamiko@gentoo.org> metadata.xml:
   take over maintainership
diff --git a/sci-visualization/paraview/Manifest b/sci-visualization/paraview/Manifest
index db184170ec20..18c913d27e0a 100644
--- a/sci-visualization/paraview/Manifest
+++ b/sci-visualization/paraview/Manifest
@@ -7,27 +7,32 @@ AUX paraview-4.0.1-removesqlite.patch 16403 SHA256 e7fee0cd7e0cd08a4de35451add15
 AUX paraview-4.0.1-vtk-cg-path.patch 1087 SHA256 291e1dd64351dcac5c1595a10f9c83080b073ce91f0bc8e2f463b855d6920645 SHA512 e1a9bb371af3c57e02de4c22c8cad6c0564bc7a85e9fbb2c0784bc610b81216f183983c70d1c7a5c8cbbe35a84577c9987878876b8b78df3bfbc75fef07614a3 WHIRLPOOL e83e0f5e99004b52ff5a0bac0c1446aabcc77f30653a8b26c0c18a78baea99d81ee84d65f88f1b890c457418cc3b234f99cd35d42286a050fd2d9b35f2396d70
 AUX paraview-4.0.1-vtknetcd.patch 2775 SHA256 b972d38d99c43db18c92b5423d06f542eae843028e1f37dff102ea10979dfea1 SHA512 3da1cd798307059e3e4dd3da876da5579384c7fe8c41301b73540f8bc653457186f956505272bb20fafb12d5f756c79ae7c31d8e5b361e0f7f86de2f480ed61b WHIRLPOOL bbf8bba64eeb0d1830f5da7285ea3c848dccf7dbef6e2663bbadea37059d10f89af676e0b44b42f8283193ccbf36895a83981206767d401094dca3113396b544
 AUX paraview-4.0.1-xdmf-cstring.patch 360 SHA256 4505a480b3775d20cde98f724a20c8b0dbf4f3baf6068013bf69b0e54c1f8473 SHA512 5577b7bae26959546795721d712c4e4f6a5403b35c0871040f6c74c07cd3aecd5b03e9f7a07ef49714b8adb4c7cc880385215b8742895006d2ad3dfeccc50472 WHIRLPOOL e0d0c1603ba4ca66fc05dd5049215f2c988f3452763772df35c7fd6a8cb6fa779fd4efbccd20a01f19778f7c0b1db78e0af12716137976ae7bf54923a6bc0642
+AUX paraview-4.1.0-glxext-legacy.patch 407 SHA256 f39570a4188d0d85182c99755da2907396d0d204a934ef7faa2f3f4d7e76ce70 SHA512 a924c1ebc1555896897e74e8daf4a66679015d6a9e208a5296ce7e49bece2946d1b0933d889866391c7c215277d229a1456efcf194261b6ca4aa2bff37ca81df WHIRLPOOL a8b7590c014df2962de59597faab5cca3321a7d4eed0ff00bd9486ee3f590ac38926b37fc1e463e0b4fcb56c258cd845c0177b27941565ddf73b18b429b99f5d
+AUX paraview-4.1.0-no-fatal-warnings.patch 973 SHA256 cdb9183dd44cf4d2fb85c49ba9e916f9ac23e7a32b5b0d238e9cb908c88dae01 SHA512 cf0c06703147c63bd495facc17e9fda9b3c8cf2a3a59ad7144a26903ca82c4870a00a7a8b9178d06368111346de1d7db8a547ddf440c3564923b26385802b43c WHIRLPOOL 193772af2f6602bb87f2c83cd66804adb3651395192cc214c8e2107a3abe5f6e727b6cf8d79554f2a6d8dee7be7006903c000a9981f56118e7e0a6c8d0139bcf
+AUX paraview-4.2.0-Protobuf.patch 1538 SHA256 e695c1ebca585c6e50b73bd67fc0d2e30b3ba7a7d4698a2eb618cdc97d399e08 SHA512 7dab74434864a4857f04ab263ee92466fec7451565be59b31298b2975baa336781c4ca4458ff522e198d39b9e0b398a816b30c2dd037995df7b63a7fae1fa44d WHIRLPOOL c541b07e3cfb2ea97a225dd9617ed9f7a3fd85d6f8d109e5caf55c1a33f4956eaa0e0b48a4c96e9c4490b9023198a90ace7297dfe2855e753b71d05d520cf4fb
+AUX paraview-4.2.0-removesqlite.patch 17104 SHA256 75b5b42450b47469e728dfbe5c2323d27f577c6dfae60b50fb43c066374bf1eb SHA512 a500ac28cca407d35c7dc3f1d9cecc55546afa193bf8f3ab400a82d75316b85e808cd4c9264f0552f22e832db8be868fb83e9ecdc0e18a0ad110624d4ce3a46b WHIRLPOOL d1bc549214704299c52b1745c02d77a64fd85f015ec1528728a217c90fc710fca701a085a9b3ff970263987c34e17fc8c3ddafa327106fcbcc0cc8ed99d25ec4
 DIST ParaView-v4.0.1-source.tgz 47827831 SHA256 1e04fcc085ee0305a163d9b6a66904fbb21e6a3fac69b275395c5ffc106e48e2 SHA512 be27b4c10f4881bcd85bfd81b0671f74358022809837620a0baf59f3c3090a5eb3afc1f78a561a3fcf9d4154875fb393c062c1b428579bc254ac7c1ff7214505 WHIRLPOOL ddac32f4be7d46b43f8f66f51ec7877442fd502fcc19b9864e284762b2cc0f3162f16766ca5c566b7f8201745ed6535cf95651f152a4d4476c2682a6432835c0
 DIST ParaView-v4.1.0-source.tar.gz 50460304 SHA256 80ef898c158d7fd9ceb0bcd83be1f679eef06ce4f20514a2435330cc97a3fdf3 SHA512 da91f7332a91746d60968a9d6cc1fe4878a3710f8e4a3d675dc65c337d6844f39df4c3e307d424ee0d2a832fd3c0f3d0c4da6a8b0a2aa6902920988fb53b9f7f WHIRLPOOL c3572d12f05b8443eb21a342c140d55e3c41e2af383aa850491aaeec412e62a45a4ee44e6d772dc9b6f141028911cb96b22a7818c6f15bc80bb8553d37008d96
+DIST ParaView-v4.2.0-source.tar.gz 50285547 SHA256 ac26cc5fe5ce82d27531727a01242353d40984826eaa580edea0791887a07b6b SHA512 611f641ccaa62b285c595df0318da94a9e0e67a1c3040f60c33bdd32bf980db8371c84958c9d5f3191cfd5249969a60f51f8e5dfa9bd234c96ec51caecdb37c8 WHIRLPOOL 1c81a95e00f06b3c60e31c82aa6e87979c6d9b8000ca7298904d8c3f09df58153f6dde7b96df5f538a991f5764862d3059d1395db61f12464306d3c3fe919fe7
 EBUILD paraview-4.0.1-r1.ebuild 9809 SHA256 aa8ce5eb27e1c2b6dfd2e4593089c208b4bc61095467cd8012cc0b099d345c7b SHA512 de07f58635dd20f5ae70d915924bc27cf649f00d647664acf32f26586dc7468db76d7786acc61924b202f80f2e94af961e9f4ca1abc98b5a7023ba59b1356021 WHIRLPOOL c96bcd123dc41c7647f763235f0218cbe2f1edf164ef55e8fca73d7c7e9e65a0d94ddca9c8d1b6d876dfc58a1cda517bceb72c8d2b692658ac737a66e7a340c7
-EBUILD paraview-4.0.1.ebuild 9710 SHA256 8ae082b888286f2677662992864297ec1dfd8ee565f6bb037ef9e8f5b01f32f3 SHA512 f70dd6e2432dc90b46bbf62c2fc9e87db54ca3f30b9cc5e59429713bd822bf84f4ebd4704c0c3bbd96a1acdac8e47f9cb2fe9e09a1085a9b110e81778af0e814 WHIRLPOOL 7c7847e33acaaf682662662da56f287050083880d2b21504c5e4309f393d9f284e592f4e0ec79e66df6e3ee092e8bc8ad97a503fc6e62016bbcacbd7473d8112
-EBUILD paraview-4.1.0-r1.ebuild 10272 SHA256 67e7f5a01600832ea306b68a94c32449e0c9d4407569e37590e9fe8301cc6f2f SHA512 bbaa95b175d0b0360f90a5b43801990f6fc230e353cea65bc7be0932aa1cfd6f9b27bb585696229619f329fecb33af935657f9e6e5baf465b1c94566b84f145c WHIRLPOOL 7ccaf5242a66863ca55a7bd81d45ea2c03f1eb670a8ee0d0ab47013a67afb7787901f11b66c71b4a428094d3af0748e2d02e6d0c3a7469ef7109c2d0e8c49489
-MISC ChangeLog 17019 SHA256 f2cd5418a7a05c6eb53c7f457643ec7b37bad919ac438dfdab5e86ba40d5f62b SHA512 170fa3bd314c1d826ea19e7d5ea18cf252c6c50cf9ada61de0167fb02f0911c15bd50276c5552afc8284498b27a74e79733948e95e4dfba62be7b1300df99d6e WHIRLPOOL fb8445e24b76afeec9b514345f7276f8eff5bd3147198b3339432821cd89939b0fefb77dd9935a4ffc078d5d072fb4f05f2907a706a49a447f4aadb46a0b2b3d
+EBUILD paraview-4.1.0-r1.ebuild 10362 SHA256 805be94232fe573dddfb8ca3902bca0acab54097a753dc9dbb1b281be3f0d67a SHA512 7c21e1ba2ad4dae6805403ccf374332cb8c9831e110c44c309147372a6ccc0b273f286e5e66ab6dd5bcc04bd8604f9b6cfb8d7d85959c62b0c1b702155430b08 WHIRLPOOL 30565408c51c13854f1f7232133b88f462838ffb9fc414208708be2e6380a24242ef668df9466c2e66ae3a205e34f548ae229e6a2f37c3515e668513015e2b0f
+EBUILD paraview-4.2.0.ebuild 10261 SHA256 ba8587b0df6016b6fd4828f7b9af8568b492470f8d35456f39c47ac20dd4a368 SHA512 37fd4f71794936ec776fd231f12614cf1931e947584b0136be5b3088960d072ae734dba82318727b8a9c4d97b14741e299b23aec34f0d137231eaf1d481364af WHIRLPOOL b1978609205ad752201e417375f87d8790275f12d1cf6302f8131368f4129a5f8612855cde39bf59411e8ad8e887c4329155178b160a364a98a13ac90037f19e
+MISC ChangeLog 17467 SHA256 23208da10b14abef2aa6d290bb78bb765bf598ebaaab19d28d3b60a3f9f08279 SHA512 5d81d89d6e32a3678f045c8d3ef9ccab8af4010709c8e0d99122dcdb81cf73c0f46f5fda71db13452162e61244daaefdd8ecf5cbfbcffec348f23d2a2220a4df WHIRLPOOL 13a603cc3a3722a2a637b9bfc6d11acd9fc7e29746708d8c22d77e8b6d083b6f2ad0bb1e75ec02d240c8256c5b4cedd76a3a170cf603f477b9cc328c6b933670
 MISC metadata.xml 702 SHA256 23c67d6f8f2cfb48ba3e8e80bf216005a892180740704cb9fbd3bc6dd7b4929e SHA512 ce92209302ca7815985d700aaa25c24796d301b8c7eeb9918f0745c8a836c735f770bb955e269c7e359b30be3d418f2fa73668ca5891f9db9437b041ebf73933 WHIRLPOOL 66658cde8cda9ecfabae72bdfe889646fb9ba33992d8c6efcb4dd882d6671f7f81f30591e6cea8dbe5cd3e3420d51142ce2bd15296d6eca3765f16455c8321ed
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.1
 
-iQIcBAEBCAAGBQJUlUrYAAoJELhOzYlK7nn/U7sP/0yk5biXIpTnD5J6ObivKwQt
-mMk13dhU7BhdRZ9Q65IYTLDM7JcSWaGU3XMuHYiLeANEKDSFq73Japf9wxBtrYFE
-dH2XQhA9aNoElaho/FifROGceFX6XBvmIo2dhBxhtYx3omJtI4bmWTtELx/u+nLY
-/cJbVrZqh1FrSq54yIrh2O6CDMDcWWKRohJtzc5vzNguS1S95XzzP9rpwweyGm5J
-vhmmJEQaEh3GHVs9/vOfBAD5yEuug8zQoKyeMTwOUBXAfnwmjQX0vvPGLSFXKmj6
-Vl64zCclIw0SO7uSgKRi0DMGzgP397YEB2hQqmF3NsbxONkhnhEjV3EwQwRxzZ5S
-JHNC43mBwpUhRzd4CjFhY7j34cYpX8dgJprwFzvOAUcsh3hluSCqGxZSRsl/ZguY
-4xnVgZ3O6Y4XkSVU2uwR5o/RoOrkH45XoAb0Dx4H9FPtO7Y+3gPgtukV85PJ2KdT
-a/2kzRg0KpBoYQ8parku6KYQVx9T4DV7mgSsFnBNze/kG/oMWQeW+K7K6OXXbjne
-m5ppvWkhjIp8Mwygkxr9akcuPrxFC52Mwkiy71ngMs9zr9Xx+3k87qtUOpLk8gPn
-E9YPnuuK4ZPddRdfP92itT4dwIyBL/VFXClMzyCae2sh9syd+5rF4UbODRPNJJw9
-+O47i0/+S2OdoorPWUuc
-=cJCz
+iQIcBAEBCAAGBQJUl1GqAAoJELhOzYlK7nn/FoIP/RTHV6AT743NsCg8SqmctQqM
+C449tK0wk+8HzFAtmTNtEnhf3QvmjPFLWET7cUzOJo4msEHTTgvmgFQ9exkPp+KG
+7ahdMyC93CG9AjCIT7v4hVHY1U183W2WgbDoXfnXzrKYP4JBG/qqnYg8TUOzXAm+
+gh4cMhgY7MK2mrUCzzkg9Ahs+qFpahcI0g4NruQpYVGJTEIUmfNhrzKvZmAwBpSw
+kLuncXkflncM7bANlCovod/4h956NH09ttfS8w4l75w/S+9nstsqso010SstRocI
+IqI2E+Sr6qOh7kxV/oQukFXInFMykuQr9v1ck8e3HSAzD3DSIdm1rVJgTC/9MjOi
+FiG9nB89I7LKWCppt10R/FowwaZqxZwts8XG3tnijOKhsD5DHLOkUqrkmdcSxgtz
+ssk1IixKMSiFamR9CfwghNLpWmYVrRebGM5i877OLJoUx9H3Tjn1iN5Y7H1VZrvk
+v2288b7Bm3iB3VcrchXK/TRDUcMF8OLyuEkDNVpFm6UNglsmVBsZPxmloY1EjEdE
+ByzoM0G5pYuWnP3u9rG2oDBaq0+0jmK9Vo7WqDFMob/LHXzevkqHmfyVqLVgMESD
+Tv5Hka6GjlT1pnwzczyjS3P7PPJOhlyakByZ3Ogscw6i3xC+IrIKiGL+oqWbRBlp
+pGs0+Rb9EJtxd/SZptRU
+=o+j1
 -----END PGP SIGNATURE-----
diff --git a/sci-visualization/paraview/files/paraview-4.1.0-glxext-legacy.patch b/sci-visualization/paraview/files/paraview-4.1.0-glxext-legacy.patch
new file mode 100644
index 000000000000..65a5b20d60fd
--- /dev/null
+++ b/sci-visualization/paraview/files/paraview-4.1.0-glxext-legacy.patch
@@ -0,0 +1,9 @@
+--- a/ParaView-v4.1.0/VTK/Rendering/OpenGL/vtkXOpenGLRenderWindow.cxx_orig	2014-01-11 15:02:10.000000000 +0100
++++ b/ParaView-v4.1.0/VTK/Rendering/OpenGL/vtkXOpenGLRenderWindow.cxx	2014-11-11 13:12:25.000000000 +0100
+@@ -28,5 +28,5 @@
+ // define GLX_GLXEXT_LEGACY to prevent glx.h to include glxext.h provided by
+ // the system
+-//#define GLX_GLXEXT_LEGACY
++#define GLX_GLXEXT_LEGACY
+ #include "GL/glx.h"
+ 
diff --git a/sci-visualization/paraview/files/paraview-4.1.0-no-fatal-warnings.patch b/sci-visualization/paraview/files/paraview-4.1.0-no-fatal-warnings.patch
new file mode 100644
index 000000000000..531be2f614f0
--- /dev/null
+++ b/sci-visualization/paraview/files/paraview-4.1.0-no-fatal-warnings.patch
@@ -0,0 +1,19 @@
+diff --git a/VTK/CMake/vtkCompilerExtras.cmake b/VTK/CMake/vtkCompilerExtras.cmake
+index 05b2db9..48d9395 100644
+--- a/VTK/CMake/vtkCompilerExtras.cmake
++++ b/VTK/CMake/vtkCompilerExtras.cmake
+@@ -15,11 +15,11 @@ if(CMAKE_COMPILER_IS_GNUCXX)
+   # If we are compiling on Linux then set some extra linker flags too
+   if(CMAKE_SYSTEM_NAME MATCHES Linux)
+     set(CMAKE_SHARED_LINKER_FLAGS
+-      "-Wl,--fatal-warnings -Wl,--no-undefined -lc ${CMAKE_SHARED_LINKER_FLAGS}")
++      "-Wl,--no-undefined -lc ${CMAKE_SHARED_LINKER_FLAGS}")
+     set(CMAKE_MODULE_LINKER_FLAGS
+-      "-Wl,--fatal-warnings -Wl,--no-undefined -lc ${CMAKE_SHARED_LINKER_FLAGS}")
++      "-Wl,--no-undefined -lc ${CMAKE_SHARED_LINKER_FLAGS}")
+     set (CMAKE_EXE_LINKER_FLAGS
+-      "-Wl,--fatal-warnings -Wl,--no-undefined -lc ${CMAKE_SHARED_LINKER_FLAGS}")
++      "-Wl,--no-undefined -lc ${CMAKE_SHARED_LINKER_FLAGS}")
+   endif()
+ 
+   # Now check if we can use visibility to selectively export symbols
diff --git a/sci-visualization/paraview/files/paraview-4.2.0-Protobuf.patch b/sci-visualization/paraview/files/paraview-4.2.0-Protobuf.patch
new file mode 100644
index 000000000000..498ad9b78ac0
--- /dev/null
+++ b/sci-visualization/paraview/files/paraview-4.2.0-Protobuf.patch
@@ -0,0 +1,39 @@
+http://paraview.org/Bug/view.php?id=13656
+
+---
+ ParaViewCore/ServerImplementation/Core/CMakeLists.txt | 12 ++++++++++--
+ 1 file changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/ParaViewCore/ServerImplementation/Core/CMakeLists.txt b/ParaViewCore/ServerImplementation/Core/CMakeLists.txt
+index 5ca5168..2a7ff4b 100644
+--- a/ParaViewCore/ServerImplementation/Core/CMakeLists.txt
++++ b/ParaViewCore/ServerImplementation/Core/CMakeLists.txt
+@@ -82,15 +82,23 @@ set (${vtk-module}_HDRS
+ #------------------------------------------------------------------------------
+ # Generate the protbuf message file.
+ #------------------------------------------------------------------------------
++if (VTK_USE_SYSTEM_PROTOBUF)
++    set (_PROTOC_COMPILER protoc)
++    set (_PROTOC_DEPEND "")
++else()
++    set (_PROTOC_COMPILER protoc_compiler)
++    set (_PROTOC_DEPEND ${_PROTOC_COMPILER})
++endif()
++
+ add_custom_command(
+     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/vtkPVMessage.pb.h
+            ${CMAKE_CURRENT_BINARY_DIR}/vtkPVMessage.pb.cc
+     
+-    COMMAND protoc_compiler
++    COMMAND ${_PROTOC_COMPILER}
+            "--cpp_out=dllexport_decl=VTKPVSERVERIMPLEMENTATIONCORE_EXPORT:${CMAKE_CURRENT_BINARY_DIR}"
+            --proto_path "${CMAKE_CURRENT_SOURCE_DIR}"
+            "${CMAKE_CURRENT_SOURCE_DIR}/vtkPVMessage.proto"
+-    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/vtkPVMessage.proto protoc_compiler
++    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/vtkPVMessage.proto ${_PROTOC_DEPEND}
+     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+ )
+ 
+-- 
+2.0.5
+
diff --git a/sci-visualization/paraview/files/paraview-4.2.0-removesqlite.patch b/sci-visualization/paraview/files/paraview-4.2.0-removesqlite.patch
new file mode 100644
index 000000000000..98619627c7ce
--- /dev/null
+++ b/sci-visualization/paraview/files/paraview-4.2.0-removesqlite.patch
@@ -0,0 +1,541 @@
+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)
+-vtk_module_export_info()
+-add_subdirectory(vtksqlite)
++#set(vtksqlite_THIRD_PARTY 1)
++#set(vtksqlite_LIBRARIES sqlite3)
++#vtk_module_export_info()
++#add_subdirectory(vtksqlite)
+--- VTK/ThirdParty/sqlite/module.cmake
++++ VTK/ThirdParty/sqlite/module.cmake
+@@ -1 +1 @@
+-vtk_module(vtksqlite EXCLUDE_FROM_WRAPPING)
++#vtk_module(vtksqlite EXCLUDE_FROM_WRAPPING)
+--- VTK/IO/SQL/module.cmake
++++ VTK/IO/SQL/module.cmake
+@@ -5,7 +5,7 @@
+     vtkIOCore
+   PRIVATE_DEPENDS
+     vtksys
+-    vtksqlite # We should consider splitting this into a module.
++#   vtksqlite # We should consider splitting this into a module.
+   TEST_DEPENDS
+     vtkIOLegacy
+     vtkTestingIOSQL
+--- VTK/IO/SQL/CMakeLists.txt
++++ VTK/IO/SQL/CMakeLists.txt
+@@ -28,3 +28,4 @@
+   )
+ 
+ vtk_module_library(vtkIOSQL ${Module_SRCS} ${SQLite_SRCS})
++target_link_libraries(vtkIOSQL -lsqlite3)
diff --git a/sci-visualization/paraview/paraview-4.1.0-r1.ebuild b/sci-visualization/paraview/paraview-4.1.0-r1.ebuild
index f792d70bbc13..5df0f5205424 100644
--- a/sci-visualization/paraview/paraview-4.1.0-r1.ebuild
+++ b/sci-visualization/paraview/paraview-4.1.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/paraview-4.1.0-r1.ebuild,v 1.4 2014/12/13 08:22:16 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/paraview-4.1.0-r1.ebuild,v 1.5 2014/12/21 23:03:05 tamiko Exp $
 
 EAPI=5
 
@@ -94,7 +94,9 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-4.0.1-removesqlite.patch \
 		"${FILESDIR}"/${PN}-4.0.1-gcc-4.7.patch \
 		"${FILESDIR}"/${PN}-4.0.1-vtk-cg-path.patch \
-		"${FILESDIR}"/${PN}-4.0.1-Protobuf.patch
+		"${FILESDIR}"/${PN}-4.0.1-Protobuf.patch \
+		"${FILESDIR}"/${P}-glxext-legacy.patch \
+		"${FILESDIR}"/${P}-no-fatal-warnings.patch
 
 	# lib64 fixes
 	sed -i \
diff --git a/sci-visualization/paraview/paraview-4.0.1.ebuild b/sci-visualization/paraview/paraview-4.2.0.ebuild
index 341c40e4a23e..148c7d4eb19c 100644
--- a/sci-visualization/paraview/paraview-4.0.1.ebuild
+++ b/sci-visualization/paraview/paraview-4.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/paraview-4.0.1.ebuild,v 1.5 2014/12/13 08:22:16 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/paraview-4.2.0.ebuild,v 1.1 2014/12/21 23:03:05 tamiko Exp $
 
 EAPI=5
 
@@ -13,19 +13,21 @@ MY_P="ParaView-v${PV}-source"
 
 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"
+SRC_URI="http://www.paraview.org/files/v${MAJOR_PV}/${MY_P}.tar.gz"
 RESTRICT="mirror"
 
 LICENSE="paraview GPL-2"
 KEYWORDS="~amd64 ~x86"
 SLOT="0"
 IUSE="boost cg coprocessing development doc examples ffmpeg mpi mysql nvcontrol plugins python qt4 sqlite tcl test tk"
+RESTRICT="test"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
 	mysql? ( sqlite )" # "vtksqlite, needed by vtkIOSQL" and "vtkIOSQL, needed by vtkIOMySQL"
 
 RDEPEND="
 	dev-libs/expat
+	dev-libs/jsoncpp
 	dev-libs/libxml2:2
 	dev-libs/protobuf
 	media-libs/freetype
@@ -33,7 +35,8 @@ RDEPEND="
 	media-libs/libtheora
 	media-libs/tiff
 	sci-libs/hdf5[mpi=]
-	~sci-libs/netcdf-4.1.3[cxx,hdf5]
+	|| ( ( >=sci-libs/netcdf-4.2[hdf5] >=sci-libs/netcdf-cxx-4.2:3 )
+		~sci-libs/netcdf-4.1.3[cxx,hdf5] )
 	sys-libs/zlib
 	virtual/jpeg
 	virtual/opengl
@@ -63,6 +66,7 @@ RDEPEND="
 		qt4? ( dev-python/PyQt4[opengl,webkit,${PYTHON_USEDEP}] )
 	)
 	qt4? (
+		dev-qt/designer:4
 		dev-qt/qtgui:4
 		dev-qt/qtopengl:4
 		dev-qt/qthelp:4[compat]
@@ -77,7 +81,7 @@ DEPEND="${RDEPEND}
 	boost? ( >=dev-libs/boost-1.40.0[mpi?,${PYTHON_USEDEP}] )
 	doc? ( app-doc/doxygen )"
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
 
 pkg_setup() {
 	python-single-r1_pkg_setup
@@ -86,11 +90,11 @@ pkg_setup() {
 
 src_prepare() {
 	# see patch headers for description
-	epatch "${FILESDIR}"/${P}-xdmf-cstring.patch \
+	epatch "${FILESDIR}"/${PN}-4.0.1-xdmf-cstring.patch \
 		"${FILESDIR}"/${P}-removesqlite.patch \
-		"${FILESDIR}"/${P}-gcc-4.7.patch \
-		"${FILESDIR}"/${P}-vtknetcd.patch \
-		"${FILESDIR}"/${P}-vtk-cg-path.patch
+		"${FILESDIR}"/${PN}-4.0.1-gcc-4.7.patch \
+		"${FILESDIR}"/${P}-Protobuf.patch \
+		"${FILESDIR}"/${PN}-4.1.0-no-fatal-warnings.patch
 
 	# lib64 fixes
 	sed -i \
@@ -105,7 +109,10 @@ src_prepare() {
 		Plugins/SciberQuestToolKit/CMakeLists.txt \
 		ParaViewConfig.cmake.in \
 		CoProcessing/PythonCatalyst/vtkCPPythonScriptPipeline.cxx \
-		ParaViewCore/ClientServerCore/Core/vtkProcessModuleInitializePython.h || die
+		ParaViewCore/ClientServerCore/Core/vtkProcessModuleInitializePython.h \
+		ParaViewCore/ClientServerCore/Core/vtkPVPluginTracker.cxx \
+		Plugins/SciberQuestToolKit/ParaViewPlugin/CMakeLists.txt \
+		Plugins/SciberQuestToolKit/SciberQuest/CMakeLists.txt || die
 
 	# no proper switch
 	use nvcontrol || {
@@ -118,15 +125,17 @@ src_prepare() {
 src_configure() {
 	local mysql_lib mysql_includedir
 
-	if [[ $(mysql_config --version | sed 's/\.//g') -lt 5529 ]] ; then
-		mysql_lib="/usr/$(get_libdir)/mysql/libmysqlclient.so"
-		mysql_includedir="/usr/include/mysql"
-	else
-		mysql_lib="$(mysql_config --variable=pkglibdir)/libmysqlclient.so"
-		mysql_includedir="$(mysql_config --variable=pkgincludedir)"
+	if use mysql ; then
+		if [[ $(mysql_config --version | sed 's/\.//g') -lt 5529 ]] ; then
+			mysql_lib="/usr/$(get_libdir)/mysql/libmysqlclient.so"
+			mysql_includedir="/usr/include/mysql"
+		else
+			mysql_lib="$(mysql_config --variable=pkglibdir)/libmysqlclient.so"
+			mysql_includedir="$(mysql_config --variable=pkgincludedir)"
+		fi
 	fi
 
-	# TODO: use system protobuf, jsoncpp
+	# TODO: use system jsoncpp
 	# VTK_USE_SYSTEM_QTTESTING
 	# PARAVIEW_USE_SYSTEM_AUTOBAHN
 	local mycmakeargs=(
@@ -142,16 +151,18 @@ src_configure() {
 		-DVTK_USE_SYSTEM_GL2PS=ON
 		-DVTK_USE_SYSTEM_HDF5=ON
 		-DVTK_USE_SYSTEM_JPEG=ON
+		-DVTK_USE_SYSTEM_JSONCPP=ON
 		-DVTK_USE_SYSTEM_LIBXML2=ON
+		-DVTK_USE_SYSTEM_NETCDF=ON
 		-DVTK_USE_SYSTEM_OGGTHEORA=ON
 		-DVTK_USE_SYSTEM_PNG=ON
-		-DVTK_USE_SYSTEM_PROTOBUF=OFF
+		-DVTK_USE_SYSTEM_PROTOBUF=ON
 		-DVTK_USE_SYSTEM_TIFF=ON
 		-DVTK_USE_SYSTEM_XDMF2=OFF
 		-DVTK_USE_SYSTEM_ZLIB=ON
 		-DPARAVIEW_USE_SYSTEM_MPI4PY=ON
-		-DPARAVIEW_USE_SYSTEM_ZOPE=ON
-		-DPARAVIEW_USE_SYSTEM_TWISTED=ON
+		-DVTK_USE_SYSTEM_ZOPE=ON
+		-DVTK_USE_SYSTEM_TWISTED=ON
 		-DCMAKE_VERBOSE_MAKEFILE=ON
 		-DCMAKE_COLOR_MAKEFILE=TRUE
 		-DVTK_USE_OFFSCREEN=TRUE
@@ -234,6 +245,7 @@ src_configure() {
 		$(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 RAVIEW_BUILD_PLUGIN_MobileRemoteControl)
 		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_Moments)
 		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_NonOrthogonalSource)
 		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_PacMan)
@@ -243,6 +255,7 @@ src_configure() {
 		$(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_StreamingParticles)
 		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_SurfaceLIC)
 		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_UncertaintyRendering)
 		# these are always needed for plugins
@@ -265,7 +278,7 @@ src_install() {
 	echo "PYTHONPATH="${EPREFIX}"/usr/${PVLIBDIR}:/usr/${PVLIBDIR}/site-packages" >> "${T}"/40${PN}
 	doenvd "${T}"/40${PN}
 
-	newicon "${S}"/Applications/ParaView/pvIcon.png paraview.png
+	newicon "${S}"/Applications/ParaView/pvIcon-32x32.png paraview.png
 	make_desktop_entry paraview "Paraview" paraview
 
 	use python && python_optimize "${D}"/usr/$(get_libdir)/${PN}-${MAJOR_PV}