gentoo auto-resync : 20:11:2023 - 05:08:49

4 files changed, 43 insertions, 1 deletions

diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index e105d16bd983..7348c420cb1c 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/hipFFT/Manifest b/sci-libs/hipFFT/Manifest
index e1ac53605779..57165569c956 100644
--- a/sci-libs/hipFFT/Manifest
+++ b/sci-libs/hipFFT/Manifest
@@ -2,8 +2,9 @@ AUX hipFFT-4.3.0-add-complex-header.patch 381 BLAKE2B 962865d4dd1a38bbc4e70756d6
 AUX hipFFT-5.0.2-remove-git-dependency.patch 1489 BLAKE2B 800033e728c4871c9c8de797779f3c9ca0f3441e1946068e4d826aabf02d1e27145e0fc627ae583ac27eaa43abeafba271fda48c22d087eda3cdace18cd62af2 SHA512 4c0ca6282b3fccf99d7ae25c17f5961b10b0ff49e1d1e1a65055d7ff20fe4a17901b8c5e9ec78953a2de86ab9408f583eb85cc211db1e2dc339fb8e2217a9f10
 AUX hipFFT-5.1.3-gentoo-install-locations.patch 1003 BLAKE2B f41fecbfa3556767f59fe4c2516a070664fb105c2d9871640a2ea4679bd50c292ac329e81ba34557423f1e2445a8157630aba9e0d0a9eacd6b3778efbd67734b SHA512 e2cd361116c59215d5a1aa383fc6e9a3a4ea3c22348dfd83a6e5da13f3ab03833b149ba4a60939f41cb933276015b819aab4e4f9356ee6742f38b88598747d45
 AUX hipFFT-5.1.3_hip-config.patch 2792 BLAKE2B 275010cb9b4fe0b2f530bc1fe4fd027e774d1bb7bb035774fec24566ff513ae7a3ea63ecc6abef81b290b02235a3f45939f21c6b34268f72f1ca2a4e4265d81c SHA512 3307392bf43cfbfdd70973a87d2d67c63d94408e382b5db145aaf23e8572f3efa77e68c29ef168123960279da947a356fbadc0b2dc67163a6bf353694dd2a51f
+AUX hipFFT-5.7.1_hip-config.patch 1256 BLAKE2B 240423151a9eede7398289049294c28322dca1480038ca6a88b234e5222df12bd56ef1ad1c56939ce695e1aa0161ca838327902a047a92cd509beaa330a9247c SHA512 915b512e847ccaf02466c9f105365c354d4e51a1a54506844cdefc895eca555d10c0e10716686aebbd1e3b5f6a547fa8ab093b56ccf655e172a0154171f4f2c2
 DIST hipFFT-rocm-5.1.3.tar.gz 89397 BLAKE2B 3c29d5d660e9f3db8afd8c9e524296c29f50faf06a5d6a58ec628b5cc5ddb47ac2b99f137c7bc5090a311189b44014ea2f6f1f7547d22506f5ba18f837fbeb68 SHA512 8d7a90630cd8bfeade9cb026e45b6b6c1ab9c96dba424559a7ced8c881cd45c1cb06d3f7e82c8e6558e4ccb8bb41b6278842057a0cf0957b0644b1139f2c9706
 DIST hipFFT-rocm-5.7.1.tar.gz 102616 BLAKE2B ee8d6dcb7924c8989987b02533126c4e4419d8dc83067a816f2253efe4537e094f1665d95699d4bf27f30cd13f3fc5df7d3b0062c267ecbdcbb3aad961fab6f6 SHA512 4bfd812fa1e949574b4170833755a435f47e893f0615b65d8d273af6e8f89ea4d28632a208de20321e834c8bc237b11816e2af0363b60adca9af736b9bc87465
 EBUILD hipFFT-5.1.3-r1.ebuild 1055 BLAKE2B 421cdf532e119730b6d3115b40d304b24156b0724f80188dd6059e0bcc017b66744bb66c52e520349e5423d80edd6c9c7eec57476a7553cfbef3965777c51caa SHA512 fe8dfd3e06dcec747dd182bd9eba449f5947d72214d2865c2789cfa0ded17e9394762d8e4a4b307de45169461cbbc6facaaa188f5f0c8b68a9b48be77c297a2e
-EBUILD hipFFT-5.7.1.ebuild 1098 BLAKE2B 0804248835238e06449a0f6f92c5eaa50b028e95211c6372a66d690972f077a2a436573a88c01c3f1693a3b2454b4193b2b508b74a1a5344ce4e9d8b5ffef4fe SHA512 8f8758679b34773025b41073bbe6e88a8bcadb6164c6f37badde3f49d7cc5658d7dbfb78f1fac1ccabc1b131014eb0c45f3e0cd1a429e345f95dc35241c2a92d
+EBUILD hipFFT-5.7.1.ebuild 1142 BLAKE2B 00fd8bb92e27a5b67270213b550e1a90766ac08a51ce3f750732d13b9b16abf461792ff20995330c180b76e01b2a7a2c31ee5cd1ef8b21358f32efafafc1ccf5 SHA512 3e7ff4f6a529867f125af61fb616f460d48b59943439726d88abbe3b93912288e3f2c45c85c024a9fe8be163443d1283a15ec81efe58dfb95667c415b45f2026
 MISC metadata.xml 617 BLAKE2B d5ab7f2a7c98fdafe1e50bff4708e7a2bf58680e9ee2cadaa2eea018b81032b4e1d82849144684a1100acb9a4e2651fb07572c0e46cbda87ef585b290e4b865c SHA512 7859cff3011e71bb1e6a2668c6d1f035cdd47ad214aefe6c0c225a8ac7133081a9e2bad5a7bb7ea94b7a9c3761f131228e5da66b0190e35234cd10c626e01734
diff --git a/sci-libs/hipFFT/files/hipFFT-5.7.1_hip-config.patch b/sci-libs/hipFFT/files/hipFFT-5.7.1_hip-config.patch
new file mode 100644
index 000000000000..71d75417c0d3
--- /dev/null
+++ b/sci-libs/hipFFT/files/hipFFT-5.7.1_hip-config.patch
@@ -0,0 +1,40 @@
+From c2b06a3b49257b3f89cf203895cf370e64e47b27 Mon Sep 17 00:00:00 2001
+From: trixirt <trix@redhat.com>
+Date: Mon, 31 Jul 2023 09:50:19 -0700
+Subject: [PATCH] Simplify finding the hip package
+
+On Fedora, where hip is installed as an rpm, its cmake files can
+not be found and are reported as an error.
+
+CMake Error at cmake/dependencies.cmake:44 (find_package):
+  No "FindHIP.cmake" found in CMAKE_MODULE_PATH.
+
+This change treats hip as a normal package.
+
+Signed-off-by: Tom Rix <trix@redhat.com>
+---
+ cmake/dependencies.cmake | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake
+index 262478d..5810e37 100644
+--- a/cmake/dependencies.cmake
++++ b/cmake/dependencies.cmake
+@@ -30,7 +30,7 @@ if( NOT CMAKE_CXX_COMPILER MATCHES ".*/hipcc$" )
+     if( WIN32 )
+       find_package( HIP CONFIG REQUIRED )
+     else()
+-      find_package( HIP MODULE REQUIRED )
++      find_package( HIP REQUIRED )
+     endif()
+     list( APPEND HIP_INCLUDE_DIRS "${HIP_ROOT_DIR}/include" )
+   endif()
+@@ -41,7 +41,7 @@ else()
+     if( WIN32 )
+       find_package( HIP CONFIG REQUIRED )
+     else()
+-      find_package( HIP MODULE REQUIRED )
++      find_package( HIP REQUIRED )
+     endif()
+   endif()
+ endif()
diff --git a/sci-libs/hipFFT/hipFFT-5.7.1.ebuild b/sci-libs/hipFFT/hipFFT-5.7.1.ebuild
index affa5dc9b14b..dd9cbd1dc59c 100644
--- a/sci-libs/hipFFT/hipFFT-5.7.1.ebuild
+++ b/sci-libs/hipFFT/hipFFT-5.7.1.ebuild
@@ -28,6 +28,7 @@ S="${WORKDIR}/hipFFT-rocm-${PV}"
 PATCHES=(
 	"${FILESDIR}/${PN}-5.0.2-remove-git-dependency.patch"
 	"${FILESDIR}/${PN}-4.3.0-add-complex-header.patch"
+	"${FILESDIR}/${PN}-5.7.1_hip-config.patch"
 )
 
 src_configure() {