gentoo auto-resync : 04:05:2023 - 05:27:32

4 files changed, 36 insertions, 23 deletions

diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest
index e6676ba845f6..cfb1730281fe 100644
--- a/sci-libs/vtk/Manifest
+++ b/sci-libs/vtk/Manifest
@@ -1,14 +1,14 @@
 AUX vtk-9.2.2-VTKm-respect-user-CXXFLAGS.patch 3256 BLAKE2B d769a03237938c58ae86dd9ec8ba13af2da07551ccfe7efed9bb98068233e37b4d0cf164a72ed157cf7ee79442c82f223566c74b6fe799a66e85a940a9f14035 SHA512 9373fa9cff8c998236d6fd16271bd40029355f9fbc7c28714a98de7488784930e0878c8424eac08c9ad56546974cf8d80c515cba4bece7dd582a3a1867082e9d
 AUX vtk-9.2.2-link-with-glut-library-for-freeglut.patch 594 BLAKE2B 054c68fa27fae4b331a78a6fd54fed9c95a18d5a54b088be1a78625922dd2638394198c3a61aed4288739bf49ea10090908133f28106d0359e055bfad9d8ed0a SHA512 1b2e84c916fa1a1a28eca981a05c190f105168e8c7adbc3d8842539de90bbca9af3511c584dc500c75e9499e7d175dbcb91125e246f93d1b16bcbf97ce2ce027
 AUX vtk-9.2.2-vtkGeometryFilter-add-missing-mutex-header-file.patch 625 BLAKE2B 46c15c6e2a1fde4974e0bb79bf96d9d695e5ab10f189ce47eb0a17845a75ef58eb0f22125c8f0043463b19b8adcdea837ce10725bbd54f1b78bcdd01b807df30 SHA512 b1a4093a63d67bf0de3f2eb4c738d4cb6da315395b3f2a1d54b449e82a008c6373ce332af7e235e693e9af6cc043ed8d28e2a62a9e05177557d628ce677e1bb5
-AUX vtk-9.2.5-Add-include-cstdint-for-gcc-13.patch 664 BLAKE2B 3cb9685adda18a858c04ba6860d965b894433306c7978087db0e1fb6e2733dd3b246ad1600977bc48691d4e6b9c434d1bcaa131646ab4846f1bf4fe02c7a14cd SHA512 8ebd89eb56e412daf43c4384b36266e2534892e82529c71584f816bcb56c80e9cc1725bb9d90f3f36a6da980b04f87f5058b06985fe8a67eddc32350ea71324e
 AUX vtk-9.2.5-Add-include-cstdint-to-compile-with-gcc-13.patch 939 BLAKE2B f97780f5cb469f403615817c76862183604dcebbc40cc6024b708b6be692018654397f389d62015b2a8f0b6bf55ebe41e3d3f60f66fc74829e0cccec2d8a00b9 SHA512 6dfb504500ff35ba98e9610b1d8b868990b933c94789df3bacf155ee212cecb81132754d5b8f0bb82181638ae0d3b47478ae42d2b75fcc9cf5c51be3c2f7ff0a
 AUX vtk-9.2.5-Fix-compilation-error-with-CUDA-12.patch 780 BLAKE2B 4ec89cdd78560910c6aef7113282556008bc8e182ddab2800a3facfc568e90e547c85b8da54386347d7d1b73896b206c77f90a1f0363acbfdbfc2fcd09f5c1e4 SHA512 5db82e3224cd7e07850cd1fc41af91577fdaa10b13d151cf8b02c16eb5c6962a58920c4bf643aaf1b8ddf2644c814c23809df29e976542098d4c1d86f52fa2d7
