gentoo resync : 20.03.2022

13 files changed, 152 insertions, 744 deletions

diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest
index fa8d6c75d6b5..85847c919ace 100644
--- a/sci-libs/vtk/Manifest
+++ b/sci-libs/vtk/Manifest
@@ -1,28 +1,17 @@
-AUX vtk-8.1.0-openmpi-4-compatibility.patch 473 BLAKE2B 2f4994b5c745746b0c1391666d155e8ff79f6c57969177862e3f64956cc370b2b12a0ba223bd344734a7700c5eb728ccaf1ac7188d0fd049815b7b22c7648203 SHA512 6a2e25263070747657aa319d80b333375b2c10bbbd58fc98a1ab6cdb563e996afe9af8d4ae28d4aab24a437508993cfa3cacfc9284562d7af8a9e29fded73837
-AUX vtk-8.2.0-0001-fix-library-installation-dir-for-xdmf3.patch 2055 BLAKE2B 2abc5d8e0855e52ce7a741097cf5e903a7e00b20d5ef7f8d71975c39eda513ced909addecc3c7fe02df4b8784b3ac9394377b2e7b6b224634a85dd7c458bf66a SHA512 a00cff2c33d67c95284f923495a7119d1da92d48c619999ea67fb4db277b6b24ce88db793133b0ae21ecc38c19c0855ab026f7ff3b7e340ae9573c0622a0800d
-AUX vtk-8.2.0-fno-common.patch 1694 BLAKE2B 7fe15b8ea0fc358360e06be2fcc6634005cbb294fdcfea87028ef67fd018085c33448a70babd0e3e6997767b801e69853381c7bd02926d9657ea3233a8bcd065 SHA512 fbccb357649cf0dc7c5a5123db05b87e26c6095c89005adcb9e799cc68531fac87f4f588d12f0ee2728517a60436192011a04885e06ef4975fc8b81ba54ba1ea
 AUX vtk-8.2.0-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch 634 BLAKE2B c143e943cfc8130e4d1a72776639e49212d9efa66db71fba6a9469381aaf35f526f316e4a6e5bd144dc8054f857b3a3f7a179eb1875c9ad0859ba669c5d63215 SHA512 28fd381693a1ed9584be3d1acc3d3de20be3cb23a3605f3f66470cf9ec0bc66ef0e3f574fc760fbbd4aeca75ea3aa96c0e22b37fbdb54a22073fee179e4a26cb
-AUX vtk-8.2.0-gcc-10.patch 739 BLAKE2B 8b9ae179c5af17f5d0173674ffd616f5473bcc0830487343150b778cf143d762fc77c7212ee4e7f8f725878e85a7c1ccaa320393164212b276703e0b86e61e7f SHA512 7a2a8ea7ac3f6d3a5fd7d6553764eb5396ee4d89cc259bbf772493953125982b4cc8a43dc7b7a5e5c1ab6783eba6dd0d6edc791465985fd1f4b1ac9eb99062eb
-AUX vtk-8.2.0-pugixml.patch 599 BLAKE2B 4dc03d18d15acb351e817a4916a60c2dc76f97165f8a440e56399cc968e33a40575b5c3fc9fa35b5dd1af3dbf7e75b6330066d2fddfadefb48722884896663d4 SHA512 d72ed9d36b4e4ffd63d877ecdc17e5773f563dc1be1e3ab4888d6b6bac7308447bcafd8b0ee65d02ac83be20256f8c05dc36d1f077ace79a2d30b869073302fc
-AUX vtk-8.2.0-py38.patch 8467 BLAKE2B ea624989f3f0a4900fa692fc271d47d1d10cc047043e464f8b6ae9ea6713a63c4f0ec75c84a70d7fc2523b29b1c24ada4b77e90e9016690868c62217dbe69a8b SHA512 9922b24551c4716bdd95d398b2ea9d48f5c098350821a16767128a97180e4e1575414755545dd71e40dec88b0a7a61fc63ba2e598bedfc07620b15b0efd02cf4
-AUX vtk-8.2.0-qt-5.15.patch 1153 BLAKE2B 2e0d041d15f547845c07d46da4f641df7a57c0df8d5f9d5290c44a91d403b58f4627ae713169696383afa1d9edd85c59606782b169238d08a5df0b7e28ac79b7 SHA512 d1460117738b33074fbd92ffc54a838452c5b2cdd668767295dced7a39c845cb58664f0ea91726015facf4e3b752a53f2a32e52c85dc187a815c95e0935d0f03
 AUX vtk-9.0.1-0001-fix-kepler-compute_arch-if-CUDA-toolkit-11-is-used.patch 1529 BLAKE2B 6e3890d824cd3362439f3fdea0f3d01a37d7a5c1e871ed6ecbcecfb4e6e425ce4caf6176b122df4b80fbe1b95661a729428be0e3302205309949080894be7563 SHA512 1177b4815a800afbbaf8ee92a4d52df513c702fcc965cd0c12ba7f91cf58b2ed035277138ef2a091a4649eaf84e6f9b9275f8875385d4cfb89f6d3262c5eef4a
 AUX vtk-9.0.1-limits-include-gcc11.patch 2654 BLAKE2B 69eae5782234e46c2a38dbc3bf3d01082518314c62742996b953a6b17ceca9d85ca9a83a907c6820210bc0ff406640476dcafc1a533d90071e1c0517a06cc938 SHA512 ef16b3dea49f29d537bfbef26e62f91e59056288eac5c0c41191fee6c2181336dcceaa27b84a541c442d986b8ce1cdf3a9effdedcab1e1a1e242efad34954d00
