[gentoo-commits] repo/gentoo:master commit in: sci-libs/vtk/files/, sci-libs/vtk/

2024-04-11 Thread Andrew Ammerlaan 
commit: 210f12a30250cc13e74637b85876284e71962bd7
Author: Paul Zander  gmail  com>
AuthorDate: Wed Apr 10 15:34:04 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Thu Apr 11 09:44:06 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=210f12a3

sci-libs/vtk: fix for opencascade-7.8.0

Closes: https://bugs.gentoo.org/927891
Signed-off-by: Paul Zander  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/36196
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sci-libs/vtk/files/vtk-9.3.0-opencascade-7.8.0.patch | 18 ++
 sci-libs/vtk/vtk-9.3.0.ebuild|  5 +
 2 files changed, 23 insertions(+)

diff --git a/sci-libs/vtk/files/vtk-9.3.0-opencascade-7.8.0.patch 
b/sci-libs/vtk/files/vtk-9.3.0-opencascade-7.8.0.patch
new file mode 100644
index ..6f77fbdea979
--- /dev/null
+++ b/sci-libs/vtk/files/vtk-9.3.0-opencascade-7.8.0.patch
@@ -0,0 +1,18 @@
+--- a/IO/OCCT/CMakeLists.txt
 b/IO/OCCT/CMakeLists.txt
+@@ -5,11 +5,11 @@ vtk_module_find_package(
+ )
+ 
+ set(opencascade_req_targets
+-  TKSTEP
+-  TKIGES
++  TKDESTEP
++  TKDEIGES
+   TKMesh
+-  TKXDESTEP
+-  TKXDEIGES)
++  TKXSDRAWSTEP
++  TKXSDRAWIGES)
+ set(opencascade_missing_targets)
+ foreach (opencascade_req_target IN LISTS opencascade_req_targets)
+   if (NOT TARGET "${opencascade_req_target}")

