commit:     9794aac65db36b79cd49c6222e49461bdbdd3ad0
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun May  7 15:17:55 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed May 10 20:19:20 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9794aac6

kde-apps: Drop KDE PIM 4.14.11_pre20160211

Package-Manager: Portage-2.3.5, Repoman-2.3.1

 kde-apps/akonadiconsole/Manifest                   |   1 -
 .../akonadiconsole-4.14.11_pre20160211.ebuild      |  28 -----
 kde-apps/akregator/Manifest                        |   1 -
 .../akregator/akregator-4.14.11_pre20160211.ebuild |  25 ----
 kde-apps/blogilo/Manifest                          |   1 -
 .../blogilo/blogilo-4.14.11_pre20160211.ebuild     |  29 -----
 kde-apps/calendarjanitor/Manifest                  |   1 -
 .../calendarjanitor-4.14.11_pre20160211.ebuild     |  30 -----
 kde-apps/gpgmepp/Manifest                          |   1 -
 .../files/kdepimlibs-4.14.11-boostincludes.patch   |  15 ---
 .../gpgmepp/gpgmepp-4.14.11_pre20160211.ebuild     |  61 ----------
 kde-apps/kabcclient/Manifest                       |   1 -
 .../kabcclient-4.14.11_pre20160211.ebuild          |  29 -----
 kde-apps/kaddressbook/Manifest                     |   1 -
 .../kaddressbook-4.14.11_pre20160211.ebuild        |  56 ---------
 kde-apps/kalarm/Manifest                           |   1 -
 kde-apps/kalarm/kalarm-4.14.11_pre20160211.ebuild  |  30 -----
 kde-apps/kdepim-common-libs/Manifest               |   1 -
 .../files/install-composereditorng.patch           |  15 ---
 .../files/kdepim-common-libs-install-headers.patch |  86 -------------
 ...depim-common-libs-4.14.11_pre20160211-r1.ebuild |  96 ---------------
 kde-apps/kdepim-kresources/Manifest                |   1 -
 .../kdepim-kresources-4.14.11_pre20160211.ebuild   |  30 -----
 .../kdepim-meta-4.14.11_pre20160211.ebuild         |  40 ------
 kde-apps/kdepimlibs/Manifest                       |   1 -
 .../files/kdepimlibs-4.14.11-boostincludes.patch   |  15 ---
 .../files/kdepimlibs-4.14.11-gpgme-1.8.0.patch     | 101 ---------------
 .../files/kdepimlibs-CVE-2016-7966-r1.patch        | 135 ---------------------
 .../kdepimlibs-4.14.11_pre20160211-r3.ebuild       |  68 -----------
 kde-apps/kjots/Manifest                            |   1 -
 kde-apps/kjots/kjots-4.14.11_pre20160211.ebuild    |  29 -----
 kde-apps/kleopatra/Manifest                        |   1 -
 .../files/kleopatra-install-headers.patch          |  48 --------
 .../kleopatra-4.14.11_pre20160211-r1.ebuild        |  46 -------
 kde-apps/kmail/Manifest                            |   1 -
 kde-apps/kmail/files/kmail-4.4.9-nodbus.patch      |  83 -------------
 kde-apps/kmail/kmail-4.14.11_pre20160211-r1.ebuild | 111 -----------------
 kde-apps/knode/Manifest                            |   1 -
 kde-apps/knode/knode-4.14.11_pre20160211.ebuild    |  51 --------
 kde-apps/knotes/Manifest                           |   1 -
 kde-apps/knotes/knotes-4.14.11_pre20160211.ebuild  |  34 ------
 kde-apps/konsolekalendar/Manifest                  |   1 -
 .../konsolekalendar-4.14.11_pre20160211.ebuild     |  52 --------
 kde-apps/kontact/Manifest                          |   1 -
 .../kontact/kontact-4.14.11_pre20160211.ebuild     |  56 ---------
 kde-apps/korganizer/Manifest                       |   1 -
 .../files/korganizer-4.14.10-handbook.patch        |  16 ---
 .../korganizer-4.14.11_pre20160211.ebuild          |  94 --------------
 kde-apps/ktimetracker/Manifest                     |   1 -
 .../ktimetracker-4.14.11_pre20160211.ebuild        |  41 -------
 kde-apps/ktnef/Manifest                            |   1 -
 kde-apps/ktnef/ktnef-4.14.11_pre20160211.ebuild    |  27 -----
 52 files changed, 1598 deletions(-)

diff --git a/kde-apps/akonadiconsole/Manifest b/kde-apps/akonadiconsole/Manifest
index 88f8a5bfdf9..0067953f51c 100644
--- a/kde-apps/akonadiconsole/Manifest
+++ b/kde-apps/akonadiconsole/Manifest
@@ -1,3 +1,2 @@
 DIST akonadiconsole-17.04.0.tar.xz 185444 SHA256 
6dccfa21b11149f9786a30800aec191c24c1c0a846e92b4474fe8bf4c3fe4d05 SHA512 
e59181f4e2b4f431c8ceba2ad4683815ffd067e6afec06a09ec2404ade719552d36dd11d3dbe78b004f88cd5da5f6895986b41083aaad0da91dca328a70a98fd
 WHIRLPOOL 
d67cd0e95488aac19698928aa8abf5c1811c6ebd139c31aafcf8017fb02c7769bf44369da81e82234f36541d7f5c23c705fa39c6ed4c2784a9ea18e0c138419a
-DIST kdepim-4.14.11_pre20160211.tar.gz 18551484 SHA256 
b970c0c04652519cc7e88d818b3a29e7b356a73f449f7f6e5767d60e5b2a17e3 SHA512 
e7fcf14353e457e9b3ec2d7eefa18ac0d9bc454ecaa682dcaf1585a6a36968bc8d7ea6ab61398a8d697d9343f0cd87472a906d444f814cd44956b6499826bb1d
 WHIRLPOOL 
f66fd74138ce871f88ce211c3b6af287cddaeda493e42c3b683938c274482d1f09a3ae659d380d4e19f5e5da70f5724ddd48723acf5846f6a1e9c01a79803e7e
 DIST kdepim-4.14.11_pre20160611.tar.xz 14805956 SHA256 
a9c3f5288efe0ccba3ffb88d4a63ac7b46a6b1ffe3c03b738ac6a53ef48e50b0 SHA512 
5ed0d2f814a7aac7f9977840bcda8ba98dc66c8ffe921d30430db07b06de2850d76140a5e5fa44db09e3cb4cac09fee0d8e0e4c208b752d52aecb453a4dc1b08
 WHIRLPOOL 
c6377c37b1a88a9d3958af5af081706e00437c3d0c28152a7e9353c49e376a3acdcdca0055d339f15287e6e101d6367a4d083b1a68162da9d4cc3d26178f62c5

diff --git a/kde-apps/akonadiconsole/akonadiconsole-4.14.11_pre20160211.ebuild 
b/kde-apps/akonadiconsole/akonadiconsole-4.14.11_pre20160211.ebuild
deleted file mode 100644
index 6a8cbc637a1..00000000000
--- a/kde-apps/akonadiconsole/akonadiconsole-4.14.11_pre20160211.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KMNAME="kdepim"
-EGIT_BRANCH="KDE/4.14"
-inherit kde4-meta
-
-DESCRIPTION="Akonadi developer console"
-COMMIT_ID="2aec255c6465676404e4694405c153e485e477d9"
-SRC_URI="https://quickgit.kde.org/?p=kdepim.git&a=snapshot&h=${COMMIT_ID}&fmt=tgz
 -> ${KMNAME}-${PV}.tar.gz"
-
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-       $(add_kdeapps_dep kdepimlibs 'akonadi(+)')
-       $(add_kdeapps_dep kdepim-common-libs)
-       kde-apps/akonadi:4
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="
-       akonadi_next/
-       calendarsupport/
-       messageviewer/
-"

diff --git a/kde-apps/akregator/Manifest b/kde-apps/akregator/Manifest
index bccefa473e4..38336866312 100644
--- a/kde-apps/akregator/Manifest
+++ b/kde-apps/akregator/Manifest
@@ -1,4 +1,3 @@
 DIST akregator-17.04.0.tar.xz 2254720 SHA256 
a5c6389d7a6f83a81b3cb062653c667272df596215650c6fbd817a3a42f7fbb6 SHA512 
6544fe124a6e82e6af06e66a8997f3cee3ae10fc993c9cad0a007b2c342d626a866794f4b060d0f019a5fbc345903c50a35ba9069b5de08cdd233ba46b4356b6
 WHIRLPOOL 
402e852db5cd2209782cee11625ec7d538ec6b63550144cbee3b33e091067e84da9dcb9db360d1871a308baeec8889051f15856db7a7ed9cd10d3862dbc687ca
-DIST kdepim-4.14.11_pre20160211.tar.gz 18551484 SHA256 
b970c0c04652519cc7e88d818b3a29e7b356a73f449f7f6e5767d60e5b2a17e3 SHA512 
e7fcf14353e457e9b3ec2d7eefa18ac0d9bc454ecaa682dcaf1585a6a36968bc8d7ea6ab61398a8d697d9343f0cd87472a906d444f814cd44956b6499826bb1d
 WHIRLPOOL 
f66fd74138ce871f88ce211c3b6af287cddaeda493e42c3b683938c274482d1f09a3ae659d380d4e19f5e5da70f5724ddd48723acf5846f6a1e9c01a79803e7e
 DIST kdepim-4.14.11_pre20160611.tar.xz 14805956 SHA256 
a9c3f5288efe0ccba3ffb88d4a63ac7b46a6b1ffe3c03b738ac6a53ef48e50b0 SHA512 
5ed0d2f814a7aac7f9977840bcda8ba98dc66c8ffe921d30430db07b06de2850d76140a5e5fa44db09e3cb4cac09fee0d8e0e4c208b752d52aecb453a4dc1b08
 WHIRLPOOL 
c6377c37b1a88a9d3958af5af081706e00437c3d0c28152a7e9353c49e376a3acdcdca0055d339f15287e6e101d6367a4d083b1a68162da9d4cc3d26178f62c5
 DIST kdepim-4.4.2017.04.tar.xz 8964644 SHA256 
943019fbf6e480761ccac4a1d54d71d5d38c88fd832e952cb03d73975f9a8535 SHA512 
d00e288563975e38f1bf4d28ed4724a9e159fab8ca37a61039aea730d22cae0c7e9921e04423bbbe6a74ee19319c57f79139d3a2b5048985675f836fd5dc77ab
 WHIRLPOOL 
1818df486e46f7345523360d05ab1d19b00906f1b51677010d0cd2f31ddd914c1e96c3a98837339882810f54b15fd4eb5063424863169decb68578100ae8049a

diff --git a/kde-apps/akregator/akregator-4.14.11_pre20160211.ebuild 
b/kde-apps/akregator/akregator-4.14.11_pre20160211.ebuild
deleted file mode 100644
index c1cc1ddc6bd..00000000000
--- a/kde-apps/akregator/akregator-4.14.11_pre20160211.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-EGIT_BRANCH="KDE/4.14"
-inherit kde4-meta
-
-DESCRIPTION="KDE news feed aggregator"
-HOMEPAGE="https://www.kde.org/applications/internet/akregator";
-COMMIT_ID="2aec255c6465676404e4694405c153e485e477d9"
-SRC_URI="https://quickgit.kde.org/?p=kdepim.git&a=snapshot&h=${COMMIT_ID}&fmt=tgz
 -> ${KMNAME}-${PV}.tar.gz"
-
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-       $(add_kdeapps_dep kdepimlibs 'akonadi(+)')
-       $(add_kdeapps_dep kdepim-common-libs)
-"
-RDEPEND="${DEPEND}"
-
-KMLOADLIBS="kdepim-common-libs"

diff --git a/kde-apps/blogilo/Manifest b/kde-apps/blogilo/Manifest
index a452155db0d..19f213572df 100644
--- a/kde-apps/blogilo/Manifest
+++ b/kde-apps/blogilo/Manifest
@@ -1,4 +1,3 @@
 DIST blogilo-17.04.0.tar.xz 804220 SHA256 
ab3951df4a110ef6d8ffcaf2f5c99da0df45239e983a9fdcdaabe8e864d83b6d SHA512 
9f576294e62f04a2eeaa1652917d92faeaf54dc0d474032277e7aa3619f3f9b8418bda6b44c620e4cdb38cba6dacf31c1e5e11ddc55c5159ef1288cb9f03348e
 WHIRLPOOL 
8568079bc31642aa6dcfff1180524d3f31a361fb857b26616850873665ae5541da93b008d3470ee51f2baabbdc2d932cccfcda237f0795c19bf240dfe676589a
-DIST kdepim-4.14.11_pre20160211.tar.gz 18551484 SHA256 
b970c0c04652519cc7e88d818b3a29e7b356a73f449f7f6e5767d60e5b2a17e3 SHA512 
e7fcf14353e457e9b3ec2d7eefa18ac0d9bc454ecaa682dcaf1585a6a36968bc8d7ea6ab61398a8d697d9343f0cd87472a906d444f814cd44956b6499826bb1d
 WHIRLPOOL 
f66fd74138ce871f88ce211c3b6af287cddaeda493e42c3b683938c274482d1f09a3ae659d380d4e19f5e5da70f5724ddd48723acf5846f6a1e9c01a79803e7e
 DIST kdepim-4.14.11_pre20160611.tar.xz 14805956 SHA256 
a9c3f5288efe0ccba3ffb88d4a63ac7b46a6b1ffe3c03b738ac6a53ef48e50b0 SHA512 
5ed0d2f814a7aac7f9977840bcda8ba98dc66c8ffe921d30430db07b06de2850d76140a5e5fa44db09e3cb4cac09fee0d8e0e4c208b752d52aecb453a4dc1b08
 WHIRLPOOL 
c6377c37b1a88a9d3958af5af081706e00437c3d0c28152a7e9353c49e376a3acdcdca0055d339f15287e6e101d6367a4d083b1a68162da9d4cc3d26178f62c5
 DIST kdepim-4.4.2017.04.tar.xz 8964644 SHA256 
943019fbf6e480761ccac4a1d54d71d5d38c88fd832e952cb03d73975f9a8535 SHA512 
d00e288563975e38f1bf4d28ed4724a9e159fab8ca37a61039aea730d22cae0c7e9921e04423bbbe6a74ee19319c57f79139d3a2b5048985675f836fd5dc77ab
 WHIRLPOOL 
1818df486e46f7345523360d05ab1d19b00906f1b51677010d0cd2f31ddd914c1e96c3a98837339882810f54b15fd4eb5063424863169decb68578100ae8049a

diff --git a/kde-apps/blogilo/blogilo-4.14.11_pre20160211.ebuild 
b/kde-apps/blogilo/blogilo-4.14.11_pre20160211.ebuild
deleted file mode 100644
index 3482082e795..00000000000
--- a/kde-apps/blogilo/blogilo-4.14.11_pre20160211.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-EGIT_BRANCH="KDE/4.14"
-inherit kde4-meta
-
-DESCRIPTION="KDE Blogging Client"
-HOMEPAGE="https://www.kde.org/applications/internet/blogilo";
-COMMIT_ID="2aec255c6465676404e4694405c153e485e477d9"
-SRC_URI="https://quickgit.kde.org/?p=kdepim.git&a=snapshot&h=${COMMIT_ID}&fmt=tgz
 -> ${KMNAME}-${PV}.tar.gz"
-
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-       $(add_kdeapps_dep kdepim-common-libs)
-       $(add_kdeapps_dep kdepimlibs 'akonadi(+)')
-       $(add_kdeapps_dep libkgapi '' 2.2.0)
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="
-       composereditor-ng/
-       pimcommon/
-"

diff --git a/kde-apps/calendarjanitor/Manifest 
b/kde-apps/calendarjanitor/Manifest
index e65b6ef00c2..67c5e6c5df4 100644
--- a/kde-apps/calendarjanitor/Manifest
+++ b/kde-apps/calendarjanitor/Manifest
@@ -1,3 +1,2 @@
 DIST akonadi-calendar-tools-17.04.0.tar.xz 221520 SHA256 
