kde-apps/kdepimlibs: Fix compatibility with app-crypt/gpgme[cxx,qt5]

Avoid file collisions by renaming the affected files.

Maintainer comments:
- 4.14.{11_pre,10_p}20160611 are two incarnations of the same tarball
    4.14.10_p20160611 reverts one commit that breaks POP3 w/ kmail-4.4
- Applied ebuild sed,mv and patch magic to sources.
- Applied Gentoo patches to sources to obsolete $FILESDIR

Gentoo-bug: 611818
Package-Manager: Portage-2.3.3, Repoman-2.3.1

45 files changed, 1076 insertions, 0 deletions

diff --git a/kde-apps/akonadiconsole/Manifest b/kde-apps/akonadiconsole/Manifest
index ec77f3d9e52c..88f8a5bfdf9e 100644
--- a/kde-apps/akonadiconsole/Manifest
+++ b/kde-apps/akonadiconsole/Manifest
@@ -1,2 +1,3 @@
 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_pre20160611.ebuild b/kde-apps/akonadiconsole/akonadiconsole-4.14.11_pre20160611.ebuild
new file mode 100644
index 000000000000..306a3d67aa29
--- /dev/null
+++ b/kde-apps/akonadiconsole/akonadiconsole-4.14.11_pre20160611.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KMNAME="kdepim"
+inherit kde4-meta
+
+DESCRIPTION="Akonadi developer console"
+
+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 fb641c4e9521..bd495480ad85 100644
--- a/kde-apps/akregator/Manifest
+++ b/kde-apps/akregator/Manifest
@@ -1,3 +1,4 @@
 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.2016.01.tar.xz 8964248 SHA256 19f4d6ab4bcddf5a0e6acae50c20d0b8fbb482503e47e75c86955637d249cefa SHA512 a04737cc89f96e3635a19c492c9f3f31e7554aa8a237fb0ad8f5fe8c02e7e30911dd5d93bf0f27fd38603e496e02f3ef1d3064e159c99c71dea379199d1e0e03 WHIRLPOOL 9f02f5799b3a10a9b18b4c8cb34084051991cb7240d2b818cd2b58bde05abde2ef3126b3960f2554c7e5c4930266e561c1715c21fe72136654e28184b5083089
diff --git a/kde-apps/akregator/akregator-4.14.11_pre20160611.ebuild b/kde-apps/akregator/akregator-4.14.11_pre20160611.ebuild
new file mode 100644
index 000000000000..30ec168e8b6b
--- /dev/null
+++ b/kde-apps/akregator/akregator-4.14.11_pre20160611.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+inherit kde4-meta
+
+DESCRIPTION="News feed aggregator"
+HOMEPAGE="https://www.kde.org/applications/internet/akregator"
+
+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 9937243830a0..6262deda22bf 100644
--- a/kde-apps/blogilo/Manifest
+++ b/kde-apps/blogilo/Manifest
@@ -1,3 +1,4 @@
 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.2016.01.tar.xz 8964248 SHA256 19f4d6ab4bcddf5a0e6acae50c20d0b8fbb482503e47e75c86955637d249cefa SHA512 a04737cc89f96e3635a19c492c9f3f31e7554aa8a237fb0ad8f5fe8c02e7e30911dd5d93bf0f27fd38603e496e02f3ef1d3064e159c99c71dea379199d1e0e03 WHIRLPOOL 9f02f5799b3a10a9b18b4c8cb34084051991cb7240d2b818cd2b58bde05abde2ef3126b3960f2554c7e5c4930266e561c1715c21fe72136654e28184b5083089
diff --git a/kde-apps/blogilo/blogilo-4.14.11_pre20160611.ebuild b/kde-apps/blogilo/blogilo-4.14.11_pre20160611.ebuild
new file mode 100644
index 000000000000..b106a30682b0
--- /dev/null
+++ b/kde-apps/blogilo/blogilo-4.14.11_pre20160611.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+inherit kde4-meta
+
+DESCRIPTION="Application to create, edit and update blog content"
+HOMEPAGE="https://www.kde.org/applications/internet/blogilo"
+
+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 b6fbb1ea2aa9..e65b6ef00c26 100644
--- a/kde-apps/calendarjanitor/Manifest
+++ b/kde-apps/calendarjanitor/Manifest
@@ -1,2 +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
diff --git a/kde-apps/calendarjanitor/calendarjanitor-4.14.11_pre20160611.ebuild b/kde-apps/calendarjanitor/calendarjanitor-4.14.11_pre20160611.ebuild
new file mode 100644
index 000000000000..e13f0aef9f02
--- /dev/null
+++ b/kde-apps/calendarjanitor/calendarjanitor-4.14.11_pre20160611.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+KMMODULE="console/${PN}"
+inherit kde4-meta
+
+DESCRIPTION="Tool to scan calendar data for buggy instances"
+HOMEPAGE="https://www.kde.org/"
+
+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 180831d4b372..c16eba243037 100644
--- a/kde-apps/gpgmepp/Manifest
+++ b/kde-apps/gpgmepp/Manifest
@@ -1,2 +1,3 @@
 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/gpgmepp-4.14.11_pre20160611.ebuild b/kde-apps/gpgmepp/gpgmepp-4.14.11_pre20160611.ebuild
