2 files changed, 53 insertions, 0 deletions
diff --git a/dev-cpp/catch/catch-2.13.10-r1.ebuild b/dev-cpp/catch/catch-2.13.10-r1.ebuild
index 31ec3aa215f9..5460dd7cab95 100644
--- a/dev-cpp/catch/catch-2.13.10-r1.ebuild
+++ b/dev-cpp/catch/catch-2.13.10-r1.ebuild
@@ -28,6 +28,13 @@ RESTRICT="!test? ( test )"
 
 BDEPEND="test? ( ${PYTHON_DEPS} )"
 
+PATCHES=( "${FILESDIR}"/${P}-cmake4.patch ) # bug 957561
+
+src_prepare() {
+	rm -r .conan misc || die # unused, bug 957561
+	cmake_src_prepare
+}
+
 pkg_setup() {
 	use test && python-any-r1_pkg_setup
 }
diff --git a/dev-cpp/catch/files/catch-2.13.10-cmake4.patch b/dev-cpp/catch/files/catch-2.13.10-cmake4.patch
new file mode 100644
index 000000000000..6327b7ca0be4
--- /dev/null
+++ b/dev-cpp/catch/files/catch-2.13.10-cmake4.patch
@@ -0,0 +1,46 @@
+From 98d37da03ee21e8a87cd3e0e6542c794c667e78b Mon Sep 17 00:00:00 2001
+From: Dimitrij Mijoski <dmjpp@hotmail.com>
+Date: Fri, 16 Sep 2022 17:56:00 +0200
+Subject: [PATCH] Raise the minimum CMake version to 3.10 (#2523)
+
+---
+ CMakeLists.txt                  | 2 +-
+ examples/CMakeLists.txt         | 2 +-
+ tests/ExtraTests/CMakeLists.txt | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ae8e86b9b9..be12d516c4 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 3.5)
++cmake_minimum_required(VERSION 3.10)
+ 
+ # detect if Catch is being bundled,
+ # disable testsuite in that case
+diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
+index b934aa7cd7..7118482eaf 100644
+--- a/examples/CMakeLists.txt
++++ b/examples/CMakeLists.txt
+@@ -1,5 +1,5 @@
+-cmake_minimum_required( VERSION 3.0 )
++cmake_minimum_required( VERSION 3.10 )
+
+-project( CatchExamples CXX )
++project( CatchExamples LANGUAGES CXX )
+ 
+ message( STATUS "Examples included" )
+diff --git a/projects/ExtraTests/CMakeLists.txt b/projects/ExtraTests/CMakeLists.txt
+index f1a02af3f6..0943a9c370 100644
+--- a/projects/ExtraTests/CMakeLists.txt
++++ b/projects/ExtraTests/CMakeLists.txt
+@@ -2,7 +2,7 @@
+ # Build extra tests.
+ #
+ 
+-cmake_minimum_required( VERSION 3.5 )
++cmake_minimum_required( VERSION 3.10 )
+ 
+ project( Catch2ExtraTests LANGUAGES CXX )
+