gentoo auto-resync : 07:01:2025 - 06:41:06

13 files changed, 420 insertions, 50 deletions

diff --git a/sci-libs/flann/Manifest b/sci-libs/flann/Manifest
index d343b6b7ccf9..607844580ad6 100644
--- a/sci-libs/flann/Manifest
+++ b/sci-libs/flann/Manifest
@@ -1,9 +1,17 @@
-AUX flann-1.9.1-build-oct-rather-than-mex-files-for-octave.patch 3337 BLAKE2B c7d149672edd6a9870b614986ce33cf203f9954f9070c49d96d717467602cea0f07f0990b7961dda00612bc9e7f017ea5c4ce6f58d8fa7a11a37a04f509ff64a SHA512 34718d5bc357db532cdb41cbb0443ae90d53231a2b87adadbd66aafb9c456c2eb7765489f8af0362b04b2b0efadb8fb65da2c9581ee2133ad8eb7065bb47f587
-AUX flann-1.9.1-cmake-3.11-1.patch 663 BLAKE2B 7162cb27a4ba6e13ac6f65752224e53be4988b3bb2ab5b8a9afbbed69a262a36c394d445fbb006afe7edbc5c9e90c339a88040eb7bee4c5c6c3209e1ba21b4ef SHA512 6d5032c30c0509951aaa5afc3f24a423d275224f67e14e0c4defbbda92ec659cef86fcfa65d72265d000f8010f0117ca2b8905f2c6f496aeef74a98dee9ffa08
-AUX flann-1.9.1-cmake-3.11.patch 2998 BLAKE2B 85c6b6feb800ab1a21af86a4001b0056fda416a6b61147f614670968cca13fa2b63d06673a11a2ef72b6f0d0876539ccb68134f4817975d4b796b66a716e606d SHA512 5cdffa2da3538965c0d20fb091a13124cdc301669b622ca35a131680db8abb58cf8e02f1366604a19a5cd10dd67f14861caa1c12da3154d82d576cb8052a4b87
-AUX flann-1.9.1-cuda-9.patch 850 BLAKE2B f193a6fd25a1d2cd45201d547fb444393cb82f344da6f5d1e2a012599170a412b261f6cf35d8943da7e96fd9f204991580d5ea045b43e2aa33ea5ad9fa9307d4 SHA512 0b5cad7b928319b922bdaa27d07fd38f1c359799ef9c217b6c1979f8ac9a86706e7ad1547f484aeb1db449a37693d18b2710b877483266915a869372c29ee1e4
+AUX flann-1.9.1-boost-1.87.patch 1964 BLAKE2B 95d239f84a2091df5a33c2185af62dd6c16e0e9a44adb259ceb9fa9a1ef9d7dd5cf53f75c78c5c959b160c5ff1c5e814c0d060566fe4f86c02f4936fb5498545 SHA512 82244cb1ce3a344b6b9239d403529a02018593c0657dfebeffc6dc0018f53bd1b3f27b0bff00358d3b1b9a93445034c27825baca4252df92ed7e06a1bff4cc4b
+AUX flann-1.9.1-build-oct-rather-than-mex-files-for-octave.patch 3123 BLAKE2B 9a65fdfe4af6a0b8fb968f03a450b8f243bf309fc28addfec33d234981363a0bfc4dd719aca2033f453c99ad3a7330bd526b71cfeca56410a6680a71d788c04f SHA512 d6d20e18f7f3c13025dee9880468242a7357426816acc00f1ac587ee6c27d5c7936c78b83cdc072f8cf0ddd910a5f8f932c9e7ba6f58d59a6d32c6406952de0e
+AUX flann-1.9.1-cmake-3.11-1.patch 591 BLAKE2B ea4d6d2054819a1d03741a0f2be0abeec022a5ae576ce4c4ce173cd9823332ff788d7216583561f425e463ae4e9b5a41f05f217bfd776b66566c0ae5e7c69b4f SHA512 9c8d9626f83c9df30f2ec54a78c477376a5cc26bc74253b0c4116356c1e116ac6febf65d146660ac3d9e2eb8fbf20493fe6aa065c63d51d7c643c87c1e90f05f
+AUX flann-1.9.1-cmake-3.11.patch 2656 BLAKE2B 6151c1322dd1c23edf02faad3d048ff646be4ac2464c69df96a6dbad097aa8fe21b582cb79b61303d0ef7fccb8e9983d378e7db17bebd024e9b4c5d3a1c8c317 SHA512 5074589369b2fe0fb89a5dffd6454bb4ee8130ae59b9496c82d4d3736feea62c75b0de0df2f3ec8e0447622c02c03fea694ee64cf042670dbe6e456c87a87124
+AUX flann-1.9.1-cuda-9.patch 612 BLAKE2B 3ea593903a5af6f7411d41a79dc3990499388a75ca998b6af5c6f77fe6aab6b7d18ae84d9a0c83f6d2578800d1cf38e573332755469af02ea14542f3b31a6f09 SHA512 98af97d96e174abaa125421ee0e70ac6d32919759814820387c03c92a8601322ce3211a88385c773a11d5592e9abb5dcc1cb98441f15d88cd9c8763ba0de6e18
 AUX flann-1.9.1-system-lz4-pkgconfig.patch 1168 BLAKE2B 9fadff93a2d603aee3eadd72d28f5af4f41b63803aa7d878d9b23e30a9c2384d48f85d2c8be8cfcd47542b35e929b8f35afc70caf6dc6c676b6521ebc6f829d7 SHA512 ba1c6307f2504814adfc872f1cbcd4fdaab23c56d84427c11c20e3ff75263ac97be0813cf9c5e9acd1a945d0c5dbb2b7660ada3290ffc7332ea0c90b1bc26ffa