new file mode 100644
index 000000000000..941901b064af
--- /dev/null
+++ b/kde-apps/gpgmepp/gpgmepp-4.14.11_pre20160611.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KMNAME="kdepimlibs"
+inherit kde4-base
+
+DESCRIPTION="C++ bindings for gpgme"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="LGPL-2.1"
+IUSE="debug"
+
+DEPEND="
+	>=app-crypt/gpgme-1.8.0
+	dev-libs/boost:=
+	dev-libs/libgpg-error
+"
+# boost is not linked to, but headers which include it are installed
+# bug #418071
+RDEPEND="${DEPEND}
+	!kde-apps/kdepimlibs:4
+"
+
+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 0a4c5c7e235d..86b45db0eb81 100644
--- a/kde-apps/kabcclient/Manifest
+++ b/kde-apps/kabcclient/Manifest
@@ -1,2 +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.2016.01.tar.xz 8964248 SHA256 19f4d6ab4bcddf5a0e6acae50c20d0b8fbb482503e47e75c86955637d249cefa SHA512 a04737cc89f96e3635a19c492c9f3f31e7554aa8a237fb0ad8f5fe8c02e7e30911dd5d93bf0f27fd38603e496e02f3ef1d3064e159c99c71dea379199d1e0e03 WHIRLPOOL 9f02f5799b3a10a9b18b4c8cb34084051991cb7240d2b818cd2b58bde05abde2ef3126b3960f2554c7e5c4930266e561c1715c21fe72136654e28184b5083089
diff --git a/kde-apps/kabcclient/kabcclient-4.14.11_pre20160611.ebuild b/kde-apps/kabcclient/kabcclient-4.14.11_pre20160611.ebuild
new file mode 100644
index 000000000000..f4cb59d61539
--- /dev/null
+++ b/kde-apps/kabcclient/kabcclient-4.14.11_pre20160611.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+KMMODULE="console/${PN}"
+inherit kde4-meta
+
+DESCRIPTION="Command line client for accessing the KDE addressbook"
+
+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 ${PREFIX}/bin/kabc2mutt
+}
diff --git a/kde-apps/kaddressbook/Manifest b/kde-apps/kaddressbook/Manifest
index 3a8e93ebc065..cdbc09c9372a 100644
--- a/kde-apps/kaddressbook/Manifest
+++ b/kde-apps/kaddressbook/Manifest
@@ -1,3 +1,4 @@
 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.2016.01.tar.xz 8964248 SHA256 19f4d6ab4bcddf5a0e6acae50c20d0b8fbb482503e47e75c86955637d249cefa SHA512 a04737cc89f96e3635a19c492c9f3f31e7554aa8a237fb0ad8f5fe8c02e7e30911dd5d93bf0f27fd38603e496e02f3ef1d3064e159c99c71dea379199d1e0e03 WHIRLPOOL 9f02f5799b3a10a9b18b4c8cb34084051991cb7240d2b818cd2b58bde05abde2ef3126b3960f2554c7e5c4930266e561c1715c21fe72136654e28184b5083089
diff --git a/kde-apps/kaddressbook/kaddressbook-4.14.11_pre20160611.ebuild b/kde-apps/kaddressbook/kaddressbook-4.14.11_pre20160611.ebuild
new file mode 100644
index 000000000000..9c4b399f2f72
--- /dev/null
+++ b/kde-apps/kaddressbook/kaddressbook-4.14.11_pre20160611.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+inherit kde4-meta
+
+DESCRIPTION="Address book application"
+HOMEPAGE="https://www.kde.org/applications/office/kaddressbook/"
+
+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}
+	!kde-base/contactthemeeditor
+"
+
+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 1bd8b4640df1..5c23d92b0931 100644
--- a/kde-apps/kalarm/Manifest
+++ b/kde-apps/kalarm/Manifest
@@ -1,3 +1,4 @@
 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.2016.01.tar.xz 8964248 SHA256 19f4d6ab4bcddf5a0e6acae50c20d0b8fbb482503e47e75c86955637d249cefa SHA512 a04737cc89f96e3635a19c492c9f3f31e7554aa8a237fb0ad8f5fe8c02e7e30911dd5d93bf0f27fd38603e496e02f3ef1d3064e159c99c71dea379199d1e0e03 WHIRLPOOL 9f02f5799b3a10a9b18b4c8cb34084051991cb7240d2b818cd2b58bde05abde2ef3126b3960f2554c7e5c4930266e561c1715c21fe72136654e28184b5083089
