[gentoo-commits] proj/kde-sunset:master commit in: kde-apps/konsolekalendar/, kde-apps/kdepim-runtime/, kde-apps/calendarjanitor/, ...

[Michael Palimaka]

commit:     694995b648e23fa90b8c2cf37648839099e7bae9
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 12 13:47:32 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Aug 12 13:47:37 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=694995b6

kde-apps: import kdepim4 from main tree

 .../akonadiconsole-4.14.11_pre20160611.ebuild      |  25 +++++
 kde-apps/akonadiconsole/metadata.xml               |   4 +
 .../akregator/akregator-4.14.11_pre20160611.ebuild |  22 +++++
 .../blogilo/blogilo-4.14.11_pre20160611.ebuild     |  26 +++++
 kde-apps/blogilo/metadata.xml                      |   4 +
 .../calendarjanitor-4.14.11_pre20160611.ebuild     |  27 ++++++
 kde-apps/calendarjanitor/metadata.xml              |   4 +
 .../kabcclient-4.14.11_pre20160611.ebuild          |  26 +++++
 kde-apps/kabcclient/metadata.xml                   |   4 +
 .../kaddressbook-4.14.11_pre20160611.ebuild        |  52 ++++++++++
 kde-apps/kalarm/kalarm-4.14.11_pre20160611.ebuild  |  27 ++++++
 ...on-libs-4.14.11_pre20160611-CVE-2017-9604.patch |  89 +++++++++++++++++
 ...depim-common-libs-4.14.11_pre20160611-r1.ebuild |  89 +++++++++++++++++
 kde-apps/kdepim-common-libs/metadata.xml           |   7 ++
 .../kdepim-kresources-4.14.11_pre20160611.ebuild   |  27 ++++++
 .../kdepim-meta-4.14.11_pre20160611.ebuild         |  40 ++++++++
 .../kdepim-runtime-4.14.11_pre20160211-r1.ebuild   |  50 ++++++++++
 kde-apps/kdepim-runtime/metadata.xml               |   7 ++
 ...imlibs-4.14.10_p20160611-revert-544410c90.patch |  25 +++++
 .../kdepimlibs/kdepimlibs-4.14.10_p20160611.ebuild |  61 ++++++++++++
 .../kdepimlibs-4.14.11_pre20160611.ebuild          |  54 +++++++++++
 kde-apps/kdepimlibs/metadata.xml                   |  11 +++
 kde-apps/kjots/kjots-4.14.11_pre20160611.ebuild    |  26 +++++
 .../kleopatra/kleopatra-4.14.11_pre20160611.ebuild |  40 ++++++++
 kde-apps/kleopatra/metadata.xml                    |   4 +
 .../kmail-4.14.11_pre20160611-CVE-2017-9604.patch  |  89 +++++++++++++++++
 kde-apps/kmail/kmail-4.14.11_pre20160611-r1.ebuild | 107 +++++++++++++++++++++
 kde-apps/knode/knode-4.14.11_pre20160611.ebuild    |  48 +++++++++
 kde-apps/knotes/knotes-4.14.11_pre20160611.ebuild  |  31 ++++++
 .../konsolekalendar-4.14.11_pre20160611.ebuild     |  47 +++++++++
 .../kontact/kontact-4.14.11_pre20160611.ebuild     |  51 ++++++++++
 .../korganizer-4.14.11_pre20160611.ebuild          |  84 ++++++++++++++++
 .../ktimetracker-4.14.11_pre20160611.ebuild        |  38 ++++++++
 kde-apps/ktimetracker/metadata.xml                 |   4 +
 kde-apps/ktnef/ktnef-4.14.11_pre20160611.ebuild    |  24 +++++
 35 files changed, 1274 insertions(+)

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 0000000..23a68ac
--- /dev/null
+++ b/kde-apps/akonadiconsole/akonadiconsole-4.14.11_pre20160611.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 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 x86"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdeapps_dep kdepim-common-libs)
+	$(add_kdeapps_dep kdepimlibs)
+	kde-apps/akonadi:4
+"
+RDEPEND="${DEPEND}"
+
+KMEXTRACTONLY="
+	akonadi_next/
+	calendarsupport/
+	messageviewer/
+"