-AUX flann-1.9.1-system-lz4.patch 4934 BLAKE2B eea32abae8b13d5d0e5149c58b2639c1b6f3bbbedfa8aa91f5fb83afca4726571eb4e01eb440eb913b54f8a03124bc0266c8b039b6448bcdc0bc5e87a9512c6f SHA512 acb67eb59b400b82722f064e529fc86f43c4e16ba097a3742b5717b33fcd35a619c73ec6ea6391b23f906d4bc40a5167b56cffd0267bc2c8259b7298ad414e65
+AUX flann-1.9.1-system-lz4.patch 4198 BLAKE2B d7c20e5649ed83af75dfe933f436c0c260111fcb280e67c2e3579bba35012c817acaf2b331cffc95e1d382940d204ebfca3818d4b9075d1a69e9f67eee4f47f6 SHA512 d35bf88ca222b2eeb46cb22f34a3d986277e30704f9e4b7b95266b28abbcc5f1beaaa533bb7f3ddc76c55c94e0eb3d3e55ac6ba3cd532763e7e1df66e52f458c
+AUX flann-1.9.2-asio-boost187.patch 1739 BLAKE2B 500b7fbcd033a3aad927a62382f3a64d088220054737385a094addb43178c70f38cf4ea848303588882b8b8f5b42de601befa64fdfe60704b20024041c17c53c SHA512 346ebe99f547f7a08ff2ecc35c68e9ccd23dab37eb4323d4ad21f5a69035cbc463510195719e6e21c534ea342a8ed02caa3ee207bd191b0ff4413ede07b88072
+AUX flann-1.9.2-boost-config.patch 700 BLAKE2B f24e1eaace63bfe5533ecf0fc540e568172b2dfcac296714fdef9744e82e51689833cf5041f99d3d411c41396a0772e41484a55c21d2c253543ed1fa3fe4a7c6 SHA512 71f7d3aa73ec9eb15c695f8368672748d4d93664f0e6d7d171f862e54aaa47870b60282141aec0cd67889698bc1765688cd77348dc8f74669bc636cab98fa532
+AUX flann-1.9.2-system-gtest.patch 1000 BLAKE2B b4278ea65b36ba725b4061a4eaed159b39a4b8dec4661e88674436d132457cffed4eca8f85cf8028c61ca1e644ea0d989eab4260566483e0a3ec0c6072c2bb37 SHA512 d7985d92433b8f020852387376772b3353710bd196228857f689efdc68164f5c7d2331080b067802127771575614c96c3ff60b0c93a72455008a2ac20aaf8449
 DIST flann-1.9.1.tar.gz 485391 BLAKE2B bf1e1e7feb33e939e1d0586db593bea3fdf66726fbadec63df9ed9c7bdb678babb11001769f0d041a7a569186b3d700db8b96af5eb9740615f6dfd880460f68b SHA512 0da78bb14111013318160dd3dee1f93eb6ed077b18439fd6496017b62a8a6070cc859cfb3e08dad4c614e48d9dc1da5f7c4a21726ee45896d360506da074a6f7