-DIST VTK-8.2.0.tar.gz 35511819 BLAKE2B 908ed9377d75da6d0bd84de0078ba90a1e9396fcc906ca2981102e2c79d9d3ba4b1297f98682cd2802c7c04f9dbec32ee70740e645c44180befd765f7cda34a6 SHA512 521bd4dabedbc24b0e80a314a34ecd7554b04af28a7973245e3a9cf99a09b995d1b8ac42305c8e53369f226a0a6da3cdb29105ba2c90b46492736ef717760286
+AUX vtk-9.0.3-IO-FFMPEG-support-FFmpeg-5.0-API-changes.patch 4152 BLAKE2B 7f757ed934e5684bdbe17e6214ac1ab55b024359cb3a4819ea11c086bbb5abcafc787fd37433cb1cae77d9284aa206b43fb5dc8fe5b8923c4d1944c4fc39d748 SHA512 dfe9c8651fc6b6e5c5c8aa81b0821fd5ceee73c728bee5add29cd28b2c19fd79dbe9f14124f789eb647975693679b80d7219ac0a3189b5b78c2818d5055a4b7b
 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 VTKData-8.2.0.tar.gz 304287875 BLAKE2B 0292d84be40e11203326dcb1bf45f4a6ad2a785968130d4868a230f1cfbdcb600d0c03d4dae3519e2737dc7a964f29c51500c91b3da4291069608dd80a2bce45 SHA512 517d0f6dfdb0c61f59df933f06d3a28c8a48ea684aaff311456213fe493e2a20128886144325fc4edfa376b2d375a2dae6c60ad6e3d5d2f4a7b0ac1d8545c87b
 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 VTKDataFiles-9.1.0.tar.gz 605163184 BLAKE2B 968e2fed1e17bb57da4f8dd38e17e128779e50dfce81fc31c6ef75a2f3fe46675dd77ab7343b609998b8ddd3927e256d1ea4117c2719ad76f61db435b5f1c34f SHA512 f56ebd087753e2d2805e2f5954197de4e9933ec90648956780525d83149277a7bca42ce376c4355a53fca71ec78510fed155955af71b70e1b26de27851252e36
-DIST VTKLargeData-8.2.0.tar.gz 247522878 BLAKE2B 68dc90548604fbbb8419f2b400aea5d26599b48208b4104f41eaa90f99483689cd928cb00e3a7def396d65db2f03c9294d132854a27af74f66eb118c8319c4ce SHA512 8a7ea3d5870b1e4ccb31c77b4c270d00208349da1b2938e957210db3ec1449b678c66edc2faee1d4514aca6d725f642abc91e10ab0c151f6743cad1c53485588
 DIST VTKLargeData-9.0.3.tar.gz 247523270 BLAKE2B f4011292957454da5d8c9e515bcd0972af4299cef3928098d745be96559a1e0080297871c6e11fdd98498c8786a30a6674bc650368adcbcdbc6260e0938d21a1 SHA512 ebd6cb5f2935b77961dd68d0c0da2ea5ab900cec8c2eb641c785a604c65702e40a3e44d32bf3f2acfce9ec28dd89f41bf29f93a4f89d5b36c713f3743d7125b1
 DIST VTKLargeData-9.1.0.tar.gz 247517666 BLAKE2B 1b47829ad51f246ff26c8b6d16c9fa431e53ca33fec99e8aa78ee156a82e4b3351e32ee36674d9d345f346efad085ae1e2d3186a144911d2210a31a259e69f1f SHA512 0760dfd4e92bbfec10fec9d783f548a8ca5464b1a1744dfa575d4ed4592756335dbfcf28249d2da964aa6b41933ff1ac98458e4a32484ee4bb91b5e7cfaa78c9
 DIST VTKLargeDataFiles-9.1.0.tar.gz 247504557 BLAKE2B a05892347a1a5cf5cb0df3f1c1d94efcdb68c28bcd0391617602565fddc4277ac44accec6f1b3ae2822a860f3d5f5642a56e36171b5d81bef137561182051d08 SHA512 10abc287256c7ec5fb7114f4054eda5cde1b75a8d2bbe70375fb96d31b7c4164be936489ce2fc9b5c33225f494d9b7f5f7bed648828661b17d6f66acb70eeddc
-DIST vtkDocHtml-8.2.0.tar.gz 132516675 BLAKE2B 8651a3793f3326dee36c5ae8a280b00943067f973115697f34770eefd42b5534a7d7e439e7745b32c5fa83daf5a5292b854792d18951af236d0aa77c3aa2b564 SHA512 45e198bde82948d1d8e47a8bdb64a2792c2bfdfc0d939ffe40ded79092d7ac5f497008c00c805baa09d27eabb419cdf0787eee1caf2ac44c5e8759ecf709a317
 DIST vtkDocHtml-9.0.3.tar.gz 132650096 BLAKE2B 45fc1a6942df3e79e500a552c3b3cda2099b9451191559d471e3a2e785a8c52b2c6273cfd2cc4a3f3f65582e607d9414475f58d243fde96a4f985bed479e53db SHA512 9b5fef43f3c2b92aa1fe6a9ba9458d6677874b09b167654db7f26df6feffdc34ed1a8fb4e59d64b75625063a774af77fe57f275903602a5f7daa74e1a2e71800
 DIST vtkDocHtml-9.1.0.tar.gz 152767166 BLAKE2B 9163b6b1bf55810a310ca8bc211e067827b1f9907efd2a378363d8e6296d4bf07b25371b66c00cab3576fb06f0cb63fdf2ffea044033e2c42e9087819a3736ba SHA512 036daba5eb6503b5eb3e9323a4ab3ea0f27c09d8fef411dd2ed154c24d5a37d9f19d57db07576c8af404bfdb7178e95b137a3c27bfedb3f9cb72c04f717da80a
