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/kaccounts-integration/
Date: Thu, 08 Oct 2015 13:07:54
Message-Id: 1444309641.f96f93110de7590009ebb0a8ec3646bbcbc2cc36.kensington@gentoo
1 commit: f96f93110de7590009ebb0a8ec3646bbcbc2cc36
2 Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
3 AuthorDate: Wed Oct 7 18:55:32 2015 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Thu Oct 8 13:07:21 2015 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=f96f9311
7
8 kde-apps/kaccounts-integration: Add USE=google, fix DEPENDs
9
10 Package-Manager: portage-2.2.22
11
12 .../kaccounts-integration-9999.ebuild | 20 +++++++++++++++-----
13 kde-apps/kaccounts-integration/metadata.xml | 1 +
14 2 files changed, 16 insertions(+), 5 deletions(-)
15
16 diff --git a/kde-apps/kaccounts-integration/kaccounts-integration-9999.ebuild b/kde-apps/kaccounts-integration/kaccounts-integration-9999.ebuild
17 index 7c1a712..a8f1ad3 100644
18 --- a/kde-apps/kaccounts-integration/kaccounts-integration-9999.ebuild
19 +++ b/kde-apps/kaccounts-integration/kaccounts-integration-9999.ebuild
20 @@ -14,36 +14,46 @@ HOMEPAGE="https://community.kde.org/KTp"
21 LICENSE="LGPL-2.1"
22
23 KEYWORDS=""
24 -IUSE="kdepim"
25 +IUSE="google"
26
27 -RDEPEND="
28 +COMMON_DEPEND="
29 $(add_frameworks_dep kconfig)
30 $(add_frameworks_dep kconfigwidgets)
31 $(add_frameworks_dep kcoreaddons)
32 $(add_frameworks_dep kdbusaddons)
33 + $(add_frameworks_dep kdeclarative)
34 $(add_frameworks_dep ki18n)
35 $(add_frameworks_dep kiconthemes)
36 $(add_frameworks_dep kio)
37 + $(add_frameworks_dep kpackage)
38 $(add_frameworks_dep kwallet)
39 $(add_frameworks_dep kwidgetsaddons)
40 + $(add_kdeapps_dep kcontacts)
41 dev-qt/qtdbus:5
42 dev-qt/qtdeclarative:5
43 dev-qt/qtgui:5
44 dev-qt/qtwidgets:5
45 + dev-qt/qtxml:5
46 net-libs/accounts-qt
47 net-libs/signond
48 - kdepim? ( $(add_kdeapps_dep kdepimlibs) )
49 + google? (
50 + dev-qt/qtwebkit:5
51 + net-libs/libkgapi:5
52 + )
53 "
54 -DEPEND="${RDEPEND}
55 +DEPEND="${COMMON_DEPEND}
56 $(add_frameworks_dep kcmutils)
57 + sys-devel/gettext
58 "
59 +RDEPEND="${COMMON_DEPEND}"
60
61 # bug #549444
62 RESTRICT="test"
63
64 src_configure() {
65 local mycmakeargs=(
66 - $(cmake-utils_use_find_package kdepim KF5Akonadi)
67 + $(cmake-utils_use_find_package google KF5GAPI)
68 + $(cmake-utils_use_find_package google Qt5WebKitWidgets)
69 )
70
71 kde5_src_configure
72
73 diff --git a/kde-apps/kaccounts-integration/metadata.xml b/kde-apps/kaccounts-integration/metadata.xml
74 index 7165813..d95d129 100644
75 --- a/kde-apps/kaccounts-integration/metadata.xml
76 +++ b/kde-apps/kaccounts-integration/metadata.xml
77 @@ -3,6 +3,7 @@
78 <pkgmetadata>
79 <herd>kde</herd>
80 <use>
81 + <flag name="google">Enable support for Google Contacts Sync via <pkg>kde-apps/libkgapi</pkg></flag>
82 <flag name="kdepim">KDE PIM integration via <pkg>kde-apps/kdepimlibs</pkg></flag>
83 </use>
84 </pkgmetadata>