+AUX vtk-9.2.5-More-include-cstdint-to-compile-with-gcc13.patch 957 BLAKE2B 75c8a9929a047db44b541e4bf5c8f58163bdfe1fe68183023577405378f59d78ef7722142a92273626785595fef370362939cd48aaf8a5d642421f5c5e09b7d2 SHA512 8179a31cb7dd50a2e0d0b7719354c1294e8a1997894303e75595464040b5c9340e33cc36064b0f300ac238e86bdd1b00570e23f0156a8542a568f65ee97d9fa1
 DIST VTK-9.2.5.tar.gz 53807732 BLAKE2B 8d25ec8f23c12868b2321eca84644dbf44704e58b7b79b2fd3a1260f7a240a78e4007fd99633ba93359103afc8ec00c7fa84f62778aed3d3361e1774a87b5626 SHA512 b1f225fb2589449621fd32bb0fc3f4817478d972cdccf7a9a376f1c17e93d5bd0a0511cdaa8587568a4baac9dfa8b5ffb9041442e221cd98d8f55e9981b6fcbf
 DIST VTKData-9.2.5.tar.gz 594016050 BLAKE2B 7f03f5640ee648275a9771f990f98a3b5dfee10c0e291b353e6f067a098d50e2653c577b7c9c4e19c1d554e14469968014d1dfe9e70a91ecbff75397a53c9be9 SHA512 c06264c10bf78943753e58b9cb034d56b65570995741020dc58d5703525cdd4842d680fb6e185fa8fc39b72225ea6b29d8d632c0327f4145a7e2b79f3f702ec3
 DIST VTKDataFiles-9.2.5.tar.gz 609038837 BLAKE2B e6a5aa5a865664cf407914c9598497f6304b914748ce9d9145b5b7d53f5897b4056b6f7615bb8221c9a9747caf13ba632e21b060b1c8963bb7d6b257bb1da559 SHA512 c0cf7e0fb79f626e25946f1154d9e4c3e7ec995a823a01fc9638976f89af26ae8978a5b6c8a78d62f42f7f81b5fbe0cddc6afc5836c214f3dcaddb917a1ccc79
 DIST VTKLargeData-9.2.5.tar.gz 247523496 BLAKE2B edc785e271ba605c730b9c8d9d62d2d95d818ebf18e4b20468c247187720a27897ecbf701e1eff61ba135545e6ea8f573ef120206813ee5ca11be33d8c5ff728 SHA512 7a994024aa42b48d3633cdcc528d89a2e7e07bcc47d01a0001578720dbc2eb991b90dc2f9caafe8f26a1f10185efb1bc2c0506f799da2b96e63ba08cb564117d
 DIST VTKLargeDataFiles-9.2.5.tar.gz 247506616 BLAKE2B 45cd462a11dfa65260a5aa178b2004636eb8ec000af9103fd2fc64ca55b0f607cdf39c40f5f0a9ef843b7b2e468e0f84a34dafb8b8655efce5c8d39c80961422 SHA512 da96e4f1d0e21bc597832d8cd0730dcdd8a8f7d6c1f41f74ec41a7a1d0b2a2d61e86bcb5fade7d3210b9d66cae975b537e25280767e37fe08e0965b3e98c1cae
 DIST vtkDocHtml-9.2.5.tar.gz 158865725 BLAKE2B ccfb6276955bda567e7f2b6fdc5e3e601766bae0314821c243a3d009e1557c5732bfbab59358670c4bc6cd598ba80c284971763e5279bc53c37d954ec30fcc03 SHA512 7901e9fb987ef3b88e8c507ecc7538b551c81d04a9cc65a84ff43b40dc1aeca2a694dd9842a030979a1370873b9fed0c8746a0634b486566086d7784a19181d6