diff --git a/kde-apps/akonadiconsole/metadata.xml b/kde-apps/akonadiconsole/metadata.xml
new file mode 100644
index 0000000..097975e
--- /dev/null
+++ b/kde-apps/akonadiconsole/metadata.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+</pkgmetadata>

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 0000000..c8207ac
--- /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 x86"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdeapps_dep kdepim-common-libs)
+	$(add_kdeapps_dep kdepimlibs)
+"
+RDEPEND="${DEPEND}"
+
+KMLOADLIBS="kdepim-common-libs"

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 0000000..3995a50
--- /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 x86"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdeapps_dep kdepim-common-libs)
+	$(add_kdeapps_dep kdepimlibs)
+	$(add_kdeapps_dep libkgapi '' 2.2.0)
+"
+RDEPEND="${DEPEND}"
+
+KMEXTRACTONLY="
+	composereditor-ng/
+	pimcommon/
+"

diff --git a/kde-apps/blogilo/metadata.xml b/kde-apps/blogilo/metadata.xml
new file mode 100644
index 0000000..af857d3
--- /dev/null
+++ b/kde-apps/blogilo/metadata.xml
@@ -0,0 +1,4 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+</pkgmetadata>

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 0000000..c4798ac
--- /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 x86"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdeapps_dep kdepim-common-libs)
+	$(add_kdeapps_dep kdepimlibs)
+"
+RDEPEND="${DEPEND}"
+
+KMEXTRACTONLY="
+	calendarsupport/
+"
+
+KMLOADLIBS="kdepim-common-libs"

diff --git a/kde-apps/calendarjanitor/metadata.xml b/kde-apps/calendarjanitor/metadata.xml
new file mode 100644
index 0000000..097975e
--- /dev/null
+++ b/kde-apps/calendarjanitor/metadata.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+</pkgmetadata>

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 0000000..69fe193
--- /dev/null
+++ b/kde-apps/kabcclient/kabcclient-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"
+KMMODULE="console/${PN}"
+inherit kde4-meta
+
+DESCRIPTION="Command line client for accessing the KDE addressbook"
+
+KEYWORDS="amd64 x86"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdeapps_dep kdepimlibs)
+"
+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/kabcclient/metadata.xml b/kde-apps/kabcclient/metadata.xml
new file mode 100644
index 0000000..af857d3
--- /dev/null
+++ b/kde-apps/kabcclient/metadata.xml
@@ -0,0 +1,4 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+</pkgmetadata>

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 0000000..73dc5e7
--- /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 x86"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdeapps_dep kdepim-common-libs '' 4.14.11_pre20160611)
+	$(add_kdeapps_dep kdepimlibs '' 4.14.11_pre20160611)
+	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/kalarm-4.14.11_pre20160611.ebuild b/kde-apps/kalarm/kalarm-4.14.11_pre20160611.ebuild
new file mode 100644
index 0000000..9c66026
--- /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 x86"
+IUSE="debug"
+
+RDEPEND="
+	$(add_kdeapps_dep kdepim-common-libs)
+	$(add_kdeapps_dep kdepimlibs)
+	$(add_kdeapps_dep ktimezoned)
+	media-libs/phonon[qt4]
+	x11-libs/libX11
+"
+DEPEND="${RDEPEND}"
+
+KMEXTRACTONLY="
+	kmail/
+"

