gentoo auto-resync : 20:06:2023 - 07:15:40

4 files changed, 44 insertions, 1 deletions

diff --git a/sci-libs/ginkgo/Manifest b/sci-libs/ginkgo/Manifest
index d6bc9fefd7d7..3bb9c745fd44 100644
--- a/sci-libs/ginkgo/Manifest
+++ b/sci-libs/ginkgo/Manifest
@@ -1,5 +1,7 @@
+AUX ginkgo-1.6.0-disable_automagic_dependencies.patch 835 BLAKE2B d496816000e76937b925eef74f6f6003a2ae8a1c9e09f2e39d78b02cd92a267be1f742666f535cbb9146384fa72245fd5cb11268bf632e86c3f263ea6ea8a735 SHA512 b6b1ce4ba90c3a8216133b248055aa6d89242e111336f15c776e66774d0dd3046199cd80d3cbbcae934ab9e1d58ca77f54b73e3c41138770a12c0b771ab6ccd5
+AUX ginkgo-1.6.0-fix_type_mismatch.patch 548 BLAKE2B ebe42eab24638703b56198f7181c40db91153cb818f0602f4cf8af35d02963e71daad5b6c865637e13f9979b1cecde1cda6d569d64e66f10eea3b80eae4a4cbd SHA512 26e329f890cb2de6513f3349ffd2a219f7b3a3fbc3aa210e03cf503a5755427d0cd216ef270f474bb3449cc9143ec1ce23694b708f2ca7d6f14ac898fddb3eb6
 DIST ginkgo-1.4.0.tar.gz 2574052 BLAKE2B 99677d9d75831991cac40312095d32c44bef18cd05b120d80fdb9e64ea6dc15796c09b26f35dc8230db6b55c7be4dd76efd6d1cd8ca13c83e1f3087550db0dca SHA512 9bfcb2c415c7a1a70cf8e49f20adf62d02cab83bb23b6fcecfeaeeb322b2d4e1ad8d8fa6582735073753f9a05eac8688b9bd1ff1d4203957c1a80702d117e807
 DIST ginkgo-1.6.0.tar.gz 12788830 BLAKE2B c452e20eddb3673b5863106d8a8d42aab253cb5a17cf0445194903ebadcffe53ef0df6b5f26e2602e137faaa4a23dddd0b192f3453b4bd440907385fc09d004a SHA512 507a17bc9ad010c235c4ae49ac4bef3f4d5b65b4ea02bfa5cad5ea578fa65d28f564d1faf0a1f5618a6e72d744217f58bdff68c5f1fffc9cfb484800f7f84c50
 EBUILD ginkgo-1.4.0-r3.ebuild 1267 BLAKE2B 509ac83701e30924c09f1ff6b4c56e6c2ebebec69e8debc96fbaafa3110a6cc81437f81ad20d77ef7b9cf6341be87e82bcea20fd0191b6baf5c8f32909eca037 SHA512 1801ec71a30814acd8e521e313a722ce472edffb20d10cd627093360ab62b9ee10d09e27dd4ffdeff0bd8f153e636d9fad45268a262e1619d3def6cd952e7965
-EBUILD ginkgo-1.6.0.ebuild 1267 BLAKE2B d7e69b9e90d288357763198c1fbbbc6f222928e647227b0de848c6ed1c97d36324a8571c0e3459b4f027bb21b8ad1f77268f3994e955f80942e321efcde5dc64 SHA512 82f8f8264622f1f810b2561bee1e4a057d259d332a52e1816e98088bb6a4530e1ff822ff287f98d1cd742d4ec9b436e2beb81c5691c63cdeea6228d6c1e992e8
+EBUILD ginkgo-1.6.0.ebuild 1381 BLAKE2B 303537467c4e8e92c0c0bc92d327eed70174486ed27c01ddc879557c619a0bb9cae4ef252736ac99cc597df3ee1ad98804d5e122b9690fa808b5307a7b46c978 SHA512 c79400621aa3b8db866017e8814d85a9107fe10e7ae620238227216b7baee16bc38e6540d7d907879c1c249b7afb6bd40fd13d58e9312fc391e1884e95e52d58
 MISC metadata.xml 892 BLAKE2B cedbb29c9e43c4b94baff1c5c7f657e9120792fe5faf0b4dab621b17579c6c82ccc3c07ee216bf45cc83b12d44fdcedaaf0736b56611b6abcb114224c2070856 SHA512 2051aabc0746015724bb7bf3f9be42097990b5a7d2657f51f8ed448e2b7f8f6ac27be208d33f133bf1098f2785b4b1b6eac27244e05337e4b80ffdfda10ec664
