commit: ea4cfe35d6653d2c42b14d7441b323648fee1c58 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Wed Feb 26 22:01:34 2025 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Wed Feb 26 22:05:43 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea4cfe35
ecm.eclass: Improve _ecm_punt_kdoctools_install(), ecm_punt_po_install() Allow for whitespace padding within kdoctools_install and ki18n_install. Odd that this hasn't come up before. Closes: https://bugs.gentoo.org/950317 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> eclass/ecm.eclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass index 1f40dd69fc74..87284df4696e 100644 --- a/eclass/ecm.eclass +++ b/eclass/ecm.eclass @@ -477,7 +477,7 @@ ecm_punt_bogus_dep() { # @DESCRIPTION: # Disables kdoctools_install(po) call. _ecm_punt_kdoctools_install() { - sed -e "s/^ *kdoctools_install.*(po.*)/#& # disabled by ecm.eclass/" \ + sed -e "s/^ *kdoctools_install.*(\s*po.*)/#& # disabled by ecm.eclass/" \ -i CMakeLists.txt || die } @@ -487,7 +487,7 @@ _ecm_punt_kdoctools_install() { # is outsourcing common files to a ${PN}-common split package. ecm_punt_po_install() { _ecm_punt_kdoctools_install - sed -e "s/^ *ki18n_install.*(po.*)/#& # disabled by ecm.eclass/" \ + sed -e "s/^ *ki18n_install.*(\s*po.*)/#& # disabled by ecm.eclass/" \ -i CMakeLists.txt || die }
