gentoo auto-resync : 09:09:2024 - 12:30:03

6 files changed, 143 insertions, 1 deletions

diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 827b2e2cedbb..7d0a166d411c 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest
index e2ec9ccc992a..692210e5ebc0 100644
--- a/sci-libs/vtk/Manifest
+++ b/sci-libs/vtk/Manifest
@@ -6,12 +6,15 @@ AUX vtk-9.2.5-Fix-compilation-error-with-CUDA-12.patch 780 BLAKE2B 4ec89cdd78560
 AUX vtk-9.2.5-More-include-cstdint-to-compile-with-gcc13.patch 957 BLAKE2B 75c8a9929a047db44b541e4bf5c8f58163bdfe1fe68183023577405378f59d78ef7722142a92273626785595fef370362939cd48aaf8a5d642421f5c5e09b7d2 SHA512 8179a31cb7dd50a2e0d0b7719354c1294e8a1997894303e75595464040b5c9340e33cc36064b0f300ac238e86bdd1b00570e23f0156a8542a568f65ee97d9fa1
 AUX vtk-9.2.5-pegtl-3.x.patch 4679 BLAKE2B 0c0be426ac07c2dcab275fb84ef68f6fe3e914d83a9434ef07b2d184bd313ed2ce62d471531c330a32cc734f7b3fcb8859a0c49c8bc5ac461191c86ea9755778 SHA512 75e8a740a784ba811eff27f0ba60d8889b24f97b1fcdf7feda4a73f0324d36060d7b35dba74bf6de2a16136201dc772ee5825e93ec0e5337e74299baea3444a0
 AUX vtk-9.2.6-Java21.patch 573 BLAKE2B ec4fac0a029cc3ef7285f1526aedd19232c67479f754c2e55d29b2316ea7322f07513f85bc4311c7acc4b4d4fcdbc3231cccb93d963293cd05a78f3dc88e0654 SHA512 a7f36c27a147a9f93aa20c807244f9b79aac45452eb4bca7ecdaf9cf9778f0575d5af742f4209b67c455e556bba354354a728407937c348c6d923775fd30c80a
+AUX vtk-9.3.0-ThirdParty-gcc15.patch 2443 BLAKE2B 67bd35f3a21ddd0897394afc5f7037f3346078ebf988f4cd358122a121197cd0bebbb748cb5972802dd4d615bf57929e41e47e2d81bb4f02f2cfe608e35497fd SHA512 636ed29f528403755c7f620826bbf384f61bec3b64b151804b6976f4aadaf786c15b9f8a38961bc059a93c671f27fb979bd34e3f42db8f6344b255490945e09b
 AUX vtk-9.3.0-ThrustPatches.patch 2026 BLAKE2B e51c72b9d2bfb0e7e968f1c9f0896a70d6215f60d21dd234c26feb7a47653c46c8d75b24b1ab0286e51d228b6c4ff7fefd34c01f5b8e885dc1cab6190fc9c6f7 SHA512 b326839c82682e7c1fc1e19d836fb55837417bbf0c23ccb28edc84dd519f085cce0a07221bf6c9e794d1b8a73ecd77c154f82cb602feef9e8d8962b2e8fabd92
