Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/kdepim/
Date: Sun, 29 Nov 2015 15:29:43
Message-Id: 1448709459.f2d9e0f950182a62125ecf4315e07748c6f47b59.kensington@gentoo
1 commit: f2d9e0f950182a62125ecf4315e07748c6f47b59
2 Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
3 AuthorDate: Thu Nov 26 19:25:58 2015 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Sat Nov 28 11:17:39 2015 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=f2d9e0f9
7
8 kde-apps/kdepim: kde-apps/noteshared only required by knotes
9
10 Package-Manager: portage-2.2.26
11
12 kde-apps/kdepim/kdepim-15.12.49.9999.ebuild | 13 ++++++++++++-
13 1 file changed, 12 insertions(+), 1 deletion(-)
14
15 diff --git a/kde-apps/kdepim/kdepim-15.12.49.9999.ebuild b/kde-apps/kdepim/kdepim-15.12.49.9999.ebuild
16 index 2d05612..85a84aa 100644
17 --- a/kde-apps/kdepim/kdepim-15.12.49.9999.ebuild
18 +++ b/kde-apps/kdepim/kdepim-15.12.49.9999.ebuild
19 @@ -92,7 +92,6 @@ DEPEND="
20 $(add_kdeapps_dep messagecore)
21 $(add_kdeapps_dep messagelist)
22 $(add_kdeapps_dep messageviewer)
23 - $(add_kdeapps_dep noteshared)
24 $(add_kdeapps_dep pimcommon)
25 $(add_kdeapps_dep syndication)
26 $(add_kdeapps_dep templateparser)
27 @@ -119,6 +118,9 @@ DEPEND="
28 dev-libs/libassuan
29 dev-libs/libgpg-error
30 )
31 + kdepim_features_knotes? (
32 + $(add_kdeapps_dep noteshared)
33 + )
34 "
35 RDEPEND="${DEPEND}
36 !kde-base/akonadiconsole:4
37 @@ -180,6 +182,15 @@ src_prepare() {
38 use handbook || sed -e '/^find_package.*KF5DocTools/ s/^/#/' \
39 -i CMakeLists.txt || die
40
41 + if ! use kdepim_features_knotes ; then
42 + sed -i \
43 + -e '/find_package(KF5NoteShared/ s/^/#DONT/' \
44 + CMakeLists.txt || die
45 + sed -i \
46 + -e '/add_subdirectory(notesagent)/ s/^/#DONT/' \
47 + agents/CMakeLists.txt || die
48 + fi
49 +
50 # applications
51 for pim_ft in ${PIM_FTS}; do
52 use kdepim_features_${pim_ft} || comment_add_subdirectory ${pim_ft}