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: Mon, 07 Mar 2016 15:13:58
Message-Id: 1457363619.f66fd822d05eebd2bbfc1f0870b89047d5e81c11.kensington@gentoo
1 commit: f66fd822d05eebd2bbfc1f0870b89047d5e81c11
2 Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
3 AuthorDate: Mon Feb 29 23:42:50 2016 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Mon Mar 7 15:13:39 2016 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=f66fd822
7
8 kde5.eclass: Split KDE PIM: Do more forcefully remove deps
9
10 eclass/kde5.eclass | 19 ++++++++++++-------
11 1 file changed, 12 insertions(+), 7 deletions(-)
12
13 diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
14 index b065315..2ccbf6e 100644
15 --- a/eclass/kde5.eclass
16 +++ b/eclass/kde5.eclass
17 @@ -532,20 +532,25 @@ kde5_src_prepare() {
18 -i CMakeLists.txt || die "Failed to make dependencies optional"
19 # FIXME: try to push these down into subdirs @upstream
20 # AkonadiSearch: kaddressbook, knotes, kdepim (kmail, korganizer)
21 - # Boost: kleopatra, kdepim (kmail, agents)
22 - # Gpgme: kleopatra
23 + # Gpgme: kleopatra (removed in >= 16.03.80)
24 # Grantlee: akregator, kaddressbook, knotes, kdepim (grantleeeditor, kmail, kontact)
25 - # MailTransportDBusService: kdepim (kmail)
26 - # Phonon4Qt5: kdepim (kalarm, korgac)
27 sed -e "/set_package_properties(KF5AkonadiSearch/ s/ REQUIRED/ OPTIONAL/" \
28 - -e "/set_package_properties(Boost/ s/ REQUIRED/ OPTIONAL/" \
29 -e "/set_package_properties(Xsltproc/ s/ REQUIRED/ OPTIONAL/" \
30 -e "/find_package(Gpgme/ s/ REQUIRED//" \
31 -e "/find_package(Grantlee5/ s/ REQUIRED//" \
32 - -e "/find_package(MailTransportDBusService/ s/ REQUIRED//" \
33 - -e "/find_package(Phonon4Qt5/ s/ REQUIRED//" \
34 -i CMakeLists.txt || die "Failed to make dependencies optional"
35
36 + # Boost: kdepim (kmail, mailfilteragent)
37 + # MailTransportDBusService: kdepim (kmail)
38 + # Phonon4Qt5: kdepim (kalarm, korgac)
39 + if [[ ${PN} != "kdepim" ]] ; then
40 + sed -e "/find_package(Boost/ s/^/#DONT/" \
41 + -e "/set_package_properties(Boost/ s/^/#DONT/" \
42 + -e "/find_package(MailTransportDBusService/ s/^/#DONT/" \
43 + -e "/find_package(Phonon4Qt5/ s/^/#DONT/" \
44 + -i CMakeLists.txt || die "Failed to disable dependencies"
45 + fi
46 +
47 # remove anything else not listed here
48 local _pim_keep_subdir="${PN} ${KDE_PIM_KEEP_SUBDIR}"
49 einfo "Building: ${_pim_keep_subdir}"