+AUX vtk-9.3.0-core-octree_node.txx.patch 670 BLAKE2B 6f53735716d6c75bfcf41dbc27331a4ac495f474c540b06c7a1b62e71b84af88304c2364e88060aae9cd015866138240f40ba28e0db8470e7a841cfb06ef827e SHA512 36d9b12f29e60bb773745263996eaf9fed2f6dee4e3be7f593f5a72e25909d30cde90828c54e1981290640b9f4cae85b20292ae054b6b5f2ee4420f27d23c07f
 AUX vtk-9.3.0-fix-Java-error-with-integer-enum-overloads.patch 2356 BLAKE2B 45e2569239b5dcd4e26a007746179cb1743cc4269f82d2fff2cdb2d5188f47cf84315ddb850f2dcc602595d928569c41f986ed6677fabf52e91a0b15b8ed3225 SHA512 dff1bb8d4480ef7d8f6672015c11c29bc7ac2ee396f473c388b236b30326978b80b0a557cc8910fce34f9c54db9ef31b7a1440c930faf83c5b4acca9ecbee99c
 AUX vtk-9.3.0-java.patch 372 BLAKE2B ec11a69bf2e7b467b00648b0bc725f838f9931bce2f2cd1cbabe6d4c8fdcd4ef807dd14eedf06d524eecc3c9bc77850cc8de5e55ceaf8a238efa501c8bb36cf9 SHA512 6d326f95b05fd86d87a0566e45efb484d92d482a916895d3aaca1e019ceac65ecbcdab2957a8686545898551a3382aa718a57ad0d9e9cd16937166bf3f0729d8
 AUX vtk-9.3.0-opencascade-7.8.0.patch 819 BLAKE2B 51f4af785af5f44b21b641a631fe63c5e308558d573c03d02646691fd3762dce89670be80da2284769fe30129861982a062aea8574c90ea7472d7875ba8b2fbb SHA512 6d3bec28921d7e3b61fa10cbe68a529190248519f67d52365b0d73f2ce265aae028b7db4601b60c13fdd309db8b4164f2134961acf27e8f0778ec649674442a0
 AUX vtk-9.3.0-opencascade.patch 624 BLAKE2B 8188da64b12213074a4093ee0dd047fcf91a777742492dfe0cb1e93b597c23e78406e4783b3cdff23ffcac81655efa370bb3746a69d166edd138ec45beeb5c09 SHA512 1a0da4ffb822a038a13201d83f1cf6b42d4438073ea35fe3654d9e907e20c12306b47a511b72cb843097327a186b36560e2590ded47ce73aa8eb5a7655664236
 AUX vtk-9.3.0-pdal-2.6.0.patch 1748 BLAKE2B 9210b5ceceb95a5d74bd7ed4815faf809206bf3f66bc1606cf17124abfab6252a87285561fd9a3e0b1e542d981e714b3e5d1ae2137672beb9bc3c25d3f5afced SHA512 59cd68181857ffb3e428f6ae46b807fda6b3e1c1d4985e31f13b7d7ff177368e1ea65fa7e4bb5ce0d004ba7a9d1aef54e4e231111f05f638ddce8b360213f2f0
+AUX vtk-9.3.0-r1-expat-2.6.0.patch 2527 BLAKE2B 30006963525dcd4c06414c03e5504376853c2114c1b6f9a8eee862d15a21188ff0432fc32174bd9b4bc62bc9d3624c9107bff8772fb3610dfe54fca47f025a0e SHA512 16196fac6bee600ccc0da04d496cf56ffaf6a1a8d1146e3f7dbd87f12bd77eae7bd3716d6d7373a1e97b91c60c8e33591029b4cac9e7c2f2e5b875dc4d90c690
 AUX vtk-9.3.0-too-many-initializer-values.patch 976 BLAKE2B ae9863f867988e1202c2fba8ded3a9c610e8dd3b731eb32f1a687faa36b011e027f5b2cea435b38f9f0eb6d6d8114cb64b60a03b9c379d2c77745fe3840fdb28 SHA512 9a935eb4b7c3eea6d9e13ba4616de1717d29732f3cfc8cd08d52cc5c4c76af336574d9e10c2546c55f5d2afae7e89f571cf91f78945abae47f15388a158bd9e5
 DIST VTK-9.2.5.tar.gz 53807732 BLAKE2B 8d25ec8f23c12868b2321eca84644dbf44704e58b7b79b2fd3a1260f7a240a78e4007fd99633ba93359103afc8ec00c7fa84f62778aed3d3361e1774a87b5626 SHA512 b1f225fb2589449621fd32bb0fc3f4817478d972cdccf7a9a376f1c17e93d5bd0a0511cdaa8587568a4baac9dfa8b5ffb9041442e221cd98d8f55e9981b6fcbf
 DIST VTK-9.2.6.tar.gz 53810904 BLAKE2B e3f9736a9b38415e0edd4b4c4bfe83aa154221c3c2c582e527996f88386b1b4d7864ddd2a364c0e83596ff45902cb7cde548ac3a4eebe06c2e43925c2608c4d3 SHA512 f2328caae959d583299b7fd57205f3dd76f87c8c1ee78653e85d44cab085295bf7bf88b3f6a2b960a57df96ccb32049337ebccb067ecde6d84d25eda636196bc