diff --git a/kde-apps/kalarm/kalarm-4.14.11_pre20160611.ebuild b/kde-apps/kalarm/kalarm-4.14.11_pre20160611.ebuild
new file mode 100644
index 000000000000..7bf9565c13f9
--- /dev/null
+++ b/kde-apps/kalarm/kalarm-4.14.11_pre20160611.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+inherit kde4-meta
+
+DESCRIPTION="Personal alarm message, command and email scheduler by KDE"
+HOMEPAGE+=" https://userbase.kde.org/KAlarm"
+
+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 d63f48e1338c..e440cd850115 100644
--- a/kde-apps/kdepim-common-libs/Manifest
+++ b/kde-apps/kdepim-common-libs/Manifest
@@ -1 +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
diff --git a/kde-apps/kdepim-common-libs/kdepim-common-libs-4.14.11_pre20160611.ebuild b/kde-apps/kdepim-common-libs/kdepim-common-libs-4.14.11_pre20160611.ebuild
new file mode 100644
index 000000000000..9276f2827715
--- /dev/null
+++ b/kde-apps/kdepim-common-libs/kdepim-common-libs-4.14.11_pre20160611.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KMNAME="kdepim"
+KMNOMODULE="true"
+WEBKIT_REQUIRED="always"
+inherit kde4-meta
+
+DESCRIPTION="Common libraries for KDE PIM apps"
+
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug google"
+
+DEPEND="
+	$(add_kdeapps_dep kdepimlibs 'akonadi(+)' 4.14.11_pre20160611)
+	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/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"
+
+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 0a4c5c7e235d..86b45db0eb81 100644
--- a/kde-apps/kdepim-kresources/Manifest
+++ b/kde-apps/kdepim-kresources/Manifest
@@ -1,2 +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.2016.01.tar.xz 8964248 SHA256 19f4d6ab4bcddf5a0e6acae50c20d0b8fbb482503e47e75c86955637d249cefa SHA512 a04737cc89f96e3635a19c492c9f3f31e7554aa8a237fb0ad8f5fe8c02e7e30911dd5d93bf0f27fd38603e496e02f3ef1d3064e159c99c71dea379199d1e0e03 WHIRLPOOL 9f02f5799b3a10a9b18b4c8cb34084051991cb7240d2b818cd2b58bde05abde2ef3126b3960f2554c7e5c4930266e561c1715c21fe72136654e28184b5083089
diff --git a/kde-apps/kdepim-kresources/kdepim-kresources-4.14.11_pre20160611.ebuild b/kde-apps/kdepim-kresources/kdepim-kresources-4.14.11_pre20160611.ebuild
new file mode 100644
index 000000000000..a0ba4c711887
--- /dev/null
+++ b/kde-apps/kdepim-kresources/kdepim-kresources-4.14.11_pre20160611.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KMNAME="kdepim"
+KMMODULE="kresources"
+inherit kde4-meta
+
+DESCRIPTION="KDE PIM groupware plugin collection"
+
+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_pre20160611.ebuild b/kde-apps/kdepim-meta/kdepim-meta-4.14.11_pre20160611.ebuild
new file mode 100644
index 000000000000..1af6dd820bff
--- /dev/null
+++ b/kde-apps/kdepim-meta/kdepim-meta-4.14.11_pre20160611.ebuild
@@ -0,0 +1,40 @@
+# 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 f2bf5ebdda22..eb7ae879258c 100644
--- a/kde-apps/kdepimlibs/Manifest
+++ b/kde-apps/kdepimlibs/Manifest
@@ -1,2 +1,3 @@
 DIST kdepimlibs-4.14.10.tar.xz 2831160 SHA256 c8cc9694add6ecf121bda050235ffa68d8307a82c85fbdffe69a8eab5be584c2 SHA512 64f396957ae1f70a19ba689fabc0850aed04e4e4bce58a4bbc27af2b5cfa27b50472614b4096d8424ee6b4463faaed37d98e6cccfe36d208e9193ba20dc6766a WHIRLPOOL b9123e702f5d4f696cd09d3e7932dbc796f4d8e09feace56a49a96ddb64478bf8cd237bcac9c438d77491822cd655f3f44b76e657f6dbb09b8deb96ab90da52a
 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.10_p20160611-revert-544410c90.patch b/kde-apps/kdepimlibs/files/kdepimlibs-4.14.10_p20160611-revert-544410c90.patch
