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

[Michael Palimaka]

commit:     aeb762f669db6537a11fbad31d0ebaf337d019a6
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 10 19:03:57 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Mar 10 19:04:02 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=aeb762f6

kde5-functions.eclass: improve punt_bogus_deps

This extends coverage to individual components such as 
find_package(KF5DocTools).
It also improves cleaning up of empty find_package calls such as 
find_package(KF5).

 eclass/kde5-functions.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 0a6a434..34a7c92 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -260,7 +260,7 @@ punt_bogus_dep() {
        local prefix=${1}
        local dep=${2}
 
-       pcregrep -Mni "(?s)find_package\s*\(\s*${prefix}.[^)]*?${dep}.*?\)" 
CMakeLists.txt > "${T}/bogus${dep}"
+       pcregrep -Mni "(?s)find_package\s*\(\s*${prefix}[^)]*?${dep}.*?\)" 
CMakeLists.txt > "${T}/bogus${dep}"
 
        # pcregrep returns non-zero on no matches/error
        if [[ $? != 0 ]] ; then
@@ -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\)*\s*\(COMPONENTS\)*\s*)/I d" -i 
CMakeLists.txt || die
        fi
 }