@@ -33,5 +36,5 @@ DIST vtkDocHtml-9.2.6.tar.gz 158833419 BLAKE2B 04686ee0373191fec454738b5e745f3f6
 DIST vtkDocHtml-9.3.0.tar.gz 165538725 BLAKE2B 27874998679090d5442ecb3a394b53db05a0215cfee9f912bd01af1d5567efc51b4f56dacb960401195da4f3d385b335bbefc922a45d0199c99d619df0941f08 SHA512 8bf9cc87c4653a65ccc39d88d70b421a7b4353986d380cbf558cbf6e8a96435695a5d54aa7ce5bb1240cb46ca0fd9225a51183a39d1af1101d3f2876a2afc10b
 EBUILD vtk-9.2.5-r2.ebuild 22724 BLAKE2B 712cafbf33a9f7f20949a9864630d114a37b60e4f64894a232648d873bd2b078688946fdbc7a94bea6dccbfa06bc465f90cfcbf8223c5886780fa8af22908de1 SHA512 4a58dbae0f477d66e900df78b78ea5f1cc5fe57200b89ef7dc481a422d81051a9a352f48bef0e9f7ec9eafbb91b175f26095e560ef44159c628ee6c365aefa33
 EBUILD vtk-9.2.6-r3.ebuild 22763 BLAKE2B 818d81d2059389e53473324803b852b0df1eec11029f99d3301d032ac30a8e798da9756bcdc4ef7bc122b5faad0357faef70894d5e13e8c44cfc08886f22e419 SHA512 4d658fdf49e3c52969d1e048827caeb71d7de38c7e2b708a6254a5d0f938fd10695589368f5a4614f176a438d53b0ec2efa16f71b7b7ba3071f4e7c42092fa9c
-EBUILD vtk-9.3.0-r2.ebuild 36130 BLAKE2B e02cf224c42457e68cc13a747d144ed13ec27b52ed6bd097ea050abee7017e76381e8b8da75066f28884d497ca59474ef46a6649a6cbc244892135c355186c07 SHA512 dbeb59c67d33cee7a550beaefdee93513fd8f7df5cf06dfb3a8c7fcf60703d2dce6a998da874eac2a0b5a70ab371dc6150c062714066caa5931f2d1bbbf3b36e
+EBUILD vtk-9.3.0-r3.ebuild 36282 BLAKE2B bdc9308f7477a56f6b5e391942d829bb72e7446a058f8b61b2d931a6300ecf289486903a24a3c997057e135760d06a042bf1189147bb561fb3b91aa2969b34e4 SHA512 b6262a241a493c12d74e0c919f34d6d7d3a8544bbf4a0dc9b28fb1a2019f0ca6a046b476ad3064b870f5ab154adac3e717dc81e5dde4971d9feb52223d7af6d7
 MISC metadata.xml 1696 BLAKE2B facd22a703e2ffda9e2a4ac8ad61855eadc47a9d0397117d7bf5516f31561c4eda178c607055c964dfbde4d1c3feb0f125085775e3c147389bee17151b21b744 SHA512 4289a0b9a96a012e94b2f33cd18481884ee04f3c21ead3d024b29c8d45dfe1247ea450e17e72488ea0f547946c55b0e8872015197f0785efd7ffcfe7bf203cbe
