From 328004bec90e683caea9da0d1b38f2568ee7582a Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Wed, 2 Sep 2015 09:52:42 +0200
Subject: Updated module definition and build order for KDE SlackBuild

---
 kde/modularize           | 42 +++++++++++++++++++++++++++++++++---------
 kde/modules/applications | 10 +++++++---
 kde/modules/kde4         |  9 ++++-----
 kde/modules/kdepim       | 23 +++++++++++++++++++++++
 kde/modules/plasma       |  5 +++++
 5 files changed, 72 insertions(+), 17 deletions(-)
 create mode 100644 kde/modules/kdepim

diff --git a/kde/modularize b/kde/modularize
index 63b7714..6136b86 100644
--- a/kde/modularize
+++ b/kde/modularize
@@ -97,7 +97,7 @@ khtml
 
 # plasma
 kfilemetadata5
-kdepimlibs-framework
+kgamma5
 baloo5
 kdecoration
 breeze
@@ -115,6 +115,7 @@ oxygen
 oxygen-fonts
 systemsettings
 kwayland
+kwayland-integration
 plasma-desktop
 plasma-workspace
 kdeplasma-addons
@@ -132,6 +133,9 @@ kde-gtk-config
 muon
 ksshaskpass
 plasma-sdk
+#kwallet-pam
+#plasma-pa
+#user-manager
 #plasma-mediacenter
 
 # plasma-extra
@@ -142,6 +146,7 @@ polkit-kde-kcmodules-framework
 
 # applications
 # kdebase:
+kdebugsettings
 kate
 konsole
 kde-baseapps
@@ -149,6 +154,7 @@ kde-wallpapers
 kde-workspace
 kde-runtime
 kde-base-artwork
+dolphin
 # kdesdk:
 kapptemplate
 okteta
@@ -177,7 +183,6 @@ okular
 kdegraphics-thumbnailers
 kamera
 kcolorchooser
-kgamma
 kolourpaint
 kruler
 ksaneplugin
@@ -326,6 +331,30 @@ ktp-filetransfer-handler
 ktp-send-file
 #ktp-call-ui
 ktp-desktop-applets
+# KDE PIM
+gpgmepp
+kcalcore
+akonadi
+akonadi-search
+kholidays
+kpimtextedit
+kidentitymanagement
+kalarmcal
+kcalutils
+syndication
+kblog
+kcontacts
+kmime
+kimap
+kldap
+kmbox
+kontactinterface
+ktnef
+kdepim
+kdepimlibs
+kdepim-runtime
+kmailtransport
+akonadi-calendar
 
 #
 # The old KDE 4 stuff which has not been migrated yet. or is still needed
@@ -336,9 +365,11 @@ ktp-desktop-applets
 kdelibs
 
 # kdebase:
+akonadi4
 baloo
 baloo-widgets
 nepomuk-core
+kdepimlibs4
 nepomuk-widgets
 kfilemetadata
 kactivities
@@ -358,13 +389,6 @@ kross-interpreters
 kimono
 qyoto
 
-# kdepim
-kdepim
-kdepim-runtime
-
-# kdepimlibs
-kdepimlibs
-
 # kdegames:
 libkdegames4
 libkmahjongg4
diff --git a/kde/modules/applications b/kde/modules/applications
index 0530bdc..7593b5e 100644
--- a/kde/modules/applications
+++ b/kde/modules/applications
@@ -1,4 +1,4 @@
-# https://community.kde.org/Applications/15.04_Release_Notes
+# https://community.kde.org/Applications/15.08_Release_Notes
 #
 # Some of the kdegraphics needs to be compiled first:
 libkipi
@@ -7,6 +7,8 @@ libkdcraw
 libksane
 gwenview
 
+# KDE PIM: split out to modules/kdepim
+
 # KDE Telepathy:
 #signon-kwallet-extension
 #kaccounts-providers
@@ -32,8 +34,10 @@ kde-wallpapers
 kde-workspace
 kde-runtime
 kde-base-artwork
+dolphin
 
 # kdesdk:
+kdebugsettings
 kapptemplate
 okteta
 cervisia
@@ -57,12 +61,12 @@ okular
 kdegraphics-thumbnailers
 kamera
 kcolorchooser
-kgamma
 kolourpaint
 kruler
 ksaneplugin
 ksnapshot
 svgpart
+# needs opencv:
 #libkface
 
 # kdeaccessibility:
@@ -192,7 +196,7 @@ ktouch
 kturtle
 kwordquiz
 marble
-pairs
+#pairs
 rocs
 step
 
diff --git a/kde/modules/kde4 b/kde/modules/kde4
index f8b62fb..0775a54 100644
--- a/kde/modules/kde4
+++ b/kde/modules/kde4
@@ -1,9 +1,11 @@
+# Pre-requisite for the old KDE4 PIM applications:
+akonadi4
 # kdelibs:
 kdelibs
 # Taken from kdebase, needed for kdepimlibs:
 nepomuk-core
-# kdepimlibs:
-kdepimlibs
+# kdepimlibs for KDE4 based PIM applications:
+kdepimlibs4
 # kdebase:
 kfilemetadata
 baloo
@@ -24,9 +26,6 @@ pykde4
 kross-interpreters
 #kimono
 #qyoto
-# kdepim:
-kdepim
-kdepim-runtime
 # kdegames:
 libkdegames4
 libkmahjongg4
diff --git a/kde/modules/kdepim b/kde/modules/kdepim
new file mode 100644
index 0000000..bc93ffe
--- /dev/null
+++ b/kde/modules/kdepim
@@ -0,0 +1,23 @@
+gpgmepp
+kcalcore
+akonadi
+kholidays
+kpimtextedit
+kidentitymanagement
+kcalutils
+syndication
+kblog
+kcontacts
+kmime
+kimap
+kldap
+kmbox
+kontactinterface
+ktnef
+kdepimlibs
+akonadi-search
+kalarmcal
+kmailtransport
+akonadi-calendar
+kdepim-runtime
+kdepim
diff --git a/kde/modules/plasma b/kde/modules/plasma
index 717026b..5ad0089 100644
--- a/kde/modules/plasma
+++ b/kde/modules/plasma
@@ -1,11 +1,13 @@
 # plasma:
 kfilemetadata5
 #kdepimlibs-framework
+kgamma5
 baloo5
 kdecoration
 breeze
 kde-cli-tools
 kwayland
+kwayland-integration
 khelpcenter
 kinfocenter
 kio-extras
@@ -35,5 +37,8 @@ kde-gtk-config
 muon
 ksshaskpass
 plasma-sdk
+#kwallet-pam
+#plasma-pa
+#user-manager
 #plasma-mediacenter
 
-- 
cgit v1.2.3