From: Michael Palimaka <kensington@gentoo.org>
Date: Thu, 10 Mar 2016 19:03:57 +0000 (+1100)
Subject: kde5-functions.eclass: improve punt_bogus_deps
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d0631022fe1b0bc3d4990fc809d57d720070eab3;p=gentoo.git

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).
---

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 0a6a4347c613..34a7c9244157 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
 }