diff --git a/sci-libs/vtk/files/vtk-9.3.0-ThirdParty-gcc15.patch b/sci-libs/vtk/files/vtk-9.3.0-ThirdParty-gcc15.patch
new file mode 100644
index 000000000000..df2d6fc61167
--- /dev/null
+++ b/sci-libs/vtk/files/vtk-9.3.0-ThirdParty-gcc15.patch
@@ -0,0 +1,46 @@
+From d00b98bd8ef02f854f1068e8ab8fd2fb28244c3b Mon Sep 17 00:00:00 2001
+From: Ted Rodgers <ted.d.rodgers@gmail.com>
+Date: Sat, 10 Aug 2024 16:13:09 -0400
+Subject: [PATCH] include cstdint + correct case/words
+
+--- a/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/filter/contour/worklet/mir/MIRTables.h
++++ b/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/filter/contour/worklet/mir/MIRTables.h
+@@ -11402,7 +11402,7 @@ public:
+ 
+     VTKM_EXEC vtkm::UInt8 GetPoint(vtkm::Id pointIndex) const
+     {
+-      return this->CellFacePortal.Get(pointIndex);
++      return this->CellEdgesPortal.Get(pointIndex);
+     }
+ 
+   private:
+--- a/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/filter/scalar_topology/worklet/contourtree_distributed/HierarchicalContourTree.h
++++ b/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/filter/scalar_topology/worklet/contourtree_distributed/HierarchicalContourTree.h
+@@ -663,7 +663,7 @@ std::string HierarchicalContourTree<FieldType>::PrintDotSuperStructure(const cha
+   auto hyperarcsPortal = this->Hyperarcs.ReadPortal();
+   auto regularNodeGlobalIdsPortal = this->RegularNodeGlobalIds.ReadPortal();
+   auto whichIterationPortal = this->WhichIteration.ReadPortal();
+-  auto whichRoundPortal = this->whichRound.ReadPortal();
++  auto whichRoundPortal = this->WhichRound.ReadPortal();
+   auto superarcsPortal = this->Superarcs.ReadPortal();
+   auto superparentsPortal = this->Superparents.ReadPortal();
+   for (vtkm::Id supernode = 0; supernode < this->Supernodes.GetNumberOfValues(); supernode++)
+@@ -708,7 +708,7 @@ std::string HierarchicalContourTree<FieldType>::PrintDotSuperStructure(const cha
+     if (contourtree_augmented::NoSuchElement(superarcTo))
+     { // no superarc
+       // if it occurred on the final round, it's the global root and is shown as the NULL node
+-      if (whichRoundPortal.Get(superarcFrom) == this->NRounds)
++      if (whichRoundPortal.Get(superarcFrom) == this->NumRounds)
+       { // root node
+         outstream << "\tSN" << std::setw(1) << superarcFrom << " -> SA" << std::setw(1) << superarc
+                   << " [label=\"S" << std::setw(1) << superarc << "\",style=dotted]\n";
+--- a/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/thirdparty/diy/vtkmdiy/include/vtkmdiy/thirdparty/chobo/small_vector.hpp
++++ b/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/thirdparty/diy/vtkmdiy/include/vtkmdiy/thirdparty/chobo/small_vector.hpp
+@@ -136,6 +136,7 @@
+ //
+ #pragma once
+ 
++#include <cstdint>
+ #include <type_traits>
+ #include <cstddef>
+ #include <memory>
diff --git a/sci-libs/vtk/files/vtk-9.3.0-core-octree_node.txx.patch b/sci-libs/vtk/files/vtk-9.3.0-core-octree_node.txx.patch
new file mode 100644
index 000000000000..7c4d4544a490
--- /dev/null
+++ b/sci-libs/vtk/files/vtk-9.3.0-core-octree_node.txx.patch
@@ -0,0 +1,18 @@
+From b5f466a66771621a3aaa15434910f413ab7168f7 Mon Sep 17 00:00:00 2001
+From: Ted Rodgers <ted.d.rodgers@gmail.com>
+Date: Sat, 10 Aug 2024 16:10:13 -0400
+Subject: [PATCH] octree_node.txx fix chilren typo
+
+Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
+
+--- a/Utilities/octree/octree/octree_node.txx
++++ b/Utilities/octree/octree/octree_node.txx
+@@ -210,7 +210,7 @@ const octree_node<T_, d_, A_>& octree_node<T_, d_, A_>::operator[](int child) co
+   {
+     throw std::domain_error("Attempt to access children of an octree leaf node.");
+   }
+-  return this->_M_chilren[child];
++  return this->m_children[child];
+ }
+ 
+ /**\brief Return a reference to a child node.
diff --git a/sci-libs/vtk/files/vtk-9.3.0-r1-expat-2.6.0.patch b/sci-libs/vtk/files/vtk-9.3.0-r1-expat-2.6.0.patch
new file mode 100644
index 000000000000..ac519f98aa63
--- /dev/null
+++ b/sci-libs/vtk/files/vtk-9.3.0-r1-expat-2.6.0.patch
@@ -0,0 +1,72 @@
+From 3efa07ad277efe5c1d11a2ef2b907c095f68bbef Mon Sep 17 00:00:00 2001
+From: Ben Boeckel <ben.boeckel@kitware.com>
+Date: Mon, 15 Apr 2024 22:22:22 -0400
+Subject: [PATCH] vtkXMLDataParser: track `AppendedData` state explicitly
+
+Newer `libexpat` doesn't like being given the appended data after the
+artificially ended document anymore. Avoid pushing it through to its
+parser.
+
+(cherry picked from commit db8f9efca220c9d16a30958e179abae3379d0011)
+
+Fixes: #19258
+---
+ IO/XMLParser/vtkXMLDataParser.cxx | 6 +++++-
+ IO/XMLParser/vtkXMLDataParser.h   | 3 +++
+ 2 files changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/IO/XMLParser/vtkXMLDataParser.cxx b/IO/XMLParser/vtkXMLDataParser.cxx
+index 1f6006d37c2..7d38092fdd7 100644
+--- a/IO/XMLParser/vtkXMLDataParser.cxx
++++ b/IO/XMLParser/vtkXMLDataParser.cxx
+@@ -36,6 +36,7 @@ vtkXMLDataParser::vtkXMLDataParser()
+   this->RootElement = nullptr;
+   this->AppendedDataPosition = 0;
+   this->AppendedDataMatched = 0;
++  this->AppendedDataFound = false;
+   this->DataStream = nullptr;
+   this->InlineDataStream = vtkBase64InputStream::New();
+   this->AppendedDataStream = vtkBase64InputStream::New();
+@@ -88,6 +89,7 @@ void vtkXMLDataParser::PrintSelf(ostream& os, vtkIndent indent)
+ {
+   this->Superclass::PrintSelf(os, indent);
+   os << indent << "AppendedDataPosition: " << this->AppendedDataPosition << "\n";
++  os << indent << "AppendedDataFound: " << this->AppendedDataFound << "\n";
+   if (this->RootElement)
+   {
+     this->RootElement->PrintXML(os, indent);
+@@ -214,7 +216,7 @@ int vtkXMLDataParser::ParsingComplete()
+   // If we have reached the appended data section, we stop parsing.
+   // This prevents the XML parser from having to walk over the entire
+   // appended data section.
+-  if (this->AppendedDataPosition)
++  if (this->AppendedDataPosition || this->AppendedDataFound)
+   {
+     return 1;
+   }
+@@ -433,6 +435,8 @@ int vtkXMLDataParser::ParseBuffer(const char* buffer, unsigned int count)
+     {
+       return 0;
+     }
++
++    this->AppendedDataFound = true;
+   }
+ 
+   return 1;
+diff --git a/IO/XMLParser/vtkXMLDataParser.h b/IO/XMLParser/vtkXMLDataParser.h
+index 1504a4d400b..142bf28327d 100644
+--- a/IO/XMLParser/vtkXMLDataParser.h
++++ b/IO/XMLParser/vtkXMLDataParser.h
+@@ -204,6 +204,9 @@ protected:
+   // How much of the string "<AppendedData" has been matched in input.
+   int AppendedDataMatched;
+ 
++  // Whether AppendedData has been dealt with or not.
++  bool AppendedDataFound;
++
+   // The byte order of the binary input.
+   int ByteOrder;
+ 
+-- 
+GitLab
+
diff --git a/sci-libs/vtk/vtk-9.3.0-r2.ebuild b/sci-libs/vtk/vtk-9.3.0-r3.ebuild
index cc7a1a438652..3a522724f066 100644
--- a/sci-libs/vtk/vtk-9.3.0-r2.ebuild
+++ b/sci-libs/vtk/vtk-9.3.0-r3.ebuild
@@ -165,6 +165,9 @@ PATCHES=(
 	"${FILESDIR}/${PN}-9.3.0-opencascade.patch"
 	"${FILESDIR}/${PN}-9.3.0-fix-Java-error-with-integer-enum-overloads.patch"
 	"${FILESDIR}/${PN}-9.3.0-ThrustPatches.patch"
+	"${FILESDIR}/${PN}-9.3.0-core-octree_node.txx.patch"
+	"${FILESDIR}/${PN}-9.3.0-ThirdParty-gcc15.patch"
+	"${FILESDIR}/${PN}-9.3.0-r1-expat-2.6.0.patch"
 )
 
 DOCS=( CONTRIBUTING.md README.md )