sci-libs/vtk: Version Bump; support offscreen rendering, #126270; unbundle as many as possible libs, #433481

Package-Manager: portage-2.2.8/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

8 files changed, 495 insertions, 15 deletions

diff --git a/sci-libs/vtk/ChangeLog b/sci-libs/vtk/ChangeLog
index da38b893ede5..cb5f6607fd0b 100644
--- a/sci-libs/vtk/ChangeLog
+++ b/sci-libs/vtk/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sci-libs/vtk
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.110 2013/07/23 14:12:22 kensington Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.111 2014/01/11 16:55:50 jlec Exp $
+
+*vtk-6.0.0 (11 Jan 2014)
+
+  11 Jan 2014; Justin Lecher <jlec@gentoo.org> +vtk-6.0.0.ebuild,
+  +files/vtk-6.0.0-install.patch, +files/vtk-6.0.0-netcdf.patch,
+  +files/vtk-6.0.0-system.patch, +files/vtk-6.0.0-vtkpython.patch,
+  metadata.xml:
+  Version Bump; support offscreen rendering, #126270; unbundle as many as
+  possible libs, #433481
 
   23 Jul 2013; Michael Palimaka <kensington@gentoo.org> vtk-5.10.0.ebuild,
   vtk-5.10.1.ebuild:
diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest
index a19d2052b43b..48df947b641a 100644
--- a/sci-libs/vtk/Manifest
+++ b/sci-libs/vtk/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX vtk-5.10.1-ffmpeg-1.patch 1626 SHA256 312402db11bbc47d1596a5c58ee127af6a5807dda2331df402ebcfe7e999ea7c SHA512 34a59c7229a9dbd63d2c346906536fc1d53965489ecb148b57fd2b4b71e7b428d3bd162aa008cc92d72c006720217bf9c72863f761b7cd9b7e2241be8c52f327 WHIRLPOOL 5319732317a82df89d37914f831bf516e66ff58cd5a4a7d2ae777d732590af6ec5f8dd9d90a59ac8f46c1e228483081ade46e0ee02c2bb6ce713fbfc4ce3c669
 AUX vtk-5.10.1-libav-9.patch 3474 SHA256 688b58df16c0fada2ef5ccca8c53a8029bd6b3a6eaaddec3a210ac880cba2120 SHA512 f22d8c215aa23b9e719598b034657a61092d326dd7e2ef0e7e68a1ff0d33e1a6523e0ae85fbc2a1e72c869a295b257563daef0842f67b27716ab2652d03bb447 WHIRLPOOL 2a0cf463926b4e06df02942a0f63aeb0a659da6f1ba85a456485691199de48d418ce2c222f39a3b69876961491bf3bcacb8b1272793e3f7785771cd474e8cb75
@@ -20,24 +20,37 @@ AUX vtk-5.6.1-libav-0.8.patch 2726 SHA256 719ebdc579b51dff5586fd8157c764ca5a735b
 AUX vtk-5.6.1-libpng15.patch 686 SHA256 4d651b007b91882b676172e069a4d86479045a1087eba062212f787509d1a88e SHA512 a7b7746d1619e2f6b551da8443a9298d08703bea7451d3a7d136449e8df7c6c18ad3272a3d90aeb6a08607065dcce336dc73cd6fa4841e3964c0215ef11b3e3d WHIRLPOOL fab93a578edbcad8e1a3f7b877c73b92a494e56d777ebff155a21ee7dee3e31e35f1e60677fdad6937d36da5560a5d5143b4c9cf8f8aa021bae517090576d70b
 AUX vtk-5.8.0-R.patch 2127 SHA256 a1be40bbc17704a614f929a4101df34ee7c327da09ee2eaee27468a9b55bb794 SHA512 957c6c0cc9203d090d530f78e7971d6f45c6d38ebb4ee82f60d79cdeea61c1a289d2826496a91bbf076f3e27cc9e328a351d56ca786839afe541afa095998c42 WHIRLPOOL 1a849f18eb102073d443932b42ef90cac73f87b787e898c50389f2418a524742180667ae37ddd420d4169aed98f0a5b698bc408c0be31bd1ca3577d11341f0e2
 AUX vtk-5.8.0-boost.patch 1264 SHA256 2611eb61261328f8b4a9f2721baade85554ebc91a7053fd78b9e7eb0500d981e SHA512 232ad44b456656d6bbcaf215a59eae4ec2c4df35f39055d24270f956d81bfc91a93090938ddd1ee5c677c5422d9eb4931c0f8fa325e860bccba163608441460b WHIRLPOOL 5f2fc86108a5bc54b92f311d3302fe1bb58bf7f3119d599f6d491e64b030624f0183b79fa50a29e11210284a2adee925a8e61509015da068930a2a8154a6bf1b