new file mode 100644
index 000000000000..94f1494a3ddd
--- /dev/null
+++ b/kde-apps/kdepimlibs/files/kdepimlibs-4.14.10_p20160611-revert-544410c90.patch
@@ -0,0 +1,25 @@
+diff --git a/kioslave/pop3/pop3.cpp b/kioslave/pop3/pop3.cpp
+index 8238a5fca..20730950d 100644
+--- a/kioslave/pop3/pop3.cpp
++++ b/kioslave/pop3/pop3.cpp
+@@ -812,7 +812,6 @@ void POP3Protocol::get(const KUrl & url)
+        .
+      */
+     if (result) {
+-      mimeType("text/plain");
+       while (true /* !AtEOF() */ ) {
+         memset(buf, 0, sizeof(buf));
+         myReadLine(buf, sizeof(buf) - 1);
+@@ -849,12 +848,6 @@ void POP3Protocol::get(const KUrl & url)
+     m_cmd = CMD_NONE;
+   } else if (cmd == "download" || cmd == "headers") {
+     const QStringList waitingCommands = path.split(',', QString::SkipEmptyParts);
+-    if ( waitingCommands.isEmpty() ) {
+-      kDebug(7105) << "tried to request" << cmd << "for" << path << "with no specific item to get";
+-      closeConnection();
+-      error(ERR_INTERNAL, m_sServer);
+-      return;
+-    }
+     bool noProgress = (metaData("progress") == "off"
+                        || waitingCommands.count() > 1);
+     int p_size = 0;
diff --git a/kde-apps/kdepimlibs/kdepimlibs-4.14.10_p20160611.ebuild b/kde-apps/kdepimlibs/kdepimlibs-4.14.10_p20160611.ebuild
new file mode 100644
index 000000000000..aa5f15224d93
--- /dev/null
+++ b/kde-apps/kdepimlibs/kdepimlibs-4.14.10_p20160611.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+CPPUNIT_REQUIRED="optional"
+inherit kde4-base
+
+DESCRIPTION="Common library for KDE PIM apps"
+SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P/10_p/11_pre}.tar.xz"
+
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+LICENSE="LGPL-2.1"
+IUSE="debug ldap prison"
+
+# some akonadi tests timeout, that probably needs more work as its ~700 tests
+RESTRICT="test"
+
+DEPEND="
+	>=app-crypt/gpgme-1.8.0
+	dev-libs/boost:=
+	dev-libs/cyrus-sasl
+	dev-libs/libgpg-error
+	dev-libs/libical:=
+	dev-libs/qjson
+	kde-apps/akonadi:4
+	media-libs/phonon[qt4]
+	x11-misc/shared-mime-info
+	ldap? ( net-nds/openldap )
+	prison? ( kde-frameworks/prison:4 )
+"
+# boost is not linked to, but headers which include it are installed
+# bug #418071
+RDEPEND="${DEPEND}"
+
+# breaks veryoldpim POP3, see also: https://git.reviewboard.kde.org/r/124987/
+PATCHES=( "${FILESDIR}/${P}-revert-544410c90.patch" )
+
+S="${WORKDIR}/${P/10_p/11_pre}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TOOLS=OFF
+		-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/kdepimlibs/kdepimlibs-4.14.11_pre20160611.ebuild b/kde-apps/kdepimlibs/kdepimlibs-4.14.11_pre20160611.ebuild
new file mode 100644
index 000000000000..423dc7ea7078
--- /dev/null
+++ b/kde-apps/kdepimlibs/kdepimlibs-4.14.11_pre20160611.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+CPPUNIT_REQUIRED="optional"
+inherit kde4-base
+
+DESCRIPTION="Common library for KDE PIM apps"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+LICENSE="LGPL-2.1"
+IUSE="debug ldap prison"
+
+# some akonadi tests timeout, that probably needs more work as its ~700 tests
+RESTRICT="test"
+
+DEPEND="
+	>=app-crypt/gpgme-1.8.0
+	dev-libs/boost:=
+	dev-libs/cyrus-sasl
+	dev-libs/libgpg-error
+	dev-libs/libical:=
+	dev-libs/qjson
+	kde-apps/akonadi:4
+	media-libs/phonon[qt4]
+	x11-misc/shared-mime-info
+	ldap? ( net-nds/openldap )
+	prison? ( kde-frameworks/prison:4 )
+"
+# boost is not linked to, but headers which include it are installed
+# bug #418071
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TOOLS=OFF
+		-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 fc7f11ea03e3..a8d4a2239fa1 100644
--- a/kde-apps/kjots/Manifest
+++ b/kde-apps/kjots/Manifest
@@ -1,3 +1,4 @@
 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.2016.01.tar.xz 8964248 SHA256 19f4d6ab4bcddf5a0e6acae50c20d0b8fbb482503e47e75c86955637d249cefa SHA512 a04737cc89f96e3635a19c492c9f3f31e7554aa8a237fb0ad8f5fe8c02e7e30911dd5d93bf0f27fd38603e496e02f3ef1d3064e159c99c71dea379199d1e0e03 WHIRLPOOL 9f02f5799b3a10a9b18b4c8cb34084051991cb7240d2b818cd2b58bde05abde2ef3126b3960f2554c7e5c4930266e561c1715c21fe72136654e28184b5083089
 DIST kjots-5.0.2.tar.xz 230608 SHA256 5359aefb7b44027d7abbdafb0d501a7b30695119d5d5c8a75cfcee98e428fae3 SHA512 a652765c56cebcaeba7b879cc075555c28667abdba84d11e986e5ffb440fbc776116f363992dd84d939918ae7d80ef5c2e1093da28d114b18041e10e5209b225 WHIRLPOOL 18e4dd955e275bdaceed16a4206e4ac5116cb26f2d1d87d35ef8b676ea61679e0c168176a50b94e96dadc5c944b56604d595541d158e982cc1222e5b52f3a1b6
diff --git a/kde-apps/kjots/kjots-4.14.11_pre20160611.ebuild b/kde-apps/kjots/kjots-4.14.11_pre20160611.ebuild
new file mode 100644
index 000000000000..2c9f013d4e5e
--- /dev/null
+++ b/kde-apps/kjots/kjots-4.14.11_pre20160611.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+inherit kde4-meta
+
+DESCRIPTION="Note taking utility by KDE"
+HOMEPAGE="https://www.kde.org/applications/utilities/kjots/"
+
+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 d51e2087e858..64ba77875e36 100644
--- a/kde-apps/kleopatra/Manifest
+++ b/kde-apps/kleopatra/Manifest
@@ -1,3 +1,4 @@
 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.2016.01.tar.xz 8964248 SHA256 19f4d6ab4bcddf5a0e6acae50c20d0b8fbb482503e47e75c86955637d249cefa SHA512 a04737cc89f96e3635a19c492c9f3f31e7554aa8a237fb0ad8f5fe8c02e7e30911dd5d93bf0f27fd38603e496e02f3ef1d3064e159c99c71dea379199d1e0e03 WHIRLPOOL 9f02f5799b3a10a9b18b4c8cb34084051991cb7240d2b818cd2b58bde05abde2ef3126b3960f2554c7e5c4930266e561c1715c21fe72136654e28184b5083089
 DIST kleopatra-17.04.0.tar.xz 1841156 SHA256 cc73f7b4e2d3722dd5ae061d731438f93a3fa851cc7dcc3c9b1f63ca131d02d1 SHA512 622ce422e51944d58de5ba04ce846ac7409cc4d60d36b8a15e19e608a0a2b3183dd1867a89276d8a6bb4fcdadcc9f38cb0311ee8139dabc08fade846d0a7da39 WHIRLPOOL 6122a7ad32945e3889daa8eca322d422c815f617ad14f6c6560e259be9e3ba951259a9997775c20af561d3a6d586edd48c148c1f530432326382a5c79ea5a154
diff --git a/kde-apps/kleopatra/kleopatra-4.14.11_pre20160611.ebuild b/kde-apps/kleopatra/kleopatra-4.14.11_pre20160611.ebuild
new file mode 100644
index 000000000000..50928baee175
--- /dev/null
+++ b/kde-apps/kleopatra/kleopatra-4.14.11_pre20160611.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+inherit kde4-meta
+
+DESCRIPTION="Certificate manager and GUI for OpenPGP and CMS cryptography"
+HOMEPAGE="https://www.kde.org/applications/utilities/kleopatra/"
+
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdeapps_dep kdepimlibs 'akonadi(+)' 4.14.11_pre20160611)
+	$(add_kdeapps_dep kdepim-common-libs '' 4.14.11_pre20160611)
+	app-crypt/gpgme
+	dev-libs/boost:=
+	dev-libs/libassuan
+	dev-libs/libgpg-error
+"
+RDEPEND="${DEPEND}
+	app-crypt/gnupg
+"
+
+KMEXTRACTONLY="
+	libkleo/
+"
+
+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 cf0221a3d994..8317eccd8c6d 100644
--- a/kde-apps/kmail/Manifest
+++ b/kde-apps/kmail/Manifest
@@ -1,3 +1,4 @@
 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.2016.01.tar.xz 8964248 SHA256 19f4d6ab4bcddf5a0e6acae50c20d0b8fbb482503e47e75c86955637d249cefa SHA512 a04737cc89f96e3635a19c492c9f3f31e7554aa8a237fb0ad8f5fe8c02e7e30911dd5d93bf0f27fd38603e496e02f3ef1d3064e159c99c71dea379199d1e0e03 WHIRLPOOL 9f02f5799b3a10a9b18b4c8cb34084051991cb7240d2b818cd2b58bde05abde2ef3126b3960f2554c7e5c4930266e561c1715c21fe72136654e28184b5083089
 DIST kmail-17.04.0.tar.xz 4377580 SHA256 2a00586e859cbca977fedc36e6992f26df8c8ce633020c259bdc3ee1b56c8e11 SHA512 3267c06a2257fa6ad2a978169a82e954708de71999d6b3ec0718c8d487f96dc8bfe56ea25395a488d4ad629fa2cc713d14b9b831bf4e445742c91e6ad308b900 WHIRLPOOL 7156ed06cf774db8c4fdfd866b6e5532926ac1d2c965133e9a2bd815481c1dbb37227531b22825e00be03bda07e495835d22e2077ad1f1e491d88b871d636eeb
