gentoo resync : 06.04.2022

4 files changed, 30 insertions, 3 deletions

diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest
index 85847c919ace..c2ab330f934f 100644
--- a/sci-libs/vtk/Manifest
+++ b/sci-libs/vtk/Manifest
@@ -2,6 +2,7 @@ AUX vtk-8.2.0-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch 634 BLAKE2B c143e943
 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
 AUX vtk-9.0.3-IO-FFMPEG-support-FFmpeg-5.0-API-changes.patch 4152 BLAKE2B 7f757ed934e5684bdbe17e6214ac1ab55b024359cb3a4819ea11c086bbb5abcafc787fd37433cb1cae77d9284aa206b43fb5dc8fe5b8923c4d1944c4fc39d748 SHA512 dfe9c8651fc6b6e5c5c8aa81b0821fd5ceee73c728bee5add29cd28b2c19fd79dbe9f14124f789eb647975693679b80d7219ac0a3189b5b78c2818d5055a4b7b
+AUX vtk-9.1.0-adjust-to-find-binaries.patch 998 BLAKE2B 2e2338aa0e918173776a6684ae344d8b75eac8bd514d38e7e1ba5ebfeede9b170f6ab76a2d2c003448673bfbf8c3a1aea58659580aa5e85cb0c5f0d1921233a1 SHA512 259953569d3e03b920783c882ee201b8eeb8c796103bbae25f2915084c26707b9d85e886874b61264da885506ee269edf839ea2da24aa5640ea46aeb8e6dbf5a
 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-9.0.3.tar.gz 413854066 BLAKE2B 84c2fa0ae5df8567cc06022262fe3ea1202c553168757c94aa4a0a258360deccdf349d474c2f6585fc2054ee8e0468df4c80ec835cecf6b2391efa639f479eaa SHA512 28ab2ecb32860d820f736e9ceb4345bcd03471f0a35b90f8c9ccbe05454f7a95a4de3c99bae2f4b9db87a27ef8fe50159cd283f5e921f4e6e69b06a50a0570c6
@@ -12,6 +13,6 @@ DIST VTKLargeData-9.1.0.tar.gz 247517666 BLAKE2B 1b47829ad51f246ff26c8b6d16c9fa4
 DIST VTKLargeDataFiles-9.1.0.tar.gz 247504557 BLAKE2B a05892347a1a5cf5cb0df3f1c1d94efcdb68c28bcd0391617602565fddc4277ac44accec6f1b3ae2822a860f3d5f5642a56e36171b5d81bef137561182051d08 SHA512 10abc287256c7ec5fb7114f4054eda5cde1b75a8d2bbe70375fb96d31b7c4164be936489ce2fc9b5c33225f494d9b7f5f7bed648828661b17d6f66acb70eeddc
 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-9.0.3-r4.ebuild 14381 BLAKE2B 9eb0d2360469b68bd6a4bba2903a7a9ded361404058522341b264cd228ae8b61eb3b90ebd7c25dd313a24dce309d5c22061ad71391c26ae019a72a0c332162a6 SHA512 38f25a78709dacf862ea81059cdc60e80609097859225b3d2ceba991fcb17a6f1b2849cc3f82dabc633420562a056c8f6afe7edc782cfb3fe17e1b6e904c8a09