+DIST flann-1.9.2_p20221027-patches.tar.xz 10232 BLAKE2B 197dd8b81f4a7a43472e440de58a6eb7349e247514ac32a4de9d5c4ea9304da2ab6991f9561dd15fd005a4a55b14f40e4de05b324c55c50632fe9b8cd1f18371 SHA512 04bb6ff3d645ead761b37aa1e8873dc39cc8f910112fc64a55a941a4c0ab9d70a37caf018f1cc649debff04f0ac7cbbd0eb439a8a8d03b879bcddb73979e91c3
+DIST flann-1.9.2_p20221027.tar.gz 34644592 BLAKE2B 822afa518a1efcfd552cee7c9bd9e14587a450d5ddae50c4d225453ab56d7297ca73f5b5bda153aea9ff37e736942057ae071ac41e3d26ac1aeb03a408171162 SHA512 14cd7d3249109ce66c43258f8b9d158efa3b57f654708e76751290eba25e2cb7fc8044a1d882c6b24d0cda1a8b206709acdb5338086ca1f2d60fef35f0fa85be
 EBUILD flann-1.9.1-r6.ebuild 2281 BLAKE2B 60ae0b559e56a67e9283aa2330f3c244ec9bfe86a77f0dcc93fa44359f5badcf4df4107d2166a3ff504d3d0e17429836b4d0886b6aea05fe53159d9ec77c5ad4 SHA512 3b2e76a51c792ae720e9aadb134c1ddc40690065016bd0733692c43fd6ba16cea739e3481a64beabb2aff157cc73642a90af61e12e0ba6614386045657b25234
