[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     07f51c3d74c5387d581a95be90985a80c2155481
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  8 12:39:47 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jan  8 12:43:19 2022 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=07f51c3d

ecm.eclass: Fix sed typo in _ecm_punt_kfqt_module()

But also add '${dep}' info to 'removed by ecm.eclass' output.

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/ecm.eclass | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass
index 148a59369c..a0ba4090ce 100644
--- a/eclass/ecm.eclass
+++ b/eclass/ecm.eclass
@@ -335,11 +335,10 @@ _ecm_punt_kfqt_module() {
        local first=$(head -n 1 "${T}/bogus${dep}" | cut -d ":" -f 1)
        local last=$(( length + first - 1))
 
-       # FIXME: may leave empty find_package($prefix) behind (no regression, 
non-trivial)
        sed -e "${first},${last}s/${dep}//" -i CMakeLists.txt || die
 
        if [[ ${length} -eq 1 ]] ; then
-               sed -e 
"/find_package\s*(\s*${prefix}\([0-9]|\${[A-Z0-9_]*}\)\(\s\+\(REQUIRED\|CONFIG\|COMPONENTS\|\${[A-Z0-9_]*}\)\)\+\s*)/Is/^/#
 removed by ecm.eclass - /" \
+               sed -e 
"/find_package\s*(\s*${prefix}\([0-9]\|\${[A-Z0-9_]*}\)\(\s\+\(REQUIRED\|CONFIG\|COMPONENTS\|\${[A-Z0-9_]*}\)\)\+\s*)/Is/^/#
 '${dep}' removed by ecm.eclass - /" \
                        -i CMakeLists.txt || die
        fi
 }