diff --git a/sci-libs/vtk/vtk-9.3.0.ebuild b/sci-libs/vtk/vtk-9.3.0.ebuild
index 28ef8668d7a7..d22fadf03387 100644
--- a/sci-libs/vtk/vtk-9.3.0.ebuild
+++ b/sci-libs/vtk/vtk-9.3.0.ebuild
@@ -268,6 +268,10 @@ src_prepare() {
-i Utilities/Doxygen/CMakeLists.txt || die
fi
 
+   if use opencascade && has_version ">=sci-libs/opencascade-7.8.0"; then
+   eapply "${FILESDIR}/vtk-9.3.0-opencascade-7.8.0.patch"
+   fi
+
cmake_src_prepare
 
if use test; then
@@ -321,6 +325,7 @@ src_configure() {
-DVTK_MODULE_ENABLE_VTK_IOExportPDF="YES"
-DVTK_MODULE_ENABLE_VTK_IOLAS="$(usex las "YES" "NO")"
-DVTK_MODULE_ENABLE_VTK_IONetCDF="YES"
+   -DVTK_MODULE_ENABLE_VTK_IOOCCT="$(usex opencascade "YES" "No")"
-DVTK_MODULE_ENABLE_VTK_IOOggTheora="YES"
-DVTK_MODULE_ENABLE_VTK_IOOpenVDB="$(usex openvdb "YES" "NO")"
-DVTK_MODULE_ENABLE_VTK_IOSQL="YES" # sqlite

[gentoo-commits] repo/gentoo:master commit in: sci-libs/vtk/files/, sci-libs/vtk/

2024-01-10 Thread Sam James 
commit: 0167fc77186716079471d895b32b2283ca8b7fc4
Author: Paul Zander  gmail  com>
AuthorDate: Thu Jul  6 14:26:47 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jan 10 12:41:01 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0167fc77

sci-libs/vtk: add 9.3.0

Closes: https://bugs.gentoo.org/918898
Closes: https://bugs.gentoo.org/909520
Closes: https://bugs.gentoo.org/909380
Closes: https://bugs.gentoo.org/908874
Closes: https://bugs.gentoo.org/906264
Closes: https://bugs.gentoo.org/906075
Closes: https://bugs.gentoo.org/887505
Closes: https://bugs.gentoo.org/840776
Closes: https://bugs.gentoo.org/835659

Signed-off-by: Paul Zander  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/34432
Signed-off-by: Sam James  gentoo.org>

 sci-libs/vtk/Manifest  |   6 +
 sci-libs/vtk/files/vtk-9.2.5-pegtl-3.x.patch   | 136 +++
 ...ix-Java-error-with-integer-enum-overloads.patch |  51 ++
 sci-libs/vtk/files/vtk-9.3.0-java.patch|  11 +
 sci-libs/vtk/files/vtk-9.3.0-opencascade.patch |  17 +
 sci-libs/vtk/files/vtk-9.3.0-pdal-2.6.0.patch  |  77 ++
 .../vtk-9.3.0-too-many-initializer-values.patch|  20 +
 sci-libs/vtk/metadata.xml  |   1 +
 sci-libs/vtk/vtk-9.3.0.ebuild  | 909 +
 9 files changed, 1228 insertions(+)

diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest
index 3aaf0aa0c9c1..51b1e50afdd1 100644
--- a/sci-libs/vtk/Manifest
+++ b/sci-libs/vtk/Manifest
@@ -1,12 +1,18 @@
 DIST VTK-9.2.5.tar.gz 53807732 BLAKE2B 
8d25ec8f23c12868b2321eca84644dbf44704e58b7b79b2fd3a1260f7a240a78e4007fd99633ba93359103afc8ec00c7fa84f62778aed3d3361e1774a87b5626
 SHA512 
b1f225fb2589449621fd32bb0fc3f4817478d972cdccf7a9a376f1c17e93d5bd0a0511cdaa8587568a4baac9dfa8b5ffb9041442e221cd98d8f55e9981b6fcbf
 DIST VTK-9.2.6.tar.gz 53810904 BLAKE2B 
e3f9736a9b38415e0edd4b4c4bfe83aa154221c3c2c582e527996f88386b1b4d7864ddd2a364c0e83596ff45902cb7cde548ac3a4eebe06c2e43925c2608c4d3
 SHA512 
f2328caae959d583299b7fd57205f3dd76f87c8c1ee78653e85d44cab085295bf7bf88b3f6a2b960a57df96ccb32049337ebccb067ecde6d84d25eda636196bc
+DIST VTK-9.3.0.tar.gz 99932810 BLAKE2B 
59c2cdfe1c2525ac0f89df77a668783d928b55d2e72b42df45ea9b789da1bb150d52ce4108f2bc39cb8840cdd1998f57d3aedf96c72e402f6115d9efeebf4486
 SHA512 
2722dc8186779df1af5c534f26b20186ea33cb3bca2cef8cb333542b12e738382616e26e8d4d0341cb98c30403f8a896d77ddb04adb07e26d0d548c4a34b7d2f
 DIST VTKData-9.2.5.tar.gz 594016050 BLAKE2B 
7f03f5640ee648275a9771f990f98a3b5dfee10c0e291b353e6f067a098d50e2653c577b7c9c4e19c1d554e14469968014d1dfe9e70a91ecbff75397a53c9be9
 SHA512 
c06264c10bf78943753e58b9cb034d56b65570995741020dc58d5703525cdd4842d680fb6e185fa8fc39b72225ea6b29d8d632c0327f4145a7e2b79f3f702ec3
 DIST VTKData-9.2.6.tar.gz 594029678 BLAKE2B 
b3d6990a8098d9bec02a031b6d804049ce649bcd58fbcd74001e893ba41159e49f4dea74c5957737098a39a399d347b3bc65db4feadf152dd3fb8e705da16eb4
 SHA512 
5c5f2b36533180a63daff224da7055e1c2911eb5e4efda26e38b9ac01cb8e886cf7e71c45ac83347642caf1786e72bb469c22954ffbbb6e2c317fc6b4080
+DIST VTKData-9.3.0.tar.gz 612388942 BLAKE2B 
66d73ddaf5f2ddf52cf5c6dda5a918a86ae630df207983534478c92a66c39e38b1f4abfb93900b36899a93ad0e26260763573e925bd128c1646a1bc3bef8c54d
 SHA512 
385d609c2adc1746c073690b58a3fc25e496946c03f08e6c9e0a69ee406cee447e66d267986c3e5ba9006dd1cb0015b68134bb3c375ae41aef8f3b1e0d923d51
 DIST VTKDataFiles-9.2.5.tar.gz 609038837 BLAKE2B 
e6a5aa5a865664cf407914c9598497f6304b914748ce9d9145b5b7d53f5897b4056b6f7615bb8221c9a9747caf13ba632e21b060b1c8963bb7d6b257bb1da559
 SHA512 
c0cf7e0fb79f626e25946f1154d9e4c3e7ec995a823a01fc9638976f89af26ae8978a5b6c8a78d62f42f7f81b5fbe0cddc6afc5836c214f3dcaddb917a1ccc79
 DIST VTKDataFiles-9.2.6.tar.gz 609045751 BLAKE2B 
c8a4a8472dcc05f5b1d35c8f6923b4ed2e7adb593a3037ae7673a5e674583ef9ccc5bc1ec8cf29e87fd5b168c0bba5ed27b89c51fe2e5da432ef5d50e415af94
 SHA512 
f7c104641d25126956a50671934c10b25589e435d7cce6a5107c8dcf83a81f48ed3ae8a325b635f341a5a47579f9200689aa5eb34fe0d1c37acddfeedd33cd01
+DIST VTKDataFiles-9.3.0.tar.gz 628646039 BLAKE2B 
c2a4e875536c0b06f1edc8a8df17defbe1038067d7a04fc07e71ea49cad46139ef25f64d4b434a095ced16a7ff39d5346d34c528c099ea2e126c9f29afe92482
 SHA512 
c6788acfa790ce6b02aa5545fa4e411d00896b7542416c18b5e5955909f26a8fab9267e44db1c2a86f95f7a7f093695453f3fd0ec4e2c9a73449f9caf3fc09d5
 DIST VTKLargeData-9.2.5.tar.gz 247523496 BLAKE2B 
edc785e271ba605c730b9c8d9d62d2d95d818ebf18e4b20468c247187720a27897ecbf701e1eff61ba135545e6ea8f573ef120206813ee5ca11be33d8c5ff728
 SHA512 
7a994024aa42b48d3633cdcc528d89a2e7e07bcc47d01a0001578720dbc2eb991b90dc2f9caafe8f26a1f10185efb1bc2c0506f799da2b96e63ba08cb564117d
 DIST VTKLargeData-9.2.6.tar.gz 247521022 BLAKE2B 
ee6e5f627a5cb96aac6a53b7ff14d4a40f1e243a095c7d145412d899ab9d509af5a62ab889fc48c96ff78359443afbeecfa70cb937affdad7225071374b28bec
 SHA512

[gentoo-commits] repo/gentoo:master commit in: sci-libs/vtk/files/, sci-libs/vtk/

2023-11-21 Thread Guilherme Amadio 
commit: a8c8e1fc3aec24a202764bbe3c3df4a664f0815f
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Mon Nov  6 13:45:32 2023 +
Commit: Guilherme Amadio  gentoo  org>
CommitDate: Tue Nov 21 12:47:17 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8c8e1fc

sci-libs/vtk: VTK_JAVA_SOURCE_VERSION "1.8"

Closes: https://bugs.gentoo.org/916951
Closes: https://github.com/gentoo/gentoo/pull/33690
Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Signed-off-by: Guilherme Amadio  gentoo.org>

 sci-libs/vtk/files/vtk-9.2.6-Java21.patch  | 17 +
 sci-libs/vtk/{vtk-9.2.6.ebuild => vtk-9.2.6-r1.ebuild} |  1 +
 2 files changed, 18 insertions(+)

diff --git a/sci-libs/vtk/files/vtk-9.2.6-Java21.patch 
b/sci-libs/vtk/files/vtk-9.2.6-Java21.patch
new file mode 100644
index ..08d4c0bf633f
--- /dev/null
+++ b/sci-libs/vtk/files/vtk-9.2.6-Java21.patch
@@ -0,0 +1,17 @@
+diff --git a/Wrapping/Java/CMakeLists.txt b/Wrapping/Java/CMakeLists.txt
+index 01f3f93d..3afd78cf 100644
+--- a/Wrapping/Java/CMakeLists.txt
 b/Wrapping/Java/CMakeLists.txt
+@@ -201,10 +201,10 @@ set(VTK_JAVA_TARGET_VERSION "" CACHE STRING 
"javac target version")
+ mark_as_advanced(VTK_JAVA_TARGET_VERSION)
+ 
+ if (VTK_JAVA_SOURCE_VERSION STREQUAL "")
+-  set(VTK_JAVA_SOURCE_VERSION "1.7")
++  set(VTK_JAVA_SOURCE_VERSION "1.8")
+ endif ()
+ if (VTK_JAVA_TARGET_VERSION STREQUAL "")
+-  set(VTK_JAVA_TARGET_VERSION "1.7")
++  set(VTK_JAVA_TARGET_VERSION "1.8")
+ endif ()
+ 
+ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY 
"${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_JARDIR}")

diff --git a/sci-libs/vtk/vtk-9.2.6.ebuild b/sci-libs/vtk/vtk-9.2.6-r1.ebuild
similarity index 99%
rename from sci-libs/vtk/vtk-9.2.6.ebuild
rename to sci-libs/vtk/vtk-9.2.6-r1.ebuild
index 7f96653bff6a..aeb17419a172 100644
--- a/sci-libs/vtk/vtk-9.2.6.ebuild
+++ b/sci-libs/vtk/vtk-9.2.6-r1.ebuild
@@ -164,6 +164,7 @@ PATCHES=(

"${FILESDIR}"/${PN}-9.2.5-Add-include-cstdint-to-compile-with-gcc-13.patch
"${FILESDIR}"/${PN}-9.2.5-Fix-compilation-error-with-CUDA-12.patch

"${FILESDIR}"/${PN}-9.2.5-More-include-cstdint-to-compile-with-gcc13.patch
+   "${FILESDIR}"/vtk-9.2.6-Java21.patch
 )
 
 DOCS=( CONTRIBUTING.md README.md )

[gentoo-commits] repo/gentoo:master commit in: sci-libs/vtk/files/, sci-libs/vtk/

2023-03-06 Thread Sam James 
commit: 19fd814a57cb65fcc57072f9576b05ebc19491ad
Author: Bernd Waibel  posteo  net>
AuthorDate: Sun Mar  5 09:50:49 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Mar  7 07:57:00 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19fd814a

sci-libs/vtk: drop 9.0.3-r7, 9.1.0-r6, 9.2.2-r1

cleanup old
Signed-off-by: Bernd Waibel  posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/29932
Signed-off-by: Sam James  gentoo.org>

 sci-libs/vtk/Manifest  |  16 -
 ...0-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch |  18 -
 ...r-compute_arch-if-CUDA-toolkit-11-is-used.patch |  32 -
 .../vtk/files/vtk-9.0.1-limits-include-gcc11.patch |  84 ---
 ...-IO-FFMPEG-support-FFmpeg-5.0-API-changes.patch | 141 
 ...-or-scope-struct-names-to-avoid-conflicts.patch | 127 
 .../files/vtk-9.1.0-adjust-to-find-binaries.patch  |  25 -
 ...-avoid-naming-collision-with-netcdf-4.9.0.patch |  26 -
 sci-libs/vtk/metadata.xml  |   4 -
 sci-libs/vtk/vtk-9.0.3-r7.ebuild   | 563 
 sci-libs/vtk/vtk-9.1.0-r6.ebuild   | 641 --
 sci-libs/vtk/vtk-9.2.2-r1.ebuild   | 748 -
 12 files changed, 2425 deletions(-)

diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest
index e07e36085b2f..d241500f291a 100644
--- a/sci-libs/vtk/Manifest
+++ b/sci-libs/vtk/Manifest
@@ -1,22 +1,6 @@
-DIST VTK-9.0.3.tar.gz 34684378 BLAKE2B 
6862ab2df95bbefe9d3970757af6521cfa874476f6ee8e64c4e6e279f2e0cbb8a8299bc3b0b8bb9b7254d01a169644e7927b67b11b2ce934ddc87bce0a9e4c26
 SHA512 
00528011f9206444d09fc6cea05c46930745bb70ea02be6244ab3eb510ae82af772157c025157b1761dc4c6a9ab538b57f814c03a708f30aa3598a421fdc6ae2
-DIST VTK-9.1.0.tar.gz 47871165 BLAKE2B 
68cebc0879737a519b53e73f198356208b047c301d38ee2d62b9a14539cdb9aa76bd7174baa29592c7b1cfd1cc9700d01e98519a207d67a232d16ad37295ac31
 SHA512 
b2c4be8795fa082e0776e6ffdb9a3fd88dbb235841a8369a34ebe26cf4c5fcb1610fcca987be314510629da3edc74ee76c0ce2cc88d5ef4b099ac550ac892b0a
-DIST VTK-9.2.2.tar.gz 53801737 BLAKE2B 
345538004a1b147f8a6812e30b6e31bdfba27d13c47e3c659ef6eb51224aa6015a44e6aaabbc6d1b127691592b4727a51c952dc565d1a12f2eddedd1536af58b
 SHA512 
11b8203a4efaac0cda9ea46acf58c0d88c18f55bfd52e284f74ef313646913d194d3885da9d9fa7222d926502522505bfdf9d719f8c09790dab1315e2161610a
 DIST VTK-9.2.5.tar.gz 53807732 BLAKE2B 
8d25ec8f23c12868b2321eca84644dbf44704e58b7b79b2fd3a1260f7a240a78e4007fd99633ba93359103afc8ec00c7fa84f62778aed3d3361e1774a87b5626
 SHA512 
b1f225fb2589449621fd32bb0fc3f4817478d972cdccf7a9a376f1c17e93d5bd0a0511cdaa8587568a4baac9dfa8b5ffb9041442e221cd98d8f55e9981b6fcbf
-DIST VTKData-9.0.3.tar.gz 413854066 BLAKE2B 
84c2fa0ae5df8567cc06022262fe3ea1202c553168757c94aa4a0a258360deccdf349d474c2f6585fc2054ee8e0468df4c80ec835cecf6b2391efa639f479eaa
 SHA512 
28ab2ecb32860d820f736e9ceb4345bcd03471f0a35b90f8c9ccbe05454f7a95a4de3c99bae2f4b9db87a27ef8fe50159cd283f5e921f4e6e69b06a50a0570c6
-DIST VTKData-9.1.0.tar.gz 590185633 BLAKE2B 
7451d57bc507571afa8a8f9ba541010e1924849759f228318b6390aabb07a68341b84b38b82cd504844194544c569b040c9fad1858e6e35e172e4e18000d338e
 SHA512 
134a8dd2b029d3a4959b601987e68a0caa5d050532655b6786b5b67dfc77d3639628b2b957511f8998e63864c247c501a11a6aed248c762f13e860d878778e1a
-DIST VTKData-9.2.2.tar.gz 593767482 BLAKE2B 
65df8f96eaca9ada44f807bd4ff5efe569dde726105c7aa260c4f0ed3b8c19303b7781e0628a759cdf68b314155ac0d125403f27ee38eefd47336a8eed235851
 SHA512 
54d33ba24c9adfef2de17f26aa68b53f61f32e50d92bd1b0ddd75b1818d864af9a4d7fa7cb55297839bd2e50c2a7d12a18695151db32f7f59fbbd2ec9169e7b8
 DIST VTKData-9.2.5.tar.gz 594016050 BLAKE2B 
7f03f5640ee648275a9771f990f98a3b5dfee10c0e291b353e6f067a098d50e2653c577b7c9c4e19c1d554e14469968014d1dfe9e70a91ecbff75397a53c9be9
 SHA512 
c06264c10bf78943753e58b9cb034d56b65570995741020dc58d5703525cdd4842d680fb6e185fa8fc39b72225ea6b29d8d632c0327f4145a7e2b79f3f702ec3
-DIST VTKDataFiles-9.1.0.tar.gz 605163184 BLAKE2B 
968e2fed1e17bb57da4f8dd38e17e128779e50dfce81fc31c6ef75a2f3fe46675dd77ab7343b609998b8ddd3927e256d1ea4117c2719ad76f61db435b5f1c34f
 SHA512 
f56ebd087753e2d2805e2f5954197de4e9933ec90648956780525d83149277a7bca42ce376c4355a53fca71ec78510fed155955af71b70e1b26de27851252e36
-DIST VTKDataFiles-9.2.2.tar.gz 608752734 BLAKE2B 
b33bcec704e0db3ad0de958fbeca1adc1b904279b46a43a5abcd45a7df96138d4d3b76cb21af3aa48c0dd18d05987bdf58476fa945b59ed5b90ad6f2e386926f
 SHA512 
75430127212fdf210fb98d278b0163b4ed09f567fd1b80fcf80ea1cf2709e41f785912b20591712f71ad7ede9e12e23e358b4889963bccfe66cf8c48a7f70e11
 DIST VTKDataFiles-9.2.5.tar.gz 609038837 BLAKE2B 
e6a5aa5a865664cf407914c9598497f6304b914748ce9d9145b5b7d53f5897b4056b6f7615bb8221c9a9747caf13ba632e21b060b1c8963bb7d6b257bb1da559
 SHA512 
c0cf7e0fb79f626e25946f1154d9e4c3e7ec995a823a01fc9638976f89af26ae8978a5b6c8a78d62f42f7f81b5fbe0cddc6afc5836c214f3dcaddb917a1ccc79
-DIST VTKLargeData-9.0.3.tar.gz 247523270 BLAKE2B

[gentoo-commits] repo/gentoo:master commit in: sci-libs/vtk/files/, sci-libs/vtk/

2023-01-30 Thread Sam James 
commit: 4b5edf17f69a4315b3fdc422d4a8c4e81c73d6b7
Author: Bernd Waibel  posteo  net>
AuthorDate: Sun Jan 29 08:42:49 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan 30 13:25:28 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b5edf17

sci-libs/vtk: fix build with gcc-13

Add #include  to build with gcc-13

Closes: https://bugs.gentoo.org/892435
Signed-off-by: Bernd Waibel  posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/29329
Signed-off-by: Sam James  gentoo.org>

 .../vtk-9.2.5-Add-include-cstdint-for-gcc-13.patch | 20 +++
 ...dd-include-cstdint-to-compile-with-gcc-13.patch | 30 ++
 sci-libs/vtk/vtk-9.2.5.ebuild  |  2 ++
 3 files changed, 52 insertions(+)

diff --git a/sci-libs/vtk/files/vtk-9.2.5-Add-include-cstdint-for-gcc-13.patch 
b/sci-libs/vtk/files/vtk-9.2.5-Add-include-cstdint-for-gcc-13.patch
new file mode 100644
index ..3ab71521b6b5
--- /dev/null
+++ b/sci-libs/vtk/files/vtk-9.2.5-Add-include-cstdint-for-gcc-13.patch
@@ -0,0 +1,20 @@
+From 69351f357a82c0bb7f97f4f707962de3400760a8 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel 
+Date: Sun, 29 Jan 2023 12:17:36 +0100
+Subject: [PATCH] Add #include  for gcc-13
+
+Bug: https://gitlab.kitware.com/vtk/vtk/-/issues/18782
+Signed-off-by: Bernd Waibel 
+--- a/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h
 b/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h
+@@ -50,6 +50,7 @@
+ #include "vtkRenderingMatplotlibModule.h" // For export macro
+ 
+ #include  // for std::vector
++#include  // for std::uint64_t
+ 
+ struct _object;
+ typedef struct _object PyObject;
+-- 
+2.39.1
+

diff --git 
a/sci-libs/vtk/files/vtk-9.2.5-Add-include-cstdint-to-compile-with-gcc-13.patch 
b/sci-libs/vtk/files/vtk-9.2.5-Add-include-cstdint-to-compile-with-gcc-13.patch
new file mode 100644
index ..82bf19b6b07f
--- /dev/null
+++ 
b/sci-libs/vtk/files/vtk-9.2.5-Add-include-cstdint-to-compile-with-gcc-13.patch
@@ -0,0 +1,30 @@
+https://gitlab.kitware.com/vtk/vtk/-/merge-requests/9857
+
+From ef95422b62296e4c136917095eace14f48cefb82 Mon Sep 17 00:00:00 2001
+From: Laurent Rineau 
+Date: Tue, 17 Jan 2023 16:18:53 +0100
+Subject: [PATCH] Add #include  to compile with gcc13
+
+The `vtkSEPReader` was introduced by MRs !4909 (from my former
+collaborator Maxime) and !4938. Then it was highly modified by
+!7516. The later MR is the one that introduced the uses of
+`std::uint8_t` and `std::uint32_t`.
+
+Those types needs the inclusion of ``.
+--- a/IO/Image/vtkSEPReader.h
 b/IO/Image/vtkSEPReader.h
+@@ -25,8 +25,9 @@
+ #include "vtkImageAlgorithm.h"
+ #include "vtkNew.h" // for ivars
+ 
+-#include   // for std::array
+-#include  // for std::string
++#include// for std::array
++#include  // for std::uint8_t and std::uint32_t
++#include   // for std::string
+ 
+ namespace details
+ {
+-- 
+GitLab
+

diff --git a/sci-libs/vtk/vtk-9.2.5.ebuild b/sci-libs/vtk/vtk-9.2.5.ebuild
index 5f5b88e80ce1..88721c38e704 100644
--- a/sci-libs/vtk/vtk-9.2.5.ebuild
+++ b/sci-libs/vtk/vtk-9.2.5.ebuild
@@ -161,6 +161,8 @@ PATCHES=(

"${FILESDIR}"/${PN}-9.2.2-vtkGeometryFilter-add-missing-mutex-header-file.patch
"${FILESDIR}"/${PN}-9.2.2-VTKm-respect-user-CXXFLAGS.patch
"${FILESDIR}"/${PN}-9.2.2-link-with-glut-library-for-freeglut.patch
+   
"${FILESDIR}"/${PN}-9.2.5-Add-include-cstdint-to-compile-with-gcc-13.patch
+   "${FILESDIR}"/${PN}-9.2.5-Add-include-cstdint-for-gcc-13.patch
 )
 
 DOCS=( CONTRIBUTING.md README.md )

[gentoo-commits] repo/gentoo:master commit in: sci-libs/vtk/files/, sci-libs/vtk/

2022-08-31 Thread Sam James 
commit: 2e02cfbf0edd45b41747e2707fc56b7512c6aef6
Author: Bernd Waibel  posteo  net>
AuthorDate: Tue Aug 23 16:54:15 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Sep  1 02:23:53 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e02cfbf

sci-libs/vtk: build with LTO enabled

Closes: https://bugs.gentoo.org/863038
Signed-off-by: Bernd Waibel  posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/27010
Signed-off-by: Sam James  gentoo.org>

 ...-or-scope-struct-names-to-avoid-conflicts.patch | 126 +
 sci-libs/vtk/vtk-9.1.0-r2.ebuild   |   1 +
 2 files changed, 127 insertions(+)

diff --git 
a/sci-libs/vtk/files/vtk-9.1.0-Change-or-scope-struct-names-to-avoid-conflicts.patch
 
b/sci-libs/vtk/files/vtk-9.1.0-Change-or-scope-struct-names-to-avoid-conflicts.patch
new file mode 100644
index ..e06c786db9ab
--- /dev/null
+++ 
b/sci-libs/vtk/files/vtk-9.1.0-Change-or-scope-struct-names-to-avoid-conflicts.patch
@@ -0,0 +1,126 @@
+From 
https://gitlab.kitware.com/vtk/vtk/-/commit/0322b938968eebee585ad7efb93bbdade7106355
+From: Aron Helser 
+Date: Mon, 15 Aug 2022 10:06:13 -0400
+Subject: [PATCH 16/30] Change or scope struct names to avoid conflicts.
+
+(cherry picked from commit b79eb46bf5a4277cafc1ed2bd47fd3ffc28a5b3f)
+--- a/IO/AMR/vtkAMRFlashReader.cxx
 b/IO/AMR/vtkAMRFlashReader.cxx
+@@ -153,7 +153,7 @@ void vtkAMRFlashReader::ComputeStats(
+ 
+   for (int i = 0; i < internal->NumberOfBlocks; ++i)
+   {
+-Block& theBlock = internal->Blocks[i];
++FlashReaderBlock& theBlock = internal->Blocks[i];
+ double* gridMin = theBlock.MinBounds;
+ if (gridMin[0] < min[0])
+ {
+@@ -193,7 +193,7 @@ int vtkAMRFlashReader::FillMetaData()
+ 
+   for (int i = 0; i < this->Internal->NumberOfBlocks; ++i)
+   {
+-Block& theBlock = this->Internal->Blocks[i];
++FlashReaderBlock& theBlock = this->Internal->Blocks[i];
+ 
+ // Start numbering levels from 0!
+ int level = this->Internal->Blocks[i].Level - 1;
+--- a/IO/AMR/vtkAMRFlashReaderInternal.cxx
 b/IO/AMR/vtkAMRFlashReaderInternal.cxx
+@@ -692,7 +692,7 @@ void 
vtkFlashReaderInternal::GetBlockMinMaxGlobalDivisionIds()
+ 
+   for (int b = 0; b < this->NumberOfBlocks; b++)
+   {
+-Block& B = this->Blocks[b];
++FlashReaderBlock& B = this->Blocks[b];
+ 
+ for (int d = 0; d < 3; d++)
+ {
+--- a/IO/AMR/vtkAMRFlashReaderInternal.h
 b/IO/AMR/vtkAMRFlashReaderInternal.h
+@@ -74,7 +74,7 @@ typedef struct tagFlashReaderSimulationParameters
+   double RedShift;
+ } FlashReaderSimulationParameters;
+ 
+-typedef struct tagBlock
++typedef struct tagFlashReaderBlock
+ {
+   int Index;   // Id of the block
+   int Level;   // LOD level
+@@ -88,7 +88,7 @@ typedef struct tagBlock
+   double Center[3];// center of the block
+   double MinBounds[3]; // lower left  of the bounding box
+   double MaxBounds[3]; // upper right of the bounding box
+-} Block;
++} FlashReaderBlock;
+ 
+ typedef struct tagFlashReaderSimulationInformation
+ {
+@@ -152,7 +152,7 @@ public:
+   FlashReaderSimulationInformation SimulationInformation; // CFD simulation
+ 
+   // blocks
+-  std::vector Blocks;
++  std::vector Blocks;
+   std::vector LeafBlocks;
+   std::vector AttributeNames;
+ 
+--- a/IO/AMR/vtkAMRVelodyneReader.cxx
 b/IO/AMR/vtkAMRVelodyneReader.cxx
+@@ -219,7 +219,7 @@ int vtkAMRVelodyneReader::FillMetaData()
+   double spacing[3];
+   for (int i = 0; i < this->Internal->nBlocks; i++)
+   {
+-Block& theBlock = this->Internal->Blocks[i];
++vtkAMRVelodyneReaderInternal::Block& theBlock = this->Internal->Blocks[i];
+ int level = theBlock.Level;
+ int id = theBlock.Index;
+ CalculateBlockDims(this->Internal->blockDims.data(), theBlock.isFull, 
dims);
+@@ -243,7 +243,7 @@ vtkUniformGrid* vtkAMRVelodyneReader::GetAMRGrid(const int 
blockIdx)
+   {
+ return nullptr;
+   }
+-  Block& theBlock = this->Internal->Blocks[blockIdx];
++  vtkAMRVelodyneReaderInternal::Block& theBlock = 
this->Internal->Blocks[blockIdx];
+   int dims[3];
+   CalculateBlockDims(this->Internal->blockDims.data(), theBlock.isFull, dims);
+   vtkUniformGrid* ug = vtkUniformGrid::New();
+--- a/IO/AMR/vtkAMRVelodyneReaderInternal.h
 b/IO/AMR/vtkAMRVelodyneReaderInternal.h
+@@ -48,24 +48,20 @@
+ 
//
+ //  INTERNAL VELODYNE READER
+ 
//
+-typedef struct tagVelodyneSimParameters
+-{
+-  double Time;
+-  int CycleTime;
+-} VelodneSimParameters;
+ 
+-typedef struct tagBlock
+-{
+-  int Index;
+-  int dSetLoc;
+-  int Level;
+-  double Origin[3];
+-  bool isFull;
+-  bool isLeaf;
+-} Block;
+ class vtkAMRVelodyneReaderInternal
+ {
+ public:
++  typedef struct tagVelodyneBlock
++  {
++int Index;
++int dSetLoc;
++int

[gentoo-commits] repo/gentoo:master commit in: sci-libs/vtk/files/, sci-libs/vtk/

2022-02-21 Thread Sam James 
commit: 456dff1993bc8dd2dabd3a7642ffcb8229b30407
Author: Bernd Waibel  posteo  net>
AuthorDate: Fri Feb  4 19:15:16 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Feb 21 23:23:52 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=456dff19

sci-libs/vtk: let v9 build against ffmpeg-5

Backports an upstream patch to successfully build against
media-video/ffmpeg-5.

Closes: https://bugs.gentoo.org/831595
Closes: https://bugs.gentoo.org/727338
Closes: https://bugs.gentoo.org/660582

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Bernd Waibel  posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/24081
Signed-off-by: Sam James  gentoo.org>

 ...-IO-FFMPEG-support-FFmpeg-5.0-API-changes.patch | 141 +
 sci-libs/vtk/vtk-9.0.3-r4.ebuild   |   1 +
 sci-libs/vtk/vtk-9.1.0.ebuild  |   3 +-
 3 files changed, 144 insertions(+), 1 deletion(-)

diff --git 
a/sci-libs/vtk/files/vtk-9.0.3-IO-FFMPEG-support-FFmpeg-5.0-API-changes.patch 
b/sci-libs/vtk/files/vtk-9.0.3-IO-FFMPEG-support-FFmpeg-5.0-API-changes.patch
new file mode 100644
index ..276831d8491e
--- /dev/null
+++ 
b/sci-libs/vtk/files/vtk-9.0.3-IO-FFMPEG-support-FFmpeg-5.0-API-changes.patch
@@ -0,0 +1,141 @@
+From 
https://gitlab.kitware.com/ben.boeckel/vtk/-/commit/bad8f3e9d0aad03e8f2aff9524cb3c5f2d10ccaf
+From: Ben Boeckel 
+Date: Fri, 28 Jan 2022 10:44:28 -0500
+Subject: [PATCH] IO/FFMPEG: support FFmpeg 5.0 API changes
+
+Fixes: #18445
+--- /dev/null
 b/Documentation/release/dev/ffmpeg-5.0.md
+@@ -0,0 +1,3 @@
++## FFmpeg 5.0 support
++
++FFmpeg 5.0 API changes are now supported.
+--- a/IO/FFMPEG/CMakeLists.txt
 b/IO/FFMPEG/CMakeLists.txt
+@@ -6,7 +6,9 @@ vtk_module_find_package(
+ avformat
+ avcodec
+ avutil
+-swscale)
++swscale
++  OPTIONAL_COMPONENTS
++swresample)
+ 
+ set(classes
+   vtkFFMPEGWriter)
+@@ -21,6 +23,17 @@ if (NOT FFMPEG_VERSION VERSION_LESS "3.1")
+ vtkFFMPEGVideoSource)
+ endif ()
+ 
++set(ffmpeg_libraries)
++if (NOT FFMPEG_VERSION VERSION_LESS "5.0")
++  if (NOT FFMPEG_swresample_FOUND)
++message(FATAL_ERROR
++  "FFMPEG 5.0 requires the `swresample` library.")
++  endif ()
++
++  list(APPEND ffmpeg_libraries
++FFMPEG::swresample)
++endif ()
++
+ vtk_module_add_module(VTK::IOFFMPEG
+   CLASSES ${classes})
+ vtk_module_link(VTK::IOFFMPEG
+@@ -28,4 +41,5 @@ vtk_module_link(VTK::IOFFMPEG
+ FFMPEG::avformat
+ FFMPEG::avcodec
+ FFMPEG::avutil
+-FFMPEG::swscale)
++FFMPEG::swscale
++${ffmpeg_libraries})
+--- a/IO/FFMPEG/vtkFFMPEGVideoSource.cxx
 b/IO/FFMPEG/vtkFFMPEGVideoSource.cxx
+@@ -205,7 +205,7 @@ void vtkFFMPEGVideoSource::Initialize()
+ 
+   this->Internal->VideoStream = 
fcontext->streams[this->Internal->VideoStreamIndex];
+ 
+-  AVCodec* dec = 
avcodec_find_decoder(this->Internal->VideoStream->codecpar->codec_id);
++  const AVCodec* dec = 
avcodec_find_decoder(this->Internal->VideoStream->codecpar->codec_id);
+   if (!dec)
+   {
+ vtkErrorMacro("Failed to find codec for video");
+@@ -271,7 +271,7 @@ void vtkFFMPEGVideoSource::Initialize()
+   {
+ this->Internal->AudioStream = 
fcontext->streams[this->Internal->AudioStreamIndex];
+ 
+-AVCodec* adec = 
avcodec_find_decoder(this->Internal->AudioStream->codecpar->codec_id);
++const AVCodec* adec = 
avcodec_find_decoder(this->Internal->AudioStream->codecpar->codec_id);
+ if (!adec)
+ {
+   vtkErrorMacro("Failed to find codec for audio");
+--- a/IO/FFMPEG/vtkFFMPEGWriter.cxx
 b/IO/FFMPEG/vtkFFMPEGWriter.cxx
+@@ -21,10 +21,17 @@
+ 
+ extern "C"
+ {
++#include 
+ #include 
+ #include 
+ }
+ 
++#if LIBAVFORMAT_VERSION_MAJOR < 59
++#define vtk_ff_const59
++#else
++#define vtk_ff_const59 const
++#endif
++
+ #if defined(LIBAVFORMAT_VERSION_MAJOR) && LIBAVFORMAT_VERSION_MAJOR >= 57
+ extern "C"
+ {
+@@ -51,7 +58,7 @@ private:
+ 
+   AVFormatContext* avFormatContext;
+ 
+-  AVOutputFormat* avOutputFormat;
++  vtk_ff_const59 AVOutputFormat* avOutputFormat;
+ 
+   AVStream* avStream;
+ 
+@@ -115,15 +122,9 @@ int vtkFFMPEGWriterInternal::Start()
+ return 0;
+   }
+ 
+-  if (this->Writer->GetCompression())
+-  {
+-// choose a codec that is easily playable on windows
+-this->avOutputFormat->video_codec = AV_CODEC_ID_MJPEG;
+-  }
+-  else
+-  {
+-this->avOutputFormat->video_codec = AV_CODEC_ID_RAWVIDEO;
+-  }
++  enum AVCodecID video_codec = this->Writer->GetCompression()
++? AV_CODEC_ID_MJPEG // choose a codec that is easily playable on windows
++: AV_CODEC_ID_RAWVIDEO;
+ 
+   // create the format context that wraps all of the media output structures
+   if (avformat_alloc_output_context2(
+@@ -133,8 +134,8 @@ int vtkFFMPEGWriterInternal::Start()
+ return 0;
+   }
+ 
+-  AVCodec* codec;
+-  if (!(codec = avcodec_find_encoder(this->avOutputFormat->video_codec)))
++  vtk_ff_const59 AVCodec* codec;
++  if (!(codec =

[gentoo-commits] repo/gentoo:master commit in: sci-libs/vtk/files/, sci-libs/vtk/

2021-12-03 Thread Sam James 
commit: 2c26edb3d736e1e00b6d1739d506abb2183d8dfe
Author: Sam James  gentoo  org>
AuthorDate: Fri Dec  3 22:48:19 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Dec  3 22:48:19 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c26edb3

sci-libs/vtk: [QA] Revert "fix build with new deps versions"

This reverts commit 4893345530421b0d6168b5278d57d69fc08f7fdf.

Rationale:
- Several patches far beyond the size limit;

- Change was NAKed on IRC;

- A PR is in progress for a newer version which would require fewer
  patches;

- Invasive patches which aren't strictly needed. They add compatibility
  for newer versions of some software, but most of this comes with VTK 9.1
  (for which, as mentioned, there's a PR well in progress by the maintainer)
  and we can apply a smaller set of patches to that version if required.

- Missing sign-off / provenance for some patches;

Bug: https://bugs.gentoo.org/827310
Signed-off-by: Sam James  gentoo.org>

 sci-libs/vtk/files/vtk-9.0.3-TBB-2021.04-fix.patch | 229 --
 sci-libs/vtk/files/vtk-9.0.3-cuda-11.5.0.patch |  25 -
 ...addr-in-wrappers-upstream-commit-55c74ed3.patch |  88 ---
 sci-libs/vtk/files/vtk-9.0.3-pegtl-3.patch |  75 --
 ...0.3-proj-api-fix-upstream-commit-03256388.patch | 163 
 .../files/vtk-9.0.3-tbb-fix-for-bundled-vtkm.patch | 504 
 .../vtk/files/vtk-9.0.3-use-std-atomic-part1.patch | 811 
 .../vtk/files/vtk-9.0.3-use-std-atomic-part2.patch | 851 -
 sci-libs/vtk/vtk-9.0.3-r4.ebuild   | 557 --
 9 files changed, 3303 deletions(-)

diff --git a/sci-libs/vtk/files/vtk-9.0.3-TBB-2021.04-fix.patch 
b/sci-libs/vtk/files/vtk-9.0.3-TBB-2021.04-fix.patch
deleted file mode 100644
index 2927368a7fdc..
--- a/sci-libs/vtk/files/vtk-9.0.3-TBB-2021.04-fix.patch
+++ /dev/null
@@ -1,229 +0,0 @@
-Patch is based on following upstream commits:
-
-56cf03534c58a21f3cea608e4f53b7e7e00670fc by Mickael PHILIT 

-ded89c1e3a025874bfd69feb6c67fa21d6af36d4 by Mickael PHILIT 

-3e5313e71c35aaeabfd4e65e090031716460d35e by Timothée Couble 

-
-Backported by Vyacheslav Perestoronin 
-
-Adapted by Vadim Misbakh-Soloviov 
-
 a/CMake/FindTBB.cmake
-+++ b/CMake/FindTBB.cmake
-@@ -424,12 +424,18 @@ findpkg_finish(TBB_MALLOC_PROXY tbbmalloc_proxy)
- #=
- #parse all the version numbers from tbb
- if(NOT TBB_VERSION)
--
-- #only read the start of the file
-- file(STRINGS
-+  if (EXISTS "${TBB_INCLUDE_DIR}/oneapi/tbb/version.h")
-+file(STRINGS
-+  "${TBB_INCLUDE_DIR}/oneapi/tbb/version.h"
-+  TBB_VERSION_CONTENTS
-+  REGEX "VERSION")
-+  else()
-+#only read the start of the file
-+file(STRINGS
-   "${TBB_INCLUDE_DIR}/tbb/tbb_stddef.h"
-   TBB_VERSION_CONTENTS
-   REGEX "VERSION")
-+  endif()
- 
-   string(REGEX REPLACE
- ".*#define TBB_VERSION_MAJOR ([0-9]+).*" "\\1"
 a/Common/Core/SMP/TBB/vtkSMPTools.cxx
-+++ b/Common/Core/SMP/TBB/vtkSMPTools.cxx
-@@ -22,47 +22,50 @@
- #define __TBB_NO_IMPLICIT_LINKAGE 1
- #endif
- 
--#include 
-+#include 
- 
- #ifdef _MSC_VER
- #pragma pop_macro("__TBB_NO_IMPLICIT_LINKAGE")
- #endif
- 
--struct vtkSMPToolsInit
--{
--  tbb::task_scheduler_init Init;
--
--  vtkSMPToolsInit(int numThreads)
--: Init(numThreads)
--  {
--  }
--};
--
--static bool vtkSMPToolsInitialized = 0;
--static int vtkTBBNumSpecifiedThreads = 0;
-+static tbb::task_arena taskArena;
- static vtkSimpleCriticalSection vtkSMPToolsCS;
- 
- 
//
- void vtkSMPTools::Initialize(int numThreads)
- {
-   vtkSMPToolsCS.Lock();
--  if (!vtkSMPToolsInitialized)
-+
-+  // If numThreads <= 0, don't create a task_arena
-+  // and let TBB do the default thing.
-+  if (numThreads > 0 && numThreads != taskArena.max_concurrency())
-   {
--// If numThreads <= 0, don't create a task_scheduler_init
--// and let TBB do the default thing.
--if (numThreads > 0)
-+if (taskArena.is_active())
- {
--  static vtkSMPToolsInit aInit(numThreads);
--  vtkTBBNumSpecifiedThreads = numThreads;
-+  taskArena.terminate();
- }
--vtkSMPToolsInitialized = true;
-+taskArena.initialize(numThreads);
-   }
-+
-   vtkSMPToolsCS.Unlock();
- }
- 
- 
//
- int vtkSMPTools::GetEstimatedNumberOfThreads()
- {
--  return vtkTBBNumSpecifiedThreads ? vtkTBBNumSpecifiedThreads
--   : 
tbb::task_scheduler_init::default_num_threads();
-+  return taskArena.max_concurrency();
-+}
-+
-+//--
-+void vtk::detail::smp::vtkSMPTools_Impl_For_TBB(vtkIdType first, vtkIdType 
last, vtkIdType grain,
-+  ExecuteFunctorPtrType functorExecuter, void* functor)
-+{
-+  if

[gentoo-commits] repo/gentoo:master commit in: sci-libs/vtk/files/, sci-libs/vtk/

2021-06-09 Thread Sam James 
commit: 2728a6a5f2c0a39f44ceee464a764bec6da2c320
Author: Bernd Waibel  posteo  net>
AuthorDate: Thu Jun  3 16:52:37 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun 10 03:37:44 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2728a6a5

sci-libs/vtk: improve all-modules USE flag

- add missing flags to REQUIRED_USE
- add new mysql USE flag - needed by all-modules, adds new dependency on
dev-db/mysql-connector-c. Dev-db/mariadb-connector-c isn't supported
by this version. Fix an issue with using of deprecated my_bool when
using mysql-connector-c.
- remove xdmf2 USE flag, block sci-libs/xdmf2 with all-modules:
sci-libs/xdmf2 doesn't ship any cmake configuration files, which leads
to configuration errors when trying to build against external xdmf2
- block sci-libs/xdmf2: when built against internal xdmf2, there are header
file collisions with the header files installed by sci-libs/xdmf2
- add dependency on sci-libs/kissfft, bug #754684) and drop bundled
- fix an issue with xdmf3 library being installed in both library locations,
lib and lib64
- fix QA issues with RPATH
- byte compile python files
- disable searching for zfp (no package in tree)
- addresses some QA issues with defined but unused cmake variables: fixing all
of them would need a thorough testing of each single USE flag and 
checking
where these belong to, in this over-complex build system (bug #660582)

Closes: https://bugs.gentoo.org/793839
Closes: https://bugs.gentoo.org/754684
Closes: https://bugs.gentoo.org/646846
Bug: https://bugs.gentoo.org/660582
Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Bernd Waibel  posteo.net>
Signed-off-by: Sam James  gentoo.org>

 ...01-fix-library-installation-dir-for-xdmf3.patch |  57 +++
 sci-libs/vtk/vtk-8.2.0-r2.ebuild   | 382 +
 2 files changed, 439 insertions(+)

diff --git 
a/sci-libs/vtk/files/vtk-8.2.0-0001-fix-library-installation-dir-for-xdmf3.patch
 
b/sci-libs/vtk/files/vtk-8.2.0-0001-fix-library-installation-dir-for-xdmf3.patch
new file mode 100644
index 000..d03cab326f4
--- /dev/null
+++ 
b/sci-libs/vtk/files/vtk-8.2.0-0001-fix-library-installation-dir-for-xdmf3.patch
@@ -0,0 +1,57 @@
+From 3aad9ec6004b7e3a82817f2f1e2840fc5f07c050 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel 
+Date: Thu, 3 Jun 2021 13:13:38 +0200
+Subject: [PATCH] fix library installation dir for xdmf3
+
+Signed-off-by: Bernd Waibel 
+---
+ ThirdParty/xdmf3/vtkxdmf3/core/CMakeLists.txt | 14 +++---
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/ThirdParty/xdmf3/vtkxdmf3/core/CMakeLists.txt 
b/ThirdParty/xdmf3/vtkxdmf3/core/CMakeLists.txt
+index 86d688f8..7d009dfe 100644
+--- a/ThirdParty/xdmf3/vtkxdmf3/core/CMakeLists.txt
 b/ThirdParty/xdmf3/vtkxdmf3/core/CMakeLists.txt
+@@ -269,10 +269,10 @@ endif()
+ 
+ if(UNIX)
+ if (BUILD_SHARED_LIBS)
+-  set(XDMFCORE_LIBRARY ${CMAKE_INSTALL_PREFIX}/lib/libXdmfCore.so
++  set(XDMFCORE_LIBRARY 
${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/libXdmfCore.so
+   PARENT_SCOPE)
+ else()
+-  set(XDMFCORE_LIBRARY ${CMAKE_INSTALL_PREFIX}/lib/libXdmfCore.a
++  set(XDMFCORE_LIBRARY 
${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/libXdmfCore.a
+   PARENT_SCOPE)
+ endif()
+ endif()
+@@ -297,13 +297,13 @@ if (NOT XDMF_INSTALL_NO_DEVELOPMENT)
+ endif()
+ install(TARGETS XdmfCore
+   RUNTIME DESTINATION bin
+-  LIBRARY DESTINATION lib
+-  ARCHIVE DESTINATION lib)
++  LIBRARY DESTINATION lib${LIB_SUFFIX}
++  ARCHIVE DESTINATION lib${LIB_SUFFIX})
+ if (XDMF_STATIC_AND_SHARED AND BUILD_SHARED_LIBS)
+   install(TARGETS XdmfCore_Static
+ RUNTIME DESTINATION bin
+-LIBRARY DESTINATION lib
+-ARCHIVE DESTINATION lib)
++LIBRARY DESTINATION lib${LIB_SUFFIX}
++ARCHIVE DESTINATION lib${LIB_SUFFIX})
+ endif ()
+ 
+ if (Boost_FOUND)
+@@ -329,7 +329,7 @@ set(XdmfCore_INCLUDE_DIRS
+   CACHE INTERNAL "")
+ 
+ set(XDMF_INCLUDE_DIRS ${CMAKE_INSTALL_PREFIX}/include PARENT_SCOPE)
+-set(XDMF_LIBRARIES ${XDMF_LIBRARIES} ${CMAKE_INSTALL_PREFIX}/lib)
++set(XDMF_LIBRARIES ${XDMF_LIBRARIES} ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
+ set(XDMF_DIR ${CMAKE_INSTALL_PREFIX} PARENT_SCOPE)
+ set(XDMF_BINARIES ${XDMF_BINARIES} ${CMAKE_INSTALL_PREFIX}/bin)
+ 
+-- 
+2.31.1
+

diff --git a/sci-libs/vtk/vtk-8.2.0-r2.ebuild b/sci-libs/vtk/vtk-8.2.0-r2.ebuild
new file mode 100644
index 000..4335d1c44a2
--- /dev/null
+++ b/sci-libs/vtk/vtk-8.2.0-r2.ebuild
@@ -0,0 +1,382 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+WEBAPP_OPTIONAL=yes
+WEBAPP_MANUAL_SLOT=yes
+
+# Short package version
+SPV="$(ver_cut 1-2)"
+inherit flag-o-matic java-pkg-opt-2 python-single-r1 qmake-utils 
toolchain-funcs cmake virtualx webapp
+
+DESCRIPTION="The Visualization Toolkit"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/vtk/files/, sci-libs/vtk/

2020-12-14 Thread Sam James 
commit: 18f089b336e3dd952ac07a8571d578cf65ca530d
Author: Sam James  gentoo  org>
AuthorDate: Tue Dec 15 02:08:32 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Dec 15 02:13:08 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18f089b3

sci-libs/vtk: further >=dev-libs/pugixml-1.11 fixes

* Drop the internal copy of pugixml just in case.

* Adapt vtk to the new "proper" CMake config files
  from pugixml upstream.

Note that Aisha Tammy's patch worked for her with
CMake 3.19.1 but not for me on 3.17.4 (stable),
so this seems to be needed to be safe.

Bug: https://bugs.gentoo.org/758611
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Sam James  gentoo.org>

 sci-libs/vtk/files/vtk-8.2.0-pugixml.patch | 13 ++---
 sci-libs/vtk/vtk-8.2.0-r1.ebuild   |  6 +-
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/sci-libs/vtk/files/vtk-8.2.0-pugixml.patch 
b/sci-libs/vtk/files/vtk-8.2.0-pugixml.patch
index 3c72bcf0003..d890f696388 100644
--- a/sci-libs/vtk/files/vtk-8.2.0-pugixml.patch
+++ b/sci-libs/vtk/files/vtk-8.2.0-pugixml.patch
@@ -1,13 +1,12 @@
-diff --git a/IO/CityGML/CMakeLists.txt b/IO/CityGML/CMakeLists.txt
-index ce979ba..555f205 100644
+https://bugs.gentoo.org/758611
 --- a/IO/CityGML/CMakeLists.txt
 +++ b/IO/CityGML/CMakeLists.txt
-@@ -5,7 +5,7 @@ vtk_module_library(vtkIOCityGML ${Module_SRCS})
+@@ -5,7 +5,4 @@ vtk_module_library(vtkIOCityGML ${Module_SRCS})
  if(VTK_USE_SYSTEM_PUGIXML AND NOT pugixml_INCLUDE_DIRS)
find_package(pugixml REQUIRED)
-   get_target_property(pugixml_INCLUDE_DIRS pugixml 
INTERFACE_INCLUDE_DIRECTORIES)
+-  get_target_property(pugixml_INCLUDE_DIRS pugixml 
INTERFACE_INCLUDE_DIRECTORIES)
 -  get_target_property(pugixml_LIBRARIES pugixml LOCATION)
-+  get_target_property(pugixml_LIBRARIES pugixml INTERFACE_LINK_LIBRARIES)
-   include_directories(${pugixml_INCLUDE_DIRS})
-   vtk_module_link_libraries(vtkIOCityGML LINK_PRIVATE ${pugixml_LIBRARIES})
+-  include_directories(${pugixml_INCLUDE_DIRS})
+-  vtk_module_link_libraries(vtkIOCityGML LINK_PRIVATE ${pugixml_LIBRARIES})
++  vtk_module_link_libraries(vtkIOCityGML LINK_PRIVATE pugixml::pugixml)
  endif()

diff --git a/sci-libs/vtk/vtk-8.2.0-r1.ebuild b/sci-libs/vtk/vtk-8.2.0-r1.ebuild
index c5fa5e5ead4..d0d4b52214c 100644
--- a/sci-libs/vtk/vtk-8.2.0-r1.ebuild
+++ b/sci-libs/vtk/vtk-8.2.0-r1.ebuild
@@ -146,12 +146,15 @@ src_prepare() {
 
local x
# missing: VPIC freerange libproj4 mrmpi sqlite utf8 verdict xmdf2 xmdf3
-   for x in expat freetype hdf5 jpeg jsoncpp libharu libxml2 lz4 netcdf 
png tiff zlib; do
+   for x in expat freetype hdf5 jpeg jsoncpp libharu libxml2 lz4 netcdf 
pugixml png tiff zlib; do
ebegin "Dropping bundled ${x}"
rm -r ThirdParty/${x}/vtk${x} || die
eend $?
done
 
+   sed -i -e '/add_subdirectory(vtkpugixml)/d' 
ThirdParty/pugixml/CMakeLists.txt || die
+   sed -i -e '/vtk_target_export(vtkpugixml)/d' 
ThirdParty/pugixml/CMakeLists.txt || die
+
if use doc; then
einfo "Removing .md5 files from documents."
rm -f "${WORKDIR}"/html/*.md5 || die "Failed to remove 
superfluous hashes"
@@ -184,6 +187,7 @@ src_configure() {
-DVTK_USE_SYSTEM_LibXml2=ON
-DVTK_USE_SYSTEM_NETCDF=ON
-DVTK_USE_SYSTEM_OGGTHEORA=ON
+   -DVTK_USE_SYSTEM_PUGIXML=ON
-DVTK_USE_SYSTEM_PNG=ON
-DVTK_USE_SYSTEM_TIFF=ON
-DVTK_USE_SYSTEM_TWISTED=ON

[gentoo-commits] repo/gentoo:master commit in: sci-libs/vtk/files/, sci-libs/vtk/

2020-06-06 Thread Andreas Sturmlechner 
commit: 448215ed366bed91445ad383572a9e3eb9f25e74
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Jun  6 12:09:39 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Jun  6 13:17:00 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=448215ed

sci-libs/vtk: python3_8

Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 sci-libs/vtk/files/vtk-8.2.0-py38.patch | 175 
 sci-libs/vtk/vtk-8.2.0.ebuild   |   3 +-
 2 files changed, 177 insertions(+), 1 deletion(-)

diff --git a/sci-libs/vtk/files/vtk-8.2.0-py38.patch 
b/sci-libs/vtk/files/vtk-8.2.0-py38.patch
new file mode 100644
index 000..c4c235dafd3
--- /dev/null
+++ b/sci-libs/vtk/files/vtk-8.2.0-py38.patch
@@ -0,0 +1,175 @@
+From 257b9d7b18d5f3db3fe099dc18f230e23f7dfbab Mon Sep 17 00:00:00 2001
+From: David Gobbi 
+Date: Tue, 20 Aug 2019 17:02:24 -0600
+Subject: [PATCH] Compatibility for Python 3.8
+
+The PyTypeObject struct was modified in Python 3.8, this change is
+required to avoid compile errors.
+---
+ .../PythonInterpreter/vtkPythonStdStreamCaptureHelper.h   | 6 ++
+ Wrapping/PythonCore/PyVTKMethodDescriptor.cxx | 2 +-
+ Wrapping/PythonCore/PyVTKNamespace.cxx| 2 +-
+ Wrapping/PythonCore/PyVTKReference.cxx| 8 
+ Wrapping/PythonCore/PyVTKTemplate.cxx | 2 +-
+ Wrapping/PythonCore/vtkPythonCompatibility.h  | 8 +++-
+ Wrapping/Tools/vtkWrapPythonClass.c   | 2 +-
+ Wrapping/Tools/vtkWrapPythonEnum.c| 2 +-
+ Wrapping/Tools/vtkWrapPythonType.c| 2 +-
+ 9 files changed, 23 insertions(+), 11 deletions(-)
+
+diff --git a/Utilities/PythonInterpreter/vtkPythonStdStreamCaptureHelper.h 
b/Utilities/PythonInterpreter/vtkPythonStdStreamCaptureHelper.h
+index b1c12c83de..14ccfbe928 100644
+--- a/Utilities/PythonInterpreter/vtkPythonStdStreamCaptureHelper.h
 b/Utilities/PythonInterpreter/vtkPythonStdStreamCaptureHelper.h
+@@ -140,6 +140,12 @@ static PyTypeObject vtkPythonStdStreamCaptureHelperType = 
{
+ #if PY_VERSION_HEX >= 0x0304
+   0, // tp_finalize
+ #endif
++#if PY_VERSION_HEX >= 0x0308
++  0, // tp_vectorcall
++#if PY_VERSION_HEX < 0x0309
++  0, // tp_print
++#endif
++#endif
+ };
+ 
+ static PyObject* vtkWrite(PyObject* self, PyObject* args)
+diff --git a/Wrapping/PythonCore/PyVTKMethodDescriptor.cxx 
b/Wrapping/PythonCore/PyVTKMethodDescriptor.cxx
+index 2b0d443537..3840038498 100644
+--- a/Wrapping/PythonCore/PyVTKMethodDescriptor.cxx
 b/Wrapping/PythonCore/PyVTKMethodDescriptor.cxx
+@@ -186,7 +186,7 @@ PyTypeObject PyVTKMethodDescriptor_Type = {
+   sizeof(PyMethodDescrObject),   // tp_basicsize
+   0, // tp_itemsize
+   PyVTKMethodDescriptor_Delete,  // tp_dealloc
+-  nullptr,   // tp_print
++  0, // tp_vectorcall_offset
+   nullptr,   // tp_getattr
+   nullptr,   // tp_setattr
+   nullptr,   // tp_compare
+diff --git a/Wrapping/PythonCore/PyVTKNamespace.cxx 
b/Wrapping/PythonCore/PyVTKNamespace.cxx
+index 71ee2a3516..5cf5bfbe6b 100644
+--- a/Wrapping/PythonCore/PyVTKNamespace.cxx
 b/Wrapping/PythonCore/PyVTKNamespace.cxx
+@@ -49,7 +49,7 @@ PyTypeObject PyVTKNamespace_Type = {
+   0, // tp_basicsize
+   0, // tp_itemsize
+   PyVTKNamespace_Delete, // tp_dealloc
+-  nullptr,   // tp_print
++  0, // tp_vectorcall_offset
+   nullptr,   // tp_getattr
+   nullptr,   // tp_setattr
+   nullptr,   // tp_compare
+diff --git a/Wrapping/PythonCore/PyVTKReference.cxx 
b/Wrapping/PythonCore/PyVTKReference.cxx
+index 943ac71080..b7104091c0 100644
+--- a/Wrapping/PythonCore/PyVTKReference.cxx
 b/Wrapping/PythonCore/PyVTKReference.cxx
+@@ -1010,7 +1010,7 @@ PyTypeObject PyVTKReference_Type = {
+   sizeof(PyVTKReference),// tp_basicsize
+   0, // tp_itemsize
+   PyVTKReference_Delete, // tp_dealloc
+-  nullptr,   // tp_print
++  0, // tp_vectorcall_offset
+   nullptr,   // tp_getattr
+   nullptr,   // tp_setattr
+   nullptr,   // tp_compare
+@@ -1067,7 +1067,7 @@ PyTypeObject PyVTKNumberReference_Type = {
+   sizeof(PyVTKReference),// tp_basicsize
+   0, // tp_itemsize
+   PyVTKReference_Delete, // tp_dealloc
+-

[gentoo-commits] repo/gentoo:master commit in: sci-libs/vtk/files/, sci-libs/vtk/

2020-06-06 Thread Andreas Sturmlechner 
commit: 49f290c037ace1ceb2ef4a6b7800baa262d3149d
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Jun  6 09:46:17 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Jun  6 09:48:20 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49f290c0

sci-libs/vtk: Fix build with -fno-common

Thanks-to: Tiernan Hubble  gmail.com>
Closes: https://bugs.gentoo.org/721048
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 sci-libs/vtk/files/vtk-8.2.0-fno-common.patch | 40 +++
 sci-libs/vtk/vtk-8.2.0.ebuild |  1 +
 2 files changed, 41 insertions(+)

diff --git a/sci-libs/vtk/files/vtk-8.2.0-fno-common.patch 
b/sci-libs/vtk/files/vtk-8.2.0-fno-common.patch
new file mode 100644
index 000..d7268ef7566
--- /dev/null
+++ b/sci-libs/vtk/files/vtk-8.2.0-fno-common.patch
@@ -0,0 +1,40 @@
+From a9079bdccbb2165583d6773a5ed848427e2a38a8 Mon Sep 17 00:00:00 2001
+From: Seacas Upstream 
+Date: Tue, 28 Jan 2020 09:13:38 -0500
+Subject: [PATCH] exodusII 2020-01-28 (d97eb08d)
+
+Code extracted from:
+
+https://gitlab.kitware.com/third-party/seacas.git
+
+at commit d97eb08d79e87c82facfae39bc75deb60c0a2d83 
(for/vtk-20200128-7.24f-v2019-12-18).
+---
+ ThirdParty/exodusII/vtkexodusII/src/ex_create_par.c | 2 +-
+ ThirdParty/exodusII/vtkexodusII/src/ex_open_par.c   | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/ThirdParty/exodusII/vtkexodusII/src/ex_create_par.c 
b/ThirdParty/exodusII/vtkexodusII/src/ex_create_par.c
+index 8d5d6734f0..ef439618da 100644
+--- a/ThirdParty/exodusII/vtkexodusII/src/ex_create_par.c
 b/ThirdParty/exodusII/vtkexodusII/src/ex_create_par.c
+@@ -216,5 +216,5 @@ int ex_create_par_int(const char *path, int cmode, int 
*comp_ws, int *io_ws, MPI
+  * Prevent warning in some versions of ranlib(1) because the object
+  * file has no symbols.
+  */
+-const char exodus_unused_symbol_dummy_1;
++const char exodus_unused_symbol_dummy_ex_create_par;
+ #endif
+diff --git a/ThirdParty/exodusII/vtkexodusII/src/ex_open_par.c 
b/ThirdParty/exodusII/vtkexodusII/src/ex_open_par.c
+index b2faa22c29..9df4818767 100644
+--- a/ThirdParty/exodusII/vtkexodusII/src/ex_open_par.c
 b/ThirdParty/exodusII/vtkexodusII/src/ex_open_par.c
+@@ -459,5 +459,5 @@ int ex_open_par_int(const char *path, int mode, int 
*comp_ws, int *io_ws, float
+  * Prevent warning in some versions of ranlib(1) because the object
+  * file has no symbols.
+  */
+-const char exodus_unused_symbol_dummy_1;
++const char exodus_unused_symbol_dummy_ex_open_par;
+ #endif
+-- 
+2.26.2
+

diff --git a/sci-libs/vtk/vtk-8.2.0.ebuild b/sci-libs/vtk/vtk-8.2.0.ebuild
index 3ad36f8c446..6da25f5916c 100644
--- a/sci-libs/vtk/vtk-8.2.0.ebuild
+++ b/sci-libs/vtk/vtk-8.2.0.ebuild
@@ -127,6 +127,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-8.1.0-openmpi-4-compatibility.patch
"${FILESDIR}"/${P}-qt-5.15.patch # bug 726960
"${FILESDIR}"/${P}-gcc-10.patch # bug 723374
+   "${FILESDIR}"/${P}-fno-common.patch # bug 721048
 )
 
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/vtk/files/, sci-libs/vtk/

2020-06-06 Thread Andreas Sturmlechner 
commit: 3ca9613d7ad604c93d714e29b116952561e4e41c
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Jun  6 08:41:08 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Jun  6 09:41:50 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ca9613d

sci-libs/vtk: Fix build with Qt 5.15

Closes: https://bugs.gentoo.org/726960
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 sci-libs/vtk/files/vtk-8.2.0-qt-5.15.patch | 37 ++
 sci-libs/vtk/vtk-8.2.0.ebuild  |  1 +
 2 files changed, 38 insertions(+)

diff --git a/sci-libs/vtk/files/vtk-8.2.0-qt-5.15.patch 
b/sci-libs/vtk/files/vtk-8.2.0-qt-5.15.patch
new file mode 100644
index 000..d5a02ca7592
--- /dev/null
+++ b/sci-libs/vtk/files/vtk-8.2.0-qt-5.15.patch
@@ -0,0 +1,37 @@
+From 797f28697d5ba50c1fa2bc5596af626a3c277826 Mon Sep 17 00:00:00 2001
+From: "Andrew J. P. Maclean" 
+Date: Wed, 27 May 2020 15:27:15 +1000
+Subject: [PATCH] Qt 5.15 needs the include file QPainterPath
+
+---
+ Rendering/Qt/vtkQtLabelRenderStrategy.cxx | 1 +
+ Rendering/Qt/vtkQtStringToImage.cxx   | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/Rendering/Qt/vtkQtLabelRenderStrategy.cxx 
b/Rendering/Qt/vtkQtLabelRenderStrategy.cxx
+index afda585cca..eca65c64cd 100644
+--- a/Rendering/Qt/vtkQtLabelRenderStrategy.cxx
 b/Rendering/Qt/vtkQtLabelRenderStrategy.cxx
+@@ -41,6 +41,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ #include 
+ #include 
+diff --git a/Rendering/Qt/vtkQtStringToImage.cxx 
b/Rendering/Qt/vtkQtStringToImage.cxx
+index 659c71570e..fbb9b78f05 100644
+--- a/Rendering/Qt/vtkQtStringToImage.cxx
 b/Rendering/Qt/vtkQtStringToImage.cxx
+@@ -30,6 +30,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ #include 
+ #include 
+-- 
+2.26.2
+

diff --git a/sci-libs/vtk/vtk-8.2.0.ebuild b/sci-libs/vtk/vtk-8.2.0.ebuild
index c9ab9cf4bdb..1097c4df324 100644
--- a/sci-libs/vtk/vtk-8.2.0.ebuild
+++ b/sci-libs/vtk/vtk-8.2.0.ebuild
@@ -125,6 +125,7 @@ S="${WORKDIR}"/VTK-${PV}
 
 PATCHES=(
"${FILESDIR}"/${PN}-8.1.0-openmpi-4-compatibility.patch
+   "${FILESDIR}"/${P}-qt-5.15.patch # bug 726960
 )
 
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/vtk/files/, sci-libs/vtk/

2019-11-28 Thread Andreas Sturmlechner 
commit: 33715dfff8634dac78e79e7c3bf849af76f3cae3
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Nov 24 11:53:04 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Nov 28 19:02:28 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33715dff

sci-libs/vtk: Drop 6.1.0-r4

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 sci-libs/vtk/Manifest   |   4 -
 sci-libs/vtk/files/vtk-6.1.0-freetype.patch |  22 --
 sci-libs/vtk/files/vtk-6.1.0-gcc67.patch|  26 --
 sci-libs/vtk/files/vtk-6.1.0-gdal2.patch|  33 ---
 sci-libs/vtk/files/vtk-6.1.0-glext.patch|  13 -
 sci-libs/vtk/files/vtk-6.1.0-install.patch  |  19 --
 sci-libs/vtk/files/vtk-6.1.0-memset.patch   | 147 ---
 sci-libs/vtk/files/vtk-6.1.0-netcdf.patch   |  29 --
 sci-libs/vtk/files/vtk-6.1.0-system.patch   |  27 --
 sci-libs/vtk/files/vtk-6.1.0-web.patch  |  25 --
 sci-libs/vtk/metadata.xml   |   2 -
 sci-libs/vtk/vtk-6.1.0-r4.ebuild| 392 
 12 files changed, 739 deletions(-)

diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest
index cac641955bc..4ac149f56f5 100644
--- a/sci-libs/vtk/Manifest
+++ b/sci-libs/vtk/Manifest
@@ -1,8 +1,4 @@
-DIST VTK-6.1.0.tar.gz 27608882 BLAKE2B 
10cef62e2fc3bf7109f7b3e9858721850243a7798fe885c6a584dba9a6f74c526c58b009f2cba6c56512a6ec159dbf29ac965f9ae6533128f3a20e7224bdddc0
 SHA512 
3ab922166502348e5cdd68e14dbf4717c0405c9d8881c04aa8be8f95d8516af39cd02aaca5171c6de8af1b462ca386399b7a87a843ec62999f0f32c11788a2dc
 DIST VTK-8.1.0.tar.gz 33482506 BLAKE2B 
82aecb497847254595f20294120ae793432348fc3fd881924b52c004335d9bae3d052f168bbe291b307af67845a80e740d8996d36991c38fbec7213438e2395d
 SHA512 
3d5efd1a18939e21045278a387817421a98919cbaaa6ed65167c16999e1bb882b849b698d201a294da9920dbc96d1fbc987013462b1c7cbb12920bfff9b6f2a3
-DIST VTKData-6.1.0.tar.gz 94452190 BLAKE2B 
55e1af454f1c54c0a182552c41e08549781532b510bf29cb28fcd12510c1cef2c4e09274507d658b700f22d0da1961d7b4e6dc289d9ee39c6b1e1fac348ba153
 SHA512 
4e23cc3de3b81a852458849f2bd4dfe2e84e9df4f77f5f0d4ac249b04a7f74144a483a91876bd748bb90685d1943071e9b36fce8dd618376621bc37e63365e65
 DIST VTKData-8.1.0.tar.gz 282986441 BLAKE2B 
885f35c5386cc5db8db905a868a3ad79c246f1b0e41a3e5b81312b1f3de90483a1e34886d4764c60fe8006acaace2405b25acf047ec0e25a957f7a2d563d3380
 SHA512 
0a63f87896320aa38970932bf47c9e3f65a8bdd5413e51f95c53e321348b5b4e1eca2405d755eabb785c03939e1936245cc9f1b0f7ad0988c41362ac6f1e3047
-DIST VTKLargeData-6.1.0.tar.gz 166019220 BLAKE2B 
94180c9fd73655cbc08914a2309925d40ac2c99ce8652a7db37bb3ddc3b9dd654e8286be97a764c9029a6de21ae847f1f2c46c07ec974e5da802f23a7d277836
 SHA512 
3663a124c16448882ad3aef0fb15f55f438863ba2176106803ad9c6fb561325accd74f2675d8b6e1de791babfa8b992e516d87640efedda4a6daeb5affc2cf3f
 DIST VTKLargeData-8.1.0.tar.gz 166992034 BLAKE2B 
ac98861ccac2aacfab7547a4b56de5c9e611b8655f077bb85e6ab850fb0cfd79f4722a0486f73eafcde2cd77d6be305201857f3e729b1f60f710c45bcf0bb63f
 SHA512 
9dfd64b5125205ba7d8cba5665da40874d0a9781f3bd2595058d939207d96980c9a68009ce9ed1476931e1b929199c4888ccf6d590f23d2412873ca6907abc31
-DIST vtkDocHtml-6.1.0.tar.gz 230827905 BLAKE2B 
a323728450c5054d715dac137e54ed9b901019af595ea3abca9e7865d0b420d7b5f87789a9489df116f982633984d74721153dc3ab735e97455f64c2ffc4aa95
 SHA512 
fcae74a65157d87b39a162facdecbb0ab0a9b95b9f2555ed2b15d635b82034bfc62181eea441caf0b1edbe036b792a8231d409908b943398ce7f662c149d3a60
 DIST vtkDocHtml-8.1.0.tar.gz 132655967 BLAKE2B 
a27d9631fa9fe42e9b8076aa3b33e03b3835db0f348ed60cfdc866ffe7accd9c5d99b6525523113a4d628253e28d6d9121e78942d89b6ee281d5e7ecee7c289e
 SHA512 
c49338ad2c121ab16098195e5a1f2c9539137a85ae5edaa64d4a887ece0c64efb8840162942f47b70ab2d82d341bba2e706a6ff007fe6bdfbce12ad92bca883c

diff --git a/sci-libs/vtk/files/vtk-6.1.0-freetype.patch 
b/sci-libs/vtk/files/vtk-6.1.0-freetype.patch
deleted file mode 100644
index b7d3e409cde..000
--- a/sci-libs/vtk/files/vtk-6.1.0-freetype.patch
+++ /dev/null
@@ -1,22 +0,0 @@
 a/ParaView-v4.2.0-source/VTK/Rendering/FreeType/vtkFreeTypeTools.cxx_orig  
2014-12-23 09:25:35.0 +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(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] =

[gentoo-commits] repo/gentoo:master commit in: sci-libs/vtk/files/, sci-libs/vtk/

2019-08-30 Thread Andreas Sturmlechner 
commit: 1c46f26bb63c6ae8d91805cf12731b8281be5b09
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Aug 25 23:25:26 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Aug 30 08:56:33 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c46f26b

sci-libs/vtk: Cleanup obsolete versions

Package-Manager: Portage-2.3.73, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 sci-libs/vtk/Manifest|   4 -
 sci-libs/vtk/files/vtk-7.0.0-glext.patch |  12 --
 sci-libs/vtk/vtk-7.1.0.ebuild| 353 ---
 sci-libs/vtk/vtk-8.1.0-r1.ebuild | 332 -
 sci-libs/vtk/vtk-8.1.0-r2.ebuild | 332 -
 sci-libs/vtk/vtk-8.1.0.ebuild| 339 -
 6 files changed, 1372 deletions(-)

diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest
index c71c0af2c89..cac641955bc 100644
--- a/sci-libs/vtk/Manifest
+++ b/sci-libs/vtk/Manifest
@@ -1,12 +1,8 @@
 DIST VTK-6.1.0.tar.gz 27608882 BLAKE2B 
10cef62e2fc3bf7109f7b3e9858721850243a7798fe885c6a584dba9a6f74c526c58b009f2cba6c56512a6ec159dbf29ac965f9ae6533128f3a20e7224bdddc0
 SHA512 
3ab922166502348e5cdd68e14dbf4717c0405c9d8881c04aa8be8f95d8516af39cd02aaca5171c6de8af1b462ca386399b7a87a843ec62999f0f32c11788a2dc
-DIST VTK-7.1.0.tar.gz 31171521 BLAKE2B 
e607aa8437b4b4546cf3be5fa1fd771d07e2c0e5f85faeeb4585aae139fc40564939ccd3ec5efd4e63711789de300cf70edede46bfb54228bf6ea783d9dec39b
 SHA512 
83f0c9291cd2bc517a4bc449ad28a1d77e7ece169e846c7beab0b1140b9ef4b7bad30e3fa6e5a59826a707df78e2e336e07fa8bd30cf7498096ee80feef16534
 DIST VTK-8.1.0.tar.gz 33482506 BLAKE2B 
82aecb497847254595f20294120ae793432348fc3fd881924b52c004335d9bae3d052f168bbe291b307af67845a80e740d8996d36991c38fbec7213438e2395d
 SHA512 
3d5efd1a18939e21045278a387817421a98919cbaaa6ed65167c16999e1bb882b849b698d201a294da9920dbc96d1fbc987013462b1c7cbb12920bfff9b6f2a3
 DIST VTKData-6.1.0.tar.gz 94452190 BLAKE2B 
55e1af454f1c54c0a182552c41e08549781532b510bf29cb28fcd12510c1cef2c4e09274507d658b700f22d0da1961d7b4e6dc289d9ee39c6b1e1fac348ba153
 SHA512 
4e23cc3de3b81a852458849f2bd4dfe2e84e9df4f77f5f0d4ac249b04a7f74144a483a91876bd748bb90685d1943071e9b36fce8dd618376621bc37e63365e65
-DIST VTKData-7.1.0.tar.gz 249106922 BLAKE2B 
01505bd5e01c790d40be6966c6261de4eba2ec36b515580112b3291f894c9d2e361f31d20bb14faf40f125b82e5ea6a1b0002acbb598c79f11d541e0fe5de4df
 SHA512 
8f78fdce36fc683c8b8b7137a02fd727f322ceecce66f20a4b1b3f8d260e8e894c1ec1ed46eb2427e501239f12b02b1476ca3a302fa1f9287584110598972f9e
 DIST VTKData-8.1.0.tar.gz 282986441 BLAKE2B 
885f35c5386cc5db8db905a868a3ad79c246f1b0e41a3e5b81312b1f3de90483a1e34886d4764c60fe8006acaace2405b25acf047ec0e25a957f7a2d563d3380
 SHA512 
0a63f87896320aa38970932bf47c9e3f65a8bdd5413e51f95c53e321348b5b4e1eca2405d755eabb785c03939e1936245cc9f1b0f7ad0988c41362ac6f1e3047
 DIST VTKLargeData-6.1.0.tar.gz 166019220 BLAKE2B 
94180c9fd73655cbc08914a2309925d40ac2c99ce8652a7db37bb3ddc3b9dd654e8286be97a764c9029a6de21ae847f1f2c46c07ec974e5da802f23a7d277836
 SHA512 
3663a124c16448882ad3aef0fb15f55f438863ba2176106803ad9c6fb561325accd74f2675d8b6e1de791babfa8b992e516d87640efedda4a6daeb5affc2cf3f
-DIST VTKLargeData-7.1.0.tar.gz 166680011 BLAKE2B 
6b630d13a7cf22909f2fd42a89eccfe2ae79c16ec46b99229f349ff47d20e38cf22b9b63803087d319d43915fce116d2874e450c439727dde5a795d003cd1c4a
 SHA512 
79d058732932837f2873a14850e18375d6a43f07de7cf4b71570ae32cf7abb7651052378ff9cbd1e221c95f78e46c13c9852425a509ae02c826f5345e836e455
 DIST VTKLargeData-8.1.0.tar.gz 166992034 BLAKE2B 
ac98861ccac2aacfab7547a4b56de5c9e611b8655f077bb85e6ab850fb0cfd79f4722a0486f73eafcde2cd77d6be305201857f3e729b1f60f710c45bcf0bb63f
 SHA512 
9dfd64b5125205ba7d8cba5665da40874d0a9781f3bd2595058d939207d96980c9a68009ce9ed1476931e1b929199c4888ccf6d590f23d2412873ca6907abc31
 DIST vtkDocHtml-6.1.0.tar.gz 230827905 BLAKE2B 
a323728450c5054d715dac137e54ed9b901019af595ea3abca9e7865d0b420d7b5f87789a9489df116f982633984d74721153dc3ab735e97455f64c2ffc4aa95
 SHA512 
fcae74a65157d87b39a162facdecbb0ab0a9b95b9f2555ed2b15d635b82034bfc62181eea441caf0b1edbe036b792a8231d409908b943398ce7f662c149d3a60
-DIST vtkDocHtml-7.1.0.tar.gz 128927849 BLAKE2B 
93ad088ec0578bf8008a789f71d7d70eff13899ab216af1499c88870189fe53c426fd23fea5f1c0ff5e8cfd9ec5c6fe03ad2b691edf88d0fbf55b7593778b3fd
 SHA512 
cac6d005262d3849f84c2632dd737c4dcd9f23d5015266d683bcc8c65fad0d88e87faf9b1d5f68fdabe7b2ed97927a9f907020cbeae2b6e7223a5ffee54f2679
 DIST vtkDocHtml-8.1.0.tar.gz 132655967 BLAKE2B 
a27d9631fa9fe42e9b8076aa3b33e03b3835db0f348ed60cfdc866ffe7accd9c5d99b6525523113a4d628253e28d6d9121e78942d89b6ee281d5e7ecee7c289e
 SHA512 
c49338ad2c121ab16098195e5a1f2c9539137a85ae5edaa64d4a887ece0c64efb8840162942f47b70ab2d82d341bba2e706a6ff007fe6bdfbce12ad92bca883c

diff --git a/sci-libs/vtk/files/vtk-7.0.0-glext.patch 
b/sci-libs/vtk/files/vtk-7.0.0-glext.patch
deleted file mode 100644
index 5c321340ed6..000
---

[gentoo-commits] repo/gentoo:master commit in: sci-libs/vtk/files/, sci-libs/vtk/

2017-01-26 Thread David Seifert 
commit: a5eb748e5720bccd9f45e0ba202d8c782ddd1ad2
Author: Gerhard Bräunlich  gmx  net>
AuthorDate: Wed Jan 25 21:25:35 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Thu Jan 26 20:11:59 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5eb748e

sci-libs/vtk: Version bump to 7.0.0, EAPI bump 5 -> 6

Package-Manager: portage-2.3.0
Closes: https://github.com/gentoo/gentoo/pull/2936

 sci-libs/vtk/Manifest|   6 +
 sci-libs/vtk/files/vtk-7.0.0-glext.patch |  12 ++
 sci-libs/vtk/vtk-7.0.0.ebuild| 349 +++
 3 files changed, 367 insertions(+)

diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest
index 18fdb61..e65a809 100644
--- a/sci-libs/vtk/Manifest
+++ b/sci-libs/vtk/Manifest
@@ -1,4 +1,10 @@
 DIST VTK-6.1.0.tar.gz 27608882 SHA256 
bd7df10a479606d529a8b71f466c44a2bdd11fd534c62ce0aa44fad91883fa34 SHA512 
3ab922166502348e5cdd68e14dbf4717c0405c9d8881c04aa8be8f95d8516af39cd02aaca5171c6de8af1b462ca386399b7a87a843ec62999f0f32c11788a2dc
 WHIRLPOOL 
e387390efdc8cd2e413524794786369ba8a2bfe788913dfb161b82d9bc041e15ed5585286bebe38f955d1def3043481303d3bc74c648bbf5bf856e212ac9950c
+DIST VTK-7.0.0.tar.gz 30659751 SHA256 
78a990a15ead79cdc752e86b83cfab7dbf5b7ef51ba409db02570dbdd9ec32c3 SHA512 
4ce51ff6ddf56f1fb45c1b09a09389bc43dffd892f80c833ea861537e02a61079e9cfd3931308f7d72f37d1977806ed2ce010a7b5c2c1a0c5bb1435e09e1f049
 WHIRLPOOL 
5b6aaf42440b27b6d46ceb5484266df84c7dd205eb87353faec034a080b0d2bc61dafaee05ff3d16e381fae8ec00ef093a93f422d531d7061250f4c15dd6be37
 DIST VTKData-6.1.0.tar.gz 94452190 SHA256 
aba27ac05d721e36b9424131f1d0f673448f2b31aac34e9e74590fdf208ad0c7 SHA512 
4e23cc3de3b81a852458849f2bd4dfe2e84e9df4f77f5f0d4ac249b04a7f74144a483a91876bd748bb90685d1943071e9b36fce8dd618376621bc37e63365e65
 WHIRLPOOL 
1ee803055e3bbf0c8150807a77efce81406c8a512c40644c5ccc35279cb1098bb8f0382b5f2bb01f483c8a38a4e81ee70ed39145c52b4375a0545919faee2a28
+DIST VTKData-7.0.0.tar.gz 183031503 SHA256 
68260172ed85134a135a2a7ab2173f6e44640dc20de43fa0f286b545a53fae15 SHA512 
a97fd3a3df96b09ee356f60bae190bbd5ca803d774fcfae5d788a897662ba1344990ca0981e41d2b3caa0750b08ed9e60905df2a1dfe29e4b9fba68e6e13c3de
 WHIRLPOOL 
dd1bf3faf428cfecb7f85b0b5239a11b48d4d3240c4b44bcb7bbeac91692d976a53a63d7705814d86450af93d5df8a570f612e67c3503d485d6f5522e33375c9
 DIST VTKLargeData-6.1.0.tar.gz 166019220 SHA256 
d8985508ff2b7fbfbae0aadedfbe2b293640cf6441d3cce41da5c3f591c96d4c SHA512 
3663a124c16448882ad3aef0fb15f55f438863ba2176106803ad9c6fb561325accd74f2675d8b6e1de791babfa8b992e516d87640efedda4a6daeb5affc2cf3f
 WHIRLPOOL 
db62af365a5c1d71b209d21578184ff1ee7a5913aefd7e5729b7dc555bdd20a8f070ed83051387634bf6a9fc1141ab68a291ec0d557602fa5802e3e6020b7ae1
+DIST VTKLargeData-7.0.0.tar.gz 166680081 SHA256 
27db751b93480c0ea9362927a25d8ab5b2cb47532b1e898cdf77c1e41db29ecc SHA512 
a17d7b883262c12a0cf0689eec02d92415746d3eea64d308e22d4945e0eaa2bef8eadafef995690c1e02d357c8887a62702c5eaf0f46fe19a66cb9993ce18624
 WHIRLPOOL 
1e19a68d3a4e7e00d417ddf7f460331179b26f9ef434beedfc52e31a4733892fbd11209c45763a69c775fcbd510971f6463f00e9dbc794945db5110fe646bf84
+DIST vtk-6.0.0.tar.gz 24170173 SHA256 
426df543cffeacf21154dddcd2a6efbd91a586570a07a0db4c426d3e0acd10e4 SHA512 
ac238e2d228df4fc4d324826b8729af9ab3274039d5abf834f013fb4deaddc116ba2b1b24fb93aaf4b1bfc4bb321d19bc05566883cf3db1f982c9650d77583e8
 WHIRLPOOL 
b8619e254f97392dae01b8e2376bd70a07ce21504580d29844fcf1ab5621d85ba12bfd6047b4f90afd2b648d8b6c17e4ce5d789d6e1f84b5a4f847de5ee376b9
+DIST vtkDocHtml-6.0.0.tar.gz 204228463 SHA256 
f5324c4c197b0cacd19bf1e5721bb012d753d49526e224d9f2dd7412f34e4434 SHA512 
b6d5660f3ae6046c63b22b613cab6822f45f6b30a09522277e32f941c75dc48e8c92abc4d7f02b17e3f4d8e625de6dce7f000acc79e2d588a13d1577c139291a
 WHIRLPOOL 
b951c4ee62639c6bada2e02c2fceddbdb730c76d80c61a6ed013d8d9878b78a697158f41f53d68b5d62e4baa1f9ecb88e2437490da7610970622a40ecb14db1f
 DIST vtkDocHtml-6.1.0.tar.gz 230827905 SHA256 
e35d0f5b7905e5c827d8daa71ee61b14dc080445efad91f97583a2b9303c1813 SHA512 
fcae74a65157d87b39a162facdecbb0ab0a9b95b9f2555ed2b15d635b82034bfc62181eea441caf0b1edbe036b792a8231d409908b943398ce7f662c149d3a60
 WHIRLPOOL 
bc1714223259953a605612c0da124ece60604989458b7de5cf24b37d0f4c339f50c07a13d899f218364e61a35f8e1ace126eda5e83acbc3fe4930b041df0f55d
+DIST vtkDocHtml-7.0.0.tar.gz 114223726 SHA256 
e2f5ff7b693880d6f7dd842428d212ea2739dd93f12f008adce3b9958125d65d SHA512 
062a2d23df2c1330b2ef46758038cd222923d17c1f3bf810f6df30456729c2f33a921815cd501aa41aeb9739500f121a5b35538613365cbf30f3c7a483e4a235
 WHIRLPOOL 
853894c3a382dccb3f2947911b7b10fd76956fe48a4ba0ad71169e826a2e663bb965bbf4026c8874e4c9df1778ee5c6a0147fab7140169a9674c63daf7fc6f98

diff --git a/sci-libs/vtk/files/vtk-7.0.0-glext.patch 
b/sci-libs/vtk/files/vtk-7.0.0-glext.patch
new file mode 100644
index ..5c32134
--- /dev/null
+++ b/sci-libs/vtk/files/vtk-7.0.0-glext.patch
@@ -0,0 +1,12 @@
+--- a/Rendering/OpenGL/vtkOpenGL.h
 b/Rendering/OpenGL/vtkOpenGL.h
+@@

[gentoo-commits] repo/gentoo:master commit in: sci-libs/vtk/files/, sci-libs/vtk/

2017-01-02 Thread Justin Lecher 
commit: 0b1c35fffdebd4b19b46149b00c83b616c7639bf
Author: Justin Lecher  gentoo  org>
AuthorDate: Mon Jan  2 22:03:12 2017 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Mon Jan  2 22:09:09 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b1c35ff

sci-libs/vtk: Drop old

Package-Manager: Portage-2.3.3, Repoman-2.3.1
Signed-off-by: Justin Lecher  gentoo.org>

 sci-libs/vtk/Manifest  |   2 -
 sci-libs/vtk/files/vtk-5.10.1-ffmpeg-1.patch   |  49 ---
 sci-libs/vtk/files/vtk-5.10.1-libav-9.patch| 117 ---
 sci-libs/vtk/files/vtk-5.10.1-tcl8.6.patch |  57 ---
 sci-libs/vtk/files/vtk-5.2.0-tcl-install.patch |  12 -
 .../vtk/files/vtk-5.4.2-boost-property_map.patch   | 194 --
 sci-libs/vtk/files/vtk-5.4.2-cg-path.patch |  35 --
 sci-libs/vtk/files/vtk-5.4.2-libpng14.patch|  20 --
 sci-libs/vtk/files/vtk-5.6.0-R.patch   |  57 ---
 .../vtk/files/vtk-5.6.0-boost-property_map.patch   |  13 -
 sci-libs/vtk/files/vtk-5.6.0-cg-path.patch |  36 --
 sci-libs/vtk/files/vtk-5.6.0-ffmpeg.patch  |  42 ---
 sci-libs/vtk/files/vtk-5.6.0-libpng14.patch|  22 --
 sci-libs/vtk/files/vtk-5.6.0-odbc.patch|  12 -
 sci-libs/vtk/files/vtk-5.6.1-ffmpeg.patch  |  42 ---
 sci-libs/vtk/files/vtk-5.6.1-gcc-46.patch  |  29 --
 sci-libs/vtk/files/vtk-5.6.1-libav-0.8.patch   |  66 
 sci-libs/vtk/files/vtk-5.6.1-libpng15.patch|  22 --
 sci-libs/vtk/files/vtk-5.8.0-R.patch   |  45 ---
 sci-libs/vtk/files/vtk-5.8.0-boost.patch   |  39 ---
 sci-libs/vtk/files/vtk-6.0.0-cg-path.patch |  16 -
 sci-libs/vtk/files/vtk-6.0.0-install.patch |  19 -
 sci-libs/vtk/files/vtk-6.0.0-netcdf.patch  |  75 
 sci-libs/vtk/files/vtk-6.0.0-system.patch  |  27 --
 sci-libs/vtk/files/vtk-6.0.0-vtkpython.patch   |  12 -
 sci-libs/vtk/vtk-6.0.0.ebuild  | 323 -
 sci-libs/vtk/vtk-6.1.0-r1.ebuild   | 389 -
 sci-libs/vtk/vtk-6.1.0.ebuild  | 379 
 28 files changed, 2151 deletions(-)

diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest
index 9e64a2f..18fdb61 100644
--- a/sci-libs/vtk/Manifest
+++ b/sci-libs/vtk/Manifest
@@ -1,6 +1,4 @@
 DIST VTK-6.1.0.tar.gz 27608882 SHA256 
bd7df10a479606d529a8b71f466c44a2bdd11fd534c62ce0aa44fad91883fa34 SHA512 
3ab922166502348e5cdd68e14dbf4717c0405c9d8881c04aa8be8f95d8516af39cd02aaca5171c6de8af1b462ca386399b7a87a843ec62999f0f32c11788a2dc
 WHIRLPOOL 
e387390efdc8cd2e413524794786369ba8a2bfe788913dfb161b82d9bc041e15ed5585286bebe38f955d1def3043481303d3bc74c648bbf5bf856e212ac9950c
 DIST VTKData-6.1.0.tar.gz 94452190 SHA256 
aba27ac05d721e36b9424131f1d0f673448f2b31aac34e9e74590fdf208ad0c7 SHA512 
4e23cc3de3b81a852458849f2bd4dfe2e84e9df4f77f5f0d4ac249b04a7f74144a483a91876bd748bb90685d1943071e9b36fce8dd618376621bc37e63365e65
 WHIRLPOOL 
1ee803055e3bbf0c8150807a77efce81406c8a512c40644c5ccc35279cb1098bb8f0382b5f2bb01f483c8a38a4e81ee70ed39145c52b4375a0545919faee2a28
 DIST VTKLargeData-6.1.0.tar.gz 166019220 SHA256 
d8985508ff2b7fbfbae0aadedfbe2b293640cf6441d3cce41da5c3f591c96d4c SHA512 
3663a124c16448882ad3aef0fb15f55f438863ba2176106803ad9c6fb561325accd74f2675d8b6e1de791babfa8b992e516d87640efedda4a6daeb5affc2cf3f
 WHIRLPOOL 
db62af365a5c1d71b209d21578184ff1ee7a5913aefd7e5729b7dc555bdd20a8f070ed83051387634bf6a9fc1141ab68a291ec0d557602fa5802e3e6020b7ae1
-DIST vtk-6.0.0.tar.gz 24170173 SHA256 
426df543cffeacf21154dddcd2a6efbd91a586570a07a0db4c426d3e0acd10e4 SHA512 
ac238e2d228df4fc4d324826b8729af9ab3274039d5abf834f013fb4deaddc116ba2b1b24fb93aaf4b1bfc4bb321d19bc05566883cf3db1f982c9650d77583e8
 WHIRLPOOL 
b8619e254f97392dae01b8e2376bd70a07ce21504580d29844fcf1ab5621d85ba12bfd6047b4f90afd2b648d8b6c17e4ce5d789d6e1f84b5a4f847de5ee376b9
-DIST vtkDocHtml-6.0.0.tar.gz 204228463 SHA256 
f5324c4c197b0cacd19bf1e5721bb012d753d49526e224d9f2dd7412f34e4434 SHA512 
b6d5660f3ae6046c63b22b613cab6822f45f6b30a09522277e32f941c75dc48e8c92abc4d7f02b17e3f4d8e625de6dce7f000acc79e2d588a13d1577c139291a
 WHIRLPOOL 
b951c4ee62639c6bada2e02c2fceddbdb730c76d80c61a6ed013d8d9878b78a697158f41f53d68b5d62e4baa1f9ecb88e2437490da7610970622a40ecb14db1f
 DIST vtkDocHtml-6.1.0.tar.gz 230827905 SHA256 
e35d0f5b7905e5c827d8daa71ee61b14dc080445efad91f97583a2b9303c1813 SHA512 
fcae74a65157d87b39a162facdecbb0ab0a9b95b9f2555ed2b15d635b82034bfc62181eea441caf0b1edbe036b792a8231d409908b943398ce7f662c149d3a60
 WHIRLPOOL 
bc1714223259953a605612c0da124ece60604989458b7de5cf24b37d0f4c339f50c07a13d899f218364e61a35f8e1ace126eda5e83acbc3fe4930b041df0f55d

diff --git a/sci-libs/vtk/files/vtk-5.10.1-ffmpeg-1.patch 
b/sci-libs/vtk/files/vtk-5.10.1-ffmpeg-1.patch
deleted file mode 100644
index 2cefb12..
--- a/sci-libs/vtk/files/vtk-5.10.1-ffmpeg-1.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=450464
-