-EBUILD vtk-8.2.0-r6.ebuild 10341 BLAKE2B f8fdb78d1181de56f455869a7e4244ae369c62aa682757628b62926d7bb6ce29efde32b3d0faa9cae2c7a2faa52d893941f8ca93b872e831e7a791aca8cc68ae SHA512 73100a10ab6f9b4d1ddaa7cfbb60d3b9c79b53d96c21b9541769306d540b1292986b1e4804cec07d86e80cbb1fb5fb2f4b4870183f1ca70637836a606ac38d14
-EBUILD vtk-9.0.3-r4.ebuild 14314 BLAKE2B 9b300b679f40871c9d89a670b8d5c5b4e2236d1f08ad94155ce8e7711f08530170decc5bde428948c0eeec66fb030d6a2d93a16902fa59fdae62d7dc3ead1508 SHA512 5103af524fd56b5d4f267f659757715b2e01529cae295c9bfd28236f7d04d4af3c04570183fae77eb672c3476b92393ae3a98ef90e38f91bfd33a6446a23e9cb
-EBUILD vtk-9.1.0.ebuild 16274 BLAKE2B 9239ae77537e00220fb84988be25c84baa55876fdd61e0d065111a841b2a80defc1c29a5e5af53600796fd9360be27d7fd0892ddfaa2363fcbe1f867cace40d2 SHA512 637b6e2511ee74416e61aaba1cb4283adb3d2ccf95f4ba461b8d9f0fc612fb429efa83cc1b7804d3ff2ece8d52bde866eb849c4ca7c74958630f22d167f84bf1
-MISC metadata.xml 1405 BLAKE2B 0eadca65bf1cec673770c28b581491053bfd0f0834aee7c063e79fdc8e89ae161f74e97de4bbcdc1f80590284a004ae129f28b948d6efee0bd5d1c2ae1c3b26d SHA512 133b198af799dabfd1f4dad6ba27b27f8a2df728b46b94934ba3cb26c6a51dec8882e905f120ce1e5f55fbf8fda4ee9634c59280f7fd1f7bcd316e64f86aec60
+EBUILD vtk-9.0.3-r4.ebuild 14381 BLAKE2B 9eb0d2360469b68bd6a4bba2903a7a9ded361404058522341b264cd228ae8b61eb3b90ebd7c25dd313a24dce309d5c22061ad71391c26ae019a72a0c332162a6 SHA512 38f25a78709dacf862ea81059cdc60e80609097859225b3d2ceba991fcb17a6f1b2849cc3f82dabc633420562a056c8f6afe7edc782cfb3fe17e1b6e904c8a09
+EBUILD vtk-9.1.0.ebuild 16377 BLAKE2B 266f22690f51f050a171bef169679f0f0428bb9a95dcf850db3c24605797091267421b597ea8f6367188ff645e8ee3a5a9963e962901c0d48e461f33de6731bf SHA512 ae04515942067b0f6dbdd0ec2974bee009d7b4014a5f731c097478d98ed432025511f70b9e609f3e40ebcde9a196bf6913164597c2c60d3e82e6546ff2a790d1
+MISC metadata.xml 1349 BLAKE2B 778c471328fddbece653650c6a54b002dc9a48f5de3eb391bd0a84c9e0720ab1b2715b8013af55e60aac11a244090fc6e1d152c57a2c7f16b0b5306043e71731 SHA512 f55cac1ad724a7440bae4e7c364d3869ba25e4668463d0757ca8eb14469b539471c2bd31bb2e874c3a7982df490d9fc1c43c8d854dd4c511d0bde43ec0dc4a0c
diff --git a/sci-libs/vtk/files/vtk-8.1.0-openmpi-4-compatibility.patch b/sci-libs/vtk/files/vtk-8.1.0-openmpi-4-compatibility.patch
deleted file mode 100644
index 267c1d91b0cb..000000000000
--- a/sci-libs/vtk/files/vtk-8.1.0-openmpi-4-compatibility.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/ThirdParty/mpi4py/vtkmpi4py/src/lib-mpi/config/openmpi.h b/ThirdParty/mpi4py/vtkmpi4py/src/lib-mpi/config/openmpi.h
-index 3173831..e8ee74b 100644
---- a/ThirdParty/mpi4py/vtkmpi4py/src/lib-mpi/config/openmpi.h
-+++ b/ThirdParty/mpi4py/vtkmpi4py/src/lib-mpi/config/openmpi.h
-@@ -141,4 +141,9 @@
- 
- #endif
- 
-+ #if OMPI_NUMVERSION >= 40000
-+ #undef  PyMPI_HAVE_MPI_LB
-+ #undef  PyMPI_HAVE_MPI_UB
-+ #endif /* OMPI >= 4.0.0 */
-+
- #endif /* !PyMPI_CONFIG_OPENMPI_H */
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
deleted file mode 100644
index d03cab326f4f..000000000000
--- a/sci-libs/vtk/files/vtk-8.2.0-0001-fix-library-installation-dir-for-xdmf3.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 3aad9ec6004b7e3a82817f2f1e2840fc5f07c050 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Thu, 3 Jun 2021 13:13:38 +0200
-Subject: [PATCH] fix library installation dir for xdmf3
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
----
- 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/files/vtk-8.2.0-fno-common.patch b/sci-libs/vtk/files/vtk-8.2.0-fno-common.patch
deleted file mode 100644
index d7268ef7566b..000000000000
--- a/sci-libs/vtk/files/vtk-8.2.0-fno-common.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From a9079bdccbb2165583d6773a5ed848427e2a38a8 Mon Sep 17 00:00:00 2001
-From: Seacas Upstream <kwrobot@kitware.com>
-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/files/vtk-8.2.0-gcc-10.patch b/sci-libs/vtk/files/vtk-8.2.0-gcc-10.patch
deleted file mode 100644
index a903b0375304..000000000000
--- a/sci-libs/vtk/files/vtk-8.2.0-gcc-10.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/CMake/VTKGenerateExportHeader.cmake  2020-05-24 14:33:12.154603698 -0600
-+++ b/CMake/VTKGenerateExportHeader.cmake  2020-05-24 14:33:34.864603776 -0600
-@@ -174,8 +174,12 @@
-     execute_process(COMMAND ${CMAKE_C_COMPILER} --version
-       OUTPUT_VARIABLE _gcc_version_info
-       ERROR_VARIABLE _gcc_version_info)
--    string(REGEX MATCH "[3-9]\\.[0-9]\\.[0-9]*"
-+    string(REGEX MATCH "[1-9][0-9]\\.[0-9]\\.[0-9]*"
-       _gcc_version "${_gcc_version_info}")
-+    if(NOT _gcc_version)
-+      string(REGEX MATCH "[3-9]\\.[0-9]\\.[0-9]*"
-+        _gcc_version "${_gcc_version_info}")
-+    endif()
-     # gcc on mac just reports: "gcc (GCC) 3.3 20030304 ..." without the
-     # patch level, handle this here:
-     if(NOT _gcc_version)
\ No newline at end of file
diff --git a/sci-libs/vtk/files/vtk-8.2.0-pugixml.patch b/sci-libs/vtk/files/vtk-8.2.0-pugixml.patch
deleted file mode 100644
index d890f696388d..000000000000
--- a/sci-libs/vtk/files/vtk-8.2.0-pugixml.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-https://bugs.gentoo.org/758611
---- a/IO/CityGML/CMakeLists.txt
-+++ b/IO/CityGML/CMakeLists.txt
-@@ -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_LIBRARIES pugixml LOCATION)
--  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/files/vtk-8.2.0-py38.patch b/sci-libs/vtk/files/vtk-8.2.0-py38.patch
deleted file mode 100644
index c4c235dafd3f..000000000000
--- a/sci-libs/vtk/files/vtk-8.2.0-py38.patch
+++ /dev/null
@@ -1,175 +0,0 @@
-From 257b9d7b18d5f3db3fe099dc18f230e23f7dfbab Mon Sep 17 00:00:00 2001
-From: David Gobbi <david.gobbi@gmail.com>
-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 >= 0x03040000
-   0, // tp_finalize
- #endif
-+#if PY_VERSION_HEX >= 0x03080000
-+  0, // tp_vectorcall
-+#if PY_VERSION_HEX < 0x03090000
-+  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
--  nullptr,                               // tp_print
-+  0,                                     // tp_vectorcall_offset
-   nullptr,                               // tp_getattr
-   nullptr,                               // tp_setattr
-   nullptr,                               // tp_compare
-@@ -1124,7 +1124,7 @@ PyTypeObject PyVTKStringReference_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
-@@ -1181,7 +1181,7 @@ PyTypeObject PyVTKTupleReference_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
-diff --git a/Wrapping/PythonCore/PyVTKTemplate.cxx b/Wrapping/PythonCore/PyVTKTemplate.cxx
-index be200985b3..340fe7953b 100644
---- a/Wrapping/PythonCore/PyVTKTemplate.cxx
-+++ b/Wrapping/PythonCore/PyVTKTemplate.cxx
-@@ -268,7 +268,7 @@ PyTypeObject PyVTKTemplate_Type = {
-   0,                                     // tp_basicsize
-   0,                                     // tp_itemsize
-   nullptr,                               // tp_dealloc
--  nullptr,                               // tp_print
-+  0,                                     // tp_vectorcall_offset
-   nullptr,                               // tp_getattr
-   nullptr,                               // tp_setattr
-   nullptr,                               // tp_compare
-diff --git a/Wrapping/PythonCore/vtkPythonCompatibility.h b/Wrapping/PythonCore/vtkPythonCompatibility.h
-index 4a767844a6..be208faeef 100644
---- a/Wrapping/PythonCore/vtkPythonCompatibility.h
-+++ b/Wrapping/PythonCore/vtkPythonCompatibility.h
-@@ -64,7 +64,13 @@
- #endif
- 
- // PyTypeObject compatibility
--#if PY_VERSION_HEX >= 0x03040000
-+#if PY_VERSION_HEX >= 0x03090000
-+#define VTK_WRAP_PYTHON_SUPPRESS_UNINITIALIZED \
-+  0, 0, 0, 0,
-+#elif PY_VERSION_HEX >= 0x03080000
-+#define VTK_WRAP_PYTHON_SUPPRESS_UNINITIALIZED \
-+  0, 0, 0, 0, 0,
-+#elif PY_VERSION_HEX >= 0x03040000
- #define VTK_WRAP_PYTHON_SUPPRESS_UNINITIALIZED \
-   0, 0, 0,
- #else
-diff --git a/Wrapping/Tools/vtkWrapPythonClass.c b/Wrapping/Tools/vtkWrapPythonClass.c
-index b1e45f8e80..4d558ea081 100644
---- a/Wrapping/Tools/vtkWrapPythonClass.c
-+++ b/Wrapping/Tools/vtkWrapPythonClass.c
-@@ -521,7 +521,7 @@ void vtkWrapPython_GenerateObjectType(
-     "  sizeof(PyVTKObject), // tp_basicsize\n"
-     "  0, // tp_itemsize\n"
-     "  PyVTKObject_Delete, // tp_dealloc\n"
--    "  nullptr, // tp_print\n"
-+    "  0, // tp_vectorcall_offset\n"
-     "  nullptr, // tp_getattr\n"
-     "  nullptr, // tp_setattr\n"
-     "  nullptr, // tp_compare\n"
-diff --git a/Wrapping/Tools/vtkWrapPythonEnum.c b/Wrapping/Tools/vtkWrapPythonEnum.c
-index b933702242..1249362854 100644
---- a/Wrapping/Tools/vtkWrapPythonEnum.c
-+++ b/Wrapping/Tools/vtkWrapPythonEnum.c
-@@ -145,7 +145,7 @@ void vtkWrapPython_GenerateEnumType(
-     "  sizeof(PyIntObject), // tp_basicsize\n"
-     "  0, // tp_itemsize\n"
-     "  nullptr, // tp_dealloc\n"
--    "  nullptr, // tp_print\n"
-+    "  0, // tp_vectorcall_offset\n"
-     "  nullptr, // tp_getattr\n"
-     "  nullptr, // tp_setattr\n"
-     "  nullptr, // tp_compare\n"
-diff --git a/Wrapping/Tools/vtkWrapPythonType.c b/Wrapping/Tools/vtkWrapPythonType.c
-index 744cb1b9d3..0a1375e541 100644
---- a/Wrapping/Tools/vtkWrapPythonType.c
-+++ b/Wrapping/Tools/vtkWrapPythonType.c
-@@ -709,7 +709,7 @@ void vtkWrapPython_GenerateSpecialType(
-     "  sizeof(PyVTKSpecialObject), // tp_basicsize\n"
-     "  0, // tp_itemsize\n"
-     "  Py%s_Delete, // tp_dealloc\n"
--    "  nullptr, // tp_print\n"
-+    "  0, // tp_vectorcall_offset\n"
-     "  nullptr, // tp_getattr\n"
-     "  nullptr, // tp_setattr\n"
-     "  nullptr, // tp_compare\n"
--- 
-2.21.0
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
deleted file mode 100644
index d5a02ca75929..000000000000
--- a/sci-libs/vtk/files/vtk-8.2.0-qt-5.15.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 797f28697d5ba50c1fa2bc5596af626a3c277826 Mon Sep 17 00:00:00 2001
-From: "Andrew J. P. Maclean" <andrew.amaclean@gmail.com>
-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 <QImage>
- #include <QMap>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QPair>
- #include <QPixmap>
- #include <QTextDocument>
-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 <QFontMetrics>
- #include <QImage>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QPixmap>
- #include <QString>
- #include <QTextDocument>
--- 
-2.26.2
-
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 000000000000..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 <ben.boeckel@kitware.com>
+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 <libavcodec/avcodec.h>
+ #include <libavformat/avformat.h>
+ #include <libswscale/swscale.h>
+ }
+ 
++#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 = avcodec_find_encoder(video_codec)))
+   {
+     vtkGenericWarningMacro(<< "Failed to get video codec.");
+     return 0;
+@@ -155,7 +156,7 @@ int vtkFFMPEGWriterInternal::Start()
+     return 0;
+   }
+ 
+-  this->avStream->codecpar->codec_id = static_cast<AVCodecID>(this->avOutputFormat->video_codec);
++  this->avStream->codecpar->codec_id = video_codec;
+   this->avStream->codecpar->codec_type = AVMEDIA_TYPE_VIDEO;
+   this->avStream->codecpar->width = this->Dim[0];
+   this->avStream->codecpar->height = this->Dim[1];
+-- 
+2.35.1
+
diff --git a/sci-libs/vtk/metadata.xml b/sci-libs/vtk/metadata.xml
index 78fb93f57d22..50a77432780d 100644
--- a/sci-libs/vtk/metadata.xml
+++ b/sci-libs/vtk/metadata.xml
@@ -27,6 +27,5 @@
     <flag name="tbb">Use <pkg>dev-cpp/tbb</pkg> to handle smp support</flag>
     <flag name="views">Building Views modules</flag>
     <flag name="web">Install web component</flag>
-    <flag name="R">Enable support for dev-lang/R</flag>
   </use>
 </pkgmetadata>
diff --git a/sci-libs/vtk/vtk-8.2.0-r6.ebuild b/sci-libs/vtk/vtk-8.2.0-r6.ebuild
deleted file mode 100644
index 6cbd67167e03..000000000000
--- a/sci-libs/vtk/vtk-8.2.0-r6.ebuild
+++ /dev/null
@@ -1,375 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9} )
-WEBAPP_OPTIONAL=yes
-WEBAPP_MANUAL_SLOT=yes
-
-# Short package version
-MY_PV="$(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"
-HOMEPAGE="https://www.vtk.org/"
-SRC_URI="
-	https://www.vtk.org/files/release/${MY_PV}/VTK-${PV}.tar.gz
-	doc? ( https://www.vtk.org/files/release/${MY_PV}/vtkDocHtml-${PV}.tar.gz )
-	examples? (
-		https://www.vtk.org/files/release/${MY_PV}/VTKData-${PV}.tar.gz
-		https://www.vtk.org/files/release/${MY_PV}/VTKLargeData-${PV}.tar.gz
-	)"
-
-LICENSE="BSD LGPL-2"
-SLOT="0/${MY_PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="all-modules aqua boost doc examples ffmpeg gdal imaging java json mpi
-	mysql odbc offscreen postgres python qt5 R rendering tbb tcl theora tk
-	video_cards_nvidia views web +X"
-
-REQUIRED_USE="
-	all-modules? ( boost ffmpeg gdal mpi mysql odbc postgres python qt5 )
-	java? ( qt5 )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	tcl? ( rendering )
-	examples? ( python )
-	tk? ( tcl )
-	web? ( python )
-	^^ ( X aqua offscreen )"
-
-RDEPEND="
-	app-arch/lz4
-	dev-cpp/eigen
-	dev-db/sqlite
-	dev-libs/double-conversion:0=
-	dev-libs/expat
-	dev-libs/jsoncpp:=
-	dev-libs/libxml2:2
-	>=dev-libs/pugixml-1.11
-	>=media-libs/freetype-2.5.4
-	media-libs/glew:0=
-	>=media-libs/libharu-2.3.0-r2
-	media-libs/libpng:0=
-	media-libs/libtheora
-	media-libs/mesa
-	media-libs/tiff:0
-	sci-libs/exodusii
-	sci-libs/hdf5:=
-	sci-libs/netcdf:0=
-	sci-libs/netcdf-cxx:3
-	sys-libs/zlib
-	virtual/jpeg:0
-	virtual/opengl
-	x11-libs/libX11
-	x11-libs/libXmu
-	x11-libs/libXt
-	all-modules? (
-		!sci-libs/xdmf2
-		<dev-libs/pegtl-3
-		sci-libs/kissfft
-	)
-	boost? ( dev-libs/boost:=[mpi?] )
-	examples? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-	)
-	ffmpeg? ( media-video/ffmpeg )
-	gdal? ( sci-libs/gdal )
-	java? ( >=virtual/jdk-1.8:* )
-	mpi? (
-		virtual/mpi[cxx,romio]
-		$(python_gen_cond_dep '
-			python? ( dev-python/mpi4py[${PYTHON_USEDEP}] )
-		')
-	)
-	mysql? ( dev-db/mysql-connector-c )
-	odbc? ( dev-db/unixODBC )
-	offscreen? ( media-libs/mesa[osmesa] )
-	postgres? ( dev-db/postgresql:= )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-python/sip:5[${PYTHON_USEDEP}]
-		')
-	)
-	qt5? (
-		dev-qt/designer:5
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtopengl:5
-		dev-qt/qtsql:5
-		dev-qt/qtx11extras:5
-		$(python_gen_cond_dep '
-			python? ( dev-python/PyQt5[${PYTHON_USEDEP}] )
-		')
-	)
-	R? ( dev-lang/R )
-	tbb? ( <dev-cpp/tbb-2021:= )
-	tcl? ( dev-lang/tcl:0= )
-	tk? ( dev-lang/tk:0= )
-	video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
-	web? (
-		${WEBAPP_DEPEND}
-		$(python_gen_cond_dep '
-			dev-python/autobahn[${PYTHON_USEDEP}]
-			dev-python/constantly[${PYTHON_USEDEP}]
-			dev-python/hyperlink[${PYTHON_USEDEP}]
-			dev-python/incremental[${PYTHON_USEDEP}]
-			dev-python/six[${PYTHON_USEDEP}]
-			dev-python/twisted[${PYTHON_USEDEP}]
-			dev-python/txaio[${PYTHON_USEDEP}]
-			dev-python/zope-interface[${PYTHON_USEDEP}]
-		')
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	doc? ( app-doc/doxygen )
-	mpi? ( app-admin/chrpath )
-"
-
-S="${WORKDIR}"/VTK-${PV}
-
-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
-	"${FILESDIR}"/${P}-py38.patch
-	"${FILESDIR}"/${P}-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch # bug #751088
-	"${FILESDIR}"/${P}-pugixml.patch
-	"${FILESDIR}"/${P}-0001-fix-library-installation-dir-for-xdmf3.patch
-)
-
-RESTRICT="test"
-
-pkg_setup() {
-	use java && java-pkg-opt-2_pkg_setup
-	use python && python-single-r1_pkg_setup
-	use web && webapp_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	local x
-	# missing: VPIC freerange libproj4 mrmpi sqlite utf8 verdict xmdf2 xmdf3 zfp
-	for x in expat freetype hdf5 jpeg jsoncpp kissfft 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
-
-	# my_bool is no longer used in MySQL and MariaDB isn't supported in vtk-8
-	sed -e 's/my_bool/bool/' -i IO/MySQL/vtkMySQL{Database,Query}.cxx || die
-
-	if use doc; then
-		einfo "Removing .md5 files from documents."
-		rm -f "${WORKDIR}"/html/*.md5 || die "Failed to remove superfluous hashes"
-		sed -e "s|\${VTK_BINARY_DIR}/Utilities/Doxygen/doc|${WORKDIR}|" \
-			-i Utilities/Doxygen/CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	# general configuration
-	local mycmakeargs=(
-		-Wno-dev
-		-DVTK_DIR="${S}"
-		-DVTK_INSTALL_LIBRARY_DIR=$(get_libdir)
-		-DVTK_INSTALL_PACKAGE_DIR="$(get_libdir)/cmake/${PN}-${MY_PV}"
-		-DVTK_INSTALL_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
-		-DVTK_DATA_ROOT="${EPREFIX}/usr/share/${PN}/data"
-		-DVTK_CUSTOM_LIBRARY_SUFFIX=""
-		-DBUILD_SHARED_LIBS=ON
-		-DVTK_USE_SYSTEM_AUTOBAHN=ON
-		-DVTK_USE_SYSTEM_EXPAT=ON
-		-DVTK_USE_SYSTEM_FREETYPE=ON
-		-DVTK_USE_SYSTEM_FreeType=ON
-		# Use bundled gl2ps (bundled version is a patched version of 1.3.9. Post 1.3.9 versions should be compatible)
-		-DVTK_USE_SYSTEM_GL2PS=OFF
-		-DVTK_USE_SYSTEM_HDF5=ON
-		-DVTK_USE_SYSTEM_JPEG=ON
-		-DVTK_USE_SYSTEM_LIBPROJ=OFF
-		-DVTK_USE_SYSTEM_LIBXML2=ON
-		-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
-		-DVTK_USE_SYSTEM_XDMF2=OFF
-		-DVTK_USE_SYSTEM_XDMF3=OFF
-		-DVTK_USE_SYSTEM_ZLIB=ON
-		-DVTK_USE_SYSTEM_ZOPE=ON
-		-DVTK_USE_SYSTEM_LIBRARIES=ON
-		# Use bundled diy2 (no gentoo package / upstream does not provide a Finddiy2.cmake or diy2Config.cmake / diy2-config.cmake)
-		-DVTK_USE_SYSTEM_DIY2=OFF
-		-DVTK_USE_GL2PS=ON
-		-DVTK_USE_LARGE_DATA=ON
-		-DVTK_USE_PARALLEL=ON
-		-DVTK_EXTRA_COMPILER_WARNINGS=ON
-		-DVTK_Group_StandAlone=ON
-		-DBUILD_DOCUMENTATION=$(usex doc)
-		-DBUILD_EXAMPLES=$(usex examples)
-		-DBUILD_VTK_BUILD_ALL_MODULES_FOR_TESTS=off
-		-DVTK_BUILD_ALL_MODULES=$(usex all-modules)
-		-DUSE_DOCUMENTATION_HTML_HELP=$(usex doc)
-		-DVTK_Group_Imaging=$(usex imaging)
-		-DVTK_Group_MPI=$(usex mpi)
-		-DVTK_Group_Rendering=$(usex rendering)
-		-DVTK_Group_Tk=$(usex tk)
-		-DVTK_Group_Views=$(usex views)
-		-DVTK_Group_Web=$(usex web)
-		-DVTK_SMP_IMPLEMENTATION_TYPE="$(usex tbb TBB Sequential)"
-		-DVTK_WWW_DIR="${EPREFIX}/${MY_HTDOCSDIR}"
-		-DVTK_WRAP_JAVA=$(usex java)
-		-DVTK_WRAP_PYTHON=$(usex python)
-		-DVTK_WRAP_PYTHON_SIP=$(usex python)
-		-DVTK_WRAP_TCL=$(usex tcl)
-		-DVTK_USE_BOOST=$(usex boost)
-		-DUSE_VTK_USE_BOOST=$(usex boost)
-		-DModule_vtkInfovisBoost=$(usex boost)
-		-DModule_vtkInfovisBoostGraphAlgorithms=$(usex boost)
-		-DVTK_USE_ODBC=$(usex odbc)
-		-DModule_vtkIOODBC=$(usex odbc)
-		-DVTK_USE_OFFSCREEN=$(usex offscreen)
-		-DVTK_OPENGL_HAS_OSMESA=$(usex offscreen)
-		-DVTK_USE_OGGTHEORA_ENCODER=$(usex theora)
-		-DVTK_USE_NVCONTROL=$(usex video_cards_nvidia)
-		-DModule_vtkFiltersStatisticsGnuR=$(usex R)
-		-DVTK_USE_X=$(usex X)
-	# IO
-		-DVTK_USE_FFMPEG_ENCODER=$(usex ffmpeg)
-		-DModule_vtkIOGDAL=$(usex gdal)
-		-DModule_vtkIOGeoJSON=$(usex json)
-		-DModule_vtkIOXdmf2=$(usex all-modules)
-		-DBUILD_TESTING=$(usex examples)
-	# Apple stuff, does it really work?
-		-DVTK_USE_COCOA=$(usex aqua)
-	)
-
-	if use all-modules; then
-		mycmakeargs+=(
-			-DVTK_MODULE_USE_EXTERNAL_VTK_pegtl=ON
-			# we don't have a package for zfp yet
-			-DVTK_USE_SYSTEM_ZFP=OFF
-		)
-	fi
-
-	if use java; then
-		local javacargs=$(java-pkg_javac-args)
-		mycmakeargs+=( -DJAVAC_OPTIONS=${javacargs// /;} )
-	fi
-
-	if use mpi; then
-		mycmakeargs+=( -DVTK_USE_SYSTEM_MPI4PY=ON )
-	fi
-
-	if use python; then
-		mycmakeargs+=(
-			-DVTK_INSTALL_PYTHON_MODULES_DIR="$(python_get_sitedir)"
-			-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_USE_SYSTEM_SIX=ON
-		)
-	fi
-
-	if use qt5; 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="$(basename $(qt5_get_libdir))/qt5/plugins/designer"
-			-DDESIRED_QT_VERSION=5
-			-DVTK_QT_VERSION=5
-			-DQT_MOC_EXECUTABLE="$(qt5_get_bindir)/moc"
-			-DQT_UIC_EXECUTABLE="$(qt5_get_bindir)/uic"
-			-DQT_INCLUDE_DIR="${EPREFIX}/usr/include/qt5"
-			-DQT_QMAKE_EXECUTABLE="$(qt5_get_bindir)/qmake"
-			-DVTK_Group_Qt:BOOL=ON
-			-DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebKitWidgets=ON
-		)
-	fi
-
-	if use R; then
-		mycmakeargs+=(
-			-DR_LIBRARY_BLAS=/usr/$(get_libdir)/R/lib/libR.so
-			-DR_LIBRARY_LAPACK=/usr/$(get_libdir)/R/lib/libR.so
-		)
-	fi
-
-	append-cppflags -D__STDC_CONSTANT_MACROS -D_UNICODE
-
-	use java && export JAVA_HOME="${EPREFIX}/etc/java-config-2/current-system-vm"
-
-	if use mpi; then
-		export CC=mpicc
-		export CXX=mpicxx
-		export FC=mpif90
-		export F90=mpif90
-		export F77=mpif77
-	fi
-
-	cmake_src_configure
-}
-
-src_install() {
-	use web && webapp_src_preinst
-
-	cmake_src_install
-
-	use java && java-pkg_regjar "${ED}"/usr/$(get_libdir)/${PN}.jar
-
-	# Stop web page images from being compressed
-	use doc && docompress -x /usr/share/doc/${PF}/doxygen
-
-	# install examples
-	if use examples; then
-		einfo "Installing examples"
-		mv -v {E,e}xamples || die
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	# with MPI, rpaths are not deleted properly
-	if use mpi; then
-		chrpath -d "${ED}"/usr/$(get_libdir)/*.so* || die
-		chrpath -d "${ED}"/usr/bin/* || die
-		if use python; then
-			chrpath -d "${ED}"/$(python_get_sitedir)/vtkmodules/*.so || die
-		fi
-	fi
-
-	use python && python_optimize
-
-	# environment
-	cat >> "${T}"/40${PN} <<- EOF || die
-		VTK_DATA_ROOT=${EPREFIX}/usr/share/${PN}/data
-		VTK_DIR=${EPREFIX}/usr/$(get_libdir)/${PN}-${MY_PV}
-		VTKHOME=${EPREFIX}/usr
-		EOF
-	doenvd "${T}"/40${PN}
-
-	use web && webapp_src_install
-}
-
-# webapp.eclass exports these but we want it optional #534036
-pkg_postinst() {
-	use web && webapp_pkg_postinst
-}
-
-pkg_prerm() {
-	use web && webapp_pkg_prerm
-}
diff --git a/sci-libs/vtk/vtk-9.0.3-r4.ebuild b/sci-libs/vtk/vtk-9.0.3-r4.ebuild
index 578cf8ade8fb..0e926465c515 100644
--- a/sci-libs/vtk/vtk-9.0.3-r4.ebuild
+++ b/sci-libs/vtk/vtk-9.0.3-r4.ebuild
@@ -134,6 +134,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-9.0.1-0001-fix-kepler-compute_arch-if-CUDA-toolkit-11-is-used.patch
 	"${FILESDIR}"/${PN}-8.2.0-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch
 	"${FILESDIR}"/${PN}-9.0.1-limits-include-gcc11.patch
+	"${FILESDIR}"/${P}-IO-FFMPEG-support-FFmpeg-5.0-API-changes.patch
 )
 
 DOCS=( CONTRIBUTING.md README.md )
diff --git a/sci-libs/vtk/vtk-9.1.0.ebuild b/sci-libs/vtk/vtk-9.1.0.ebuild
index 0cc9587af0cf..7be370c13c6a 100644
--- a/sci-libs/vtk/vtk-9.1.0.ebuild
+++ b/sci-libs/vtk/vtk-9.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -142,6 +142,7 @@ BDEPEND="
 PATCHES=(
 	"${FILESDIR}"/${PN}-9.0.1-0001-fix-kepler-compute_arch-if-CUDA-toolkit-11-is-used.patch
 	"${FILESDIR}"/${PN}-8.2.0-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch
+	"${FILESDIR}"/${PN}-9.0.3-IO-FFMPEG-support-FFmpeg-5.0-API-changes.patch
 )
 
 DOCS=( CONTRIBUTING.md README.md )
@@ -456,7 +457,10 @@ src_configure() {
 	fi
 
 	if use qt5; then
-		mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_GUISupportQt="WANT" )
+		mycmakeargs+=(
+			-DVTK_MODULE_ENABLE_VTK_GUISupportQt="WANT"
+			-DVTK_QT_VERSION="5"
+		)
 		if use mysql || use postgres; then
 			mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_GUISupportQtSQL="WANT" )
 		fi