+AUX vtk-6.0.0-install.patch 964 SHA256 01a395a379491e0cf0a776a0c9228ffa5cdfce992b69ee3d8b381fce1eb8df56 SHA512 807531c1fbc9d15c165c41c2e47ffcb3a7f05adcbf4e28b18f7ab29ca87c14c7fcd10626ec2573c9397d88321192bf41524c23b9306f88fc9ca0f6358591302c WHIRLPOOL 308334d948a350f608af9dc3b0394837451bddd7b65271cb8704fa608a83ef78998b9f2a4f46d5be3843aa23df41cac48d24abd3af49a407b6d9ed808d23e35c
+AUX vtk-6.0.0-netcdf.patch 3121 SHA256 76de7de43f6bf30b7c049ef4365f9dcef89ff02ab0537fee2e6c356184c51d28 SHA512 cb4f99dc794f2b1bc2a29b24030e55373e5e6f552a057c3484268cb013affe742e411a1ee30f31c53ab74e4436d61e235f1ffcfae8c8e2ae0f66ec7358709870 WHIRLPOOL 579979a187eefe6841b3019a7e70bb7799bb3236651cc13e708234fff24bce6166ca646c4121665c148e39f019c4b2aaeaa7f3803048993b9d4fd9b165890b78
+AUX vtk-6.0.0-system.patch 1405 SHA256 f6576f02922e6672805db7a32881779c69bbe04df472baf1fda4aec2266e9484 SHA512 97c4fbe10cd26e5d51745236acdd88a5a3371dac1abf7aa8bd5fd62742646634c8bf71d77393f9015662994215f11ebaf6ee0c0128e48940a53d0128c3e59bea WHIRLPOOL f4449b22d8b0a193bebedde16b1deddbc82cdcbd8a3e947b039f0c51d742e495bc8f729930f11ab8b84672a9d0b505ef421dae9f1d173f7879ffe3a20dd59fb9
+AUX vtk-6.0.0-vtkpython.patch 583 SHA256 93280898c89da7f99962fe5536006ae52bf488162021c42b8f0b98220a8c35e1 SHA512 49b4749aa16bdf61c83f5de0f40a3da7b1212793855e537d1cb97ab489260862c87b936292add17a318d4940e634fa2b043c5d7d8a73effcedbb85e5ab00533a WHIRLPOOL 43b8d3701b274a76b070e639733dc1e4bfde4f96ccf1e41ebecbbee8872555c6452ed300e47e3b56778dcd9c930e4a5836038938f82951758fe2f3d158597fe1
 DIST vtk-5.10.0.tar.gz 24803686 SHA256 9dd8c750f5d974ca92734d0168db6b534109b9ec30461eb7082a9f71d4716392 SHA512 8603098fa316fa86f624cf05eed3882158aaf098fe371754fec93fe96ebbf965a5315b3bfc34784f8adb0b46a545bd326c80e11e11157f3f96d33b36fb177554 WHIRLPOOL b7265e7e2430ad1de90987f8c54c130734d603f27e806a7666a292334e6feb43b4883e68b77004b9c1eb9bfe488db59ccf89052745e1f68153d7bd3bfabdb43f
 DIST vtk-5.10.1.tar.gz 24804193 SHA256 f1a240c1f5f0d84e27b57e962f8e4a78b166b25bf4003ae16def9874947ebdbb SHA512 2e4ab39293620b553c91e2275a813ce88eaa39c7f4c3ec6041d88a71fa736ee38aad31ec66897440d4025d5c0933d16c1d421ac5b91cd8a362f6f2e6569bde22 WHIRLPOOL 4b7aef091b2a1d9c14b0f2ba9495b1809771c92c6c2c242ce3a723b43878f9c79d21214f6db8b16c726542f6375d8932c7ed50ceadc3a07724f6ecdb46492e0e
-DIST vtkDocHtml-5.10.0.tar.gz 176529461 SHA256 28d7e1bfc9f9a4d225d15b9f46cec18f89df106a161d0cee29fcc6f071d3b01a
+DIST vtk-6.0.0.tar.gz 24170173 SHA256 426df543cffeacf21154dddcd2a6efbd91a586570a07a0db4c426d3e0acd10e4 SHA512 ac238e2d228df4fc4d324826b8729af9ab3274039d5abf834f013fb4deaddc116ba2b1b24fb93aaf4b1bfc4bb321d19bc05566883cf3db1f982c9650d77583e8 WHIRLPOOL b8619e254f97392dae01b8e2376bd70a07ce21504580d29844fcf1ab5621d85ba12bfd6047b4f90afd2b648d8b6c17e4ce5d789d6e1f84b5a4f847de5ee376b9
+DIST vtkDocHtml-5.10.0.tar.gz 176529461 SHA256 28d7e1bfc9f9a4d225d15b9f46cec18f89df106a161d0cee29fcc6f071d3b01a SHA512 f713238e51e3c82c78ed8ac757b99c4847a7f0876de5051f8a251802029781d4d4778843616d008dbb1a133818e30b5e11ae527fe9a549deadc373c22bf874e9 WHIRLPOOL 1055870b5395e70bfc1614cec5587970a0d4a892769c81c67eb767cbb763e05415e94d600fc930b9051a0077ecef35fd15d82d429eef922dad87392a0e4be3bf
 DIST vtkDocHtml-5.10.1.tar.gz 178278963 SHA256 1447d7e07a615c0c6d66cce2bfc6b2f4a6eaec03c132d13345d225ee6f309944 SHA512 c1c8bf1b3c94ab79b1661b3197788ded31c3aef5114d830866ed0a6dd90d3a6c50ed27cd7840a512065ad2b15fd8bcbc61787fbbd00216a1becb2419eb172735 WHIRLPOOL b3ba92938fb4894522c5b930767b4e4c11756e1aae1c100a42ab4a592f7d4a848ea1996b3956c26cb17cce4cb0fd43d8c92efec42a802e318439a653bcc398e9
