From c52c7146510731bacfa4b96267d3e0c4e8097356 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Thu, 9 Jun 2016 10:25:41 +0200 Subject: [PATCH] kde5-functions.eclass: Improve punt_bogus_dep The variable holding the min version requirement can be named anything. This should catch most cases, most importantly Qt5 modules. --- eclass/kde5-functions.eclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass index 435c8384658a..b20d406721dd 100644 --- a/eclass/kde5-functions.eclass +++ b/eclass/kde5-functions.eclass @@ -279,7 +279,7 @@ punt_bogus_dep() { sed -e "${first},${last}s/${dep}//" -i CMakeLists.txt || die if [[ ${length} = 1 ]] ; then - sed -e "/find_package\s*(\s*${prefix}\(\s\+\(REQUIRED\|CONFIG\|COMPONENTS\|\${KF5_VERSION}\)\)\+\s*)/Is/^/# removed by kde5-functions.eclass - /" -i CMakeLists.txt || die + sed -e "/find_package\s*(\s*${prefix}\(\s\+\(REQUIRED\|CONFIG\|COMPONENTS\|\${[A-Z0-9_]*}\)\)\+\s*)/Is/^/# removed by kde5-functions.eclass - /" -i CMakeLists.txt || die fi } -- 2.26.2