13 files changed, 788 insertions, 0 deletions
diff --git a/kde-base/kmail/Manifest b/kde-base/kmail/Manifest
new file mode 100644
index 000000000000..dce5efd8f5cb
--- /dev/null
+++ b/kde-base/kmail/Manifest
@@ -0,0 +1,5 @@
+DIST kdepim-4.14.10.tar.xz 14585020 SHA256 edad865b81259331780a25906127e105d06fda8aa56f6f11cfee4bc8f85bb7e2 SHA512 aa7e5a488964d11d355557e89053993bb0bed4860072dbb8ae1851df881713a15ec5aa4e428de9b85a8bef678ace307b33f186314fe5a8011521e30331a1691b WHIRLPOOL 358589e29baeb2f7bf648d1bbccb9bbf37c4c1a447f05a2eff472b50282d7d5118ad40ced2f93ac7f47f2c394f745216632d33be389e82f88efd69386f6ab57d
+DIST kdepim-4.14.3.tar.xz 14483432 SHA256 a3fd17fa2f3b1debc32bd28537402aaf7337582ff2fe39dbadd47d5b3232f944 SHA512 e7a125f36cc8b9e827808d9503861c3f0a6b518034c3cacf544739626907e2392c6e1d778fad058457f00cdae180cd01511f65633a76afeeeb169a56422b04a7 WHIRLPOOL 7b4e01fa56a4cc6a4c9ec1a5f4b06df68d1b84f00b3201197b5e118597c3ffd2544db56b13413c8ba5d106c841a8ade92107189a9566a8a93903387ff4493bef
+DIST kdepim-4.14.8.tar.xz 14575884 SHA256 52b4174924387030c1b3803267f099f3534aa8ccde796953d6cf34b4aabbe3a7 SHA512 687b0db97476e692718039153a1ee60cf9ddab8d9adad06abba702a170d49488f60f0fe050a339db2da2a5996d1bdbe1faec73c1c2e2b655fa9ea66aa538899c WHIRLPOOL 4ce31c3c526a0eed7819137cb5c29450da75fac8a7f4f74e25794b6617bbd7e12987bb45983408ae87bd892a57508d171941b9c4e1a75324773611d950fe55e4
+DIST kdepim-4.4.11.1.tar.bz2 8964708 SHA256 a2fa237a3d880cc55a6c94450b93a7918bb0d5e3943eb7a759c8789de1ed41bf SHA512 7450ba9985c5583847d1fc3d214940cef130150a3591c3cbb73bc15624ee0298805d5dc25f3cd3a135091c1d0491b865961d52aa8feef623219eed9364dd86bf WHIRLPOOL 349a72c5c6859c7cafb1aefdf80b80482102c8b1d6e0123c6c410d262c3908b9572daa1950e2fb41e6bc727430fc91bb57b7276e345553ed15d792fa63aba5ec
+DIST kdepim-4.4.2015.06.tar.xz 8901968 SHA256 d9153c57e697ca33d0bd82f1f93ed2befdabbe3822189c1c8acbdf7bf9bbaec6 SHA512 10e89ff1bb22ef03ae2128b800f87c76da945703fa98c07fa0ac29deb17c724beeca84995c50b067138ab7cf0543112173eb850d897b38c512a25974bfc15e1e WHIRLPOOL 543b9d629380e9923b38c414cf6e7390437a48acfb31b9ed934e9655bb1efb1f480065942775dc68d8382e639e4df122f953388dad90a9fadb3734d2f2fe72f0
diff --git a/kde-base/kmail/files/4.4/0002-kmail-Only-start-akonadi-asynchronously-on-KDE-4.6.2.patch b/kde-base/kmail/files/4.4/0002-kmail-Only-start-akonadi-asynchronously-on-KDE-4.6.2.patch
new file mode 100644
index 000000000000..11bcad61d759
--- /dev/null
+++ b/kde-base/kmail/files/4.4/0002-kmail-Only-start-akonadi-asynchronously-on-KDE-4.6.2.patch
@@ -0,0 +1,48 @@
+From 0b44b1aa3d66f974e3d255c6e027947f1375b685 Mon Sep 17 00:00:00 2001
+From: Stephen Kelly <steveire@gmail.com>
+Date: Mon, 25 Apr 2011 22:09:08 +0200
+Subject: [PATCH 2/6] Only start akonadi asynchronously on KDE 4.6.2.
+
+Revises cfa404b7188e4c26bddbc9579728f6d25f8cd214 to hopefully fix
+the bug seen on fedora.
+
+Please re-test this on 4.6.2 on fedora too. Unfortunately that's the
+best I can do because I can't reproduce the issue.
+
+BUG: 268120
+---
+ kaddressbook/main.cpp  |    2 +-
+ kmail/kmmainwidget.cpp |    2 +-
+ kmail/main.cpp         |    2 +-
+ kontact/src/main.cpp   |    2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/kmail/kmmainwidget.cpp b/kmail/kmmainwidget.cpp
+index 10b14e4..f6461d9 100644
+--- a/kmail/kmmainwidget.cpp
++++ b/kmail/kmmainwidget.cpp
+@@ -189,7 +189,7 @@ KMMainWidget::KMMainWidget( QWidget *parent, KXMLGUIClient *aGUIClient,
+     mVacationIndicatorActive( false ),
+     mGoToFirstUnreadMessageInSelectedFolder( false )
+ {
+-#if KDE_IS_VERSION(4,6,0)
++#if KDE_IS_VERSION(4,6,2)
+   Akonadi::Control::widgetNeedsAkonadi(this);
+   Akonadi::ServerManager::start();
+ #endif
+diff --git a/kmail/main.cpp b/kmail/main.cpp
+index c2dd1c3..f59d5e6 100644
+--- a/kmail/main.cpp
++++ b/kmail/main.cpp
+@@ -145,7 +145,7 @@ int main(int argc, char *argv[])
+   app.setEventLoopReached();
+   app.delayedInstanceCreation();
+ 
+-#if !KDE_IS_VERSION(4,6,0)
++#if !KDE_IS_VERSION(4,6,2)
+   // Start Akonadi
+   if ( !Akonadi::Control::start( kmkernel->getKMMainWidget() ) ) {
+     //TODO: add message box after string freeze
+-- 
+1.7.9.2
+
diff --git a/kde-base/kmail/files/4.4/0004-kmail-Make-spell-checking-work-again.patch b/kde-base/kmail/files/4.4/0004-kmail-Make-spell-checking-work-again.patch
new file mode 100644
index 000000000000..0004bec69e8a
--- /dev/null
+++ b/kde-base/kmail/files/4.4/0004-kmail-Make-spell-checking-work-again.patch
@@ -0,0 +1,35 @@
+From 6f62ea1bff318d8efea42f59bdc965ee2ab187a0 Mon Sep 17 00:00:00 2001
+From: Thomas McGuire <mcguire@kde.org>
+Date: Wed, 11 May 2011 18:21:32 +0100
+Subject: [PATCH 4/6] Make spell checking work again. The text edit used the
+ wrong config file for loading spell settings. After
+ using the config file, the correct settigns get loaded
+ again, since the Loader from Sonnet is a singleton and
+ therefore shares the settings, so even the textedit
+ with the wrong settings file name gets updated.
+
+cherry-picked from d1708effbb68d6eae36ee5177a599c965973725f.
+
+BUG: 247486
+---
+ kmail/kmcomposereditor.cpp |    2 +-
+ libkdepim/kmeditor.cpp     |   12 ++++++++++++
+ libkdepim/kmeditor.h       |    6 ++++++
+ 3 files changed, 19 insertions(+), 1 deletion(-)
+
+diff --git a/kmail/kmcomposereditor.cpp b/kmail/kmcomposereditor.cpp
+index f1accab..74de65b 100644
+--- a/kmail/kmcomposereditor.cpp
++++ b/kmail/kmcomposereditor.cpp
+@@ -44,7 +44,7 @@
+ #include <QFileInfo>
+ 
+ KMComposerEditor::KMComposerEditor( KMComposeWin *win,QWidget *parent)
+- :KMeditor(parent),m_composerWin(win)
++ :KMeditor(parent, "kmailrc"),m_composerWin(win)
+ {
+ }
+ 
+-- 
+1.7.9.2
+
diff --git a/kde-base/kmail/files/4.4/0004-libkdepim-Make-spell-checking-work-again.patch b/kde-base/kmail/files/4.4/0004-libkdepim-Make-spell-checking-work-again.patch
new file mode 100644
index 000000000000..19d8c01666f6
--- /dev/null
+++ b/kde-base/kmail/files/4.4/0004-libkdepim-Make-spell-checking-work-again.patch
@@ -0,0 +1,69 @@
+From 6f62ea1bff318d8efea42f59bdc965ee2ab187a0 Mon Sep 17 00:00:00 2001
+From: Thomas McGuire <mcguire@kde.org>
+Date: Wed, 11 May 2011 18:21:32 +0100
+Subject: [PATCH 4/6] Make spell checking work again. The text edit used the
+ wrong config file for loading spell settings. After
+ using the config file, the correct settigns get loaded
+ again, since the Loader from Sonnet is a singleton and
+ therefore shares the settings, so even the textedit
+ with the wrong settings file name gets updated.
+
+cherry-picked from d1708effbb68d6eae36ee5177a599c965973725f.
+
+BUG: 247486
+---
+ kmail/kmcomposereditor.cpp |    2 +-
+ libkdepim/kmeditor.cpp     |   12 ++++++++++++
+ libkdepim/kmeditor.h       |    6 ++++++
+ 3 files changed, 19 insertions(+), 1 deletion(-)
+
+diff --git a/libkdepim/kmeditor.cpp b/libkdepim/kmeditor.cpp
+index e8f0d36..067c781 100644
+--- a/libkdepim/kmeditor.cpp
++++ b/libkdepim/kmeditor.cpp
+@@ -28,6 +28,7 @@
+ #include <KProcess>
+ #include <KPushButton>
+ #include <KTemporaryFile>
++#include <kdeversion.h>
+ 
+ #include <QApplication>
+ #include <QClipboard>
+@@ -215,6 +216,17 @@ KMeditor::KMeditor( QWidget *parent )
+   d->init();
+ }
+ 
++KMeditor::KMeditor( QWidget *parent, const QString & configFile )
++#if KDE_IS_VERSION(4,6,0)
++ : TextEdit( parent, configFile ), d( new KMeditorPrivate( this ) )
++#else
++ : TextEdit( parent ), d( new KMeditorPrivate( this ) )
++#endif
++{
++  Q_UNUSED( configFile )
++  d->init();
++}
++
+ KMeditor::~KMeditor()
+ {
+   delete d;
+diff --git a/libkdepim/kmeditor.h b/libkdepim/kmeditor.h
+index 4aab8aa..66ebb4a 100644
+--- a/libkdepim/kmeditor.h
++++ b/libkdepim/kmeditor.h
+@@ -61,6 +61,12 @@ class KDEPIM_EXPORT KMeditor : public KPIMTextEdit::TextEdit
+      */
+     explicit KMeditor( QWidget *parent = 0 );
+ 
++    /**
++     * Constructs a KMeditor object.
++     */
++    explicit KMeditor( QWidget *parent, const QString& configFile );
++
++
+     virtual ~KMeditor();
+ 
+     //Redefine it for each apps
+-- 
+1.7.9.2
+
diff --git a/kde-base/kmail/files/4.4/0005-Fix-bug-276086-crash-on-exit.patch b/kde-base/kmail/files/4.4/0005-Fix-bug-276086-crash-on-exit.patch
new file mode 100644
index 000000000000..5193c364f668
--- /dev/null
+++ b/kde-base/kmail/files/4.4/0005-Fix-bug-276086-crash-on-exit.patch
@@ -0,0 +1,26 @@
+From fb1874f8e2805f0afb3b9e848e8fd4d9ee11a97f Mon Sep 17 00:00:00 2001
+From: Montel Laurent <montel@kde.org>
+Date: Mon, 20 Jun 2011 13:27:05 +0200
+Subject: [PATCH 5/6] Fix bug #276086 crash on exit
+
+---
+ kmail/accountmanager.cpp |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/kmail/accountmanager.cpp b/kmail/accountmanager.cpp
+index 1745aa4..ca2a7c8 100644
+--- a/kmail/accountmanager.cpp
++++ b/kmail/accountmanager.cpp
+@@ -227,7 +227,8 @@ void AccountManager::processNextCheck( bool _newMail )
+ 
+   curAccount->setCheckingMail( true );
+   mAcctChecking.append( curAccount );
+-  kmkernel->filterMgr()->ref();
++  if( kmkernel->filterMgr() )
++      kmkernel->filterMgr()->ref();
+   curAccount->processNewMail( mInteractive );
+ }
+ 
+-- 
+1.7.9.2
+
diff --git a/kde-base/kmail/files/kmail-4.14.6-fix-crash.patch b/kde-base/kmail/files/kmail-4.14.6-fix-crash.patch
new file mode 100644
index 000000000000..308d98df82b8
--- /dev/null
+++ b/kde-base/kmail/files/kmail-4.14.6-fix-crash.patch
@@ -0,0 +1,21 @@
+commit b6196bc1fd489a5be69731ca9a19d8a95f721570
+Author: Montel Laurent <montel@kde.org>
+Date:   Thu Mar 12 07:48:15 2015 +0100
+
+    Fix Bug 345071 - KMail crashed while I was reading an email
+    
+    BUG: 345071
+    FIXED-IN: 4.16.7
+
+diff --git a/kmail/kmmainwidget.cpp b/kmail/kmmainwidget.cpp
+index 2228aef..92ba8c5 100644
+--- a/kmail/kmmainwidget.cpp
++++ b/kmail/kmmainwidget.cpp
+@@ -4498,5 +4498,6 @@ void KMMainWidget::populateMessageListStatusFilterCombo()
+ 
+ void KMMainWidget::slotCollectionRemoved(const Akonadi::Collection &col)
+ {
+-    mFavoritesModel->removeCollection(col);
++    if (mFavoritesModel)
++       mFavoritesModel->removeCollection(col);
+ }
diff --git a/kde-base/kmail/files/kmail-4.4.9-nodbus.patch b/kde-base/kmail/files/kmail-4.4.9-nodbus.patch
new file mode 100644
index 000000000000..af3237def53b
--- /dev/null
+++ b/kde-base/kmail/files/kmail-4.4.9-nodbus.patch
@@ -0,0 +1,83 @@
+diff -ruN kmail-4.4.9.orig/kmail/tests/CMakeLists.txt kmail-4.4.9/kmail/tests/CMakeLists.txt
+--- kmail-4.4.9.orig/kmail/tests/CMakeLists.txt	2010-12-22 18:52:24.000000000 +0100
++++ kmail-4.4.9/kmail/tests/CMakeLists.txt	2011-01-25 23:52:38.953021223 +0100
+@@ -9,14 +9,14 @@
+ add_definitions(-DKMAIL_UNITTESTS=YES)
+ 
+ ########### htmlquotecolorertest ###############
+-set(htmlquotecolorertest_SRCS htmlquotecolorertest.cpp ../htmlquotecolorer.cpp)
+-kde4_add_unit_test(htmlquotecolorertest TESTNAME kmail-quotecolorertest ${htmlquotecolorertest_SRCS})
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
+-target_link_libraries(htmlquotecolorertest
+-  ${QT_QTTEST_LIBRARY}
+-  ${QT_QTCORE_LIBRARY}
+-  ${KDE4_KHTML_LIBRARY}
+-)
++# set(htmlquotecolorertest_SRCS htmlquotecolorertest.cpp ../htmlquotecolorer.cpp)
++# kde4_add_unit_test(htmlquotecolorertest TESTNAME kmail-quotecolorertest ${htmlquotecolorertest_SRCS})
++# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
++# target_link_libraries(htmlquotecolorertest
++#   ${QT_QTTEST_LIBRARY}
++#   ${QT_QTCORE_LIBRARY}
++#   ${KDE4_KHTML_LIBRARY}
++# )
+ 
+ ########### utiltests ###############
+ 
+diff -ruN kmail-4.4.9.orig/messagecore/tests/CMakeLists.txt kmail-4.4.9/messagecore/tests/CMakeLists.txt
+--- kmail-4.4.9.orig/messagecore/tests/CMakeLists.txt	2010-12-22 18:52:15.000000000 +0100
++++ kmail-4.4.9/messagecore/tests/CMakeLists.txt	2011-01-25 23:50:54.421021223 +0100
+@@ -13,6 +13,6 @@
+ # Attachment tests.
+ add_messagecore_test( attachmentcompressjobtest.cpp )
+ add_messagecore_test( attachmentfrommimecontentjobtest.cpp )
+-add_messagecore_test( attachmentfromurljobtest.cpp )
++# add_messagecore_test( attachmentfromurljobtest.cpp )
+ add_messagecore_test( attachmentparttest.cpp )
+-add_messagecore_test( attachmentpropertiesdialogtest.cpp )
++# add_messagecore_test( attachmentpropertiesdialogtest.cpp )
+diff -ruN kmail-4.4.9.orig/messageviewer/tests/CMakeLists.txt kmail-4.4.9/messageviewer/tests/CMakeLists.txt
+--- kmail-4.4.9.orig/messageviewer/tests/CMakeLists.txt	2010-12-22 18:52:47.000000000 +0100
++++ kmail-4.4.9/messageviewer/tests/CMakeLists.txt	2011-01-25 23:51:58.374021223 +0100
+@@ -6,23 +6,23 @@
+ )
+ 
+ ########### htmlquotecolorertest ###############
+-set(messageviewer_htmlquotecolorertest_SRCS htmlquotecolorertest.cpp ../htmlquotecolorer.cpp)
+-kde4_add_unit_test(messageviewer_htmlquotecolorertest TESTNAME messageviewer-quotecolorertest ${messageviewer_htmlquotecolorertest_SRCS})
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
+-target_link_libraries(messageviewer_htmlquotecolorertest
+-  ${QT_QTTEST_LIBRARY}
+-  ${QT_QTCORE_LIBRARY}
+-  ${KDE4_KHTML_LIBRARY}
+-  messageviewer
+-)
++# set(messageviewer_htmlquotecolorertest_SRCS htmlquotecolorertest.cpp ../htmlquotecolorer.cpp)
++# kde4_add_unit_test(messageviewer_htmlquotecolorertest TESTNAME messageviewer-quotecolorertest ${messageviewer_htmlquotecolorertest_SRCS})
++# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
++# target_link_libraries(messageviewer_htmlquotecolorertest
++#   ${QT_QTTEST_LIBRARY}
++#   ${QT_QTCORE_LIBRARY}
++#   ${KDE4_KHTML_LIBRARY}
++#   messageviewer
++# )
+ 
+ ########### stringutiltest ###############
+-set(stringutiltest_SRCS stringutiltest.cpp)
+-kde4_add_unit_test(stringutiltest TESTNAME messageviewer-stringutiltest ${stringutiltest_SRCS})
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
+-target_link_libraries(stringutiltest
+-  ${QT_QTTEST_LIBRARY}
+-  ${QT_QTCORE_LIBRARY}
+-  ${KDE4_KHTML_LIBRARY}
+-  messageviewer
+-)
++# set(stringutiltest_SRCS stringutiltest.cpp)
++# kde4_add_unit_test(stringutiltest TESTNAME messageviewer-stringutiltest ${stringutiltest_SRCS})
++# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
++# target_link_libraries(stringutiltest
++#   ${QT_QTTEST_LIBRARY}
++#   ${QT_QTCORE_LIBRARY}
++#   ${KDE4_KHTML_LIBRARY}
++#   messageviewer
++# )
diff --git a/kde-base/kmail/kmail-4.14.10.ebuild b/kde-base/kmail/kmail-4.14.10.ebuild
new file mode 100644
index 000000000000..bd5eb0649b3c
--- /dev/null
+++ b/kde-base/kmail/kmail-4.14.10.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+EGIT_BRANCH="KDE/4.14"
+VIRTUALX_REQUIRED=test
+inherit flag-o-matic kde4-meta
+
+DESCRIPTION="KMail is the email component of Kontact, the integrated personal information manager of KDE"
+HOMEPAGE="http://www.kde.org/applications/internet/kmail/"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep kdepimlibs 'akonadi(+)')
+	$(add_kdebase_dep korganizer)
+	$(add_kdebase_dep kdepim-common-libs)
+"
+RDEPEND="
+	${DEPEND}
+	!=kde-base/kdepim-common-libs-4.12.1-r1
+"
+
+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_configure() {
+	# Bug 308903
+	use ppc64 && append-flags -mminimal-toc
+
+	kde4-meta_src_configure
+}
+
+src_compile() {
+	kde4-meta_src_compile kmail_xml
+	kde4-meta_src_compile
+}
+
+pkg_postinst() {
+	kde4-meta_pkg_postinst
+
+	if ! has_version kde-base/kdepim-kresources:${SLOT}; then
+		echo
+		elog "For groupware functionality, please install kde-base/kdepim-kresources:${SLOT}"
+		echo
+	fi
+	if ! has_version kde-base/kleopatra:${SLOT}; then
+		echo
+		elog "For certificate management and the gnupg log viewer, please install kde-base/kleopatra:${SLOT}"
+		echo
+	fi
+
+	if has_version "app-office/akonadi-server[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-base/kmail-4.10 does not work properly with the sqlite"
+		ewarn "backend anymore."
+		if has_version "app-office/akonadi-server[-mysql]"; then
+			ewarn "FOR THAT, YOU WILL HAVE TO RE-BUILD app-office/akonadi-server WITH mysql USEFLAG ENABLED."
+		fi
+		ewarn "You can select the backend in your ~/.config/akonadi/akonadiserverrc."
+		ewarn
+	fi
+}
diff --git a/kde-base/kmail/kmail-4.14.3.ebuild b/kde-base/kmail/kmail-4.14.3.ebuild
new file mode 100644
index 000000000000..b23d6fe72792
--- /dev/null
+++ b/kde-base/kmail/kmail-4.14.3.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+VIRTUALX_REQUIRED=test
+inherit flag-o-matic kde4-meta
+
+DESCRIPTION="KMail is the email component of Kontact, the integrated personal information manager of KDE"
+HOMEPAGE="http://www.kde.org/applications/internet/kmail/"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep kdepimlibs)
+	$(add_kdebase_dep korganizer)
+	$(add_kdebase_dep kdepim-common-libs "" 4.12.1-r2)
+"
+RDEPEND="
+	${DEPEND}
+	!=kde-base/kdepim-common-libs-4.12.1-r1
+"
+
+RESTRICT="test"
+# bug 393147
+
+KMEXTRACTONLY="
+	agents/folderarchiveagent.desktop
+	agents/sendlateragent/
+	akonadi_next/
+	calendarsupport/
+	calendarviews/
+	grantleeeditor/grantleethemeeditor/
+	korganizer/
+	kresources/
+	libkleo/
+	libkpgp/
+	libkdepimdbusinterfaces/
+	kdgantt2/
+"
+KMCOMPILEONLY="
+	grantleetheme/
+	kaddressbookgrantlee/
+	messagecomposer/
+	messagecore/
+	messagelist/
+	messageviewer/
+	pimcommon/
+	templateparser/
+	incidenceeditor-ng/
+	calendarsupport/
+	noteshared/
+"
+KMEXTRA="
+	agents/archivemailagent/
+	agents/followupreminderagent/
+	agents/mailfilteragent/
+	grantleeeditor/headerthemeeditor/
+	kmailcvt/
+	ksendemail/
+	importwizard/
+	libksieve/
+	mailcommon/
+	mailimporter/
+	mboximporter/
+	pimsettingexporter/
+	plugins/messageviewer/
+"
+
+KMLOADLIBS="kdepim-common-libs"
+
+src_configure() {
+	# Bug 308903
+	use ppc64 && append-flags -mminimal-toc
+
+	kde4-meta_src_configure
+}
+
+src_compile() {
+	kde4-meta_src_compile kmail_xml
+	kde4-meta_src_compile
+}
+
+pkg_postinst() {
+	kde4-meta_pkg_postinst
+
+	if ! has_version kde-base/kdepim-kresources:${SLOT}; then
+		echo
+		elog "For groupware functionality, please install kde-base/kdepim-kresources:${SLOT}"
+		echo
+	fi
+	if ! has_version kde-base/kleopatra:${SLOT}; then
+		echo
+		elog "For certificate management and the gnupg log viewer, please install kde-base/kleopatra:${SLOT}"
+		echo
+	fi
+
+	if has_version "app-office/akonadi-server[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-base/kmail-4.10 does not work properly with the sqlite"
+		ewarn "backend anymore."
+		if has_version "app-office/akonadi-server[-mysql]"; then
+			ewarn "FOR THAT, YOU WILL HAVE TO RE-BUILD app-office/akonadi-server WITH mysql USEFLAG ENABLED."
+		fi
+		ewarn "You can select the backend in your ~/.config/akonadi/akonadiserverrc."
+		ewarn
+	fi
+}
diff --git a/kde-base/kmail/kmail-4.14.8.ebuild b/kde-base/kmail/kmail-4.14.8.ebuild
new file mode 100644
index 000000000000..782c4af0d986
--- /dev/null
+++ b/kde-base/kmail/kmail-4.14.8.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+EGIT_BRANCH="KDE/4.14"
+VIRTUALX_REQUIRED=test
+inherit flag-o-matic kde4-meta
+
+DESCRIPTION="KMail is the email component of Kontact, the integrated personal information manager of KDE"
+HOMEPAGE="http://www.kde.org/applications/internet/kmail/"
+KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep kdepimlibs)
+	$(add_kdebase_dep korganizer)
+	$(add_kdebase_dep kdepim-common-libs)
+"
+RDEPEND="
+	${DEPEND}
+	!=kde-base/kdepim-common-libs-4.12.1-r1
+"
+
+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_configure() {
+	# Bug 308903
+	use ppc64 && append-flags -mminimal-toc
+
+	kde4-meta_src_configure
+}
+
+src_compile() {
+	kde4-meta_src_compile kmail_xml
+	kde4-meta_src_compile
+}
+
+pkg_postinst() {
+	kde4-meta_pkg_postinst
+
+	if ! has_version kde-base/kdepim-kresources:${SLOT}; then
+		echo
+		elog "For groupware functionality, please install kde-base/kdepim-kresources:${SLOT}"
+		echo
+	fi
+	if ! has_version kde-base/kleopatra:${SLOT}; then
+		echo
+		elog "For certificate management and the gnupg log viewer, please install kde-base/kleopatra:${SLOT}"
+		echo
+	fi
+
+	if has_version "app-office/akonadi-server[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-base/kmail-4.10 does not work properly with the sqlite"
+		ewarn "backend anymore."
+		if has_version "app-office/akonadi-server[-mysql]"; then
+			ewarn "FOR THAT, YOU WILL HAVE TO RE-BUILD app-office/akonadi-server WITH mysql USEFLAG ENABLED."
+		fi
+		ewarn "You can select the backend in your ~/.config/akonadi/akonadiserverrc."
+		ewarn
+	fi
+}
diff --git a/kde-base/kmail/kmail-4.4.11.1-r2.ebuild b/kde-base/kmail/kmail-4.4.11.1-r2.ebuild
new file mode 100644
index 000000000000..e742124d5a49
--- /dev/null
+++ b/kde-base/kmail/kmail-4.4.11.1-r2.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KMNAME="kdepim"
+KDE_HANDBOOK=optional
+VIRTUALX_REQUIRED=test
+inherit flag-o-matic kde4-meta
+
+DESCRIPTION="KMail is the email component of Kontact, the integrated personal information manager of KDE"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep kdelibs 'nepomuk' 4.13.1)
+	$(add_kdebase_dep kdepimlibs '' 4.13.1)
+	$(add_kdebase_dep libkdepim '' 4.4.11.1-r1)
+	$(add_kdebase_dep libkleo)
+	$(add_kdebase_dep libkpgp)
+"
+RDEPEND="${DEPEND}
+	$(add_kdebase_dep kdepim-runtime)
+"
+
+KMEXTRACTONLY="
+	korganizer/org.kde.Korganizer.Calendar.xml
+	libkleo/
+	libkpgp/
+"
+KMEXTRA="
+	kmailcvt/
+	ksendemail/
+	libksieve/
+	messagecore/
+	messagelist/
+	messageviewer/
+	mimelib/
+	plugins/kmail/
+"
+KMLOADLIBS="libkdepim"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.4.9-nodbus.patch"
+	"${FILESDIR}/4.4/"000{2,4,5}-*.patch
+)
+
+src_configure() {
+	# Bug 308903
+	use ppc64 && append-flags -mminimal-toc
+
+	mycmakeargs=(
+		-DWITH_IndicateQt=OFF
+	)
+
+	kde4-meta_src_configure
+}
+
+src_compile() {
+	kde4-meta_src_compile kmail_xml
+	kde4-meta_src_compile
+}
+
+pkg_postinst() {
+	kde4-meta_pkg_postinst
+
+	if ! has_version kde-base/kdepim-kresources:${SLOT}; then
+		echo
+		elog "For groupware functionality, please install kde-base/kdepim-kresources:${SLOT}"
+		echo
+	fi
+	if ! has_version kde-base/kleopatra:${SLOT}; then
+		echo
+		elog "For certificate management and the gnupg log viewer, please install kde-base/kleopatra:${SLOT}"
+		echo
+	fi
+}
diff --git a/kde-base/kmail/kmail-4.4.2015.06.ebuild b/kde-base/kmail/kmail-4.4.2015.06.ebuild
new file mode 100644
index 000000000000..35af159b0fcf
--- /dev/null
+++ b/kde-base/kmail/kmail-4.4.2015.06.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KMNAME="kdepim"
+KDE_HANDBOOK=optional
+VIRTUALX_REQUIRED=test
+inherit flag-o-matic kde4-meta
+
+DESCRIPTION="Email component of Kontact, the integrated personal information manager of KDE (noakonadi branch)"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep kdelibs '' 4.13.1)
+	$(add_kdebase_dep kdepimlibs '' 4.13.1)
+	$(add_kdebase_dep libkdepim '' 4.4.11.1-r1)
+	$(add_kdebase_dep libkleo)
+	$(add_kdebase_dep libkpgp)
+"
+RDEPEND="${DEPEND}"
+
+KMEXTRACTONLY="
+	korganizer/org.kde.Korganizer.Calendar.xml
+	libkleo/
+	libkpgp/
+"
+KMEXTRA="
+	kmailcvt/
+	ksendemail/
+	libksieve/
+	messagecore/
+	messagelist/
+	messageviewer/
+	mimelib/
+	plugins/kmail/
+"
+KMLOADLIBS="libkdepim"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.4.9-nodbus.patch"
+)
+
+src_configure() {
+	# Bug 308903
+	use ppc64 && append-flags -mminimal-toc
+
+	mycmakeargs=(
+		-DWITH_IndicateQt=OFF
+	)
+
+	kde4-meta_src_configure
+}
+
+src_compile() {
+	kde4-meta_src_compile kmail_xml
+	kde4-meta_src_compile
+}
+
+pkg_postinst() {
+	kde4-meta_pkg_postinst
+
+	if ! has_version kde-base/kdepim-kresources:${SLOT}; then
+		echo
+		elog "For groupware functionality, please install kde-base/kdepim-kresources:${SLOT}"
+		echo
+	fi
+	if ! has_version kde-base/kleopatra:${SLOT}; then
+		echo
+		elog "For certificate management and the gnupg log viewer, please install kde-base/kleopatra:${SLOT}"
+		echo
+	fi
+}
diff --git a/kde-base/kmail/metadata.xml b/kde-base/kmail/metadata.xml
new file mode 100644
index 000000000000..8d1e86a9cefb
--- /dev/null
+++ b/kde-base/kmail/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>kde</herd>
+</pkgmetadata>