[gentoo-commits] repo/gentoo:master commit in: eclass/

[Johannes Huber]

commit:     fbc6d2cd97278c3ce27bbf6a8fc532796b3fc32c
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 19 11:53:41 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Tue Apr 19 12:07:57 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbc6d2cd

kde5-functions.eclass: punt_bogus_deps improvements

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

 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 be336be..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\)*\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
 }