diff --git a/sci-electronics/kicad/files/kicad-9.0.8-fix-cmake4-compat.patch b/sci-electronics/kicad/files/kicad-9.0.8-fix-cmake4-compat.patch deleted file mode 100644 index ab06a00219b6f..0000000000000 --- a/sci-electronics/kicad/files/kicad-9.0.8-fix-cmake4-compat.patch +++ /dev/null @@ -1,22 +0,0 @@ -https://bugs.gentoo.org/970924 - -CMake >= 4.0 has removed compatibility with cmake_minimum_required -versions less than 3.5. Bump the minimum versions in vendored -thirdparty code to fix the build. - ---- a/thirdparty/sentry-native/external/crashpad/third_party/zlib/zlib/CMakeLists.txt -+++ b/thirdparty/sentry-native/external/crashpad/third_party/zlib/zlib/CMakeLists.txt -@@ -1,4 +1,4 @@ --cmake_minimum_required(VERSION 3.0) -+cmake_minimum_required(VERSION 3.5) - set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS ON) - - project(zlib C) ---- a/thirdparty/pybind11/tests/test_cmake_build/subdirectory_target/CMakeLists.txt -+++ b/thirdparty/pybind11/tests/test_cmake_build/subdirectory_target/CMakeLists.txt -@@ -1,4 +1,4 @@ --cmake_minimum_required(VERSION 3.4) -+cmake_minimum_required(VERSION 3.5) - - # The `cmake_minimum_required(VERSION 3.4...3.18)` syntax does not work with - # some versions of VS that have a patched CMake 3.11. This forces us to emulate diff --git a/sci-electronics/kicad/files/kicad-9.0.9-fix-cmake4-compat.patch b/sci-electronics/kicad/files/kicad-9.0.9-fix-cmake4-compat.patch deleted file mode 100644 index ab06a00219b6f..0000000000000 --- a/sci-electronics/kicad/files/kicad-9.0.9-fix-cmake4-compat.patch +++ /dev/null @@ -1,22 +0,0 @@ -https://bugs.gentoo.org/970924 - -CMake >= 4.0 has removed compatibility with cmake_minimum_required -versions less than 3.5. Bump the minimum versions in vendored -thirdparty code to fix the build. - ---- a/thirdparty/sentry-native/external/crashpad/third_party/zlib/zlib/CMakeLists.txt -+++ b/thirdparty/sentry-native/external/crashpad/third_party/zlib/zlib/CMakeLists.txt -@@ -1,4 +1,4 @@ --cmake_minimum_required(VERSION 3.0) -+cmake_minimum_required(VERSION 3.5) - set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS ON) - - project(zlib C) ---- a/thirdparty/pybind11/tests/test_cmake_build/subdirectory_target/CMakeLists.txt -+++ b/thirdparty/pybind11/tests/test_cmake_build/subdirectory_target/CMakeLists.txt -@@ -1,4 +1,4 @@ --cmake_minimum_required(VERSION 3.4) -+cmake_minimum_required(VERSION 3.5) - - # The `cmake_minimum_required(VERSION 3.4...3.18)` syntax does not work with - # some versions of VS that have a patched CMake 3.11. This forces us to emulate diff --git a/sci-electronics/kicad/kicad-9.0.8.ebuild b/sci-electronics/kicad/kicad-9.0.8.ebuild index 10e739f599adf..c9e777be3e7ed 100644 --- a/sci-electronics/kicad/kicad-9.0.8.ebuild +++ b/sci-electronics/kicad/kicad-9.0.8.ebuild @@ -121,7 +121,7 @@ src_unpack() { } PATCHES=( - "${FILESDIR}"/${P}-fix-cmake4-compat.patch # Bug 970924 + "${FILESDIR}"/${PN}-9.0.6-fix-cmake4-compat.patch # Bug 970924 ) src_prepare() { diff --git a/sci-electronics/kicad/kicad-9.0.9.ebuild b/sci-electronics/kicad/kicad-9.0.9.ebuild index 5939869e7a535..68791e168646c 100644 --- a/sci-electronics/kicad/kicad-9.0.9.ebuild +++ b/sci-electronics/kicad/kicad-9.0.9.ebuild @@ -121,7 +121,7 @@ src_unpack() { } PATCHES=( - "${FILESDIR}"/${P}-fix-cmake4-compat.patch # Bug 970924 + "${FILESDIR}"/${PN}-9.0.6-fix-cmake4-compat.patch # Bug 970924 ) src_prepare() {