3578d824b54055f80404fde67e0ede910a7cb6aa22ec215673a178124daa6468 SHA512 
27595ad1ed647858c70b9d9b4e3e32e8d5107fb1123d7c50ea49a7601f3db6b2c8d1d3b32c8818d756dec841a7650d5706d7aca29a4081f46f54b16aa96f3290
 WHIRLPOOL 
673a8099f7c6560a67c25cae31776a5c802cd35f9fdaac93c449fc00f3af36db0498bb713cfee9234f694db4fc69a1a711e12f8c48b89583bec3d367e1252e30
-DIST kdepim-4.14.11_pre20160211.tar.gz 18551484 SHA256 
b970c0c04652519cc7e88d818b3a29e7b356a73f449f7f6e5767d60e5b2a17e3 SHA512 
e7fcf14353e457e9b3ec2d7eefa18ac0d9bc454ecaa682dcaf1585a6a36968bc8d7ea6ab61398a8d697d9343f0cd87472a906d444f814cd44956b6499826bb1d
 WHIRLPOOL 
f66fd74138ce871f88ce211c3b6af287cddaeda493e42c3b683938c274482d1f09a3ae659d380d4e19f5e5da70f5724ddd48723acf5846f6a1e9c01a79803e7e
 DIST kdepim-4.14.11_pre20160611.tar.xz 14805956 SHA256 
a9c3f5288efe0ccba3ffb88d4a63ac7b46a6b1ffe3c03b738ac6a53ef48e50b0 SHA512 
5ed0d2f814a7aac7f9977840bcda8ba98dc66c8ffe921d30430db07b06de2850d76140a5e5fa44db09e3cb4cac09fee0d8e0e4c208b752d52aecb453a4dc1b08
 WHIRLPOOL 
c6377c37b1a88a9d3958af5af081706e00437c3d0c28152a7e9353c49e376a3acdcdca0055d339f15287e6e101d6367a4d083b1a68162da9d4cc3d26178f62c5

diff --git 
a/kde-apps/calendarjanitor/calendarjanitor-4.14.11_pre20160211.ebuild 
b/kde-apps/calendarjanitor/calendarjanitor-4.14.11_pre20160211.ebuild
deleted file mode 100644
index e5220e68397..00000000000
--- a/kde-apps/calendarjanitor/calendarjanitor-4.14.11_pre20160211.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-EGIT_BRANCH="KDE/4.14"
-KMMODULE="console/${PN}"
-inherit kde4-meta
-
-DESCRIPTION="A tool to scan calendar data for buggy instances"
-HOMEPAGE="https://www.kde.org/";
-COMMIT_ID="2aec255c6465676404e4694405c153e485e477d9"
-SRC_URI="https://quickgit.kde.org/?p=kdepim.git&a=snapshot&h=${COMMIT_ID}&fmt=tgz
 -> ${KMNAME}-${PV}.tar.gz"
-
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-       $(add_kdeapps_dep kdepim-common-libs)
-       $(add_kdeapps_dep kdepimlibs 'akonadi(+)')
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="
-       calendarsupport/
-"
-
-KMLOADLIBS="kdepim-common-libs"

diff --git a/kde-apps/gpgmepp/Manifest b/kde-apps/gpgmepp/Manifest
index c16eba24303..37423552ac1 100644
--- a/kde-apps/gpgmepp/Manifest
+++ b/kde-apps/gpgmepp/Manifest
@@ -1,3 +1,2 @@
 DIST gpgmepp-16.08.3.tar.xz 68576 SHA256 
bfc44e36d410e131c57ad6f3a18d761056e3dd6b589d2da2d4df575f5614aa69 SHA512 
d159f9d1fe532769260e2a00abd3e236de1f0503e1aec822b724736ffcfe625720595674ba4b32911906a391bd66281850c6ac4a519b889a8973d638399e815f
 WHIRLPOOL 
0c6106a0cff8e5799640f3f009a72409a6dabbfc1edbe72a27e0b1fa217b660ba8423ba68b3a0dd481284ed12e275c7b30397e62d870a2aaee93f6d21fb647c9
-DIST kdepimlibs-4.14.11_pre20160211.tar.gz 4300730 SHA256 
3c2559987871761ac13185b0ffa9f7575fe0a5c2e00950b433b25edea7ec47fd SHA512 
d0977a5387b0937d850fb3adc8c0bc8086ddb0894d238272f0586e53cc8a157a50b7e6d4aeb97a7fb944521de4f8978a23f172a6bf1b8e6afbbba5a183832b1c
 WHIRLPOOL 
28bdf9c93de2c500fe2c1264c8dff42cc816d414d6b15820bc6c6aaaafc0fe67008ce13b678e0c41ac6780863e94eccb43ab18beb4c052230cad312f4530f58d
 DIST kdepimlibs-4.14.11_pre20160611.tar.xz 2860084 SHA256 
15ebde0f9683f42b89dc2ad6656bc71bf516e2b885333cc5438891217e59ddd4 SHA512 
19560362f07328f3743b5aabdef74a55e3ac7f8016f1bb6d63aa792985b9b0c4d3f34e979df6022df31623ffb7f701c90f9262a70cc9326596429ff1395c4f6d
 WHIRLPOOL 
cddf5beb57f66e19b60baa896ba08879c1537d44cb35fb33776c439461411a1e0b07ec03229bc1d4a6d086235e50c19022411fe1d2a56d7901d8a6e9c1fbcbd0

diff --git a/kde-apps/gpgmepp/files/kdepimlibs-4.14.11-boostincludes.patch 
b/kde-apps/gpgmepp/files/kdepimlibs-4.14.11-boostincludes.patch
deleted file mode 100644
index 1b5cdcb52e4..00000000000
--- a/kde-apps/gpgmepp/files/kdepimlibs-4.14.11-boostincludes.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Make sure that the Boost headers are actually found, since they are
-referenced in the kdepimlibs headers. 
-Patch by Alex Turbov, see https://bugs.kde.org/show_bug.cgi?id=306323
-
---- a/KdepimLibsConfig.cmake.in.org    2012-08-13 12:46:24.000000000 +0400
-+++ b/KdepimLibsConfig.cmake.in        2012-09-06 08:53:53.000000000 +0400
-@@ -15,7 +15,7 @@
- set(KDEPIMLIBS_DBUS_INTERFACES_DIR "@KDEPIMLIBS_DBUS_INTERFACES_DIR@")
- set(KDEPIMLIBS_DBUS_SERVICES_DIR   "@KDEPIMLIBS_DBUS_SERVICES_DIR@")
- set(KDEPIMLIBS_INCLUDE_DIR         "@KDEPIMLIBS_INCLUDE_DIR@")
--set(KDEPIMLIBS_INCLUDE_DIRS        "@KDEPIMLIBS_INCLUDE_DIR@" 
"@KDEPIMLIBS_INCLUDE_DIR@/KDE")
-+set(KDEPIMLIBS_INCLUDE_DIRS        "@KDEPIMLIBS_INCLUDE_DIR@" 
"@KDEPIMLIBS_INCLUDE_DIR@/KDE" "@Boost_INCLUDE_DIR@")
- set(KDEPIMLIBS_LIB_DIR             "@KDEPIMLIBS_LIB_DIR@")
- set(KDEPIMLIBS_BIN_DIR             "@KDEPIMLIBS_BIN_DIR@")
- set(KDEPIMLIBS_LIBEXEC_DIR         "@KDEPIMLIBS_LIBEXEC_DIR@")

diff --git a/kde-apps/gpgmepp/gpgmepp-4.14.11_pre20160211.ebuild 
b/kde-apps/gpgmepp/gpgmepp-4.14.11_pre20160211.ebuild
deleted file mode 100644
index 0d979eda7bb..00000000000
--- a/kde-apps/gpgmepp/gpgmepp-4.14.11_pre20160211.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KMNAME="kdepimlibs"
-EGIT_BRANCH="KDE/4.14"
-inherit kde4-base
-
-DESCRIPTION="C++ bindings for gpgme"
-COMMIT_ID="a791b69599c3571ff2f4b1cc9033d8fb30f1bc33"
-SRC_URI="https://quickgit.kde.org/?p=kdepimlibs.git&a=snapshot&h=${COMMIT_ID}&fmt=tgz
 -> ${KMNAME}-${PV}.tar.gz"
-
-KEYWORDS="amd64 x86"
-LICENSE="LGPL-2.1"
-IUSE="debug"
-
-DEPEND="
-       >=app-crypt/gpgme-1.1.6
-       >=dev-libs/boost-1.35.0-r5:=
-       dev-libs/libgpg-error
-"
-# boost is not linked to, but headers which include it are installed
-# bug #418071
-RDEPEND="${DEPEND}
-       !kde-apps/kdepimlibs:4
-"
-
-PATCHES=( "${FILESDIR}/kdepimlibs-4.14.11-boostincludes.patch" )
-
-S=${WORKDIR}/${KMNAME}
-
-src_prepare() {
-       cmake_comment_add_subdirectory kmime
-       kde4-base_src_prepare
-}
-
-src_configure() {
-       local mycmakeargs=(
-               -DBUILD_doc=OFF
-               -DCMAKE_DISABLE_FIND_PACKAGE_Prison=ON
-               -DCMAKE_DISABLE_FIND_PACKAGE_Ldap=ON
-               -DKDEPIM_ONLY_KLEO=ON
-               -DKDEPIM_NO_KCAL=ON
-               -DKDEPIM_NO_KRESOURCES=ON
-       )
-
-       kde4-base_src_configure
-}
-
-src_install() {
-       kde4-base_src_install
-
-       # Collisions with kdepimlibs:4
-       rm -f "${ED}"usr/share/apps/cmake/modules/CheckTimezone.cmake \
-               
"${ED}"usr/share/apps/cmake/modules/Find{Ldap,Libical,QtOAuth}.cmake \
-               
"${ED}"usr/share/doc/"${PF}"/{akonadi,kabc,kalarmcal,kresources,kxmlrpcclient}.README*
 \
-               
"${ED}"usr/share/doc/"${PF}"/{kabc,kmime,kresources,mailtransport}.TODO* \
-               "${ED}"usr/share/doc/"${PF}"/kabc.HACKING* \
-               "${ED}"usr/share/doc/"${PF}"/ktnef.AUTHORS || die
-}

diff --git a/kde-apps/kabcclient/Manifest b/kde-apps/kabcclient/Manifest
index 2da6ebd9cbd..2e6c7bd033f 100644
--- a/kde-apps/kabcclient/Manifest
+++ b/kde-apps/kabcclient/Manifest
@@ -1,3 +1,2 @@
-DIST kdepim-4.14.11_pre20160211.tar.gz 18551484 SHA256 
b970c0c04652519cc7e88d818b3a29e7b356a73f449f7f6e5767d60e5b2a17e3 SHA512 
e7fcf14353e457e9b3ec2d7eefa18ac0d9bc454ecaa682dcaf1585a6a36968bc8d7ea6ab61398a8d697d9343f0cd87472a906d444f814cd44956b6499826bb1d
 WHIRLPOOL 
f66fd74138ce871f88ce211c3b6af287cddaeda493e42c3b683938c274482d1f09a3ae659d380d4e19f5e5da70f5724ddd48723acf5846f6a1e9c01a79803e7e
 DIST kdepim-4.14.11_pre20160611.tar.xz 14805956 SHA256 
a9c3f5288efe0ccba3ffb88d4a63ac7b46a6b1ffe3c03b738ac6a53ef48e50b0 SHA512 
5ed0d2f814a7aac7f9977840bcda8ba98dc66c8ffe921d30430db07b06de2850d76140a5e5fa44db09e3cb4cac09fee0d8e0e4c208b752d52aecb453a4dc1b08
 WHIRLPOOL 
c6377c37b1a88a9d3958af5af081706e00437c3d0c28152a7e9353c49e376a3acdcdca0055d339f15287e6e101d6367a4d083b1a68162da9d4cc3d26178f62c5
 DIST kdepim-4.4.2017.04.tar.xz 8964644 SHA256 
943019fbf6e480761ccac4a1d54d71d5d38c88fd832e952cb03d73975f9a8535 SHA512 
d00e288563975e38f1bf4d28ed4724a9e159fab8ca37a61039aea730d22cae0c7e9921e04423bbbe6a74ee19319c57f79139d3a2b5048985675f836fd5dc77ab
 WHIRLPOOL 
1818df486e46f7345523360d05ab1d19b00906f1b51677010d0cd2f31ddd914c1e96c3a98837339882810f54b15fd4eb5063424863169decb68578100ae8049a

diff --git a/kde-apps/kabcclient/kabcclient-4.14.11_pre20160211.ebuild 
b/kde-apps/kabcclient/kabcclient-4.14.11_pre20160211.ebuild
deleted file mode 100644
index 3fce87698a8..00000000000
--- a/kde-apps/kabcclient/kabcclient-4.14.11_pre20160211.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-EGIT_BRANCH="KDE/4.14"
-KMMODULE="console/${PN}"
-inherit kde4-meta
-
-DESCRIPTION="Command line client for accessing the KDE addressbook"
-COMMIT_ID="2aec255c6465676404e4694405c153e485e477d9"
-SRC_URI="https://quickgit.kde.org/?p=kdepim.git&a=snapshot&h=${COMMIT_ID}&fmt=tgz
 -> ${KMNAME}-${PV}.tar.gz"
-
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-       $(add_kdeapps_dep kdepimlibs 'akonadi(+)')
-"
-RDEPEND="${DEPEND}"
-
-src_install() {
-       kde4-meta_src_install
-
-       # work around NULL DT_RPATH in kabc2mutt
-       dosym kabcclient /usr/bin/kabc2mutt
-}

diff --git a/kde-apps/kaddressbook/Manifest b/kde-apps/kaddressbook/Manifest
index 0fce347b4f2..b183d9adf00 100644
--- a/kde-apps/kaddressbook/Manifest
+++ b/kde-apps/kaddressbook/Manifest
@@ -1,4 +1,3 @@
 DIST kaddressbook-17.04.0.tar.xz 561852 SHA256 
9f50478678b2b9073b8bc9ca3de5d8174d9d08aba2e9af248d78451b85edf4e1 SHA512 
db9f61c87721ed3c4ace8b4063ab34fce31402e2f8c5c9c1a108cbee3e34c3af2de48b9f30b82edf0d81d3bd8006743cded1632a53fbab5c09f3de4f8fe9b095
 WHIRLPOOL 
40952cd3ab27f4103a5509a25b7a5318fdfa5713ceeaaed143f2c0324ccb39c82c8bc64d8747927364e721a6c9d1eb86c5692281513bb7ba7688d154efa6dd83
-DIST kdepim-4.14.11_pre20160211.tar.gz 18551484 SHA256 
b970c0c04652519cc7e88d818b3a29e7b356a73f449f7f6e5767d60e5b2a17e3 SHA512 
e7fcf14353e457e9b3ec2d7eefa18ac0d9bc454ecaa682dcaf1585a6a36968bc8d7ea6ab61398a8d697d9343f0cd87472a906d444f814cd44956b6499826bb1d
 WHIRLPOOL 
f66fd74138ce871f88ce211c3b6af287cddaeda493e42c3b683938c274482d1f09a3ae659d380d4e19f5e5da70f5724ddd48723acf5846f6a1e9c01a79803e7e
 DIST kdepim-4.14.11_pre20160611.tar.xz 14805956 SHA256 
a9c3f5288efe0ccba3ffb88d4a63ac7b46a6b1ffe3c03b738ac6a53ef48e50b0 SHA512 
5ed0d2f814a7aac7f9977840bcda8ba98dc66c8ffe921d30430db07b06de2850d76140a5e5fa44db09e3cb4cac09fee0d8e0e4c208b752d52aecb453a4dc1b08
 WHIRLPOOL 
c6377c37b1a88a9d3958af5af081706e00437c3d0c28152a7e9353c49e376a3acdcdca0055d339f15287e6e101d6367a4d083b1a68162da9d4cc3d26178f62c5
 DIST kdepim-4.4.2017.04.tar.xz 8964644 SHA256 
943019fbf6e480761ccac4a1d54d71d5d38c88fd832e952cb03d73975f9a8535 SHA512 
d00e288563975e38f1bf4d28ed4724a9e159fab8ca37a61039aea730d22cae0c7e9921e04423bbbe6a74ee19319c57f79139d3a2b5048985675f836fd5dc77ab
 WHIRLPOOL 