-EBUILD vtk-9.1.0.ebuild 16377 BLAKE2B 266f22690f51f050a171bef169679f0f0428bb9a95dcf850db3c24605797091267421b597ea8f6367188ff645e8ee3a5a9963e962901c0d48e461f33de6731bf SHA512 ae04515942067b0f6dbdd0ec2974bee009d7b4014a5f731c097478d98ed432025511f70b9e609f3e40ebcde9a196bf6913164597c2c60d3e82e6546ff2a790d1
+EBUILD vtk-9.0.3-r4.ebuild 14383 BLAKE2B 42e0a6bcc242fe05f0cf68bb2abcfb015eb97c3f8eb538e52c4dda965889ba3c14e12bd0fa15d18c3bdd8ea2600266777cce12ea9c40e77d80d85346f07c9821 SHA512 8cceabff7535339811fc9a02925dc437d1460311b32a6354227d1190bba4b7261c452cc44fd0b74f70bbf8970d59c04fec578dfb5619c2b3bfa90e92bb3d9973
+EBUILD vtk-9.1.0.ebuild 16427 BLAKE2B 7f616c51f2ed60d12f46003d64e6ae228db8c567e50fc05305fd688aa6a62669c620c762dbf3eaafc62492e64cbea10deeaca505bca1578916639607f5eaa059 SHA512 8a344d6651b4b1b4f9fc01decd63e7a2f602c3bcdf27c23ffd7cea8c506385ad7d5c6a8ddb0c9b7b0fa08cae7988cc095149800d63adc2650b4ec3881e3d6f69
 MISC metadata.xml 1349 BLAKE2B 778c471328fddbece653650c6a54b002dc9a48f5de3eb391bd0a84c9e0720ab1b2715b8013af55e60aac11a244090fc6e1d152c57a2c7f16b0b5306043e71731 SHA512 f55cac1ad724a7440bae4e7c364d3869ba25e4668463d0757ca8eb14469b539471c2bd31bb2e874c3a7982df490d9fc1c43c8d854dd4c511d0bde43ec0dc4a0c
diff --git a/sci-libs/vtk/files/vtk-9.1.0-adjust-to-find-binaries.patch b/sci-libs/vtk/files/vtk-9.1.0-adjust-to-find-binaries.patch
new file mode 100644
index 000000000000..10d6d251ebf3
--- /dev/null
+++ b/sci-libs/vtk/files/vtk-9.1.0-adjust-to-find-binaries.patch
@@ -0,0 +1,25 @@
+From e59b8ff7b83cd6a58c226cb4f5d9661bcb29002b Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Thu, 31 Mar 2022 08:05:17 +0200
+Subject: [PATCH] adjust to find binaries
+
+Add compatibility for qt-5.15.3 with no qtchooser installed. QtCore exports
+Qt5::{qmake,moc,rcc} which we use to get the path for binaries.
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+--- a/GUISupport/QtQuick/qml/CMakeLists.txt
++++ b/GUISupport/QtQuick/qml/CMakeLists.txt
+@@ -60,8 +60,8 @@ file(GENERATE
+ # Generate the qmltypes file for the VTK QML plugin
+ 
+ # First, find the qmlplugindump executable
+-get_target_property(qt_core_location "Qt${vtk_qt_major_version}::Core" LOCATION)
+-get_filename_component(qt_bin_dir "${qt_core_location}" PATH)
++get_target_property(qt_qmake_location "Qt${vtk_qt_major_version}::qmake" LOCATION)
++get_filename_component(qt_bin_dir "${qt_qmake_location}" PATH)
+ if (APPLE)
+   get_filename_component(qt_bin_dir "${qt_bin_dir}" PATH)
+ endif ()
+-- 
+2.35.1
+
diff --git a/sci-libs/vtk/vtk-9.0.3-r4.ebuild b/sci-libs/vtk/vtk-9.0.3-r4.ebuild
index 0e926465c515..0848a5f8b4e5 100644
--- a/sci-libs/vtk/vtk-9.0.3-r4.ebuild
+++ b/sci-libs/vtk/vtk-9.0.3-r4.ebuild
@@ -7,7 +7,7 @@ EAPI=7
 # - add USE flag for remote modules? Those modules can be downloaded
 #	properly before building.
 
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 WEBAPP_OPTIONAL=yes
 WEBAPP_MANUAL_SLOT=yes
 
diff --git a/sci-libs/vtk/vtk-9.1.0.ebuild b/sci-libs/vtk/vtk-9.1.0.ebuild
index 7be370c13c6a..9a6ebbdaac51 100644
--- a/sci-libs/vtk/vtk-9.1.0.ebuild
+++ b/sci-libs/vtk/vtk-9.1.0.ebuild
@@ -143,6 +143,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.3-IO-FFMPEG-support-FFmpeg-5.0-API-changes.patch
+	"${FILESDIR}"/${P}-adjust-to-find-binaries.patch
 )
 
 DOCS=( CONTRIBUTING.md README.md )