From fd84f16f5331aabb697cc2a8525e2728812da3ae Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
Date: Sat, 18 Apr 2015 20:45:29 +0200
Subject: [kde-base] Update KDE PIM 9999 ebuilds

Package-Manager: portage-2.2.14
---
 .../kdepim-common-libs-4.9999.ebuild                | 15 +++++++--------
 kde-base/kmail/kmail-4.9999.ebuild                  | 21 +++++++++++----------
 .../konsolekalendar/konsolekalendar-4.9999.ebuild   | 16 ++++++++++++++++
 kde-base/korganizer/korganizer-4.9999.ebuild        | 18 +++++++++++++-----
 4 files changed, 47 insertions(+), 23 deletions(-)

diff --git a/kde-base/kdepim-common-libs/kdepim-common-libs-4.9999.ebuild b/kde-base/kdepim-common-libs/kdepim-common-libs-4.9999.ebuild
index 266400189a1..03eddbc72de 100644
--- a/kde-base/kdepim-common-libs/kdepim-common-libs-4.9999.ebuild
+++ b/kde-base/kdepim-common-libs/kdepim-common-libs-4.9999.ebuild
@@ -26,11 +26,7 @@ RDEPEND="${DEPEND}
 	!kde-base/libkpgp:4
 	!<kde-base/kaddressbook-4.11.50:4
 	!kde-base/kdepim-wizards:4
-	!<kde-base/kmail-4.4.80:4
-	!=kde-base/kmail-4.11*
-	!=kde-base/kmail-4.12.0
-	!=kde-base/kmail-4.12.1
-	!<kde-base/kmail-4.13.60
+	!<kde-base/kmail-4.14.5
 	!<kde-base/korganizer-4.5.67:4
 	app-crypt/gnupg
 	$(add_kdebase_dep kdepim-runtime)
@@ -47,13 +43,15 @@ KMEXTRA="
 	composereditor-ng/
 	grantleeeditor/grantleethemeeditor/
 	grantleetheme/
-	kaddressbookgrantlee/
 	incidenceeditor-ng/
 	libkdepim/
 	libkdepimdbusinterfaces/
 	libkleo/
 	libkpgp/
+	kaddressbookgrantlee/
 	kdgantt2/
+	mailcommon/
+	mailimporter/
 	messagecomposer/
 	messagecore/
 	messagelist/
@@ -63,12 +61,13 @@ KMEXTRA="
 	templateparser/
 "
 KMEXTRACTONLY="
+	agents/mailfilteragent/org.freedesktop.Akonadi.MailFilterAgent.xml
 	kleopatra/
 	kmail/
 	knode/org.kde.knode.xml
 	korgac/org.kde.korganizer.KOrgac.xml
-	korganizer/org.kde.korganizer.Korganizer.xml
-	mailcommon/
+	korganizer/data/org.kde.korganizer.Korganizer.xml
+	korganizer/data/org.kde.Korganizer.Calendar.xml
 "
 KMSAVELIBS="true"
 
diff --git a/kde-base/kmail/kmail-4.9999.ebuild b/kde-base/kmail/kmail-4.9999.ebuild
index f574850ff90..c28ed9f502a 100644
--- a/kde-base/kmail/kmail-4.9999.ebuild
+++ b/kde-base/kmail/kmail-4.9999.ebuild
@@ -17,7 +17,7 @@ IUSE="debug"
 DEPEND="
 	$(add_kdebase_dep kdepimlibs)
 	$(add_kdebase_dep korganizer)
-	$(add_kdebase_dep kdepim-common-libs "" 4.12.1-r2)
+	$(add_kdebase_dep kdepim-common-libs)
 "
 RDEPEND="
 	${DEPEND}
@@ -31,40 +31,41 @@ KMEXTRACTONLY="
 	agents/folderarchiveagent.desktop
 	agents/sendlateragent/
 	akonadi_next/
-	calendarsupport/
 	calendarviews/
 	grantleeeditor/grantleethemeeditor/
+	kdgantt2/
 	korganizer/
 	kresources/
+	libkdepimdbusinterfaces/
 	libkleo/
 	libkpgp/
-	libkdepimdbusinterfaces/
-	kdgantt2/
 "
 KMCOMPILEONLY="
+	calendarsupport/
 	grantleetheme/
+	incidenceeditor-ng/
 	kaddressbookgrantlee/
+	mailcommon/
+	mailimporter/
 	messagecomposer/
 	messagecore/
 	messagelist/
 	messageviewer/
+	mailcommon/
+	mailimporter/
+	noteshared/
 	pimcommon/
 	templateparser/
-	incidenceeditor-ng/
-	calendarsupport/
-	noteshared/
 "
 KMEXTRA="
 	agents/archivemailagent/
 	agents/followupreminderagent/
 	agents/mailfilteragent/
 	grantleeeditor/headerthemeeditor/
+	importwizard/
 	kmailcvt/
 	ksendemail/
-	importwizard/
 	libksieve/
-	mailcommon/
-	mailimporter/
 	mboximporter/
 	pimsettingexporter/
 	plugins/messageviewer/
diff --git a/kde-base/konsolekalendar/konsolekalendar-4.9999.ebuild b/kde-base/konsolekalendar/konsolekalendar-4.9999.ebuild
index b481f498cbb..c1d98abf34b 100644
--- a/kde-base/konsolekalendar/konsolekalendar-4.9999.ebuild
+++ b/kde-base/konsolekalendar/konsolekalendar-4.9999.ebuild
@@ -22,10 +22,26 @@ 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/org.kde.Korganizer.Calendar.xml
+	mailimporter/
+	messagecomposer/
 	libkdepimdbusinterfaces/
+	libkleo/
+	libkpgp/
 "
 
 KMLOADLIBS="kdepim-common-libs"
diff --git a/kde-base/korganizer/korganizer-4.9999.ebuild b/kde-base/korganizer/korganizer-4.9999.ebuild
index 114ddad022e..f8ee8f39dbe 100644
--- a/kde-base/korganizer/korganizer-4.9999.ebuild
+++ b/kde-base/korganizer/korganizer-4.9999.ebuild
@@ -30,21 +30,29 @@ KMLOADLIBS="kdepim-common-libs"
 KMEXTRA="
 	korgac/
 "
-
 KMEXTRACTONLY="
+	agents/mailfilteragent/org.freedesktop.Akonadi.MailFilterAgent.xml
 	akonadi_next/
 	calendarviews/
 	kdgantt2/
 	kmail/
-	pimcommon/
 	knode/org.kde.knode.xml
 	libkdepimdbusinterfaces/
-	korgac/org.kde.korganizer.KOrgac.xml
+	libkleo/
+	libkpgp/
+	mailimporter/
+	messagecomposer/
 "
-
 KMCOMPILEONLY="
-	incidenceeditor-ng/
 	calendarsupport/
+	grantleetheme/
+	incidenceeditor-ng/
+	kaddressbookgrantlee/
+	mailcommon/
+	messagecore/
+	messageviewer/
+	pimcommon/
+	templateparser/
 "
 
 src_unpack() {
-- 
cgit v1.2.3