1818df486e46f7345523360d05ab1d19b00906f1b51677010d0cd2f31ddd914c1e96c3a98837339882810f54b15fd4eb5063424863169decb68578100ae8049a

diff --git a/kde-apps/kaddressbook/kaddressbook-4.14.11_pre20160211.ebuild 
b/kde-apps/kaddressbook/kaddressbook-4.14.11_pre20160211.ebuild
deleted file mode 100644
index 6c56b30617e..00000000000
--- a/kde-apps/kaddressbook/kaddressbook-4.14.11_pre20160211.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-EGIT_BRANCH="KDE/4.14"
-inherit kde4-meta
-
-DESCRIPTION="The KDE Address Book"
-HOMEPAGE="https://www.kde.org/applications/office/kaddressbook/";
-COMMIT_ID="2aec255c6465676404e4694405c153e485e477d9"
-SRC_URI="https://quickgit.kde.org/?p=kdepim.git&a=snapshot&h=${COMMIT_ID}&fmt=tgz
 -> ${KMNAME}-${PV}.tar.gz"
-
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-       $(add_kdeapps_dep kdepimlibs 'akonadi(+)')
-       $(add_kdeapps_dep kdepim-common-libs)
-       dev-libs/grantlee:0
-       !kde-base/contactthemeeditor
-"
-RDEPEND="${DEPEND}
-       !>kde-apps/kdepimlibs-4.14.11_pre20160211-r3
-"
-
-KMEXTRA="
-       grantleeeditor/contactthemeeditor
-       plugins/kaddressbook/
-       plugins/ktexteditor/
-"
-KMCOMPILEONLY="
-       grantleetheme/
-       kaddressbookgrantlee/
-"
-KMEXTRACTONLY="
-       akonadi_next/
-       calendarsupport/
-       grantleeeditor/grantleethemeeditor/
-       libkleo/
-       pimcommon/
-"
-
-KMLOADLIBS="kdepim-common-libs"
-
-pkg_postinst() {
-       kde4-meta_pkg_postinst
-
-       if ! has_version kde-apps/kdepim-kresources:${SLOT}; then
-               echo
-               elog "For groupware functionality, please install 
kde-apps/kdepim-kresources:${SLOT}"
-               echo
-       fi
-}

diff --git a/kde-apps/kalarm/Manifest b/kde-apps/kalarm/Manifest
index 3d7e1abd605..1549c2e1c19 100644
--- a/kde-apps/kalarm/Manifest
+++ b/kde-apps/kalarm/Manifest
@@ -1,4 +1,3 @@
 DIST kalarm-17.04.0.tar.xz 1823760 SHA256 
e7911fee91804f9e401a11ac0423f0a2fe5e04741146dcdcf08053c7cba30bff SHA512 
1c7eba06e9998addb1ca36375f556f2ffbc401acaf8a6240b14ff245ec52eddfa503ea2ccfa608b743522c1e3787d9a5f4f6488e67803552cad1519efd907545
 WHIRLPOOL 
10b45398ced32722439925399ed6b6f9a7ef68725cae1b5e73593a8de643feb86e7ced15de7183b1cf0a205bd59b2ca205d691423aefd8173b0fbde196ec00d1
-DIST kdepim-4.14.11_pre20160211.tar.gz 18551484 SHA256 
b970c0c04652519cc7e88d818b3a29e7b356a73f449f7f6e5767d60e5b2a17e3 SHA512 
e7fcf14353e457e9b3ec2d7eefa18ac0d9bc454ecaa682dcaf1585a6a36968bc8d7ea6ab61398a8d697d9343f0cd87472a906d444f814cd44956b6499826bb1d
 WHIRLPOOL 
f66fd74138ce871f88ce211c3b6af287cddaeda493e42c3b683938c274482d1f09a3ae659d380d4e19f5e5da70f5724ddd48723acf5846f6a1e9c01a79803e7e
 DIST kdepim-4.14.11_pre20160611.tar.xz 14805956 SHA256 
a9c3f5288efe0ccba3ffb88d4a63ac7b46a6b1ffe3c03b738ac6a53ef48e50b0 SHA512 
5ed0d2f814a7aac7f9977840bcda8ba98dc66c8ffe921d30430db07b06de2850d76140a5e5fa44db09e3cb4cac09fee0d8e0e4c208b752d52aecb453a4dc1b08
 WHIRLPOOL 
c6377c37b1a88a9d3958af5af081706e00437c3d0c28152a7e9353c49e376a3acdcdca0055d339f15287e6e101d6367a4d083b1a68162da9d4cc3d26178f62c5
 DIST kdepim-4.4.2017.04.tar.xz 8964644 SHA256 
943019fbf6e480761ccac4a1d54d71d5d38c88fd832e952cb03d73975f9a8535 SHA512 
d00e288563975e38f1bf4d28ed4724a9e159fab8ca37a61039aea730d22cae0c7e9921e04423bbbe6a74ee19319c57f79139d3a2b5048985675f836fd5dc77ab
 WHIRLPOOL 
1818df486e46f7345523360d05ab1d19b00906f1b51677010d0cd2f31ddd914c1e96c3a98837339882810f54b15fd4eb5063424863169decb68578100ae8049a

diff --git a/kde-apps/kalarm/kalarm-4.14.11_pre20160211.ebuild 
b/kde-apps/kalarm/kalarm-4.14.11_pre20160211.ebuild
deleted file mode 100644
index 96418a1d422..00000000000
--- a/kde-apps/kalarm/kalarm-4.14.11_pre20160211.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-EGIT_BRANCH="KDE/4.14"
-inherit kde4-meta
-
-DESCRIPTION="Personal alarm message, command and email scheduler by KDE"
-HOMEPAGE+=" https://userbase.kde.org/KAlarm";
-COMMIT_ID="2aec255c6465676404e4694405c153e485e477d9"
-SRC_URI="https://quickgit.kde.org/?p=kdepim.git&a=snapshot&h=${COMMIT_ID}&fmt=tgz
 -> ${KMNAME}-${PV}.tar.gz"
-
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-RDEPEND="
-       $(add_kdeapps_dep kdepimlibs 'akonadi(+)')
-       $(add_kdeapps_dep kdepim-common-libs)
-       $(add_kdeapps_dep ktimezoned)
-       media-libs/phonon[qt4]
-       x11-libs/libX11
-"
-DEPEND="${RDEPEND}"
-
-KMEXTRACTONLY="
-       kmail/
-"

diff --git a/kde-apps/kdepim-common-libs/Manifest 
b/kde-apps/kdepim-common-libs/Manifest
index e440cd85011..4684ba42767 100644
--- a/kde-apps/kdepim-common-libs/Manifest
+++ b/kde-apps/kdepim-common-libs/Manifest
@@ -1,2 +1 @@
-DIST kdepim-4.14.11_pre20160211.tar.gz 18551484 SHA256 
b970c0c04652519cc7e88d818b3a29e7b356a73f449f7f6e5767d60e5b2a17e3 SHA512 
e7fcf14353e457e9b3ec2d7eefa18ac0d9bc454ecaa682dcaf1585a6a36968bc8d7ea6ab61398a8d697d9343f0cd87472a906d444f814cd44956b6499826bb1d
 WHIRLPOOL 
f66fd74138ce871f88ce211c3b6af287cddaeda493e42c3b683938c274482d1f09a3ae659d380d4e19f5e5da70f5724ddd48723acf5846f6a1e9c01a79803e7e
 DIST kdepim-4.14.11_pre20160611.tar.xz 14805956 SHA256 
a9c3f5288efe0ccba3ffb88d4a63ac7b46a6b1ffe3c03b738ac6a53ef48e50b0 SHA512 
5ed0d2f814a7aac7f9977840bcda8ba98dc66c8ffe921d30430db07b06de2850d76140a5e5fa44db09e3cb4cac09fee0d8e0e4c208b752d52aecb453a4dc1b08
 WHIRLPOOL 
c6377c37b1a88a9d3958af5af081706e00437c3d0c28152a7e9353c49e376a3acdcdca0055d339f15287e6e101d6367a4d083b1a68162da9d4cc3d26178f62c5

diff --git a/kde-apps/kdepim-common-libs/files/install-composereditorng.patch 
b/kde-apps/kdepim-common-libs/files/install-composereditorng.patch
deleted file mode 100644
index 37dc26c3f4b..00000000000
--- a/kde-apps/kdepim-common-libs/files/install-composereditorng.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/composereditor-ng/CMakeLists.txt    2013-02-25 03:16:44.129528884 +0000
-+++ b/composereditor-ng/CMakeLists.txt.new        2013-02-25 
03:18:48.016192479 +0000
-@@ -58,8 +58,8 @@
- install(TARGETS composereditorng ${INSTALL_TARGETS_DEFAULT_ARGS} )
- install( FILES data/composereditorinitialhtml DESTINATION  
${DATA_INSTALL_DIR}/composereditor )
- 
--#install( FILES
--#         composereditor_export.h
--#         composereditor.h
--#         DESTINATION ${INCLUDE_INSTALL_DIR}/composereditorng COMPONENT Devel 
)
-+install( FILES
-+         composereditor_export.h
-+         composereditor.h
-+         DESTINATION ${INCLUDE_INSTALL_DIR}/composereditorng COMPONENT Devel )
-