-MISC metadata.xml 912 BLAKE2B e78b293fb235efa090e62fdee5a9f9646e9b46640b8ec64815834a7897504b37ab9c0a275c17c7bf1464384a460c562ff046cc445416e891b52639f0f2d54f38 SHA512 e493462f2d4e91b656ec0b18017b34533b362eced29025b582ac8191597841fc761ac0a84a3bcaf1a8ba7c1b33c097e9d7292d6403c1aa4fc035f7416a6dd45a
+EBUILD flann-1.9.1-r7.ebuild 2331 BLAKE2B 3719c9a7e6c1eae072e94fca69ed06a036cc09f30a05a08943165ca484583ee60bc40a73b9ae00d376ed3ff75854811f08ce8dbe411e306997b7208d4c2ae05a SHA512 0e4b3d8c30d2a4de19fa16c5e45ed3ef8425d11c8c45242755aaefef4e0c0cf67c741344f6e5a58198418d5d711418622ecffc48f24ccb25c83c6106f781fcd6
+EBUILD flann-1.9.2_p20221027.ebuild 2794 BLAKE2B 2209493b04f3839be8b7a52418fa36dd3fc9d837451f67691b1007bcf0f50c9c4e1b48aabebf5c1caf7d54300d1637473750fbac4e8061610c6da66d633c8f4b SHA512 a5fe3acfaed3cde42a12dc160b3058f6f68a45e89b9a3f2c6305f54ca06bc3d4a441252eddde3a41275cee5b889dceb33408c94dd35280c5c3e53b16fbfc7223
+MISC metadata.xml 911 BLAKE2B 91ff495b936d1f5314be65367c332cab0ca78f618e6ed8197f2aa4762670feb61e6bb8155b11f5127224e4ee0c716b3e71e290030be5331db4f0722b63d151b4 SHA512 996d48a77a00584b4fe2f0c170ddbfbb92282a0a3fdde5bf0619ffc2f1f1168d50fae282e5e7758da8b94a8cb284d7744d52e8b0ac12eaaff67339942f3f667b
diff --git a/sci-libs/flann/files/flann-1.9.1-boost-1.87.patch b/sci-libs/flann/files/flann-1.9.1-boost-1.87.patch
new file mode 100644
index 000000000000..a19b8a3f4183
--- /dev/null
+++ b/sci-libs/flann/files/flann-1.9.1-boost-1.87.patch
@@ -0,0 +1,60 @@
+--- a/src/cpp/flann/mpi/client.h
++++ b/src/cpp/flann/mpi/client.h
+@@ -45,17 +45,16 @@ class Client
+ public:
+ 	Client(const std::string& host, const std::string& service)
+ 	{
+-	    tcp::resolver resolver(io_service_);
+-	    tcp::resolver::query query(tcp::v4(), host, service);
+-	    iterator_ = resolver.resolve(query);
++	    tcp::resolver resolver(io_context_);
++            results_ = resolver.resolve(host, service);
+ 	}
+ 
+ 
+ 	template<typename ElementType, typename DistanceType>
+ 	void knnSearch(const flann::Matrix<ElementType>& queries, flann::Matrix<int>& indices, flann::Matrix<DistanceType>& dists, int knn, const SearchParams& params)
+ 	{
+-	    tcp::socket sock(io_service_);
+-	    sock.connect(*iterator_);
++	    tcp::socket sock(io_context_);
++	    boost::asio::connect(sock, results_);
+ 
+ 	    Request<ElementType> req;
+ 	    req.nn = knn;
+@@ -78,8 +77,8 @@ public:
+ 
+ 
+ private:
+-	boost::asio::io_service io_service_;
+-	tcp::resolver::iterator iterator_;
++	boost::asio::io_context io_context_;
++	tcp::resolver::results_type results_;
+ };
+ 
+ 
+--- a/src/cpp/flann/mpi/server.h
++++ b/src/cpp/flann/mpi/server.h
+@@ -119,18 +119,18 @@ public:
+ 	void run()
+ 	{
+ 		boost::mpi::communicator world;
+-		boost::shared_ptr<boost::asio::io_service> io_service;
++		boost::shared_ptr<boost::asio::io_context> io_context;
+ 		boost::shared_ptr<tcp::acceptor> acceptor;
+ 
+ 		if (world.rank()==0) {
+-			io_service.reset(new boost::asio::io_service());
+-			acceptor.reset(new tcp::acceptor(*io_service, tcp::endpoint(tcp::v4(), port_)));
++			io_context.reset(new boost::asio::io_context());
++			acceptor.reset(new tcp::acceptor(*io_context, tcp::endpoint(tcp::v4(), port_)));
+ 			std::cout << "Start listening for queries...\n";
+ 		}
+ 		for (;;) {
+ 			socket_ptr sock;
+ 			if (world.rank()==0) {
+-				sock.reset(new tcp::socket(*io_service));
++				sock.reset(new tcp::socket(*io_context));
+ 				acceptor->accept(*sock);
+ 				std::cout << "Accepted connection\n";
+ 			}
diff --git a/sci-libs/flann/files/flann-1.9.1-build-oct-rather-than-mex-files-for-octave.patch b/sci-libs/flann/files/flann-1.9.1-build-oct-rather-than-mex-files-for-octave.patch
index f29aef41977c..d0e9ea04bf09 100644
--- a/sci-libs/flann/files/flann-1.9.1-build-oct-rather-than-mex-files-for-octave.patch
+++ b/sci-libs/flann/files/flann-1.9.1-build-oct-rather-than-mex-files-for-octave.patch
@@ -9,12 +9,6 @@ Subject: [PATCH] build *.oct rather than *.mex files for octave
    LOCATION
 
 Signed-off-by: Alexander Golubev <fatzer2@gmail.com>
----
- src/matlab/CMakeLists.txt | 28 ++++++++++++++++++----------
- 1 file changed, 18 insertions(+), 10 deletions(-)
-
-diff --git a/src/matlab/CMakeLists.txt b/src/matlab/CMakeLists.txt
-index a89b6b8..ebacaea 100755
 --- a/src/matlab/CMakeLists.txt
 +++ b/src/matlab/CMakeLists.txt
 @@ -16,9 +16,6 @@ endif()
diff --git a/sci-libs/flann/files/flann-1.9.1-cmake-3.11-1.patch b/sci-libs/flann/files/flann-1.9.1-cmake-3.11-1.patch
index 4cf8f3a990fc..fccac407c1e6 100644
--- a/sci-libs/flann/files/flann-1.9.1-cmake-3.11-1.patch
+++ b/sci-libs/flann/files/flann-1.9.1-cmake-3.11-1.patch
@@ -1,5 +1,5 @@
---- a/src/cpp/CMakeLists.txt	2019-02-14 21:58:41.567625108 +0100
-+++ b/src/cpp/CMakeLists.txt	2019-02-14 21:59:04.017920926 +0100
+--- a/src/cpp/CMakeLists.txt
++++ b/src/cpp/CMakeLists.txt
 @@ -34,7 +34,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AN
      target_link_libraries(flann_cpp -Wl,-whole-archive flann_cpp_s -Wl,-no-whole-archive)
  
diff --git a/sci-libs/flann/files/flann-1.9.1-cmake-3.11.patch b/sci-libs/flann/files/flann-1.9.1-cmake-3.11.patch
index b37bedcf6d50..e199a511a48e 100644
--- a/sci-libs/flann/files/flann-1.9.1-cmake-3.11.patch
+++ b/sci-libs/flann/files/flann-1.9.1-cmake-3.11.patch
@@ -40,14 +40,6 @@ http://autobuild.buildroot.net/results/b2f/b2febfaf8c44ce477b3e4a5b9b976fd25e8d7
 [3] https://github.com/mariusmuja/flann/commit/0fd62b43be2fbb0b8d791ee36290791224dc030c
 
 Signed-off-by: Romain Naour <romain.naour@gmail.com>
----
- src/cpp/CMakeLists.txt | 4 ++--
- src/cpp/empty.cpp      | 1 +
- 2 files changed, 3 insertions(+), 2 deletions(-)
- create mode 100644 src/cpp/empty.cpp
-
-diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt
-index b44a735..a816863 100644
 --- a/src/cpp/CMakeLists.txt
 +++ b/src/cpp/CMakeLists.txt
 @@ -29,7 +29,7 @@ if (BUILD_CUDA_LIB)
@@ -68,9 +60,6 @@ index b44a735..a816863 100644
          set_target_properties(flann PROPERTIES LINKER_LANGUAGE CXX)
          target_link_libraries(flann -Wl,-whole-archive flann_s -Wl,-no-whole-archive)
      else()
-diff --git a/src/cpp/empty.cpp b/src/cpp/empty.cpp
-new file mode 100644
-index 0000000..40a8c17
 --- /dev/null
 +++ b/src/cpp/empty.cpp
 @@ -0,0 +1 @@
diff --git a/sci-libs/flann/files/flann-1.9.1-cuda-9.patch b/sci-libs/flann/files/flann-1.9.1-cuda-9.patch
index 561c379af9ae..5f3483ea6756 100644
--- a/sci-libs/flann/files/flann-1.9.1-cuda-9.patch
+++ b/sci-libs/flann/files/flann-1.9.1-cuda-9.patch
@@ -4,12 +4,6 @@ Date: Fri, 4 May 2018 07:50:24 +0000
 Subject: [PATCH] fix compilation via gcc and cuda 9.1 add missing #include
  <thrust/gather> to kdtree_cuda_3d_index.cu
 
----
- src/cpp/flann/algorithms/kdtree_cuda_3d_index.cu | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/cpp/flann/algorithms/kdtree_cuda_3d_index.cu b/src/cpp/flann/algorithms/kdtree_cuda_3d_index.cu
-index e9b05080..8465322e 100644
 --- a/src/cpp/flann/algorithms/kdtree_cuda_3d_index.cu
 +++ b/src/cpp/flann/algorithms/kdtree_cuda_3d_index.cu
 @@ -32,6 +32,7 @@
diff --git a/sci-libs/flann/files/flann-1.9.1-system-lz4.patch b/sci-libs/flann/files/flann-1.9.1-system-lz4.patch
index dcc9fedd4a97..04ef15939284 100644
--- a/sci-libs/flann/files/flann-1.9.1-system-lz4.patch
+++ b/sci-libs/flann/files/flann-1.9.1-system-lz4.patch
@@ -3,16 +3,6 @@ Date: Sun, 14 Oct 2018 00:25:05 +0200
 Subject: Use system version of liblz4
 
 Also make sure that flann_cpp is linked against LZ4.
----
- CMakeLists.txt                     | 3 +++
- cmake/flann.pc.in                  | 2 +-
- examples/CMakeLists.txt            | 3 +++
- src/cpp/CMakeLists.txt             | 8 ++++++--
- src/cpp/flann/util/serialization.h | 4 ++--
- 5 files changed, 15 insertions(+), 5 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a01fb7a..995e54e 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -142,6 +142,9 @@ if (BUILD_CUDA_LIB)
@@ -25,8 +15,6 @@ index a01fb7a..995e54e 100644
  #set the C/C++ include path to the "include" directory
  include_directories(BEFORE ${PROJECT_SOURCE_DIR}/src/cpp)
  
-diff --git a/cmake/flann.pc.in b/cmake/flann.pc.in
-index 82eee5e..07b8d64 100644
 --- a/cmake/flann.pc.in
 +++ b/cmake/flann.pc.in
 @@ -8,6 +8,6 @@ Name: @PROJECT_NAME@
@@ -37,8 +25,6 @@ index 82eee5e..07b8d64 100644
 +Libs: -L${libdir} @LZ4_STATIC_LDFLAGS@ -lflann -lflann_cpp
  Cflags: -I${includedir}
  
-diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
-index e9fef04..2b2bb9d 100644
 --- a/examples/CMakeLists.txt
 +++ b/examples/CMakeLists.txt
 @@ -3,6 +3,7 @@ add_custom_target(examples ALL)
@@ -65,8 +51,6 @@ index e9fef04..2b2bb9d 100644
          target_link_libraries(flann_example_mpi flann_cpp ${HDF5_LIBRARIES} ${MPI_LIBRARIES} ${Boost_LIBRARIES})
  
          add_dependencies(examples flann_example_mpi)
-diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt
-index b453b27..5c4f693 100644
 --- a/src/cpp/CMakeLists.txt
 +++ b/src/cpp/CMakeLists.txt
 @@ -4,11 +4,12 @@ add_definitions(-D_FLANN_VERSION=${FLANN_VERSION})
@@ -108,8 +92,6 @@ index b453b27..5c4f693 100644
  
          if(MINGW AND OPENMP_FOUND)
            target_link_libraries(flann gomp)
-diff --git a/src/cpp/flann/util/serialization.h b/src/cpp/flann/util/serialization.h
-index d731021..cdc2e5e 100644
 --- a/src/cpp/flann/util/serialization.h
 +++ b/src/cpp/flann/util/serialization.h
 @@ -6,8 +6,8 @@
diff --git a/sci-libs/flann/files/flann-1.9.2-asio-boost187.patch b/sci-libs/flann/files/flann-1.9.2-asio-boost187.patch
new file mode 100644
index 000000000000..be8961c6af68
--- /dev/null
+++ b/sci-libs/flann/files/flann-1.9.2-asio-boost187.patch
@@ -0,0 +1,55 @@
+From 8972fc0ebb7f26e8f1f985d3ada52f9cd4510207 Mon Sep 17 00:00:00 2001
+From: Paul Zander <negril.nx+gentoo@gmail.com>
+Date: Mon, 16 Dec 2024 15:48:52 +0100
+Subject: [PATCH] Update asio for boost 1.87
+
+Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
+
+diff --git a/src/cpp/flann/mpi/client.h b/src/cpp/flann/mpi/client.h
+index 19a410c..8b7fbed 100644
+--- a/src/cpp/flann/mpi/client.h
++++ b/src/cpp/flann/mpi/client.h
+@@ -45,9 +45,8 @@ class Client
+ public:
+ 	Client(const std::string& host, const std::string& service)
+ 	{
+-	    tcp::resolver resolver(io_service_);
+-	    tcp::resolver::query query(tcp::v4(), host, service);
+-	    iterator_ = resolver.resolve(query);
++	    boost::asio::ip::basic_resolver<tcp> resolver(io_service_);
++	    iterator_ = resolver.resolve(tcp::v4(), host, service).begin();
+ 	}
+ 
+ 
+@@ -78,8 +77,8 @@ public:
+ 
+ 
+ private:
+-	boost::asio::io_service io_service_;
+-	tcp::resolver::iterator iterator_;
++	boost::asio::io_context io_service_;
++	boost::asio::ip::basic_resolver_iterator<tcp> iterator_;
+ };
+ 
+ 
+diff --git a/src/cpp/flann/mpi/server.h b/src/cpp/flann/mpi/server.h
+index 2caab43..9d10280 100644
+--- a/src/cpp/flann/mpi/server.h
++++ b/src/cpp/flann/mpi/server.h
+@@ -119,11 +119,11 @@ public:
+ 	void run()
+ 	{
+ 		boost::mpi::communicator world;
+-		boost::shared_ptr<boost::asio::io_service> io_service;
++		boost::shared_ptr<boost::asio::io_context> io_service;
+ 		boost::shared_ptr<tcp::acceptor> acceptor;
+ 
+ 		if (world.rank()==0) {
+-			io_service.reset(new boost::asio::io_service());
++			io_service.reset(new boost::asio::io_context());
+ 			acceptor.reset(new tcp::acceptor(*io_service, tcp::endpoint(tcp::v4(), port_)));
+ 			std::cout << "Start listening for queries...\n";
+ 		}
+-- 
+2.47.1
+
diff --git a/sci-libs/flann/files/flann-1.9.2-boost-config.patch b/sci-libs/flann/files/flann-1.9.2-boost-config.patch
new file mode 100644
index 000000000000..2e3f8598bd79
--- /dev/null
+++ b/sci-libs/flann/files/flann-1.9.2-boost-config.patch
@@ -0,0 +1,23 @@
+From 5127212278ef3675f36e962dc2f057583ab80f57 Mon Sep 17 00:00:00 2001
+From: Paul Zander <negril.nx+gentoo@gmail.com>
+Date: Mon, 16 Dec 2024 16:02:03 +0100
+Subject: [PATCH] boost config
+
+Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 64ead01..0e0b4dc 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -108,7 +108,7 @@ endif(USE_MPI)
+ 
+ 
+ if (USE_MPI AND HDF5_IS_PARALLEL)
+-    find_package(Boost COMPONENTS mpi system serialization thread REQUIRED)
++    find_package(Boost COMPONENTS mpi system serialization thread REQUIRED CONFIG)
+     include_directories(${Boost_INCLUDE_DIRS})
+     add_definitions("-DHAVE_MPI")
+ endif()
+-- 
+2.47.1
+
diff --git a/sci-libs/flann/files/flann-1.9.2-system-gtest.patch b/sci-libs/flann/files/flann-1.9.2-system-gtest.patch
new file mode 100644
index 000000000000..f825cf3d529b
--- /dev/null
+++ b/sci-libs/flann/files/flann-1.9.2-system-gtest.patch
@@ -0,0 +1,36 @@
+From 4001b11f20ccfc291a355c52a090fa16e2f5a5f1 Mon Sep 17 00:00:00 2001
+From: Paul Zander <negril.nx+gentoo@gmail.com>
+Date: Mon, 6 Jan 2025 16:13:09 +0100
+Subject: [PATCH] system gtest
+
+Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
+
+diff --git a/cmake/flann_utils.cmake b/cmake/flann_utils.cmake
+index e02a6ff..544f87a 100644
+--- a/cmake/flann_utils.cmake
++++ b/cmake/flann_utils.cmake
+@@ -41,6 +41,13 @@ macro(find_hdf5)
+ endmacro(find_hdf5)
+ 
+ 
++if(BUILD_TESTS)
++enable_testing()
++find_package(GTest)
++if(GTest_FOUND)
++    set(googletest_LIBRARIES GTest::gtest)
++    add_library(googletest ALIAS GTest::gtest)
++else()
+ # Enable ExternalProject CMake module
+ include(ExternalProject)
+ 
+@@ -69,6 +76,8 @@ set(googletest_INCLUDE_DIRS ${source_dir}/googletest/include)
+ ExternalProject_Get_Property(googletest binary_dir)
+ set(googletest_LIBRARIES ${binary_dir}/lib/libgtest.a)
+ include_directories(${googletest_INCLUDE_DIRS})
++endif()
++endif()
+ 
+ 
+ macro(flann_add_gtest exe src)
+-- 
+2.47.1
diff --git a/sci-libs/flann/flann-1.9.1-r7.ebuild b/sci-libs/flann/flann-1.9.1-r7.ebuild
new file mode 100644
index 000000000000..8bd2008b221d
--- /dev/null
+++ b/sci-libs/flann/flann-1.9.1-r7.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake cuda flag-o-matic toolchain-funcs
+
+DESCRIPTION="Fast approximate nearest neighbor searches in high dimensional spaces"
+HOMEPAGE="https://github.com/mariusmuja/flann"
+SRC_URI="https://github.com/mariusmuja/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="cuda doc examples mpi octave openmp"
+
+BDEPEND="
+	app-arch/unzip
+	doc? ( dev-tex/latex2html )
+	mpi? ( app-admin/chrpath )
+"
+DEPEND="
+	app-arch/lz4:=
+	cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5 )
+	mpi? (
+		dev-libs/boost:=[mpi]
+		sci-libs/hdf5:=[mpi]
+	)
+	!mpi? ( !sci-libs/hdf5[mpi] )
+	octave? ( >=sci-mathematics/octave-3.6.4-r1:= )
+"
+RDEPEND="${DEPEND}"
+# TODO:
+# readd dependencies for test suite,
+# requires multiple ruby dependencies
+
+PATCHES=(
+	"${FILESDIR}"/${P}-cmake-3.11{,-1}.patch # bug 678030
+	"${FILESDIR}"/${P}-cuda-9.patch
+	"${FILESDIR}"/${P}-system-lz4.patch # bug 681898
+	"${FILESDIR}"/${P}-system-lz4-pkgconfig.patch # bug 827263
+	"${FILESDIR}"/${P}-build-oct-rather-than-mex-files-for-octave.patch # bug 830424
+	"${FILESDIR}"/${P}-boost-1.87.patch # bug 946465
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_prepare() {
+	# bug #302621
+	use mpi && export CXX=mpicxx
+
+	use cuda && cuda_src_prepare
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	append-cxxflags -std=c++11
+
+	# python bindings are split off into dev-python/pyflann
+	local mycmakeargs=(
+		-DBUILD_C_BINDINGS=ON
+		-DBUILD_PYTHON_BINDINGS=OFF
+		-DPYTHON_EXECUTABLE=
+		-DBUILD_CUDA_LIB=$(usex cuda)
+		-DBUILD_EXAMPLES=$(usex examples)
+		-DBUILD_DOC=$(usex doc)
+		-DBUILD_TESTS=OFF
+		-DBUILD_MATLAB_BINDINGS=$(usex octave)
+		-DUSE_MPI=$(usex mpi)
+		-DUSE_OPENMP=$(usex openmp)
+	)
+	use cuda && mycmakeargs+=(
+		-DCUDA_NVCC_FLAGS="${NVCCFLAGS} --linker-options \"-arsch\""
+	)
+	use doc && mycmakeargs+=( -DDOCDIR=share/doc/${PF} )
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	find "${D}" -name 'lib*.a' -delete || die
+
+	# bug 795828; mpicc volunterely adds some runpaths
+	if use mpi; then
+		chrpath -d "${ED}"/usr/bin/flann_mpi_{client,server} || die
+	fi
+}
diff --git a/sci-libs/flann/flann-1.9.2_p20221027.ebuild b/sci-libs/flann/flann-1.9.2_p20221027.ebuild
new file mode 100644
index 000000000000..d628a4efa00f
--- /dev/null
+++ b/sci-libs/flann/flann-1.9.2_p20221027.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake cuda toolchain-funcs
+
+DESCRIPTION="Fast approximate nearest neighbor searches in high dimensional spaces"
+HOMEPAGE="https://github.com/flann-lib/flann"
+COMMIT="f9caaf609d8b8cb2b7104a85cf59eb92c275a25d"
+SRC_URI="
+	https://github.com/flann-lib/${PN}/archive/${COMMIT}.tar.gz
+		-> ${P}.tar.gz
+	https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-patches.tar.xz
+"
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="cuda doc examples mpi octave openmp test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	doc? (
+		dev-tex/latex2html
+	)
+	mpi? (
+		app-admin/chrpath
+	)
+"
+DEPEND="
+	app-arch/lz4:=
+	cuda? (
+		dev-util/nvidia-cuda-toolkit:=
+	)
+	examples? (
+		sci-libs/hdf5:=[mpi?]
+	)
+	mpi? (
+		dev-libs/boost:=[mpi]
+		sci-libs/hdf5[mpi]
+	)
+	octave? (
+		>=sci-mathematics/octave-3.6.4-r1:=
+	)
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.9.1-build-oct-rather-than-mex-files-for-octave.patch # bug 830424
+	"${FILESDIR}"/${PN}-1.9.2-asio-boost187.patch
+	"${FILESDIR}"/${PN}-1.9.2-boost-config.patch
+	"${FILESDIR}"/${PN}-1.9.2-system-gtest.patch
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_prepare() {
+	# bug #302621
+	use mpi && export CXX=mpicxx
+
+	cmake_src_prepare
+	for patch in "${WORKDIR}/${P}-patches"/*; do
+		eapply "${patch}"
+	done
+}
+
+src_configure() {
+
+	# python bindings are split off into dev-python/pyflann
+	local mycmakeargs=(
+		-DCMAKE_CXX_STANDARD=17
+		-DBUILD_C_BINDINGS="yes"
+		-DBUILD_PYTHON_BINDINGS="no"
+		-DBUILD_CUDA_LIB="$(usex cuda)"
+		-DBUILD_EXAMPLES="$(usex examples)"
+		-DBUILD_DOC="$(usex doc)"
+		-DBUILD_TESTS="$(usex test)"
+		-DBUILD_MATLAB_BINDINGS="$(usex octave)"
+		-DUSE_MPI="$(usex test "$(usex mpi)")"
+		-DUSE_OPENMP="$(usex openmp)"
+		-DCMAKE_BUILD_STATIC_LIBS="no"
+	)
+
+	if use cuda; then
+		cuda_add_sandbox -w
+
+		mycmakeargs+=(
+			-DCMAKE_CUDA_FLAGS="-Xcudafe \"--diag_suppress=partial_override\""
+		)
+		export CUDAHOSTCXX="$(cuda_gccdir)"
+		export CUDAHOSTLD="$(tc-getCXX)"
+	fi
+
+	use doc && mycmakeargs+=( -DDOCDIR="share/doc/${PF}" )
+
+	cmake_src_configure
+}
+
+src_compile() {
+	local targets=( "all" )
+
+	use doc && targets+=( "doc" )
+
+	if use test; then
+		targets+=( "flann_gtests" )
+		if use cuda; then
+			targets+=( "flann_cuda_test" )
+		fi
+	fi
+
+	cmake_src_compile "${targets[@]}"
+}
+
+src_test() {
+	# some fail when run in parallel
+	cmake_src_test -j1
+}
+
+src_install() {
+	cmake_src_install
+
+	# bug 795828; mpicc voluntarily adds some runpaths
+	if use mpi; then
+		chrpath -d "${ED}/usr/bin/flann_mpi_"{client,server} || die
+	fi
+}
diff --git a/sci-libs/flann/metadata.xml b/sci-libs/flann/metadata.xml
index c33b2618d660..f54c9e238fb6 100644
--- a/sci-libs/flann/metadata.xml
+++ b/sci-libs/flann/metadata.xml
@@ -19,6 +19,6 @@
     <pkg>sci-mathematics/octave</pkg></flag>
   </use>
   <upstream>
-    <remote-id type="github">mariusmuja/flann</remote-id>
+    <remote-id type="github">flann-lib/flann</remote-id>
   </upstream>
 </pkgmetadata>