version bump (bug #538690), fix dependencies (bug #538168), fix freetype-2.5.5 compatibility also in 4.1.0-r2 (bug #541012), fix protobuf compatibility in 4.2.0 and 4.3.1 (bug #537988)

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

8 files changed, 267 insertions, 64 deletions

diff --git a/sci-visualization/paraview/ChangeLog b/sci-visualization/paraview/ChangeLog
index 7ef2e2510b45..72d401f6648f 100644
--- a/sci-visualization/paraview/ChangeLog
+++ b/sci-visualization/paraview/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for sci-visualization/paraview
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/ChangeLog,v 1.88 2015/04/08 18:23:57 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/ChangeLog,v 1.89 2015/04/19 13:15:00 tamiko Exp $
+
+*paraview-4.3.1 (19 Apr 2015)
+
+  19 Apr 2015; Matthias Maier <tamiko@gentoo.org>
+  +files/paraview-4.1.0-vtk-freetype.patch,
+  +files/paraview-4.2.0-protobuf-2.patch, +files/paraview-4.2.0-protobuf.patch,
+  +paraview-4.3.1.ebuild, -files/paraview-4.2.0-Protobuf.patch,
+  -paraview-4.0.1-r2.ebuild, paraview-4.1.0-r2.ebuild, paraview-4.2.0-r1.ebuild:
+  version bump (bug #538690), fix dependencies (bug #538168), fix freetype-2.5.5
+  compatibility also in 4.1.0-r2 (bug #541012), fix protobuf compatibility in
+  4.2.0 and 4.3.1 (bug #537988)
 
   08 Apr 2015; Michał Górny <mgorny@gentoo.org> paraview-4.0.1-r2.ebuild,
   paraview-4.1.0-r2.ebuild, paraview-4.2.0-r1.ebuild:
diff --git a/sci-visualization/paraview/Manifest b/sci-visualization/paraview/Manifest
index ece68a6ad477..9e97f86d9b06 100644
--- a/sci-visualization/paraview/Manifest
+++ b/sci-visualization/paraview/Manifest
@@ -9,33 +9,33 @@ AUX paraview-4.0.1-vtknetcd.patch 2775 SHA256 b972d38d99c43db18c92b5423d06f542ea
 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.1.0-vtk-freetype.patch 1159 SHA256 ab95039cf8f39d1dcdf97a3ae62c4aa47f6daad4defdb5be842719102036c452 SHA512 c4e0328d1c7c1a1842de0f70ec93fe28e5537d9add29d4e76243f91138b97e993d5ef02a80fece8cc3476086772bb2f3e97ff6c8ce18a4ffedced90ad98199e0 WHIRLPOOL 95b7d29a790aa095b2ded9becb8cb02f9ca837ab4c18cae62a5f7f8191fd94af6c5e4df5359b4ea1268d01e72fe6f8eff56ec7cef8b2ef823021f8e5395fc911
+AUX paraview-4.2.0-protobuf-2.patch 4473 SHA256 3fc795a66bc76980e9858ebf7ee2ab982f5bf731279a945dc9a13ddfaf47a143 SHA512 509e995699a5f07065baf0b1800484221f967d4053666cb231c7bc0ef0a5e7d0400ba10aa62769efb36334e97e688ce00f2f53cfd60455907e6384c236fd0782 WHIRLPOOL 8379cbcdfc89cf76ccc59ffee3e40f847ab128e7bb92a868be935f66293175b39b26845047d72b902751c82fbd344fcb2812657c46267145db96f0be071773fc
+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
 AUX paraview-4.2.0-vtk-freetype.patch 1159 SHA256 ab95039cf8f39d1dcdf97a3ae62c4aa47f6daad4defdb5be842719102036c452 SHA512 c4e0328d1c7c1a1842de0f70ec93fe28e5537d9add29d4e76243f91138b97e993d5ef02a80fece8cc3476086772bb2f3e97ff6c8ce18a4ffedced90ad98199e0 WHIRLPOOL 95b7d29a790aa095b2ded9becb8cb02f9ca837ab4c18cae62a5f7f8191fd94af6c5e4df5359b4ea1268d01e72fe6f8eff56ec7cef8b2ef823021f8e5395fc911
-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-r2.ebuild 10030 SHA256 9f647f8ac4493c63577c4401156434d07172e00bcca434494d43a6d0d5d6e482 SHA512 d8f2b60b44f6d12e4a21511447d9ba7270ba55f3442a65a556b87ed1c73d851878ad8a64666c7cb405c31190b135c40209d15c91fcc802315148bbe500320505 WHIRLPOOL 1d5d5f8bc4b2e4f446534ec0bdb6844e0bb14e2464a012ccd75d56ecaec6e774f27e14ccbf4d3162b6d156633530e0f11497bde85340f76de9966311a50fbfad
-EBUILD paraview-4.1.0-r2.ebuild 10583 SHA256 2dd876a2a8ac2ca6431a5868b7cf07baac0f16ae978610825c29e72999a8f99e SHA512 30409a78cead6a628d9071ed3fa802b13d6cf6aa1f64e60372c02c05f22085a189b3b6e616900f570a9075926236c63fd2dbe46e3be073e309632dbdb76ba65a WHIRLPOOL 12b48ece8ccb2e888bd6ea560bf593cc9c8ea2e33672fbbd212d6b6d324c062597440ab8278e357a6eb8f4d006659e28e169a43bdc45d6d0f804868d89786827
-EBUILD paraview-4.2.0-r1.ebuild 10527 SHA256 ef43ec00381de27d20316cbad6f771e3295739f175354b139a8c8237ff05e911 SHA512 9537f62e6642c4f68b46624551021aa0f8392e6a48f970811e2ae8a331ea8b0da2d2e37c0f33216d3d4bad6fa58dd6df39f04ee13a0a568da85e4563a6b97f6c WHIRLPOOL e89d84bd820daf0fc337b99c487cefd779d82d45bb3699b23b61f677bf503e179aae681c0db9fc398f587c707361b8984576cd95a628837f0fc4b3761fccc20e
-MISC ChangeLog 18344 SHA256 390c72b50615a1bf756c9e916f19b5799427f958550ee197b1142a6fa176dc24 SHA512 974de9fc8aa13469a316ff17845a6de53aef2ec2e7cb6ab0354d9287965ac4eb2005fb014ce453437d0c88d3371ca8850933b9809e71402d11eec52322f614c8 WHIRLPOOL 095743483c6e3e460437ee4d9fc1166103ea3c4b6e27b4cdde0a78d3b75d59ce13dab2cd9d7a60fe4a2fdae107a5d04ef57bf9d09980b77a50f64b89c8770786
+DIST ParaView-v4.3.1-source.tar.gz 50842525 SHA256 d534c475fc052215ecadf4ad19d9c7996c634b5d965951292b966710509a2542 SHA512 73c17f7ba757647869b26992c0ac3a6b9298bce9d2b8c2fca28286064f2b83a29753028a29c6f478654fffc96c9d9f5dd638c64df2b05ded425da122109d31e3 WHIRLPOOL 3db1d02db95acf16f29c4784714985e4f6f7a32fbdf7fa58ad85ecfaf6ab60d7959ea3d5a3ab5d36739e56f1ee5b025d9b6275749966b576324629f14e96bde0
+EBUILD paraview-4.1.0-r2.ebuild 10580 SHA256 93edbbf6f7ebdd3f5f0937d1e62c52fc8f1e6873d9b761f250600088bcb977ad SHA512 f9c7f906288bce2178e9ee13b12f53844f0ed5a10180e52496a24131077313020fbad6b239d9991f6e85fc2bd21e6adaf97107b880a2d632f0d4e400964a9e71 WHIRLPOOL 3bdd7f4f4eb21ced34c765df48a22dff2756e8e75a85d3eb270d950c17f3f1452e69f4255c02854a47829afa6e319a9515662aceac6ac3fde188f89276e25a72
+EBUILD paraview-4.2.0-r1.ebuild 10522 SHA256 f7f5ff4218b87a0900f4788df5aa6232957d2819016af9ef3d5e312036aa4bc7 SHA512 3221bba500d2c5f3678e572b3e65f60d31c29c5c1b6aab972e2a32e3d61879b0a69ecd79c6106579ac590e89ef2077db444e2be42a95fef4e0a2612b8a9df765 WHIRLPOOL 164938d442e918ee62f01e35ca813b7c1cdd286b5fabb037e964c98d7467799c3bdf851a322b3553fe96b231995100d39896835e42a97bfefadbd641e09f26f5
+EBUILD paraview-4.3.1.ebuild 10508 SHA256 51cb5149099cc1baa54cc1bb2d02a6b3062dc111c816a674f5088fb761ad7aa3 SHA512 d30a8aff4eda35e70681df245c86d7a39242c087f7874288e7425b5cfd230e975d5a1b434147c7fd074c846b053241978dcc2eece44a1fafbe4804def925e39f WHIRLPOOL f5a73bc60fe1b6533af4e78a159aef8b7a210bc8313a012c74693535a9a8e5328d65aacff8d8a8cc1d5152254684ede5786dc3a360bf5e75bf8afa700eeaa34c
+MISC ChangeLog 18886 SHA256 fc6fc095a5692f5499b47d0dfc6206f589ddcec0e80deeea2047795becca51d6 SHA512 5413e13d978851fc890037e4564b2e5ae9c7eb64ba24fb7ac0fb0a797102c2c0dced9e2cde4faea660dc0c2e3296b9bc2bf771ea063847b324846ff466b19f1c WHIRLPOOL a67f282d7afb1b1138bed628b59c0be44deed6db4b48a7ce6380da683d2ec1658de0b15d10cc668fb7a5ab6ece69cef55eb24b49920e44ca77d3c5ebc3406f1b
 MISC metadata.xml 734 SHA256 477700ff289c96e62b0ca05a06bfcb9059fddaf6e880b159099349e072a958ce SHA512 3298974ce60364b56453482b950aa12759cae192a8ea1943e24dabb944ad17b7925e1e8e1c05ce781daf8fc409bca29190339c26bf542df5c328824cccd3e142 WHIRLPOOL c252c5d89e223d5f13beaa065317d75befd22e3f06c804abbfbbf6b40e0f06e7cd724951f56fe6662b60db3bbc1b587aea4d422ecec2f97251f1d8fc34da1703
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iQJ8BAEBCABmBQJVJXJGXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO8p0P/2k4nDZNWV2xcjEwMzrA4iGC
-F8wveMTjApREiOQ8e9lAo6/OdHREzX8oj7uCvGETcHJaGUMMUP50S6az5bRr69KV
-wMJIMfhAnpGZY81W13WeV9w8vc3S45qwUfnhMpm9vR0XSfvz3OcfQA4mJ90G4fXt
-tJmvDw23NZ6Uc8RXMeCtTZXfN9h/4hWNTjLxESduEWCWmuPjCsd75iDsqqTAZkVj
-a79nCA7IHTnq+c9mIcuKI7rkgE8/Uma2lRyAmNhrlo39Z8HWLkPqv8cWfPcgoLCS
-b8dCzeE4PznGiJcsyL5eIXuRKtHxuJ3e9byHjkL8gM4D5dV5XIpKELY5M4DbNQrd
-0/3RhHY921zJEJtv9LX7wcNnLZc8W0i3WAQ8JwRK4iYXfiUIueIASwMLz5+j2F+e
-ovfRdEmdSRGtAQtxF2R016kE6qkv8W/Vzb6ytDkS/7C94fkdC98VnJUCsr6OD6yX
-4J8SwPRy4jlqLLsbFXDsepOJp1C+GIGglXZsoA+pcwzRWiw6zXnPUvu+7G8jaYsv
-rPZU1wcl1Ev6qtNKVHb6CM1Hra3lOaFXc3xUIx53RsM3zuiZWBtZWnRM7vXFhRz6
-rXBL254cbAWLFf+jMUJhXtxKBMquF+54f06EFtigw9N9grwmJ9jgJzcAAw8GwhGy
-vUrJkHkyTkIMsYuT8b9T
-=Ir+4
+iQIcBAEBCAAGBQJVM6pMAAoJELhOzYlK7nn/BkEQAL36P3aasMffCZAV58LzOg/a
+lQOc+E8iXIdNlK5Ww6M7ktpGWIcbPd4w1ZTMDj0kDy+eh7rvODUqJEGtYb4jA4V5
+YOP87wJ/HNgI2X0a+6clHjukWvPiQslVg7kbXFB4Q8FA0qorkUFyHidYqHQBdYRe
+8vbqwHw720ARJ2zPMrp6NUX6gDxwmdt3XtAUUdFOOGVBMkanjBScw7pEMi8gLxBs
+XaN/r1uvKR6+Oha5Ynt4FGnAuYw6V6gWHGSANiAB+liJuTvMv8xrJuVE8iumaQVp
+yQx3avLiBwKD7l1iKqm6UfW6F6vxovXouy2chE6tsXL0OhXH4NZz7y5G3P4KwWsQ
+/PyN4tXPIv4uf1qC0tfAX1OQxgwTM561CrWvL7VhamGNbvpYIOyQH4IwsPK70hU4
++sJAUFzpk+8IUWFl+v9VY1pInzdsMDDwzKvONICXvSCmuD/2yJmU+djz5aNLuS3D
+D/7dJtCijp/AhhhyESPvo2SCPRCSFryHRBpMYav2bygfHAtHQtd5MaiSTbXfAhwV
+TiBj7F/uGIB3M9l6/fn2Ey314/IKLfX7GPvEMQZ4nYX/G0JwCGciEDCwg6ItXSr5
+L4phP7FG5QgvjQFii6U3BlSoI1d4V7/0r5+Yj++wYmytzixqR8t+kAX1Bovgsa1n
+oaskpiFPGBpKY270fek3
+=HrqK
 -----END PGP SIGNATURE-----
diff --git a/sci-visualization/paraview/files/paraview-4.1.0-vtk-freetype.patch b/sci-visualization/paraview/files/paraview-4.1.0-vtk-freetype.patch
new file mode 100644
index 000000000000..b7d3e409cde1
--- /dev/null
+++ b/sci-visualization/paraview/files/paraview-4.1.0-vtk-freetype.patch
@@ -0,0 +1,22 @@
+--- a/ParaView-v4.2.0-source/VTK/Rendering/FreeType/vtkFreeTypeTools.cxx_orig	2014-12-23 09:25:35.000000000 +0100
++++ b/ParaView-v4.2.0-source/VTK/Rendering/FreeType/vtkFreeTypeTools.cxx	2014-12-24 09:40:31.886953389 +0100
+@@ -1185,7 +1185,7 @@
+     if (bitmap)
+       {
+       metaData.ascent = std::max(bitmapGlyph->top - 1, metaData.ascent);
+-      metaData.descent = std::min(-(bitmap->rows - (bitmapGlyph->top - 1)),
++      metaData.descent = std::min(-(static_cast<int>(bitmap->rows) - (bitmapGlyph->top - 1)),
+                                   metaData.descent);
+       }
+     ++heightString;
+@@ -1952,8 +1952,8 @@
+     if (bitmap)
+       {
+       bbox[0] = std::min(bbox[0], pen[0] + bitmapGlyph->left);
+-      bbox[1] = std::max(bbox[1], pen[0] + bitmapGlyph->left + bitmap->width);
+-      bbox[2] = std::min(bbox[2], pen[1] + bitmapGlyph->top - 1 - bitmap->rows);
++      bbox[1] = std::max(bbox[1], pen[0] + bitmapGlyph->left + static_cast<int>(bitmap->width));
++      bbox[2] = std::min(bbox[2], pen[1] + bitmapGlyph->top - 1 - static_cast<int>(bitmap->rows));
+       bbox[3] = std::max(bbox[3], pen[1] + bitmapGlyph->top - 1);
+       }
+     else
diff --git a/sci-visualization/paraview/files/paraview-4.2.0-protobuf-2.patch b/sci-visualization/paraview/files/paraview-4.2.0-protobuf-2.patch
new file mode 100644
index 000000000000..f1ea7b5b01bc
--- /dev/null
+++ b/sci-visualization/paraview/files/paraview-4.2.0-protobuf-2.patch
@@ -0,0 +1,161 @@
+diff --git a/ParaViewCore/ServerImplementation/Core/vtkPVMessage.proto b/ParaViewCore/ServerImplementation/Core/vtkPVMessage.proto
+index 60e084c..aed5832 100644
+--- a/ParaViewCore/ServerImplementation/Core/vtkPVMessage.proto
++++ b/ParaViewCore/ServerImplementation/Core/vtkPVMessage.proto
+@@ -21,7 +21,7 @@ message Variant {
+     MAP     = 7;
+     }
+ 
+-  required Type    type            = 1;
++  optional Type    type            = 1;
+   repeated sint64  idtype          = 3;
+   repeated sint32  integer         = 4;
+   repeated double  float64         = 5;
+@@ -47,8 +47,8 @@ message MessageCollection
+ 
+ message Message
+ {
+-  required uint64 global_id  = 1;
+-  required uint32 location   = 2;
++  optional uint64 global_id  = 1;
++  optional uint32 location   = 2;
+   optional bool   share_only = 3 [default = false];
+   optional bool   req_def    = 4 [default = false];
+   optional uint32 client_id  = 5 [default = 0];
+@@ -62,10 +62,10 @@ message DefinitionHeader
+ {
+   extend Message {
+     // The classname for the driver process i.e. the client, typically
+-    required string client_class = 10;
++    optional string client_class = 10;
+ 
+     // The classname for the process where the processing occurs
+-    required string server_class = 11;
++    optional string server_class = 11;
+   }
+ }
+ 
+@@ -76,32 +76,32 @@ message ProxyState
+ 
+   message SubProxy
+     {
+-    required string name      = 1;
+-    required uint32 global_id = 2;
++    optional string name      = 1;
++    optional uint32 global_id = 2;
+     }
+ 
+   message Annotation
+     {
+-    required string key   = 1;
+-    required string value = 2;
++    optional string key   = 1;
++    optional string value = 2;
+     }
+ 
+   message UserData
+     {
+-    required string key   = 1;
++    optional string key   = 1;
+     repeated Variant variant = 2;
+     }
+ 
+   message Property
+     {
+-    required string  name  = 1;
++    optional string  name  = 1;
+     optional Variant value = 2;
+     repeated UserData user_data = 3;
+     }
+ 
+   extend Message {
+-    required string     xml_group           = 20;
+-    required string     xml_name            = 21;
++    optional string     xml_group           = 20;
++    optional string     xml_name            = 21;
+     optional string     xml_sub_proxy_name  = 22;
+     repeated Property   property            = 23;
+     repeated SubProxy   subproxy            = 24;
+@@ -118,8 +118,8 @@ message PXMRegistrationState
+   message Entry
+     {
+     optional string group     = 1;
+-    required string name      = 2;
+-    required uint64 global_id = 3;
++    optional string name      = 2;
++    optional uint64 global_id = 3;
+     }
+ 
+   extend Message {
+@@ -135,9 +135,9 @@ message ProxyDefinitionState
+ {
+   message ProxyXMLDefinition
+     {
+-    required string group = 1;
+-    required string name  = 2;
+-    required string xml   = 3;
++    optional string group = 1;
++    optional string name  = 2;
++    optional string xml   = 3;
+     }
+ 
+   extend Message {
+@@ -181,9 +181,9 @@ message LinkState {
+       OUTPUT = 2;
+       }
+ 
+-    required uint32 proxy         = 1;
++    optional uint32 proxy         = 1;
+     optional string property_name = 2;
+-    required Direction direction  = 3;
++    optional Direction direction  = 3;
+     }
+ 
+   extend Message {
+@@ -206,7 +206,7 @@ message MousePointer {
+   }
+ 
+   extend Message {
+-    required uint32 view      = 70;
++    optional uint32 view      = 70;
+     optional double x         = 71 [default = 0];
+     optional double y         = 72 [default = 0];
+     optional bool   forceShow = 73 [default = false];
+@@ -219,7 +219,7 @@ message MousePointer {
+ message ChartViewBounds {
+ 
+   extend Message {
+-    required uint32 view  = 75;
++    optional uint32 view  = 75;
+     repeated double range = 76;
+   }
+ }
+@@ -229,7 +229,7 @@ message ChartViewBounds {
+ message ClientsInformation {
+ 
+   message ClientInfo {
+-    required uint32 user       = 1;
++    optional uint32 user       = 1;
+     optional string name       = 2;
+     optional bool   is_master  = 3 [default = false];
+     optional bool   follow_cam = 4 [default = false];
+@@ -242,8 +242,8 @@ message ClientsInformation {
+ 
+ message ChatMessage {
+   extend Message {
+-    required uint32 author = 84;
+-    required string txt    = 85;
++    optional uint32 author = 84;
++    optional string txt    = 85;
+   }
+ }
+ 
+@@ -256,7 +256,7 @@ message QtEvent {
+   }
+ 
+   extend Message {
+-    required QtEventType type  = 98;
++    optional QtEventType type  = 98;
+   }
+ }
+ 
diff --git a/sci-visualization/paraview/files/paraview-4.2.0-Protobuf.patch b/sci-visualization/paraview/files/paraview-4.2.0-protobuf.patch
index 498ad9b78ac0..498ad9b78ac0 100644
--- a/sci-visualization/paraview/files/paraview-4.2.0-Protobuf.patch
+++ b/sci-visualization/paraview/files/paraview-4.2.0-protobuf.patch
diff --git a/sci-visualization/paraview/paraview-4.1.0-r2.ebuild b/sci-visualization/paraview/paraview-4.1.0-r2.ebuild
index 6d9dcd9f2531..ecf52a91d90a 100644
--- a/sci-visualization/paraview/paraview-4.1.0-r2.ebuild
+++ b/sci-visualization/paraview/paraview-4.1.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 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-r2.ebuild,v 1.3 2015/04/08 18:23:57 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/paraview-4.1.0-r2.ebuild,v 1.4 2015/04/19 13:15:00 tamiko Exp $
 
 EAPI=5
 
@@ -35,8 +35,8 @@ RDEPEND="
 	media-libs/libtheora
 	media-libs/tiff:0=
 	sci-libs/hdf5[mpi=]
-	|| ( ( >=sci-libs/netcdf-4.2[hdf5] >=sci-libs/netcdf-cxx-4.2:3 )
-		~sci-libs/netcdf-4.1.3[cxx,hdf5] )
+	>=sci-libs/netcdf-4.2[hdf5]
+	>=sci-libs/netcdf-cxx-4.2:3
 	sys-libs/zlib
 	virtual/jpeg:0
 	virtual/opengl
@@ -45,6 +45,7 @@ RDEPEND="
 	x11-libs/libXext
 	x11-libs/libXmu
 	x11-libs/libXt
+	boost? ( >=dev-libs/boost-1.40.0[mpi?,${PYTHON_USEDEP}] )
 	coprocessing? (
 		plugins? (
 			dev-python/PyQt4
@@ -57,12 +58,11 @@ RDEPEND="
 	python? (
 		${PYTHON_DEPS}
 		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/mpi4py
 		dev-python/numpy[${PYTHON_USEDEP}]
 		dev-python/sip[${PYTHON_USEDEP}]
-		dev-python/twisted-core
+		dev-python/twisted-core[${PYTHON_USEDEP}]
 		dev-python/zope-interface[${PYTHON_USEDEP}]
-		mpi? ( dev-python/mpi4py )
+		mpi? ( dev-python/mpi4py[${PYTHON_USEDEP}] )
 		qt4? ( dev-python/PyQt4[opengl,webkit,${PYTHON_USEDEP}] )
 	)
 	qt4? (
@@ -77,8 +77,6 @@ RDEPEND="
 	tcl? ( dev-lang/tcl:0= )
 	tk? ( dev-lang/tk:0= )"
 DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	boost? ( >=dev-libs/boost-1.40.0[mpi?,${PYTHON_USEDEP}] )
 	doc? ( app-doc/doxygen )"
 
 S=${WORKDIR}/${MY_P%-source}
@@ -96,7 +94,8 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-4.0.1-vtk-cg-path.patch \
 		"${FILESDIR}"/${PN}-4.0.1-Protobuf.patch \
 		"${FILESDIR}"/${P}-glxext-legacy.patch \
-		"${FILESDIR}"/${P}-no-fatal-warnings.patch
+		"${FILESDIR}"/${P}-no-fatal-warnings.patch \
+		"${FILESDIR}"/${P}-vtk-freetype.patch
 
 	# lib64 fixes
 	sed -i \
diff --git a/sci-visualization/paraview/paraview-4.2.0-r1.ebuild b/sci-visualization/paraview/paraview-4.2.0-r1.ebuild
index 26dcb8e6af91..7a702b14ce9e 100644
--- a/sci-visualization/paraview/paraview-4.2.0-r1.ebuild
+++ b/sci-visualization/paraview/paraview-4.2.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/paraview-4.2.0-r1.ebuild,v 1.3 2015/04/08 18:23:57 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/paraview-4.2.0-r1.ebuild,v 1.4 2015/04/19 13:15:00 tamiko Exp $
 
 EAPI=5
 
@@ -35,8 +35,8 @@ RDEPEND="
 	media-libs/libtheora
 	media-libs/tiff:0=
 	sci-libs/hdf5[mpi=]
-	|| ( ( >=sci-libs/netcdf-4.2[hdf5] >=sci-libs/netcdf-cxx-4.2:3 )
-		~sci-libs/netcdf-4.1.3[cxx,hdf5] )
+	>=sci-libs/netcdf-4.2[hdf5]
+	>=sci-libs/netcdf-cxx-4.2:3
 	sys-libs/zlib
 	virtual/jpeg:0
 	virtual/opengl
@@ -45,6 +45,7 @@ RDEPEND="
 	x11-libs/libXext
 	x11-libs/libXmu
 	x11-libs/libXt
+	boost? ( >=dev-libs/boost-1.40.0[mpi?,${PYTHON_USEDEP}] )
 	coprocessing? (
 		plugins? (
 			dev-python/PyQt4
@@ -57,12 +58,11 @@ RDEPEND="
 	python? (
 		${PYTHON_DEPS}
 		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/mpi4py
 		dev-python/numpy[${PYTHON_USEDEP}]
 		dev-python/sip[${PYTHON_USEDEP}]
-		dev-python/twisted-core
+		dev-python/twisted-core[${PYTHON_USEDEP}]
 		dev-python/zope-interface[${PYTHON_USEDEP}]
-		mpi? ( dev-python/mpi4py )
+		mpi? ( dev-python/mpi4py[${PYTHON_USEDEP}] )
 		qt4? ( dev-python/PyQt4[opengl,webkit,${PYTHON_USEDEP}] )
 	)
 	qt4? (
@@ -77,8 +77,6 @@ RDEPEND="
 	tcl? ( dev-lang/tcl:0= )
 	tk? ( dev-lang/tk:0= )"
 DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	boost? ( >=dev-libs/boost-1.40.0[mpi?,${PYTHON_USEDEP}] )
 	doc? ( app-doc/doxygen )"
 
 S="${WORKDIR}/${MY_P}"
@@ -93,7 +91,8 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-4.0.1-xdmf-cstring.patch \
 		"${FILESDIR}"/${P}-removesqlite.patch \
 		"${FILESDIR}"/${PN}-4.0.1-gcc-4.7.patch \
-		"${FILESDIR}"/${P}-Protobuf.patch \
+		"${FILESDIR}"/${P}-protobuf.patch \
+		"${FILESDIR}"/${P}-protobuf-2.patch \
 		"${FILESDIR}"/${PN}-4.1.0-no-fatal-warnings.patch \
 		"${FILESDIR}"/${P}-vtk-freetype.patch
 
diff --git a/sci-visualization/paraview/paraview-4.0.1-r2.ebuild b/sci-visualization/paraview/paraview-4.3.1.ebuild
index 72935098ec49..7c484c0526be 100644
--- a/sci-visualization/paraview/paraview-4.0.1-r2.ebuild
+++ b/sci-visualization/paraview/paraview-4.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 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-r2.ebuild,v 1.3 2015/04/08 18:23:57 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/paraview-4.3.1.ebuild,v 1.1 2015/04/19 13:15:00 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-0.10.1
 	dev-libs/libxml2:2
 	dev-libs/protobuf
 	media-libs/freetype
@@ -33,8 +35,8 @@ RDEPEND="
 	media-libs/libtheora
 	media-libs/tiff:0=
 	sci-libs/hdf5[mpi=]
-	|| ( ( >=sci-libs/netcdf-4.2[hdf5] >=sci-libs/netcdf-cxx-4.2:3 )
-		~sci-libs/netcdf-4.1.3[cxx,hdf5] )
+	>=sci-libs/netcdf-4.2[hdf5]
+	>=sci-libs/netcdf-cxx-4.2:3
 	sys-libs/zlib
 	virtual/jpeg:0
 	virtual/opengl
@@ -55,7 +57,6 @@ RDEPEND="
 	python? (
 		${PYTHON_DEPS}
 		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/mpi4py
 		dev-python/numpy[${PYTHON_USEDEP}]
 		dev-python/sip[${PYTHON_USEDEP}]
 		dev-python/twisted-core
@@ -64,6 +65,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]
@@ -78,7 +80,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
@@ -87,12 +89,13 @@ pkg_setup() {
 
 src_prepare() {
 	# see patch headers for description
-	epatch "${FILESDIR}"/${P}-xdmf-cstring.patch \
-		"${FILESDIR}"/${P}-removesqlite.patch \
-		"${FILESDIR}"/${P}-gcc-4.7.patch \
-		"${FILESDIR}"/${P}-vtknetcd.patch \
-		"${FILESDIR}"/${P}-vtk-cg-path.patch \
-		"${FILESDIR}"/${P}-Protobuf.patch
+	epatch "${FILESDIR}"/${PN}-4.0.1-xdmf-cstring.patch \
+		"${FILESDIR}"/${PN}-4.2.0-removesqlite.patch \
+		"${FILESDIR}"/${PN}-4.0.1-gcc-4.7.patch \
+		"${FILESDIR}"/${PN}-4.2.0-protobuf.patch \
+		"${FILESDIR}"/${PN}-4.2.0-protobuf-2.patch \
+		"${FILESDIR}"/${PN}-4.1.0-no-fatal-warnings.patch \
+		"${FILESDIR}"/${PN}-4.2.0-vtk-freetype.patch
 
 	# lib64 fixes
 	sed -i \
@@ -107,7 +110,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 || {
@@ -120,15 +126,16 @@ 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 jsoncpp
 	# VTK_USE_SYSTEM_QTTESTING
 	# PARAVIEW_USE_SYSTEM_AUTOBAHN
 	local mycmakeargs=(
@@ -144,7 +151,9 @@ 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=ON
@@ -152,8 +161,8 @@ src_configure() {
 		-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
@@ -236,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)
@@ -245,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 +276,7 @@ src_install() {
 	# set up the environment
 	echo "LDPATH=${EPREFIX}/usr/${PVLIBDIR}" > "${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}