diff --git a/kde-apps/kmail/kmail-4.14.11_pre20160611.ebuild b/kde-apps/kmail/kmail-4.14.11_pre20160611.ebuild
new file mode 100644
index 000000000000..33d45ed89198
--- /dev/null
+++ b/kde-apps/kmail/kmail-4.14.11_pre20160611.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+VIRTUALX_REQUIRED="test"
+WEBKIT_REQUIRED="always"
+inherit flag-o-matic kde4-meta
+
+DESCRIPTION="Email client, supporting POP3 and IMAP mailboxes."
+HOMEPAGE="https://www.kde.org/applications/internet/kmail/"
+
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdeapps_dep kdepimlibs 'akonadi(+)' 4.14.11_pre20160611)
+	$(add_kdeapps_dep kdepim-common-libs '' 4.14.11_pre20160611)
+	$(add_kdeapps_dep korganizer)
+"
+RDEPEND="${DEPEND}"
+
+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 0a4c5c7e235d..86b45db0eb81 100644
--- a/kde-apps/knode/Manifest
+++ b/kde-apps/knode/Manifest
@@ -1,2 +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.2016.01.tar.xz 8964248 SHA256 19f4d6ab4bcddf5a0e6acae50c20d0b8fbb482503e47e75c86955637d249cefa SHA512 a04737cc89f96e3635a19c492c9f3f31e7554aa8a237fb0ad8f5fe8c02e7e30911dd5d93bf0f27fd38603e496e02f3ef1d3064e159c99c71dea379199d1e0e03 WHIRLPOOL 9f02f5799b3a10a9b18b4c8cb34084051991cb7240d2b818cd2b58bde05abde2ef3126b3960f2554c7e5c4930266e561c1715c21fe72136654e28184b5083089
diff --git a/kde-apps/knode/knode-4.14.11_pre20160611.ebuild b/kde-apps/knode/knode-4.14.11_pre20160611.ebuild
new file mode 100644
index 000000000000..0b846e42f5fe
--- /dev/null
+++ b/kde-apps/knode/knode-4.14.11_pre20160611.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+inherit kde4-meta
+
+DESCRIPTION="Usenet newsgroups and mailing lists reader by KDE"
+HOMEPAGE="https://www.kde.org/applications/internet/knode/"
+
+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 44c096eda201..f082dbdc13f2 100644
--- a/kde-apps/knotes/Manifest
+++ b/kde-apps/knotes/Manifest
@@ -1,3 +1,4 @@
 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.2016.01.tar.xz 8964248 SHA256 19f4d6ab4bcddf5a0e6acae50c20d0b8fbb482503e47e75c86955637d249cefa SHA512 a04737cc89f96e3635a19c492c9f3f31e7554aa8a237fb0ad8f5fe8c02e7e30911dd5d93bf0f27fd38603e496e02f3ef1d3064e159c99c71dea379199d1e0e03 WHIRLPOOL 9f02f5799b3a10a9b18b4c8cb34084051991cb7240d2b818cd2b58bde05abde2ef3126b3960f2554c7e5c4930266e561c1715c21fe72136654e28184b5083089
 DIST knotes-17.04.0.tar.xz 334820 SHA256 cc5813205e0ca214b9aa565f16f7107aa4bbea2330d6c31bec076999e12b3e14 SHA512 b9ec3d620ade284771fdb83873d8ef685373bd4e2eb74a737a6c83b89c4c489b2c212b4fc68dd1c3b41915a08d736f112b62c5ad0df8b8059c31be3c9936e1cb WHIRLPOOL e0d98194762a41c00eb4bae23c39a3130ba4566b505fc7e84163efe12d5219c5513103be3bac903f01a2b60b63759b2265be94aa7a68377d2e37a25460b6b10b
