From 4683e38d6d8e7dcc48307928b85102c1a1867361 Mon Sep 17 00:00:00 2001 From: Rolf Eike Beer Date: Wed, 3 Jul 2019 22:35:08 +0200 Subject: [PATCH] dev-util/cmake: use correct pattern to undo cmake eclass modifications Fixes: 6b7998b644e6f4469a7cb4c64776013a74363866 Closes: https://bugs.gentoo.org/686266 Closes: https://github.com/gentoo/gentoo/pull/12385 Signed-off-by: Rolf Eike Beer Closes: https://github.com/gentoo/gentoo/pull/12385 Signed-off-by: Andreas Sturmlechner --- dev-util/cmake/cmake-3.14.3.ebuild | 2 +- dev-util/cmake/cmake-3.14.5.ebuild | 2 +- dev-util/cmake/cmake-3.15.0_rc3.ebuild | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dev-util/cmake/cmake-3.14.3.ebuild b/dev-util/cmake/cmake-3.14.3.ebuild index 42fd589bd81b..40c754212745 100644 --- a/dev-util/cmake/cmake-3.14.3.ebuild +++ b/dev-util/cmake/cmake-3.14.3.ebuild @@ -101,7 +101,7 @@ cmake_src_bootstrap() { cmake_src_test() { # fix OutDir and SelectLibraryConfigurations tests # these are altered thanks to our eclass - sed -i -e 's:#IGNORE ::g' \ + sed -i -e 's:^#_cmake_modify_IGNORE ::g' \ "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \ || die diff --git a/dev-util/cmake/cmake-3.14.5.ebuild b/dev-util/cmake/cmake-3.14.5.ebuild index 0ec739545d3b..e3507ad6196d 100644 --- a/dev-util/cmake/cmake-3.14.5.ebuild +++ b/dev-util/cmake/cmake-3.14.5.ebuild @@ -101,7 +101,7 @@ cmake_src_bootstrap() { cmake_src_test() { # fix OutDir and SelectLibraryConfigurations tests # these are altered thanks to our eclass - sed -i -e 's:#IGNORE ::g' \ + sed -i -e 's:^#_cmake_modify_IGNORE ::g' \ "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \ || die diff --git a/dev-util/cmake/cmake-3.15.0_rc3.ebuild b/dev-util/cmake/cmake-3.15.0_rc3.ebuild index b8f071ece70a..0fb93b78d73f 100644 --- a/dev-util/cmake/cmake-3.15.0_rc3.ebuild +++ b/dev-util/cmake/cmake-3.15.0_rc3.ebuild @@ -101,7 +101,7 @@ cmake_src_bootstrap() { cmake_src_test() { # fix OutDir and SelectLibraryConfigurations tests # these are altered thanks to our eclass - sed -i -e 's:#IGNORE ::g' \ + sed -i -e 's:^#_cmake_modify_IGNORE ::g' \ "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \ || die -- 2.26.2