1 |
commit: 32ff6edcb19e009d0c94e54fbfd6714dae23ca2e |
2 |
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> |
3 |
AuthorDate: Mon May 30 19:12:39 2016 +0000 |
4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jun 5 18:55:24 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=32ff6edc |
7 |
|
8 |
kde-apps/mailcommon: Fix DEPENDs, force test optional |
9 |
|
10 |
Package-Manager: portage-2.2.28 |
11 |
|
12 |
kde-apps/mailcommon/mailcommon-16.04.1.ebuild | 16 ++++++++++++---- |
13 |
kde-apps/mailcommon/mailcommon-16.04.49.9999.ebuild | 16 ++++++++++++---- |
14 |
kde-apps/mailcommon/mailcommon-9999.ebuild | 18 +++++++++++++----- |
15 |
3 files changed, 37 insertions(+), 13 deletions(-) |
16 |
|
17 |
diff --git a/kde-apps/mailcommon/mailcommon-16.04.1.ebuild b/kde-apps/mailcommon/mailcommon-16.04.1.ebuild |
18 |
index b115d77..c711eb2 100644 |
19 |
--- a/kde-apps/mailcommon/mailcommon-16.04.1.ebuild |
20 |
+++ b/kde-apps/mailcommon/mailcommon-16.04.1.ebuild |
21 |
@@ -4,7 +4,7 @@ |
22 |
|
23 |
EAPI=6 |
24 |
|
25 |
-KDE_TEST="false" |
26 |
+KDE_TEST="forceoptional" |
27 |
inherit kde5 |
28 |
|
29 |
DESCRIPTION="Common mail library" |
30 |
@@ -15,30 +15,38 @@ IUSE="designer" |
31 |
COMMON_DEPEND=" |
32 |
$(add_frameworks_dep karchive) |
33 |
$(add_frameworks_dep kcodecs) |
34 |
+ $(add_frameworks_dep kcompletion) |
35 |
$(add_frameworks_dep kconfig) |
36 |
+ $(add_frameworks_dep kconfigwidgets) |
37 |
$(add_frameworks_dep ki18n) |
38 |
$(add_frameworks_dep kiconthemes) |
39 |
- $(add_frameworks_dep kitemviews) |
40 |
$(add_frameworks_dep kio) |
41 |
+ $(add_frameworks_dep kitemmodels) |
42 |
+ $(add_frameworks_dep kitemviews) |
43 |
+ $(add_frameworks_dep ktextwidgets) |
44 |
$(add_frameworks_dep kwidgetsaddons) |
45 |
$(add_frameworks_dep kwindowsystem) |
46 |
$(add_frameworks_dep kxmlgui) |
47 |
$(add_kdeapps_dep akonadi) |
48 |
+ $(add_kdeapps_dep akonadi-contact) |
49 |
$(add_kdeapps_dep akonadi-mime) |
50 |
+ $(add_kdeapps_dep kcontacts) |
51 |
$(add_kdeapps_dep kldap) |
52 |
$(add_kdeapps_dep kmailtransport) |
53 |
$(add_kdeapps_dep kmime) |
54 |
+ $(add_kdeapps_dep kpimtextedit) |
55 |
$(add_kdeapps_dep libkdepim) |
56 |
$(add_kdeapps_dep mailimporter) |
57 |
$(add_kdeapps_dep messagelib) |
58 |
$(add_kdeapps_dep pimcommon) |
59 |
- dev-libs/libxslt |
60 |
+ $(add_qt_dep qtdbus) |
61 |
$(add_qt_dep qtgui) |
62 |
$(add_qt_dep qtwidgets) |
63 |
+ $(add_qt_dep qtxml) |
64 |
media-libs/phonon[qt5] |
65 |
" |
66 |
DEPEND="${COMMON_DEPEND} |
67 |
- sys-devel/gettext |
68 |
+ dev-libs/libxslt |
69 |
designer? ( $(add_qt_dep designer) ) |
70 |
" |
71 |
RDEPEND="${COMMON_DEPEND} |
72 |
|
73 |
diff --git a/kde-apps/mailcommon/mailcommon-16.04.49.9999.ebuild b/kde-apps/mailcommon/mailcommon-16.04.49.9999.ebuild |
74 |
index 999704f..896c781 100644 |
75 |
--- a/kde-apps/mailcommon/mailcommon-16.04.49.9999.ebuild |
76 |
+++ b/kde-apps/mailcommon/mailcommon-16.04.49.9999.ebuild |
77 |
@@ -4,7 +4,7 @@ |
78 |
|
79 |
EAPI=6 |
80 |
|
81 |
-KDE_TEST="false" |
82 |
+KDE_TEST="forceoptional" |
83 |
inherit kde5 |
84 |
|
85 |
DESCRIPTION="Common mail library" |
86 |
@@ -15,30 +15,38 @@ IUSE="designer" |
87 |
COMMON_DEPEND=" |
88 |
$(add_frameworks_dep karchive) |
89 |
$(add_frameworks_dep kcodecs) |
90 |
+ $(add_frameworks_dep kcompletion) |
91 |
$(add_frameworks_dep kconfig) |
92 |
+ $(add_frameworks_dep kconfigwidgets) |
93 |
$(add_frameworks_dep ki18n) |
94 |
$(add_frameworks_dep kiconthemes) |
95 |
- $(add_frameworks_dep kitemviews) |
96 |
$(add_frameworks_dep kio) |
97 |
+ $(add_frameworks_dep kitemmodels) |
98 |
+ $(add_frameworks_dep kitemviews) |
99 |
+ $(add_frameworks_dep ktextwidgets) |
100 |
$(add_frameworks_dep kwidgetsaddons) |
101 |
$(add_frameworks_dep kwindowsystem) |
102 |
$(add_frameworks_dep kxmlgui) |
103 |
$(add_kdeapps_dep akonadi) |
104 |
+ $(add_kdeapps_dep akonadi-contact) |
105 |
$(add_kdeapps_dep akonadi-mime) |
106 |
+ $(add_kdeapps_dep kcontacts) |
107 |
$(add_kdeapps_dep kldap) |
108 |
$(add_kdeapps_dep kmailtransport) |
109 |
$(add_kdeapps_dep kmime) |
110 |
+ $(add_kdeapps_dep kpimtextedit) |
111 |
$(add_kdeapps_dep libkdepim) |
112 |
$(add_kdeapps_dep mailimporter) |
113 |
$(add_kdeapps_dep messagelib) |
114 |
$(add_kdeapps_dep pimcommon) |
115 |
- dev-libs/libxslt |
116 |
+ $(add_qt_dep qtdbus) |
117 |
$(add_qt_dep qtgui) |
118 |
$(add_qt_dep qtwidgets) |
119 |
+ $(add_qt_dep qtxml) |
120 |
media-libs/phonon[qt5] |
121 |
" |
122 |
DEPEND="${COMMON_DEPEND} |
123 |
- sys-devel/gettext |
124 |
+ dev-libs/libxslt |
125 |
designer? ( $(add_qt_dep designer) ) |
126 |
" |
127 |
RDEPEND="${COMMON_DEPEND} |
128 |
|
129 |
diff --git a/kde-apps/mailcommon/mailcommon-9999.ebuild b/kde-apps/mailcommon/mailcommon-9999.ebuild |
130 |
index 8414230..f00885e 100644 |
131 |
--- a/kde-apps/mailcommon/mailcommon-9999.ebuild |
132 |
+++ b/kde-apps/mailcommon/mailcommon-9999.ebuild |
133 |
@@ -4,7 +4,7 @@ |
134 |
|
135 |
EAPI=6 |
136 |
|
137 |
-KDE_TEST="false" |
138 |
+KDE_TEST="forceoptional" |
139 |
QT_MINIMAL="5.6.0" |
140 |
inherit kde5 |
141 |
|
142 |
@@ -16,34 +16,42 @@ IUSE="designer" |
143 |
COMMON_DEPEND=" |
144 |
$(add_frameworks_dep karchive) |
145 |
$(add_frameworks_dep kcodecs) |
146 |
+ $(add_frameworks_dep kcompletion) |
147 |
$(add_frameworks_dep kconfig) |
148 |
+ $(add_frameworks_dep kconfigwidgets) |
149 |
$(add_frameworks_dep ki18n) |
150 |
$(add_frameworks_dep kiconthemes) |
151 |
- $(add_frameworks_dep kitemviews) |
152 |
$(add_frameworks_dep kio) |
153 |
+ $(add_frameworks_dep kitemmodels) |
154 |
+ $(add_frameworks_dep kitemviews) |
155 |
+ $(add_frameworks_dep ktextwidgets) |
156 |
$(add_frameworks_dep kwidgetsaddons) |
157 |
$(add_frameworks_dep kwindowsystem) |
158 |
$(add_frameworks_dep kxmlgui) |
159 |
$(add_kdeapps_dep akonadi) |
160 |
+ $(add_kdeapps_dep akonadi-contact) |
161 |
$(add_kdeapps_dep akonadi-mime) |
162 |
+ $(add_kdeapps_dep kcontacts) |
163 |
$(add_kdeapps_dep kldap) |
164 |
$(add_kdeapps_dep kmailtransport) |
165 |
$(add_kdeapps_dep kmime) |
166 |
+ $(add_kdeapps_dep kpimtextedit) |
167 |
$(add_kdeapps_dep libkdepim) |
168 |
$(add_kdeapps_dep mailimporter) |
169 |
$(add_kdeapps_dep messagelib) |
170 |
$(add_kdeapps_dep pimcommon) |
171 |
- dev-libs/libxslt |
172 |
+ $(add_qt_dep qtdbus) |
173 |
$(add_qt_dep qtgui) |
174 |
$(add_qt_dep qtwidgets) |
175 |
+ $(add_qt_dep qtxml) |
176 |
media-libs/phonon[qt5] |
177 |
" |
178 |
DEPEND="${COMMON_DEPEND} |
179 |
- sys-devel/gettext |
180 |
+ dev-libs/libxslt |
181 |
designer? ( $(add_qt_dep designer) ) |
182 |
" |
183 |
RDEPEND="${COMMON_DEPEND} |
184 |
- !<kde-apps/kdepim-15.08.50:5 |
185 |
+ !kde-apps/kdepim:5 |
186 |
!kde-apps/kdepim-common-libs:4 |
187 |
" |