diff --git a/kde-apps/knotes/knotes-4.14.11_pre20160611.ebuild b/kde-apps/knotes/knotes-4.14.11_pre20160611.ebuild
new file mode 100644
index 000000000000..cec191efd036
--- /dev/null
+++ b/kde-apps/knotes/knotes-4.14.11_pre20160611.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+inherit kde4-meta
+
+DESCRIPTION="Note taking application"
+HOMEPAGE="https://www.kde.org/applications/utilities/knotes/"
+
+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 3e3c1f904d50..b0b901264e9f 100644
--- a/kde-apps/konsolekalendar/Manifest
+++ b/kde-apps/konsolekalendar/Manifest
@@ -1,3 +1,4 @@
 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.2016.01.tar.xz 8964248 SHA256 19f4d6ab4bcddf5a0e6acae50c20d0b8fbb482503e47e75c86955637d249cefa SHA512 a04737cc89f96e3635a19c492c9f3f31e7554aa8a237fb0ad8f5fe8c02e7e30911dd5d93bf0f27fd38603e496e02f3ef1d3064e159c99c71dea379199d1e0e03 WHIRLPOOL 9f02f5799b3a10a9b18b4c8cb34084051991cb7240d2b818cd2b58bde05abde2ef3126b3960f2554c7e5c4930266e561c1715c21fe72136654e28184b5083089