-EBUILD vtk-9.2.5.ebuild 22680 BLAKE2B bb1e64a206053173269d0d0eeffff00ee9e3a1bf2f84dc5a102364963fabeb6176f402e0cb5ad6a3002d86710e4564426fc599f8ab8257724378be8c3805330a SHA512 bb9021ea45a9f91cec96e9665bca3a48b5c3d8fd8e6d50cb33f04aa60701c241b732953d1e3a2672eed5a0facd136b951c0966b7a05ee38ed280afe7dbeee0a6
+EBUILD vtk-9.2.5.ebuild 22692 BLAKE2B 99f2fd43aead46dd302e3afc09f6f1ce0297f3c799004b2092a8d7c15c4f5b0711d63adfd1166e81f9725a95e442639343e0fec7cb52a6f87e421960cdfff2ea SHA512 ac9b8ff795a74028eb08d657691d49b8213466dd26c93ab161c9af7d94fe6967aa4fbf878f8c79b6419e6453fdb682bacd3c8c1389e79dad5029776f2dbb7e69
 MISC metadata.xml 1703 BLAKE2B 0cda631a65906112bd56a573e6602afdc5d6eddd9a8f0a05c2b81728deb6cf1a1ecb2761126f7d0b50645cd116c9d8a62b414c3759af092114dc4395ed15bbc8 SHA512 e857ebd04a9b185bef6d2d3a1e818d22056bf272e448b942dbed9737bfa333072004aafced6cdf97b859c8fbab596b7760149eba5c945603f04d95fc83c9f654
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
deleted file mode 100644
index 3ab71521b6b5..000000000000
--- a/sci-libs/vtk/files/vtk-9.2.5-Add-include-cstdint-for-gcc-13.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From 69351f357a82c0bb7f97f4f707962de3400760a8 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Sun, 29 Jan 2023 12:17:36 +0100
-Subject: [PATCH] Add #include <cstdint> for gcc-13
-
-Bug: https://gitlab.kitware.com/vtk/vtk/-/issues/18782
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
---- a/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h
-+++ b/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h
-@@ -50,6 +50,7 @@
- #include "vtkRenderingMatplotlibModule.h" // For export macro
- 
- #include <vector> // for std::vector
-+#include <cstdint> // for std::uint64_t
- 
- struct _object;
- typedef struct _object PyObject;
--- 
-2.39.1
-
diff --git a/sci-libs/vtk/files/vtk-9.2.5-More-include-cstdint-to-compile-with-gcc13.patch b/sci-libs/vtk/files/vtk-9.2.5-More-include-cstdint-to-compile-with-gcc13.patch
new file mode 100644
index 000000000000..356efbb4da9a
--- /dev/null
+++ b/sci-libs/vtk/files/vtk-9.2.5-More-include-cstdint-to-compile-with-gcc13.patch
@@ -0,0 +1,33 @@
+https://bugs.gentoo.org/905387
+https://github.com/Kitware/VTK/commit/4d8283bcb460ff60d8df1b7b67b5db19876a5ca3
+
+From 890f7574f01cf58cb1522772a62ca07deb438479 Mon Sep 17 00:00:00 2001
+From: Mathieu Westphal <mathieu.westphal@kitware.com>
+Date: Thu, 23 Feb 2023 18:06:07 +0100
+Subject: [PATCH 1580/2105] More #include <cstdint> to compile with gcc13
+
+--- a/IO/PIO/PIOData.h
++++ b/IO/PIO/PIOData.h
+@@ -1,6 +1,7 @@
+ #if !defined(_PIODATA_H)
+ #define _PIODATA_H
+ 
++#include <cstdint>
+ #include <fstream>
+ #include <iostream>
+ #include <list>
+--- a/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h
++++ b/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h
+@@ -49,7 +49,8 @@
+ #include "vtkMathTextUtilities.h"
+ #include "vtkRenderingMatplotlibModule.h" // For export macro
+ 
+-#include <vector> // for std::vector
++#include <cstdint> // for std::uint64_t
++#include <vector>  // for std::vector
+ 
+ struct _object;
+ typedef struct _object PyObject;
+-- 
+2.40.1
+
diff --git a/sci-libs/vtk/vtk-9.2.5.ebuild b/sci-libs/vtk/vtk-9.2.5.ebuild
index e4fc6333d5f8..23a48458dd3a 100644
--- a/sci-libs/vtk/vtk-9.2.5.ebuild
+++ b/sci-libs/vtk/vtk-9.2.5.ebuild
@@ -162,8 +162,8 @@ PATCHES=(
 	"${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
 	"${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
 )
 
 DOCS=( CONTRIBUTING.md README.md )