commit: 01d43d006b17918703062c099958bbf3f1b8f21a
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 12 17:00:30 2015 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Jun 12 17:00:55 2015 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=01d43d00
[eclass] Handle more whitespace variations.
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 95735ba..cd0588d 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -218,7 +218,7 @@ punt_bogus_dep() {
local prefix=${1}
local dep=${2}
- pcregrep -Mn "(?s)find_package\(\s*${prefix}.[^)]*?${dep}.*?\)"
CMakeLists.txt > "${T}/bogus${dep}"
+ pcregrep -Mn "(?s)find_package\s*\(\s*${prefix}.[^)]*?${dep}.*?\)"
CMakeLists.txt > "${T}/bogus${dep}"
# pcregrep returns non-zero on no matches/error
if [[ $? != 0 ]] ; then
@@ -232,7 +232,7 @@ punt_bogus_dep() {
sed -e "${first},${last}s/${dep}//" -i CMakeLists.txt || die
if [[ ${length} = 1 ]] ; then
- sed -e
"/find_package(\s*${prefix}\s*REQUIRED\s*COMPONENTS\s*)/d" -i CMakeLists.txt ||
die
+ sed -e
"/find_package\s*(\s*${prefix}\s*REQUIRED\s*COMPONENTS\s*)/d" -i CMakeLists.txt
|| die
fi
}