diff --git a/kde-apps/konsolekalendar/konsolekalendar-4.14.11_pre20160611.ebuild b/kde-apps/konsolekalendar/konsolekalendar-4.14.11_pre20160611.ebuild
new file mode 100644
index 000000000000..0f0538ee5f51
--- /dev/null
+++ b/kde-apps/konsolekalendar/konsolekalendar-4.14.11_pre20160611.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+KMMODULE="console/${PN}"
+inherit kde4-meta
+
+DESCRIPTION="Command line interface to KDE calendars"
+HOMEPAGE+=" https://userbase.kde.org/KonsoleKalendar"
+
+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="
+	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 49bbe36ae44b..9b420e4b75f0 100644
--- a/kde-apps/kontact/Manifest
+++ b/kde-apps/kontact/Manifest
@@ -1,3 +1,4 @@
 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.2016.01.tar.xz 8964248 SHA256 19f4d6ab4bcddf5a0e6acae50c20d0b8fbb482503e47e75c86955637d249cefa SHA512 a04737cc89f96e3635a19c492c9f3f31e7554aa8a237fb0ad8f5fe8c02e7e30911dd5d93bf0f27fd38603e496e02f3ef1d3064e159c99c71dea379199d1e0e03 WHIRLPOOL 9f02f5799b3a10a9b18b4c8cb34084051991cb7240d2b818cd2b58bde05abde2ef3126b3960f2554c7e5c4930266e561c1715c21fe72136654e28184b5083089
 DIST kontact-17.04.0.tar.xz 862864 SHA256 e60485b85f60930c8ec4a3fe9e93e7f7e3f450a3c463d81f6a5a247bbc1a5344 SHA512 7654b5a108ac8a655cc04080adc52062cb373b69b5b575ad43f21d26bb77056d252ce22d65923df8a8b9ee67fdcb3015970f983281b7594d1be37c73d29cb19b WHIRLPOOL 6dfd9b82cdd850db9d4d8445420798728edd5093b63b66cc13960b641f4910d2e1de85c2a38176d7e3feb67851cb5a919fe78d6d3c1d5e3952042c15bcd6132e
diff --git a/kde-apps/kontact/kontact-4.14.11_pre20160611.ebuild b/kde-apps/kontact/kontact-4.14.11_pre20160611.ebuild
new file mode 100644
index 000000000000..2ff704b88d89
--- /dev/null
+++ b/kde-apps/kontact/kontact-4.14.11_pre20160611.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+inherit kde4-meta
+
+DESCRIPTION="Container application to unify several major PIM applications within one"
+HOMEPAGE="https://www.kde.org/applications/office/kontact/"
+
+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"
+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 73c37f51be48..7c159371ad61 100644
--- a/kde-apps/korganizer/Manifest
+++ b/kde-apps/korganizer/Manifest
@@ -1,3 +1,4 @@
 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.2016.01.tar.xz 8964248 SHA256 19f4d6ab4bcddf5a0e6acae50c20d0b8fbb482503e47e75c86955637d249cefa SHA512 a04737cc89f96e3635a19c492c9f3f31e7554aa8a237fb0ad8f5fe8c02e7e30911dd5d93bf0f27fd38603e496e02f3ef1d3064e159c99c71dea379199d1e0e03 WHIRLPOOL 9f02f5799b3a10a9b18b4c8cb34084051991cb7240d2b818cd2b58bde05abde2ef3126b3960f2554c7e5c4930266e561c1715c21fe72136654e28184b5083089
 DIST korganizer-17.04.0.tar.xz 2344316 SHA256 3a34366cb3035beb33271197e1bfe655dd8a15793bf825e2cee0d21ab7eead8e SHA512 301010096749b7e6b2332d7b476f601b4d3a5ff1a9148f470cc8390174ee8c6b93eac83c3c5865e510b06ac49f6a6440ac7a80242348f7ec9b47515a102d97b8 WHIRLPOOL f92eebfe76ef58282322e15640c41689931fc61e7c7eb0156b47dbc3f03327be646d63e1521d30ce0c871f0bb02bf31b5482604700ba34ed55b1b4223338399f
diff --git a/kde-apps/korganizer/korganizer-4.14.11_pre20160611.ebuild b/kde-apps/korganizer/korganizer-4.14.11_pre20160611.ebuild
new file mode 100644
index 000000000000..a35b25535fd7
--- /dev/null
+++ b/kde-apps/korganizer/korganizer-4.14.11_pre20160611.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+inherit kde4-meta
+
+DESCRIPTION="Organizational assistant, providing calendars and other similar functionality"
+HOMEPAGE="https://www.kde.org/applications/office/korganizer/"
+
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdeapps_dep kdepimlibs 'akonadi(+)' 4.14.11_pre20160611)
+	$(add_kdeapps_dep kdepim-common-libs)
+	sys-libs/zlib
+"
+RDEPEND="${DEPEND}
+	$(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 0a4c5c7e235d..86b45db0eb81 100644
--- a/kde-apps/ktimetracker/Manifest
+++ b/kde-apps/ktimetracker/Manifest
@@ -1,2 +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.2016.01.tar.xz 8964248 SHA256 19f4d6ab4bcddf5a0e6acae50c20d0b8fbb482503e47e75c86955637d249cefa SHA512 a04737cc89f96e3635a19c492c9f3f31e7554aa8a237fb0ad8f5fe8c02e7e30911dd5d93bf0f27fd38603e496e02f3ef1d3064e159c99c71dea379199d1e0e03 WHIRLPOOL 9f02f5799b3a10a9b18b4c8cb34084051991cb7240d2b818cd2b58bde05abde2ef3126b3960f2554c7e5c4930266e561c1715c21fe72136654e28184b5083089
diff --git a/kde-apps/ktimetracker/ktimetracker-4.14.11_pre20160611.ebuild b/kde-apps/ktimetracker/ktimetracker-4.14.11_pre20160611.ebuild
new file mode 100644
index 000000000000..798d58586c32
--- /dev/null
+++ b/kde-apps/ktimetracker/ktimetracker-4.14.11_pre20160611.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+inherit kde4-meta
+
+DESCRIPTION="Tracks time spent on various tasks"
+HOEMPAGE="https://www.kde.org/applications/utilities/ktimetracker/"
+
+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 d63f48e1338c..e440cd850115 100644
--- a/kde-apps/ktnef/Manifest
+++ b/kde-apps/ktnef/Manifest
@@ -1 +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
diff --git a/kde-apps/ktnef/ktnef-4.14.11_pre20160611.ebuild b/kde-apps/ktnef/ktnef-4.14.11_pre20160611.ebuild
new file mode 100644
index 000000000000..384f3b6d3934
--- /dev/null
+++ b/kde-apps/ktnef/ktnef-4.14.11_pre20160611.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+inherit kde4-meta
+
+DESCRIPTION="Viewer for TNEF attachments"
+
+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/
+"