Gentoo Archives: gentoo-commits

From: Johannes Huber <johu@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: kde-apps/ktimetracker/, kde-apps/akregator/, kde-apps/gpgmepp/, kde-apps/ktnef/, ...
Date: Fri, 08 Jul 2016 21:02:31
Message-Id: 1468011738.8f60f1900f3a6d60de843e53196d355816d5649a.johu@gentoo
1 commit: 8f60f1900f3a6d60de843e53196d355816d5649a
2 Author: Johannes Huber <johu <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jul 8 20:57:48 2016 +0000
4 Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
5 CommitDate: Fri Jul 8 21:02:18 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f60f190
7
8 kde-apps: Remove KDE PIM 4.14.10
9
10 Package-Manager: portage-2.3.0
11
12 kde-apps/akonadiconsole/Manifest | 1 -
13 .../akonadiconsole/akonadiconsole-4.14.10.ebuild | 26 -
14 kde-apps/akregator/Manifest | 1 -
15 kde-apps/akregator/akregator-4.14.10.ebuild | 23 -
16 kde-apps/blogilo/Manifest | 1 -
17 kde-apps/blogilo/blogilo-4.14.10.ebuild | 27 -
18 kde-apps/calendarjanitor/Manifest | 1 -
19 .../calendarjanitor/calendarjanitor-4.14.10.ebuild | 28 -
20 kde-apps/gpgmepp/Manifest | 1 -
21 .../files/kdepimlibs-4.9.1-boostincludes.patch | 15 -
22 kde-apps/gpgmepp/gpgmepp-4.14.10.ebuild | 57 -
23 kde-apps/kabcclient/Manifest | 1 -
24 kde-apps/kabcclient/kabcclient-4.14.10.ebuild | 27 -
25 kde-apps/kaddressbook/Manifest | 1 -
26 kde-apps/kaddressbook/kaddressbook-4.14.10.ebuild | 52 -
27 kde-apps/kalarm/Manifest | 1 -
28 kde-apps/kalarm/kalarm-4.14.10.ebuild | 27 -
29 kde-apps/kdepim-common-libs/Manifest | 1 -
30 .../kdepim-common-libs-4.14.10.ebuild | 93 -
31 kde-apps/kdepim-kresources/Manifest | 1 -
32 .../kdepim-kresources-4.14.10.ebuild | 28 -
33 kde-apps/kdepim-meta/kdepim-meta-4.14.10-r1.ebuild | 41 -
34 kde-apps/kdepim-runtime/Manifest | 1 -
35 .../kdepim-runtime/kdepim-runtime-4.14.10.ebuild | 47 -
36 kde-apps/kdepim-runtime/metadata.xml | 1 -
37 kde-apps/kjots/Manifest | 1 -
38 kde-apps/kjots/kjots-4.14.10.ebuild | 27 -
39 kde-apps/kleopatra/Manifest | 1 -
40 .../kleopatra-4.14.10-newer-boost-buildfix.patch | 1803 --------------------
41 .../files/kleopatra-4.4.2015.06-reenable.patch | 13 -
42 kde-apps/kleopatra/kleopatra-4.14.10.ebuild | 46 -
43 kde-apps/kmail/Manifest | 1 -
44 .../kmail/files/kdepim-4.14.10-fix-cmake-3.4.patch | 23 -
45 kde-apps/kmail/kmail-4.14.10.ebuild | 109 --
46 kde-apps/knode/Manifest | 1 -
47 kde-apps/knode/knode-4.14.10.ebuild | 49 -
48 kde-apps/knotes/Manifest | 1 -
49 kde-apps/knotes/knotes-4.14.10.ebuild | 32 -
50 kde-apps/konsolekalendar/Manifest | 1 -
51 .../files/kdepim-4.14.10-fix-cmake-3.4.patch | 23 -
52 .../konsolekalendar/konsolekalendar-4.14.10.ebuild | 50 -
53 kde-apps/kontact/Manifest | 1 -
54 kde-apps/kontact/kontact-4.14.10.ebuild | 52 -
55 kde-apps/korganizer/Manifest | 1 -
56 .../files/kdepim-4.14.10-fix-cmake-3.4.patch | 23 -
57 kde-apps/korganizer/korganizer-4.14.10.ebuild | 93 -
58 kde-apps/ktimetracker/Manifest | 1 -
59 kde-apps/ktimetracker/ktimetracker-4.14.10.ebuild | 39 -
60 kde-apps/ktnef/Manifest | 1 -
61 kde-apps/ktnef/ktnef-4.14.10.ebuild | 25 -
62 50 files changed, 2920 deletions(-)
63
64 diff --git a/kde-apps/akonadiconsole/Manifest b/kde-apps/akonadiconsole/Manifest
65 index 55fbc17..d63f48e 100644
66 --- a/kde-apps/akonadiconsole/Manifest
67 +++ b/kde-apps/akonadiconsole/Manifest
68 @@ -1,2 +1 @@
69 -DIST kdepim-4.14.10.tar.xz 14585020 SHA256 edad865b81259331780a25906127e105d06fda8aa56f6f11cfee4bc8f85bb7e2 SHA512 aa7e5a488964d11d355557e89053993bb0bed4860072dbb8ae1851df881713a15ec5aa4e428de9b85a8bef678ace307b33f186314fe5a8011521e30331a1691b WHIRLPOOL 358589e29baeb2f7bf648d1bbccb9bbf37c4c1a447f05a2eff472b50282d7d5118ad40ced2f93ac7f47f2c394f745216632d33be389e82f88efd69386f6ab57d
70 DIST kdepim-4.14.11_pre20160211.tar.gz 18551484 SHA256 b970c0c04652519cc7e88d818b3a29e7b356a73f449f7f6e5767d60e5b2a17e3 SHA512 e7fcf14353e457e9b3ec2d7eefa18ac0d9bc454ecaa682dcaf1585a6a36968bc8d7ea6ab61398a8d697d9343f0cd87472a906d444f814cd44956b6499826bb1d WHIRLPOOL f66fd74138ce871f88ce211c3b6af287cddaeda493e42c3b683938c274482d1f09a3ae659d380d4e19f5e5da70f5724ddd48723acf5846f6a1e9c01a79803e7e
71
72 diff --git a/kde-apps/akonadiconsole/akonadiconsole-4.14.10.ebuild b/kde-apps/akonadiconsole/akonadiconsole-4.14.10.ebuild
73 deleted file mode 100644
74 index 1eeba1e..0000000
75 --- a/kde-apps/akonadiconsole/akonadiconsole-4.14.10.ebuild
76 +++ /dev/null
77 @@ -1,26 +0,0 @@
78 -# Copyright 1999-2015 Gentoo Foundation
79 -# Distributed under the terms of the GNU General Public License v2
80 -# $Id$
81 -
82 -EAPI=5
83 -
84 -KMNAME="kdepim"
85 -EGIT_BRANCH="KDE/4.14"
86 -inherit kde4-meta
87 -
88 -DESCRIPTION="Akonadi developer console"
89 -KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
90 -IUSE="debug"
91 -
92 -DEPEND="
93 - >=app-office/akonadi-server-1.12.90
94 - $(add_kdeapps_dep kdepimlibs 'akonadi(+)')
95 - $(add_kdeapps_dep kdepim-common-libs)
96 -"
97 -RDEPEND="${DEPEND}"
98 -
99 -KMEXTRACTONLY="
100 - akonadi_next/
101 - calendarsupport/
102 - messageviewer/
103 -"
104
105 diff --git a/kde-apps/akregator/Manifest b/kde-apps/akregator/Manifest
106 index d5c4ebb..0a4c5c7 100644
107 --- a/kde-apps/akregator/Manifest
108 +++ b/kde-apps/akregator/Manifest
109 @@ -1,3 +1,2 @@
110 -DIST kdepim-4.14.10.tar.xz 14585020 SHA256 edad865b81259331780a25906127e105d06fda8aa56f6f11cfee4bc8f85bb7e2 SHA512 aa7e5a488964d11d355557e89053993bb0bed4860072dbb8ae1851df881713a15ec5aa4e428de9b85a8bef678ace307b33f186314fe5a8011521e30331a1691b WHIRLPOOL 358589e29baeb2f7bf648d1bbccb9bbf37c4c1a447f05a2eff472b50282d7d5118ad40ced2f93ac7f47f2c394f745216632d33be389e82f88efd69386f6ab57d
111 DIST kdepim-4.14.11_pre20160211.tar.gz 18551484 SHA256 b970c0c04652519cc7e88d818b3a29e7b356a73f449f7f6e5767d60e5b2a17e3 SHA512 e7fcf14353e457e9b3ec2d7eefa18ac0d9bc454ecaa682dcaf1585a6a36968bc8d7ea6ab61398a8d697d9343f0cd87472a906d444f814cd44956b6499826bb1d WHIRLPOOL f66fd74138ce871f88ce211c3b6af287cddaeda493e42c3b683938c274482d1f09a3ae659d380d4e19f5e5da70f5724ddd48723acf5846f6a1e9c01a79803e7e
112 DIST kdepim-4.4.2016.01.tar.xz 8964248 SHA256 19f4d6ab4bcddf5a0e6acae50c20d0b8fbb482503e47e75c86955637d249cefa SHA512 a04737cc89f96e3635a19c492c9f3f31e7554aa8a237fb0ad8f5fe8c02e7e30911dd5d93bf0f27fd38603e496e02f3ef1d3064e159c99c71dea379199d1e0e03 WHIRLPOOL 9f02f5799b3a10a9b18b4c8cb34084051991cb7240d2b818cd2b58bde05abde2ef3126b3960f2554c7e5c4930266e561c1715c21fe72136654e28184b5083089
113
114 diff --git a/kde-apps/akregator/akregator-4.14.10.ebuild b/kde-apps/akregator/akregator-4.14.10.ebuild
115 deleted file mode 100644
116 index b7fe356..0000000
117 --- a/kde-apps/akregator/akregator-4.14.10.ebuild
118 +++ /dev/null
119 @@ -1,23 +0,0 @@
120 -# Copyright 1999-2015 Gentoo Foundation
121 -# Distributed under the terms of the GNU General Public License v2
122 -# $Id$
123 -
124 -EAPI=5
125 -
126 -KDE_HANDBOOK="optional"
127 -KMNAME="kdepim"
128 -EGIT_BRANCH="KDE/4.14"
129 -inherit kde4-meta
130 -
131 -DESCRIPTION="KDE news feed aggregator"
132 -HOMEPAGE="https://www.kde.org/applications/internet/akregator"
133 -KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
134 -IUSE="debug"
135 -
136 -DEPEND="
137 - $(add_kdeapps_dep kdepimlibs 'akonadi(+)')
138 - $(add_kdeapps_dep kdepim-common-libs)
139 -"
140 -RDEPEND="${DEPEND}"
141 -
142 -KMLOADLIBS="kdepim-common-libs"
143
144 diff --git a/kde-apps/blogilo/Manifest b/kde-apps/blogilo/Manifest
145 index d5c4ebb..0a4c5c7 100644
146 --- a/kde-apps/blogilo/Manifest
147 +++ b/kde-apps/blogilo/Manifest
148 @@ -1,3 +1,2 @@
149 -DIST kdepim-4.14.10.tar.xz 14585020 SHA256 edad865b81259331780a25906127e105d06fda8aa56f6f11cfee4bc8f85bb7e2 SHA512 aa7e5a488964d11d355557e89053993bb0bed4860072dbb8ae1851df881713a15ec5aa4e428de9b85a8bef678ace307b33f186314fe5a8011521e30331a1691b WHIRLPOOL 358589e29baeb2f7bf648d1bbccb9bbf37c4c1a447f05a2eff472b50282d7d5118ad40ced2f93ac7f47f2c394f745216632d33be389e82f88efd69386f6ab57d
150 DIST kdepim-4.14.11_pre20160211.tar.gz 18551484 SHA256 b970c0c04652519cc7e88d818b3a29e7b356a73f449f7f6e5767d60e5b2a17e3 SHA512 e7fcf14353e457e9b3ec2d7eefa18ac0d9bc454ecaa682dcaf1585a6a36968bc8d7ea6ab61398a8d697d9343f0cd87472a906d444f814cd44956b6499826bb1d WHIRLPOOL f66fd74138ce871f88ce211c3b6af287cddaeda493e42c3b683938c274482d1f09a3ae659d380d4e19f5e5da70f5724ddd48723acf5846f6a1e9c01a79803e7e
151 DIST kdepim-4.4.2016.01.tar.xz 8964248 SHA256 19f4d6ab4bcddf5a0e6acae50c20d0b8fbb482503e47e75c86955637d249cefa SHA512 a04737cc89f96e3635a19c492c9f3f31e7554aa8a237fb0ad8f5fe8c02e7e30911dd5d93bf0f27fd38603e496e02f3ef1d3064e159c99c71dea379199d1e0e03 WHIRLPOOL 9f02f5799b3a10a9b18b4c8cb34084051991cb7240d2b818cd2b58bde05abde2ef3126b3960f2554c7e5c4930266e561c1715c21fe72136654e28184b5083089
152
153 diff --git a/kde-apps/blogilo/blogilo-4.14.10.ebuild b/kde-apps/blogilo/blogilo-4.14.10.ebuild
154 deleted file mode 100644
155 index 844f258..0000000
156 --- a/kde-apps/blogilo/blogilo-4.14.10.ebuild
157 +++ /dev/null
158 @@ -1,27 +0,0 @@
159 -# Copyright 1999-2015 Gentoo Foundation
160 -# Distributed under the terms of the GNU General Public License v2
161 -# $Id$
162 -
163 -EAPI=5
164 -
165 -KDE_HANDBOOK="optional"
166 -KMNAME="kdepim"
167 -EGIT_BRANCH="KDE/4.14"
168 -inherit kde4-meta
169 -
170 -DESCRIPTION="KDE Blogging Client"
171 -HOMEPAGE="https://www.kde.org/applications/internet/blogilo"
172 -KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
173 -IUSE="debug"
174 -
175 -DEPEND="
176 - $(add_kdeapps_dep kdepim-common-libs)
177 - $(add_kdeapps_dep kdepimlibs 'akonadi(+)')
178 - >=net-libs/libkgapi-2.2.0:4
179 -"
180 -RDEPEND="${DEPEND}"
181 -
182 -KMEXTRACTONLY="
183 - composereditor-ng/
184 - pimcommon/
185 -"
186
187 diff --git a/kde-apps/calendarjanitor/Manifest b/kde-apps/calendarjanitor/Manifest
188 index 55fbc17..d63f48e 100644
189 --- a/kde-apps/calendarjanitor/Manifest
190 +++ b/kde-apps/calendarjanitor/Manifest
191 @@ -1,2 +1 @@
192 -DIST kdepim-4.14.10.tar.xz 14585020 SHA256 edad865b81259331780a25906127e105d06fda8aa56f6f11cfee4bc8f85bb7e2 SHA512 aa7e5a488964d11d355557e89053993bb0bed4860072dbb8ae1851df881713a15ec5aa4e428de9b85a8bef678ace307b33f186314fe5a8011521e30331a1691b WHIRLPOOL 358589e29baeb2f7bf648d1bbccb9bbf37c4c1a447f05a2eff472b50282d7d5118ad40ced2f93ac7f47f2c394f745216632d33be389e82f88efd69386f6ab57d
193 DIST kdepim-4.14.11_pre20160211.tar.gz 18551484 SHA256 b970c0c04652519cc7e88d818b3a29e7b356a73f449f7f6e5767d60e5b2a17e3 SHA512 e7fcf14353e457e9b3ec2d7eefa18ac0d9bc454ecaa682dcaf1585a6a36968bc8d7ea6ab61398a8d697d9343f0cd87472a906d444f814cd44956b6499826bb1d WHIRLPOOL f66fd74138ce871f88ce211c3b6af287cddaeda493e42c3b683938c274482d1f09a3ae659d380d4e19f5e5da70f5724ddd48723acf5846f6a1e9c01a79803e7e
194
195 diff --git a/kde-apps/calendarjanitor/calendarjanitor-4.14.10.ebuild b/kde-apps/calendarjanitor/calendarjanitor-4.14.10.ebuild
196 deleted file mode 100644
197 index 732ed95..0000000
198 --- a/kde-apps/calendarjanitor/calendarjanitor-4.14.10.ebuild
199 +++ /dev/null
200 @@ -1,28 +0,0 @@
201 -# Copyright 1999-2015 Gentoo Foundation
202 -# Distributed under the terms of the GNU General Public License v2
203 -# $Id$
204 -
205 -EAPI=5
206 -
207 -KDE_HANDBOOK="optional"
208 -KMNAME="kdepim"
209 -EGIT_BRANCH="KDE/4.14"
210 -KMMODULE="console/${PN}"
211 -inherit kde4-meta
212 -
213 -DESCRIPTION="A tool to scan calendar data for buggy instances"
214 -HOMEPAGE="https://www.kde.org/"
215 -KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
216 -IUSE="debug"
217 -
218 -DEPEND="
219 - $(add_kdeapps_dep kdepim-common-libs)
220 - $(add_kdeapps_dep kdepimlibs 'akonadi(+)')
221 -"
222 -RDEPEND="${DEPEND}"
223 -
224 -KMEXTRACTONLY="
225 - calendarsupport/
226 -"
227 -
228 -KMLOADLIBS="kdepim-common-libs"
229
230 diff --git a/kde-apps/gpgmepp/Manifest b/kde-apps/gpgmepp/Manifest
231 index b70caec..6e7e36e 100644
232 --- a/kde-apps/gpgmepp/Manifest
233 +++ b/kde-apps/gpgmepp/Manifest
234 @@ -1,3 +1,2 @@
235 DIST gpgmepp-15.12.3.tar.xz 67716 SHA256 5753e82cd1832ee848b3f41eb9427c844f3862cfc6c2b08bddded9d44a1c39ef SHA512 356baea004eb51040c3f02790c55c7843ecd9890a3937b217851b1b98924b3dcba6296d1bee7488d573e930998dcbdd0e1fc322e6f665ca5c5031add6d652b58 WHIRLPOOL f0abbf8968fde7f33fffef06ac0bf9ba9d068d5004ac164e5a6a3d1442c9a788de89a7e5b5fd9eedbb52f2bb903d7132547ab34776822b86d6af6286560973b3
236 -DIST kdepimlibs-4.14.10.tar.xz 2831160 SHA256 c8cc9694add6ecf121bda050235ffa68d8307a82c85fbdffe69a8eab5be584c2 SHA512 64f396957ae1f70a19ba689fabc0850aed04e4e4bce58a4bbc27af2b5cfa27b50472614b4096d8424ee6b4463faaed37d98e6cccfe36d208e9193ba20dc6766a WHIRLPOOL b9123e702f5d4f696cd09d3e7932dbc796f4d8e09feace56a49a96ddb64478bf8cd237bcac9c438d77491822cd655f3f44b76e657f6dbb09b8deb96ab90da52a
237 DIST kdepimlibs-4.14.11_pre20160211.tar.gz 4300730 SHA256 3c2559987871761ac13185b0ffa9f7575fe0a5c2e00950b433b25edea7ec47fd SHA512 d0977a5387b0937d850fb3adc8c0bc8086ddb0894d238272f0586e53cc8a157a50b7e6d4aeb97a7fb944521de4f8978a23f172a6bf1b8e6afbbba5a183832b1c WHIRLPOOL 28bdf9c93de2c500fe2c1264c8dff42cc816d414d6b15820bc6c6aaaafc0fe67008ce13b678e0c41ac6780863e94eccb43ab18beb4c052230cad312f4530f58d
238
239 diff --git a/kde-apps/gpgmepp/files/kdepimlibs-4.9.1-boostincludes.patch b/kde-apps/gpgmepp/files/kdepimlibs-4.9.1-boostincludes.patch
240 deleted file mode 100644
241 index 2df44a7..0000000
242 --- a/kde-apps/gpgmepp/files/kdepimlibs-4.9.1-boostincludes.patch
243 +++ /dev/null
244 @@ -1,15 +0,0 @@
245 -Make sure that the Boost headers are actually found, since they are
246 -referenced in the kdepimlibs headers.
247 -Patch by Alex Turbov, see https://bugs.kde.org/show_bug.cgi?id=306323
248 -
249 ---- KdepimLibsConfig.cmake.in.org 2012-08-13 12:46:24.000000000 +0400
250 -+++ KdepimLibsConfig.cmake.in 2012-09-06 08:53:53.000000000 +0400
251 -@@ -15,7 +15,7 @@
252 - set(KDEPIMLIBS_DBUS_INTERFACES_DIR "@KDEPIMLIBS_DBUS_INTERFACES_DIR@")
253 - set(KDEPIMLIBS_DBUS_SERVICES_DIR "@KDEPIMLIBS_DBUS_SERVICES_DIR@")
254 - set(KDEPIMLIBS_INCLUDE_DIR "@KDEPIMLIBS_INCLUDE_DIR@")
255 --set(KDEPIMLIBS_INCLUDE_DIRS "@KDEPIMLIBS_INCLUDE_DIR@" "@KDEPIMLIBS_INCLUDE_DIR@/KDE")
256 -+set(KDEPIMLIBS_INCLUDE_DIRS "@KDEPIMLIBS_INCLUDE_DIR@" "@KDEPIMLIBS_INCLUDE_DIR@/KDE" "@Boost_INCLUDE_DIR@")
257 - set(KDEPIMLIBS_LIB_DIR "@KDEPIMLIBS_LIB_DIR@")
258 - set(KDEPIMLIBS_BIN_DIR "@KDEPIMLIBS_BIN_DIR@")
259 - set(KDEPIMLIBS_LIBEXEC_DIR "@KDEPIMLIBS_LIBEXEC_DIR@")
260
261 diff --git a/kde-apps/gpgmepp/gpgmepp-4.14.10.ebuild b/kde-apps/gpgmepp/gpgmepp-4.14.10.ebuild
262 deleted file mode 100644
263 index a74982d..0000000
264 --- a/kde-apps/gpgmepp/gpgmepp-4.14.10.ebuild
265 +++ /dev/null
266 @@ -1,57 +0,0 @@
267 -# Copyright 1999-2015 Gentoo Foundation
268 -# Distributed under the terms of the GNU General Public License v2
269 -# $Id$
270 -
271 -EAPI=5
272 -
273 -KMNAME="kdepimlibs"
274 -EGIT_BRANCH="KDE/4.14"
275 -inherit kde4-base
276 -
277 -DESCRIPTION="C++ bindings for gpgme"
278 -KEYWORDS="amd64 x86"
279 -LICENSE="LGPL-2.1"
280 -IUSE="debug"
281 -
282 -DEPEND="
283 - >=app-crypt/gpgme-1.1.6
284 - >=dev-libs/boost-1.35.0-r5:=
285 - dev-libs/libgpg-error
286 -"
287 -# boost is not linked to, but headers which include it are installed
288 -# bug #418071
289 -RDEPEND="${DEPEND}
290 - !kde-apps/kdepimlibs:4
291 -"
292 -
293 -PATCHES=( "${FILESDIR}/kdepimlibs-4.9.1-boostincludes.patch" )
294 -
295 -S="${WORKDIR}/${KMNAME}-${PV}"
296 -
297 -src_prepare() {
298 - comment_add_subdirectory kmime
299 - kde4-base_src_prepare
300 -}
301 -
302 -src_configure() {
303 - local mycmakeargs=(
304 - -DBUILD_doc=OFF
305 - -DCMAKE_DISABLE_FIND_PACKAGE_Prison=ON
306 - -DCMAKE_DISABLE_FIND_PACKAGE_Ldap=ON
307 - -DKDEPIM_ONLY_KLEO=ON
308 - -DKDEPIM_NO_KCAL=ON
309 - -DKDEPIM_NO_KRESOURCES=ON
310 - )
311 -
312 - kde4-base_src_configure
313 -}
314 -
315 -src_install() {
316 - kde4-base_src_install
317 - rm -f "${ED}"usr/share/apps/cmake/modules/CheckTimezone.cmake \
318 - "${ED}"usr/share/apps/cmake/modules/Find{Ldap,Libical,QtOAuth}.cmake \
319 - "${ED}"usr/share/doc/"${PF}"/{akonadi,kabc,kalarmcal,kresources,kxmlrpcclient}.README* \
320 - "${ED}"usr/share/doc/"${PF}"/{kabc,kmime,kresources,mailtransport}.TODO* \
321 - "${ED}"usr/share/doc/"${PF}"/kabc.HACKING* \
322 - "${ED}"usr/share/doc/"${PF}"/ktnef.AUTHORS || die
323 -}
324
325 diff --git a/kde-apps/kabcclient/Manifest b/kde-apps/kabcclient/Manifest
326 index d5c4ebb..0a4c5c7 100644
327 --- a/kde-apps/kabcclient/Manifest
328 +++ b/kde-apps/kabcclient/Manifest
329 @@ -1,3 +1,2 @@
330 -DIST kdepim-4.14.10.tar.xz 14585020 SHA256 edad865b81259331780a25906127e105d06fda8aa56f6f11cfee4bc8f85bb7e2 SHA512 aa7e5a488964d11d355557e89053993bb0bed4860072dbb8ae1851df881713a15ec5aa4e428de9b85a8bef678ace307b33f186314fe5a8011521e30331a1691b WHIRLPOOL 358589e29baeb2f7bf648d1bbccb9bbf37c4c1a447f05a2eff472b50282d7d5118ad40ced2f93ac7f47f2c394f745216632d33be389e82f88efd69386f6ab57d
331 DIST kdepim-4.14.11_pre20160211.tar.gz 18551484 SHA256 b970c0c04652519cc7e88d818b3a29e7b356a73f449f7f6e5767d60e5b2a17e3 SHA512 e7fcf14353e457e9b3ec2d7eefa18ac0d9bc454ecaa682dcaf1585a6a36968bc8d7ea6ab61398a8d697d9343f0cd87472a906d444f814cd44956b6499826bb1d WHIRLPOOL f66fd74138ce871f88ce211c3b6af287cddaeda493e42c3b683938c274482d1f09a3ae659d380d4e19f5e5da70f5724ddd48723acf5846f6a1e9c01a79803e7e
332 DIST kdepim-4.4.2016.01.tar.xz 8964248 SHA256 19f4d6ab4bcddf5a0e6acae50c20d0b8fbb482503e47e75c86955637d249cefa SHA512 a04737cc89f96e3635a19c492c9f3f31e7554aa8a237fb0ad8f5fe8c02e7e30911dd5d93bf0f27fd38603e496e02f3ef1d3064e159c99c71dea379199d1e0e03 WHIRLPOOL 9f02f5799b3a10a9b18b4c8cb34084051991cb7240d2b818cd2b58bde05abde2ef3126b3960f2554c7e5c4930266e561c1715c21fe72136654e28184b5083089
333
334 diff --git a/kde-apps/kabcclient/kabcclient-4.14.10.ebuild b/kde-apps/kabcclient/kabcclient-4.14.10.ebuild
335 deleted file mode 100644
336 index b944fb0..0000000
337 --- a/kde-apps/kabcclient/kabcclient-4.14.10.ebuild
338 +++ /dev/null
339 @@ -1,27 +0,0 @@
340 -# Copyright 1999-2015 Gentoo Foundation
341 -# Distributed under the terms of the GNU General Public License v2
342 -# $Id$
343 -
344 -EAPI=5
345 -
346 -KDE_HANDBOOK="optional"
347 -KMNAME="kdepim"
348 -EGIT_BRANCH="KDE/4.14"
349 -KMMODULE="console/${PN}"
350 -inherit kde4-meta
351 -
352 -DESCRIPTION="A command line client for accessing the KDE addressbook"
353 -KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
354 -IUSE="debug"
355 -
356 -DEPEND="
357 - $(add_kdeapps_dep kdepimlibs 'akonadi(+)')
358 -"
359 -RDEPEND="${DEPEND}"
360 -
361 -src_install() {
362 - kde4-meta_src_install
363 -
364 - # work around NULL DT_RPATH in kabc2mutt
365 - dosym kabcclient ${PREFIX}/bin/kabc2mutt
366 -}
367
368 diff --git a/kde-apps/kaddressbook/Manifest b/kde-apps/kaddressbook/Manifest
369 index d5c4ebb..0a4c5c7 100644
370 --- a/kde-apps/kaddressbook/Manifest
371 +++ b/kde-apps/kaddressbook/Manifest
372 @@ -1,3 +1,2 @@
373 -DIST kdepim-4.14.10.tar.xz 14585020 SHA256 edad865b81259331780a25906127e105d06fda8aa56f6f11cfee4bc8f85bb7e2 SHA512 aa7e5a488964d11d355557e89053993bb0bed4860072dbb8ae1851df881713a15ec5aa4e428de9b85a8bef678ace307b33f186314fe5a8011521e30331a1691b WHIRLPOOL 358589e29baeb2f7bf648d1bbccb9bbf37c4c1a447f05a2eff472b50282d7d5118ad40ced2f93ac7f47f2c394f745216632d33be389e82f88efd69386f6ab57d
374 DIST kdepim-4.14.11_pre20160211.tar.gz 18551484 SHA256 b970c0c04652519cc7e88d818b3a29e7b356a73f449f7f6e5767d60e5b2a17e3 SHA512 e7fcf14353e457e9b3ec2d7eefa18ac0d9bc454ecaa682dcaf1585a6a36968bc8d7ea6ab61398a8d697d9343f0cd87472a906d444f814cd44956b6499826bb1d WHIRLPOOL f66fd74138ce871f88ce211c3b6af287cddaeda493e42c3b683938c274482d1f09a3ae659d380d4e19f5e5da70f5724ddd48723acf5846f6a1e9c01a79803e7e
375 DIST kdepim-4.4.2016.01.tar.xz 8964248 SHA256 19f4d6ab4bcddf5a0e6acae50c20d0b8fbb482503e47e75c86955637d249cefa SHA512 a04737cc89f96e3635a19c492c9f3f31e7554aa8a237fb0ad8f5fe8c02e7e30911dd5d93bf0f27fd38603e496e02f3ef1d3064e159c99c71dea379199d1e0e03 WHIRLPOOL 9f02f5799b3a10a9b18b4c8cb34084051991cb7240d2b818cd2b58bde05abde2ef3126b3960f2554c7e5c4930266e561c1715c21fe72136654e28184b5083089
376
377 diff --git a/kde-apps/kaddressbook/kaddressbook-4.14.10.ebuild b/kde-apps/kaddressbook/kaddressbook-4.14.10.ebuild
378 deleted file mode 100644
379 index 3943a12..0000000
380 --- a/kde-apps/kaddressbook/kaddressbook-4.14.10.ebuild
381 +++ /dev/null
382 @@ -1,52 +0,0 @@
383 -# Copyright 1999-2015 Gentoo Foundation
384 -# Distributed under the terms of the GNU General Public License v2
385 -# $Id$
386 -
387 -EAPI=5
388 -
389 -KDE_HANDBOOK="optional"
390 -KMNAME="kdepim"
391 -EGIT_BRANCH="KDE/4.14"
392 -inherit kde4-meta
393 -
394 -DESCRIPTION="The KDE Address Book"
395 -HOMEPAGE="https://www.kde.org/applications/office/kaddressbook/"
396 -KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
397 -IUSE="debug"
398 -
399 -DEPEND="
400 - $(add_kdeapps_dep kdepimlibs 'akonadi(+)')
401 - $(add_kdeapps_dep kdepim-common-libs)
402 - dev-libs/grantlee:0
403 - !kde-base/contactthemeeditor
404 -"
405 -RDEPEND="${DEPEND}"
406 -
407 -KMEXTRA="
408 - grantleeeditor/contactthemeeditor
409 - plugins/kaddressbook/
410 - plugins/ktexteditor/
411 -"
412 -KMCOMPILEONLY="
413 - grantleetheme/
414 - kaddressbookgrantlee/
415 -"
416 -KMEXTRACTONLY="
417 - akonadi_next/
418 - calendarsupport/
419 - grantleeeditor/grantleethemeeditor/
420 - libkleo/
421 - pimcommon/
422 -"
423 -
424 -KMLOADLIBS="kdepim-common-libs"
425 -
426 -pkg_postinst() {
427 - kde4-meta_pkg_postinst
428 -
429 - if ! has_version kde-apps/kdepim-kresources:${SLOT}; then
430 - echo
431 - elog "For groupware functionality, please install kde-apps/kdepim-kresources:${SLOT}"
432 - echo
433 - fi
434 -}
435
436 diff --git a/kde-apps/kalarm/Manifest b/kde-apps/kalarm/Manifest
437 index d5c4ebb..0a4c5c7 100644
438 --- a/kde-apps/kalarm/Manifest
439 +++ b/kde-apps/kalarm/Manifest
440 @@ -1,3 +1,2 @@
441 -DIST kdepim-4.14.10.tar.xz 14585020 SHA256 edad865b81259331780a25906127e105d06fda8aa56f6f11cfee4bc8f85bb7e2 SHA512 aa7e5a488964d11d355557e89053993bb0bed4860072dbb8ae1851df881713a15ec5aa4e428de9b85a8bef678ace307b33f186314fe5a8011521e30331a1691b WHIRLPOOL 358589e29baeb2f7bf648d1bbccb9bbf37c4c1a447f05a2eff472b50282d7d5118ad40ced2f93ac7f47f2c394f745216632d33be389e82f88efd69386f6ab57d
442 DIST kdepim-4.14.11_pre20160211.tar.gz 18551484 SHA256 b970c0c04652519cc7e88d818b3a29e7b356a73f449f7f6e5767d60e5b2a17e3 SHA512 e7fcf14353e457e9b3ec2d7eefa18ac0d9bc454ecaa682dcaf1585a6a36968bc8d7ea6ab61398a8d697d9343f0cd87472a906d444f814cd44956b6499826bb1d WHIRLPOOL f66fd74138ce871f88ce211c3b6af287cddaeda493e42c3b683938c274482d1f09a3ae659d380d4e19f5e5da70f5724ddd48723acf5846f6a1e9c01a79803e7e
443 DIST kdepim-4.4.2016.01.tar.xz 8964248 SHA256 19f4d6ab4bcddf5a0e6acae50c20d0b8fbb482503e47e75c86955637d249cefa SHA512 a04737cc89f96e3635a19c492c9f3f31e7554aa8a237fb0ad8f5fe8c02e7e30911dd5d93bf0f27fd38603e496e02f3ef1d3064e159c99c71dea379199d1e0e03 WHIRLPOOL 9f02f5799b3a10a9b18b4c8cb34084051991cb7240d2b818cd2b58bde05abde2ef3126b3960f2554c7e5c4930266e561c1715c21fe72136654e28184b5083089
444
445 diff --git a/kde-apps/kalarm/kalarm-4.14.10.ebuild b/kde-apps/kalarm/kalarm-4.14.10.ebuild
446 deleted file mode 100644
447 index b9d3497..0000000
448 --- a/kde-apps/kalarm/kalarm-4.14.10.ebuild
449 +++ /dev/null
450 @@ -1,27 +0,0 @@
451 -# Copyright 1999-2015 Gentoo Foundation
452 -# Distributed under the terms of the GNU General Public License v2
453 -# $Id$
454 -
455 -EAPI=5
456 -
457 -KDE_HANDBOOK="optional"
458 -KMNAME="kdepim"
459 -EGIT_BRANCH="KDE/4.14"
460 -inherit kde4-meta
461 -
462 -DESCRIPTION="Personal alarm message, command and email scheduler for KDE"
463 -HOMEPAGE+=" https://userbase.kde.org/KAlarm"
464 -KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
465 -IUSE="debug"
466 -
467 -RDEPEND="
468 - $(add_kdeapps_dep kdepimlibs 'akonadi(+)')
469 - $(add_kdeapps_dep kdepim-common-libs)
470 - media-libs/phonon[qt4]
471 - x11-libs/libX11
472 -"
473 -DEPEND="${RDEPEND}"
474 -
475 -KMEXTRACTONLY="
476 - kmail/
477 -"
478
479 diff --git a/kde-apps/kdepim-common-libs/Manifest b/kde-apps/kdepim-common-libs/Manifest
480 index 55fbc17..d63f48e 100644
481 --- a/kde-apps/kdepim-common-libs/Manifest
482 +++ b/kde-apps/kdepim-common-libs/Manifest
483 @@ -1,2 +1 @@
484 -DIST kdepim-4.14.10.tar.xz 14585020 SHA256 edad865b81259331780a25906127e105d06fda8aa56f6f11cfee4bc8f85bb7e2 SHA512 aa7e5a488964d11d355557e89053993bb0bed4860072dbb8ae1851df881713a15ec5aa4e428de9b85a8bef678ace307b33f186314fe5a8011521e30331a1691b WHIRLPOOL 358589e29baeb2f7bf648d1bbccb9bbf37c4c1a447f05a2eff472b50282d7d5118ad40ced2f93ac7f47f2c394f745216632d33be389e82f88efd69386f6ab57d
485 DIST kdepim-4.14.11_pre20160211.tar.gz 18551484 SHA256 b970c0c04652519cc7e88d818b3a29e7b356a73f449f7f6e5767d60e5b2a17e3 SHA512 e7fcf14353e457e9b3ec2d7eefa18ac0d9bc454ecaa682dcaf1585a6a36968bc8d7ea6ab61398a8d697d9343f0cd87472a906d444f814cd44956b6499826bb1d WHIRLPOOL f66fd74138ce871f88ce211c3b6af287cddaeda493e42c3b683938c274482d1f09a3ae659d380d4e19f5e5da70f5724ddd48723acf5846f6a1e9c01a79803e7e
486
487 diff --git a/kde-apps/kdepim-common-libs/kdepim-common-libs-4.14.10.ebuild b/kde-apps/kdepim-common-libs/kdepim-common-libs-4.14.10.ebuild
488 deleted file mode 100644
489 index a46cb9f..0000000
490 --- a/kde-apps/kdepim-common-libs/kdepim-common-libs-4.14.10.ebuild
491 +++ /dev/null
492 @@ -1,93 +0,0 @@
493 -# Copyright 1999-2015 Gentoo Foundation
494 -# Distributed under the terms of the GNU General Public License v2
495 -# $Id$
496 -
497 -EAPI=5
498 -
499 -KMNAME="kdepim"
500 -EGIT_BRANCH="KDE/4.14"
501 -KMNOMODULE="true"
502 -inherit kde4-meta
503 -
504 -DESCRIPTION="Common libraries for KDE PIM apps"
505 -KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
506 -IUSE="debug google"
507 -
508 -DEPEND="
509 - app-crypt/gpgme
510 - >=app-office/akonadi-server-1.12.90
511 - dev-libs/grantlee:0
512 - $(add_kdebase_dep baloo '' 4.14.3)
513 - $(add_kdeapps_dep kdepimlibs 'akonadi(+)')
514 - google? ( net-libs/libkgapi:4 )
515 -"
516 -RDEPEND="${DEPEND}
517 - !kde-base/akonadi:4
518 - !kde-apps/libkdepim:4
519 - !kde-apps/libkleo:4
520 - !kde-apps/libkpgp:4
521 - !<kde-base/kaddressbook-4.11.50:4
522 - !kde-apps/kdepim-wizards:4
523 - !<kde-base/kmail-4.14.5:4
524 - !<kde-base/korganizer-4.5.67:4
525 - app-crypt/gnupg
526 - $(add_kdeapps_dep kdepim-runtime)
527 -"
528 -
529 -RESTRICT="test"
530 -# bug 393131
531 -
532 -KMEXTRA="
533 - agents/sendlateragent/
534 - akonadi_next/
535 - calendarsupport/
536 - calendarviews/
537 - composereditor-ng/
538 - grantleeeditor/grantleethemeeditor/
539 - grantleetheme/
540 - incidenceeditor-ng/
541 - libkdepim/
542 - libkdepimdbusinterfaces/
543 - libkleo/
544 - libkpgp/
545 - kaddressbookgrantlee/
546 - kdgantt2/
547 - mailcommon/
548 - mailimporter/
549 - messagecomposer/
550 - messagecore/
551 - messagelist/
552 - messageviewer/
553 - noteshared/
554 - pimcommon/
555 - templateparser/
556 -"
557 -KMEXTRACTONLY="
558 - agents/mailfilteragent/org.freedesktop.Akonadi.MailFilterAgent.xml
559 - kleopatra/
560 - kmail/
561 - knode/org.kde.knode.xml
562 - korgac/org.kde.korganizer.KOrgac.xml
563 - korganizer/data/org.kde.korganizer.Korganizer.xml
564 - korganizer/data/org.kde.Korganizer.Calendar.xml
565 -"
566 -KMSAVELIBS="true"
567 -
568 -PATCHES=(
569 - "${FILESDIR}/install-composereditorng.patch"
570 - "${FILESDIR}/${PN}-install-headers.patch"
571 -)
572 -
573 -src_prepare() {
574 - kde4-meta_src_prepare
575 - sed -e '/folderarchiveagent.desktop/d' \
576 - -i agents/CMakeLists.txt || die
577 -}
578 -
579 -src_configure() {
580 - local mycmakeargs=(
581 - $(cmake-utils_use_find_package google LibKGAPI2)
582 - )
583 -
584 - kde4-meta_src_configure
585 -}
586
587 diff --git a/kde-apps/kdepim-kresources/Manifest b/kde-apps/kdepim-kresources/Manifest
588 index d5c4ebb..0a4c5c7 100644
589 --- a/kde-apps/kdepim-kresources/Manifest
590 +++ b/kde-apps/kdepim-kresources/Manifest
591 @@ -1,3 +1,2 @@
592 -DIST kdepim-4.14.10.tar.xz 14585020 SHA256 edad865b81259331780a25906127e105d06fda8aa56f6f11cfee4bc8f85bb7e2 SHA512 aa7e5a488964d11d355557e89053993bb0bed4860072dbb8ae1851df881713a15ec5aa4e428de9b85a8bef678ace307b33f186314fe5a8011521e30331a1691b WHIRLPOOL 358589e29baeb2f7bf648d1bbccb9bbf37c4c1a447f05a2eff472b50282d7d5118ad40ced2f93ac7f47f2c394f745216632d33be389e82f88efd69386f6ab57d
593 DIST kdepim-4.14.11_pre20160211.tar.gz 18551484 SHA256 b970c0c04652519cc7e88d818b3a29e7b356a73f449f7f6e5767d60e5b2a17e3 SHA512 e7fcf14353e457e9b3ec2d7eefa18ac0d9bc454ecaa682dcaf1585a6a36968bc8d7ea6ab61398a8d697d9343f0cd87472a906d444f814cd44956b6499826bb1d WHIRLPOOL f66fd74138ce871f88ce211c3b6af287cddaeda493e42c3b683938c274482d1f09a3ae659d380d4e19f5e5da70f5724ddd48723acf5846f6a1e9c01a79803e7e
594 DIST kdepim-4.4.2016.01.tar.xz 8964248 SHA256 19f4d6ab4bcddf5a0e6acae50c20d0b8fbb482503e47e75c86955637d249cefa SHA512 a04737cc89f96e3635a19c492c9f3f31e7554aa8a237fb0ad8f5fe8c02e7e30911dd5d93bf0f27fd38603e496e02f3ef1d3064e159c99c71dea379199d1e0e03 WHIRLPOOL 9f02f5799b3a10a9b18b4c8cb34084051991cb7240d2b818cd2b58bde05abde2ef3126b3960f2554c7e5c4930266e561c1715c21fe72136654e28184b5083089
595
596 diff --git a/kde-apps/kdepim-kresources/kdepim-kresources-4.14.10.ebuild b/kde-apps/kdepim-kresources/kdepim-kresources-4.14.10.ebuild
597 deleted file mode 100644
598 index 39ea6cf..0000000
599 --- a/kde-apps/kdepim-kresources/kdepim-kresources-4.14.10.ebuild
600 +++ /dev/null
601 @@ -1,28 +0,0 @@
602 -# Copyright 1999-2015 Gentoo Foundation
603 -# Distributed under the terms of the GNU General Public License v2
604 -# $Id$
605 -
606 -EAPI=5
607 -
608 -KMNAME="kdepim"
609 -EGIT_BRANCH="KDE/4.14"
610 -KMMODULE="kresources"
611 -inherit kde4-meta
612 -
613 -DESCRIPTION="KDE PIM groupware plugin collection"
614 -IUSE="debug"
615 -KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
616 -
617 -DEPEND="
618 - $(add_kdeapps_dep kdepimlibs 'akonadi(+)')
619 - $(add_kdeapps_dep kdepim-common-libs)
620 -"
621 -RDEPEND="${DEPEND}"
622 -
623 -KMEXTRACTONLY="
624 - kmail/
625 - knotes/
626 - korganizer/version.h
627 -"
628 -
629 -KMLOADLIBS="kdepim-common-libs"
630
631 diff --git a/kde-apps/kdepim-meta/kdepim-meta-4.14.10-r1.ebuild b/kde-apps/kdepim-meta/kdepim-meta-4.14.10-r1.ebuild
632 deleted file mode 100644
633 index fcb6d9f..0000000
634 --- a/kde-apps/kdepim-meta/kdepim-meta-4.14.10-r1.ebuild
635 +++ /dev/null
636 @@ -1,41 +0,0 @@
637 -# Copyright 1999-2016 Gentoo Foundation
638 -# Distributed under the terms of the GNU General Public License v2
639 -# $Id$
640 -
641 -EAPI=5
642 -inherit kde4-meta-pkg
643 -
644 -DESCRIPTION="kdepim - merge this to pull in all kdepim-derived packages"
645 -HOMEPAGE+=" https://community.kde.org/KDE_PIM"
646 -KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
647 -IUSE="nls"
648 -
649 -RDEPEND="
650 - $(add_kdeapps_dep akonadiconsole '' ${PV})
651 - $(add_kdeapps_dep akregator '' ${PV})
652 - $(add_kdeapps_dep blogilo '' ${PV})
653 - $(add_kdeapps_dep calendarjanitor '' ${PV})
654 - $(add_kdeapps_dep kabcclient '' ${PV})
655 - $(add_kdeapps_dep kaddressbook '' ${PV})
656 - $(add_kdeapps_dep kalarm '' ${PV})
657 - || (
658 - $(add_kdeapps_dep kdepim-icons)
659 - >=kde-frameworks/oxygen-icons-5.19.0:5
660 - )
661 - $(add_kdeapps_dep kdepim-kresources '' ${PV})
662 - $(add_kdeapps_dep kdepim-runtime '' ${PV})
663 - $(add_kdeapps_dep kjots '' ${PV})
664 - $(add_kdeapps_dep kleopatra '' ${PV})
665 - $(add_kdeapps_dep kmail '' ${PV})
666 - $(add_kdeapps_dep knode '' ${PV})
667 - $(add_kdeapps_dep knotes '' ${PV})
668 - $(add_kdeapps_dep konsolekalendar '' ${PV})
669 - $(add_kdeapps_dep kontact '' ${PV})
670 - $(add_kdeapps_dep korganizer '' ${PV})
671 - $(add_kdeapps_dep ktimetracker '' ${PV})
672 - $(add_kdeapps_dep ktnef '' ${PV})
673 - nls? (
674 - $(add_kdeapps_dep kde4-l10n '' 4.14.3-r1)
675 - $(add_kdeapps_dep kdepim-l10n '' 4.14.3-r1)
676 - )
677 -"
678
679 diff --git a/kde-apps/kdepim-runtime/Manifest b/kde-apps/kdepim-runtime/Manifest
680 index e80ea8f..da1aefd 100644
681 --- a/kde-apps/kdepim-runtime/Manifest
682 +++ b/kde-apps/kdepim-runtime/Manifest
683 @@ -1,2 +1 @@
684 -DIST kdepim-runtime-4.14.10.tar.xz 1175432 SHA256 d68d1e3278646c3e82c7913dd443b5e10c887fb983fad7d24b26916ed4afcd52 SHA512 599cf08ee7c4bfcc2dcde7d146c5c889663a463e59e4e4773e6b1cee909d02914fce414afe473a127d484b5daa2fa9332dcef8092c3b953cdbebc87663e70577 WHIRLPOOL c40c44f266716f7136c253904e7ee65c6e40de40df458608cc4a1f7e02ada5b17febe4611e7693ef48c63201577ca21866b82005849bdd2409dfd1415d9ba251
685 DIST kdepim-runtime-4.14.11_pre20160211.tar.gz 1655057 SHA256 00d0c78d84850b1619c22550fd938c0e016d1765a04623bac25dafffc6105b49 SHA512 6aeb3b35dc84a1cacc18619af5f7ab65175a31fbfb9a1d11d30dc98c6dcd3f40ebd18a90d2d02421b6a38fdc4b4d77f9fa6853c523a60910e92367f25932c45e WHIRLPOOL c14c3f9b85b7b157a9f274f4c74c687ae0e85e8b3ea6aa0756c640ff8f5dbcb3311366e3ff6c490a29ed7697a7a51c75ca6de6cef8b3ebf28f7da640e7eb149e
686
687 diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-4.14.10.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-4.14.10.ebuild
688 deleted file mode 100644
689 index 287e6ea..0000000
690 --- a/kde-apps/kdepim-runtime/kdepim-runtime-4.14.10.ebuild
691 +++ /dev/null
692 @@ -1,47 +0,0 @@
693 -# Copyright 1999-2016 Gentoo Foundation
694 -# Distributed under the terms of the GNU General Public License v2
695 -# $Id$
696 -
697 -EAPI=5
698 -
699 -KMNAME="kdepim-runtime"
700 -EGIT_BRANCH="KDE/4.14"
701 -inherit kde4-base
702 -
703 -DESCRIPTION="KDE PIM runtime plugin collection"
704 -KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
705 -IUSE="debug facebook google kolab"
706 -
707 -RESTRICT="test"
708 -# Would need test programs _testrunner and akonaditest from kdepimlibs, see bug 313233
709 -
710 -DEPEND="
711 - >=app-office/akonadi-server-1.12.90
712 - dev-libs/boost:=
713 - dev-libs/libxml2:2
714 - dev-libs/libxslt
715 - $(add_kdeapps_dep kdepimlibs 'akonadi(+)')
716 - x11-misc/shared-mime-info
717 - facebook? ( net-libs/libkfbapi:4 )
718 - google? ( >=net-libs/libkgapi-2.0:4 )
719 - kolab? ( >=net-libs/libkolab-0.5 )
720 -"
721 -RDEPEND="${DEPEND}
722 - || (
723 - $(add_kdeapps_dep kdepim-icons)
724 - >=kde-frameworks/oxygen-icons-5.19.0:5
725 - )
726 - !>=kde-apps/kdepimlibs-4.14.11_pre20160211
727 - !kde-misc/akonadi-google
728 -"
729 -
730 -src_configure() {
731 - local mycmakeargs=(
732 - $(cmake-utils_use_find_package facebook LibKFbAPI)
733 - $(cmake-utils_use_find_package google LibKGAPI2)
734 - $(cmake-utils_use_find_package kolab Libkolab)
735 - $(cmake-utils_use_find_package kolab Libkolabxml)
736 - )
737 -
738 - kde4-base_src_configure
739 -}
740
741 diff --git a/kde-apps/kdepim-runtime/metadata.xml b/kde-apps/kdepim-runtime/metadata.xml
742 index a01b9db..65f42d1 100644
743 --- a/kde-apps/kdepim-runtime/metadata.xml
744 +++ b/kde-apps/kdepim-runtime/metadata.xml
745 @@ -6,7 +6,6 @@
746 <name>Gentoo KDE Project</name>
747 </maintainer>
748 <use>
749 - <flag name="facebook">Facebook service integration via <pkg>net-libs/libkfbapi</pkg></flag>
750 <flag name="google">Google service integration via <pkg>net-libs/libkgapi</pkg></flag>
751 </use>
752 </pkgmetadata>
753
754 diff --git a/kde-apps/kjots/Manifest b/kde-apps/kjots/Manifest
755 index d5c4ebb..0a4c5c7 100644
756 --- a/kde-apps/kjots/Manifest
757 +++ b/kde-apps/kjots/Manifest
758 @@ -1,3 +1,2 @@
759 -DIST kdepim-4.14.10.tar.xz 14585020 SHA256 edad865b81259331780a25906127e105d06fda8aa56f6f11cfee4bc8f85bb7e2 SHA512 aa7e5a488964d11d355557e89053993bb0bed4860072dbb8ae1851df881713a15ec5aa4e428de9b85a8bef678ace307b33f186314fe5a8011521e30331a1691b WHIRLPOOL 358589e29baeb2f7bf648d1bbccb9bbf37c4c1a447f05a2eff472b50282d7d5118ad40ced2f93ac7f47f2c394f745216632d33be389e82f88efd69386f6ab57d
760 DIST kdepim-4.14.11_pre20160211.tar.gz 18551484 SHA256 b970c0c04652519cc7e88d818b3a29e7b356a73f449f7f6e5767d60e5b2a17e3 SHA512 e7fcf14353e457e9b3ec2d7eefa18ac0d9bc454ecaa682dcaf1585a6a36968bc8d7ea6ab61398a8d697d9343f0cd87472a906d444f814cd44956b6499826bb1d WHIRLPOOL f66fd74138ce871f88ce211c3b6af287cddaeda493e42c3b683938c274482d1f09a3ae659d380d4e19f5e5da70f5724ddd48723acf5846f6a1e9c01a79803e7e
761 DIST kdepim-4.4.2016.01.tar.xz 8964248 SHA256 19f4d6ab4bcddf5a0e6acae50c20d0b8fbb482503e47e75c86955637d249cefa SHA512 a04737cc89f96e3635a19c492c9f3f31e7554aa8a237fb0ad8f5fe8c02e7e30911dd5d93bf0f27fd38603e496e02f3ef1d3064e159c99c71dea379199d1e0e03 WHIRLPOOL 9f02f5799b3a10a9b18b4c8cb34084051991cb7240d2b818cd2b58bde05abde2ef3126b3960f2554c7e5c4930266e561c1715c21fe72136654e28184b5083089
762
763 diff --git a/kde-apps/kjots/kjots-4.14.10.ebuild b/kde-apps/kjots/kjots-4.14.10.ebuild
764 deleted file mode 100644
765 index 08ea44d..0000000
766 --- a/kde-apps/kjots/kjots-4.14.10.ebuild
767 +++ /dev/null
768 @@ -1,27 +0,0 @@
769 -# Copyright 1999-2015 Gentoo Foundation
770 -# Distributed under the terms of the GNU General Public License v2
771 -# $Id$
772 -
773 -EAPI=5
774 -
775 -KDE_HANDBOOK="optional"
776 -KMNAME="kdepim"
777 -EGIT_BRANCH="KDE/4.14"
778 -inherit kde4-meta
779 -
780 -DESCRIPTION="KDE note taking utility"
781 -HOMEPAGE="https://www.kde.org/applications/utilities/kjots/"
782 -KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
783 -IUSE="debug"
784 -
785 -DEPEND="
786 - dev-libs/grantlee:0
787 - $(add_kdeapps_dep kdepimlibs 'akonadi(+)')
788 - $(add_kdeapps_dep kdepim-common-libs)
789 -"
790 -RDEPEND="${DEPEND}"
791 -
792 -KMEXTRACTONLY="
793 - akonadi_next/
794 - noteshared/
795 -"
796
797 diff --git a/kde-apps/kleopatra/Manifest b/kde-apps/kleopatra/Manifest
798 index d5c4ebb..0a4c5c7 100644
799 --- a/kde-apps/kleopatra/Manifest
800 +++ b/kde-apps/kleopatra/Manifest
801 @@ -1,3 +1,2 @@
802 -DIST kdepim-4.14.10.tar.xz 14585020 SHA256 edad865b81259331780a25906127e105d06fda8aa56f6f11cfee4bc8f85bb7e2 SHA512 aa7e5a488964d11d355557e89053993bb0bed4860072dbb8ae1851df881713a15ec5aa4e428de9b85a8bef678ace307b33f186314fe5a8011521e30331a1691b WHIRLPOOL 358589e29baeb2f7bf648d1bbccb9bbf37c4c1a447f05a2eff472b50282d7d5118ad40ced2f93ac7f47f2c394f745216632d33be389e82f88efd69386f6ab57d
803 DIST kdepim-4.14.11_pre20160211.tar.gz 18551484 SHA256 b970c0c04652519cc7e88d818b3a29e7b356a73f449f7f6e5767d60e5b2a17e3 SHA512 e7fcf14353e457e9b3ec2d7eefa18ac0d9bc454ecaa682dcaf1585a6a36968bc8d7ea6ab61398a8d697d9343f0cd87472a906d444f814cd44956b6499826bb1d WHIRLPOOL f66fd74138ce871f88ce211c3b6af287cddaeda493e42c3b683938c274482d1f09a3ae659d380d4e19f5e5da70f5724ddd48723acf5846f6a1e9c01a79803e7e
804 DIST kdepim-4.4.2016.01.tar.xz 8964248 SHA256 19f4d6ab4bcddf5a0e6acae50c20d0b8fbb482503e47e75c86955637d249cefa SHA512 a04737cc89f96e3635a19c492c9f3f31e7554aa8a237fb0ad8f5fe8c02e7e30911dd5d93bf0f27fd38603e496e02f3ef1d3064e159c99c71dea379199d1e0e03 WHIRLPOOL 9f02f5799b3a10a9b18b4c8cb34084051991cb7240d2b818cd2b58bde05abde2ef3126b3960f2554c7e5c4930266e561c1715c21fe72136654e28184b5083089
805
806 diff --git a/kde-apps/kleopatra/files/kleopatra-4.14.10-newer-boost-buildfix.patch b/kde-apps/kleopatra/files/kleopatra-4.14.10-newer-boost-buildfix.patch
807 deleted file mode 100644
808 index ae4f7a7..0000000
809 --- a/kde-apps/kleopatra/files/kleopatra-4.14.10-newer-boost-buildfix.patch
810 +++ /dev/null
811 @@ -1,1803 +0,0 @@
812 -From: Michael Pyne <mpyne@×××.org>
813 -Date: Fri, 04 Sep 2015 01:59:01 +0000
814 -Subject: Build with recent Boost.
815 -X-Git-Url: http://quickgit.kde.org/?p=kdepim.git&a=commitdiff&h=3c72e211dc4ee1420bf744312036dc2141238912
816 ----
817 -Build with recent Boost.
818 -
819 -The issue is that recent versions of Boost have widespread usage of a
820 -technique involving the generation of namespace names using a special
821 -macro, BOOST_JOIN. This macro breaks moc with Qt 4, leading to
822 -compilation failures unless Boost is downgraded.
823 -
824 -moc is fixed for Qt 5 but the change is too invasive to backport.
825 -Instead, we use the technique recommended by the Qt devs and tell moc to
826 -avoid scanning Boost headers wherever we use them. Some headers already
827 -had this fix applied; this patch completes the work.
828 -
829 -See also QTBUG-22829.
830 -
831 -REVIEW:124926
832 ----
833 -
834 -
835 ---- a/kleopatra/commands/certifycertificatecommand.cpp
836 -+++ b/kleopatra/commands/certifycertificatecommand.cpp
837 -@@ -52,7 +52,9 @@
838 - #include <KLocalizedString>
839 - #include <kdebug.h>
840 -
841 -+#ifndef Q_MOC_RUN
842 - #include <boost/bind.hpp>
843 -+#endif
844 -
845 - #include <cassert>
846 -
847 -
848 ---- a/kleopatra/commands/deletecertificatescommand.cpp
849 -+++ b/kleopatra/commands/deletecertificatescommand.cpp
850 -@@ -54,7 +54,9 @@
851 - #include <QPointer>
852 - #include <QAbstractItemView>
853 -
854 -+#ifndef Q_MOC_RUN
855 - #include <boost/bind.hpp>
856 -+#endif
857 -
858 - #include <algorithm>
859 - #include <vector>
860 -
861 ---- a/kleopatra/commands/exportcertificatecommand.cpp
862 -+++ b/kleopatra/commands/exportcertificatecommand.cpp
863 -@@ -53,7 +53,9 @@
864 - #include <QMap>
865 - #include <QPointer>
866 -
867 -+#ifndef Q_MOC_RUN
868 - #include <boost/bind.hpp>
869 -+#endif
870 - #include <algorithm>
871 - #include <vector>
872 - #include <cassert>
873 -
874 ---- a/kleopatra/commands/importcertificatescommand.cpp
875 -+++ b/kleopatra/commands/importcertificatescommand.cpp
876 -@@ -59,8 +59,10 @@
877 - #include <QTreeView>
878 - #include <QTextDocument> // for Qt::escape
879 -
880 -+#ifndef Q_MOC_RUN
881 - #include <boost/bind.hpp>
882 - #include <boost/mem_fn.hpp>
883 -+#endif
884 -
885 - #include <memory>
886 - #include <algorithm>
887 -
888 ---- a/kleopatra/commands/lookupcertificatescommand.cpp
889 -+++ b/kleopatra/commands/lookupcertificatescommand.cpp
890 -@@ -59,8 +59,10 @@
891 -
892 - #include <QRegExp>
893 -
894 -+#ifndef Q_MOC_RUN
895 - #include <boost/bind.hpp>
896 - #include <boost/shared_ptr.hpp>
897 -+#endif
898 -
899 - #include <vector>
900 - #include <map>
901 -
902 ---- a/kleopatra/commands/reloadkeyscommand.cpp
903 -+++ b/kleopatra/commands/reloadkeyscommand.cpp
904 -@@ -41,7 +41,9 @@
905 -
906 - #include <gpgme++/keylistresult.h>
907 -
908 -+#ifndef Q_MOC_RUN
909 - #include <boost/bind.hpp>
910 -+#endif
911 -
912 - using namespace Kleo;
913 - using namespace boost;
914 -
915 ---- a/kleopatra/commands/selftestcommand.cpp
916 -+++ b/kleopatra/commands/selftestcommand.cpp
917 -@@ -57,8 +57,10 @@
918 - #include <KSplashScreen>
919 - #include <KSharedConfig>
920 -
921 -+#ifndef Q_MOC_RUN
922 - #include <boost/shared_ptr.hpp>
923 - #include <boost/mem_fn.hpp>
924 -+#endif
925 -
926 - #include <vector>
927 -
928 -
929 ---- a/kleopatra/conf/appearanceconfigwidget.cpp
930 -+++ b/kleopatra/conf/appearanceconfigwidget.cpp
931 -@@ -62,8 +62,10 @@
932 - #include <QColorDialog>
933 - #include <QFontDialog>
934 -
935 -+#ifndef Q_MOC_RUN
936 - #include <boost/range.hpp>
937 - #include <boost/bind.hpp>
938 -+#endif
939 -
940 - #include <algorithm>
941 - #include <cassert>
942 -
943 ---- a/kleopatra/conf/cryptooperationsconfigwidget.cpp
944 -+++ b/kleopatra/conf/cryptooperationsconfigwidget.cpp
945 -@@ -47,7 +47,9 @@
946 -
947 - #include <QLayout>
948 -
949 -+#ifndef Q_MOC_RUN
950 - #include <boost/shared_ptr.hpp>
951 -+#endif
952 -
953 - using namespace Kleo;
954 - using namespace Kleo::Config;
955 -
956 ---- a/kleopatra/crypto/certificateresolver.cpp
957 -+++ b/kleopatra/crypto/certificateresolver.cpp
958 -@@ -45,7 +45,9 @@
959 - #include <QHash>
960 - #include <QSet>
961 -
962 -+#ifndef Q_MOC_RUN
963 - #include <boost/bind.hpp>
964 -+#endif
965 -
966 - #include <algorithm>
967 - #include <iterator>
968 -
969 ---- a/kleopatra/crypto/controller.h
970 -+++ b/kleopatra/crypto/controller.h
971 -@@ -40,7 +40,9 @@
972 - #include <utils/pimpl_ptr.h>
973 - #include <utils/types.h>
974 -
975 -+#ifndef Q_MOC_RUN
976 - #include <boost/shared_ptr.hpp>
977 -+#endif
978 -
979 - class QDialog;
980 -
981 -
982 ---- a/kleopatra/crypto/createchecksumscontroller.cpp
983 -+++ b/kleopatra/crypto/createchecksumscontroller.cpp
984 -@@ -62,8 +62,10 @@
985 - #include <QDir>
986 - #include <QProcess>
987 -
988 -+#ifndef Q_MOC_RUN
989 - #include <boost/bind.hpp>
990 - #include <boost/function.hpp>
991 -+#endif
992 -
993 - #include <gpg-error.h>
994 -
995 -
996 ---- a/kleopatra/crypto/createchecksumscontroller.h
997 -+++ b/kleopatra/crypto/createchecksumscontroller.h
998 -@@ -40,7 +40,9 @@
999 - #include <gpgme++/global.h>
1000 - #include <kmime/kmime_header_parsing.h>
1001 -
1002 -+#ifndef Q_MOC_RUN
1003 - #include <boost/shared_ptr.hpp>
1004 -+#endif
1005 -
1006 - #include <vector>
1007 -
1008 -
1009 ---- a/kleopatra/crypto/decryptverifyemailcontroller.cpp
1010 -+++ b/kleopatra/crypto/decryptverifyemailcontroller.cpp
1011 -@@ -58,7 +58,9 @@
1012 - #include <QPointer>
1013 - #include <QTimer>
1014 -
1015 -+#ifndef Q_MOC_RUN
1016 - #include <boost/shared_ptr.hpp>
1017 -+#endif
1018 -
1019 - #include <memory>
1020 - #include <vector>
1021 -
1022 ---- a/kleopatra/crypto/decryptverifyemailcontroller.h
1023 -+++ b/kleopatra/crypto/decryptverifyemailcontroller.h
1024 -@@ -41,7 +41,9 @@
1025 -
1026 - #include <QMetaType>
1027 -
1028 -+#ifndef Q_MOC_RUN
1029 - #include <boost/shared_ptr.hpp>
1030 -+#endif
1031 -
1032 - #include <vector>
1033 -
1034 -
1035 ---- a/kleopatra/crypto/decryptverifyfilescontroller.cpp
1036 -+++ b/kleopatra/crypto/decryptverifyfilescontroller.cpp
1037 -@@ -56,7 +56,9 @@
1038 - #include <QPointer>
1039 - #include <QTimer>
1040 -
1041 -+#ifndef Q_MOC_RUN
1042 - #include <boost/shared_ptr.hpp>
1043 -+#endif
1044 -
1045 - #include <memory>
1046 - #include <vector>
1047 -
1048 ---- a/kleopatra/crypto/decryptverifytask.cpp
1049 -+++ b/kleopatra/crypto/decryptverifytask.cpp
1050 -@@ -75,7 +75,9 @@
1051 - #include <QStringList>
1052 - #include <QTextDocument> // Qt::escape
1053 -
1054 -+#ifndef Q_MOC_RUN
1055 - #include <boost/bind.hpp>
1056 -+#endif
1057 -
1058 - #include <algorithm>
1059 - #include <cassert>
1060 -
1061 ---- a/kleopatra/crypto/decryptverifytask.h
1062 -+++ b/kleopatra/crypto/decryptverifytask.h
1063 -@@ -39,7 +39,9 @@
1064 -
1065 - #include <gpgme++/verificationresult.h>
1066 -
1067 -+#ifndef Q_MOC_RUN
1068 - #include <boost/shared_ptr.hpp>
1069 -+#endif
1070 -
1071 -
1072 - namespace KMime {
1073 -
1074 ---- a/kleopatra/crypto/encryptemailcontroller.cpp
1075 -+++ b/kleopatra/crypto/encryptemailcontroller.cpp
1076 -@@ -58,8 +58,10 @@
1077 - #include <QPointer>
1078 - #include <QTimer>
1079 -
1080 -+#ifndef Q_MOC_RUN
1081 - #include <boost/bind.hpp>
1082 - #include <boost/shared_ptr.hpp>
1083 -+#endif
1084 -
1085 - using namespace Kleo;
1086 - using namespace Kleo::Crypto;
1087 -
1088 ---- a/kleopatra/crypto/encryptemailtask.cpp
1089 -+++ b/kleopatra/crypto/encryptemailtask.cpp
1090 -@@ -52,7 +52,9 @@
1091 - #include <QPointer>
1092 - #include <QTextDocument> // for Qt::escape
1093 -
1094 -+#ifndef Q_MOC_RUN
1095 - #include <boost/bind.hpp>
1096 -+#endif
1097 -
1098 - using namespace Kleo;
1099 - using namespace Kleo::Crypto;
1100 -
1101 ---- a/kleopatra/crypto/encryptemailtask.h
1102 -+++ b/kleopatra/crypto/encryptemailtask.h
1103 -@@ -39,7 +39,9 @@
1104 -
1105 - #include <gpgme++/global.h>
1106 -
1107 -+#ifndef Q_MOC_RUN
1108 - #include <boost/shared_ptr.hpp>
1109 -+#endif
1110 -
1111 - #include <vector>
1112 -
1113 -
1114 ---- a/kleopatra/crypto/gui/decryptverifyfileswizard.cpp
1115 -+++ b/kleopatra/crypto/gui/decryptverifyfileswizard.cpp
1116 -@@ -57,7 +57,9 @@
1117 - #include <QTimer>
1118 - #include <QTreeView>
1119 -
1120 -+#ifndef Q_MOC_RUN
1121 - #include <boost/bind.hpp>
1122 -+#endif
1123 -
1124 - #include <vector>
1125 - #include <cassert>
1126 -
1127 ---- a/kleopatra/crypto/gui/decryptverifyfileswizard.h
1128 -+++ b/kleopatra/crypto/gui/decryptverifyfileswizard.h
1129 -@@ -37,7 +37,9 @@
1130 -
1131 - #include <utils/pimpl_ptr.h>
1132 -
1133 -+#ifndef Q_MOC_RUN
1134 - #include <boost/shared_ptr.hpp>
1135 -+#endif
1136 -
1137 - namespace Kleo {
1138 - namespace Crypto {
1139 -
1140 ---- a/kleopatra/crypto/gui/decryptverifyoperationwidget.cpp
1141 -+++ b/kleopatra/crypto/gui/decryptverifyoperationwidget.cpp
1142 -@@ -45,7 +45,9 @@
1143 - #include <QStackedLayout>
1144 - #include <QComboBox>
1145 -
1146 -+#ifndef Q_MOC_RUN
1147 - #include <boost/shared_ptr.hpp>
1148 -+#endif
1149 -
1150 - using namespace Kleo;
1151 - using namespace Kleo::Crypto::Gui;
1152 -
1153 ---- a/kleopatra/crypto/gui/newresultpage.cpp
1154 -+++ b/kleopatra/crypto/gui/newresultpage.cpp
1155 -@@ -41,7 +41,9 @@
1156 -
1157 - #include <kleo/stl_util.h>
1158 -
1159 -+#ifndef Q_MOC_RUN
1160 - #include <boost/mem_fn.hpp>
1161 -+#endif
1162 -
1163 - #include <KLocalizedString>
1164 -
1165 -
1166 ---- a/kleopatra/crypto/gui/newsignencryptfileswizard.cpp
1167 -+++ b/kleopatra/crypto/gui/newsignencryptfileswizard.cpp
1168 -@@ -73,8 +73,10 @@
1169 -
1170 - #include <gpgme++/key.h>
1171 -
1172 -+#ifndef Q_MOC_RUN
1173 - #include <boost/shared_ptr.hpp>
1174 - #include <boost/bind.hpp>
1175 -+#endif
1176 -
1177 - using namespace GpgME;
1178 - using namespace boost;
1179 -
1180 ---- a/kleopatra/crypto/gui/resolverecipientspage.cpp
1181 -+++ b/kleopatra/crypto/gui/resolverecipientspage.cpp
1182 -@@ -61,8 +61,10 @@
1183 - #include <QStringList>
1184 - #include <QVBoxLayout>
1185 -
1186 -+#ifndef Q_MOC_RUN
1187 - #include <boost/bind.hpp>
1188 - #include <boost/shared_ptr.hpp>
1189 -+#endif
1190 -
1191 - #include <cassert>
1192 -
1193 -
1194 ---- a/kleopatra/crypto/gui/resolverecipientspage.h
1195 -+++ b/kleopatra/crypto/gui/resolverecipientspage.h
1196 -@@ -39,7 +39,9 @@
1197 -
1198 - #include <gpgme++/global.h>
1199 -
1200 -+#ifndef Q_MOC_RUN
1201 - #include <boost/shared_ptr.hpp>
1202 -+#endif
1203 -
1204 - #include <vector>
1205 -
1206 -
1207 ---- a/kleopatra/crypto/gui/resultitemwidget.h
1208 -+++ b/kleopatra/crypto/gui/resultitemwidget.h
1209 -@@ -39,7 +39,9 @@
1210 -
1211 - #include <utils/pimpl_ptr.h>
1212 -
1213 -+#ifndef Q_MOC_RUN
1214 - #include <boost/shared_ptr.hpp>
1215 -+#endif
1216 -
1217 - class QString;
1218 -
1219 -
1220 ---- a/kleopatra/crypto/gui/resultlistwidget.cpp
1221 -+++ b/kleopatra/crypto/gui/resultlistwidget.cpp
1222 -@@ -50,8 +50,10 @@
1223 - #include <QLabel>
1224 - #include <QVBoxLayout>
1225 -
1226 -+#ifndef Q_MOC_RUN
1227 - #include <boost/bind.hpp>
1228 - #include <boost/mem_fn.hpp>
1229 -+#endif
1230 -
1231 - #include <cassert>
1232 -
1233 -
1234 ---- a/kleopatra/crypto/gui/resultlistwidget.h
1235 -+++ b/kleopatra/crypto/gui/resultlistwidget.h
1236 -@@ -39,7 +39,9 @@
1237 -
1238 - #include <utils/pimpl_ptr.h>
1239 -
1240 -+#ifndef Q_MOC_RUN
1241 - #include <boost/shared_ptr.hpp>
1242 -+#endif
1243 -
1244 - class QString;
1245 -
1246 -
1247 ---- a/kleopatra/crypto/gui/resultpage.h
1248 -+++ b/kleopatra/crypto/gui/resultpage.h
1249 -@@ -39,7 +39,9 @@
1250 - #include <utils/pimpl_ptr.h>
1251 -
1252 -
1253 -+#ifndef Q_MOC_RUN
1254 - #include <boost/shared_ptr.hpp>
1255 -+#endif
1256 -
1257 - namespace Kleo {
1258 - namespace Crypto {
1259 -
1260 ---- a/kleopatra/crypto/gui/signencryptemailconflictdialog.cpp
1261 -+++ b/kleopatra/crypto/gui/signencryptemailconflictdialog.cpp
1262 -@@ -68,8 +68,10 @@
1263 - #include <QStyle>
1264 - #include <QPointer>
1265 -
1266 -+#ifndef Q_MOC_RUN
1267 - #include <boost/shared_ptr.hpp>
1268 - #include <boost/bind.hpp>
1269 -+#endif
1270 -
1271 - #include <iterator>
1272 -
1273 -
1274 ---- a/kleopatra/crypto/gui/signencryptwizard.cpp
1275 -+++ b/kleopatra/crypto/gui/signencryptwizard.cpp
1276 -@@ -55,7 +55,9 @@
1277 - #include <QFileInfo>
1278 - #include <QTimer>
1279 -
1280 -+#ifndef Q_MOC_RUN
1281 - #include <boost/bind.hpp>
1282 -+#endif
1283 -
1284 - using namespace Kleo;
1285 - using namespace Kleo::Crypto;
1286 -
1287 ---- a/kleopatra/crypto/gui/signencryptwizard.h
1288 -+++ b/kleopatra/crypto/gui/signencryptwizard.h
1289 -@@ -42,7 +42,9 @@
1290 - #include <gpgme++/global.h>
1291 - #include <kmime/kmime_header_parsing.h>
1292 -
1293 -+#ifndef Q_MOC_RUN
1294 - #include <boost/shared_ptr.hpp>
1295 -+#endif
1296 -
1297 - #include <vector>
1298 -
1299 -
1300 ---- a/kleopatra/crypto/gui/signerresolvepage.h
1301 -+++ b/kleopatra/crypto/gui/signerresolvepage.h
1302 -@@ -40,7 +40,9 @@
1303 - #include <gpgme++/global.h>
1304 - #include <kmime/kmime_header_parsing.h>
1305 -
1306 -+#ifndef Q_MOC_RUN
1307 - #include <boost/shared_ptr.hpp>
1308 -+#endif
1309 -
1310 - #include <vector>
1311 -
1312 -
1313 ---- a/kleopatra/crypto/gui/signingcertificateselectionwidget.cpp
1314 -+++ b/kleopatra/crypto/gui/signingcertificateselectionwidget.cpp
1315 -@@ -45,7 +45,9 @@
1316 - #include <QByteArray>
1317 - #include <QMap>
1318 -
1319 -+#ifndef Q_MOC_RUN
1320 - #include <boost/bind.hpp>
1321 -+#endif
1322 -
1323 - #include <cassert>
1324 -
1325 -
1326 ---- a/kleopatra/crypto/gui/verifychecksumsdialog.cpp
1327 -+++ b/kleopatra/crypto/gui/verifychecksumsdialog.cpp
1328 -@@ -53,7 +53,9 @@
1329 - #include <QPushButton>
1330 - #include <QHeaderView>
1331 -
1332 -+#ifndef Q_MOC_RUN
1333 - #include <boost/static_assert.hpp>
1334 -+#endif
1335 -
1336 - #include <cassert>
1337 -
1338 -
1339 ---- a/kleopatra/crypto/newsignencryptemailcontroller.cpp
1340 -+++ b/kleopatra/crypto/newsignencryptemailcontroller.cpp
1341 -@@ -63,8 +63,10 @@
1342 - #include <QPointer>
1343 - #include <QTimer>
1344 -
1345 -+#ifndef Q_MOC_RUN
1346 - #include <boost/bind.hpp>
1347 - #include <boost/shared_ptr.hpp>
1348 -+#endif
1349 -
1350 - using namespace Kleo;
1351 - using namespace Kleo::Crypto;
1352 -
1353 ---- a/kleopatra/crypto/recipient.h
1354 -+++ b/kleopatra/crypto/recipient.h
1355 -@@ -35,7 +35,9 @@
1356 -
1357 - #include <gpgme++/global.h>
1358 -
1359 -+#ifndef Q_MOC_RUN
1360 - #include <boost/shared_ptr.hpp>
1361 -+#endif
1362 -
1363 - #include <vector>
1364 -
1365 -
1366 ---- a/kleopatra/crypto/sender.h
1367 -+++ b/kleopatra/crypto/sender.h
1368 -@@ -35,7 +35,9 @@
1369 -
1370 - #include <gpgme++/global.h>
1371 -
1372 -+#ifndef Q_MOC_RUN
1373 - #include <boost/shared_ptr.hpp>
1374 -+#endif
1375 -
1376 - #include <vector>
1377 -
1378 -
1379 ---- a/kleopatra/crypto/signemailcontroller.cpp
1380 -+++ b/kleopatra/crypto/signemailcontroller.cpp
1381 -@@ -55,8 +55,10 @@
1382 - #include <QPointer>
1383 - #include <QTimer>
1384 -
1385 -+#ifndef Q_MOC_RUN
1386 - #include <boost/bind.hpp>
1387 - #include <boost/shared_ptr.hpp>
1388 -+#endif
1389 -
1390 - using namespace Kleo;
1391 - using namespace Kleo::Crypto;
1392 -
1393 ---- a/kleopatra/crypto/signemailtask.cpp
1394 -+++ b/kleopatra/crypto/signemailtask.cpp
1395 -@@ -52,8 +52,10 @@
1396 - #include <QPointer>
1397 - #include <QTextDocument> // for Qt::escape
1398 -
1399 -+#ifndef Q_MOC_RUN
1400 - #include <boost/bind.hpp>
1401 - #include <boost/mem_fn.hpp>
1402 -+#endif
1403 -
1404 - using namespace Kleo;
1405 - using namespace Kleo::Crypto;
1406 -
1407 ---- a/kleopatra/crypto/signemailtask.h
1408 -+++ b/kleopatra/crypto/signemailtask.h
1409 -@@ -39,7 +39,9 @@
1410 -
1411 - #include <gpgme++/global.h>
1412 -
1413 -+#ifndef Q_MOC_RUN
1414 - #include <boost/shared_ptr.hpp>
1415 -+#endif
1416 -
1417 - #include <vector>
1418 -
1419 -
1420 ---- a/kleopatra/crypto/signencryptfilescontroller.cpp
1421 -+++ b/kleopatra/crypto/signencryptfilescontroller.cpp
1422 -@@ -58,7 +58,9 @@
1423 - #include <QTimer>
1424 - #include <QFileInfo>
1425 -
1426 -+#ifndef Q_MOC_RUN
1427 - #include <boost/bind.hpp>
1428 -+#endif
1429 -
1430 - using namespace Kleo;
1431 - using namespace Kleo::Crypto;
1432 -
1433 ---- a/kleopatra/crypto/signencryptfilescontroller.h
1434 -+++ b/kleopatra/crypto/signencryptfilescontroller.h
1435 -@@ -40,7 +40,9 @@
1436 - #include <gpgme++/global.h>
1437 - #include <kmime/kmime_header_parsing.h>
1438 -
1439 -+#ifndef Q_MOC_RUN
1440 - #include <boost/shared_ptr.hpp>
1441 -+#endif
1442 -
1443 - #include <vector>
1444 -
1445 -
1446 ---- a/kleopatra/crypto/signencryptfilestask.cpp
1447 -+++ b/kleopatra/crypto/signencryptfilestask.cpp
1448 -@@ -60,7 +60,9 @@
1449 - #include <QPointer>
1450 - #include <QTextDocument> // for Qt::escape
1451 -
1452 -+#ifndef Q_MOC_RUN
1453 - #include <boost/bind.hpp>
1454 -+#endif
1455 -
1456 - using namespace Kleo;
1457 - using namespace Kleo::Crypto;
1458 -
1459 ---- a/kleopatra/crypto/task.cpp
1460 -+++ b/kleopatra/crypto/task.cpp
1461 -@@ -50,7 +50,9 @@
1462 -
1463 - #include <QString>
1464 -
1465 -+#ifndef Q_MOC_RUN
1466 - #include <boost/bind.hpp>
1467 -+#endif
1468 -
1469 - using namespace Kleo;
1470 - using namespace Kleo::Crypto;
1471 -
1472 ---- a/kleopatra/crypto/task.h
1473 -+++ b/kleopatra/crypto/task.h
1474 -@@ -40,7 +40,9 @@
1475 -
1476 - #include <gpgme++/global.h>
1477 -
1478 -+#ifndef Q_MOC_RUN
1479 - #include <boost/shared_ptr.hpp>
1480 -+#endif
1481 -
1482 - class QColor;
1483 - class QIcon;
1484 -
1485 ---- a/kleopatra/crypto/taskcollection.cpp
1486 -+++ b/kleopatra/crypto/taskcollection.cpp
1487 -@@ -36,7 +36,9 @@
1488 -
1489 - #include <crypto/task.h>
1490 -
1491 -+#ifndef Q_MOC_RUN
1492 - #include <boost/bind.hpp>
1493 -+#endif
1494 -
1495 - #include <algorithm>
1496 - #include <map>
1497 -
1498 ---- a/kleopatra/crypto/taskcollection.h
1499 -+++ b/kleopatra/crypto/taskcollection.h
1500 -@@ -39,7 +39,9 @@
1501 -
1502 - #include <utils/pimpl_ptr.h>
1503 -
1504 -+#ifndef Q_MOC_RUN
1505 - #include <boost/shared_ptr.hpp>
1506 -+#endif
1507 -
1508 - #include <vector>
1509 -
1510 -
1511 ---- a/kleopatra/crypto/verifychecksumscontroller.cpp
1512 -+++ b/kleopatra/crypto/verifychecksumscontroller.cpp
1513 -@@ -57,8 +57,10 @@
1514 - #include <QDir>
1515 - #include <QProcess>
1516 -
1517 -+#ifndef Q_MOC_RUN
1518 - #include <boost/bind.hpp>
1519 - #include <boost/function.hpp>
1520 -+#endif
1521 -
1522 - #include <gpg-error.h>
1523 -
1524 -
1525 ---- a/kleopatra/crypto/verifychecksumscontroller.h
1526 -+++ b/kleopatra/crypto/verifychecksumscontroller.h
1527 -@@ -42,7 +42,9 @@
1528 - #include <gpgme++/global.h>
1529 - #include <kmime/kmime_header_parsing.h>
1530 -
1531 -+#ifndef Q_MOC_RUN
1532 - #include <boost/shared_ptr.hpp>
1533 -+#endif
1534 -
1535 - #include <vector>
1536 -
1537 -
1538 ---- a/kleopatra/dialogs/certificatedetailsdialog.cpp
1539 -+++ b/kleopatra/dialogs/certificatedetailsdialog.cpp
1540 -@@ -66,7 +66,9 @@
1541 - #include <QPointer>
1542 - #include <QHeaderView>
1543 -
1544 -+#ifndef Q_MOC_RUN
1545 - #include <boost/mem_fn.hpp>
1546 -+#endif
1547 -
1548 - #include <algorithm>
1549 - #include <cassert>
1550 -
1551 ---- a/kleopatra/dialogs/certificateselectiondialog.cpp
1552 -+++ b/kleopatra/dialogs/certificateselectiondialog.cpp
1553 -@@ -59,7 +59,9 @@
1554 - #include <QPointer>
1555 - #include <QVBoxLayout>
1556 -
1557 -+#ifndef Q_MOC_RUN
1558 - #include <boost/bind.hpp>
1559 -+#endif
1560 -
1561 - #include <algorithm>
1562 -
1563 -
1564 ---- a/kleopatra/dialogs/certifycertificatedialog.cpp
1565 -+++ b/kleopatra/dialogs/certifycertificatedialog.cpp
1566 -@@ -54,7 +54,9 @@
1567 -
1568 - #include <QTextDocument> // Qt::escape
1569 -
1570 -+#ifndef Q_MOC_RUN
1571 - #include <boost/bind.hpp>
1572 -+#endif
1573 -
1574 - #include <gpg-error.h>
1575 -
1576 -
1577 ---- a/kleopatra/dialogs/deletecertificatesdialog.cpp
1578 -+++ b/kleopatra/dialogs/deletecertificatesdialog.cpp
1579 -@@ -56,7 +56,9 @@
1580 -
1581 - #include <gpgme++/key.h>
1582 -
1583 -+#ifndef Q_MOC_RUN
1584 - #include <boost/mem_fn.hpp>
1585 -+#endif
1586 -
1587 - #include <cassert>
1588 -
1589 -
1590 ---- a/kleopatra/dialogs/lookupcertificatesdialog.cpp
1591 -+++ b/kleopatra/dialogs/lookupcertificatesdialog.cpp
1592 -@@ -50,7 +50,9 @@
1593 - #include <QPushButton>
1594 - #include <QHeaderView>
1595 -
1596 -+#ifndef Q_MOC_RUN
1597 - #include <boost/bind.hpp>
1598 -+#endif
1599 -
1600 - #include <cassert>
1601 -
1602 -
1603 ---- a/kleopatra/dialogs/selftestdialog.cpp
1604 -+++ b/kleopatra/dialogs/selftestdialog.cpp
1605 -@@ -44,7 +44,9 @@
1606 - #include <QHeaderView>
1607 - #include <QSortFilterProxyModel>
1608 -
1609 -+#ifndef Q_MOC_RUN
1610 - #include <boost/shared_ptr.hpp>
1611 -+#endif
1612 -
1613 - #include <cassert>
1614 - #include <vector>
1615 -
1616 ---- a/kleopatra/dialogs/setinitialpindialog.cpp
1617 -+++ b/kleopatra/dialogs/setinitialpindialog.cpp
1618 -@@ -43,7 +43,9 @@
1619 -
1620 - #include <gpgme++/error.h>
1621 -
1622 -+#ifndef Q_MOC_RUN
1623 - #include <boost/static_assert.hpp>
1624 -+#endif
1625 -
1626 - #include <cassert>
1627 -
1628 -
1629 ---- a/kleopatra/kleopatraapplication.cpp
1630 -+++ b/kleopatra/kleopatraapplication.cpp
1631 -@@ -69,10 +69,12 @@
1632 - #include <QDir>
1633 - #include <QPointer>
1634 -
1635 -+#ifndef Q_MOC_RUN
1636 - #include <boost/shared_ptr.hpp>
1637 - #include <boost/range.hpp>
1638 - #include <boost/bind.hpp>
1639 - #include <boost/mem_fn.hpp>
1640 -+#endif
1641 -
1642 - #include <memory>
1643 -
1644 -
1645 ---- a/kleopatra/libkleopatraclient/core/command.cpp
1646 -+++ b/kleopatra/libkleopatraclient/core/command.cpp
1647 -@@ -44,8 +44,10 @@
1648 - #include <assuan.h>
1649 - #include <gpg-error.h>
1650 -
1651 -+#ifndef Q_MOC_RUN
1652 - #include <boost/shared_ptr.hpp>
1653 - #include <boost/type_traits/remove_pointer.hpp>
1654 -+#endif
1655 -
1656 - #include <algorithm>
1657 - #include <string>
1658 -
1659 ---- a/kleopatra/main.cpp
1660 -+++ b/kleopatra/main.cpp
1661 -@@ -89,7 +89,9 @@
1662 - #include <gpgme++/global.h>
1663 - #include <gpgme++/error.h>
1664 -
1665 -+#ifndef Q_MOC_RUN
1666 - #include <boost/shared_ptr.hpp>
1667 -+#endif
1668 -
1669 - #include <cassert>
1670 -
1671 -
1672 ---- a/kleopatra/mainwindow_desktop.cpp
1673 -+++ b/kleopatra/mainwindow_desktop.cpp
1674 -@@ -89,8 +89,10 @@
1675 - #include <kleo/cryptoconfig.h>
1676 - #include <kleo/stl_util.h>
1677 -
1678 -+#ifndef Q_MOC_RUN
1679 - #include <boost/bind.hpp>
1680 - #include <boost/shared_ptr.hpp>
1681 -+#endif
1682 -
1683 - #include <vector>
1684 -
1685 -
1686 ---- a/kleopatra/mainwindow_mobile.cpp
1687 -+++ b/kleopatra/mainwindow_mobile.cpp
1688 -@@ -93,8 +93,10 @@
1689 - #include <ui/cryptoconfigdialog.h>
1690 - #include <kleo/cryptoconfig.h>
1691 -
1692 -+#ifndef Q_MOC_RUN
1693 - #include <boost/bind.hpp>
1694 - #include <boost/shared_ptr.hpp>
1695 -+#endif
1696 -
1697 - #include <vector>
1698 -
1699 -
1700 ---- a/kleopatra/models/keycache.cpp
1701 -+++ b/kleopatra/models/keycache.cpp
1702 -@@ -63,11 +63,13 @@
1703 - #include <QPointer>
1704 - #include <QTimer>
1705 -
1706 -+#ifndef Q_MOC_RUN
1707 - #include <boost/bind.hpp>
1708 - #include <boost/mem_fn.hpp>
1709 - #include <boost/range.hpp>
1710 - #include <boost/weak_ptr.hpp>
1711 - #include <boost/iterator/filter_iterator.hpp>
1712 -+#endif
1713 -
1714 - #include <utility>
1715 - #include <algorithm>
1716 -
1717 ---- a/kleopatra/models/keycache.h
1718 -+++ b/kleopatra/models/keycache.h
1719 -@@ -39,7 +39,9 @@
1720 -
1721 - #include <gpgme++/global.h>
1722 -
1723 -+#ifndef Q_MOC_RUN
1724 - #include <boost/shared_ptr.hpp>
1725 -+#endif
1726 -
1727 - #include <string>
1728 - #include <vector>
1729 -
1730 ---- a/kleopatra/models/keylistsortfilterproxymodel.cpp
1731 -+++ b/kleopatra/models/keylistsortfilterproxymodel.cpp
1732 -@@ -42,7 +42,9 @@
1733 -
1734 - #include <kleo/stl_util.h>
1735 -
1736 -+#ifndef Q_MOC_RUN
1737 - #include <boost/bind.hpp>
1738 -+#endif
1739 -
1740 - #include <cassert>
1741 -
1742 -
1743 ---- a/kleopatra/models/keylistsortfilterproxymodel.h
1744 -+++ b/kleopatra/models/keylistsortfilterproxymodel.h
1745 -@@ -37,7 +37,9 @@
1746 - #include <models/keylistmodelinterface.h>
1747 -
1748 - #include <utils/pimpl_ptr.h>
1749 -+#ifndef Q_MOC_RUN
1750 - #include <boost/shared_ptr.hpp>
1751 -+#endif
1752 -
1753 - namespace GpgME {
1754 - class Key;
1755 -
1756 ---- a/kleopatra/models/predicates.h
1757 -+++ b/kleopatra/models/predicates.h
1758 -@@ -39,7 +39,9 @@
1759 -
1760 - #include <gpgme++/key.h>
1761 -
1762 -+#ifndef Q_MOC_RUN
1763 - #include <boost/bind.hpp>
1764 -+#endif
1765 -
1766 - #include <cstring>
1767 - #include <algorithm>
1768 -
1769 ---- a/kleopatra/models/subkeylistmodel.cpp
1770 -+++ b/kleopatra/models/subkeylistmodel.cpp
1771 -@@ -43,7 +43,9 @@
1772 - #include <QVariant>
1773 - #include <QDate>
1774 -
1775 -+#ifndef Q_MOC_RUN
1776 - #include <boost/bind.hpp>
1777 -+#endif
1778 -
1779 - #include <algorithm>
1780 - #include <iterator>
1781 -
1782 ---- a/kleopatra/models/useridlistmodel.cpp
1783 -+++ b/kleopatra/models/useridlistmodel.cpp
1784 -@@ -43,7 +43,9 @@
1785 - #include <QVariant>
1786 - #include <QDate>
1787 -
1788 -+#ifndef Q_MOC_RUN
1789 - #include <boost/bind.hpp>
1790 -+#endif
1791 -
1792 - #include <algorithm>
1793 - #include <iterator>
1794 -
1795 ---- a/kleopatra/newcertificatewizard/newcertificatewizard.cpp
1796 -+++ b/kleopatra/newcertificatewizard/newcertificatewizard.cpp
1797 -@@ -78,7 +78,9 @@
1798 - #include <QUrl>
1799 - #include <QDesktopServices>
1800 -
1801 -+#ifndef Q_MOC_RUN
1802 - #include <boost/range.hpp>
1803 -+#endif
1804 -
1805 - #include <algorithm>
1806 -
1807 -
1808 ---- a/kleopatra/selftest/enginecheck.cpp
1809 -+++ b/kleopatra/selftest/enginecheck.cpp
1810 -@@ -48,8 +48,10 @@
1811 - #include <QFile>
1812 - #include <QRegExp>
1813 -
1814 -+#ifndef Q_MOC_RUN
1815 - #include <boost/shared_ptr.hpp>
1816 - #include <boost/range.hpp>
1817 -+#endif
1818 -
1819 - #include <algorithm>
1820 - #include <cassert>
1821 -
1822 ---- a/kleopatra/selftest/gpgagentcheck.cpp
1823 -+++ b/kleopatra/selftest/gpgagentcheck.cpp
1824 -@@ -46,7 +46,9 @@
1825 -
1826 - #include <KLocalizedString>
1827 -
1828 -+#ifndef Q_MOC_RUN
1829 - #include <boost/shared_ptr.hpp>
1830 -+#endif
1831 -
1832 - #include <cassert>
1833 -
1834 -
1835 ---- a/kleopatra/selftest/gpgconfcheck.cpp
1836 -+++ b/kleopatra/selftest/gpgconfcheck.cpp
1837 -@@ -45,7 +45,9 @@
1838 - #include <QProcess>
1839 - #include <QDir>
1840 -
1841 -+#ifndef Q_MOC_RUN
1842 - #include <boost/shared_ptr.hpp>
1843 -+#endif
1844 -
1845 - #include <cassert>
1846 -
1847 -
1848 ---- a/kleopatra/selftest/libkleopatrarccheck.cpp
1849 -+++ b/kleopatra/selftest/libkleopatrarccheck.cpp
1850 -@@ -43,7 +43,9 @@
1851 - #include <KLocalizedString>
1852 -
1853 -
1854 -+#ifndef Q_MOC_RUN
1855 - #include <boost/shared_ptr.hpp>
1856 -+#endif
1857 -
1858 - #include <cassert>
1859 -
1860 -
1861 ---- a/kleopatra/selftest/registrycheck.cpp
1862 -+++ b/kleopatra/selftest/registrycheck.cpp
1863 -@@ -41,7 +41,9 @@
1864 -
1865 - #include <QSettings>
1866 -
1867 -+#ifndef Q_MOC_RUN
1868 - #include <boost/shared_ptr.hpp>
1869 -+#endif
1870 -
1871 - #include <cassert>
1872 -
1873 -
1874 ---- a/kleopatra/selftest/uiservercheck.cpp
1875 -+++ b/kleopatra/selftest/uiservercheck.cpp
1876 -@@ -45,7 +45,9 @@
1877 -
1878 - #include <KLocalizedString>
1879 -
1880 -+#ifndef Q_MOC_RUN
1881 - #include <boost/shared_ptr.hpp>
1882 -+#endif
1883 -
1884 - #include <cassert>
1885 -
1886 -
1887 ---- a/kleopatra/smartcard/readerstatus.cpp
1888 -+++ b/kleopatra/smartcard/readerstatus.cpp
1889 -@@ -58,12 +58,14 @@
1890 - #include <QThread>
1891 - #include <QPointer>
1892 -
1893 -+#ifndef Q_MOC_RUN
1894 - #include <boost/algorithm/string/split.hpp>
1895 - #include <boost/algorithm/string/classification.hpp>
1896 - #include <boost/algorithm/string/case_conv.hpp>
1897 - #include <boost/static_assert.hpp>
1898 - #include <boost/range.hpp>
1899 - #include <boost/bind.hpp>
1900 -+#endif
1901 -
1902 - #include <vector>
1903 - #include <set>
1904 -
1905 ---- a/kleopatra/systrayicon.cpp
1906 -+++ b/kleopatra/systrayicon.cpp
1907 -@@ -64,8 +64,10 @@
1908 - #include <QClipboard>
1909 - #include <QPointer>
1910 -
1911 -+#ifndef Q_MOC_RUN
1912 - #include <boost/shared_ptr.hpp>
1913 - #include <boost/bind.hpp>
1914 -+#endif
1915 -
1916 - #include <cassert>
1917 -
1918 -
1919 ---- a/kleopatra/uiserver/assuancommand.h
1920 -+++ b/kleopatra/uiserver/assuancommand.h
1921 -@@ -47,8 +47,10 @@
1922 -
1923 - #include <qwindowdefs.h> // for WId
1924 -
1925 -+#ifndef Q_MOC_RUN
1926 - #include <boost/shared_ptr.hpp>
1927 - #include <boost/enable_shared_from_this.hpp>
1928 -+#endif
1929 -
1930 - #include <string>
1931 - #include <map>
1932 -
1933 ---- a/kleopatra/uiserver/assuanserverconnection.h
1934 -+++ b/kleopatra/uiserver/assuanserverconnection.h
1935 -@@ -39,7 +39,9 @@
1936 -
1937 - #include <utils/pimpl_ptr.h>
1938 -
1939 -+#ifndef Q_MOC_RUN
1940 - #include <boost/shared_ptr.hpp>
1941 -+#endif
1942 -
1943 - #include <string>
1944 - #include <vector>
1945 -
1946 ---- a/kleopatra/uiserver/selectcertificatecommand.cpp
1947 -+++ b/kleopatra/uiserver/selectcertificatecommand.cpp
1948 -@@ -38,7 +38,9 @@
1949 -
1950 - #include <models/keycache.h>
1951 -
1952 -+#ifndef Q_MOC_RUN
1953 - #include <boost/mem_fn.hpp>
1954 -+#endif
1955 -
1956 - #include <kleo/stl_util.h>
1957 - #include <kleo/exception.h>
1958 -
1959 ---- a/kleopatra/uiserver/sessiondata.cpp
1960 -+++ b/kleopatra/uiserver/sessiondata.cpp
1961 -@@ -38,7 +38,9 @@
1962 -
1963 - #include <QMutex>
1964 -
1965 -+#ifndef Q_MOC_RUN
1966 - #include <boost/bind.hpp>
1967 -+#endif
1968 -
1969 - using namespace Kleo;
1970 - using namespace boost;
1971 -
1972 ---- a/kleopatra/uiserver/sessiondata.h
1973 -+++ b/kleopatra/uiserver/sessiondata.h
1974 -@@ -39,7 +39,9 @@
1975 -
1976 - #include <QTimer>
1977 -
1978 -+#ifndef Q_MOC_RUN
1979 - #include <boost/shared_ptr.hpp>
1980 -+#endif
1981 -
1982 - #include <map>
1983 -
1984 -
1985 ---- a/kleopatra/uiserver/uiserver.cpp
1986 -+++ b/kleopatra/uiserver/uiserver.cpp
1987 -@@ -52,8 +52,10 @@
1988 - #include <QTimer>
1989 - #include <QFile>
1990 -
1991 -+#ifndef Q_MOC_RUN
1992 - #include <boost/range/empty.hpp>
1993 - #include <boost/bind.hpp>
1994 -+#endif
1995 -
1996 - #include <algorithm>
1997 - #include <cassert>
1998 -
1999 ---- a/kleopatra/uiserver/uiserver.h
2000 -+++ b/kleopatra/uiserver/uiserver.h
2001 -@@ -37,7 +37,9 @@
2002 -
2003 - #include <utils/pimpl_ptr.h>
2004 -
2005 -+#ifndef Q_MOC_RUN
2006 - #include <boost/shared_ptr.hpp>
2007 -+#endif
2008 -
2009 - #include <cstdio>
2010 -
2011 -
2012 ---- a/kleopatra/uiserver/uiserver_p.h
2013 -+++ b/kleopatra/uiserver/uiserver_p.h
2014 -@@ -44,7 +44,9 @@
2015 -
2016 - #include <kleo-assuan.h>
2017 -
2018 -+#ifndef Q_MOC_RUN
2019 - #include <boost/bind.hpp>
2020 -+#endif
2021 -
2022 - #include <algorithm>
2023 - #include <vector>
2024 -
2025 ---- a/kleopatra/utils/archivedefinition.cpp
2026 -+++ b/kleopatra/utils/archivedefinition.cpp
2027 -@@ -55,7 +55,9 @@
2028 - #include <QMutex>
2029 - #include <QCoreApplication>
2030 -
2031 -+#ifndef Q_MOC_RUN
2032 - #include <boost/shared_ptr.hpp>
2033 -+#endif
2034 -
2035 - using namespace GpgME;
2036 - using namespace Kleo;
2037 -
2038 ---- a/kleopatra/utils/cached.h
2039 -+++ b/kleopatra/utils/cached.h
2040 -@@ -33,7 +33,9 @@
2041 - #ifndef __KLEOPATRA_UTILS_CACHED_H__
2042 - #define __KLEOPATRA_UTILS_CACHED_H__
2043 -
2044 -+#ifndef Q_MOC_RUN
2045 - #include <boost/call_traits.hpp>
2046 -+#endif
2047 -
2048 - namespace Kleo {
2049 -
2050 -
2051 ---- a/kleopatra/utils/classify.cpp
2052 -+++ b/kleopatra/utils/classify.cpp
2053 -@@ -43,7 +43,9 @@
2054 - #include <QtAlgorithms>
2055 - #include <QByteArrayMatcher>
2056 -
2057 -+#ifndef Q_MOC_RUN
2058 - #include <boost/range.hpp>
2059 -+#endif
2060 -
2061 - #ifdef __GLIBCXX__
2062 - # include <ext/algorithm>
2063 -
2064 ---- a/kleopatra/utils/detail_p.h
2065 -+++ b/kleopatra/utils/detail_p.h
2066 -@@ -35,7 +35,9 @@
2067 -
2068 - #include <kleo-assuan.h>
2069 -
2070 -+#ifndef Q_MOC_RUN
2071 - #include <boost/shared_ptr.hpp>
2072 -+#endif
2073 -
2074 - #include <QByteArray>
2075 -
2076 -
2077 ---- a/kleopatra/utils/filesystemwatcher.cpp
2078 -+++ b/kleopatra/utils/filesystemwatcher.cpp
2079 -@@ -44,7 +44,9 @@
2080 -
2081 - #include <kleo/stl_util.h>
2082 -
2083 -+#ifndef Q_MOC_RUN
2084 - #include <boost/bind.hpp>
2085 -+#endif
2086 -
2087 - #include <set>
2088 - #include <cassert>
2089 -
2090 ---- a/kleopatra/utils/input.h
2091 -+++ b/kleopatra/utils/input.h
2092 -@@ -35,7 +35,9 @@
2093 -
2094 - #include <kleo-assuan.h> // for assuan_fd_t
2095 -
2096 -+#ifndef Q_MOC_RUN
2097 - #include <boost/shared_ptr.hpp>
2098 -+#endif
2099 -
2100 - class QIODevice;
2101 - class QString;
2102 -
2103 ---- a/kleopatra/utils/iodevicelogger.h
2104 -+++ b/kleopatra/utils/iodevicelogger.h
2105 -@@ -37,7 +37,9 @@
2106 -
2107 - #include <utils/pimpl_ptr.h>
2108 -
2109 -+#ifndef Q_MOC_RUN
2110 - #include <boost/shared_ptr.hpp>
2111 -+#endif
2112 -
2113 - namespace Kleo {
2114 -
2115 -
2116 ---- a/kleopatra/utils/kleo_assert.h
2117 -+++ b/kleopatra/utils/kleo_assert.h
2118 -@@ -35,7 +35,9 @@
2119 -
2120 - #include <kleo/exception.h>
2121 -
2122 -+#ifndef Q_MOC_RUN
2123 - #include <boost/preprocessor/stringize.hpp>
2124 -+#endif
2125 -
2126 - #include <assert.h>
2127 -
2128 -
2129 ---- a/kleopatra/utils/log.cpp
2130 -+++ b/kleopatra/utils/log.cpp
2131 -@@ -45,7 +45,9 @@
2132 - #include <QFile>
2133 - #include <QString>
2134 -
2135 -+#ifndef Q_MOC_RUN
2136 - #include <boost/weak_ptr.hpp>
2137 -+#endif
2138 - #include <cassert>
2139 - #include <cstdio>
2140 -
2141 -
2142 ---- a/kleopatra/utils/log.h
2143 -+++ b/kleopatra/utils/log.h
2144 -@@ -36,7 +36,9 @@
2145 - #include <utils/pimpl_ptr.h>
2146 -
2147 -
2148 -+#ifndef Q_MOC_RUN
2149 - #include <boost/shared_ptr.hpp>
2150 -+#endif
2151 -
2152 - #include <cstdio>
2153 -
2154 -
2155 ---- a/kleopatra/utils/multivalidator.cpp
2156 -+++ b/kleopatra/utils/multivalidator.cpp
2157 -@@ -36,8 +36,10 @@
2158 -
2159 - #include <kleo/stl_util.h>
2160 -
2161 -+#ifndef Q_MOC_RUN
2162 - #include <boost/lambda/lambda.hpp>
2163 - #include <boost/lambda/bind.hpp>
2164 -+#endif
2165 -
2166 - #include <vector>
2167 - #include <iterator>
2168 -
2169 ---- a/kleopatra/utils/output.h
2170 -+++ b/kleopatra/utils/output.h
2171 -@@ -37,7 +37,9 @@
2172 -
2173 - #include <utils/pimpl_ptr.h>
2174 -
2175 -+#ifndef Q_MOC_RUN
2176 - #include <boost/shared_ptr.hpp>
2177 -+#endif
2178 -
2179 - class QIODevice;
2180 - class QString;
2181 -
2182 ---- a/kleopatra/utils/path-helper.cpp
2183 -+++ b/kleopatra/utils/path-helper.cpp
2184 -@@ -46,7 +46,9 @@
2185 - #include <QFileInfo>
2186 - #include <QDir>
2187 -
2188 -+#ifndef Q_MOC_RUN
2189 - #include <boost/bind.hpp>
2190 -+#endif
2191 -
2192 - #include <algorithm>
2193 -
2194 -
2195 ---- a/kleopatra/utils/types.cpp
2196 -+++ b/kleopatra/utils/types.cpp
2197 -@@ -38,8 +38,10 @@
2198 - #include <QWidget>
2199 - #include <QVector>
2200 -
2201 -+#ifndef Q_MOC_RUN
2202 - #include <boost/shared_ptr.hpp>
2203 - #include <boost/weak_ptr.hpp>
2204 -+#endif
2205 -
2206 - #ifdef Q_OS_WIN
2207 - #include <windows.h>
2208 -
2209 ---- a/kleopatra/view/keylistcontroller.cpp
2210 -+++ b/kleopatra/view/keylistcontroller.cpp
2211 -@@ -83,7 +83,9 @@
2212 - #include <QItemSelectionModel>
2213 - #include <QAction>
2214 -
2215 -+#ifndef Q_MOC_RUN
2216 - #include <boost/bind.hpp>
2217 -+#endif
2218 -
2219 - #include <algorithm>
2220 - #include <cassert>
2221 -
2222 ---- a/kleopatra/view/keytreeview.h
2223 -+++ b/kleopatra/view/keytreeview.h
2224 -@@ -39,7 +39,9 @@
2225 -
2226 - #include <gpgme++/key.h>
2227 -
2228 -+#ifndef Q_MOC_RUN
2229 - #include <boost/shared_ptr.hpp>
2230 -+#endif
2231 - #include <vector>
2232 -
2233 - class QTreeView;
2234 -
2235 ---- a/kleopatra/view/searchbar.h
2236 -+++ b/kleopatra/view/searchbar.h
2237 -@@ -37,7 +37,9 @@
2238 -
2239 - #include <utils/pimpl_ptr.h>
2240 -
2241 -+#ifndef Q_MOC_RUN
2242 - #include <boost/shared_ptr.hpp>
2243 -+#endif
2244 -
2245 - class KLineEdit;
2246 -
2247 -
2248 ---- a/kleopatra/view/tabwidget.h
2249 -+++ b/kleopatra/view/tabwidget.h
2250 -@@ -39,7 +39,9 @@
2251 -
2252 - #include <utils/pimpl_ptr.h>
2253 -
2254 -+#ifndef Q_MOC_RUN
2255 - #include <boost/shared_ptr.hpp>
2256 -+#endif
2257 -
2258 - class QAbstractItemView;
2259 -
2260 -
2261 ---- a/libkleo/backends/qgpgme/qgpgmedecryptjob.cpp
2262 -+++ b/libkleo/backends/qgpgme/qgpgmedecryptjob.cpp
2263 -@@ -40,7 +40,9 @@
2264 -
2265 - #include <QBuffer>
2266 -
2267 -+#ifndef Q_MOC_RUN
2268 - #include <boost/weak_ptr.hpp>
2269 -+#endif
2270 -
2271 - #include <cassert>
2272 -
2273 -
2274 ---- a/libkleo/backends/qgpgme/qgpgmedecryptverifyjob.cpp
2275 -+++ b/libkleo/backends/qgpgme/qgpgmedecryptverifyjob.cpp
2276 -@@ -43,7 +43,9 @@
2277 -
2278 - #include <QBuffer>
2279 -
2280 -+#ifndef Q_MOC_RUN
2281 - #include <boost/weak_ptr.hpp>
2282 -+#endif
2283 -
2284 - #include <cassert>
2285 -
2286 -
2287 ---- a/libkleo/backends/qgpgme/qgpgmedownloadjob.cpp
2288 -+++ b/libkleo/backends/qgpgme/qgpgmedownloadjob.cpp
2289 -@@ -39,7 +39,9 @@
2290 -
2291 - #include <QStringList>
2292 -
2293 -+#ifndef Q_MOC_RUN
2294 - #include <boost/weak_ptr.hpp>
2295 -+#endif
2296 -
2297 - #include <cassert>
2298 -
2299 -
2300 ---- a/libkleo/backends/qgpgme/qgpgmeencryptjob.cpp
2301 -+++ b/libkleo/backends/qgpgme/qgpgmeencryptjob.cpp
2302 -@@ -42,7 +42,9 @@
2303 -
2304 - #include <QBuffer>
2305 -
2306 -+#ifndef Q_MOC_RUN
2307 - #include <boost/weak_ptr.hpp>
2308 -+#endif
2309 -
2310 - #include <cassert>
2311 -
2312 -
2313 ---- a/libkleo/backends/qgpgme/qgpgmenewcryptoconfig.cpp
2314 -+++ b/libkleo/backends/qgpgme/qgpgmenewcryptoconfig.cpp
2315 -@@ -41,9 +41,11 @@
2316 - #include <gpgme++/global.h>
2317 - #include <gpgme++/error.h>
2318 -
2319 -+#ifndef Q_MOC_RUN
2320 - #include <boost/foreach.hpp>
2321 - #include <boost/bind.hpp>
2322 - #include <boost/mem_fn.hpp>
2323 -+#endif
2324 -
2325 - #include <sstream>
2326 - #include <string>
2327 -
2328 ---- a/libkleo/backends/qgpgme/qgpgmenewcryptoconfig.h
2329 -+++ b/libkleo/backends/qgpgme/qgpgmenewcryptoconfig.h
2330 -@@ -44,9 +44,11 @@
2331 -
2332 - #include <gpgme++/configuration.h>
2333 -
2334 -+#ifndef Q_MOC_RUN
2335 - #include <boost/shared_ptr.hpp>
2336 - #include <boost/weak_ptr.hpp>
2337 - #include <boost/enable_shared_from_this.hpp>
2338 -+#endif
2339 -
2340 - #include <vector>
2341 - #include <utility>
2342 -
2343 ---- a/libkleo/backends/qgpgme/qgpgmeprogresstokenmapper.cpp
2344 -+++ b/libkleo/backends/qgpgme/qgpgmeprogresstokenmapper.cpp
2345 -@@ -37,7 +37,9 @@
2346 -
2347 - #include <QString>
2348 -
2349 -+#ifndef Q_MOC_RUN
2350 - #include <boost/range.hpp>
2351 -+#endif
2352 -
2353 - #include <cassert>
2354 -
2355 -
2356 ---- a/libkleo/backends/qgpgme/qgpgmesignencryptjob.cpp
2357 -+++ b/libkleo/backends/qgpgme/qgpgmesignencryptjob.cpp
2358 -@@ -45,7 +45,9 @@
2359 -
2360 - #include <QBuffer>
2361 -
2362 -+#ifndef Q_MOC_RUN
2363 - #include <boost/weak_ptr.hpp>
2364 -+#endif
2365 -
2366 - #include <cassert>
2367 -
2368 -
2369 ---- a/libkleo/backends/qgpgme/qgpgmesignjob.cpp
2370 -+++ b/libkleo/backends/qgpgme/qgpgmesignjob.cpp
2371 -@@ -42,7 +42,9 @@
2372 -
2373 - #include <QBuffer>
2374 -
2375 -+#ifndef Q_MOC_RUN
2376 - #include <boost/weak_ptr.hpp>
2377 -+#endif
2378 -
2379 - #include <cassert>
2380 -
2381 -
2382 ---- a/libkleo/backends/qgpgme/qgpgmeverifydetachedjob.cpp
2383 -+++ b/libkleo/backends/qgpgme/qgpgmeverifydetachedjob.cpp
2384 -@@ -42,7 +42,9 @@
2385 -
2386 - #include <cassert>
2387 -
2388 -+#ifndef Q_MOC_RUN
2389 - #include <boost/weak_ptr.hpp>
2390 -+#endif
2391 -
2392 - using namespace Kleo;
2393 - using namespace GpgME;
2394 -
2395 ---- a/libkleo/backends/qgpgme/qgpgmeverifyopaquejob.cpp
2396 -+++ b/libkleo/backends/qgpgme/qgpgmeverifyopaquejob.cpp
2397 -@@ -40,7 +40,9 @@
2398 -
2399 - #include <QBuffer>
2400 -
2401 -+#ifndef Q_MOC_RUN
2402 - #include <boost/weak_ptr.hpp>
2403 -+#endif
2404 -
2405 - #include <cassert>
2406 -
2407 -
2408 ---- a/libkleo/backends/qgpgme/threadedjobmixin.cpp
2409 -+++ b/libkleo/backends/qgpgme/threadedjobmixin.cpp
2410 -@@ -40,7 +40,9 @@
2411 - #include <QStringList>
2412 - #include <QByteArray>
2413 -
2414 -+#ifndef Q_MOC_RUN
2415 - #include <boost/mem_fn.hpp>
2416 -+#endif
2417 -
2418 - #include <algorithm>
2419 - #include <iterator>
2420 -
2421 ---- a/libkleo/backends/qgpgme/threadedjobmixin.h
2422 -+++ b/libkleo/backends/qgpgme/threadedjobmixin.h
2423 -@@ -44,6 +44,7 @@
2424 - #include <gpgme++/context.h>
2425 - #include <gpgme++/interfaces/progressprovider.h>
2426 -
2427 -+#ifndef Q_MOC_RUN
2428 - #include <boost/shared_ptr.hpp>
2429 - #include <boost/weak_ptr.hpp>
2430 - #include <boost/bind.hpp>
2431 -@@ -51,6 +52,7 @@
2432 - #include <boost/tuple/tuple.hpp>
2433 - #include <boost/utility/enable_if.hpp>
2434 - #include <boost/type_traits/is_same.hpp>
2435 -+#endif
2436 -
2437 - #include <cassert>
2438 -
2439 -
2440 ---- a/libkleo/kleo/checksumdefinition.cpp
2441 -+++ b/libkleo/kleo/checksumdefinition.cpp
2442 -@@ -51,7 +51,9 @@
2443 - #include <QMutex>
2444 - #include <QCoreApplication>
2445 -
2446 -+#ifndef Q_MOC_RUN
2447 - #include <boost/shared_ptr.hpp>
2448 -+#endif
2449 -
2450 - #ifdef stdin
2451 - # undef stdin // pah..
2452 -
2453 ---- a/libkleo/kleo/decryptjob.h
2454 -+++ b/libkleo/kleo/decryptjob.h
2455 -@@ -35,7 +35,9 @@
2456 -
2457 - #include "job.h"
2458 -
2459 -+#ifndef Q_MOC_RUN
2460 - #include <boost/shared_ptr.hpp>
2461 -+#endif
2462 -
2463 - class QByteArray;
2464 - class QIODevice;
2465 -
2466 ---- a/libkleo/kleo/decryptverifyjob.h
2467 -+++ b/libkleo/kleo/decryptverifyjob.h
2468 -@@ -35,7 +35,9 @@
2469 -
2470 - #include "job.h"
2471 -
2472 -+#ifndef Q_MOC_RUN
2473 - #include <boost/shared_ptr.hpp>
2474 -+#endif
2475 -
2476 - class QByteArray;
2477 - class QIODevice;
2478 -
2479 ---- a/libkleo/kleo/encryptjob.h
2480 -+++ b/libkleo/kleo/encryptjob.h
2481 -@@ -35,7 +35,9 @@
2482 -
2483 - #include "job.h"
2484 -
2485 -+#ifndef Q_MOC_RUN
2486 - #include <boost/shared_ptr.hpp>
2487 -+#endif
2488 -
2489 - #include <vector>
2490 -
2491 -
2492 ---- a/libkleo/kleo/kconfigbasedkeyfilter.cpp
2493 -+++ b/libkleo/kleo/kconfigbasedkeyfilter.cpp
2494 -@@ -37,7 +37,9 @@
2495 - #include <kconfiggroup.h>
2496 - #include <klocale.h>
2497 -
2498 -+#ifndef Q_MOC_RUN
2499 - #include <boost/mem_fn.hpp>
2500 -+#endif
2501 - #include <algorithm>
2502 -
2503 - using namespace Kleo;
2504 -
2505 ---- a/libkleo/kleo/keyfiltermanager.cpp
2506 -+++ b/libkleo/kleo/keyfiltermanager.cpp
2507 -@@ -48,8 +48,10 @@
2508 - #include <QAbstractListModel>
2509 - #include <QModelIndex>
2510 -
2511 -+#ifndef Q_MOC_RUN
2512 - #include <boost/bind.hpp>
2513 - #include <boost/iterator/filter_iterator.hpp>
2514 -+#endif
2515 -
2516 - #include <algorithm>
2517 - #include <vector>
2518 -
2519 ---- a/libkleo/kleo/keyfiltermanager.h
2520 -+++ b/libkleo/kleo/keyfiltermanager.h
2521 -@@ -36,7 +36,9 @@
2522 - #include "kleo/kleo_export.h"
2523 - #include <QtCore/QObject>
2524 -
2525 -+#ifndef Q_MOC_RUN
2526 - #include <boost/shared_ptr.hpp>
2527 -+#endif
2528 -
2529 - #include <kleo/keyfilter.h>
2530 -
2531 -
2532 ---- a/libkleo/kleo/signencryptjob.h
2533 -+++ b/libkleo/kleo/signencryptjob.h
2534 -@@ -37,7 +37,9 @@
2535 -
2536 - #include <gpgme++/global.h>
2537 -
2538 -+#ifndef Q_MOC_RUN
2539 - #include <boost/shared_ptr.hpp>
2540 -+#endif
2541 -
2542 - #include <vector>
2543 - #include <utility>
2544 -
2545 ---- a/libkleo/kleo/signjob.h
2546 -+++ b/libkleo/kleo/signjob.h
2547 -@@ -37,7 +37,9 @@
2548 -
2549 - #include <gpgme++/global.h>
2550 -
2551 -+#ifndef Q_MOC_RUN
2552 - #include <boost/shared_ptr.hpp>
2553 -+#endif
2554 -
2555 - #include <vector>
2556 -
2557 -
2558 ---- a/libkleo/kleo/stl_util.h
2559 -+++ b/libkleo/kleo/stl_util.h
2560 -@@ -22,11 +22,13 @@
2561 - #ifndef __KDTOOLSCORE_STL_UTIL_H__
2562 - #define __KDTOOLSCORE_STL_UTIL_H__
2563 -
2564 -+#ifndef Q_MOC_RUN
2565 - #include <boost/range.hpp>
2566 - #include <boost/iterator/filter_iterator.hpp>
2567 - #include <boost/iterator/transform_iterator.hpp>
2568 - #include <boost/call_traits.hpp>
2569 - #include <boost/version.hpp>
2570 -+#endif
2571 -
2572 - #include <algorithm>
2573 - #include <numeric>
2574 -
2575 ---- a/libkleo/kleo/verifydetachedjob.h
2576 -+++ b/libkleo/kleo/verifydetachedjob.h
2577 -@@ -35,7 +35,9 @@
2578 -
2579 - #include "job.h"
2580 -
2581 -+#ifndef Q_MOC_RUN
2582 - #include <boost/shared_ptr.hpp>
2583 -+#endif
2584 -
2585 - class QByteArray;
2586 - class QIODevice;
2587 -
2588 ---- a/libkleo/kleo/verifyopaquejob.h
2589 -+++ b/libkleo/kleo/verifyopaquejob.h
2590 -@@ -35,7 +35,9 @@
2591 -
2592 - #include "job.h"
2593 -
2594 -+#ifndef Q_MOC_RUN
2595 - #include <boost/shared_ptr.hpp>
2596 -+#endif
2597 -
2598 - class QByteArray;
2599 - class QIODevice;
2600 -
2601 ---- a/libkleo/ui/directoryserviceswidget.cpp
2602 -+++ b/libkleo/ui/directoryserviceswidget.cpp
2603 -@@ -45,7 +45,9 @@
2604 - #include <QMenu>
2605 - #include <QAction>
2606 -
2607 -+#ifndef Q_MOC_RUN
2608 - #include <boost/bind.hpp>
2609 -+#endif
2610 -
2611 - #include <vector>
2612 -
2613 -
2614 -
2615
2616 diff --git a/kde-apps/kleopatra/files/kleopatra-4.4.2015.06-reenable.patch b/kde-apps/kleopatra/files/kleopatra-4.4.2015.06-reenable.patch
2617 deleted file mode 100644
2618 index f8c934e..0000000
2619 --- a/kde-apps/kleopatra/files/kleopatra-4.4.2015.06-reenable.patch
2620 +++ /dev/null
2621 @@ -1,13 +0,0 @@
2622 -diff --git a/CMakeLists.txt b/CMakeLists.txt
2623 -index 8c450d3..b927ad9 100644
2624 ---- a/CMakeLists.txt
2625 -+++ b/CMakeLists.txt
2626 -@@ -190,7 +190,7 @@ set(libkdgantt1_SRCS
2627 -
2628 - if(QGPGME_FOUND)
2629 - if (Boost_TOPOLOGICAL_SORT_DIR)
2630 --# macro_optional_add_subdirectory(kleopatra)
2631 -+ macro_optional_add_subdirectory(kleopatra)
2632 - endif(Boost_TOPOLOGICAL_SORT_DIR)
2633 - macro_optional_add_subdirectory(wizards)
2634 - # The following components depend on QGpgME.
2635
2636 diff --git a/kde-apps/kleopatra/kleopatra-4.14.10.ebuild b/kde-apps/kleopatra/kleopatra-4.14.10.ebuild
2637 deleted file mode 100644
2638 index 5173087..0000000
2639 --- a/kde-apps/kleopatra/kleopatra-4.14.10.ebuild
2640 +++ /dev/null
2641 @@ -1,46 +0,0 @@
2642 -# Copyright 1999-2015 Gentoo Foundation
2643 -# Distributed under the terms of the GNU General Public License v2
2644 -# $Id$
2645 -
2646 -EAPI=5
2647 -
2648 -KDE_HANDBOOK="optional"
2649 -KMNAME="kdepim"
2650 -EGIT_BRANCH="KDE/4.14"
2651 -inherit kde4-meta
2652 -
2653 -DESCRIPTION="Kleopatra - KDE X.509 key manager"
2654 -HOMEPAGE="https://www.kde.org/applications/utilities/kleopatra/"
2655 -KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
2656 -IUSE="debug"
2657 -
2658 -DEPEND="
2659 - >=app-crypt/gpgme-1.3.2
2660 - dev-libs/boost:=
2661 - dev-libs/libassuan
2662 - dev-libs/libgpg-error
2663 - $(add_kdeapps_dep kdepimlibs 'akonadi(+)')
2664 - $(add_kdeapps_dep kdepim-common-libs)
2665 -"
2666 -RDEPEND="${DEPEND}
2667 - app-crypt/gnupg
2668 -"
2669 -
2670 -KMEXTRACTONLY="
2671 - libkleo/
2672 -"
2673 -
2674 -PATCHES=(
2675 - "${FILESDIR}/${PN}-install-headers.patch"
2676 - "${FILESDIR}/${P}-newer-boost-buildfix.patch"
2677 -)
2678 -
2679 -src_unpack() {
2680 - if use handbook; then
2681 - KMEXTRA="
2682 - doc/kwatchgnupg
2683 - "
2684 - fi
2685 -
2686 - kde4-meta_src_unpack
2687 -}
2688
2689 diff --git a/kde-apps/kmail/Manifest b/kde-apps/kmail/Manifest
2690 index d5c4ebb..0a4c5c7 100644
2691 --- a/kde-apps/kmail/Manifest
2692 +++ b/kde-apps/kmail/Manifest
2693 @@ -1,3 +1,2 @@
2694 -DIST kdepim-4.14.10.tar.xz 14585020 SHA256 edad865b81259331780a25906127e105d06fda8aa56f6f11cfee4bc8f85bb7e2 SHA512 aa7e5a488964d11d355557e89053993bb0bed4860072dbb8ae1851df881713a15ec5aa4e428de9b85a8bef678ace307b33f186314fe5a8011521e30331a1691b WHIRLPOOL 358589e29baeb2f7bf648d1bbccb9bbf37c4c1a447f05a2eff472b50282d7d5118ad40ced2f93ac7f47f2c394f745216632d33be389e82f88efd69386f6ab57d
2695 DIST kdepim-4.14.11_pre20160211.tar.gz 18551484 SHA256 b970c0c04652519cc7e88d818b3a29e7b356a73f449f7f6e5767d60e5b2a17e3 SHA512 e7fcf14353e457e9b3ec2d7eefa18ac0d9bc454ecaa682dcaf1585a6a36968bc8d7ea6ab61398a8d697d9343f0cd87472a906d444f814cd44956b6499826bb1d WHIRLPOOL f66fd74138ce871f88ce211c3b6af287cddaeda493e42c3b683938c274482d1f09a3ae659d380d4e19f5e5da70f5724ddd48723acf5846f6a1e9c01a79803e7e
2696 DIST kdepim-4.4.2016.01.tar.xz 8964248 SHA256 19f4d6ab4bcddf5a0e6acae50c20d0b8fbb482503e47e75c86955637d249cefa SHA512 a04737cc89f96e3635a19c492c9f3f31e7554aa8a237fb0ad8f5fe8c02e7e30911dd5d93bf0f27fd38603e496e02f3ef1d3064e159c99c71dea379199d1e0e03 WHIRLPOOL 9f02f5799b3a10a9b18b4c8cb34084051991cb7240d2b818cd2b58bde05abde2ef3126b3960f2554c7e5c4930266e561c1715c21fe72136654e28184b5083089
2697
2698 diff --git a/kde-apps/kmail/files/kdepim-4.14.10-fix-cmake-3.4.patch b/kde-apps/kmail/files/kdepim-4.14.10-fix-cmake-3.4.patch
2699 deleted file mode 100644
2700 index 4039cbf..0000000
2701 --- a/kde-apps/kmail/files/kdepim-4.14.10-fix-cmake-3.4.patch
2702 +++ /dev/null
2703 @@ -1,23 +0,0 @@
2704 -From: Andreas Sturmlechner <andreas.sturmlechner@×××××.com>
2705 -Date: Sun, 13 Dec 2015 09:20:24 +0000
2706 -Subject: Fix configure with >=cmake-3.4
2707 -X-Git-Url: http://quickgit.kde.org/?p=kdepim.git&a=commitdiff&h=91275a772e51a4031b8f34bc83652b5e60478624
2708 ----
2709 -Fix configure with >=cmake-3.4
2710 -
2711 -REVIEW: 126334
2712 ----
2713 -
2714 -
2715 ---- a/CMakeLists.txt
2716 -+++ b/CMakeLists.txt
2717 -@@ -3,6 +3,8 @@
2718 -
2719 - # where to look first for cmake modules. This line must be the first one or cmake will use the system's FindFoo.cmake
2720 - set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules")
2721 -+
2722 -+include(CheckIncludeFiles)
2723 -
2724 - ############### Build Options ###############
2725 -
2726 -
2727
2728 diff --git a/kde-apps/kmail/kmail-4.14.10.ebuild b/kde-apps/kmail/kmail-4.14.10.ebuild
2729 deleted file mode 100644
2730 index a2ab8a3..0000000
2731 --- a/kde-apps/kmail/kmail-4.14.10.ebuild
2732 +++ /dev/null
2733 @@ -1,109 +0,0 @@
2734 -# Copyright 1999-2016 Gentoo Foundation
2735 -# Distributed under the terms of the GNU General Public License v2
2736 -# $Id$
2737 -
2738 -EAPI=5
2739 -
2740 -KDE_HANDBOOK="optional"
2741 -KMNAME="kdepim"
2742 -EGIT_BRANCH="KDE/4.14"
2743 -VIRTUALX_REQUIRED=test
2744 -inherit flag-o-matic kde4-meta
2745 -
2746 -DESCRIPTION="Email component of Kontact, the integrated personal information manager of KDE"
2747 -HOMEPAGE="https://www.kde.org/applications/internet/kmail/"
2748 -KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
2749 -IUSE="debug"
2750 -
2751 -DEPEND="
2752 - $(add_kdeapps_dep kdepimlibs 'akonadi(+)')
2753 - $(add_kdeapps_dep korganizer)
2754 - $(add_kdeapps_dep kdepim-common-libs)
2755 -"
2756 -RDEPEND="${DEPEND}
2757 - !>=kde-apps/kdepimlibs-4.14.11_pre20160211
2758 -"
2759 -
2760 -RESTRICT="test"
2761 -# bug 393147
2762 -
2763 -KMEXTRACTONLY="
2764 - agents/folderarchiveagent.desktop
2765 - agents/sendlateragent/
2766 - akonadi_next/
2767 - calendarviews/
2768 - grantleeeditor/grantleethemeeditor/
2769 - kdgantt2/
2770 - korganizer/
2771 - kresources/
2772 - libkdepimdbusinterfaces/
2773 - libkleo/
2774 - libkpgp/
2775 -"
2776 -KMCOMPILEONLY="
2777 - calendarsupport/
2778 - grantleetheme/
2779 - incidenceeditor-ng/
2780 - kaddressbookgrantlee/
2781 - mailcommon/
2782 - mailimporter/
2783 - messagecomposer/
2784 - messagecore/
2785 - messagelist/
2786 - messageviewer/
2787 - mailcommon/
2788 - mailimporter/
2789 - noteshared/
2790 - pimcommon/
2791 - templateparser/
2792 -"
2793 -KMEXTRA="
2794 - agents/archivemailagent/
2795 - agents/followupreminderagent/
2796 - agents/mailfilteragent/
2797 - grantleeeditor/headerthemeeditor/
2798 - importwizard/
2799 - kmailcvt/
2800 - ksendemail/
2801 - libksieve/
2802 - mboximporter/
2803 - pimsettingexporter/
2804 - plugins/messageviewer/
2805 -"
2806 -
2807 -KMLOADLIBS="kdepim-common-libs"
2808 -
2809 -PATCHES=( "${FILESDIR}/kdepim-4.14.10-fix-cmake-3.4.patch" )
2810 -
2811 -src_compile() {
2812 - kde4-meta_src_compile kmail_xml
2813 - kde4-meta_src_compile
2814 -}
2815 -
2816 -pkg_postinst() {
2817 - kde4-meta_pkg_postinst
2818 -
2819 - if ! has_version kde-apps/kdepim-kresources:${SLOT}; then
2820 - echo
2821 - elog "For groupware functionality, please install kde-apps/kdepim-kresources:${SLOT}"
2822 - echo
2823 - fi
2824 - if ! has_version kde-apps/kleopatra:${SLOT}; then
2825 - echo
2826 - elog "For certificate management and the gnupg log viewer, please install kde-apps/kleopatra:${SLOT}"
2827 - echo
2828 - fi
2829 -
2830 - if has_version "app-office/akonadi-server[sqlite]"; then
2831 - ewarn
2832 - ewarn "We strongly recommend you set your Akonadi database backend to QMYSQL in your"
2833 - ewarn "user configuration. This is the backend recommended by KDE upstream."
2834 - ewarn "Reports indicate that kde-apps/kmail-4.10 does not work properly with the sqlite"
2835 - ewarn "backend anymore."
2836 - if has_version "app-office/akonadi-server[-mysql]"; then
2837 - ewarn "FOR THAT, YOU WILL HAVE TO RE-BUILD app-office/akonadi-server WITH mysql USEFLAG ENABLED."
2838 - fi
2839 - ewarn "You can select the backend in your ~/.config/akonadi/akonadiserverrc."
2840 - ewarn
2841 - fi
2842 -}
2843
2844 diff --git a/kde-apps/knode/Manifest b/kde-apps/knode/Manifest
2845 index d5c4ebb..0a4c5c7 100644
2846 --- a/kde-apps/knode/Manifest
2847 +++ b/kde-apps/knode/Manifest
2848 @@ -1,3 +1,2 @@
2849 -DIST kdepim-4.14.10.tar.xz 14585020 SHA256 edad865b81259331780a25906127e105d06fda8aa56f6f11cfee4bc8f85bb7e2 SHA512 aa7e5a488964d11d355557e89053993bb0bed4860072dbb8ae1851df881713a15ec5aa4e428de9b85a8bef678ace307b33f186314fe5a8011521e30331a1691b WHIRLPOOL 358589e29baeb2f7bf648d1bbccb9bbf37c4c1a447f05a2eff472b50282d7d5118ad40ced2f93ac7f47f2c394f745216632d33be389e82f88efd69386f6ab57d
2850 DIST kdepim-4.14.11_pre20160211.tar.gz 18551484 SHA256 b970c0c04652519cc7e88d818b3a29e7b356a73f449f7f6e5767d60e5b2a17e3 SHA512 e7fcf14353e457e9b3ec2d7eefa18ac0d9bc454ecaa682dcaf1585a6a36968bc8d7ea6ab61398a8d697d9343f0cd87472a906d444f814cd44956b6499826bb1d WHIRLPOOL f66fd74138ce871f88ce211c3b6af287cddaeda493e42c3b683938c274482d1f09a3ae659d380d4e19f5e5da70f5724ddd48723acf5846f6a1e9c01a79803e7e
2851 DIST kdepim-4.4.2016.01.tar.xz 8964248 SHA256 19f4d6ab4bcddf5a0e6acae50c20d0b8fbb482503e47e75c86955637d249cefa SHA512 a04737cc89f96e3635a19c492c9f3f31e7554aa8a237fb0ad8f5fe8c02e7e30911dd5d93bf0f27fd38603e496e02f3ef1d3064e159c99c71dea379199d1e0e03 WHIRLPOOL 9f02f5799b3a10a9b18b4c8cb34084051991cb7240d2b818cd2b58bde05abde2ef3126b3960f2554c7e5c4930266e561c1715c21fe72136654e28184b5083089
2852
2853 diff --git a/kde-apps/knode/knode-4.14.10.ebuild b/kde-apps/knode/knode-4.14.10.ebuild
2854 deleted file mode 100644
2855 index c426fce..0000000
2856 --- a/kde-apps/knode/knode-4.14.10.ebuild
2857 +++ /dev/null
2858 @@ -1,49 +0,0 @@
2859 -# Copyright 1999-2015 Gentoo Foundation
2860 -# Distributed under the terms of the GNU General Public License v2
2861 -# $Id$
2862 -
2863 -EAPI=5
2864 -
2865 -KDE_HANDBOOK="optional"
2866 -KMNAME="kdepim"
2867 -EGIT_BRANCH="KDE/4.14"
2868 -inherit kde4-meta
2869 -
2870 -DESCRIPTION="A newsreader for KDE"
2871 -HOMEPAGE="https://www.kde.org/applications/internet/knode/"
2872 -KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
2873 -IUSE="debug"
2874 -
2875 -# test fails, last checked for 4.2.96
2876 -RESTRICT=test
2877 -
2878 -DEPEND="
2879 - $(add_kdeapps_dep kdepimlibs 'akonadi(+)')
2880 - $(add_kdeapps_dep kdepim-common-libs '' 4.12.1-r1)
2881 -"
2882 -RDEPEND="${DEPEND}"
2883 -
2884 -KMEXTRACTONLY="
2885 - agents/
2886 - libkleo/
2887 - libkpgp/
2888 - messagecomposer/
2889 - messageviewer/
2890 - messagecore/
2891 -"
2892 -KMCOMPILEONLY="
2893 - grantleetheme/
2894 - kaddressbookgrantlee/
2895 -"
2896 -
2897 -KMLOADLIBS="kdepim-common-libs"
2898 -
2899 -src_unpack() {
2900 - if use handbook; then
2901 - KMEXTRA="
2902 - doc/kioslave/news
2903 - "
2904 - fi
2905 -
2906 - kde4-meta_src_unpack
2907 -}
2908
2909 diff --git a/kde-apps/knotes/Manifest b/kde-apps/knotes/Manifest
2910 index d5c4ebb..0a4c5c7 100644
2911 --- a/kde-apps/knotes/Manifest
2912 +++ b/kde-apps/knotes/Manifest
2913 @@ -1,3 +1,2 @@
2914 -DIST kdepim-4.14.10.tar.xz 14585020 SHA256 edad865b81259331780a25906127e105d06fda8aa56f6f11cfee4bc8f85bb7e2 SHA512 aa7e5a488964d11d355557e89053993bb0bed4860072dbb8ae1851df881713a15ec5aa4e428de9b85a8bef678ace307b33f186314fe5a8011521e30331a1691b WHIRLPOOL 358589e29baeb2f7bf648d1bbccb9bbf37c4c1a447f05a2eff472b50282d7d5118ad40ced2f93ac7f47f2c394f745216632d33be389e82f88efd69386f6ab57d
2915 DIST kdepim-4.14.11_pre20160211.tar.gz 18551484 SHA256 b970c0c04652519cc7e88d818b3a29e7b356a73f449f7f6e5767d60e5b2a17e3 SHA512 e7fcf14353e457e9b3ec2d7eefa18ac0d9bc454ecaa682dcaf1585a6a36968bc8d7ea6ab61398a8d697d9343f0cd87472a906d444f814cd44956b6499826bb1d WHIRLPOOL f66fd74138ce871f88ce211c3b6af287cddaeda493e42c3b683938c274482d1f09a3ae659d380d4e19f5e5da70f5724ddd48723acf5846f6a1e9c01a79803e7e
2916 DIST kdepim-4.4.2016.01.tar.xz 8964248 SHA256 19f4d6ab4bcddf5a0e6acae50c20d0b8fbb482503e47e75c86955637d249cefa SHA512 a04737cc89f96e3635a19c492c9f3f31e7554aa8a237fb0ad8f5fe8c02e7e30911dd5d93bf0f27fd38603e496e02f3ef1d3064e159c99c71dea379199d1e0e03 WHIRLPOOL 9f02f5799b3a10a9b18b4c8cb34084051991cb7240d2b818cd2b58bde05abde2ef3126b3960f2554c7e5c4930266e561c1715c21fe72136654e28184b5083089
2917
2918 diff --git a/kde-apps/knotes/knotes-4.14.10.ebuild b/kde-apps/knotes/knotes-4.14.10.ebuild
2919 deleted file mode 100644
2920 index 6c4e46a..0000000
2921 --- a/kde-apps/knotes/knotes-4.14.10.ebuild
2922 +++ /dev/null
2923 @@ -1,32 +0,0 @@
2924 -# Copyright 1999-2015 Gentoo Foundation
2925 -# Distributed under the terms of the GNU General Public License v2
2926 -# $Id$
2927 -
2928 -EAPI=5
2929 -
2930 -KDE_HANDBOOK="optional"
2931 -KMNAME="kdepim"
2932 -EGIT_BRANCH="KDE/4.14"
2933 -inherit kde4-meta
2934 -
2935 -DESCRIPTION="KDE Notes application"
2936 -HOMEPAGE="https://www.kde.org/applications/utilities/knotes/"
2937 -KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
2938 -IUSE="debug"
2939 -
2940 -DEPEND="
2941 - $(add_kdeapps_dep kdepimlibs 'akonadi(+)')
2942 - $(add_kdeapps_dep kdepim-common-libs)
2943 -"
2944 -RDEPEND="${DEPEND}"
2945 -
2946 -KMCOMPILEONLY="
2947 - noteshared/
2948 -"
2949 -
2950 -KMEXTRACTONLY="
2951 - akonadi_next/
2952 - pimcommon/
2953 -"
2954 -
2955 -KMLOADLIBS="kdepim-common-libs"
2956
2957 diff --git a/kde-apps/konsolekalendar/Manifest b/kde-apps/konsolekalendar/Manifest
2958 index d5c4ebb..0a4c5c7 100644
2959 --- a/kde-apps/konsolekalendar/Manifest
2960 +++ b/kde-apps/konsolekalendar/Manifest
2961 @@ -1,3 +1,2 @@
2962 -DIST kdepim-4.14.10.tar.xz 14585020 SHA256 edad865b81259331780a25906127e105d06fda8aa56f6f11cfee4bc8f85bb7e2 SHA512 aa7e5a488964d11d355557e89053993bb0bed4860072dbb8ae1851df881713a15ec5aa4e428de9b85a8bef678ace307b33f186314fe5a8011521e30331a1691b WHIRLPOOL 358589e29baeb2f7bf648d1bbccb9bbf37c4c1a447f05a2eff472b50282d7d5118ad40ced2f93ac7f47f2c394f745216632d33be389e82f88efd69386f6ab57d
2963 DIST kdepim-4.14.11_pre20160211.tar.gz 18551484 SHA256 b970c0c04652519cc7e88d818b3a29e7b356a73f449f7f6e5767d60e5b2a17e3 SHA512 e7fcf14353e457e9b3ec2d7eefa18ac0d9bc454ecaa682dcaf1585a6a36968bc8d7ea6ab61398a8d697d9343f0cd87472a906d444f814cd44956b6499826bb1d WHIRLPOOL f66fd74138ce871f88ce211c3b6af287cddaeda493e42c3b683938c274482d1f09a3ae659d380d4e19f5e5da70f5724ddd48723acf5846f6a1e9c01a79803e7e
2964 DIST kdepim-4.4.2016.01.tar.xz 8964248 SHA256 19f4d6ab4bcddf5a0e6acae50c20d0b8fbb482503e47e75c86955637d249cefa SHA512 a04737cc89f96e3635a19c492c9f3f31e7554aa8a237fb0ad8f5fe8c02e7e30911dd5d93bf0f27fd38603e496e02f3ef1d3064e159c99c71dea379199d1e0e03 WHIRLPOOL 9f02f5799b3a10a9b18b4c8cb34084051991cb7240d2b818cd2b58bde05abde2ef3126b3960f2554c7e5c4930266e561c1715c21fe72136654e28184b5083089
2965
2966 diff --git a/kde-apps/konsolekalendar/files/kdepim-4.14.10-fix-cmake-3.4.patch b/kde-apps/konsolekalendar/files/kdepim-4.14.10-fix-cmake-3.4.patch
2967 deleted file mode 100644
2968 index 4039cbf..0000000
2969 --- a/kde-apps/konsolekalendar/files/kdepim-4.14.10-fix-cmake-3.4.patch
2970 +++ /dev/null
2971 @@ -1,23 +0,0 @@
2972 -From: Andreas Sturmlechner <andreas.sturmlechner@×××××.com>
2973 -Date: Sun, 13 Dec 2015 09:20:24 +0000
2974 -Subject: Fix configure with >=cmake-3.4
2975 -X-Git-Url: http://quickgit.kde.org/?p=kdepim.git&a=commitdiff&h=91275a772e51a4031b8f34bc83652b5e60478624
2976 ----
2977 -Fix configure with >=cmake-3.4
2978 -
2979 -REVIEW: 126334
2980 ----
2981 -
2982 -
2983 ---- a/CMakeLists.txt
2984 -+++ b/CMakeLists.txt
2985 -@@ -3,6 +3,8 @@
2986 -
2987 - # where to look first for cmake modules. This line must be the first one or cmake will use the system's FindFoo.cmake
2988 - set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules")
2989 -+
2990 -+include(CheckIncludeFiles)
2991 -
2992 - ############### Build Options ###############
2993 -
2994 -
2995
2996 diff --git a/kde-apps/konsolekalendar/konsolekalendar-4.14.10.ebuild b/kde-apps/konsolekalendar/konsolekalendar-4.14.10.ebuild
2997 deleted file mode 100644
2998 index ac43cba..0000000
2999 --- a/kde-apps/konsolekalendar/konsolekalendar-4.14.10.ebuild
3000 +++ /dev/null
3001 @@ -1,50 +0,0 @@
3002 -# Copyright 1999-2015 Gentoo Foundation
3003 -# Distributed under the terms of the GNU General Public License v2
3004 -# $Id$
3005 -
3006 -EAPI=5
3007 -
3008 -KDE_HANDBOOK="optional"
3009 -KMNAME="kdepim"
3010 -EGIT_BRANCH="KDE/4.14"
3011 -KMMODULE="console/${PN}"
3012 -inherit kde4-meta
3013 -
3014 -DESCRIPTION="A command line interface to KDE calendars"
3015 -HOMEPAGE+=" https://userbase.kde.org/KonsoleKalendar"
3016 -KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
3017 -IUSE="debug"
3018 -
3019 -DEPEND="
3020 - $(add_kdeapps_dep kdepimlibs 'akonadi(+)')
3021 - $(add_kdeapps_dep kdepim-common-libs)
3022 -"
3023 -RDEPEND="${DEPEND}"
3024 -
3025 -KMCOMPILEONLY="
3026 - calendarsupport/
3027 - grantleetheme/
3028 - incidenceeditor-ng/
3029 - kaddressbookgrantlee/
3030 - mailcommon/
3031 - messagecore/
3032 - messageviewer/
3033 - pimcommon/
3034 - templateparser/
3035 -"
3036 -KMEXTRACTONLY="
3037 - akonadi_next/
3038 - agents/mailfilteragent/org.freedesktop.Akonadi.MailFilterAgent.xml
3039 - calendarviews/
3040 - kdgantt2/
3041 - korganizer/data/org.kde.Korganizer.Calendar.xml
3042 - mailimporter/
3043 - messagecomposer/
3044 - libkdepimdbusinterfaces/
3045 - libkleo/
3046 - libkpgp/
3047 -"
3048 -
3049 -KMLOADLIBS="kdepim-common-libs"
3050 -
3051 -PATCHES=( "${FILESDIR}/kdepim-4.14.10-fix-cmake-3.4.patch" )
3052
3053 diff --git a/kde-apps/kontact/Manifest b/kde-apps/kontact/Manifest
3054 index d5c4ebb..0a4c5c7 100644
3055 --- a/kde-apps/kontact/Manifest
3056 +++ b/kde-apps/kontact/Manifest
3057 @@ -1,3 +1,2 @@
3058 -DIST kdepim-4.14.10.tar.xz 14585020 SHA256 edad865b81259331780a25906127e105d06fda8aa56f6f11cfee4bc8f85bb7e2 SHA512 aa7e5a488964d11d355557e89053993bb0bed4860072dbb8ae1851df881713a15ec5aa4e428de9b85a8bef678ace307b33f186314fe5a8011521e30331a1691b WHIRLPOOL 358589e29baeb2f7bf648d1bbccb9bbf37c4c1a447f05a2eff472b50282d7d5118ad40ced2f93ac7f47f2c394f745216632d33be389e82f88efd69386f6ab57d
3059 DIST kdepim-4.14.11_pre20160211.tar.gz 18551484 SHA256 b970c0c04652519cc7e88d818b3a29e7b356a73f449f7f6e5767d60e5b2a17e3 SHA512 e7fcf14353e457e9b3ec2d7eefa18ac0d9bc454ecaa682dcaf1585a6a36968bc8d7ea6ab61398a8d697d9343f0cd87472a906d444f814cd44956b6499826bb1d WHIRLPOOL f66fd74138ce871f88ce211c3b6af287cddaeda493e42c3b683938c274482d1f09a3ae659d380d4e19f5e5da70f5724ddd48723acf5846f6a1e9c01a79803e7e
3060 DIST kdepim-4.4.2016.01.tar.xz 8964248 SHA256 19f4d6ab4bcddf5a0e6acae50c20d0b8fbb482503e47e75c86955637d249cefa SHA512 a04737cc89f96e3635a19c492c9f3f31e7554aa8a237fb0ad8f5fe8c02e7e30911dd5d93bf0f27fd38603e496e02f3ef1d3064e159c99c71dea379199d1e0e03 WHIRLPOOL 9f02f5799b3a10a9b18b4c8cb34084051991cb7240d2b818cd2b58bde05abde2ef3126b3960f2554c7e5c4930266e561c1715c21fe72136654e28184b5083089
3061
3062 diff --git a/kde-apps/kontact/kontact-4.14.10.ebuild b/kde-apps/kontact/kontact-4.14.10.ebuild
3063 deleted file mode 100644
3064 index f1f7bc9..0000000
3065 --- a/kde-apps/kontact/kontact-4.14.10.ebuild
3066 +++ /dev/null
3067 @@ -1,52 +0,0 @@
3068 -# Copyright 1999-2015 Gentoo Foundation
3069 -# Distributed under the terms of the GNU General Public License v2
3070 -# $Id$
3071 -
3072 -EAPI=5
3073 -
3074 -KDE_HANDBOOK="optional"
3075 -KMNAME="kdepim"
3076 -EGIT_BRANCH="KDE/4.14"
3077 -inherit kde4-meta
3078 -
3079 -DESCRIPTION="KDE personal information manager"
3080 -HOMEPAGE="https://www.kde.org/applications/office/kontact/"
3081 -KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
3082 -IUSE="debug"
3083 -
3084 -DEPEND="
3085 - $(add_kdeapps_dep kdepimlibs 'akonadi(+)')
3086 - $(add_kdeapps_dep kdepim-common-libs)
3087 -"
3088 -RDEPEND="${DEPEND}"
3089 -
3090 -KMLOADLIBS="kdepim-common-libs"
3091 -KMSAVELIBS="true"
3092 -
3093 -# We remove plugins that are related to external kdepim programs. This way
3094 -# kontact doesn't have to depend on all programs it has plugins for.
3095 -# kcontactmanager gone from kdesvn
3096 -#
3097 -KMEXTRACTONLY="
3098 - kontact/plugins/akregator/
3099 - kontact/plugins/kaddressbook/
3100 - kontact/plugins/kjots/
3101 - kontact/plugins/kmail/
3102 - kontact/plugins/knode/
3103 - kontact/plugins/knotes/
3104 - kontact/plugins/korganizer/
3105 - kontact/plugins/ktimetracker/
3106 - kontact/plugins/planner/
3107 - kontact/plugins/specialdates/
3108 - libkdepimdbusinterfaces/
3109 -"
3110 -
3111 -src_unpack() {
3112 - if use handbook; then
3113 - KMEXTRA+="
3114 - doc/kontact-admin/
3115 - "
3116 - fi
3117 -
3118 - kde4-meta_src_unpack
3119 -}
3120
3121 diff --git a/kde-apps/korganizer/Manifest b/kde-apps/korganizer/Manifest
3122 index d5c4ebb..0a4c5c7 100644
3123 --- a/kde-apps/korganizer/Manifest
3124 +++ b/kde-apps/korganizer/Manifest
3125 @@ -1,3 +1,2 @@
3126 -DIST kdepim-4.14.10.tar.xz 14585020 SHA256 edad865b81259331780a25906127e105d06fda8aa56f6f11cfee4bc8f85bb7e2 SHA512 aa7e5a488964d11d355557e89053993bb0bed4860072dbb8ae1851df881713a15ec5aa4e428de9b85a8bef678ace307b33f186314fe5a8011521e30331a1691b WHIRLPOOL 358589e29baeb2f7bf648d1bbccb9bbf37c4c1a447f05a2eff472b50282d7d5118ad40ced2f93ac7f47f2c394f745216632d33be389e82f88efd69386f6ab57d
3127 DIST kdepim-4.14.11_pre20160211.tar.gz 18551484 SHA256 b970c0c04652519cc7e88d818b3a29e7b356a73f449f7f6e5767d60e5b2a17e3 SHA512 e7fcf14353e457e9b3ec2d7eefa18ac0d9bc454ecaa682dcaf1585a6a36968bc8d7ea6ab61398a8d697d9343f0cd87472a906d444f814cd44956b6499826bb1d WHIRLPOOL f66fd74138ce871f88ce211c3b6af287cddaeda493e42c3b683938c274482d1f09a3ae659d380d4e19f5e5da70f5724ddd48723acf5846f6a1e9c01a79803e7e
3128 DIST kdepim-4.4.2016.01.tar.xz 8964248 SHA256 19f4d6ab4bcddf5a0e6acae50c20d0b8fbb482503e47e75c86955637d249cefa SHA512 a04737cc89f96e3635a19c492c9f3f31e7554aa8a237fb0ad8f5fe8c02e7e30911dd5d93bf0f27fd38603e496e02f3ef1d3064e159c99c71dea379199d1e0e03 WHIRLPOOL 9f02f5799b3a10a9b18b4c8cb34084051991cb7240d2b818cd2b58bde05abde2ef3126b3960f2554c7e5c4930266e561c1715c21fe72136654e28184b5083089
3129
3130 diff --git a/kde-apps/korganizer/files/kdepim-4.14.10-fix-cmake-3.4.patch b/kde-apps/korganizer/files/kdepim-4.14.10-fix-cmake-3.4.patch
3131 deleted file mode 100644
3132 index 4039cbf..0000000
3133 --- a/kde-apps/korganizer/files/kdepim-4.14.10-fix-cmake-3.4.patch
3134 +++ /dev/null
3135 @@ -1,23 +0,0 @@
3136 -From: Andreas Sturmlechner <andreas.sturmlechner@×××××.com>
3137 -Date: Sun, 13 Dec 2015 09:20:24 +0000
3138 -Subject: Fix configure with >=cmake-3.4
3139 -X-Git-Url: http://quickgit.kde.org/?p=kdepim.git&a=commitdiff&h=91275a772e51a4031b8f34bc83652b5e60478624
3140 ----
3141 -Fix configure with >=cmake-3.4
3142 -
3143 -REVIEW: 126334
3144 ----
3145 -
3146 -
3147 ---- a/CMakeLists.txt
3148 -+++ b/CMakeLists.txt
3149 -@@ -3,6 +3,8 @@
3150 -
3151 - # where to look first for cmake modules. This line must be the first one or cmake will use the system's FindFoo.cmake
3152 - set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules")
3153 -+
3154 -+include(CheckIncludeFiles)
3155 -
3156 - ############### Build Options ###############
3157 -
3158 -
3159
3160 diff --git a/kde-apps/korganizer/korganizer-4.14.10.ebuild b/kde-apps/korganizer/korganizer-4.14.10.ebuild
3161 deleted file mode 100644
3162 index 26b186f..0000000
3163 --- a/kde-apps/korganizer/korganizer-4.14.10.ebuild
3164 +++ /dev/null
3165 @@ -1,93 +0,0 @@
3166 -# Copyright 1999-2016 Gentoo Foundation
3167 -# Distributed under the terms of the GNU General Public License v2
3168 -# $Id$
3169 -
3170 -EAPI=5
3171 -
3172 -KDE_HANDBOOK="optional"
3173 -KMNAME="kdepim"
3174 -EGIT_BRANCH="KDE/4.14"
3175 -inherit kde4-meta
3176 -
3177 -DESCRIPTION="A Personal Organizer for KDE"
3178 -HOMEPAGE="https://www.kde.org/applications/office/korganizer/"
3179 -KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
3180 -IUSE="debug"
3181 -
3182 -DEPEND="
3183 - $(add_kdeapps_dep kdepimlibs 'akonadi(+)')
3184 - $(add_kdeapps_dep kdepim-common-libs)
3185 - sys-libs/zlib
3186 -"
3187 -RDEPEND="${DEPEND}
3188 - $(add_kdeapps_dep ktimezoned '' 4.14.3)
3189 -"
3190 -
3191 -RESTRICT="test"
3192 -# bug 393135
3193 -
3194 -KMLOADLIBS="kdepim-common-libs"
3195 -
3196 -KMEXTRA="
3197 - korgac/
3198 -"
3199 -KMEXTRACTONLY="
3200 - agents/mailfilteragent/org.freedesktop.Akonadi.MailFilterAgent.xml
3201 - akonadi_next/
3202 - calendarviews/
3203 - kdgantt2/
3204 - kmail/
3205 - knode/org.kde.knode.xml
3206 - libkdepimdbusinterfaces/
3207 - libkleo/
3208 - libkpgp/
3209 - mailimporter/
3210 - messagecomposer/
3211 -"
3212 -KMCOMPILEONLY="
3213 - calendarsupport/
3214 - grantleetheme/
3215 - incidenceeditor-ng/
3216 - kaddressbookgrantlee/
3217 - mailcommon/
3218 - messagecore/
3219 - messageviewer/
3220 - pimcommon/
3221 - templateparser/
3222 -"
3223 -
3224 -src_unpack() {
3225 - if use kontact; then
3226 - KMEXTRA="${KMEXTRA}
3227 - kontact/plugins/planner/
3228 - kontact/plugins/specialdates/
3229 - "
3230 - fi
3231 -
3232 - kde4-meta_src_unpack
3233 -}
3234 -
3235 -src_prepare() {
3236 - epatch "${FILESDIR}/kdepim-4.14.10-fix-cmake-3.4.patch"
3237 -
3238 - use handbook && epatch "${FILESDIR}/${PN}-4.14.10-handbook.patch"
3239 -
3240 - kde4-meta_src_prepare
3241 -}
3242 -
3243 -src_install() {
3244 - kde4-meta_src_install
3245 - # colliding with kdepim-common-libs
3246 - rm -rf "${ED}"usr/share/kde4/servicetypes/calendarplugin.desktop || die
3247 - rm -rf "${ED}"usr/share/kde4/servicetypes/calendardecoration.desktop || die
3248 -}
3249 -
3250 -pkg_postinst() {
3251 - kde4-meta_pkg_postinst
3252 -
3253 - if ! has_version kde-apps/kdepim-kresources:${SLOT}; then
3254 - echo
3255 - elog "For groupware functionality, please install kde-apps/kdepim-kresources:${SLOT}"
3256 - echo
3257 - fi
3258 -}
3259
3260 diff --git a/kde-apps/ktimetracker/Manifest b/kde-apps/ktimetracker/Manifest
3261 index d5c4ebb..0a4c5c7 100644
3262 --- a/kde-apps/ktimetracker/Manifest
3263 +++ b/kde-apps/ktimetracker/Manifest
3264 @@ -1,3 +1,2 @@
3265 -DIST kdepim-4.14.10.tar.xz 14585020 SHA256 edad865b81259331780a25906127e105d06fda8aa56f6f11cfee4bc8f85bb7e2 SHA512 aa7e5a488964d11d355557e89053993bb0bed4860072dbb8ae1851df881713a15ec5aa4e428de9b85a8bef678ace307b33f186314fe5a8011521e30331a1691b WHIRLPOOL 358589e29baeb2f7bf648d1bbccb9bbf37c4c1a447f05a2eff472b50282d7d5118ad40ced2f93ac7f47f2c394f745216632d33be389e82f88efd69386f6ab57d
3266 DIST kdepim-4.14.11_pre20160211.tar.gz 18551484 SHA256 b970c0c04652519cc7e88d818b3a29e7b356a73f449f7f6e5767d60e5b2a17e3 SHA512 e7fcf14353e457e9b3ec2d7eefa18ac0d9bc454ecaa682dcaf1585a6a36968bc8d7ea6ab61398a8d697d9343f0cd87472a906d444f814cd44956b6499826bb1d WHIRLPOOL f66fd74138ce871f88ce211c3b6af287cddaeda493e42c3b683938c274482d1f09a3ae659d380d4e19f5e5da70f5724ddd48723acf5846f6a1e9c01a79803e7e
3267 DIST kdepim-4.4.2016.01.tar.xz 8964248 SHA256 19f4d6ab4bcddf5a0e6acae50c20d0b8fbb482503e47e75c86955637d249cefa SHA512 a04737cc89f96e3635a19c492c9f3f31e7554aa8a237fb0ad8f5fe8c02e7e30911dd5d93bf0f27fd38603e496e02f3ef1d3064e159c99c71dea379199d1e0e03 WHIRLPOOL 9f02f5799b3a10a9b18b4c8cb34084051991cb7240d2b818cd2b58bde05abde2ef3126b3960f2554c7e5c4930266e561c1715c21fe72136654e28184b5083089
3268
3269 diff --git a/kde-apps/ktimetracker/ktimetracker-4.14.10.ebuild b/kde-apps/ktimetracker/ktimetracker-4.14.10.ebuild
3270 deleted file mode 100644
3271 index 6e48eb6..0000000
3272 --- a/kde-apps/ktimetracker/ktimetracker-4.14.10.ebuild
3273 +++ /dev/null
3274 @@ -1,39 +0,0 @@
3275 -# Copyright 1999-2015 Gentoo Foundation
3276 -# Distributed under the terms of the GNU General Public License v2
3277 -# $Id$
3278 -
3279 -EAPI=5
3280 -
3281 -KDE_HANDBOOK="optional"
3282 -KMNAME="kdepim"
3283 -EGIT_BRANCH="KDE/4.14"
3284 -inherit kde4-meta
3285 -
3286 -DESCRIPTION="KTimeTracker tracks time spent on various tasks"
3287 -HOEMPAGE="https://www.kde.org/applications/utilities/ktimetracker/"
3288 -KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
3289 -IUSE="debug"
3290 -
3291 -RDEPEND="
3292 - $(add_kdeapps_dep kdepim-kresources)
3293 - $(add_kdeapps_dep kdepimlibs 'akonadi(+)')
3294 - $(add_kdeapps_dep kdepim-common-libs)
3295 - x11-libs/libXScrnSaver
3296 -"
3297 -DEPEND="${RDEPEND}
3298 - x11-proto/scrnsaverproto
3299 -"
3300 -
3301 -KMEXTRACTONLY="
3302 - kresources/
3303 -"
3304 -
3305 -KMLOADLIBS="kdepim-common-libs"
3306 -
3307 -src_unpack() {
3308 - if use kontact; then
3309 - KMEXTRA="${KMEXTRA} kontact/plugins/ktimetracker"
3310 - fi
3311 -
3312 - kde4-meta_src_unpack
3313 -}
3314
3315 diff --git a/kde-apps/ktnef/Manifest b/kde-apps/ktnef/Manifest
3316 index 55fbc17..d63f48e 100644
3317 --- a/kde-apps/ktnef/Manifest
3318 +++ b/kde-apps/ktnef/Manifest
3319 @@ -1,2 +1 @@
3320 -DIST kdepim-4.14.10.tar.xz 14585020 SHA256 edad865b81259331780a25906127e105d06fda8aa56f6f11cfee4bc8f85bb7e2 SHA512 aa7e5a488964d11d355557e89053993bb0bed4860072dbb8ae1851df881713a15ec5aa4e428de9b85a8bef678ace307b33f186314fe5a8011521e30331a1691b WHIRLPOOL 358589e29baeb2f7bf648d1bbccb9bbf37c4c1a447f05a2eff472b50282d7d5118ad40ced2f93ac7f47f2c394f745216632d33be389e82f88efd69386f6ab57d
3321 DIST kdepim-4.14.11_pre20160211.tar.gz 18551484 SHA256 b970c0c04652519cc7e88d818b3a29e7b356a73f449f7f6e5767d60e5b2a17e3 SHA512 e7fcf14353e457e9b3ec2d7eefa18ac0d9bc454ecaa682dcaf1585a6a36968bc8d7ea6ab61398a8d697d9343f0cd87472a906d444f814cd44956b6499826bb1d WHIRLPOOL f66fd74138ce871f88ce211c3b6af287cddaeda493e42c3b683938c274482d1f09a3ae659d380d4e19f5e5da70f5724ddd48723acf5846f6a1e9c01a79803e7e
3322
3323 diff --git a/kde-apps/ktnef/ktnef-4.14.10.ebuild b/kde-apps/ktnef/ktnef-4.14.10.ebuild
3324 deleted file mode 100644
3325 index d35cf8b..0000000
3326 --- a/kde-apps/ktnef/ktnef-4.14.10.ebuild
3327 +++ /dev/null
3328 @@ -1,25 +0,0 @@
3329 -# Copyright 1999-2015 Gentoo Foundation
3330 -# Distributed under the terms of the GNU General Public License v2
3331 -# $Id$
3332 -
3333 -EAPI=5
3334 -
3335 -KDE_HANDBOOK="optional"
3336 -KMNAME="kdepim"
3337 -EGIT_BRANCH="KDE/4.14"
3338 -inherit kde4-meta
3339 -
3340 -DESCRIPTION="A viewer for TNEF attachments"
3341 -KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
3342 -LICENSE="LGPL-2.1"
3343 -IUSE="debug"
3344 -
3345 -DEPEND="
3346 - app-office/akonadi-server
3347 - $(add_kdeapps_dep kdepimlibs 'akonadi(+)')
3348 -"
3349 -RDEPEND="${DEPEND}"
3350 -
3351 -KMEXTRACTONLY="
3352 - akonadi/
3353 -"