Gentoo Archives: gentoo-commits

From: Johannes Huber <johu@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: eclass/
Date: Tue, 26 Apr 2016 05:52:34
Message-Id: 1461649925.52088d62d0545e436fc86de216dac07438ec82f1.johu@gentoo
1 commit: 52088d62d0545e436fc86de216dac07438ec82f1
2 Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
3 AuthorDate: Mon Apr 25 15:52:38 2016 +0000
4 Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
5 CommitDate: Tue Apr 26 05:52:05 2016 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=52088d62
7
8 kde5.eclass: Fix recent change wrt split PIM 16.04.x
9
10 Gentoo-bug: 581176
11
12 Signed-off-by: Johannes Huber <johu <AT> gentoo.org>
13
14 eclass/kde5.eclass | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17 diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
18 index d39e1b4..71e5ad4 100644
19 --- a/eclass/kde5.eclass
20 +++ b/eclass/kde5.eclass
21 @@ -534,7 +534,7 @@ kde5_src_prepare() {
22 fi
23
24 # legacy (16.04) kdepim split packaging handling (drop other applications != {PN})
25 - if [[ ${KMNAME} = "kdepim" && ${PV} = "16.04*" && $(basename "${S}") != ${PN} ]] || \
26 + if [[ ${KMNAME} = "kdepim" && ${PV} = 16.04* && $(basename "${S}") != ${PN} ]] || \
27 [[ ${PN} = "kdepim" ]] ; then
28 # make optional a lot of otherwise required dependencies in root CMakeLists.txt
29 sed -e "/find_package(KF5/ s/ REQUIRED//" \