commit:     92c399440dbaaaaadc80669da9c7f7722b71e896
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Apr  7 19:20:05 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Apr  7 19:20:11 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=92c39944

kde5-functions.eclass: further dependency punting improvements

This now handles the case of 'find_package(Qt5 REQUIRED COMPONENTS )'.

Thanks again to Arfrever.

 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 1b882d4..44bc296 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -274,7 +274,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}\)\)\+)/Is/^/#
 removed by kde5-functions.eclass - /" -i CMakeLists.txt || die
+               sed -e 
"/find_package\s*(\s*${prefix}\(\s\+\(REQUIRED\|CONFIG\|COMPONENTS\|\${KF5_VERSION}\)\)\+\s*)/Is/^/#
 removed by kde5-functions.eclass - /" -i CMakeLists.txt || die
        fi
 }
 

Reply via email to