From 7651b6e1d796a7c05fd1198ae15f3ac365982e23 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Wed, 26 Feb 2025 23:01:34 +0100 Subject: [PATCH] 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 --- eclass/ecm.eclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass index 1d4b7e97c6..c9a2b7ef9c 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 }