kde5-functions.eclass: punt_bogus_deps improvements

Syncs eclass with kde overlay. Improvements by Michael Palimaka
<kensington@gentoo.org>. Needed for bug #580282.

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index be336bec8b10e27387d8c7b815a443ee8fd70f4d..44bc29631a56ad69f3e6bb13014c9d7e48d6217d 100644 (file)
--- 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\)*\s*\(COMPONENTS\)*\s*)/I d" -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
 }