diff --git 
a/kde-apps/kdepim-common-libs/files/kdepim-common-libs-install-headers.patch 
b/kde-apps/kdepim-common-libs/files/kdepim-common-libs-install-headers.patch
deleted file mode 100644
index f0037beac4c..00000000000
--- a/kde-apps/kdepim-common-libs/files/kdepim-common-libs-install-headers.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-Install headers needed by Kopete's cryptography plugin.
-
-Patch borrowed from Fedora.
-
-diff --git a/libkleo/CMakeLists.txt b/libkleo/CMakeLists.txt
-index 84e660f..bfb92f8 100644
---- a/libkleo/CMakeLists.txt
-+++ b/libkleo/CMakeLists.txt
-@@ -124,3 +124,61 @@ install ( FILES libkleopatrarc-win32.desktop DESTINATION 
${CONFIG_INSTALL_DIR} R
- else ()
- install ( FILES libkleopatrarc.desktop DESTINATION ${CONFIG_INSTALL_DIR} 
RENAME libkleopatrarc )
- endif ()
-+
-+install( FILES
-+    kleo/kleo_export.h
-+    kleo/enum.h
-+    kleo/oidmap.h
-+    kleo/cryptobackend.h
-+    kleo/cryptobackendfactory.h
-+    kleo/cryptoconfig.h
-+    kleo/dn.h
-+    kleo/job.h
-+    kleo/keylistjob.h
-+    kleo/keygenerationjob.h
-+    kleo/abstractimportjob.h
-+    kleo/importjob.h
-+    kleo/importfromkeyserverjob.h
-+    kleo/exportjob.h
-+    kleo/changeexpiryjob.h
-+    kleo/changeownertrustjob.h
-+    kleo/downloadjob.h
-+    kleo/deletejob.h
-+    kleo/encryptjob.h
-+    kleo/decryptjob.h
-+    kleo/signjob.h
-+    kleo/specialjob.h
-+    kleo/verifydetachedjob.h
-+    kleo/verifyopaquejob.h
-+    kleo/decryptverifyjob.h
-+    kleo/signencryptjob.h
-+    kleo/signkeyjob.h
-+    kleo/adduseridjob.h
-+    kleo/refreshkeysjob.h
-+    kleo/multideletejob.h
-+    kleo/hierarchicalkeylistjob.h
-+    kleo/keyfilter.h
-+    kleo/keyfiltermanager.h
-+    kleo/changepasswdjob.h
-+    kleo/checksumdefinition.h
-+    kleo/exception.h
-+    kleo/kconfigbasedkeyfilter.h
-+    kleo/listallkeysjob.h
-+    kleo/stl_util.h
-+    DESTINATION ${INCLUDE_INSTALL_DIR}/kleo COMPONENT Devel)
-+
-+install ( FILES
-+    ui/kdhorizontalline.h
-+    ui/messagebox.h
-+    ui/progressbar.h
-+    ui/progressdialog.h
-+    ui/keylistview.h
-+    ui/keyselectiondialog.h
-+    ui/keyrequester.h
-+    ui/keyapprovaldialog.h
-+    ui/dnattributeorderconfigwidget.h
-+    ui/cryptoconfigmodule.h
-+    ui/cryptoconfigdialog.h
-+    ui/directoryserviceswidget.h
-+    ui/filenamerequester.h
-+    DESTINATION ${INCLUDE_INSTALL_DIR}/kleo/ui COMPONENT Devel)
-diff --git a/libkpgp/CMakeLists.txt b/libkpgp/CMakeLists.txt
-index 4be58ba..de868ad 100644
---- a/libkpgp/CMakeLists.txt
-+++ b/libkpgp/CMakeLists.txt
-@@ -35,3 +35,11 @@ add_subdirectory( tests )
- install(FILES kconf_update/kpgp.upd  DESTINATION ${KCONF_UPDATE_INSTALL_DIR})
- install(PROGRAMS kconf_update/kpgp-3.1-upgrade-address-data.pl DESTINATION 
${KCONF_UPDATE_INSTALL_DIR})
- 
-+install(FILES
-+        kpgp.h
-+        kpgpbase.h
-+        kpgpblock.h
-+        kpgpkey.h
-+        kpgpui.h
-+        libkpgp_export.h
-+        DESTINATION ${INCLUDE_INSTALL_DIR}/kpgp COMPONENT Devel )

diff --git 
a/kde-apps/kdepim-common-libs/kdepim-common-libs-4.14.11_pre20160211-r1.ebuild 
b/kde-apps/kdepim-common-libs/kdepim-common-libs-4.14.11_pre20160211-r1.ebuild
deleted file mode 100644
index 0fcd4f30030..00000000000
--- 
a/kde-apps/kdepim-common-libs/kdepim-common-libs-4.14.11_pre20160211-r1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KMNAME="kdepim"
-EGIT_BRANCH="KDE/4.14"
-KMNOMODULE="true"
-WEBKIT_REQUIRED="always"
-inherit kde4-meta
-
-DESCRIPTION="Common libraries for KDE PIM apps"
-COMMIT_ID="2aec255c6465676404e4694405c153e485e477d9"
-SRC_URI="https://quickgit.kde.org/?p=kdepim.git&a=snapshot&h=${COMMIT_ID}&fmt=tgz
 -> ${KMNAME}-${PV}.tar.gz"
-
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
-IUSE="debug google"
-
-DEPEND="
-       $(add_kdeapps_dep kdepimlibs 'akonadi(+)' 4.14.11_pre20160211-r3)
-       app-crypt/gpgme
-       dev-libs/grantlee:0
-       kde-apps/akonadi:4
-       kde-frameworks/baloo:4
-       google? ( $(add_kdeapps_dep libkgapi '' 2.2.0) )
-"
-RDEPEND="${DEPEND}
-       !kde-apps/libkdepim:4
-       !kde-apps/libkleo:4
-       !kde-apps/libkpgp:4
-       !<kde-apps/kaddressbook-4.11.50:4
-       !kde-apps/kdepim-wizards:4
-       !>kde-apps/kdepimlibs-4.14.11_pre20160211-r3
-       !<kde-apps/kmail-4.14.5:4
-       !<kde-apps/korganizer-4.5.67:4
-       $(add_kdeapps_dep kdepim-runtime)
-       app-crypt/gnupg
-"
-
-RESTRICT="test"
-# bug 393131
-
-KMEXTRA="
-       agents/sendlateragent/
-       akonadi_next/
-       calendarsupport/
-       calendarviews/
-       composereditor-ng/
-       grantleeeditor/grantleethemeeditor/
-       grantleetheme/
-       incidenceeditor-ng/
-       libkdepim/
-       libkdepimdbusinterfaces/
-       libkleo/
-       libkpgp/
-       kaddressbookgrantlee/
-       kdgantt2/
-       mailcommon/
-       mailimporter/
-       messagecomposer/
-       messagecore/
-       messagelist/
-       messageviewer/
-       noteshared/
-       pimcommon/
-       templateparser/
-"
-KMEXTRACTONLY="
-       agents/mailfilteragent/org.freedesktop.Akonadi.MailFilterAgent.xml
-       kleopatra/
-       kmail/
-       knode/org.kde.knode.xml
-       korgac/org.kde.korganizer.KOrgac.xml
-       korganizer/data/org.kde.korganizer.Korganizer.xml
-       korganizer/data/org.kde.Korganizer.Calendar.xml
-"
-KMSAVELIBS="true"
-
-PATCHES=(
-       "${FILESDIR}/install-composereditorng.patch"
-       "${FILESDIR}/${PN}-install-headers.patch"
-)
-
-src_prepare() {
-       kde4-meta_src_prepare
-       sed -e '/folderarchiveagent.desktop/d' \
-               -i agents/CMakeLists.txt || die
-}
-
-src_configure() {
-       local mycmakeargs=(
-               $(cmake-utils_use_find_package google LibKGAPI2)
-       )
-
-       kde4-meta_src_configure
-}

diff --git a/kde-apps/kdepim-kresources/Manifest 
b/kde-apps/kdepim-kresources/Manifest
index 2da6ebd9cbd..2e6c7bd033f 100644
--- a/kde-apps/kdepim-kresources/Manifest
+++ b/kde-apps/kdepim-kresources/Manifest
@@ -1,3 +1,2 @@
-DIST kdepim-4.14.11_pre20160211.tar.gz 18551484 SHA256 
b970c0c04652519cc7e88d818b3a29e7b356a73f449f7f6e5767d60e5b2a17e3 SHA512 
e7fcf14353e457e9b3ec2d7eefa18ac0d9bc454ecaa682dcaf1585a6a36968bc8d7ea6ab61398a8d697d9343f0cd87472a906d444f814cd44956b6499826bb1d
 WHIRLPOOL 
f66fd74138ce871f88ce211c3b6af287cddaeda493e42c3b683938c274482d1f09a3ae659d380d4e19f5e5da70f5724ddd48723acf5846f6a1e9c01a79803e7e
 DIST kdepim-4.14.11_pre20160611.tar.xz 14805956 SHA256 
a9c3f5288efe0ccba3ffb88d4a63ac7b46a6b1ffe3c03b738ac6a53ef48e50b0 SHA512 
5ed0d2f814a7aac7f9977840bcda8ba98dc66c8ffe921d30430db07b06de2850d76140a5e5fa44db09e3cb4cac09fee0d8e0e4c208b752d52aecb453a4dc1b08
 WHIRLPOOL 
c6377c37b1a88a9d3958af5af081706e00437c3d0c28152a7e9353c49e376a3acdcdca0055d339f15287e6e101d6367a4d083b1a68162da9d4cc3d26178f62c5
 DIST kdepim-4.4.2017.04.tar.xz 8964644 SHA256 
943019fbf6e480761ccac4a1d54d71d5d38c88fd832e952cb03d73975f9a8535 SHA512 
d00e288563975e38f1bf4d28ed4724a9e159fab8ca37a61039aea730d22cae0c7e9921e04423bbbe6a74ee19319c57f79139d3a2b5048985675f836fd5dc77ab
 WHIRLPOOL 
1818df486e46f7345523360d05ab1d19b00906f1b51677010d0cd2f31ddd914c1e96c3a98837339882810f54b15fd4eb5063424863169decb68578100ae8049a

diff --git 
a/kde-apps/kdepim-kresources/kdepim-kresources-4.14.11_pre20160211.ebuild 
b/kde-apps/kdepim-kresources/kdepim-kresources-4.14.11_pre20160211.ebuild
deleted file mode 100644
index 46b5fc58822..00000000000
--- a/kde-apps/kdepim-kresources/kdepim-kresources-4.14.11_pre20160211.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KMNAME="kdepim"
-EGIT_BRANCH="KDE/4.14"
-KMMODULE="kresources"
-inherit kde4-meta
-
-DESCRIPTION="KDE PIM groupware plugin collection"
-COMMIT_ID="2aec255c6465676404e4694405c153e485e477d9"
-SRC_URI="https://quickgit.kde.org/?p=kdepim.git&a=snapshot&h=${COMMIT_ID}&fmt=tgz
 -> ${KMNAME}-${PV}.tar.gz"
-
-IUSE="debug"
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
-       $(add_kdeapps_dep kdepimlibs 'akonadi(+)')
-       $(add_kdeapps_dep kdepim-common-libs)
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="
-       kmail/
-       knotes/
-       korganizer/version.h
-"
-
-KMLOADLIBS="kdepim-common-libs"

diff --git a/kde-apps/kdepim-meta/kdepim-meta-4.14.11_pre20160211.ebuild 
b/kde-apps/kdepim-meta/kdepim-meta-4.14.11_pre20160211.ebuild
deleted file mode 100644
index 535bd94429b..00000000000
--- a/kde-apps/kdepim-meta/kdepim-meta-4.14.11_pre20160211.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_BLOCK_SLOT4="false"
-inherit kde5-meta-pkg
-
-DESCRIPTION="kdepim - merge this to pull in all kdepim-derived packages"
-HOMEPAGE+=" https://community.kde.org/KDE_PIM";
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
-IUSE="nls"
-SLOT="4"
-
-RDEPEND="
-       kde-frameworks/oxygen-icons:5
-       $(add_kdeapps_dep akonadiconsole '' 4.14.10)
-       $(add_kdeapps_dep akregator '' 4.14.10)
-       $(add_kdeapps_dep blogilo '' 4.14.10)
-       $(add_kdeapps_dep calendarjanitor '' 4.14.10)
-       $(add_kdeapps_dep kabcclient '' 4.14.10)
-       $(add_kdeapps_dep kaddressbook '' 4.14.10)
-       $(add_kdeapps_dep kalarm '' 4.14.10)
-       $(add_kdeapps_dep kdepim-kresources '' 4.14.10)
-       $(add_kdeapps_dep kdepim-runtime '' 4.14.10)
-       $(add_kdeapps_dep kjots '' 4.14.10)
-       $(add_kdeapps_dep kleopatra '' 4.14.10)
-       $(add_kdeapps_dep kmail '' 4.14.10)
-       $(add_kdeapps_dep knode '' 4.14.10)
-       $(add_kdeapps_dep knotes '' 4.14.10)
-       $(add_kdeapps_dep konsolekalendar '' 4.14.10)
-       $(add_kdeapps_dep kontact '' 4.14.10)
-       $(add_kdeapps_dep korganizer '' 4.14.10)
-       $(add_kdeapps_dep ktimetracker '' 4.14.10)
-       $(add_kdeapps_dep ktnef '' 4.14.10)
-       nls? (
-               $(add_kdeapps_dep kde4-l10n '' 4.14.3-r1)
-               $(add_kdeapps_dep kdepim-l10n '' 4.14.3-r1)
-       )
-"

diff --git a/kde-apps/kdepimlibs/Manifest b/kde-apps/kdepimlibs/Manifest
index fdb838d9079..9ee4c401da2 100644
--- a/kde-apps/kdepimlibs/Manifest
+++ b/kde-apps/kdepimlibs/Manifest
@@ -1,2 +1 @@
-DIST kdepimlibs-4.14.11_pre20160211.tar.gz 4300730 SHA256 
3c2559987871761ac13185b0ffa9f7575fe0a5c2e00950b433b25edea7ec47fd SHA512 
d0977a5387b0937d850fb3adc8c0bc8086ddb0894d238272f0586e53cc8a157a50b7e6d4aeb97a7fb944521de4f8978a23f172a6bf1b8e6afbbba5a183832b1c
 WHIRLPOOL 
28bdf9c93de2c500fe2c1264c8dff42cc816d414d6b15820bc6c6aaaafc0fe67008ce13b678e0c41ac6780863e94eccb43ab18beb4c052230cad312f4530f58d
 DIST kdepimlibs-4.14.11_pre20160611.tar.xz 2860084 SHA256 
15ebde0f9683f42b89dc2ad6656bc71bf516e2b885333cc5438891217e59ddd4 SHA512 
19560362f07328f3743b5aabdef74a55e3ac7f8016f1bb6d63aa792985b9b0c4d3f34e979df6022df31623ffb7f701c90f9262a70cc9326596429ff1395c4f6d
 WHIRLPOOL 
cddf5beb57f66e19b60baa896ba08879c1537d44cb35fb33776c439461411a1e0b07ec03229bc1d4a6d086235e50c19022411fe1d2a56d7901d8a6e9c1fbcbd0

diff --git a/kde-apps/kdepimlibs/files/kdepimlibs-4.14.11-boostincludes.patch 
b/kde-apps/kdepimlibs/files/kdepimlibs-4.14.11-boostincludes.patch
deleted file mode 100644
index 1b5cdcb52e4..00000000000
--- a/kde-apps/kdepimlibs/files/kdepimlibs-4.14.11-boostincludes.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Make sure that the Boost headers are actually found, since they are
-referenced in the kdepimlibs headers. 
-Patch by Alex Turbov, see https://bugs.kde.org/show_bug.cgi?id=306323
-
---- a/KdepimLibsConfig.cmake.in.org    2012-08-13 12:46:24.000000000 +0400
-+++ b/KdepimLibsConfig.cmake.in        2012-09-06 08:53:53.000000000 +0400
-@@ -15,7 +15,7 @@
- set(KDEPIMLIBS_DBUS_INTERFACES_DIR "@KDEPIMLIBS_DBUS_INTERFACES_DIR@")
- set(KDEPIMLIBS_DBUS_SERVICES_DIR   "@KDEPIMLIBS_DBUS_SERVICES_DIR@")
- set(KDEPIMLIBS_INCLUDE_DIR         "@KDEPIMLIBS_INCLUDE_DIR@")
--set(KDEPIMLIBS_INCLUDE_DIRS        "@KDEPIMLIBS_INCLUDE_DIR@" 
"@KDEPIMLIBS_INCLUDE_DIR@/KDE")
-+set(KDEPIMLIBS_INCLUDE_DIRS        "@KDEPIMLIBS_INCLUDE_DIR@" 
"@KDEPIMLIBS_INCLUDE_DIR@/KDE" "@Boost_INCLUDE_DIR@")
- set(KDEPIMLIBS_LIB_DIR             "@KDEPIMLIBS_LIB_DIR@")
- set(KDEPIMLIBS_BIN_DIR             "@KDEPIMLIBS_BIN_DIR@")
- set(KDEPIMLIBS_LIBEXEC_DIR         "@KDEPIMLIBS_LIBEXEC_DIR@")

diff --git a/kde-apps/kdepimlibs/files/kdepimlibs-4.14.11-gpgme-1.8.0.patch 
b/kde-apps/kdepimlibs/files/kdepimlibs-4.14.11-gpgme-1.8.0.patch
deleted file mode 100644
index 83a128c8f6c..00000000000
--- a/kde-apps/kdepimlibs/files/kdepimlibs-4.14.11-gpgme-1.8.0.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-commit 0b684a86d8cf918a4c2ab047a4d6c3034a93c12b
-Author: Andreas Sturmlechner <[email protected]>
-Date:   Sun Mar 5 18:28:45 2017 +0100
-
-    Adapt to >=gpgme-1.8.0, need for -phtread is gone
-
-diff --git a/cmake/modules/FindGpgme.cmake b/cmake/modules/FindGpgme.cmake
-index 5da9a60..268314a 100644
---- a/cmake/modules/FindGpgme.cmake
-+++ b/cmake/modules/FindGpgme.cmake
-@@ -11,12 +11,12 @@
- #    - GPGME_INCLUDES is the same for all of the above
- #    - GPGME_FOUND is set if any of the above was found
- #  - *nix:
--#    There's also three variants: gpgme{,-pthread,-pth}.
-+#    There's also two variants: gpgme{,-pth}.
- #    - The variant used determines the multithreaded use possible:
--#      - gpgme:         no multithreading support available
--#      - gpgme-pthread: multithreading available using POSIX threads
-+#      - gpgme:         >=GpgME-1.8.0 multithreading support available
- #      - gpgme-pth:     multithreading available using GNU PTH (cooperative 
multithreading)
--#    - GPGME_{VANILLA,PTH,PTHREAD}_{FOUND,LIBRARIES} will be set for each of 
the above
-+#    - GPGME_{VANILLA,PTH}_{FOUND,LIBRARIES} will be set for each of the above
-+#    - GPGME_PTHREAD_{FOUND,LIBRARIES} will be set for legacy compatibility
- #    - GPGME_INCLUDES is the same for all of the above
- #    - GPGME_FOUND is set if any of the above was found
- #
-@@ -164,7 +164,7 @@ else() # not WIN32
-   if ( _seem_to_have_cached_gpgme )
- 
-     macro_bool_to_bool( GPGME_VANILLA_LIBRARIES GPGME_VANILLA_FOUND )
--    macro_bool_to_bool( GPGME_PTHREAD_LIBRARIES GPGME_PTHREAD_FOUND )
-+    macro_bool_to_bool( GPGME_VANILLA_LIBRARIES GPGME_PTHREAD_FOUND )
-     macro_bool_to_bool( GPGME_PTH_LIBRARIES     GPGME_PTH_FOUND     )
- 
-     if ( GPGME_VANILLA_FOUND OR GPGME_PTHREAD_FOUND OR GPGME_PTH_FOUND )
-@@ -189,7 +189,7 @@ else() # not WIN32
- 
-       exec_program( ${_GPGMECONFIG_EXECUTABLE} ARGS --version OUTPUT_VARIABLE 
GPGME_VERSION )
- 
--      set( _GPGME_MIN_VERSION "1.1.7" )
-+      set( _GPGME_MIN_VERSION "1.7.99" )
-       if( ${GPGME_VERSION} VERSION_GREATER ${_GPGME_MIN_VERSION} )
-         set( _GPGME_INSTALLED_VERSION_OK TRUE )
-       endif()
-@@ -207,7 +207,7 @@ else() # not WIN32
-         set( _gpgme_config_vanilla_libs )
-       endif()
- 
--        exec_program( ${_GPGMECONFIG_EXECUTABLE} ARGS --thread=pthread --libs 
OUTPUT_VARIABLE _gpgme_config_pthread_libs RETURN_VALUE _ret )
-+        exec_program( ${_GPGMECONFIG_EXECUTABLE} ARGS                  --libs 
OUTPUT_VARIABLE _gpgme_config_pthread_libs RETURN_VALUE _ret )
-       if ( _ret )
-         set( _gpgme_config_pthread_libs )
-       endif()
-@@ -294,7 +294,7 @@ else() # not WIN32
-           # This comment above doesn't make sense, the four following lines 
seem to do nothing. Alex
-           set( GPGME_INCLUDES          ${GPGME_INCLUDES} )
-           set( GPGME_VANILLA_LIBRARIES ${GPGME_VANILLA_LIBRARIES} )
--          set( GPGME_PTHREAD_LIBRARIES ${GPGME_PTHREAD_LIBRARIES} )
-+          set( GPGME_PTHREAD_LIBRARIES ${GPGME_VANILLA_LIBRARIES} )
-           set( GPGME_PTH_LIBRARIES     ${GPGME_PTH_LIBRARIES} )
- 
-           if ( GPGME_VANILLA_FOUND OR GPGME_PTHREAD_FOUND OR GPGME_PTH_FOUND )
-@@ -319,7 +319,7 @@ else() # not WIN32
- 
-   macro_bool_to_01( GPGME_FOUND         HAVE_GPGME         )
-   macro_bool_to_01( GPGME_VANILLA_FOUND HAVE_GPGME_VANILLA )
--  macro_bool_to_01( GPGME_PTHREAD_FOUND HAVE_GPGME_PTHREAD )
-+  macro_bool_to_01( GPGME_VANILLA_FOUND HAVE_GPGME_PTHREAD )
-   macro_bool_to_01( GPGME_PTH_FOUND     HAVE_GPGME_PTH     )
- 
- endif() # WIN32 | Unix
-diff --git a/cmake/modules/FindQGpgme.cmake b/cmake/modules/FindQGpgme.cmake
-index 50013eb..4d94af6 100644
---- a/cmake/modules/FindQGpgme.cmake
-+++ b/cmake/modules/FindQGpgme.cmake
-@@ -12,13 +12,8 @@ find_package(Gpgme QUIET)
- 
- if(GPGME_FOUND)
- 
--   if ( WIN32 )
--      find_library(_QGPGME_EXTRA_LIBRARY gpgme++
--                   HINTS ${GPGME_LIBRARY_DIR})
--   else ( WIN32 )
--      find_library(_QGPGME_EXTRA_LIBRARY gpgme++-pthread
--                   HINTS ${GPGME_LIBRARY_DIR})
--   endif()
-+   find_library(_QGPGME_EXTRA_LIBRARY gpgme++
-+                HINTS ${GPGME_LIBRARY_DIR})
- 
-    find_library(QGPGME_LIBRARY qgpgme
-                 HINTS ${GPGME_LIBRARY_DIR})
-@@ -34,7 +29,7 @@ if(GPGME_FOUND)
-    if ( WIN32 )
-       set(QGPGME_LIBRARIES ${QGPGME_LIBRARY} ${_QGPGME_EXTRA_LIBRARY} 
${GPGME_VANILLA_LIBRARIES} ${GPGME_QT_LIBRARIES})
-    else ( WIN32 )
--      set(QGPGME_LIBRARIES ${QGPGME_LIBRARY} ${_QGPGME_EXTRA_LIBRARY} 
${GPGME_PTHREAD_LIBRARIES})
-+      set(QGPGME_LIBRARIES ${QGPGME_LIBRARY} ${_QGPGME_EXTRA_LIBRARY} 
${GPGME_VANILLA_LIBRARIES})
-    endif()
- 
- endif()

diff --git a/kde-apps/kdepimlibs/files/kdepimlibs-CVE-2016-7966-r1.patch 
b/kde-apps/kdepimlibs/files/kdepimlibs-CVE-2016-7966-r1.patch
deleted file mode 100644
index 9bea5726d03..00000000000
--- a/kde-apps/kdepimlibs/files/kdepimlibs-CVE-2016-7966-r1.patch
+++ /dev/null
@@ -1,135 +0,0 @@
-From 176fee25ca79145ab5c8e2275d248f1a46a8d8cf Mon Sep 17 00:00:00 2001
-From: Montel Laurent <[email protected]>
-Date: Fri, 30 Sep 2016 15:55:35 +0200
-Subject: [PATCH] Backport avoid to transform as a url when we have a quote
-
----
- kpimutils/linklocator.cpp | 30 +++++++++++++++++++++++++++---
- kpimutils/linklocator.h   |  3 ++-
- 2 files changed, 29 insertions(+), 4 deletions(-)
-
-diff --git a/kpimutils/linklocator.cpp b/kpimutils/linklocator.cpp
-index f5d9afd..f30e8fc 100644
---- a/kpimutils/linklocator.cpp
-+++ b/kpimutils/linklocator.cpp
-@@ -95,6 +95,12 @@ int LinkLocator::maxAddressLen() const
- 
- QString LinkLocator::getUrl()
- {
-+    return getUrlAndCheckValidHref();
-+}
-+
-+
-+QString LinkLocator::getUrlAndCheckValidHref(bool *badurl)
-+{
-   QString url;
-   if ( atUrl() ) {
-     // NOTE: see http://tools.ietf.org/html/rfc3986#appendix-A and especially 
appendix-C
-@@ -129,13 +135,26 @@ QString LinkLocator::getUrl()
- 
-     url.reserve( maxUrlLen() );  // avoid allocs
-     int start = mPos;
-+    bool previousCharIsADoubleQuote = false;
-     while ( ( mPos < (int)mText.length() ) &&
-             ( mText[mPos].isPrint() || mText[mPos].isSpace() ) &&
-             ( ( afterUrl.isNull() && !mText[mPos].isSpace() ) ||
-               ( !afterUrl.isNull() && mText[mPos] != afterUrl ) ) ) {
-       if ( !mText[mPos].isSpace() ) {   // skip whitespace
--        url.append( mText[mPos] );
--        if ( url.length() > maxUrlLen() ) {
-+          if (mText[mPos] == QLatin1Char('>') && previousCharIsADoubleQuote) {
-+              //it's an invalid url
-+              if (badurl) {
-+                  *badurl = true;
-+              }
-+              return QString();
-+          }
-+          if (mText[mPos] == QLatin1Char('"')) {
-+              previousCharIsADoubleQuote = true;
-+          } else {
-+              previousCharIsADoubleQuote = false;
-+          }
-+          url.append( mText[mPos] );
-+          if ( url.length() > maxUrlLen() ) {
-           break;
-         }
-       }
-@@ -367,7 +386,12 @@ QString LinkLocator::convertToHtml( const QString 
&plainText, int flags,
-     } else {
-       const int start = locator.mPos;
-       if ( !( flags & IgnoreUrls ) ) {
--        str = locator.getUrl();
-+        bool badUrl = false;
-+        str = locator.getUrlAndCheckValidHref(&badUrl);
-+        if (badUrl) {
-+            return locator.mText;
-+        }
-+
-         if ( !str.isEmpty() ) {
-           QString hyperlink;
-           if ( str.left( 4 ) == QLatin1String("www.") ) {
-diff --git a/kpimutils/linklocator.h b/kpimutils/linklocator.h
-index 3049397..375498d 100644
---- a/kpimutils/linklocator.h
-+++ b/kpimutils/linklocator.h
-@@ -107,6 +107,7 @@ class KPIMUTILS_EXPORT LinkLocator
-       @return The URL at the current scan position, or an empty string.
-     */
-     QString getUrl();
-+    QString getUrlAndCheckValidHref(bool *badurl = 0);
- 
-     /**
-       Attempts to grab an email address. If there is an @ symbol at the
-@@ -155,7 +156,7 @@ class KPIMUTILS_EXPORT LinkLocator
-     */
-     static QString pngToDataUrl( const QString & iconPath );
- 
--  protected:
-+protected:
-     /**
-       The plaintext string being scanned for URLs and email addresses.
-     */
--- 
-2.7.3
-
-From 8bbe1bd3fdc55f609340edc667ff154b3d2aaab1 Mon Sep 17 00:00:00 2001
-From: Montel Laurent <[email protected]>
-Date: Tue, 11 Oct 2016 11:47:41 +0200
-Subject: [PATCH] Backport  show bad url text
-
----
- kpimutils/linklocator.cpp | 18 +++++++++++++++++-
- 1 file changed, 17 insertions(+), 1 deletion(-)
-
-diff --git a/kpimutils/linklocator.cpp b/kpimutils/linklocator.cpp
-index f30e8fc..4abe968 100644
---- a/kpimutils/linklocator.cpp
-+++ b/kpimutils/linklocator.cpp
-@@ -389,7 +389,23 @@ QString LinkLocator::convertToHtml( const QString 
&plainText, int flags,
-         bool badUrl = false;
-         str = locator.getUrlAndCheckValidHref(&badUrl);
-         if (badUrl) {
--            return locator.mText;
-+            QString resultBadUrl;
-+            const int helperTextSize(locator.mText.count());
-+            for (int i = 0; i < helperTextSize; ++i) {
-+                const QChar chBadUrl = locator.mText[i];
-+                if (chBadUrl == QLatin1Char('&')) {
-+                    resultBadUrl += QLatin1String("&amp;");
-+                } else if (chBadUrl == QLatin1Char('"')) {
-+                    resultBadUrl += QLatin1String("&quot;");
-+                } else if (chBadUrl == QLatin1Char('<')) {
-+                    resultBadUrl += QLatin1String("&lt;");
-+                } else if (chBadUrl == QLatin1Char('>')) {
-+                    resultBadUrl += QLatin1String("&gt;");
-+                } else {
-+                    resultBadUrl += chBadUrl;
-+                }
-+            }
-+            return resultBadUrl;
-         }
- 
-         if ( !str.isEmpty() ) {
--- 
-2.7.3
-

diff --git a/kde-apps/kdepimlibs/kdepimlibs-4.14.11_pre20160211-r3.ebuild 
b/kde-apps/kdepimlibs/kdepimlibs-4.14.11_pre20160211-r3.ebuild
deleted file mode 100644
index 0e0fe531648..00000000000
--- a/kde-apps/kdepimlibs/kdepimlibs-4.14.11_pre20160211-r3.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="optional"
-CPPUNIT_REQUIRED="optional"
-EGIT_BRANCH="KDE/4.14"
-inherit kde4-base
-
-DESCRIPTION="Common library for KDE PIM apps"
-COMMIT_ID="a791b69599c3571ff2f4b1cc9033d8fb30f1bc33"
-SRC_URI="https://quickgit.kde.org/?p=kdepimlibs.git&a=snapshot&h=${COMMIT_ID}&fmt=tgz
 -> ${P}.tar.gz"
-S=${WORKDIR}/${PN}
-
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
-LICENSE="LGPL-2.1"
-IUSE="debug ldap prison"
-
-# some akonadi tests timeout, that probaly needs more work as its ~700 tests
-RESTRICT="test"
-
-DEPEND="
-       >=app-crypt/gpgme-1.8.0
-       >=dev-libs/boost-1.35.0-r5:=
-       dev-libs/libgpg-error
-       >=dev-libs/libical-0.48-r2:=
-       dev-libs/cyrus-sasl
-       >=dev-libs/qjson-0.8.1
-       kde-apps/akonadi:4
-       media-libs/phonon[qt4]
-       x11-misc/shared-mime-info
-       prison? ( kde-frameworks/prison:4 )
-       ldap? ( net-nds/openldap )
-"
-# boost is not linked to, but headers which include it are installed
-# bug #418071
-RDEPEND="${DEPEND}
-       !app-crypt/gpgme[cxx]
-       !app-crypt/gpgme[qt5]
-       !<kde-apps/kdepim-runtime-4.4.11.1-r2:4
-"
-
-PATCHES=(
-       "${FILESDIR}/${PN}-4.14.11-boostincludes.patch"
-       "${FILESDIR}/${PN}-CVE-2016-7966-r1.patch"
-       "${FILESDIR}/${PN}-4.14.11-gpgme-1.8.0.patch"
-)
-
-src_configure() {
-       local mycmakeargs=(
-               -DBUILD_doc=$(usex handbook)
-               $(cmake-utils_use_find_package ldap Ldap)
-               $(cmake-utils_use_find_package prison Prison)
-       )
-
-       kde4-base_src_configure
-}
-
-src_install() {
-       kde4-base_src_install
-
-       # Collides with net-im/choqok
-       rm "${ED}"usr/share/apps/cmake/modules/FindQtOAuth.cmake || die
-
-       # contains constants/defines only
-       QA_DT_NEEDED="$(find "${ED}" -type f -name 'libakonadi-kabc.so.*' 
-printf '/%P\n')"
-}

diff --git a/kde-apps/kjots/Manifest b/kde-apps/kjots/Manifest
index 1f0260551c2..d35b7189d7d 100644
--- a/kde-apps/kjots/Manifest
+++ b/kde-apps/kjots/Manifest
@@ -1,4 +1,3 @@
-DIST kdepim-4.14.11_pre20160211.tar.gz 18551484 SHA256 
b970c0c04652519cc7e88d818b3a29e7b356a73f449f7f6e5767d60e5b2a17e3 SHA512 
e7fcf14353e457e9b3ec2d7eefa18ac0d9bc454ecaa682dcaf1585a6a36968bc8d7ea6ab61398a8d697d9343f0cd87472a906d444f814cd44956b6499826bb1d
 WHIRLPOOL 
f66fd74138ce871f88ce211c3b6af287cddaeda493e42c3b683938c274482d1f09a3ae659d380d4e19f5e5da70f5724ddd48723acf5846f6a1e9c01a79803e7e
 DIST kdepim-4.14.11_pre20160611.tar.xz 14805956 SHA256 
a9c3f5288efe0ccba3ffb88d4a63ac7b46a6b1ffe3c03b738ac6a53ef48e50b0 SHA512 
5ed0d2f814a7aac7f9977840bcda8ba98dc66c8ffe921d30430db07b06de2850d76140a5e5fa44db09e3cb4cac09fee0d8e0e4c208b752d52aecb453a4dc1b08
 WHIRLPOOL 
c6377c37b1a88a9d3958af5af081706e00437c3d0c28152a7e9353c49e376a3acdcdca0055d339f15287e6e101d6367a4d083b1a68162da9d4cc3d26178f62c5
 DIST kdepim-4.4.2017.04.tar.xz 8964644 SHA256 
943019fbf6e480761ccac4a1d54d71d5d38c88fd832e952cb03d73975f9a8535 SHA512 
d00e288563975e38f1bf4d28ed4724a9e159fab8ca37a61039aea730d22cae0c7e9921e04423bbbe6a74ee19319c57f79139d3a2b5048985675f836fd5dc77ab
 WHIRLPOOL 
1818df486e46f7345523360d05ab1d19b00906f1b51677010d0cd2f31ddd914c1e96c3a98837339882810f54b15fd4eb5063424863169decb68578100ae8049a
 DIST kjots-5.0.2.tar.xz 230608 SHA256 
5359aefb7b44027d7abbdafb0d501a7b30695119d5d5c8a75cfcee98e428fae3 SHA512 
a652765c56cebcaeba7b879cc075555c28667abdba84d11e986e5ffb440fbc776116f363992dd84d939918ae7d80ef5c2e1093da28d114b18041e10e5209b225
 WHIRLPOOL 
18e4dd955e275bdaceed16a4206e4ac5116cb26f2d1d87d35ef8b676ea61679e0c168176a50b94e96dadc5c944b56604d595541d158e982cc1222e5b52f3a1b6

diff --git a/kde-apps/kjots/kjots-4.14.11_pre20160211.ebuild 
b/kde-apps/kjots/kjots-4.14.11_pre20160211.ebuild
deleted file mode 100644
index 784c2f7f14c..00000000000
--- a/kde-apps/kjots/kjots-4.14.11_pre20160211.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-EGIT_BRANCH="KDE/4.14"
-inherit kde4-meta
-
-DESCRIPTION="KDE note taking utility"
-HOMEPAGE="https://www.kde.org/applications/utilities/kjots/";
-COMMIT_ID="2aec255c6465676404e4694405c153e485e477d9"
-SRC_URI="https://quickgit.kde.org/?p=kdepim.git&a=snapshot&h=${COMMIT_ID}&fmt=tgz
 -> ${KMNAME}-${PV}.tar.gz"
-
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-       $(add_kdeapps_dep kdepimlibs 'akonadi(+)')
-       $(add_kdeapps_dep kdepim-common-libs)
-       dev-libs/grantlee:0
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="
-       akonadi_next/
-       noteshared/
-"

diff --git a/kde-apps/kleopatra/Manifest b/kde-apps/kleopatra/Manifest
index a1ef9d9ef9e..29c7c1abade 100644
--- a/kde-apps/kleopatra/Manifest
+++ b/kde-apps/kleopatra/Manifest
@@ -1,4 +1,3 @@
-DIST kdepim-4.14.11_pre20160211.tar.gz 18551484 SHA256 
b970c0c04652519cc7e88d818b3a29e7b356a73f449f7f6e5767d60e5b2a17e3 SHA512 
e7fcf14353e457e9b3ec2d7eefa18ac0d9bc454ecaa682dcaf1585a6a36968bc8d7ea6ab61398a8d697d9343f0cd87472a906d444f814cd44956b6499826bb1d
 WHIRLPOOL 
f66fd74138ce871f88ce211c3b6af287cddaeda493e42c3b683938c274482d1f09a3ae659d380d4e19f5e5da70f5724ddd48723acf5846f6a1e9c01a79803e7e
 DIST kdepim-4.14.11_pre20160611.tar.xz 14805956 SHA256 
a9c3f5288efe0ccba3ffb88d4a63ac7b46a6b1ffe3c03b738ac6a53ef48e50b0 SHA512 
5ed0d2f814a7aac7f9977840bcda8ba98dc66c8ffe921d30430db07b06de2850d76140a5e5fa44db09e3cb4cac09fee0d8e0e4c208b752d52aecb453a4dc1b08
 WHIRLPOOL 
c6377c37b1a88a9d3958af5af081706e00437c3d0c28152a7e9353c49e376a3acdcdca0055d339f15287e6e101d6367a4d083b1a68162da9d4cc3d26178f62c5
 DIST kdepim-4.4.2017.04.tar.xz 8964644 SHA256 
943019fbf6e480761ccac4a1d54d71d5d38c88fd832e952cb03d73975f9a8535 SHA512 
d00e288563975e38f1bf4d28ed4724a9e159fab8ca37a61039aea730d22cae0c7e9921e04423bbbe6a74ee19319c57f79139d3a2b5048985675f836fd5dc77ab
 WHIRLPOOL 
1818df486e46f7345523360d05ab1d19b00906f1b51677010d0cd2f31ddd914c1e96c3a98837339882810f54b15fd4eb5063424863169decb68578100ae8049a
 DIST kleopatra-17.04.0.tar.xz 1841156 SHA256 
cc73f7b4e2d3722dd5ae061d731438f93a3fa851cc7dcc3c9b1f63ca131d02d1 SHA512 
622ce422e51944d58de5ba04ce846ac7409cc4d60d36b8a15e19e608a0a2b3183dd1867a89276d8a6bb4fcdadcc9f38cb0311ee8139dabc08fade846d0a7da39
 WHIRLPOOL 
6122a7ad32945e3889daa8eca322d422c815f617ad14f6c6560e259be9e3ba951259a9997775c20af561d3a6d586edd48c148c1f530432326382a5c79ea5a154

diff --git a/kde-apps/kleopatra/files/kleopatra-install-headers.patch 
b/kde-apps/kleopatra/files/kleopatra-install-headers.patch
deleted file mode 100644
index 0478141b26b..00000000000
--- a/kde-apps/kleopatra/files/kleopatra-install-headers.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Install headers needed by Kopete's cryptography plugin.
-
-Patch borrowed from Fedora.
-
-diff --git a/kleopatra/libkleopatraclient/CMakeLists.txt 
b/kleopatra/libkleopatraclient/CMakeLists.txt
-index 17b4980..690b00d 100644
---- a/kleopatra/libkleopatraclient/CMakeLists.txt
-+++ b/kleopatra/libkleopatraclient/CMakeLists.txt
-@@ -6,3 +6,7 @@ add_subdirectory(gui)
- 
- add_subdirectory(tests)
- 
-+install(
-+  FILES kleopatraclient_export.h
-+  DESTINATION ${INCLUDE_INSTALL_DIR}/libkleopatraclient
-+  )
-diff --git a/kleopatra/libkleopatraclient/core/CMakeLists.txt 
b/kleopatra/libkleopatraclient/core/CMakeLists.txt
-index d4f1ea2..17a6eb5 100644
---- a/kleopatra/libkleopatraclient/core/CMakeLists.txt
-+++ b/kleopatra/libkleopatraclient/core/CMakeLists.txt
-@@ -63,3 +63,13 @@ else()
- endif()
- 
- install(TARGETS kleopatraclientcore ${INSTALL_TARGETS_DEFAULT_ARGS})
-+
-+install(
-+  FILES
-+    initialization.h
-+    command.h
-+    selectcertificatecommand.h
-+    signencryptfilescommand.h
-+    decryptverifyfilescommand.h
-+  DESTINATION ${INCLUDE_INSTALL_DIR}/libkleopatraclient/core
-+  )
-diff --git a/kleopatra/libkleopatraclient/gui/CMakeLists.txt 
b/kleopatra/libkleopatraclient/gui/CMakeLists.txt
-index 3c5bab2..78dde2e 100644
---- a/kleopatra/libkleopatraclient/gui/CMakeLists.txt
-+++ b/kleopatra/libkleopatraclient/gui/CMakeLists.txt
-@@ -16,3 +16,9 @@ set_target_properties(kleopatraclientgui PROPERTIES
- )
- 
- install(TARGETS kleopatraclientgui ${INSTALL_TARGETS_DEFAULT_ARGS})
-+
-+install(
-+  FILES
-+    certificaterequester.h
-+  DESTINATION ${INCLUDE_INSTALL_DIR}/libkleopatraclient/gui
-+  )

diff --git a/kde-apps/kleopatra/kleopatra-4.14.11_pre20160211-r1.ebuild 
b/kde-apps/kleopatra/kleopatra-4.14.11_pre20160211-r1.ebuild
deleted file mode 100644
index 540a0a71de7..00000000000
--- a/kde-apps/kleopatra/kleopatra-4.14.11_pre20160211-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-EGIT_BRANCH="KDE/4.14"
-inherit kde4-meta
-
-DESCRIPTION="Kleopatra - KDE X.509 key manager"
-HOMEPAGE="https://www.kde.org/applications/utilities/kleopatra/";
-COMMIT_ID="2aec255c6465676404e4694405c153e485e477d9"
-SRC_URI="https://quickgit.kde.org/?p=kdepim.git&a=snapshot&h=${COMMIT_ID}&fmt=tgz
 -> ${KMNAME}-${PV}.tar.gz"
-
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-       $(add_kdeapps_dep kdepimlibs 'akonadi(+)' 4.14.11_pre20160211-r3)
-       $(add_kdeapps_dep kdepim-common-libs '' 4.14.11_pre20160211-r1)
-       app-crypt/gpgme
-       dev-libs/boost:=
-       dev-libs/libassuan
-       dev-libs/libgpg-error
-"
-RDEPEND="${DEPEND}
-       !>kde-apps/kdepimlibs-4.14.11_pre20160211-r3
-       app-crypt/gnupg
-"
-
-KMEXTRACTONLY="
-       libkleo/
-"
-
-PATCHES=( "${FILESDIR}/${PN}-install-headers.patch" )
-
-src_unpack() {
-       if use handbook; then
-               KMEXTRA="
-                       doc/kwatchgnupg
-               "
-       fi
-
-       kde4-meta_src_unpack
-}

diff --git a/kde-apps/kmail/Manifest b/kde-apps/kmail/Manifest
index 18f5e633b51..fa51f425907 100644
--- a/kde-apps/kmail/Manifest
+++ b/kde-apps/kmail/Manifest
@@ -1,4 +1,3 @@
-DIST kdepim-4.14.11_pre20160211.tar.gz 18551484 SHA256 
b970c0c04652519cc7e88d818b3a29e7b356a73f449f7f6e5767d60e5b2a17e3 SHA512 
e7fcf14353e457e9b3ec2d7eefa18ac0d9bc454ecaa682dcaf1585a6a36968bc8d7ea6ab61398a8d697d9343f0cd87472a906d444f814cd44956b6499826bb1d
 WHIRLPOOL 
f66fd74138ce871f88ce211c3b6af287cddaeda493e42c3b683938c274482d1f09a3ae659d380d4e19f5e5da70f5724ddd48723acf5846f6a1e9c01a79803e7e
 DIST kdepim-4.14.11_pre20160611.tar.xz 14805956 SHA256 
a9c3f5288efe0ccba3ffb88d4a63ac7b46a6b1ffe3c03b738ac6a53ef48e50b0 SHA512 
5ed0d2f814a7aac7f9977840bcda8ba98dc66c8ffe921d30430db07b06de2850d76140a5e5fa44db09e3cb4cac09fee0d8e0e4c208b752d52aecb453a4dc1b08
 WHIRLPOOL 
c6377c37b1a88a9d3958af5af081706e00437c3d0c28152a7e9353c49e376a3acdcdca0055d339f15287e6e101d6367a4d083b1a68162da9d4cc3d26178f62c5
 DIST kdepim-4.4.2017.04.tar.xz 8964644 SHA256 
943019fbf6e480761ccac4a1d54d71d5d38c88fd832e952cb03d73975f9a8535 SHA512 
d00e288563975e38f1bf4d28ed4724a9e159fab8ca37a61039aea730d22cae0c7e9921e04423bbbe6a74ee19319c57f79139d3a2b5048985675f836fd5dc77ab
 WHIRLPOOL 
1818df486e46f7345523360d05ab1d19b00906f1b51677010d0cd2f31ddd914c1e96c3a98837339882810f54b15fd4eb5063424863169decb68578100ae8049a
 DIST kmail-17.04.0.tar.xz 4377580 SHA256 
2a00586e859cbca977fedc36e6992f26df8c8ce633020c259bdc3ee1b56c8e11 SHA512 
3267c06a2257fa6ad2a978169a82e954708de71999d6b3ec0718c8d487f96dc8bfe56ea25395a488d4ad629fa2cc713d14b9b831bf4e445742c91e6ad308b900
 WHIRLPOOL 
7156ed06cf774db8c4fdfd866b6e5532926ac1d2c965133e9a2bd815481c1dbb37227531b22825e00be03bda07e495835d22e2077ad1f1e491d88b871d636eeb

diff --git a/kde-apps/kmail/files/kmail-4.4.9-nodbus.patch 
b/kde-apps/kmail/files/kmail-4.4.9-nodbus.patch
deleted file mode 100644
index af3237def53..00000000000
--- a/kde-apps/kmail/files/kmail-4.4.9-nodbus.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-diff -ruN kmail-4.4.9.orig/kmail/tests/CMakeLists.txt 
kmail-4.4.9/kmail/tests/CMakeLists.txt
---- kmail-4.4.9.orig/kmail/tests/CMakeLists.txt        2010-12-22 
18:52:24.000000000 +0100
-+++ kmail-4.4.9/kmail/tests/CMakeLists.txt     2011-01-25 23:52:38.953021223 
+0100
-@@ -9,14 +9,14 @@
- add_definitions(-DKMAIL_UNITTESTS=YES)
- 
- ########### htmlquotecolorertest ###############
--set(htmlquotecolorertest_SRCS htmlquotecolorertest.cpp 
../htmlquotecolorer.cpp)
--kde4_add_unit_test(htmlquotecolorertest TESTNAME kmail-quotecolorertest 
${htmlquotecolorertest_SRCS})
--set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
--target_link_libraries(htmlquotecolorertest
--  ${QT_QTTEST_LIBRARY}
--  ${QT_QTCORE_LIBRARY}
--  ${KDE4_KHTML_LIBRARY}
--)
-+# set(htmlquotecolorertest_SRCS htmlquotecolorertest.cpp 
../htmlquotecolorer.cpp)
-+# kde4_add_unit_test(htmlquotecolorertest TESTNAME kmail-quotecolorertest 
${htmlquotecolorertest_SRCS})
-+# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
-+# target_link_libraries(htmlquotecolorertest
-+#   ${QT_QTTEST_LIBRARY}
-+#   ${QT_QTCORE_LIBRARY}
-+#   ${KDE4_KHTML_LIBRARY}
-+# )
- 
- ########### utiltests ###############
- 
-diff -ruN kmail-4.4.9.orig/messagecore/tests/CMakeLists.txt 
kmail-4.4.9/messagecore/tests/CMakeLists.txt
---- kmail-4.4.9.orig/messagecore/tests/CMakeLists.txt  2010-12-22 
18:52:15.000000000 +0100
-+++ kmail-4.4.9/messagecore/tests/CMakeLists.txt       2011-01-25 
23:50:54.421021223 +0100
-@@ -13,6 +13,6 @@
- # Attachment tests.
- add_messagecore_test( attachmentcompressjobtest.cpp )
- add_messagecore_test( attachmentfrommimecontentjobtest.cpp )
--add_messagecore_test( attachmentfromurljobtest.cpp )
-+# add_messagecore_test( attachmentfromurljobtest.cpp )
- add_messagecore_test( attachmentparttest.cpp )
--add_messagecore_test( attachmentpropertiesdialogtest.cpp )
-+# add_messagecore_test( attachmentpropertiesdialogtest.cpp )
-diff -ruN kmail-4.4.9.orig/messageviewer/tests/CMakeLists.txt 
kmail-4.4.9/messageviewer/tests/CMakeLists.txt
---- kmail-4.4.9.orig/messageviewer/tests/CMakeLists.txt        2010-12-22 
18:52:47.000000000 +0100
-+++ kmail-4.4.9/messageviewer/tests/CMakeLists.txt     2011-01-25 
23:51:58.374021223 +0100
-@@ -6,23 +6,23 @@
- )
- 
- ########### htmlquotecolorertest ###############
--set(messageviewer_htmlquotecolorertest_SRCS htmlquotecolorertest.cpp 
../htmlquotecolorer.cpp)
--kde4_add_unit_test(messageviewer_htmlquotecolorertest TESTNAME 
messageviewer-quotecolorertest ${messageviewer_htmlquotecolorertest_SRCS})
--set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
--target_link_libraries(messageviewer_htmlquotecolorertest
--  ${QT_QTTEST_LIBRARY}
--  ${QT_QTCORE_LIBRARY}
--  ${KDE4_KHTML_LIBRARY}
--  messageviewer
--)
-+# set(messageviewer_htmlquotecolorertest_SRCS htmlquotecolorertest.cpp 
../htmlquotecolorer.cpp)
-+# kde4_add_unit_test(messageviewer_htmlquotecolorertest TESTNAME 
messageviewer-quotecolorertest ${messageviewer_htmlquotecolorertest_SRCS})
-+# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
-+# target_link_libraries(messageviewer_htmlquotecolorertest
-+#   ${QT_QTTEST_LIBRARY}
-+#   ${QT_QTCORE_LIBRARY}
-+#   ${KDE4_KHTML_LIBRARY}
-+#   messageviewer
-+# )
- 
- ########### stringutiltest ###############
--set(stringutiltest_SRCS stringutiltest.cpp)
--kde4_add_unit_test(stringutiltest TESTNAME messageviewer-stringutiltest 
${stringutiltest_SRCS})
--set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
--target_link_libraries(stringutiltest
--  ${QT_QTTEST_LIBRARY}
--  ${QT_QTCORE_LIBRARY}
--  ${KDE4_KHTML_LIBRARY}
--  messageviewer
--)
-+# set(stringutiltest_SRCS stringutiltest.cpp)
-+# kde4_add_unit_test(stringutiltest TESTNAME messageviewer-stringutiltest 
${stringutiltest_SRCS})
-+# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
-+# target_link_libraries(stringutiltest
-+#   ${QT_QTTEST_LIBRARY}
-+#   ${QT_QTCORE_LIBRARY}
-+#   ${KDE4_KHTML_LIBRARY}
-+#   messageviewer
-+# )

diff --git a/kde-apps/kmail/kmail-4.14.11_pre20160211-r1.ebuild 
b/kde-apps/kmail/kmail-4.14.11_pre20160211-r1.ebuild
deleted file mode 100644
index 4595c5ab522..00000000000
--- a/kde-apps/kmail/kmail-4.14.11_pre20160211-r1.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-EGIT_BRANCH="KDE/4.14"
-VIRTUALX_REQUIRED="test"
-WEBKIT_REQUIRED="always"
-inherit flag-o-matic kde4-meta
-
-DESCRIPTION="Email component of Kontact, the integrated personal information 
manager of KDE"
-HOMEPAGE="https://www.kde.org/applications/internet/kmail/";
-COMMIT_ID="2aec255c6465676404e4694405c153e485e477d9"
-SRC_URI="https://quickgit.kde.org/?p=kdepim.git&a=snapshot&h=${COMMIT_ID}&fmt=tgz
 -> ${KMNAME}-${PV}.tar.gz"
-
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-       $(add_kdeapps_dep kdepimlibs 'akonadi(+)' 4.14.11_pre20160211-r3)
-       $(add_kdeapps_dep kdepim-common-libs '' 4.14.11_pre20160211-r1)
-       $(add_kdeapps_dep korganizer)
-"
-RDEPEND="${DEPEND}
-       !=kde-apps/kdepim-common-libs-4.12.1-r1
-       !>kde-apps/kdepimlibs-4.14.11_pre20160211-r3
-"
-
-RESTRICT="test"
-# bug 393147
-
-KMEXTRACTONLY="
-       agents/folderarchiveagent.desktop
-       agents/sendlateragent/
-       akonadi_next/
-       calendarviews/
-       grantleeeditor/grantleethemeeditor/
-       kdgantt2/
-       korganizer/
-       kresources/
-       libkdepimdbusinterfaces/
-       libkleo/
-       libkpgp/
-"
-KMCOMPILEONLY="
-       calendarsupport/
-       grantleetheme/
-       incidenceeditor-ng/
-       kaddressbookgrantlee/
-       mailcommon/
-       mailimporter/
-       messagecomposer/
-       messagecore/
-       messagelist/
-       messageviewer/
-       mailcommon/
-       mailimporter/
-       noteshared/
-       pimcommon/
-       templateparser/
-"
-KMEXTRA="
-       agents/archivemailagent/
-       agents/followupreminderagent/
-       agents/mailfilteragent/
-       grantleeeditor/headerthemeeditor/
-       importwizard/
-       kmailcvt/
-       ksendemail/
-       libksieve/
-       mboximporter/
-       pimsettingexporter/
-       plugins/messageviewer/
-"
-
-KMLOADLIBS="kdepim-common-libs"
-
-src_compile() {
-       kde4-meta_src_compile kmail_xml
-       kde4-meta_src_compile
-}
-
-pkg_postinst() {
-       kde4-meta_pkg_postinst
-
-       if ! has_version kde-apps/kdepim-kresources:${SLOT}; then
-               echo
-               elog "For groupware functionality, please install 
kde-apps/kdepim-kresources:${SLOT}"
-               echo
-       fi
-       if ! has_version kde-apps/kleopatra:${SLOT}; then
-               echo
-               elog "For certificate management and the gnupg log viewer, 
please install kde-apps/kleopatra:${SLOT}"
-               echo
-       fi
-
-       if has_version "kde-apps/akonadi[sqlite]"; then
-               ewarn
-               ewarn "We strongly recommend you set your Akonadi database 
backend to QMYSQL in your"
-               ewarn "user configuration. This is the backend recommended by 
KDE upstream."
-               ewarn "Reports indicate that kde-apps/kmail-4.10 does not work 
properly with the sqlite"
-               ewarn "backend anymore."
-               if has_version "kde-apps/akonadi[-mysql]"; then
-                       ewarn "FOR THAT, YOU WILL HAVE TO RE-BUILD 
kde-apps/akonadi WITH mysql USEFLAG ENABLED."
-               fi
-               ewarn "You can select the backend in your 
~/.config/akonadi/akonadiserverrc."
-               ewarn
-       fi
-}

diff --git a/kde-apps/knode/Manifest b/kde-apps/knode/Manifest
index 2da6ebd9cbd..2e6c7bd033f 100644
--- a/kde-apps/knode/Manifest
+++ b/kde-apps/knode/Manifest
@@ -1,3 +1,2 @@
-DIST kdepim-4.14.11_pre20160211.tar.gz 18551484 SHA256 
b970c0c04652519cc7e88d818b3a29e7b356a73f449f7f6e5767d60e5b2a17e3 SHA512 
e7fcf14353e457e9b3ec2d7eefa18ac0d9bc454ecaa682dcaf1585a6a36968bc8d7ea6ab61398a8d697d9343f0cd87472a906d444f814cd44956b6499826bb1d
 WHIRLPOOL 
f66fd74138ce871f88ce211c3b6af287cddaeda493e42c3b683938c274482d1f09a3ae659d380d4e19f5e5da70f5724ddd48723acf5846f6a1e9c01a79803e7e
 DIST kdepim-4.14.11_pre20160611.tar.xz 14805956 SHA256 
a9c3f5288efe0ccba3ffb88d4a63ac7b46a6b1ffe3c03b738ac6a53ef48e50b0 SHA512 
5ed0d2f814a7aac7f9977840bcda8ba98dc66c8ffe921d30430db07b06de2850d76140a5e5fa44db09e3cb4cac09fee0d8e0e4c208b752d52aecb453a4dc1b08
 WHIRLPOOL 
c6377c37b1a88a9d3958af5af081706e00437c3d0c28152a7e9353c49e376a3acdcdca0055d339f15287e6e101d6367a4d083b1a68162da9d4cc3d26178f62c5
 DIST kdepim-4.4.2017.04.tar.xz 8964644 SHA256 
943019fbf6e480761ccac4a1d54d71d5d38c88fd832e952cb03d73975f9a8535 SHA512 
d00e288563975e38f1bf4d28ed4724a9e159fab8ca37a61039aea730d22cae0c7e9921e04423bbbe6a74ee19319c57f79139d3a2b5048985675f836fd5dc77ab
 WHIRLPOOL 
1818df486e46f7345523360d05ab1d19b00906f1b51677010d0cd2f31ddd914c1e96c3a98837339882810f54b15fd4eb5063424863169decb68578100ae8049a

diff --git a/kde-apps/knode/knode-4.14.11_pre20160211.ebuild 
b/kde-apps/knode/knode-4.14.11_pre20160211.ebuild
deleted file mode 100644
index 0d6032b5947..00000000000
--- a/kde-apps/knode/knode-4.14.11_pre20160211.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-EGIT_BRANCH="KDE/4.14"
-inherit kde4-meta
-
-DESCRIPTION="A newsreader by KDE"
-HOMEPAGE="https://www.kde.org/applications/internet/knode/";
-COMMIT_ID="2aec255c6465676404e4694405c153e485e477d9"
-SRC_URI="https://quickgit.kde.org/?p=kdepim.git&a=snapshot&h=${COMMIT_ID}&fmt=tgz
 -> ${KMNAME}-${PV}.tar.gz"
-
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-# test fails, last checked for 4.2.96
-RESTRICT=test
-
-DEPEND="
-       $(add_kdeapps_dep kdepimlibs 'akonadi(+)')
-       $(add_kdeapps_dep kdepim-common-libs '' 4.12.1-r1)
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="
-       agents/
-       libkleo/
-       libkpgp/
-       messagecomposer/
-       messageviewer/
-       messagecore/
-"
-KMCOMPILEONLY="
-       grantleetheme/
-       kaddressbookgrantlee/
-"
-
-KMLOADLIBS="kdepim-common-libs"
-
-src_unpack() {
-       if use handbook; then
-               KMEXTRA="
-                       doc/kioslave/news
-               "
-       fi
-
-       kde4-meta_src_unpack
-}

diff --git a/kde-apps/knotes/Manifest b/kde-apps/knotes/Manifest
index f0f9f8232ea..191248251f6 100644
--- a/kde-apps/knotes/Manifest
+++ b/kde-apps/knotes/Manifest
@@ -1,4 +1,3 @@
-DIST kdepim-4.14.11_pre20160211.tar.gz 18551484 SHA256 
b970c0c04652519cc7e88d818b3a29e7b356a73f449f7f6e5767d60e5b2a17e3 SHA512 
e7fcf14353e457e9b3ec2d7eefa18ac0d9bc454ecaa682dcaf1585a6a36968bc8d7ea6ab61398a8d697d9343f0cd87472a906d444f814cd44956b6499826bb1d
 WHIRLPOOL 
f66fd74138ce871f88ce211c3b6af287cddaeda493e42c3b683938c274482d1f09a3ae659d380d4e19f5e5da70f5724ddd48723acf5846f6a1e9c01a79803e7e
 DIST kdepim-4.14.11_pre20160611.tar.xz 14805956 SHA256 
a9c3f5288efe0ccba3ffb88d4a63ac7b46a6b1ffe3c03b738ac6a53ef48e50b0 SHA512 
5ed0d2f814a7aac7f9977840bcda8ba98dc66c8ffe921d30430db07b06de2850d76140a5e5fa44db09e3cb4cac09fee0d8e0e4c208b752d52aecb453a4dc1b08
 WHIRLPOOL 
c6377c37b1a88a9d3958af5af081706e00437c3d0c28152a7e9353c49e376a3acdcdca0055d339f15287e6e101d6367a4d083b1a68162da9d4cc3d26178f62c5
 DIST kdepim-4.4.2017.04.tar.xz 8964644 SHA256 
943019fbf6e480761ccac4a1d54d71d5d38c88fd832e952cb03d73975f9a8535 SHA512 
d00e288563975e38f1bf4d28ed4724a9e159fab8ca37a61039aea730d22cae0c7e9921e04423bbbe6a74ee19319c57f79139d3a2b5048985675f836fd5dc77ab
 WHIRLPOOL 
1818df486e46f7345523360d05ab1d19b00906f1b51677010d0cd2f31ddd914c1e96c3a98837339882810f54b15fd4eb5063424863169decb68578100ae8049a
 DIST knotes-17.04.0.tar.xz 334820 SHA256 
cc5813205e0ca214b9aa565f16f7107aa4bbea2330d6c31bec076999e12b3e14 SHA512 
b9ec3d620ade284771fdb83873d8ef685373bd4e2eb74a737a6c83b89c4c489b2c212b4fc68dd1c3b41915a08d736f112b62c5ad0df8b8059c31be3c9936e1cb
 WHIRLPOOL 
e0d98194762a41c00eb4bae23c39a3130ba4566b505fc7e84163efe12d5219c5513103be3bac903f01a2b60b63759b2265be94aa7a68377d2e37a25460b6b10b

diff --git a/kde-apps/knotes/knotes-4.14.11_pre20160211.ebuild 
b/kde-apps/knotes/knotes-4.14.11_pre20160211.ebuild
deleted file mode 100644
index 4ce86f37286..00000000000
--- a/kde-apps/knotes/knotes-4.14.11_pre20160211.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-EGIT_BRANCH="KDE/4.14"
-inherit kde4-meta
-
-DESCRIPTION="KDE Notes application"
-HOMEPAGE="https://www.kde.org/applications/utilities/knotes/";
-COMMIT_ID="2aec255c6465676404e4694405c153e485e477d9"
-SRC_URI="https://quickgit.kde.org/?p=kdepim.git&a=snapshot&h=${COMMIT_ID}&fmt=tgz
 -> ${KMNAME}-${PV}.tar.gz"
-
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-       $(add_kdeapps_dep kdepimlibs 'akonadi(+)')
-       $(add_kdeapps_dep kdepim-common-libs)
-"
-RDEPEND="${DEPEND}"
-
-KMCOMPILEONLY="
-       noteshared/
-"
-
-KMEXTRACTONLY="
-       akonadi_next/
-       pimcommon/
-"
-
-KMLOADLIBS="kdepim-common-libs"

diff --git a/kde-apps/konsolekalendar/Manifest 
b/kde-apps/konsolekalendar/Manifest
index eff12630ef3..9af6a9ce87b 100644
--- a/kde-apps/konsolekalendar/Manifest
+++ b/kde-apps/konsolekalendar/Manifest
@@ -1,4 +1,3 @@
 DIST akonadi-calendar-tools-17.04.0.tar.xz 221520 SHA256 
3578d824b54055f80404fde67e0ede910a7cb6aa22ec215673a178124daa6468 SHA512 
27595ad1ed647858c70b9d9b4e3e32e8d5107fb1123d7c50ea49a7601f3db6b2c8d1d3b32c8818d756dec841a7650d5706d7aca29a4081f46f54b16aa96f3290
 WHIRLPOOL 
673a8099f7c6560a67c25cae31776a5c802cd35f9fdaac93c449fc00f3af36db0498bb713cfee9234f694db4fc69a1a711e12f8c48b89583bec3d367e1252e30
-DIST kdepim-4.14.11_pre20160211.tar.gz 18551484 SHA256 
b970c0c04652519cc7e88d818b3a29e7b356a73f449f7f6e5767d60e5b2a17e3 SHA512 
e7fcf14353e457e9b3ec2d7eefa18ac0d9bc454ecaa682dcaf1585a6a36968bc8d7ea6ab61398a8d697d9343f0cd87472a906d444f814cd44956b6499826bb1d
 WHIRLPOOL 
f66fd74138ce871f88ce211c3b6af287cddaeda493e42c3b683938c274482d1f09a3ae659d380d4e19f5e5da70f5724ddd48723acf5846f6a1e9c01a79803e7e
 DIST kdepim-4.14.11_pre20160611.tar.xz 14805956 SHA256 
a9c3f5288efe0ccba3ffb88d4a63ac7b46a6b1ffe3c03b738ac6a53ef48e50b0 SHA512 
5ed0d2f814a7aac7f9977840bcda8ba98dc66c8ffe921d30430db07b06de2850d76140a5e5fa44db09e3cb4cac09fee0d8e0e4c208b752d52aecb453a4dc1b08
 WHIRLPOOL 
c6377c37b1a88a9d3958af5af081706e00437c3d0c28152a7e9353c49e376a3acdcdca0055d339f15287e6e101d6367a4d083b1a68162da9d4cc3d26178f62c5
 DIST kdepim-4.4.2017.04.tar.xz 8964644 SHA256 
943019fbf6e480761ccac4a1d54d71d5d38c88fd832e952cb03d73975f9a8535 SHA512 
d00e288563975e38f1bf4d28ed4724a9e159fab8ca37a61039aea730d22cae0c7e9921e04423bbbe6a74ee19319c57f79139d3a2b5048985675f836fd5dc77ab
 WHIRLPOOL 
1818df486e46f7345523360d05ab1d19b00906f1b51677010d0cd2f31ddd914c1e96c3a98837339882810f54b15fd4eb5063424863169decb68578100ae8049a

diff --git 
a/kde-apps/konsolekalendar/konsolekalendar-4.14.11_pre20160211.ebuild 
b/kde-apps/konsolekalendar/konsolekalendar-4.14.11_pre20160211.ebuild
deleted file mode 100644
index 43b604c957b..00000000000
--- a/kde-apps/konsolekalendar/konsolekalendar-4.14.11_pre20160211.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-EGIT_BRANCH="KDE/4.14"
-KMMODULE="console/${PN}"
-inherit kde4-meta
-
-DESCRIPTION="A command line interface to KDE calendars"
-HOMEPAGE+=" https://userbase.kde.org/KonsoleKalendar";
-COMMIT_ID="2aec255c6465676404e4694405c153e485e477d9"
-SRC_URI="https://quickgit.kde.org/?p=kdepim.git&a=snapshot&h=${COMMIT_ID}&fmt=tgz
 -> ${KMNAME}-${PV}.tar.gz"
-
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-       $(add_kdeapps_dep kdepimlibs 'akonadi(+)')
-       $(add_kdeapps_dep kdepim-common-libs)
-"
-RDEPEND="${DEPEND}
-       !>kde-apps/kdepimlibs-4.14.11_pre20160211-r3
-"
-
-KMCOMPILEONLY="
-       calendarsupport/
-       grantleetheme/
-       incidenceeditor-ng/
-       kaddressbookgrantlee/
-       mailcommon/
-       messagecore/
-       messageviewer/
-       pimcommon/
-       templateparser/
-"
-KMEXTRACTONLY="
-       akonadi_next/
-       agents/mailfilteragent/org.freedesktop.Akonadi.MailFilterAgent.xml
-       calendarviews/
-       kdgantt2/
-       korganizer/data/org.kde.Korganizer.Calendar.xml
-       mailimporter/
-       messagecomposer/
-       libkdepimdbusinterfaces/
-       libkleo/
-       libkpgp/
-"
-
-KMLOADLIBS="kdepim-common-libs"

diff --git a/kde-apps/kontact/Manifest b/kde-apps/kontact/Manifest
index 469960517a9..e1aff66ce87 100644
--- a/kde-apps/kontact/Manifest
+++ b/kde-apps/kontact/Manifest
@@ -1,4 +1,3 @@
-DIST kdepim-4.14.11_pre20160211.tar.gz 18551484 SHA256 
b970c0c04652519cc7e88d818b3a29e7b356a73f449f7f6e5767d60e5b2a17e3 SHA512 
e7fcf14353e457e9b3ec2d7eefa18ac0d9bc454ecaa682dcaf1585a6a36968bc8d7ea6ab61398a8d697d9343f0cd87472a906d444f814cd44956b6499826bb1d
 WHIRLPOOL 
f66fd74138ce871f88ce211c3b6af287cddaeda493e42c3b683938c274482d1f09a3ae659d380d4e19f5e5da70f5724ddd48723acf5846f6a1e9c01a79803e7e
 DIST kdepim-4.14.11_pre20160611.tar.xz 14805956 SHA256 
a9c3f5288efe0ccba3ffb88d4a63ac7b46a6b1ffe3c03b738ac6a53ef48e50b0 SHA512 
5ed0d2f814a7aac7f9977840bcda8ba98dc66c8ffe921d30430db07b06de2850d76140a5e5fa44db09e3cb4cac09fee0d8e0e4c208b752d52aecb453a4dc1b08
 WHIRLPOOL 
c6377c37b1a88a9d3958af5af081706e00437c3d0c28152a7e9353c49e376a3acdcdca0055d339f15287e6e101d6367a4d083b1a68162da9d4cc3d26178f62c5
 DIST kdepim-4.4.2017.04.tar.xz 8964644 SHA256 
943019fbf6e480761ccac4a1d54d71d5d38c88fd832e952cb03d73975f9a8535 SHA512 
d00e288563975e38f1bf4d28ed4724a9e159fab8ca37a61039aea730d22cae0c7e9921e04423bbbe6a74ee19319c57f79139d3a2b5048985675f836fd5dc77ab
 WHIRLPOOL 
1818df486e46f7345523360d05ab1d19b00906f1b51677010d0cd2f31ddd914c1e96c3a98837339882810f54b15fd4eb5063424863169decb68578100ae8049a
 DIST kontact-17.04.0.tar.xz 862864 SHA256 
e60485b85f60930c8ec4a3fe9e93e7f7e3f450a3c463d81f6a5a247bbc1a5344 SHA512 
7654b5a108ac8a655cc04080adc52062cb373b69b5b575ad43f21d26bb77056d252ce22d65923df8a8b9ee67fdcb3015970f983281b7594d1be37c73d29cb19b
 WHIRLPOOL 
6dfd9b82cdd850db9d4d8445420798728edd5093b63b66cc13960b641f4910d2e1de85c2a38176d7e3feb67851cb5a919fe78d6d3c1d5e3952042c15bcd6132e

diff --git a/kde-apps/kontact/kontact-4.14.11_pre20160211.ebuild 
b/kde-apps/kontact/kontact-4.14.11_pre20160211.ebuild
deleted file mode 100644
index 12a513b1ed8..00000000000
--- a/kde-apps/kontact/kontact-4.14.11_pre20160211.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-EGIT_BRANCH="KDE/4.14"
-inherit kde4-meta
-
-DESCRIPTION="KDE personal information manager"
-HOMEPAGE="https://www.kde.org/applications/office/kontact/";
-COMMIT_ID="2aec255c6465676404e4694405c153e485e477d9"
-SRC_URI="https://quickgit.kde.org/?p=kdepim.git&a=snapshot&h=${COMMIT_ID}&fmt=tgz
 -> ${KMNAME}-${PV}.tar.gz"
-
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-       $(add_kdeapps_dep kdepimlibs 'akonadi(+)')
-       $(add_kdeapps_dep kdepim-common-libs)
-"
-RDEPEND="${DEPEND}
-       !>kde-apps/kdepimlibs-4.14.11_pre20160211-r3
-"
-
-KMLOADLIBS="kdepim-common-libs"
-KMSAVELIBS="true"
-
-# We remove plugins that are related to external kdepim programs. This way
-# kontact doesn't have to depend on all programs it has plugins for.
-# kcontactmanager gone from kdesvn
-#
-KMEXTRACTONLY="
-       kontact/plugins/akregator/
-       kontact/plugins/kaddressbook/
-       kontact/plugins/kjots/
-       kontact/plugins/kmail/
-       kontact/plugins/knode/
-       kontact/plugins/knotes/
-       kontact/plugins/korganizer/
-       kontact/plugins/ktimetracker/
-       kontact/plugins/planner/
-       kontact/plugins/specialdates/
-       libkdepimdbusinterfaces/
-"
-
-src_unpack() {
-       if use handbook; then
-               KMEXTRA+="
-                       doc/kontact-admin/
-               "
-       fi
-
-       kde4-meta_src_unpack
-}

diff --git a/kde-apps/korganizer/Manifest b/kde-apps/korganizer/Manifest
index 9b52bad1fe7..58e77e8835c 100644
--- a/kde-apps/korganizer/Manifest
+++ b/kde-apps/korganizer/Manifest
@@ -1,4 +1,3 @@
-DIST kdepim-4.14.11_pre20160211.tar.gz 18551484 SHA256 
b970c0c04652519cc7e88d818b3a29e7b356a73f449f7f6e5767d60e5b2a17e3 SHA512 
e7fcf14353e457e9b3ec2d7eefa18ac0d9bc454ecaa682dcaf1585a6a36968bc8d7ea6ab61398a8d697d9343f0cd87472a906d444f814cd44956b6499826bb1d
 WHIRLPOOL 
f66fd74138ce871f88ce211c3b6af287cddaeda493e42c3b683938c274482d1f09a3ae659d380d4e19f5e5da70f5724ddd48723acf5846f6a1e9c01a79803e7e
 DIST kdepim-4.14.11_pre20160611.tar.xz 14805956 SHA256 
a9c3f5288efe0ccba3ffb88d4a63ac7b46a6b1ffe3c03b738ac6a53ef48e50b0 SHA512 
5ed0d2f814a7aac7f9977840bcda8ba98dc66c8ffe921d30430db07b06de2850d76140a5e5fa44db09e3cb4cac09fee0d8e0e4c208b752d52aecb453a4dc1b08
 WHIRLPOOL 
c6377c37b1a88a9d3958af5af081706e00437c3d0c28152a7e9353c49e376a3acdcdca0055d339f15287e6e101d6367a4d083b1a68162da9d4cc3d26178f62c5
 DIST kdepim-4.4.2017.04.tar.xz 8964644 SHA256 
943019fbf6e480761ccac4a1d54d71d5d38c88fd832e952cb03d73975f9a8535 SHA512 
d00e288563975e38f1bf4d28ed4724a9e159fab8ca37a61039aea730d22cae0c7e9921e04423bbbe6a74ee19319c57f79139d3a2b5048985675f836fd5dc77ab
 WHIRLPOOL 
1818df486e46f7345523360d05ab1d19b00906f1b51677010d0cd2f31ddd914c1e96c3a98837339882810f54b15fd4eb5063424863169decb68578100ae8049a
 DIST korganizer-17.04.0.tar.xz 2344316 SHA256 
3a34366cb3035beb33271197e1bfe655dd8a15793bf825e2cee0d21ab7eead8e SHA512 
301010096749b7e6b2332d7b476f601b4d3a5ff1a9148f470cc8390174ee8c6b93eac83c3c5865e510b06ac49f6a6440ac7a80242348f7ec9b47515a102d97b8
 WHIRLPOOL 
f92eebfe76ef58282322e15640c41689931fc61e7c7eb0156b47dbc3f03327be646d63e1521d30ce0c871f0bb02bf31b5482604700ba34ed55b1b4223338399f

diff --git a/kde-apps/korganizer/files/korganizer-4.14.10-handbook.patch 
b/kde-apps/korganizer/files/korganizer-4.14.10-handbook.patch
deleted file mode 100644
index a365d05c337..00000000000
--- a/kde-apps/korganizer/files/korganizer-4.14.10-handbook.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/doc/CMakeLists.txt       2015-06-25 19:47:38.000000000 +0200
-+++ b/doc/CMakeLists.txt       2015-07-05 11:50:37.584637940 +0200
-@@ -28,9 +28,10 @@
- 
- if(BUILD_kmail)
-   add_subdirectory(kmail)
--  if(BUILD_korganizer)
--    add_subdirectory(korganizer)
--  endif()
-+endif()
-+
-+if(BUILD_korganizer)
-+  add_subdirectory(korganizer)
- endif()
- 
- if(BUILD_knode)

diff --git a/kde-apps/korganizer/korganizer-4.14.11_pre20160211.ebuild 
b/kde-apps/korganizer/korganizer-4.14.11_pre20160211.ebuild
deleted file mode 100644
index acb3a53132f..00000000000
--- a/kde-apps/korganizer/korganizer-4.14.11_pre20160211.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-EGIT_BRANCH="KDE/4.14"
-inherit kde4-meta
-
-DESCRIPTION="Personal Organizer by KDE"
-HOMEPAGE="https://www.kde.org/applications/office/korganizer/";
-COMMIT_ID="2aec255c6465676404e4694405c153e485e477d9"
-SRC_URI="https://quickgit.kde.org/?p=kdepim.git&a=snapshot&h=${COMMIT_ID}&fmt=tgz
 -> ${KMNAME}-${PV}.tar.gz"
-
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-       $(add_kdeapps_dep kdepimlibs 'akonadi(+)')
-       $(add_kdeapps_dep kdepim-common-libs)
-       sys-libs/zlib
-"
-RDEPEND="${DEPEND}
-       !>kde-apps/kdepimlibs-4.14.11_pre20160211-r3
-       $(add_kdeapps_dep ktimezoned '' 4.14.3)
-"
-
-RESTRICT="test"
-# bug 393135
-
-KMLOADLIBS="kdepim-common-libs"
-
-KMEXTRA="
-       korgac/
-"
-KMEXTRACTONLY="
-       agents/mailfilteragent/org.freedesktop.Akonadi.MailFilterAgent.xml
-       akonadi_next/
-       calendarviews/
-       kdgantt2/
-       kmail/
-       knode/org.kde.knode.xml
-       libkdepimdbusinterfaces/
-       libkleo/
-       libkpgp/
-       mailimporter/
-       messagecomposer/
-"
-KMCOMPILEONLY="
-       calendarsupport/
-       grantleetheme/
-       incidenceeditor-ng/
-       kaddressbookgrantlee/
-       mailcommon/
-       messagecore/
-       messageviewer/
-       pimcommon/
-       templateparser/
-"
-
-src_unpack() {
-       if use kontact; then
-               KMEXTRA="${KMEXTRA}
-                       kontact/plugins/planner/
-                       kontact/plugins/specialdates/
-               "
-       fi
-
-       kde4-meta_src_unpack
-}
-
-src_prepare() {
-       use handbook && epatch "${FILESDIR}/${PN}-4.14.10-handbook.patch"
-
-       kde4-meta_src_prepare
-}
-
-src_install() {
-       kde4-meta_src_install
-       # colliding with kdepim-common-libs
-       rm -rf "${ED}"usr/share/kde4/servicetypes/calendarplugin.desktop || die
-       rm -rf "${ED}"usr/share/kde4/servicetypes/calendardecoration.desktop || 
die
-}
-
-pkg_postinst() {
-       kde4-meta_pkg_postinst
-
-       if ! has_version kde-apps/kdepim-kresources:${SLOT}; then
-               echo
-               elog "For groupware functionality, please install 
kde-apps/kdepim-kresources:${SLOT}"
-               echo
-       fi
-}

diff --git a/kde-apps/ktimetracker/Manifest b/kde-apps/ktimetracker/Manifest
index 2da6ebd9cbd..2e6c7bd033f 100644
--- a/kde-apps/ktimetracker/Manifest
+++ b/kde-apps/ktimetracker/Manifest
@@ -1,3 +1,2 @@
-DIST kdepim-4.14.11_pre20160211.tar.gz 18551484 SHA256 
b970c0c04652519cc7e88d818b3a29e7b356a73f449f7f6e5767d60e5b2a17e3 SHA512 
e7fcf14353e457e9b3ec2d7eefa18ac0d9bc454ecaa682dcaf1585a6a36968bc8d7ea6ab61398a8d697d9343f0cd87472a906d444f814cd44956b6499826bb1d
 WHIRLPOOL 
f66fd74138ce871f88ce211c3b6af287cddaeda493e42c3b683938c274482d1f09a3ae659d380d4e19f5e5da70f5724ddd48723acf5846f6a1e9c01a79803e7e
 DIST kdepim-4.14.11_pre20160611.tar.xz 14805956 SHA256 
a9c3f5288efe0ccba3ffb88d4a63ac7b46a6b1ffe3c03b738ac6a53ef48e50b0 SHA512 
5ed0d2f814a7aac7f9977840bcda8ba98dc66c8ffe921d30430db07b06de2850d76140a5e5fa44db09e3cb4cac09fee0d8e0e4c208b752d52aecb453a4dc1b08
 WHIRLPOOL 
c6377c37b1a88a9d3958af5af081706e00437c3d0c28152a7e9353c49e376a3acdcdca0055d339f15287e6e101d6367a4d083b1a68162da9d4cc3d26178f62c5
 DIST kdepim-4.4.2017.04.tar.xz 8964644 SHA256 
943019fbf6e480761ccac4a1d54d71d5d38c88fd832e952cb03d73975f9a8535 SHA512 
d00e288563975e38f1bf4d28ed4724a9e159fab8ca37a61039aea730d22cae0c7e9921e04423bbbe6a74ee19319c57f79139d3a2b5048985675f836fd5dc77ab
 WHIRLPOOL 
1818df486e46f7345523360d05ab1d19b00906f1b51677010d0cd2f31ddd914c1e96c3a98837339882810f54b15fd4eb5063424863169decb68578100ae8049a

diff --git a/kde-apps/ktimetracker/ktimetracker-4.14.11_pre20160211.ebuild 
b/kde-apps/ktimetracker/ktimetracker-4.14.11_pre20160211.ebuild
deleted file mode 100644
index 4c53973a5aa..00000000000
--- a/kde-apps/ktimetracker/ktimetracker-4.14.11_pre20160211.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-EGIT_BRANCH="KDE/4.14"
-inherit kde4-meta
-
-DESCRIPTION="KTimeTracker tracks time spent on various tasks"
-HOEMPAGE="https://www.kde.org/applications/utilities/ktimetracker/";
-COMMIT_ID="2aec255c6465676404e4694405c153e485e477d9"
-SRC_URI="https://quickgit.kde.org/?p=kdepim.git&a=snapshot&h=${COMMIT_ID}&fmt=tgz
 -> ${KMNAME}-${PV}.tar.gz"
-
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-RDEPEND="
-       $(add_kdeapps_dep kdepim-kresources)
-       $(add_kdeapps_dep kdepimlibs 'akonadi(+)')
-       $(add_kdeapps_dep kdepim-common-libs)
-       x11-libs/libXScrnSaver
-"
-DEPEND="${RDEPEND}
-       x11-proto/scrnsaverproto
-"
-
-KMEXTRACTONLY="
-       kresources/
-"
-
-KMLOADLIBS="kdepim-common-libs"
-
-src_unpack() {
-       if use kontact; then
-               KMEXTRA="${KMEXTRA} kontact/plugins/ktimetracker"
-       fi
-
-       kde4-meta_src_unpack
-}

diff --git a/kde-apps/ktnef/Manifest b/kde-apps/ktnef/Manifest
index e440cd85011..4684ba42767 100644
--- a/kde-apps/ktnef/Manifest
+++ b/kde-apps/ktnef/Manifest
@@ -1,2 +1 @@
-DIST kdepim-4.14.11_pre20160211.tar.gz 18551484 SHA256 
b970c0c04652519cc7e88d818b3a29e7b356a73f449f7f6e5767d60e5b2a17e3 SHA512 
e7fcf14353e457e9b3ec2d7eefa18ac0d9bc454ecaa682dcaf1585a6a36968bc8d7ea6ab61398a8d697d9343f0cd87472a906d444f814cd44956b6499826bb1d
 WHIRLPOOL 
f66fd74138ce871f88ce211c3b6af287cddaeda493e42c3b683938c274482d1f09a3ae659d380d4e19f5e5da70f5724ddd48723acf5846f6a1e9c01a79803e7e
 DIST kdepim-4.14.11_pre20160611.tar.xz 14805956 SHA256 
a9c3f5288efe0ccba3ffb88d4a63ac7b46a6b1ffe3c03b738ac6a53ef48e50b0 SHA512 
5ed0d2f814a7aac7f9977840bcda8ba98dc66c8ffe921d30430db07b06de2850d76140a5e5fa44db09e3cb4cac09fee0d8e0e4c208b752d52aecb453a4dc1b08
 WHIRLPOOL 
c6377c37b1a88a9d3958af5af081706e00437c3d0c28152a7e9353c49e376a3acdcdca0055d339f15287e6e101d6367a4d083b1a68162da9d4cc3d26178f62c5

diff --git a/kde-apps/ktnef/ktnef-4.14.11_pre20160211.ebuild 
b/kde-apps/ktnef/ktnef-4.14.11_pre20160211.ebuild
deleted file mode 100644
index 28322decc58..00000000000
--- a/kde-apps/ktnef/ktnef-4.14.11_pre20160211.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-EGIT_BRANCH="KDE/4.14"
-inherit kde4-meta
-
-DESCRIPTION="Viewer for TNEF attachments"
-COMMIT_ID="2aec255c6465676404e4694405c153e485e477d9"
-SRC_URI="https://quickgit.kde.org/?p=kdepim.git&a=snapshot&h=${COMMIT_ID}&fmt=tgz
 -> ${KMNAME}-${PV}.tar.gz"
-
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
-LICENSE="LGPL-2.1"
-IUSE="debug"
-
-DEPEND="
-       $(add_kdeapps_dep kdepimlibs 'akonadi(+)')
-       kde-apps/akonadi:4
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="
-       akonadi/
-"

Reply via email to