Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: eclass/
Date: Wed, 02 Dec 2015 11:06:46
Message-Id: 1449054371.ed4f3e135c2c401ce26dddb4c1108efef5891d82.kensington@gentoo
1 commit: ed4f3e135c2c401ce26dddb4c1108efef5891d82
2 Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
3 AuthorDate: Mon Nov 30 22:55:00 2015 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Wed Dec 2 11:06:11 2015 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=ed4f3e13
7
8 kde5-functions.eclass: Make punt_bogus_dep() case insensitive
9
10 eclass/kde5-functions.eclass | 4 ++--
11 1 file changed, 2 insertions(+), 2 deletions(-)
12
13 diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
14 index db460d5..eb0cc16 100644
15 --- a/eclass/kde5-functions.eclass
16 +++ b/eclass/kde5-functions.eclass
17 @@ -229,7 +229,7 @@ punt_bogus_dep() {
18 local prefix=${1}
19 local dep=${2}
20
21 - pcregrep -Mn "(?s)find_package\s*\(\s*${prefix}.[^)]*?${dep}.*?\)" CMakeLists.txt > "${T}/bogus${dep}"
22 + pcregrep -Mni "(?s)find_package\s*\(\s*${prefix}.[^)]*?${dep}.*?\)" CMakeLists.txt > "${T}/bogus${dep}"
23
24 # pcregrep returns non-zero on no matches/error
25 if [[ $? != 0 ]] ; then
26 @@ -243,7 +243,7 @@ punt_bogus_dep() {
27 sed -e "${first},${last}s/${dep}//" -i CMakeLists.txt || die
28
29 if [[ ${length} = 1 ]] ; then
30 - sed -e "/find_package\s*(\s*${prefix}\s*REQUIRED\s*COMPONENTS\s*)/d" -i CMakeLists.txt || die
31 + sed -e "/find_package\s*(\s*${prefix}\s*REQUIRED\s*COMPONENTS\s*)/I d" -i CMakeLists.txt || die
32 fi
33 }