diff --git a/sci-libs/ginkgo/files/ginkgo-1.6.0-disable_automagic_dependencies.patch b/sci-libs/ginkgo/files/ginkgo-1.6.0-disable_automagic_dependencies.patch
new file mode 100644
index 000000000000..c910ad92c5a9
--- /dev/null
+++ b/sci-libs/ginkgo/files/ginkgo-1.6.0-disable_automagic_dependencies.patch
@@ -0,0 +1,24 @@
+diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
+index 41ed77d900..9a0c7d5128 100644
+--- a/examples/CMakeLists.txt
++++ b/examples/CMakeLists.txt
+@@ -40,8 +40,7 @@ if(GINKGO_BUILD_EXTLIB_EXAMPLE)
+     list(APPEND EXAMPLES_LIST external-lib-interfacing)
+ endif()
+ 
+-find_package(OpenCV QUIET)
+-if(OpenCV_FOUND)
++if(FALSE)
+     list(APPEND EXAMPLES_LIST heat-equation schroedinger-splitting)
+ else()
+     message(STATUS "No OpenCV found, disabling examples with video output")
+@@ -55,8 +54,7 @@ if(GINKGO_BUILD_MPI)
+     list(APPEND EXAMPLES_LIST distributed-solver)
+ endif()
+ 
+-find_package(Kokkos QUIET)
+-if(Kokkos_FOUND)
++if(FALSE)
+     if(GINKGO_WITH_CCACHE)
+         message(WARNING "The CMAKE_CXX_COMPILER_LAUNCHER is set due to "
+             "GINKGO_WITH_CCACHE=ON which is known to casue issues with CUDA enabled "
diff --git a/sci-libs/ginkgo/files/ginkgo-1.6.0-fix_type_mismatch.patch b/sci-libs/ginkgo/files/ginkgo-1.6.0-fix_type_mismatch.patch
new file mode 100644
index 000000000000..d248fe87f2d7
--- /dev/null
+++ b/sci-libs/ginkgo/files/ginkgo-1.6.0-fix_type_mismatch.patch
@@ -0,0 +1,12 @@
+diff --git a/core/base/timer.cpp b/core/base/timer.cpp
+index bc1c716..0185567 100644
+--- a/core/base/timer.cpp
++++ b/core/base/timer.cpp
+@@ -124,7 +124,7 @@ void CpuTimer::wait(time_point& time) {}
+ std::chrono::nanoseconds CpuTimer::difference_async(const time_point& start,
+                                                     const time_point& stop)
+ {
+-    return std::chrono::duration_cast<std::chrono::nanoseconds, int64>(
++    return std::chrono::duration_cast<std::chrono::nanoseconds>(
+         stop.data_.chrono - start.data_.chrono);
+ }
diff --git a/sci-libs/ginkgo/ginkgo-1.6.0.ebuild b/sci-libs/ginkgo/ginkgo-1.6.0.ebuild
index 00081e5e00a7..4cceeb06c5b6 100644
--- a/sci-libs/ginkgo/ginkgo-1.6.0.ebuild
+++ b/sci-libs/ginkgo/ginkgo-1.6.0.ebuild
@@ -26,6 +26,11 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-fix_type_mismatch.patch
+	"${FILESDIR}"/${P}-disable_automagic_dependencies.patch
+)
+
 pkg_pretend() {
 	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }