dev-util/Tensile: adapt for msgpack-cxx-6.0.0

The name of the cmake module has changed again.

Signed-off-by: Marek Szuba <marecki@gentoo.org>

4 files changed, 29 insertions, 39 deletions

diff --git a/dev-util/Tensile/Tensile-5.1.3-r2.ebuild b/dev-util/Tensile/Tensile-5.1.3-r3.ebuild
index 2f487059341f..da1adcab4f7b 100644
--- a/dev-util/Tensile/Tensile-5.1.3-r2.ebuild
+++ b/dev-util/Tensile/Tensile-5.1.3-r3.ebuild
@@ -23,7 +23,7 @@ SLOT="0/$(ver_cut 1-2)"
 RESTRICT="test"
 
 RDEPEND="${PYTHON_DEPS}
-	dev-cpp/msgpack-cxx
+	>=dev-cpp/msgpack-cxx-6.0.0
 	dev-python/pyyaml[${PYTHON_USEDEP}]
 	dev-python/msgpack[${PYTHON_USEDEP}]
 	dev-util/hip
@@ -32,12 +32,13 @@ RDEPEND="${PYTHON_DEPS}
 "
 DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}"/${PN}-4.3.0-output-commands.patch
-		  "${FILESDIR}"/${PN}-5.0.2-gfx1031.patch
-		  "${FILESDIR}"/${PN}-5.0.2-fix-arch-parse.patch
-		  "${FILESDIR}"/${PN}-5.0.2-use-ninja.patch
-		  "${FILESDIR}"/0001-Change-cmake-name-for-msgpack-5-release.patch
-	  )
+PATCHES=(
+	"${FILESDIR}"/${PN}-change-cmake-name-for-msgpack-cxx-6-release.patch
+	"${FILESDIR}"/${PN}-4.3.0-output-commands.patch
+	"${FILESDIR}"/${PN}-5.0.2-gfx1031.patch
+	"${FILESDIR}"/${PN}-5.0.2-fix-arch-parse.patch
+	"${FILESDIR}"/${PN}-5.0.2-use-ninja.patch
+)
 
 CMAKE_USE_DIR="${WORKDIR}/Source"
 
diff --git a/dev-util/Tensile/Tensile-5.4.2-r1.ebuild b/dev-util/Tensile/Tensile-5.4.2-r2.ebuild
index 8c23e68fdb21..c846dce60997 100644
--- a/dev-util/Tensile/Tensile-5.4.2-r1.ebuild
+++ b/dev-util/Tensile/Tensile-5.4.2-r2.ebuild
@@ -25,7 +25,7 @@ REQUIRED_USE="client? ( ${ROCM_REQUIRED_USE} )"
 RESTRICT="test"
 
 RDEPEND="${PYTHON_DEPS}
-	dev-cpp/msgpack-cxx
+	>=dev-cpp/msgpack-cxx-6.0.0
 	dev-python/pyyaml[${PYTHON_USEDEP}]
 	dev-python/msgpack[${PYTHON_USEDEP}]
 	dev-util/hip
@@ -34,12 +34,13 @@ RDEPEND="${PYTHON_DEPS}
 "
 DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}"/${PN}-4.3.0-output-commands.patch
-		  "${FILESDIR}"/${PN}-5.4.2-gfx1031.patch
-		  "${FILESDIR}"/${PN}-5.4.2-fix-arch-parse.patch
-		  "${FILESDIR}"/${PN}-5.4.2-use-ninja.patch
-		  "${FILESDIR}"/0001-Change-cmake-name-for-msgpack-5-release.patch
-	  )
+PATCHES=(
+	"${FILESDIR}"/${PN}-change-cmake-name-for-msgpack-cxx-6-release.patch
+	"${FILESDIR}"/${PN}-4.3.0-output-commands.patch
+	"${FILESDIR}"/${PN}-5.4.2-gfx1031.patch
+	"${FILESDIR}"/${PN}-5.4.2-fix-arch-parse.patch
+	"${FILESDIR}"/${PN}-5.4.2-use-ninja.patch
+)
 
 CMAKE_USE_DIR="${S}/${PN}/Source"
 
diff --git a/dev-util/Tensile/files/0001-Change-cmake-name-for-msgpack-5-release.patch b/dev-util/Tensile/files/0001-Change-cmake-name-for-msgpack-5-release.patch
deleted file mode 100644
index 7f8fb95123ee..000000000000
--- a/dev-util/Tensile/files/0001-Change-cmake-name-for-msgpack-5-release.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 66f5f943bbd0fd3b41b02ce7a563bed9f59f9c38 Mon Sep 17 00:00:00 2001
-From: Yiyang Wu <xgreenlandforwyy@gmail.com>
-Date: Sat, 11 Feb 2023 15:37:11 +0800
-Subject: [PATCH] Change cmake name for msgpack-5 release
-
----
- Tensile/Source/lib/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Tensile/Source/lib/CMakeLists.txt b/Tensile/Source/lib/CMakeLists.txt
-index 47a5d15d..f1a6118b 100644
---- a/Tensile/Source/lib/CMakeLists.txt
-+++ b/Tensile/Source/lib/CMakeLists.txt
-@@ -97,7 +97,7 @@ if(TENSILE_USE_LLVM OR TENSILE_USE_MSGPACK)
- endif()
- 
- if(TENSILE_USE_MSGPACK)
--    find_package(msgpack REQUIRED)
-+    find_package(msgpackc-cxx REQUIRED)
-     target_compile_definitions(TensileHost PUBLIC -DTENSILE_MSGPACK=1)
- 
-     if(TARGET msgpackc-cxx)
--- 
-2.39.1
-
diff --git a/dev-util/Tensile/files/Tensile-change-cmake-name-for-msgpack-cxx-6-release.patch b/dev-util/Tensile/files/Tensile-change-cmake-name-for-msgpack-cxx-6-release.patch
new file mode 100644
index 000000000000..d8ac203781da
--- /dev/null
+++ b/dev-util/Tensile/files/Tensile-change-cmake-name-for-msgpack-cxx-6-release.patch
@@ -0,0 +1,13 @@
+Yiyang's original patch for msgpack-cxx-5 adapted to version 6.
+
+--- a/Tensile/Source/lib/CMakeLists.txt
++++ b/Tensile/Source/lib/CMakeLists.txt
+@@ -97,7 +97,7 @@ if(TENSILE_USE_LLVM OR TENSILE_USE_MSGPACK)
+ endif()
+ 
+ if(TENSILE_USE_MSGPACK)
+-    find_package(msgpack REQUIRED)
++    find_package(msgpack-cxx REQUIRED)
+     target_compile_definitions(TensileHost PUBLIC -DTENSILE_MSGPACK=1)
+ 
+     if(TARGET msgpackc-cxx)