diff --git a/kde-apps/kdepim-common-libs/files/kdepim-common-libs-4.14.11_pre20160611-CVE-2017-9604.patch b/kde-apps/kdepim-common-libs/files/kdepim-common-libs-4.14.11_pre20160611-CVE-2017-9604.patch
new file mode 100644
index 0000000..e36e074
--- /dev/null
+++ b/kde-apps/kdepim-common-libs/files/kdepim-common-libs-4.14.11_pre20160611-CVE-2017-9604.patch
@@ -0,0 +1,89 @@
+From c54706e990bbd6498e7b1597ec7900bc809e8197 Mon Sep 17 00:00:00 2001
+From: Montel Laurent <montel@×××.org>
+Date: Fri, 2 Jun 2017 13:56:41 +0200
+Subject: Make sure to sign/encrypt message when we send later
+
+(cherry picked from commit 4048f5e46d0a7d62d93d74fd2861dd70fb2ad660)
+---
+ messagecomposer/composer/composerviewbase.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: kdepim-4.14.10/messagecomposer/composer/composerviewbase.cpp
+===================================================================
+--- kdepim-4.14.10.orig/messagecomposer/composer/composerviewbase.cpp
++++ kdepim-4.14.10/messagecomposer/composer/composerviewbase.cpp
+@@ -435,7 +435,7 @@ void MessageComposer::ComposerViewBase::
+     // if so, we create a composer per format
+     // if we aren't signing or encrypting, this just returns a single empty message
+     bool wasCanceled = false;
+-    if( m_neverEncrypt && mSaveIn != MessageComposer::MessageSender::SaveInNone ) {
++    if( m_neverEncrypt && mSaveIn != MessageComposer::MessageSender::SaveInNone && !mSendLaterInfo) {
+         MessageComposer::Composer* composer = new MessageComposer::Composer;
+         composer->setNoCrypto( true );
+         m_composers.append( composer );
+From 78c5552be2f00a4ac25bd77ca39386522fca70a8 Mon Sep 17 00:00:00 2001
+From: Montel Laurent <montel@×××.org>
+Date: Fri, 2 Jun 2017 13:59:02 +0200
+Subject: Make sure that we use plugin when we use sendlater feature
+
+---
+ src/editor/kmcomposewin.cpp | 9 +++++----
+ src/editor/kmcomposewin.h   | 3 ++-
+ 2 files changed, 7 insertions(+), 5 deletions(-)
+
+Index: kdepim-4.14.10/kmail/editor/kmcomposewin.cpp
+===================================================================
+--- kdepim-4.14.10.orig/kmail/editor/kmcomposewin.cpp
++++ kdepim-4.14.10/kmail/editor/kmcomposewin.cpp
+@@ -2533,7 +2533,7 @@ void KMComposeWin::printComposeResult( K
+ 
+ 
+ void KMComposeWin::doSend( MessageComposer::MessageSender::SendMethod method,
+-                           MessageComposer::MessageSender::SaveIn saveIn )
++                           MessageComposer::MessageSender::SaveIn saveIn, bool willSendItWithoutReediting )
+ {
+     if ( mStorageService->numProgressUpdateFile() > 0) {
+         KMessageBox::sorry( this, i18np( "There is %1 file upload in progress.",
+@@ -2549,7 +2549,7 @@ void KMComposeWin::doSend( MessageCompos
+     }
+ 
+ 
+-    if ( saveIn == MessageComposer::MessageSender::SaveInNone ) { // don't save as draft or template, send immediately
++    if ( saveIn == MessageComposer::MessageSender::SaveInNone || willSendItWithoutReediting ) { // don't save as draft or template, send immediately
+         if ( KPIMUtils::firstEmailAddress( from() ).isEmpty() ) {
+             if ( !( mShowHeaders & HDR_FROM ) ) {
+                 mShowHeaders |= HDR_FROM;
+@@ -2716,6 +2716,7 @@ void KMComposeWin::slotSendLater()
+         return;
+     if ( !checkRecipientNumber() )
+         return;
++    mComposerBase->setSendLaterInfo(NULL);
+     if ( mComposerBase->editor()->checkExternalEditorFinished() ) {
+         const bool wasRegistered = (SendLater::SendLaterUtil::sentLaterAgentWasRegistered() && SendLater::SendLaterUtil::sentLaterAgentEnabled());
+         if (wasRegistered) {
+@@ -2739,9 +2740,9 @@ void KMComposeWin::slotSendLater()
+                 {
+                     mComposerBase->setSendLaterInfo(info);
+                     if (info->isRecurrence()) {
+-                        doSend( MessageComposer::MessageSender::SendLater, MessageComposer::MessageSender::SaveInTemplates );
++                        doSend( MessageComposer::MessageSender::SendLater, MessageComposer::MessageSender::SaveInTemplates, true );
+                     } else {
+-                        doSend( MessageComposer::MessageSender::SendLater, MessageComposer::MessageSender::SaveInDrafts );
++                        doSend( MessageComposer::MessageSender::SendLater, MessageComposer::MessageSender::SaveInDrafts, true );
+                     }
+                     break;
+                 }
+Index: kdepim-4.14.10/kmail/editor/kmcomposewin.h
+===================================================================
+--- kdepim-4.14.10.orig/kmail/editor/kmcomposewin.h
++++ kdepim-4.14.10/kmail/editor/kmcomposewin.h
+@@ -549,7 +549,8 @@ private:
+      * Send the message.
+      */
+     void doSend( MessageComposer::MessageSender::SendMethod method=MessageComposer::MessageSender::SendDefault,
+-                 MessageComposer::MessageSender::SaveIn saveIn = MessageComposer::MessageSender::SaveInNone );
++                 MessageComposer::MessageSender::SaveIn saveIn = MessageComposer::MessageSender::SaveInNone,
++                 bool willSendItWithoutReediting = false);
+ 
+     void doDelayedSend( MessageComposer::MessageSender::SendMethod method, MessageComposer::MessageSender::SaveIn saveIn );
+ 

diff --git a/kde-apps/kdepim-common-libs/kdepim-common-libs-4.14.11_pre20160611-r1.ebuild b/kde-apps/kdepim-common-libs/kdepim-common-libs-4.14.11_pre20160611-r1.ebuild
new file mode 100644
index 0000000..b7d3186
--- /dev/null
+++ b/kde-apps/kdepim-common-libs/kdepim-common-libs-4.14.11_pre20160611-r1.ebuild
@@ -0,0 +1,89 @@
+# 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 x86"
+IUSE="debug google"
+
+DEPEND="
+	$(add_kdeapps_dep kdepimlibs '' 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 '' 4.14.11_pre20160211)
+	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}/${P}-CVE-2017-9604.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-common-libs/metadata.xml b/kde-apps/kdepim-common-libs/metadata.xml
new file mode 100644
index 0000000..f05c652
--- /dev/null
+++ b/kde-apps/kdepim-common-libs/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<use>
+		<flag name="google">Google service integration via <pkg>kde-apps/libkgapi</pkg></flag>
+	</use>
+</pkgmetadata>

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 0000000..92d872b
--- /dev/null
+++ b/kde-apps/kdepim-kresources/kdepim-kresources-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
+
+KMNAME="kdepim"
+KMMODULE="kresources"
+inherit kde4-meta
+
+DESCRIPTION="KDE PIM groupware plugin collection"
+
+IUSE="debug"
+KEYWORDS="amd64 x86"
+
+DEPEND="
+	$(add_kdeapps_dep kdepim-common-libs)
+	$(add_kdeapps_dep kdepimlibs)
+"
+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 0000000..9051128
--- /dev/null
+++ b/kde-apps/kdepim-meta/kdepim-meta-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_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 x86"
+IUSE="nls"
+SLOT="4"
+
+RDEPEND="
+	>=kde-apps/akonadiconsole-4.14.11_pre20160611:4
+	>=kde-apps/akregator-4.14.11_pre20160611:4
+	>=kde-apps/blogilo-4.14.11_pre20160611:4
+	>=kde-apps/calendarjanitor-4.14.11_pre20160611:4
+	>=kde-apps/kabcclient-4.14.11_pre20160611:4
+	>=kde-apps/kaddressbook-4.14.11_pre20160611:4
+	>=kde-apps/kalarm-4.14.11_pre20160611:4
+	>=kde-apps/kdepim-kresources-4.14.11_pre20160611:4
+	>=kde-apps/kdepim-runtime-4.14.11_pre20160211:4
+	>=kde-apps/kjots-4.14.11_pre20160611:4
+	>=kde-apps/kleopatra-4.14.11_pre20160611:4
+	>=kde-apps/kmail-4.14.11_pre20160611:4
+	>=kde-apps/knode-4.14.11_pre20160611:4
+	>=kde-apps/knotes-4.14.11_pre20160611:4
+	>=kde-apps/konsolekalendar-4.14.11_pre20160611:4
+	>=kde-apps/kontact-4.14.11_pre20160611:4
+	>=kde-apps/korganizer-4.14.11_pre20160611:4
+	>=kde-apps/ktimetracker-4.14.11_pre20160611:4
+	>=kde-apps/ktnef-4.14.11_pre20160611:4
+	kde-frameworks/oxygen-icons:5
+	nls? (
+		>=kde-apps/kde4-l10n-4.14.3-r1:4
+		>=kde-apps/kdepim-l10n-4.14.3-r1:4
+	)
+"

diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-4.14.11_pre20160211-r1.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-4.14.11_pre20160211-r1.ebuild
new file mode 100644
index 0000000..83c08f1
--- /dev/null
+++ b/kde-apps/kdepim-runtime/kdepim-runtime-4.14.11_pre20160211-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KMNAME="kdepim-runtime"
+QT_MINIMAL="4.8.7"
+EGIT_BRANCH="KDE/4.14"
+inherit kde4-base
+
+DESCRIPTION="KDE PIM runtime plugin collection"
+COMMIT_ID="bb194cc299839cb00b808c9c5740169815ba9e39"
+SRC_URI="https://quickgit.kde.org/?p=kdepim-runtime.git&a=snapshot&h=${COMMIT_ID}&fmt=tgz -> ${KMNAME}-${PV}.tar.gz"
+S=${WORKDIR}/${PN}
+
+KEYWORDS="amd64 x86"
+IUSE="debug google"
+
+RESTRICT="test"
+# Would need test programs _testrunner and akonaditest from kdepimlibs, see bug 313233
+
+DEPEND="
+	$(add_kdeapps_dep kdepimlibs 'akonadi(+)' ${PV})
+	dev-libs/boost:=
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	kde-apps/akonadi:4
+	x11-misc/shared-mime-info
+	google? ( $(add_kdeapps_dep libkgapi '' 2.0) )
+"
+RDEPEND="${DEPEND}
+	kde-frameworks/oxygen-icons:5
+	!kde-misc/akonadi-google
+"
+
+pkg_setup() {
+	if [[ $(gcc-major-version) -lt 5 ]] ; then
+		ewarn "A GCC version older than 5 was detected. There may be trouble. See also Gentoo bug #595618"
+	fi
+
+	kde4-base_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package google LibKGAPI2)
+	)
+
+	kde4-base_src_configure
+}

diff --git a/kde-apps/kdepim-runtime/metadata.xml b/kde-apps/kdepim-runtime/metadata.xml
new file mode 100644
index 0000000..a147d91
--- /dev/null
+++ b/kde-apps/kdepim-runtime/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<use>
+	<flag name="google">Google service integration via <pkg>kde-apps/libkgapi</pkg></flag>
+</use>
+</pkgmetadata>

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 0000000..94f1494
--- /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 0000000..b30d8ec
--- /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"
+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 0000000..a7b125e
--- /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"
+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/kdepimlibs/metadata.xml b/kde-apps/kdepimlibs/metadata.xml
new file mode 100644
index 0000000..b17398a
--- /dev/null
+++ b/kde-apps/kdepimlibs/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>kde@g.o</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+	<use>
+		<flag name="prison">Enable support for QRcodes in contacts</flag>
+	</use>
+</pkgmetadata>

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 0000000..e286af8
--- /dev/null
+++ b/kde-apps/kjots/kjots-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="Note taking utility by KDE"
+HOMEPAGE="https://www.kde.org/applications/utilities/kjots/"
+
+KEYWORDS="amd64 x86"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdeapps_dep kdepim-common-libs)
+	$(add_kdeapps_dep kdepimlibs)
+	dev-libs/grantlee:0
+"
+RDEPEND="${DEPEND}"
+
+KMEXTRACTONLY="
+	akonadi_next/
+	noteshared/
+"

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 0000000..b01e500
--- /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 x86"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdeapps_dep kdepim-common-libs '' 4.14.11_pre20160611)
+	$(add_kdeapps_dep kdepimlibs '' 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/kleopatra/metadata.xml b/kde-apps/kleopatra/metadata.xml
new file mode 100644
index 0000000..af857d3
--- /dev/null
+++ b/kde-apps/kleopatra/metadata.xml
@@ -0,0 +1,4 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+</pkgmetadata>

diff --git a/kde-apps/kmail/files/kmail-4.14.11_pre20160611-CVE-2017-9604.patch b/kde-apps/kmail/files/kmail-4.14.11_pre20160611-CVE-2017-9604.patch
new file mode 100644
index 0000000..e36e074
--- /dev/null
+++ b/kde-apps/kmail/files/kmail-4.14.11_pre20160611-CVE-2017-9604.patch
@@ -0,0 +1,89 @@
+From c54706e990bbd6498e7b1597ec7900bc809e8197 Mon Sep 17 00:00:00 2001
+From: Montel Laurent <montel@×××.org>
+Date: Fri, 2 Jun 2017 13:56:41 +0200
+Subject: Make sure to sign/encrypt message when we send later
+
+(cherry picked from commit 4048f5e46d0a7d62d93d74fd2861dd70fb2ad660)
+---
+ messagecomposer/composer/composerviewbase.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: kdepim-4.14.10/messagecomposer/composer/composerviewbase.cpp
+===================================================================
+--- kdepim-4.14.10.orig/messagecomposer/composer/composerviewbase.cpp
++++ kdepim-4.14.10/messagecomposer/composer/composerviewbase.cpp
+@@ -435,7 +435,7 @@ void MessageComposer::ComposerViewBase::
+     // if so, we create a composer per format
+     // if we aren't signing or encrypting, this just returns a single empty message
+     bool wasCanceled = false;
+-    if( m_neverEncrypt && mSaveIn != MessageComposer::MessageSender::SaveInNone ) {
++    if( m_neverEncrypt && mSaveIn != MessageComposer::MessageSender::SaveInNone && !mSendLaterInfo) {
+         MessageComposer::Composer* composer = new MessageComposer::Composer;
+         composer->setNoCrypto( true );
+         m_composers.append( composer );
+From 78c5552be2f00a4ac25bd77ca39386522fca70a8 Mon Sep 17 00:00:00 2001
+From: Montel Laurent <montel@×××.org>
+Date: Fri, 2 Jun 2017 13:59:02 +0200
+Subject: Make sure that we use plugin when we use sendlater feature
+
+---
+ src/editor/kmcomposewin.cpp | 9 +++++----
+ src/editor/kmcomposewin.h   | 3 ++-
+ 2 files changed, 7 insertions(+), 5 deletions(-)
+
+Index: kdepim-4.14.10/kmail/editor/kmcomposewin.cpp
+===================================================================
+--- kdepim-4.14.10.orig/kmail/editor/kmcomposewin.cpp
++++ kdepim-4.14.10/kmail/editor/kmcomposewin.cpp
+@@ -2533,7 +2533,7 @@ void KMComposeWin::printComposeResult( K
+ 
+ 
+ void KMComposeWin::doSend( MessageComposer::MessageSender::SendMethod method,
+-                           MessageComposer::MessageSender::SaveIn saveIn )
++                           MessageComposer::MessageSender::SaveIn saveIn, bool willSendItWithoutReediting )
+ {
+     if ( mStorageService->numProgressUpdateFile() > 0) {
+         KMessageBox::sorry( this, i18np( "There is %1 file upload in progress.",
+@@ -2549,7 +2549,7 @@ void KMComposeWin::doSend( MessageCompos
+     }
+ 
+ 
+-    if ( saveIn == MessageComposer::MessageSender::SaveInNone ) { // don't save as draft or template, send immediately
++    if ( saveIn == MessageComposer::MessageSender::SaveInNone || willSendItWithoutReediting ) { // don't save as draft or template, send immediately
+         if ( KPIMUtils::firstEmailAddress( from() ).isEmpty() ) {
+             if ( !( mShowHeaders & HDR_FROM ) ) {
+                 mShowHeaders |= HDR_FROM;
+@@ -2716,6 +2716,7 @@ void KMComposeWin::slotSendLater()
+         return;
+     if ( !checkRecipientNumber() )
+         return;
++    mComposerBase->setSendLaterInfo(NULL);
+     if ( mComposerBase->editor()->checkExternalEditorFinished() ) {
+         const bool wasRegistered = (SendLater::SendLaterUtil::sentLaterAgentWasRegistered() && SendLater::SendLaterUtil::sentLaterAgentEnabled());
+         if (wasRegistered) {
+@@ -2739,9 +2740,9 @@ void KMComposeWin::slotSendLater()
+                 {
+                     mComposerBase->setSendLaterInfo(info);
+                     if (info->isRecurrence()) {
+-                        doSend( MessageComposer::MessageSender::SendLater, MessageComposer::MessageSender::SaveInTemplates );
++                        doSend( MessageComposer::MessageSender::SendLater, MessageComposer::MessageSender::SaveInTemplates, true );
+                     } else {
+-                        doSend( MessageComposer::MessageSender::SendLater, MessageComposer::MessageSender::SaveInDrafts );
++                        doSend( MessageComposer::MessageSender::SendLater, MessageComposer::MessageSender::SaveInDrafts, true );
+                     }
+                     break;
+                 }
+Index: kdepim-4.14.10/kmail/editor/kmcomposewin.h
+===================================================================
+--- kdepim-4.14.10.orig/kmail/editor/kmcomposewin.h
++++ kdepim-4.14.10/kmail/editor/kmcomposewin.h
+@@ -549,7 +549,8 @@ private:
+      * Send the message.
+      */
+     void doSend( MessageComposer::MessageSender::SendMethod method=MessageComposer::MessageSender::SendDefault,
+-                 MessageComposer::MessageSender::SaveIn saveIn = MessageComposer::MessageSender::SaveInNone );
++                 MessageComposer::MessageSender::SaveIn saveIn = MessageComposer::MessageSender::SaveInNone,
++                 bool willSendItWithoutReediting = false);
+ 
+     void doDelayedSend( MessageComposer::MessageSender::SendMethod method, MessageComposer::MessageSender::SaveIn saveIn );
+ 

diff --git a/kde-apps/kmail/kmail-4.14.11_pre20160611-r1.ebuild b/kde-apps/kmail/kmail-4.14.11_pre20160611-r1.ebuild
new file mode 100644
index 0000000..5735507
--- /dev/null
+++ b/kde-apps/kmail/kmail-4.14.11_pre20160611-r1.ebuild
@@ -0,0 +1,107 @@
+# 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 x86"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdeapps_dep kdepim-common-libs '' 4.14.11_pre20160611)
+	$(add_kdeapps_dep kdepimlibs '' 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"
+
+PATCHES=( "${FILESDIR}/${P}-CVE-2017-9604.patch" )
+
+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/knode-4.14.11_pre20160611.ebuild b/kde-apps/knode/knode-4.14.11_pre20160611.ebuild
new file mode 100644
index 0000000..48e01a8
--- /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 x86"
+IUSE="debug"
+
+# test fails, last checked for 4.2.96
+RESTRICT=test
+
+DEPEND="
+	$(add_kdeapps_dep kdepim-common-libs)
+	$(add_kdeapps_dep kdepimlibs)
+"
+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/knotes-4.14.11_pre20160611.ebuild b/kde-apps/knotes/knotes-4.14.11_pre20160611.ebuild
new file mode 100644
index 0000000..b9e7013
--- /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 x86"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdeapps_dep kdepim-common-libs)
+	$(add_kdeapps_dep kdepimlibs)
+"
+RDEPEND="${DEPEND}"
+
+KMCOMPILEONLY="
+	noteshared/
+"
+
+KMEXTRACTONLY="
+	akonadi_next/
+	pimcommon/
+"
+
+KMLOADLIBS="kdepim-common-libs"

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 0000000..83240b5
--- /dev/null
+++ b/kde-apps/konsolekalendar/konsolekalendar-4.14.11_pre20160611.ebuild
@@ -0,0 +1,47 @@
+# 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="Command line interface to KDE calendars"
+HOMEPAGE+=" https://userbase.kde.org/KonsoleKalendar"
+
+KEYWORDS="amd64 x86"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdeapps_dep kdepim-common-libs '' 4.14.11_pre20160611)
+	$(add_kdeapps_dep kdepimlibs '' 4.14.11_pre20160611)
+"
+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/kontact-4.14.11_pre20160611.ebuild b/kde-apps/kontact/kontact-4.14.11_pre20160611.ebuild
new file mode 100644
index 0000000..753eb7e
--- /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 x86"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdeapps_dep kdepim-common-libs '' 4.14.11_pre20160611)
+	$(add_kdeapps_dep kdepimlibs '' 4.14.11_pre20160611)
+"
+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/korganizer-4.14.11_pre20160611.ebuild b/kde-apps/korganizer/korganizer-4.14.11_pre20160611.ebuild
new file mode 100644
index 0000000..70438d5
--- /dev/null
+++ b/kde-apps/korganizer/korganizer-4.14.11_pre20160611.ebuild
@@ -0,0 +1,84 @@
+# 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 x86"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdeapps_dep kdepim-common-libs '' 4.14.11_pre20160611)
+	$(add_kdeapps_dep kdepimlibs '' 4.14.11_pre20160611)
+	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_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/ktimetracker-4.14.11_pre20160611.ebuild b/kde-apps/ktimetracker/ktimetracker-4.14.11_pre20160611.ebuild
new file mode 100644
index 0000000..45eb02e
--- /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 x86"
+IUSE="debug"
+
+RDEPEND="
+	$(add_kdeapps_dep kdepim-common-libs)
+	$(add_kdeapps_dep kdepim-kresources)
+	$(add_kdeapps_dep kdepimlibs)
+	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/ktimetracker/metadata.xml b/kde-apps/ktimetracker/metadata.xml
new file mode 100644
index 0000000..af857d3
--- /dev/null
+++ b/kde-apps/ktimetracker/metadata.xml
@@ -0,0 +1,4 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+</pkgmetadata>

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 0000000..8374218
--- /dev/null
+++ b/kde-apps/ktnef/ktnef-4.14.11_pre20160611.ebuild
@@ -0,0 +1,24 @@
+# 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="Viewer for TNEF attachments"
+
+KEYWORDS="amd64 x86"
+LICENSE="LGPL-2.1"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdeapps_dep kdepimlibs)
+	kde-apps/akonadi:4
+"
+RDEPEND="${DEPEND}"
+
+KMEXTRACTONLY="
+	akonadi/
+"