-DIST vtkdata-5.10.0.tar.gz 88635192 SHA256 3b2e44feea87f57dc356e924863f8b787a42627c92838138b376b383b4915b2c
+DIST vtkDocHtml-6.0.0.tar.gz 204228463 SHA256 f5324c4c197b0cacd19bf1e5721bb012d753d49526e224d9f2dd7412f34e4434 SHA512 b6d5660f3ae6046c63b22b613cab6822f45f6b30a09522277e32f941c75dc48e8c92abc4d7f02b17e3f4d8e625de6dce7f000acc79e2d588a13d1577c139291a WHIRLPOOL b951c4ee62639c6bada2e02c2fceddbdb730c76d80c61a6ed013d8d9878b78a697158f41f53d68b5d62e4baa1f9ecb88e2437490da7610970622a40ecb14db1f
+DIST vtkdata-5.10.0.tar.gz 88635192 SHA256 3b2e44feea87f57dc356e924863f8b787a42627c92838138b376b383b4915b2c SHA512 2b0bbd00ad57e27a085f24340900a1b9791936bb91267cdf38b35c01723910714c07679af03d1e4ac68f557c3abcb1e3a18af10526763a91a69e238fb2b40443 WHIRLPOOL 8596cf852c2914fca0754fffe8e1c72caa248df4c12107033427870d970bad7e903430610305685ab1cd491716e902d6a694d9395f44baf32f53909aac253609
 DIST vtkdata-5.10.1.tar.gz 88642678 SHA256 c526a5eeb73693597043a89d401ef5b8f0c6f6eddb82e03ad205f013ee9edf7c SHA512 3655ecd4bd6f05e3266c19d67c59867e12d4681e159869b7673948a8ba3966f958bd1a1ef024321b66f3ad649b80fc62e5323f8bd700d34fdd95645e7fe5ef32 WHIRLPOOL b65e533dc3a092ae4944bfd1ca850ab3b7ba95c62c654e0c03ac8c689d4270eaf58ae91519200c00b94ad3108f4ce3bc16656bf62a7e10dc627dea736594831d
 EBUILD vtk-5.10.0.ebuild 7496 SHA256 95590f599548bc7b2123823a2f5bd7a121d614d5ba19cb30f0eccfe0083528a1 SHA512 9105fff6f53161454dd7f7d3d36b6f5de5e6a53af0e317181913ff0c453e7274829768f1bdceaa171744d37c1cdce75da3fd414d27abcafec4e1d48c39811b47 WHIRLPOOL 7c826421edeb3367e37843f294229ef0071637d93dc79cb3749a85c2a4a5a8c5417a21e132a746c39b5f2441d7dea2bd145b97ed91b3c4672f8a39e15199d1a9
 EBUILD vtk-5.10.1.ebuild 7608 SHA256 afd98fb01d1d391397d4ee22d8fb302e1fd63002944d8a78363aa74ffb057750 SHA512 c30578c4363dfa973ac6e47642ba9ca89e81ecc4f8603e8bc73456334887e430ccc13249628524d5797932cb46833f16ba1453a5819350ab96e4d0ff98e5aa12 WHIRLPOOL 57541ba69ade0992fb9a13cad13e2938c77e905a2954e2009c60ddbbdca632bfed7e52ae62ff07504a80c5dca49ad5822c9d3c0c41ae1f97709c6e8bb5a2bf78
