From: Johannes Huber <johu@gentoo.org>
Date: Tue, 19 Apr 2016 11:53:41 +0000 (+0200)
Subject: kde5-functions.eclass: punt_bogus_deps improvements
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=fbc6d2cd97278c3ce27bbf6a8fc532796b3fc32c;p=gentoo.git

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 be336bec8b10..44bc29631a56 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
 }