commit: 4683e38d6d8e7dcc48307928b85102c1a1867361 Author: Rolf Eike Beer <eike <AT> sf-mail <DOT> de> AuthorDate: Wed Jul 3 20:35:08 2019 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Thu Jul 4 19:36:07 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4683e38d
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 <eike <AT> sf-mail.de> Closes: https://github.com/gentoo/gentoo/pull/12385 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> 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 42fd589bd81..40c75421274 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 0ec739545d3..e3507ad6196 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 b8f071ece70..0fb93b78d73 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
