[gentoo-commits] repo/gentoo:master commit in: sci-visualization/kst/files/, sci-visualization/kst/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     c3876a84c08510d2351ee41d189e58f2592b8c77
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Sep  7 11:44:53 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Sep  7 12:52:28 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3876a84

sci-visualization/kst: Fix build w/ >=dev-util/cmake-3.20

Closes: https://bugs.gentoo.org/778560
Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../kst/files/kst-2.0.8-cmake-3.20.patch           | 32 ++++++++++++++++++++++
 sci-visualization/kst/kst-2.0.8-r1.ebuild          |  1 +
 2 files changed, 33 insertions(+)

diff --git a/sci-visualization/kst/files/kst-2.0.8-cmake-3.20.patch b/sci-visualization/kst/files/kst-2.0.8-cmake-3.20.patch
new file mode 100644
index 00000000000..39e2df7d0a6
--- /dev/null
+++ b/sci-visualization/kst/files/kst-2.0.8-cmake-3.20.patch
@@ -0,0 +1,32 @@
+From 6a41644c39ffb394c350de3dacbacdffa54a0a2a Mon Sep 17 00:00:00 2001
+From: Adriaan de Groot <groot@kde.org>
+Date: Sat, 3 Apr 2021 00:47:52 +0200
+Subject: [PATCH] Fix CMake-time with CMake 3.20
+
+Having multiple else-blocks for a single if() is now a syntax
+error; they need to be elseif() with only a single
+optional else() at the end.
+---
+ CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 593dcb11..f965bd64 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -116,10 +116,10 @@ elseif(kst_3rdparty_download)
+         elseif(GCC_VERSION VERSION_EQUAL 4.7 OR GCC_VERSION VERSION_GREATER 4.7)
+             set(ver 4.7)
+             set(md5 de6e8dbab1bb17eee6057941fddc93e3)
+-        else(GCC_VERSION VERSION_EQUAL 4.6 OR GCC_VERSION VERSION_GREATER 4.6)
++        elseif(GCC_VERSION VERSION_EQUAL 4.6 OR GCC_VERSION VERSION_GREATER 4.6)
+             set(ver 4.6)
+             set(md5 70d8670af9c21eb8fb466654c95d8e4d)
+-        else(GCC_VERSION VERSION_GREATER 4.4)
++        elseif(GCC_VERSION VERSION_GREATER 4.4)
+             set(ver 4.4)
+             set(md5 999248fb40a44543af4dd4cd1be0ceeb)
+         else()
+-- 
+GitLab
+

diff --git a/sci-visualization/kst/kst-2.0.8-r1.ebuild b/sci-visualization/kst/kst-2.0.8-r1.ebuild
index e7319cac830..dea0db42382 100644
--- a/sci-visualization/kst/kst-2.0.8-r1.ebuild
+++ b/sci-visualization/kst/kst-2.0.8-r1.ebuild
@@ -44,6 +44,7 @@ PATCHES=(
 	"${FILESDIR}/${P}-includes.patch"
 	"${FILESDIR}/${P}-qt-5.11.patch"
 	"${FILESDIR}/${P}-gsl-2.0.patch"
+	"${FILESDIR}/${P}-cmake-3.20.patch" # bug 778560
 )
 
 src_configure() {