[kde-base/kdepim-4.14.5] Fix compilation and unmask packages. Bug 538922.

4 files changed, 38 insertions, 13 deletions

diff --git a/kde-base/kdepim-common-libs/kdepim-common-libs-4.14.5.ebuild b/kde-base/kdepim-common-libs/kdepim-common-libs-4.14.5.ebuild
index ca2acaa5fe0..69474acab2e 100644
--- a/kde-base/kdepim-common-libs/kdepim-common-libs-4.14.5.ebuild
+++ b/kde-base/kdepim-common-libs/kdepim-common-libs-4.14.5.ebuild
@@ -43,12 +43,12 @@ KMEXTRA="
 	composereditor-ng/
 	grantleeeditor/grantleethemeeditor/
 	grantleetheme/
-	kaddressbookgrantlee/
 	incidenceeditor-ng/
 	libkdepim/
 	libkdepimdbusinterfaces/
 	libkleo/
 	libkpgp/
+	kaddressbookgrantlee/
 	kdgantt2/
 	mailcommon/
 	mailimporter/
diff --git a/kde-base/kmail/kmail-4.14.5.ebuild b/kde-base/kmail/kmail-4.14.5.ebuild
index 7aa1e899777..89c7d236d71 100644
--- a/kde-base/kmail/kmail-4.14.5.ebuild
+++ b/kde-base/kmail/kmail-4.14.5.ebuild
@@ -31,18 +31,19 @@ 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/
@@ -50,20 +51,20 @@ KMCOMPILEONLY="
 	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/
 	mboximporter/
 	pimsettingexporter/
diff --git a/kde-base/konsolekalendar/konsolekalendar-4.14.5.ebuild b/kde-base/konsolekalendar/konsolekalendar-4.14.5.ebuild
index 16aeafb6b86..edc5b0218d4 100644
--- a/kde-base/konsolekalendar/konsolekalendar-4.14.5.ebuild
+++ b/kde-base/konsolekalendar/konsolekalendar-4.14.5.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.14.5.ebuild b/kde-base/korganizer/korganizer-4.14.5.ebuild
index de0a2970447..8c2e8ca2894 100644
--- a/kde-base/korganizer/korganizer-4.14.5.ebuild
+++ b/kde-base/korganizer/korganizer-4.14.5.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() {