-MISC ChangeLog 17887 SHA256 a7950bd9221e71df77adb9b649376a8487aa283f08301e10486e1d9a74b7116f SHA512 a32e25fb1e64edab25295bd4c8291c627232ce5bb1d047446ae8bf51eea4c7f6674971fb9a8215c5c23a56cba99dff2092c6026f0c53603910538629508f6b44 WHIRLPOOL 87f15f249d59ab55316f7e8cf4dc5d8815b6d9970fb3d6ec4fb0363395c652308676e70c6fc884b9458a64cd0fa62b1c7da4d960f1ec23c67c124ae6bbc3d16e
-MISC metadata.xml 563 SHA256 2fedd09c2e8b8c709641c6490e9b4ea9190d4c98cafa958386ed957bc8687ce9 SHA512 cb5a7f2db34a3e35a7115240ad21fce20bf771613dc42fe57c8e0ea1d004ea40e06fb57970285ebcca290bb390b29c10d7aa5d20a3df7e8dfeb314db152c3152 WHIRLPOOL 2540838d0c619af440b8269a46c58045cb6c79e73525b75ea891af381f7561c106712a1881c62cd0d4de7ddd7cc6926ab7c5a7ea59adfa7ebfb312dd1712ec45
+EBUILD vtk-6.0.0.ebuild 8893 SHA256 6755c7ab33575e7ee1898397d07cf3e4b1471dcc1f8c604ed0184dadb11d0d15 SHA512 366e7f0781070403ea8504039e10b2395085807b000068010a57b5bae056d44484253abe7bc7b198d8ad8571d4bca2776cabdb16305655049d8b14a23be0aac3 WHIRLPOOL 37e94099a9d77d91262fce1a59ba9b3ed531319a98ad5b8eed4c04fd9d6fb64492f6e9c135cbdc6530330ef4c3eb00d8ad9b5e823e34c6a63889355a93227c09
+MISC ChangeLog 18221 SHA256 abf478a22f5948d780b156c93f7e03c45e4e309f516c31ce2c77c21f19e8b848 SHA512 9037510cd5aa8ef5757d7e0094bcce85fee9afb3ba437c4e9ef5d872efd5fec0f228e3a7d3d77f1b55db57871bf6e2c07fbe97049e7ee1873d000d7b704e5478 WHIRLPOOL 7312922c9a9808430e8dd0309c784e8bd17495202c6d0979956f13bcc6716ff693d5b244949162f8720af4b7492476c1b8c353edbbd088810d43892ebb3ff288
+MISC metadata.xml 802 SHA256 1231c68c26cabb428cdbcceef9d861221da64ad74e27e2fb90fd4a33de8b77f5 SHA512 c9363d3988a51151aafc0b5d2ed7ffc7c76578c8e075a723ed29fac8b3aeb6991915508d111847b28fb7368d43b8307cbd97b726d5d8f87d71ae593938d7291d WHIRLPOOL 76fd0a5cc8aa66331d62cae3cc5fd542480a709608fd155602c87b6234d68b06659d67849446b190d27bcd844acddd6ab63939a9399f4bb64ed6d87f375eeb2a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJR7o7TAAoJEMbwO6tnXQ0sx7sH/R9Vz+OFYD8077Z/OuD2mCaP
-ubzSQ2Vrz50dmwR4o5pbq2VZzt189LQVKqBTplkN1UzNd9j3nTG41FOWoeZtR2cZ
-kgYeYrpyYHRPB3WpxH3GidCfbaaJGLfeLkOTRMltga4dByJQzZd6gmLp3FXshRQE
-1T0TMtAD2C24iLCa2UscvDoCMpfLZ8oa/ZHuWU4lCcAJG8TML82MRp0ppe8NxUNq
-LJvAzGxql3Dt5Dz9xjADxpNTr5aG7w/f7dUc3Umu/j1L8vQzHkoC6Y9WDjQehuz+
-zhwXkd+qHheLX9ik6S8iYAQ7AQz1QoJUA1WvJR1dgmK1UAqLo5sYZghFgQeYUls=
-=rRym
+iQIcBAEBCgAGBQJS0XeXAAoJELnU8jG9FVirZAsP/0/DUlT0AO5+H24gof7Tv228
+fxjez7kHdlBfD8qi8lcJNhMpWRlBqYUoLtgdxlYOeird9SEsKm/d8o6hFkgIscMd
+x28I0x/vQsBeU4o5oTX2Sw65h+SeJrQrToAPk5GsaWSahgBXWUbrX3I6AwkD2GlT
+R4sfISKtmcHIOsfdtGH4SlSGkDh7aLkzG5CbeCF5fierFv7ScqG94+N0cfT5LHlH
+yzGTMQeD6hKlQuD4cU0wAKDBUX+2EA26D8anjZs7j/S7lLypac95MARJveDQ8Jjj
+aTjsCKDKbmbIFKyYkt8VhePNxCVKlVf2xwumndkPlMA3+octXH8e9kSMqZOtvFuk
+LtQeOflpaa5enAmJ9J8NyiPA9zPSWyJy0kL7LoUlkg+Ui+vkQ5BT2zaymPCwHQhf
++DyGxyhawYv6TYCun8j9unVGj+jp/O9+MSPkSeF+0y2aEER+hj6GhHv4UvtgBNrh
+Bv4T138ERKS1j60D4a0sFAcwWoXkwgWTNy8g6Pr8YHaD3ukbRTRUglB9IQ3zKp74
+uL1Sx587RgHNao/xVW4ckWgrg+spTweUfhk6EUVccD4cwO9q1Iuac4i8q4zuMDTr
+xkUODqSgq7+QxE2G8+43BTglt0PTH6oWb2l+2hix7pbLUA8u0vKox1eXwvVHcaAM
+9lv8Qx+PRGydRxMoeMz3
+=ILbr
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/vtk/files/vtk-6.0.0-install.patch b/sci-libs/vtk/files/vtk-6.0.0-install.patch
new file mode 100644
index 000000000000..a97755ab69ff
--- /dev/null
+++ b/sci-libs/vtk/files/vtk-6.0.0-install.patch
@@ -0,0 +1,19 @@
+diff -up VTK6.0.0/CMake/vtkModuleTop.cmake.install VTK6.0.0/CMake/vtkModuleTop.cmake
+--- VTK6.0.0/CMake/vtkModuleTop.cmake.install	2013-06-12 13:47:10.000000000 -0600
++++ VTK6.0.0/CMake/vtkModuleTop.cmake	2013-07-12 16:15:15.706008475 -0600
+@@ -330,10 +330,15 @@ if (NOT VTK_INSTALL_NO_DEVELOPMENT)
+                 CMake/pythonmodules.h.in
+                 CMake/UseVTK.cmake
+                 CMake/FindTCL.cmake
++                CMake/TopologicalSort.cmake
+                 CMake/vtkTclTkMacros.cmake
+                 CMake/vtk-forward.c.in
+                 CMake/vtkForwardingExecutable.cmake
++                CMake/vtkGroups.cmake
+                 CMake/vtkJavaWrapping.cmake
++                CMake/vtkMakeInstantiator.cmake
++                CMake/vtkMakeInstantiator.cxx.in
++                CMake/vtkMakeInstantiator.h.in
+                 CMake/vtkModuleAPI.cmake
+                 CMake/vtkModuleHeaders.cmake.in
+                 CMake/vtkModuleInfo.cmake.in
diff --git a/sci-libs/vtk/files/vtk-6.0.0-netcdf.patch b/sci-libs/vtk/files/vtk-6.0.0-netcdf.patch
new file mode 100644
index 000000000000..df0ef94890f7
--- /dev/null
+++ b/sci-libs/vtk/files/vtk-6.0.0-netcdf.patch
@@ -0,0 +1,75 @@
+diff -up VTK/IO/NetCDF/CMakeLists.txt.netcdf VTK/IO/NetCDF/CMakeLists.txt
+--- VTK/IO/NetCDF/CMakeLists.txt.netcdf	2013-01-28 14:44:35.000000000 -0700
++++ VTK/IO/NetCDF/CMakeLists.txt	2013-01-28 15:40:00.825176295 -0700
+@@ -10,5 +10,5 @@ set(Module_SRCS
+ 
+ vtk_module_library(vtkIONetCDF ${Module_SRCS})
+ 
+-target_link_libraries(vtkIONetCDF vtkNetCDF_cxx)
++target_link_libraries(vtkIONetCDF netcdf_c++ netcdf)
+ set_target_properties(vtkIONetCDF PROPERTIES LINK_INTERFACE_LIBRARIES "")
+diff -up VTK/IO/ParallelNetCDF/CMakeLists.txt.netcdf VTK/IO/ParallelNetCDF/CMakeLists.txt
+--- VTK/IO/ParallelNetCDF/CMakeLists.txt.netcdf	2013-01-28 14:44:35.000000000 -0700
++++ VTK/IO/ParallelNetCDF/CMakeLists.txt	2013-01-28 15:40:00.825176295 -0700
+@@ -8,4 +8,4 @@ set(Module_SRCS
+ 
+ vtk_module_library(vtkIOParallelNetCDF ${Module_SRCS})
+ 
+-target_link_libraries(vtkIOParallelNetCDF vtkNetCDF_cxx)
++target_link_libraries(vtkIOParallelNetCDF netcdf)
+diff -up VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt.netcdf VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt
+--- VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt.netcdf	2013-01-28 14:44:36.000000000 -0700
++++ VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt	2013-01-28 15:40:27.534030910 -0700
+@@ -241,7 +241,7 @@ ENDIF(APPLE)
+ 
+ 
+ VTK_ADD_LIBRARY(vtkexoIIc ${cbind_SRCS})
+-TARGET_LINK_LIBRARIES(vtkexoIIc vtkNetCDF)
++TARGET_LINK_LIBRARIES(vtkexoIIc netcdf)
+ 
+ #INCLUDE (${CMAKE_ROOT}/Modules/Dart.cmake)
+ 
+diff -up VTK/ThirdParty/netcdf/CMakeLists.txt.netcdf VTK/ThirdParty/netcdf/CMakeLists.txt
+--- VTK/ThirdParty/netcdf/CMakeLists.txt.netcdf	2013-01-28 14:44:36.000000000 -0700
++++ VTK/ThirdParty/netcdf/CMakeLists.txt	2013-01-28 15:40:00.825176295 -0700
+@@ -1,8 +1,12 @@
+ set(vtknetcdf_THIRD_PARTY 1)
+-set(vtknetcdf_LIBRARIES vtkNetCDF vtkNetCDF_cxx)
+-set(vtknetcdf_INCLUDE_DIRS
+-  ${vtknetcdf_SOURCE_DIR}/vtknetcdf/include
+-  ${vtknetcdf_BINARY_DIR}/vtknetcdf
+-  )
++if(NOT VTK_USE_SYSTEM_NETCDF)
++  set(vtknetcdf_LIBRARIES vtkNetCDF vtkNetCDF_cxx)
++  set(vtknetcdf_INCLUDE_DIRS
++    ${vtknetcdf_SOURCE_DIR}/vtknetcdf/include
++    ${vtknetcdf_BINARY_DIR}/vtknetcdf
++    )
++  add_subdirectory(vtknetcdf)
++else(NOT VTK_USE_SYSTEM_NETCDF)
++  set(vtknetcdf_LIBRARIES netcdf)
++endif()
+ vtk_module_export_info()
+-add_subdirectory(vtknetcdf)
+diff -up VTK/ThirdParty/netcdf/vtk_netcdfcpp.h.netcdf VTK/ThirdParty/netcdf/vtk_netcdfcpp.h
+--- VTK/ThirdParty/netcdf/vtk_netcdfcpp.h.netcdf	2013-01-28 14:44:36.000000000 -0700
++++ VTK/ThirdParty/netcdf/vtk_netcdfcpp.h	2013-01-28 15:40:00.826176289 -0700
+@@ -16,6 +16,6 @@
+ #define __vtk_netcdfcpp_h
+ 
+ /* Use the netcdf library configured for VTK.  */
+-#include <vtknetcdf/cxx/netcdfcpp.h>
++#include <netcdfcpp.h>
+ 
+ #endif
+diff -up VTK/ThirdParty/netcdf/vtk_netcdf.h.netcdf VTK/ThirdParty/netcdf/vtk_netcdf.h
+--- VTK/ThirdParty/netcdf/vtk_netcdf.h.netcdf	2013-01-28 14:44:36.000000000 -0700
++++ VTK/ThirdParty/netcdf/vtk_netcdf.h	2013-01-28 15:40:00.826176289 -0700
+@@ -16,6 +16,6 @@
+ #define __vtk_netcdf_h
+ 
+ /* Use the netcdf library configured for VTK.  */
+-#include <vtknetcdf/include/netcdf.h>
++#include <netcdf.h>
+ 
+ #endif
diff --git a/sci-libs/vtk/files/vtk-6.0.0-system.patch b/sci-libs/vtk/files/vtk-6.0.0-system.patch
new file mode 100644
index 000000000000..3e5762fe5d46
--- /dev/null
+++ b/sci-libs/vtk/files/vtk-6.0.0-system.patch
@@ -0,0 +1,27 @@
+diff -up VTK6.0.0/CMake/vtkModuleMacros.cmake.system VTK6.0.0/CMake/vtkModuleMacros.cmake
+--- VTK6.0.0/CMake/vtkModuleMacros.cmake.system	2013-06-12 13:47:10.000000000 -0600
++++ VTK6.0.0/CMake/vtkModuleMacros.cmake	2013-12-27 20:59:39.548152746 -0700
+@@ -613,7 +613,7 @@ macro(vtk_module_third_party _pkg)
+     message(FATAL_ERROR "Cannot specify both LIBRARIES and NO_LIBRARIES")
+   endif()
+ 
+-  option(VTK_USE_SYSTEM_${_upper} "Use system-installed ${_pkg}" OFF)
++  option(VTK_USE_SYSTEM_${_upper} "Use system-installed ${_pkg}" ${VTK_USE_SYSTEM_LIBRARIES})
+   mark_as_advanced(VTK_USE_SYSTEM_${_upper})
+ 
+   if(VTK_USE_SYSTEM_${_upper})
+diff -up VTK6.0.0/CMakeLists.txt.system VTK6.0.0/CMakeLists.txt
+--- VTK6.0.0/CMakeLists.txt.system	2013-06-12 13:47:10.000000000 -0600
++++ VTK6.0.0/CMakeLists.txt	2013-12-27 20:59:39.548152746 -0700
+@@ -107,6 +107,11 @@ set(VTK_INSTALL_INCLUDE_DIR_CM24 ${VTK_I
+ set(VTK_INSTALL_DOXYGEN_DIR_CM24 ${VTK_INSTALL_DATA_DIR}/doxygen)
+ 
+ #-----------------------------------------------------------------------------
++# Do we try to use system libraries by default?
++OPTION(VTK_USE_SYSTEM_LIBRARIES "Use the system's libraries by default." OFF)
++MARK_AS_ADVANCED(VTK_USE_SYSTEM_LIBRARIES)
++
++#-----------------------------------------------------------------------------
+ # The third party macros are still used in one or two third party builds.
+ include(vtkThirdParty)
+ 
diff --git a/sci-libs/vtk/files/vtk-6.0.0-vtkpython.patch b/sci-libs/vtk/files/vtk-6.0.0-vtkpython.patch
new file mode 100644
index 000000000000..f310479e8ab8
--- /dev/null
+++ b/sci-libs/vtk/files/vtk-6.0.0-vtkpython.patch
@@ -0,0 +1,12 @@
+diff -up VTK6.0.0/Wrapping/Python/CMakeLists.txt.vtkpython VTK6.0.0/Wrapping/Python/CMakeLists.txt
+--- VTK6.0.0/Wrapping/Python/CMakeLists.txt.vtkpython	2013-06-12 13:47:10.000000000 -0600
++++ VTK6.0.0/Wrapping/Python/CMakeLists.txt	2013-07-26 16:44:19.954295281 -0600
+@@ -371,3 +371,8 @@ endif()
+ 
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/setup.py.in
+   ${CMAKE_CURRENT_BINARY_DIR}/setup.py @ONLY IMMEDIATE)
++
++if(NOT VTK_INSTALL_NO_RUNTIME AND NOT VTK_INSTALL_NO_PYTHON)
++  install(TARGETS vtkpython ${VTKPYTHON_EXECUTABLE}
++    DESTINATION ${VTK_INSTALL_RUNTIME_DIR})
++endif()
diff --git a/sci-libs/vtk/metadata.xml b/sci-libs/vtk/metadata.xml
index d61334b677ae..1905f110a0c6 100644
--- a/sci-libs/vtk/metadata.xml
+++ b/sci-libs/vtk/metadata.xml
@@ -12,6 +12,10 @@
     <flag name="chemistry">Add chemistry support</flag>
     <flag name="cg">Use nvidia's cg shaders</flag>
     <flag name="patented">Build patented classes</flag>
+    <flag name="imaging">Building Imaging modules</flag>
+    <flag name="offscreen">Offscreen rendering through OSMesa</flag>
+    <flag name="rendering">Building Redering modules</flag>
+    <flag name="views">Building Views modules</flag>
     <flag name="R">Enable support for dev-lang/R</flag>
   </use>
 </pkgmetadata>
diff --git a/sci-libs/vtk/vtk-6.0.0.ebuild b/sci-libs/vtk/vtk-6.0.0.ebuild
new file mode 100644
index 000000000000..1c057081cfba
--- /dev/null
+++ b/sci-libs/vtk/vtk-6.0.0.ebuild
@@ -0,0 +1,321 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-6.0.0.ebuild,v 1.1 2014/01/11 16:55:50 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit eutils flag-o-matic java-pkg-opt-2 python-single-r1 qt4-r2 versionator toolchain-funcs cmake-utils virtualx
+
+# Short package version
+SPV="$(get_version_component_range 1-2)"
+
+DESCRIPTION="The Visualization Toolkit"
+HOMEPAGE="http://www.vtk.org/"
+SRC_URI="
+	http://www.${PN}.org/files/release/${SPV}/${P/_rc/.rc}.tar.gz
+	doc? ( http://www.${PN}.org/files/release/${SPV}/${PN}DocHtml-${PV}.tar.gz )"
+
+LICENSE="BSD LGPL-2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+IUSE="
+	aqua boost cg doc examples imaging ffmpeg java mpi mysql odbc
+	offscreen postgres python qt4 rendering test theora tk tcl
+	video_cards_nvidia views R +X"
+
+REQUIRED_USE="
+	java? ( qt4 )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	tcl? ( rendering )
+	test? ( python )
+	tk? ( tcl )
+	^^ ( X aqua offscreen )"
+
+RDEPEND="
+	dev-libs/expat
+	dev-libs/libxml2:2
+	media-libs/freetype
+	media-libs/libpng
+	media-libs/mesa
+	media-libs/libtheora
+	media-libs/tiff
+	sci-libs/exodusii
+	sci-libs/hdf5
+	sci-libs/netcdf-cxx:3
+	sys-libs/zlib
+	virtual/jpeg
+	virtual/opengl
+	x11-libs/gl2ps
+	x11-libs/libX11
+	x11-libs/libXmu
+	x11-libs/libXt
+	boost? ( >=dev-libs/boost-1.40.0[mpi?] )
+	cg? ( media-gfx/nvidia-cg-toolkit )
+	examples? (
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+		sci-libs/vtkdata
+	)
+	ffmpeg? ( virtual/ffmpeg )
+	java? ( >=virtual/jre-1.5 )
+	mpi? ( virtual/mpi[cxx,romio] )
+	mysql? ( virtual/mysql )
+	odbc? ( dev-db/unixODBC )
+	offscreen? ( media-libs/mesa[osmesa] )
+	postgres? ( dev-db/postgresql-base )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/sip[${PYTHON_USEDEP}]
+	)
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+		dev-qt/qtopengl:4
+		dev-qt/qtsql:4
+		dev-qt/qtwebkit:4
+		python? ( dev-python/PyQt4[${PYTHON_USEDEP}] )
+		)
+	tcl? ( dev-lang/tcl )
+	tk? ( dev-lang/tk )
+	video_cards_nvidia? ( media-video/nvidia-settings )
+	R? ( dev-lang/R )"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+	java? ( >=virtual/jdk-1.5 )
+	test? ( sci-libs/vtkdata )"
+
+S="${WORKDIR}"/VTK${PV}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-cg-path.patch
+	"${FILESDIR}"/${P}-install.patch
+	"${FILESDIR}"/${P}-system.patch
+	"${FILESDIR}"/${P}-netcdf.patch
+	"${FILESDIR}"/${P}-vtkpython.patch
+	)
+
+RESTRICT=test
+
+pkg_setup() {
+	use java && java-pkg-opt-2_pkg_setup
+	use python && python-single-r1_pkg_setup
+
+	append-cppflags -D__STDC_CONSTANT_MACROS -D_UNICODE
+}
+
+src_prepare() {
+	sed \
+		-e 's:libproj4:libproj:g' \
+		-e 's:lib_proj.h:lib_abi.h:g' \
+		-i CMake/FindLIBPROJ4.cmake || die
+
+	local x
+	for x in expat freetype gl2ps hdf5 jpeg libxml2 netcdf oggtheora png tiff zlib; do
+		rm -r ThirdParty/${x}/vtk${x} || die
+	done
+
+	if use examples || use test; then
+		# Replace relative path ../../../VTKData with
+		# otherwise it will break on symlinks.
+		grep -rl '\.\./\.\./\.\./\.\./VTKData' . | xargs \
+			sed \
+				-e "s|\.\./\.\./\.\./\.\./VTKData|${EPREFIX}/usr/share/vtk/data|g" \
+				-e "s|\.\./\.\./\.\./\.\./\.\./VTKData|${EPREFIX}/usr/share/vtk/data|g" \
+				-i || die
+	fi
+
+	use java && export JAVA_HOME="${EPREFIX}/etc/java-config-2/current-system-vm"
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	# general configuration
+	local mycmakeargs=(
+		-Wno-dev
+#		-DCMAKE_SKIP_RPATH=YES
+		-DVTK_DIR="${S}"
+		-DVTK_INSTALL_LIBRARY_DIR=$(get_libdir)
+		-DVTK_DATA_ROOT:PATH="${EPREFIX}/usr/share/${PN}/data"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
+		-DVTK_CUSTOM_LIBRARY_SUFFIX=""
+		-DBUILD_SHARED_LIBS=ON
+		-DVTK_USE_SYSTEM_EXPAT=ON
+		-DVTK_USE_SYSTEM_FREETYPE=ON
+		-DVTK_USE_SYSTEM_FreeType=ON
+		-DVTK_USE_SYSTEM_GL2PS=ON
+		-DVTK_USE_SYSTEM_HDF5=ON
+		-DVTK_USE_SYSTEM_JPEG=ON
+		-DVTK_USE_SYSTEM_LIBPROJ4=OFF
+#		-DLIBPROJ4_DIR="${EPREFIX}/usr"
+		-DVTK_USE_SYSTEM_LIBXML2=ON
+		-DVTK_USE_SYSTEM_LibXml2=ON
+		-DVTK_USE_SYSTEM_NETCDF=ON
+		-DVTK_USE_SYSTEM_OGGTHEORA=ON
+		-DVTK_USE_SYSTEM_PNG=ON
+		-DVTK_USE_SYSTEM_TIFF=ON
+#		-DVTK_USE_SYSTEM_XDMF2=ON
+		-DVTK_USE_SYSTEM_ZLIB=ON
+		-DVTK_USE_SYSTEM_LIBRARIES=ON
+		-DVTK_USE_GL2PS=ON
+		-DVTK_USE_PARALLEL=ON
+	)
+
+	mycmakeargs+=(
+		-DVTK_EXTRA_COMPILER_WARNINGS=ON
+		-DVTK_Group_StandAlone=ON
+	)
+
+	mycmakeargs+=(
+		$(cmake-utils_use_build doc DOCUMENTATION)
+		$(cmake-utils_use_build examples EXAMPLES)
+		$(cmake-utils_use_build test TESTING)
+		$(cmake-utils_use_build test VTK_BUILD_ALL_MODULES_FOR_TESTS)
+		$(cmake-utils_use doc DOCUMENTATION_HTML_HELP)
+		$(cmake-utils_use imaging VTK_Group_Imaging)
+		$(cmake-utils_use mpi VTK_Group_MPI)
+		$(cmake-utils_use qt4 VTK_Group_Qt)
+		$(cmake-utils_use rendering VTK_Group_Rendering)
+		$(cmake-utils_use tk VTK_Group_Tk)
+		$(cmake-utils_use views VTK_Group_Views)
+		$(cmake-utils_use java VTK_WRAP_JAVA)
+		$(cmake-utils_use python VTK_WRAP_PYTHON)
+		$(cmake-utils_use python VTK_WRAP_PYTHON_SIP)
+		$(cmake-utils_use tcl VTK_WRAP_TCL)
+#		-DVTK_BUILD_ALL_MODULES=ON
+	)
+
+	mycmakeargs+=(
+		$(cmake-utils_use boost VTK_USE_BOOST)
+		$(cmake-utils_use cg VTK_USE_CG_SHADERS)
+		$(cmake-utils_use odbc VTK_USE_ODBC)
+		$(cmake-utils_use offscreen VTK_USE_OFFSCREEN)
+		$(cmake-utils_use offscreen VTK_OPENGL_HAS_OSMESA)
+		$(cmake-utils_use theora VTK_USE_OGGTHEORA_ENCODER)
+		$(cmake-utils_use ffmpeg VTK_USE_FFMPEG_ENCODER)
+		$(cmake-utils_use video_cards_nvidia VTK_USE_NVCONTROL)
+		$(cmake-utils_use R Module_vtkFiltersStatisticsGnuR)
+		$(cmake-utils_use X VTK_USE_X)
+	)
+
+	# Apple stuff, does it really work?
+	mycmakeargs+=( $(cmake-utils_use aqua VTK_USE_COCOA) )
+
+	if use java; then
+#		local _ejavahome=${EPREFIX}/etc/java-config-2/current-system-vm
+#
+#	mycmakeargs+=(
+#			-DJAVAC=${EPREFIX}/usr/bin/javac
+#			-DJAVAC=$(java-config -c)
+#			-DJAVA_AWT_INCLUDE_PATH=${JAVA_HOME}/include
+#			-DJAVA_INCLUDE_PATH:PATH=${JAVA_HOME}/include
+#			-DJAVA_INCLUDE_PATH2:PATH=${JAVA_HOME}/include/linux
+#		)
+#
+		if [ "${ARCH}" == "amd64" ]; then
+			mycmakeargs+=( -DJAVA_AWT_LIBRARY="${JAVA_HOME}/jre/lib/${ARCH}/libjawt.so;${JAVA_HOME}/jre/lib/${ARCH}/xawt/libmawt.so" )
+		else
+			mycmakeargs+=( -DJAVA_AWT_LIBRARY="${JAVA_HOME}/jre/lib/i386/libjawt.so;${JAVA_HOME}/jre/lib/i386/xawt/libmawt.so" )
+		fi
+	fi
+	if use python; then
+		mycmakeargs+=(
+			-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+			-DPYTHON_LIBRARY="$(python_get_library_path)"
+			-DSIP_PYQT_DIR="${EPREFIX}/usr/share/sip"
+			-DSIP_INCLUDE_DIR="$(python_get_includedir)"
+			-DVTK_PYTHON_INCLUDE_DIR="$(python_get_includedir)"
+			-DVTK_PYTHON_LIBRARY="$(python_get_library_path)"
+			-DVTK_PYTHON_SETUP_ARGS:STRING="--prefix=${PREFIX} --root=${D}"
+		)
+	fi
+
+	if use qt4; then
+		mycmakeargs+=(
+			-DVTK_USE_QVTK=ON
+			-DVTK_USE_QVTK_OPENGL=ON
+			-DVTK_USE_QVTK_QTOPENGL=ON
+			-DQT_WRAP_CPP=ON
+			-DQT_WRAP_UI=ON
+			-DVTK_INSTALL_QT_DIR=/$(get_libdir)/qt4/plugins/designer
+			-DDESIRED_QT_VERSION=4
+			-DQT_MOC_EXECUTABLE="${EPREFIX}/usr/bin/moc"
+			-DQT_UIC_EXECUTABLE="${EPREFIX}/usr/bin/uic"
+			-DQT_INCLUDE_DIR="${EPREFIX}/usr/include/qt4"
+			-DQT_QMAKE_EXECUTABLE="${EPREFIX}/usr/bin/qmake"
+		)
+	fi
+
+	if use R; then
+		mycmakeargs+=(
+#			-DR_LIBRARY_BLAS=$($(tc-getPKG_CONFIG) --libs blas)
+#			-DR_LIBRARY_LAPACK=$($(tc-getPKG_CONFIG) --libs lapack)
+			-DR_LIBRARY_BLAS=/usr/lib64/R/lib/libR.so
+			-DR_LIBRARY_LAPACK=/usr/lib64/R/lib/libR.so
+		)
+	fi
+
+	cmake-utils_src_configure
+
+	cat >> "${BUILD_DIR}"/Utilities/MaterialLibrary/ProcessShader.sh <<- EOF
+	#!${EPREFIX}/bin/bash
+
+	export LD_LIBRARY_PATH="${BUILD_DIR}"/lib
+	"${BUILD_DIR}"/bin/vtkProcessShader \$@
+	EOF
+	chmod 750 "${BUILD_DIR}"/Utilities/MaterialLibrary/ProcessShader.sh || die
+}
+
+src_test() {
+	local tcllib
+	ln -sf "${BUILD_DIR}"/lib  "${BUILD_DIR}"/lib/Release || die
+	for tcllib in "${BUILD_DIR}"/lib/lib*TCL*so; do
+		ln -sf $(basename "${tcllib}").1 "${tcllib/.so/-${SPV}.so}" || die
+	done
+	export LD_LIBRARY_PATH="${BUILD_DIR}"/lib:"${JAVA_HOME}"/jre/lib/${ARCH}/:"${JAVA_HOME}"/jre/lib/${ARCH}/xawt/
+	local VIRTUALX_COMMAND="cmake-utils_src_test"
+#	local VIRTUALX_COMMAND="cmake-utils_src_test -R Java"
+#	local VIRTUALX_COMMAND="cmake-utils_src_test -I 364,365"
+	virtualmake
+}
+
+src_install() {
+	# install docs
+	HTML_DOCS=( "${S}"/README.html )
+
+	cmake-utils_src_install
+
+	use java && java-pkg_regjar "${ED}"/usr/$(get_libdir)/${PN}.jar
+
+	if use tcl; then
+		# install Tcl docs
+		docinto vtk_tcl
+		dodoc "${S}"/Wrapping/Tcl/README
+	fi
+
+	# install examples
+	if use examples; then
+		insinto /usr/share/${PN}
+		mv -v Examples examples || die
+		doins -r examples
+	fi
+
+	#install big docs
+	if use doc; then
+		cd "${WORKDIR}"/html || die
+		rm -f *.md5 || die "Failed to remove superfluous hashes"
+		einfo "Installing API docs. This may take some time."
+		insinto "/usr/share/doc/${PF}/api-docs"
+		doins -r ./*
+	fi
+
+	# environment
+	cat >> "${T}"/40${PN} <<- EOF
+	VTK_DATA_ROOT=${EPREFIX}/usr/share/${PN}/data
+	VTK_DIR=${EPREFIX}/usr/$(get_libdir)/${PN}-${SPV}
+	VTKHOME=${EPREFIX}/usr
+	EOF
+	doenvd "${T}"/40${PN}
+}