1 |
commit: 0a153dd2b6875b48e8558081e9efe0c387c5c78a |
2 |
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> |
3 |
AuthorDate: Tue Apr 26 18:10:38 2016 +0000 |
4 |
Commit: Johannes Huber <johu <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Apr 27 07:45:06 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=0a153dd2 |
7 |
|
8 |
kde-misc/zanshin: Version bump to 0.4.0, fix deps |
9 |
|
10 |
Package-Manager: portage-2.2.28 |
11 |
|
12 |
Signed-off-by: Johannes Huber <johu <AT> gentoo.org> |
13 |
|
14 |
.../zanshin/{zanshin-9999.ebuild => zanshin-0.4.0.ebuild} | 11 ++++++++--- |
15 |
kde-misc/zanshin/zanshin-9999.ebuild | 9 +++++++-- |
16 |
2 files changed, 15 insertions(+), 5 deletions(-) |
17 |
|
18 |
diff --git a/kde-misc/zanshin/zanshin-9999.ebuild b/kde-misc/zanshin/zanshin-0.4.0.ebuild |
19 |
similarity index 83% |
20 |
copy from kde-misc/zanshin/zanshin-9999.ebuild |
21 |
copy to kde-misc/zanshin/zanshin-0.4.0.ebuild |
22 |
index 959946c..e9be325 100644 |
23 |
--- a/kde-misc/zanshin/zanshin-9999.ebuild |
24 |
+++ b/kde-misc/zanshin/zanshin-0.4.0.ebuild |
25 |
@@ -11,13 +11,14 @@ inherit kde5 |
26 |
|
27 |
DESCRIPTION="Getting things done application by KDE" |
28 |
HOMEPAGE="https://zanshin.kde.org/" |
29 |
+[[ ${KDE_BUILD_TYPE} != live ]] && SRC_URI="http://files.kde.org/zanshin/${P}.tar.bz2" |
30 |
|
31 |
LICENSE="|| ( GPL-2 GPL-3 )" |
32 |
-KEYWORDS="" |
33 |
+KEYWORDS="~amd64" |
34 |
IUSE="" |
35 |
|
36 |
# FIXME: bundles libkdepim |
37 |
-RDEPEND=" |
38 |
+COMMON_DEPEND=" |
39 |
$(add_frameworks_dep kcodecs) |
40 |
$(add_frameworks_dep kcompletion) |
41 |
$(add_frameworks_dep kconfig) |
42 |
@@ -42,6 +43,7 @@ RDEPEND=" |
43 |
$(add_kdeapps_dep kidentitymanagement) |
44 |
$(add_kdeapps_dep kldap) |
45 |
$(add_kdeapps_dep kmime) |
46 |
+ $(add_kdeapps_dep kontactinterface) |
47 |
$(add_qt_dep qtdbus) |
48 |
$(add_qt_dep qtdeclarative) |
49 |
$(add_qt_dep qtgui) |
50 |
@@ -49,6 +51,9 @@ RDEPEND=" |
51 |
$(add_qt_dep qtwidgets) |
52 |
dev-libs/boost |
53 |
" |
54 |
-DEPEND="${RDEPEND} |
55 |
+DEPEND="${COMMON_DEPEND} |
56 |
+ test? ( $(add_kdeapps_dep akonadi 'tools') ) |
57 |
+" |
58 |
+RDEPEND="${COMMON_DEPEND} |
59 |
!kde-misc/zanshin:4 |
60 |
" |
61 |
|
62 |
diff --git a/kde-misc/zanshin/zanshin-9999.ebuild b/kde-misc/zanshin/zanshin-9999.ebuild |
63 |
index 959946c..4fb9039 100644 |
64 |
--- a/kde-misc/zanshin/zanshin-9999.ebuild |
65 |
+++ b/kde-misc/zanshin/zanshin-9999.ebuild |
66 |
@@ -11,13 +11,14 @@ inherit kde5 |
67 |
|
68 |
DESCRIPTION="Getting things done application by KDE" |
69 |
HOMEPAGE="https://zanshin.kde.org/" |
70 |
+[[ ${KDE_BUILD_TYPE} != live ]] && SRC_URI="http://files.kde.org/zanshin/${P}.tar.bz2" |
71 |
|
72 |
LICENSE="|| ( GPL-2 GPL-3 )" |
73 |
KEYWORDS="" |
74 |
IUSE="" |
75 |
|
76 |
# FIXME: bundles libkdepim |
77 |
-RDEPEND=" |
78 |
+COMMON_DEPEND=" |
79 |
$(add_frameworks_dep kcodecs) |
80 |
$(add_frameworks_dep kcompletion) |
81 |
$(add_frameworks_dep kconfig) |
82 |
@@ -42,6 +43,7 @@ RDEPEND=" |
83 |
$(add_kdeapps_dep kidentitymanagement) |
84 |
$(add_kdeapps_dep kldap) |
85 |
$(add_kdeapps_dep kmime) |
86 |
+ $(add_kdeapps_dep kontactinterface) |
87 |
$(add_qt_dep qtdbus) |
88 |
$(add_qt_dep qtdeclarative) |
89 |
$(add_qt_dep qtgui) |
90 |
@@ -49,6 +51,9 @@ RDEPEND=" |
91 |
$(add_qt_dep qtwidgets) |
92 |
dev-libs/boost |
93 |
" |
94 |
-DEPEND="${RDEPEND} |
95 |
+DEPEND="${COMMON_DEPEND} |
96 |
+ test? ( $(add_kdeapps_dep akonadi 'tools') ) |
97 |
+" |
98 |
+RDEPEND="${COMMON_DEPEND} |
99 |
!kde-misc/zanshin:4 |
100 |
" |