kdepim 4.8.0-1 maj port

6 files changed, 167 insertions, 217 deletions

diff --git a/kdepim/.footprint.i686 b/kdepim/.footprint.i686
index 84508d1a5..f75073a55 100644
--- a/kdepim/.footprint.i686
+++ b/kdepim/.footprint.i686
@@ -4,13 +4,11 @@ drwxr-xr-x	root/root	etc/dbus-1/system.d/
 -rw-r--r--	root/root	etc/dbus-1/system.d/org.kde.kalarmrtcwake.conf
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
--rwxr-xr-x	root/root	usr/bin/akonadi_nepomuk_email_feeder
+-rwxr-xr-x	root/root	usr/bin/akonadi_mailfilter_agent
 -rwxr-xr-x	root/root	usr/bin/akonadiconsole
 -rwxr-xr-x	root/root	usr/bin/akregator
 -rwxr-xr-x	root/root	usr/bin/akregatorstorageexporter
 -rwxr-xr-x	root/root	usr/bin/blogilo
--rwxr-xr-x	root/root	usr/bin/groupwarewizard
--rwxr-xr-x	root/root	usr/bin/groupwisewizard
 -rwxr-xr-x	root/root	usr/bin/ical2vcal
 -rwxr-xr-x	root/root	usr/bin/kabc2mutt
 -rwxr-xr-x	root/root	usr/bin/kabcclient
@@ -174,13 +172,8 @@ drwxr-xr-x	root/root	usr/lib/kde4/imports/org/kde/pim/mobileui/images/status/
 -rw-r--r--	root/root	usr/lib/kde4/imports/org/kde/pim/mobileui/images/status/sending-receiving.png
 -rw-r--r--	root/root	usr/lib/kde4/imports/org/kde/pim/mobileui/images/status/sending.png
 -rw-r--r--	root/root	usr/lib/kde4/imports/org/kde/pim/mobileui/qmldir
--rwxr-xr-x	root/root	usr/lib/kde4/kabc_groupwise.so
 -rwxr-xr-x	root/root	usr/lib/kde4/kaddressbookpart.so
--rwxr-xr-x	root/root	usr/lib/kde4/kalarm_local.so
--rwxr-xr-x	root/root	usr/lib/kde4/kalarm_localdir.so
--rwxr-xr-x	root/root	usr/lib/kde4/kalarm_remote.so
 -rwxr-xr-x	root/root	usr/lib/kde4/kcal_blog.so
--rwxr-xr-x	root/root	usr/lib/kde4/kcal_groupwise.so
 -rwxr-xr-x	root/root	usr/lib/kde4/kcal_remote.so
 -rwxr-xr-x	root/root	usr/lib/kde4/kcm_apptsummary.so
 -rwxr-xr-x	root/root	usr/lib/kde4/kcm_kjots.so
@@ -197,7 +190,6 @@ drwxr-xr-x	root/root	usr/lib/kde4/imports/org/kde/pim/mobileui/images/status/
 -rwxr-xr-x	root/root	usr/lib/kde4/kcm_ldap.so
 -rwxr-xr-x	root/root	usr/lib/kde4/kcm_sdsummary.so
 -rwxr-xr-x	root/root	usr/lib/kde4/kcm_todosummary.so
--rwxr-xr-x	root/root	usr/lib/kde4/kio_groupwise.so
 -rwxr-xr-x	root/root	usr/lib/kde4/kjotspart.so
 -rwxr-xr-x	root/root	usr/lib/kde4/kmailpart.so
 -rwxr-xr-x	root/root	usr/lib/kde4/knodepart.so
@@ -232,116 +224,104 @@ drwxr-xr-x	root/root	usr/lib/kde4/libexec/
 -rwxr-xr-x	root/root	usr/lib/kde4/plasma_applet_akonotes_list.so
 -rwxr-xr-x	root/root	usr/lib/kde4/plasma_applet_akonotes_note.so
 drwxr-xr-x	root/root	usr/lib/kde4/plugins/
+drwxr-xr-x	root/root	usr/lib/kde4/plugins/accessible/
+-rwxr-xr-x	root/root	usr/lib/kde4/plugins/accessible/messagevieweraccessiblewidgetfactory.so
 drwxr-xr-x	root/root	usr/lib/kde4/plugins/designer/
 -rwxr-xr-x	root/root	usr/lib/kde4/plugins/designer/kdepimwidgets.so
 lrwxrwxrwx	root/root	usr/lib/libakonadi_next.so -> libakonadi_next.so.4
-lrwxrwxrwx	root/root	usr/lib/libakonadi_next.so.4 -> libakonadi_next.so.4.7.0
--rwxr-xr-x	root/root	usr/lib/libakonadi_next.so.4.7.0
+lrwxrwxrwx	root/root	usr/lib/libakonadi_next.so.4 -> libakonadi_next.so.4.8.0
+-rwxr-xr-x	root/root	usr/lib/libakonadi_next.so.4.8.0
 lrwxrwxrwx	root/root	usr/lib/libakregatorinterfaces.so -> libakregatorinterfaces.so.4
-lrwxrwxrwx	root/root	usr/lib/libakregatorinterfaces.so.4 -> libakregatorinterfaces.so.4.7.0
--rwxr-xr-x	root/root	usr/lib/libakregatorinterfaces.so.4.7.0
-lrwxrwxrwx	root/root	usr/lib/libakregatorprivate.so.4 -> libakregatorprivate.so.4.7.0
--rwxr-xr-x	root/root	usr/lib/libakregatorprivate.so.4.7.0
+lrwxrwxrwx	root/root	usr/lib/libakregatorinterfaces.so.4 -> libakregatorinterfaces.so.4.8.0
+-rwxr-xr-x	root/root	usr/lib/libakregatorinterfaces.so.4.8.0
+lrwxrwxrwx	root/root	usr/lib/libakregatorprivate.so.4 -> libakregatorprivate.so.4.8.0
+-rwxr-xr-x	root/root	usr/lib/libakregatorprivate.so.4.8.0
 lrwxrwxrwx	root/root	usr/lib/libcalendarsupport.so -> libcalendarsupport.so.4
-lrwxrwxrwx	root/root	usr/lib/libcalendarsupport.so.4 -> libcalendarsupport.so.4.7.0
--rwxr-xr-x	root/root	usr/lib/libcalendarsupport.so.4.7.0
+lrwxrwxrwx	root/root	usr/lib/libcalendarsupport.so.4 -> libcalendarsupport.so.4.8.0
+-rwxr-xr-x	root/root	usr/lib/libcalendarsupport.so.4.8.0
 lrwxrwxrwx	root/root	usr/lib/libeventviews.so -> libeventviews.so.4
-lrwxrwxrwx	root/root	usr/lib/libeventviews.so.4 -> libeventviews.so.4.7.0
--rwxr-xr-x	root/root	usr/lib/libeventviews.so.4.7.0
-lrwxrwxrwx	root/root	usr/lib/libgwsoap.so -> libgwsoap.so.4
-lrwxrwxrwx	root/root	usr/lib/libgwsoap.so.4 -> libgwsoap.so.4.7.0
--rwxr-xr-x	root/root	usr/lib/libgwsoap.so.4.7.0
+lrwxrwxrwx	root/root	usr/lib/libeventviews.so.4 -> libeventviews.so.4.8.0
+-rwxr-xr-x	root/root	usr/lib/libeventviews.so.4.8.0
 lrwxrwxrwx	root/root	usr/lib/libincidenceeditorsng.so -> libincidenceeditorsng.so.4
-lrwxrwxrwx	root/root	usr/lib/libincidenceeditorsng.so.4 -> libincidenceeditorsng.so.4.7.0
--rwxr-xr-x	root/root	usr/lib/libincidenceeditorsng.so.4.7.0
+lrwxrwxrwx	root/root	usr/lib/libincidenceeditorsng.so.4 -> libincidenceeditorsng.so.4.8.0
+-rwxr-xr-x	root/root	usr/lib/libincidenceeditorsng.so.4.8.0
 lrwxrwxrwx	root/root	usr/lib/libincidenceeditorsngmobile.so -> libincidenceeditorsngmobile.so.4
-lrwxrwxrwx	root/root	usr/lib/libincidenceeditorsngmobile.so.4 -> libincidenceeditorsngmobile.so.4.7.0
--rwxr-xr-x	root/root	usr/lib/libincidenceeditorsngmobile.so.4.7.0
-lrwxrwxrwx	root/root	usr/lib/libkabcgroupwise.so -> libkabcgroupwise.so.4
-lrwxrwxrwx	root/root	usr/lib/libkabcgroupwise.so.4 -> libkabcgroupwise.so.4.7.0
--rwxr-xr-x	root/root	usr/lib/libkabcgroupwise.so.4.7.0
-lrwxrwxrwx	root/root	usr/lib/libkaddressbookprivate.so.4 -> libkaddressbookprivate.so.4.7.0
--rwxr-xr-x	root/root	usr/lib/libkaddressbookprivate.so.4.7.0
-lrwxrwxrwx	root/root	usr/lib/libkalarm_calendar.so -> libkalarm_calendar.so.4
-lrwxrwxrwx	root/root	usr/lib/libkalarm_calendar.so.4 -> libkalarm_calendar.so.4.7.0
--rwxr-xr-x	root/root	usr/lib/libkalarm_calendar.so.4.7.0
-lrwxrwxrwx	root/root	usr/lib/libkalarm_resources.so.4 -> libkalarm_resources.so.4.7.0
--rwxr-xr-x	root/root	usr/lib/libkalarm_resources.so.4.7.0
+lrwxrwxrwx	root/root	usr/lib/libincidenceeditorsngmobile.so.4 -> libincidenceeditorsngmobile.so.4.8.0
+-rwxr-xr-x	root/root	usr/lib/libincidenceeditorsngmobile.so.4.8.0
+lrwxrwxrwx	root/root	usr/lib/libkaddressbookprivate.so.4 -> libkaddressbookprivate.so.4.8.0
+-rwxr-xr-x	root/root	usr/lib/libkaddressbookprivate.so.4.8.0
 lrwxrwxrwx	root/root	usr/lib/libkcal_resourceblog.so -> libkcal_resourceblog.so.4
-lrwxrwxrwx	root/root	usr/lib/libkcal_resourceblog.so.4 -> libkcal_resourceblog.so.4.7.0
--rwxr-xr-x	root/root	usr/lib/libkcal_resourceblog.so.4.7.0
+lrwxrwxrwx	root/root	usr/lib/libkcal_resourceblog.so.4 -> libkcal_resourceblog.so.4.8.0
+-rwxr-xr-x	root/root	usr/lib/libkcal_resourceblog.so.4.8.0
 lrwxrwxrwx	root/root	usr/lib/libkcal_resourceremote.so -> libkcal_resourceremote.so.4
-lrwxrwxrwx	root/root	usr/lib/libkcal_resourceremote.so.4 -> libkcal_resourceremote.so.4.7.0
--rwxr-xr-x	root/root	usr/lib/libkcal_resourceremote.so.4.7.0
-lrwxrwxrwx	root/root	usr/lib/libkcalgroupwise.so -> libkcalgroupwise.so.4
-lrwxrwxrwx	root/root	usr/lib/libkcalgroupwise.so.4 -> libkcalgroupwise.so.4.7.0
--rwxr-xr-x	root/root	usr/lib/libkcalgroupwise.so.4.7.0
+lrwxrwxrwx	root/root	usr/lib/libkcal_resourceremote.so.4 -> libkcal_resourceremote.so.4.8.0
+-rwxr-xr-x	root/root	usr/lib/libkcal_resourceremote.so.4.8.0
 lrwxrwxrwx	root/root	usr/lib/libkdepim.so -> libkdepim.so.4
-lrwxrwxrwx	root/root	usr/lib/libkdepim.so.4 -> libkdepim.so.4.7.0
--rwxr-xr-x	root/root	usr/lib/libkdepim.so.4.7.0
+lrwxrwxrwx	root/root	usr/lib/libkdepim.so.4 -> libkdepim.so.4.8.0
+-rwxr-xr-x	root/root	usr/lib/libkdepim.so.4.8.0
 lrwxrwxrwx	root/root	usr/lib/libkdepimdbusinterfaces.so -> libkdepimdbusinterfaces.so.4
-lrwxrwxrwx	root/root	usr/lib/libkdepimdbusinterfaces.so.4 -> libkdepimdbusinterfaces.so.4.7.0
--rwxr-xr-x	root/root	usr/lib/libkdepimdbusinterfaces.so.4.7.0
+lrwxrwxrwx	root/root	usr/lib/libkdepimdbusinterfaces.so.4 -> libkdepimdbusinterfaces.so.4.8.0
+-rwxr-xr-x	root/root	usr/lib/libkdepimdbusinterfaces.so.4.8.0
 lrwxrwxrwx	root/root	usr/lib/libkdepimmobileui.so -> libkdepimmobileui.so.4
-lrwxrwxrwx	root/root	usr/lib/libkdepimmobileui.so.4 -> libkdepimmobileui.so.4.7.0
--rwxr-xr-x	root/root	usr/lib/libkdepimmobileui.so.4.7.0
+lrwxrwxrwx	root/root	usr/lib/libkdepimmobileui.so.4 -> libkdepimmobileui.so.4.8.0
+-rwxr-xr-x	root/root	usr/lib/libkdepimmobileui.so.4.8.0
 lrwxrwxrwx	root/root	usr/lib/libkdgantt2.so -> libkdgantt2.so.0
 lrwxrwxrwx	root/root	usr/lib/libkdgantt2.so.0 -> libkdgantt2.so.0.1.0
 -rwxr-xr-x	root/root	usr/lib/libkdgantt2.so.0.1.0
 lrwxrwxrwx	root/root	usr/lib/libkleo.so -> libkleo.so.4
-lrwxrwxrwx	root/root	usr/lib/libkleo.so.4 -> libkleo.so.4.7.0
--rwxr-xr-x	root/root	usr/lib/libkleo.so.4.7.0
+lrwxrwxrwx	root/root	usr/lib/libkleo.so.4 -> libkleo.so.4.8.0
+-rwxr-xr-x	root/root	usr/lib/libkleo.so.4.8.0
 lrwxrwxrwx	root/root	usr/lib/libkleopatraclientcore.so -> libkleopatraclientcore.so.0
 lrwxrwxrwx	root/root	usr/lib/libkleopatraclientcore.so.0 -> libkleopatraclientcore.so.0.3.0
 -rwxr-xr-x	root/root	usr/lib/libkleopatraclientcore.so.0.3.0
 lrwxrwxrwx	root/root	usr/lib/libkleopatraclientgui.so -> libkleopatraclientgui.so.0
 lrwxrwxrwx	root/root	usr/lib/libkleopatraclientgui.so.0 -> libkleopatraclientgui.so.0.3.0
 -rwxr-xr-x	root/root	usr/lib/libkleopatraclientgui.so.0.3.0
-lrwxrwxrwx	root/root	usr/lib/libkmailprivate.so.4 -> libkmailprivate.so.4.7.0
--rwxr-xr-x	root/root	usr/lib/libkmailprivate.so.4.7.0
+lrwxrwxrwx	root/root	usr/lib/libkmailprivate.so.4 -> libkmailprivate.so.4.8.0
+-rwxr-xr-x	root/root	usr/lib/libkmailprivate.so.4.8.0
 lrwxrwxrwx	root/root	usr/lib/libkmanagesieve.so -> libkmanagesieve.so.4
-lrwxrwxrwx	root/root	usr/lib/libkmanagesieve.so.4 -> libkmanagesieve.so.4.7.0
--rwxr-xr-x	root/root	usr/lib/libkmanagesieve.so.4.7.0
+lrwxrwxrwx	root/root	usr/lib/libkmanagesieve.so.4 -> libkmanagesieve.so.4.8.0
+-rwxr-xr-x	root/root	usr/lib/libkmanagesieve.so.4.8.0
 lrwxrwxrwx	root/root	usr/lib/libknodecommon.so -> libknodecommon.so.4
-lrwxrwxrwx	root/root	usr/lib/libknodecommon.so.4 -> libknodecommon.so.4.7.0
--rwxr-xr-x	root/root	usr/lib/libknodecommon.so.4.7.0
-lrwxrwxrwx	root/root	usr/lib/libkontactprivate.so.4 -> libkontactprivate.so.4.7.0
--rwxr-xr-x	root/root	usr/lib/libkontactprivate.so.4.7.0
+lrwxrwxrwx	root/root	usr/lib/libknodecommon.so.4 -> libknodecommon.so.4.8.0
+-rwxr-xr-x	root/root	usr/lib/libknodecommon.so.4.8.0
+lrwxrwxrwx	root/root	usr/lib/libkontactprivate.so.4 -> libkontactprivate.so.4.8.0
+-rwxr-xr-x	root/root	usr/lib/libkontactprivate.so.4.8.0
 lrwxrwxrwx	root/root	usr/lib/libkorganizer_core.so -> libkorganizer_core.so.4
-lrwxrwxrwx	root/root	usr/lib/libkorganizer_core.so.4 -> libkorganizer_core.so.4.7.0
--rwxr-xr-x	root/root	usr/lib/libkorganizer_core.so.4.7.0
+lrwxrwxrwx	root/root	usr/lib/libkorganizer_core.so.4 -> libkorganizer_core.so.4.8.0
+-rwxr-xr-x	root/root	usr/lib/libkorganizer_core.so.4.8.0
 lrwxrwxrwx	root/root	usr/lib/libkorganizer_interfaces.so -> libkorganizer_interfaces.so.4
-lrwxrwxrwx	root/root	usr/lib/libkorganizer_interfaces.so.4 -> libkorganizer_interfaces.so.4.7.0
--rwxr-xr-x	root/root	usr/lib/libkorganizer_interfaces.so.4.7.0
-lrwxrwxrwx	root/root	usr/lib/libkorganizerprivate.so.4 -> libkorganizerprivate.so.4.7.0
--rwxr-xr-x	root/root	usr/lib/libkorganizerprivate.so.4.7.0
+lrwxrwxrwx	root/root	usr/lib/libkorganizer_interfaces.so.4 -> libkorganizer_interfaces.so.4.8.0
+-rwxr-xr-x	root/root	usr/lib/libkorganizer_interfaces.so.4.8.0
+lrwxrwxrwx	root/root	usr/lib/libkorganizerprivate.so.4 -> libkorganizerprivate.so.4.8.0
+-rwxr-xr-x	root/root	usr/lib/libkorganizerprivate.so.4.8.0
 lrwxrwxrwx	root/root	usr/lib/libkpgp.so -> libkpgp.so.4
-lrwxrwxrwx	root/root	usr/lib/libkpgp.so.4 -> libkpgp.so.4.7.0
--rwxr-xr-x	root/root	usr/lib/libkpgp.so.4.7.0
+lrwxrwxrwx	root/root	usr/lib/libkpgp.so.4 -> libkpgp.so.4.8.0
+-rwxr-xr-x	root/root	usr/lib/libkpgp.so.4.8.0
 lrwxrwxrwx	root/root	usr/lib/libksieve.so -> libksieve.so.4
-lrwxrwxrwx	root/root	usr/lib/libksieve.so.4 -> libksieve.so.4.7.0
--rwxr-xr-x	root/root	usr/lib/libksieve.so.4.7.0
+lrwxrwxrwx	root/root	usr/lib/libksieve.so.4 -> libksieve.so.4.8.0
+-rwxr-xr-x	root/root	usr/lib/libksieve.so.4.8.0
 lrwxrwxrwx	root/root	usr/lib/libksieveui.so -> libksieveui.so.4
-lrwxrwxrwx	root/root	usr/lib/libksieveui.so.4 -> libksieveui.so.4.7.0
--rwxr-xr-x	root/root	usr/lib/libksieveui.so.4.7.0
+lrwxrwxrwx	root/root	usr/lib/libksieveui.so.4 -> libksieveui.so.4.8.0
+-rwxr-xr-x	root/root	usr/lib/libksieveui.so.4.8.0
 lrwxrwxrwx	root/root	usr/lib/libmailcommon.so -> libmailcommon.so.4
-lrwxrwxrwx	root/root	usr/lib/libmailcommon.so.4 -> libmailcommon.so.4.7.0
--rwxr-xr-x	root/root	usr/lib/libmailcommon.so.4.7.0
+lrwxrwxrwx	root/root	usr/lib/libmailcommon.so.4 -> libmailcommon.so.4.8.0
+-rwxr-xr-x	root/root	usr/lib/libmailcommon.so.4.8.0
 lrwxrwxrwx	root/root	usr/lib/libmessagecomposer.so -> libmessagecomposer.so.4
-lrwxrwxrwx	root/root	usr/lib/libmessagecomposer.so.4 -> libmessagecomposer.so.4.7.0
--rwxr-xr-x	root/root	usr/lib/libmessagecomposer.so.4.7.0
+lrwxrwxrwx	root/root	usr/lib/libmessagecomposer.so.4 -> libmessagecomposer.so.4.8.0
+-rwxr-xr-x	root/root	usr/lib/libmessagecomposer.so.4.8.0
 lrwxrwxrwx	root/root	usr/lib/libmessagecore.so -> libmessagecore.so.4
-lrwxrwxrwx	root/root	usr/lib/libmessagecore.so.4 -> libmessagecore.so.4.7.0
--rwxr-xr-x	root/root	usr/lib/libmessagecore.so.4.7.0
+lrwxrwxrwx	root/root	usr/lib/libmessagecore.so.4 -> libmessagecore.so.4.8.0
+-rwxr-xr-x	root/root	usr/lib/libmessagecore.so.4.8.0
 lrwxrwxrwx	root/root	usr/lib/libmessagelist.so -> libmessagelist.so.4
-lrwxrwxrwx	root/root	usr/lib/libmessagelist.so.4 -> libmessagelist.so.4.7.0
--rwxr-xr-x	root/root	usr/lib/libmessagelist.so.4.7.0
+lrwxrwxrwx	root/root	usr/lib/libmessagelist.so.4 -> libmessagelist.so.4.8.0
+-rwxr-xr-x	root/root	usr/lib/libmessagelist.so.4.8.0
 lrwxrwxrwx	root/root	usr/lib/libmessageviewer.so -> libmessageviewer.so.4
-lrwxrwxrwx	root/root	usr/lib/libmessageviewer.so.4 -> libmessageviewer.so.4.7.0
--rwxr-xr-x	root/root	usr/lib/libmessageviewer.so.4.7.0
+lrwxrwxrwx	root/root	usr/lib/libmessageviewer.so.4 -> libmessageviewer.so.4.8.0
+-rwxr-xr-x	root/root	usr/lib/libmessageviewer.so.4.8.0
 lrwxrwxrwx	root/root	usr/lib/libtemplateparser.so -> libtemplateparser.so.4
-lrwxrwxrwx	root/root	usr/lib/libtemplateparser.so.4 -> libtemplateparser.so.4.7.0
--rwxr-xr-x	root/root	usr/lib/libtemplateparser.so.4.7.0
+lrwxrwxrwx	root/root	usr/lib/libtemplateparser.so.4 -> libtemplateparser.so.4.8.0
+-rwxr-xr-x	root/root	usr/lib/libtemplateparser.so.4.8.0
 drwxr-xr-x	root/root	usr/lib/strigi/
 -rwxr-xr-x	root/root	usr/lib/strigi/strigiea_ctg.so
 -rwxr-xr-x	root/root	usr/lib/strigi/strigiea_ics.so
@@ -350,7 +330,7 @@ drwxr-xr-x	root/root	usr/lib/strigi/
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/akonadi/
 drwxr-xr-x	root/root	usr/share/akonadi/agents/
--rw-r--r--	root/root	usr/share/akonadi/agents/nepomukemailfeeder.desktop
+-rw-r--r--	root/root	usr/share/akonadi/agents/mailfilteragent.desktop
 drwxr-xr-x	root/root	usr/share/applications/
 drwxr-xr-x	root/root	usr/share/applications/kde4/
 -rwxr-xr-x	root/root	usr/share/applications/kde4/KMail2.desktop
@@ -360,7 +340,6 @@ drwxr-xr-x	root/root	usr/share/applications/kde4/
 -rwxr-xr-x	root/root	usr/share/applications/kde4/akonadiconsole.desktop
 -rwxr-xr-x	root/root	usr/share/applications/kde4/akregator.desktop
 -rwxr-xr-x	root/root	usr/share/applications/kde4/blogilo.desktop
--rwxr-xr-x	root/root	usr/share/applications/kde4/groupwarewizard.desktop
 -rwxr-xr-x	root/root	usr/share/applications/kde4/kaddressbook-mobile.desktop
 -rwxr-xr-x	root/root	usr/share/applications/kde4/kaddressbook.desktop
 -rwxr-xr-x	root/root	usr/share/applications/kde4/kalarm.desktop
@@ -472,6 +451,8 @@ drwxr-xr-x	root/root	usr/share/apps/kconf_update/
 -rw-r--r--	root/root	usr/share/apps/kconf_update/korganizer.upd
 -rwxr-xr-x	root/root	usr/share/apps/kconf_update/kpgp-3.1-upgrade-address-data.pl
 -rw-r--r--	root/root	usr/share/apps/kconf_update/kpgp.upd
+-rw-r--r--	root/root	usr/share/apps/kconf_update/mailfilteragent.upd
+-rwxr-xr-x	root/root	usr/share/apps/kconf_update/migrate-kmail-filters.pl
 -rwxr-xr-x	root/root	usr/share/apps/kconf_update/upgrade-signature.pl
 -rwxr-xr-x	root/root	usr/share/apps/kconf_update/upgrade-transport.pl
 drwxr-xr-x	root/root	usr/share/apps/kdepimwidgets/
@@ -528,8 +509,6 @@ drwxr-xr-x	root/root	usr/share/apps/kmail-mobile/
 -rw-r--r--	root/root	usr/share/apps/kmail-mobile/SnippetsList.qml
 -rw-r--r--	root/root	usr/share/apps/kmail-mobile/VacationScriptIndicator.qml
 -rw-r--r--	root/root	usr/share/apps/kmail-mobile/add-attachment-button.png
--rw-r--r--	root/root	usr/share/apps/kmail-mobile/dividing-line-horizontal.png
--rw-r--r--	root/root	usr/share/apps/kmail-mobile/dividing-line.png
 -rw-r--r--	root/root	usr/share/apps/kmail-mobile/kmail-composer.qml
 -rw-r--r--	root/root	usr/share/apps/kmail-mobile/kmail-mobile-background.png
 -rw-r--r--	root/root	usr/share/apps/kmail-mobile/kmail-mobile.notifyrc
@@ -539,26 +518,27 @@ drwxr-xr-x	root/root	usr/share/apps/kmail-mobile/
 -rw-r--r--	root/root	usr/share/apps/kmail-mobile/toggle-encryption-button.png
 -rw-r--r--	root/root	usr/share/apps/kmail-mobile/toggle-signature-button.png
 drwxr-xr-x	root/root	usr/share/apps/kmail/
-drwxr-xr-x	root/root	usr/share/apps/kmail/about/
--rw-r--r--	root/root	usr/share/apps/kmail/about/kmail.css
--rw-r--r--	root/root	usr/share/apps/kmail/about/main.html
--rw-r--r--	root/root	usr/share/apps/kmail/about/top-left-kmail.png
 drwxr-xr-x	root/root	usr/share/apps/kmail/pics/
 -rw-r--r--	root/root	usr/share/apps/kmail/pics/key.png
 -rw-r--r--	root/root	usr/share/apps/kmail/pics/key_bad.png
 -rw-r--r--	root/root	usr/share/apps/kmail/pics/key_ok.png
 -rw-r--r--	root/root	usr/share/apps/kmail/pics/key_unknown.png
--rw-r--r--	root/root	usr/share/apps/kmail/pics/kmwizard.png
--rw-r--r--	root/root	usr/share/apps/kmail/pics/mail-deleted.png
--rw-r--r--	root/root	usr/share/apps/kmail/pics/mail-thread-ignored.png
--rw-r--r--	root/root	usr/share/apps/kmail/pics/mail-thread-watch.png
--rw-r--r--	root/root	usr/share/apps/kmail/pics/pgp-keys.png
 drwxr-xr-x	root/root	usr/share/apps/kmail2/
+drwxr-xr-x	root/root	usr/share/apps/kmail2/about/
+-rw-r--r--	root/root	usr/share/apps/kmail2/about/kmail.css
+-rw-r--r--	root/root	usr/share/apps/kmail2/about/main.html
+-rw-r--r--	root/root	usr/share/apps/kmail2/about/top-left-kmail.png
 -rw-r--r--	root/root	usr/share/apps/kmail2/kmail2.notifyrc
 -rw-r--r--	root/root	usr/share/apps/kmail2/kmail_part.rc
 -rw-r--r--	root/root	usr/share/apps/kmail2/kmcomposerui.rc
 -rw-r--r--	root/root	usr/share/apps/kmail2/kmmainwin.rc
 -rw-r--r--	root/root	usr/share/apps/kmail2/kmreadermainwin.rc
+drwxr-xr-x	root/root	usr/share/apps/kmail2/pics/
+-rw-r--r--	root/root	usr/share/apps/kmail2/pics/kmwizard.png
+-rw-r--r--	root/root	usr/share/apps/kmail2/pics/mail-deleted.png
+-rw-r--r--	root/root	usr/share/apps/kmail2/pics/mail-thread-ignored.png
+-rw-r--r--	root/root	usr/share/apps/kmail2/pics/mail-thread-watch.png
+-rw-r--r--	root/root	usr/share/apps/kmail2/pics/pgp-keys.png
 -rw-r--r--	root/root	usr/share/apps/kmail2/tips
 drwxr-xr-x	root/root	usr/share/apps/kmailcvt/
 drwxr-xr-x	root/root	usr/share/apps/kmailcvt/pics/
@@ -788,6 +768,7 @@ drwxr-xr-x	root/root	usr/share/apps/messageviewer/plugins/bodypartformatter/
 -rw-r--r--	root/root	usr/share/apps/messageviewer/plugins/bodypartformatter/text_vcard.desktop
 -rw-r--r--	root/root	usr/share/apps/messageviewer/plugins/bodypartformatter/text_xdiff.desktop
 drwxr-xr-x	root/root	usr/share/apps/mobileui/
+-rw-r--r--	root/root	usr/share/apps/mobileui/ScreenFunctions.js
 -rw-r--r--	root/root	usr/share/apps/mobileui/add-button.png
 -rw-r--r--	root/root	usr/share/apps/mobileui/back-to-list-button.png
 -rw-r--r--	root/root	usr/share/apps/mobileui/built-on-the-kde-platform.png
@@ -821,7 +802,6 @@ drwxr-xr-x	root/root	usr/share/config.kcfg/
 -rw-r--r--	root/root	usr/share/config.kcfg/akregator.kcfg
 -rw-r--r--	root/root	usr/share/config.kcfg/blogilo.kcfg
 -rw-r--r--	root/root	usr/share/config.kcfg/customtemplates_kfg.kcfg
--rw-r--r--	root/root	usr/share/config.kcfg/groupwise.kcfg
 -rw-r--r--	root/root	usr/share/config.kcfg/kalarmconfig.kcfg
 -rw-r--r--	root/root	usr/share/config.kcfg/kjots.kcfg
 -rw-r--r--	root/root	usr/share/config.kcfg/kmail.kcfg
@@ -1296,8 +1276,6 @@ drwxr-xr-x	root/root	usr/share/kde4/services/ServiceMenus/
 -rw-r--r--	root/root	usr/share/kde4/services/akregator_part.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/akregator_sharemicroblog_plugin.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/feed.protocol
--rw-r--r--	root/root	usr/share/kde4/services/groupwise.protocol
--rw-r--r--	root/root	usr/share/kde4/services/groupwises.protocol
 -rw-r--r--	root/root	usr/share/kde4/services/kaddressbookpart.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/kcm_kpimidentities.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/kcmapptsummary.desktop
@@ -1367,16 +1345,8 @@ drwxr-xr-x	root/root	usr/share/kde4/services/korganizer/
 -rw-r--r--	root/root	usr/share/kde4/services/korganizer_configviews.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/korganizer_part.desktop
 drwxr-xr-x	root/root	usr/share/kde4/services/kresources/
-drwxr-xr-x	root/root	usr/share/kde4/services/kresources/alarms/
--rw-r--r--	root/root	usr/share/kde4/services/kresources/alarms/local.desktop
--rw-r--r--	root/root	usr/share/kde4/services/kresources/alarms/localdir.desktop
--rw-r--r--	root/root	usr/share/kde4/services/kresources/alarms/remote.desktop
-drwxr-xr-x	root/root	usr/share/kde4/services/kresources/kabc/
--rw-r--r--	root/root	usr/share/kde4/services/kresources/kabc/kabc_groupwise.desktop
--rw-r--r--	root/root	usr/share/kde4/services/kresources/kalarm_manager.desktop
 drwxr-xr-x	root/root	usr/share/kde4/services/kresources/kcal/
 -rw-r--r--	root/root	usr/share/kde4/services/kresources/kcal/blog.desktop
--rw-r--r--	root/root	usr/share/kde4/services/kresources/kcal/kcal_groupwise.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/kresources/kcal/remote.desktop
 drwxr-xr-x	root/root	usr/share/kde4/services/kresources/knotes/
 -rw-r--r--	root/root	usr/share/kde4/services/kresources/knotes/local.desktop
diff --git a/kdepim/.footprint.x86_64 b/kdepim/.footprint.x86_64
index 84508d1a5..f75073a55 100644
--- a/kdepim/.footprint.x86_64
+++ b/kdepim/.footprint.x86_64
@@ -4,13 +4,11 @@ drwxr-xr-x	root/root	etc/dbus-1/system.d/
 -rw-r--r--	root/root	etc/dbus-1/system.d/org.kde.kalarmrtcwake.conf
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
--rwxr-xr-x	root/root	usr/bin/akonadi_nepomuk_email_feeder
+-rwxr-xr-x	root/root	usr/bin/akonadi_mailfilter_agent
 -rwxr-xr-x	root/root	usr/bin/akonadiconsole
 -rwxr-xr-x	root/root	usr/bin/akregator
 -rwxr-xr-x	root/root	usr/bin/akregatorstorageexporter
 -rwxr-xr-x	root/root	usr/bin/blogilo
--rwxr-xr-x	root/root	usr/bin/groupwarewizard
--rwxr-xr-x	root/root	usr/bin/groupwisewizard
 -rwxr-xr-x	root/root	usr/bin/ical2vcal
 -rwxr-xr-x	root/root	usr/bin/kabc2mutt
 -rwxr-xr-x	root/root	usr/bin/kabcclient
@@ -174,13 +172,8 @@ drwxr-xr-x	root/root	usr/lib/kde4/imports/org/kde/pim/mobileui/images/status/
 -rw-r--r--	root/root	usr/lib/kde4/imports/org/kde/pim/mobileui/images/status/sending-receiving.png
 -rw-r--r--	root/root	usr/lib/kde4/imports/org/kde/pim/mobileui/images/status/sending.png
 -rw-r--r--	root/root	usr/lib/kde4/imports/org/kde/pim/mobileui/qmldir
--rwxr-xr-x	root/root	usr/lib/kde4/kabc_groupwise.so
 -rwxr-xr-x	root/root	usr/lib/kde4/kaddressbookpart.so
--rwxr-xr-x	root/root	usr/lib/kde4/kalarm_local.so
--rwxr-xr-x	root/root	usr/lib/kde4/kalarm_localdir.so
--rwxr-xr-x	root/root	usr/lib/kde4/kalarm_remote.so
 -rwxr-xr-x	root/root	usr/lib/kde4/kcal_blog.so
--rwxr-xr-x	root/root	usr/lib/kde4/kcal_groupwise.so
 -rwxr-xr-x	root/root	usr/lib/kde4/kcal_remote.so
 -rwxr-xr-x	root/root	usr/lib/kde4/kcm_apptsummary.so
 -rwxr-xr-x	root/root	usr/lib/kde4/kcm_kjots.so
@@ -197,7 +190,6 @@ drwxr-xr-x	root/root	usr/lib/kde4/imports/org/kde/pim/mobileui/images/status/
 -rwxr-xr-x	root/root	usr/lib/kde4/kcm_ldap.so
 -rwxr-xr-x	root/root	usr/lib/kde4/kcm_sdsummary.so
 -rwxr-xr-x	root/root	usr/lib/kde4/kcm_todosummary.so
--rwxr-xr-x	root/root	usr/lib/kde4/kio_groupwise.so
 -rwxr-xr-x	root/root	usr/lib/kde4/kjotspart.so
 -rwxr-xr-x	root/root	usr/lib/kde4/kmailpart.so
 -rwxr-xr-x	root/root	usr/lib/kde4/knodepart.so
@@ -232,116 +224,104 @@ drwxr-xr-x	root/root	usr/lib/kde4/libexec/
 -rwxr-xr-x	root/root	usr/lib/kde4/plasma_applet_akonotes_list.so
 -rwxr-xr-x	root/root	usr/lib/kde4/plasma_applet_akonotes_note.so
 drwxr-xr-x	root/root	usr/lib/kde4/plugins/
+drwxr-xr-x	root/root	usr/lib/kde4/plugins/accessible/
+-rwxr-xr-x	root/root	usr/lib/kde4/plugins/accessible/messagevieweraccessiblewidgetfactory.so
 drwxr-xr-x	root/root	usr/lib/kde4/plugins/designer/
 -rwxr-xr-x	root/root	usr/lib/kde4/plugins/designer/kdepimwidgets.so
 lrwxrwxrwx	root/root	usr/lib/libakonadi_next.so -> libakonadi_next.so.4
-lrwxrwxrwx	root/root	usr/lib/libakonadi_next.so.4 -> libakonadi_next.so.4.7.0
--rwxr-xr-x	root/root	usr/lib/libakonadi_next.so.4.7.0
+lrwxrwxrwx	root/root	usr/lib/libakonadi_next.so.4 -> libakonadi_next.so.4.8.0
+-rwxr-xr-x	root/root	usr/lib/libakonadi_next.so.4.8.0
 lrwxrwxrwx	root/root	usr/lib/libakregatorinterfaces.so -> libakregatorinterfaces.so.4
-lrwxrwxrwx	root/root	usr/lib/libakregatorinterfaces.so.4 -> libakregatorinterfaces.so.4.7.0
--rwxr-xr-x	root/root	usr/lib/libakregatorinterfaces.so.4.7.0
-lrwxrwxrwx	root/root	usr/lib/libakregatorprivate.so.4 -> libakregatorprivate.so.4.7.0
--rwxr-xr-x	root/root	usr/lib/libakregatorprivate.so.4.7.0
+lrwxrwxrwx	root/root	usr/lib/libakregatorinterfaces.so.4 -> libakregatorinterfaces.so.4.8.0
+-rwxr-xr-x	root/root	usr/lib/libakregatorinterfaces.so.4.8.0
+lrwxrwxrwx	root/root	usr/lib/libakregatorprivate.so.4 -> libakregatorprivate.so.4.8.0
+-rwxr-xr-x	root/root	usr/lib/libakregatorprivate.so.4.8.0
 lrwxrwxrwx	root/root	usr/lib/libcalendarsupport.so -> libcalendarsupport.so.4
-lrwxrwxrwx	root/root	usr/lib/libcalendarsupport.so.4 -> libcalendarsupport.so.4.7.0
--rwxr-xr-x	root/root	usr/lib/libcalendarsupport.so.4.7.0
+lrwxrwxrwx	root/root	usr/lib/libcalendarsupport.so.4 -> libcalendarsupport.so.4.8.0
+-rwxr-xr-x	root/root	usr/lib/libcalendarsupport.so.4.8.0
 lrwxrwxrwx	root/root	usr/lib/libeventviews.so -> libeventviews.so.4
-lrwxrwxrwx	root/root	usr/lib/libeventviews.so.4 -> libeventviews.so.4.7.0
--rwxr-xr-x	root/root	usr/lib/libeventviews.so.4.7.0
-lrwxrwxrwx	root/root	usr/lib/libgwsoap.so -> libgwsoap.so.4
-lrwxrwxrwx	root/root	usr/lib/libgwsoap.so.4 -> libgwsoap.so.4.7.0
--rwxr-xr-x	root/root	usr/lib/libgwsoap.so.4.7.0
+lrwxrwxrwx	root/root	usr/lib/libeventviews.so.4 -> libeventviews.so.4.8.0
+-rwxr-xr-x	root/root	usr/lib/libeventviews.so.4.8.0
 lrwxrwxrwx	root/root	usr/lib/libincidenceeditorsng.so -> libincidenceeditorsng.so.4
-lrwxrwxrwx	root/root	usr/lib/libincidenceeditorsng.so.4 -> libincidenceeditorsng.so.4.7.0
--rwxr-xr-x	root/root	usr/lib/libincidenceeditorsng.so.4.7.0
+lrwxrwxrwx	root/root	usr/lib/libincidenceeditorsng.so.4 -> libincidenceeditorsng.so.4.8.0
+-rwxr-xr-x	root/root	usr/lib/libincidenceeditorsng.so.4.8.0
 lrwxrwxrwx	root/root	usr/lib/libincidenceeditorsngmobile.so -> libincidenceeditorsngmobile.so.4
-lrwxrwxrwx	root/root	usr/lib/libincidenceeditorsngmobile.so.4 -> libincidenceeditorsngmobile.so.4.7.0
--rwxr-xr-x	root/root	usr/lib/libincidenceeditorsngmobile.so.4.7.0
-lrwxrwxrwx	root/root	usr/lib/libkabcgroupwise.so -> libkabcgroupwise.so.4
-lrwxrwxrwx	root/root	usr/lib/libkabcgroupwise.so.4 -> libkabcgroupwise.so.4.7.0
--rwxr-xr-x	root/root	usr/lib/libkabcgroupwise.so.4.7.0
-lrwxrwxrwx	root/root	usr/lib/libkaddressbookprivate.so.4 -> libkaddressbookprivate.so.4.7.0
--rwxr-xr-x	root/root	usr/lib/libkaddressbookprivate.so.4.7.0
-lrwxrwxrwx	root/root	usr/lib/libkalarm_calendar.so -> libkalarm_calendar.so.4
-lrwxrwxrwx	root/root	usr/lib/libkalarm_calendar.so.4 -> libkalarm_calendar.so.4.7.0
--rwxr-xr-x	root/root	usr/lib/libkalarm_calendar.so.4.7.0
-lrwxrwxrwx	root/root	usr/lib/libkalarm_resources.so.4 -> libkalarm_resources.so.4.7.0
--rwxr-xr-x	root/root	usr/lib/libkalarm_resources.so.4.7.0
+lrwxrwxrwx	root/root	usr/lib/libincidenceeditorsngmobile.so.4 -> libincidenceeditorsngmobile.so.4.8.0
+-rwxr-xr-x	root/root	usr/lib/libincidenceeditorsngmobile.so.4.8.0
+lrwxrwxrwx	root/root	usr/lib/libkaddressbookprivate.so.4 -> libkaddressbookprivate.so.4.8.0
+-rwxr-xr-x	root/root	usr/lib/libkaddressbookprivate.so.4.8.0
 lrwxrwxrwx	root/root	usr/lib/libkcal_resourceblog.so -> libkcal_resourceblog.so.4
-lrwxrwxrwx	root/root	usr/lib/libkcal_resourceblog.so.4 -> libkcal_resourceblog.so.4.7.0
--rwxr-xr-x	root/root	usr/lib/libkcal_resourceblog.so.4.7.0
+lrwxrwxrwx	root/root	usr/lib/libkcal_resourceblog.so.4 -> libkcal_resourceblog.so.4.8.0
+-rwxr-xr-x	root/root	usr/lib/libkcal_resourceblog.so.4.8.0
 lrwxrwxrwx	root/root	usr/lib/libkcal_resourceremote.so -> libkcal_resourceremote.so.4
-lrwxrwxrwx	root/root	usr/lib/libkcal_resourceremote.so.4 -> libkcal_resourceremote.so.4.7.0
--rwxr-xr-x	root/root	usr/lib/libkcal_resourceremote.so.4.7.0
-lrwxrwxrwx	root/root	usr/lib/libkcalgroupwise.so -> libkcalgroupwise.so.4
-lrwxrwxrwx	root/root	usr/lib/libkcalgroupwise.so.4 -> libkcalgroupwise.so.4.7.0
--rwxr-xr-x	root/root	usr/lib/libkcalgroupwise.so.4.7.0
+lrwxrwxrwx	root/root	usr/lib/libkcal_resourceremote.so.4 -> libkcal_resourceremote.so.4.8.0
+-rwxr-xr-x	root/root	usr/lib/libkcal_resourceremote.so.4.8.0
 lrwxrwxrwx	root/root	usr/lib/libkdepim.so -> libkdepim.so.4
-lrwxrwxrwx	root/root	usr/lib/libkdepim.so.4 -> libkdepim.so.4.7.0
--rwxr-xr-x	root/root	usr/lib/libkdepim.so.4.7.0
+lrwxrwxrwx	root/root	usr/lib/libkdepim.so.4 -> libkdepim.so.4.8.0
+-rwxr-xr-x	root/root	usr/lib/libkdepim.so.4.8.0
 lrwxrwxrwx	root/root	usr/lib/libkdepimdbusinterfaces.so -> libkdepimdbusinterfaces.so.4
-lrwxrwxrwx	root/root	usr/lib/libkdepimdbusinterfaces.so.4 -> libkdepimdbusinterfaces.so.4.7.0
--rwxr-xr-x	root/root	usr/lib/libkdepimdbusinterfaces.so.4.7.0
+lrwxrwxrwx	root/root	usr/lib/libkdepimdbusinterfaces.so.4 -> libkdepimdbusinterfaces.so.4.8.0
+-rwxr-xr-x	root/root	usr/lib/libkdepimdbusinterfaces.so.4.8.0
 lrwxrwxrwx	root/root	usr/lib/libkdepimmobileui.so -> libkdepimmobileui.so.4
-lrwxrwxrwx	root/root	usr/lib/libkdepimmobileui.so.4 -> libkdepimmobileui.so.4.7.0
--rwxr-xr-x	root/root	usr/lib/libkdepimmobileui.so.4.7.0
+lrwxrwxrwx	root/root	usr/lib/libkdepimmobileui.so.4 -> libkdepimmobileui.so.4.8.0
+-rwxr-xr-x	root/root	usr/lib/libkdepimmobileui.so.4.8.0
 lrwxrwxrwx	root/root	usr/lib/libkdgantt2.so -> libkdgantt2.so.0
 lrwxrwxrwx	root/root	usr/lib/libkdgantt2.so.0 -> libkdgantt2.so.0.1.0
 -rwxr-xr-x	root/root	usr/lib/libkdgantt2.so.0.1.0
 lrwxrwxrwx	root/root	usr/lib/libkleo.so -> libkleo.so.4
-lrwxrwxrwx	root/root	usr/lib/libkleo.so.4 -> libkleo.so.4.7.0
--rwxr-xr-x	root/root	usr/lib/libkleo.so.4.7.0
+lrwxrwxrwx	root/root	usr/lib/libkleo.so.4 -> libkleo.so.4.8.0
+-rwxr-xr-x	root/root	usr/lib/libkleo.so.4.8.0
 lrwxrwxrwx	root/root	usr/lib/libkleopatraclientcore.so -> libkleopatraclientcore.so.0
 lrwxrwxrwx	root/root	usr/lib/libkleopatraclientcore.so.0 -> libkleopatraclientcore.so.0.3.0
 -rwxr-xr-x	root/root	usr/lib/libkleopatraclientcore.so.0.3.0
 lrwxrwxrwx	root/root	usr/lib/libkleopatraclientgui.so -> libkleopatraclientgui.so.0
 lrwxrwxrwx	root/root	usr/lib/libkleopatraclientgui.so.0 -> libkleopatraclientgui.so.0.3.0
 -rwxr-xr-x	root/root	usr/lib/libkleopatraclientgui.so.0.3.0
-lrwxrwxrwx	root/root	usr/lib/libkmailprivate.so.4 -> libkmailprivate.so.4.7.0
--rwxr-xr-x	root/root	usr/lib/libkmailprivate.so.4.7.0
+lrwxrwxrwx	root/root	usr/lib/libkmailprivate.so.4 -> libkmailprivate.so.4.8.0
+-rwxr-xr-x	root/root	usr/lib/libkmailprivate.so.4.8.0
 lrwxrwxrwx	root/root	usr/lib/libkmanagesieve.so -> libkmanagesieve.so.4
-lrwxrwxrwx	root/root	usr/lib/libkmanagesieve.so.4 -> libkmanagesieve.so.4.7.0
--rwxr-xr-x	root/root	usr/lib/libkmanagesieve.so.4.7.0
+lrwxrwxrwx	root/root	usr/lib/libkmanagesieve.so.4 -> libkmanagesieve.so.4.8.0
+-rwxr-xr-x	root/root	usr/lib/libkmanagesieve.so.4.8.0
 lrwxrwxrwx	root/root	usr/lib/libknodecommon.so -> libknodecommon.so.4
-lrwxrwxrwx	root/root	usr/lib/libknodecommon.so.4 -> libknodecommon.so.4.7.0
--rwxr-xr-x	root/root	usr/lib/libknodecommon.so.4.7.0
-lrwxrwxrwx	root/root	usr/lib/libkontactprivate.so.4 -> libkontactprivate.so.4.7.0
--rwxr-xr-x	root/root	usr/lib/libkontactprivate.so.4.7.0
+lrwxrwxrwx	root/root	usr/lib/libknodecommon.so.4 -> libknodecommon.so.4.8.0
+-rwxr-xr-x	root/root	usr/lib/libknodecommon.so.4.8.0
+lrwxrwxrwx	root/root	usr/lib/libkontactprivate.so.4 -> libkontactprivate.so.4.8.0
+-rwxr-xr-x	root/root	usr/lib/libkontactprivate.so.4.8.0
 lrwxrwxrwx	root/root	usr/lib/libkorganizer_core.so -> libkorganizer_core.so.4
-lrwxrwxrwx	root/root	usr/lib/libkorganizer_core.so.4 -> libkorganizer_core.so.4.7.0
--rwxr-xr-x	root/root	usr/lib/libkorganizer_core.so.4.7.0
+lrwxrwxrwx	root/root	usr/lib/libkorganizer_core.so.4 -> libkorganizer_core.so.4.8.0
+-rwxr-xr-x	root/root	usr/lib/libkorganizer_core.so.4.8.0
 lrwxrwxrwx	root/root	usr/lib/libkorganizer_interfaces.so -> libkorganizer_interfaces.so.4
-lrwxrwxrwx	root/root	usr/lib/libkorganizer_interfaces.so.4 -> libkorganizer_interfaces.so.4.7.0
--rwxr-xr-x	root/root	usr/lib/libkorganizer_interfaces.so.4.7.0
-lrwxrwxrwx	root/root	usr/lib/libkorganizerprivate.so.4 -> libkorganizerprivate.so.4.7.0
--rwxr-xr-x	root/root	usr/lib/libkorganizerprivate.so.4.7.0
+lrwxrwxrwx	root/root	usr/lib/libkorganizer_interfaces.so.4 -> libkorganizer_interfaces.so.4.8.0
+-rwxr-xr-x	root/root	usr/lib/libkorganizer_interfaces.so.4.8.0
+lrwxrwxrwx	root/root	usr/lib/libkorganizerprivate.so.4 -> libkorganizerprivate.so.4.8.0
+-rwxr-xr-x	root/root	usr/lib/libkorganizerprivate.so.4.8.0
 lrwxrwxrwx	root/root	usr/lib/libkpgp.so -> libkpgp.so.4
-lrwxrwxrwx	root/root	usr/lib/libkpgp.so.4 -> libkpgp.so.4.7.0
--rwxr-xr-x	root/root	usr/lib/libkpgp.so.4.7.0
+lrwxrwxrwx	root/root	usr/lib/libkpgp.so.4 -> libkpgp.so.4.8.0
+-rwxr-xr-x	root/root	usr/lib/libkpgp.so.4.8.0
 lrwxrwxrwx	root/root	usr/lib/libksieve.so -> libksieve.so.4
-lrwxrwxrwx	root/root	usr/lib/libksieve.so.4 -> libksieve.so.4.7.0
--rwxr-xr-x	root/root	usr/lib/libksieve.so.4.7.0
+lrwxrwxrwx	root/root	usr/lib/libksieve.so.4 -> libksieve.so.4.8.0
+-rwxr-xr-x	root/root	usr/lib/libksieve.so.4.8.0
 lrwxrwxrwx	root/root	usr/lib/libksieveui.so -> libksieveui.so.4
-lrwxrwxrwx	root/root	usr/lib/libksieveui.so.4 -> libksieveui.so.4.7.0
--rwxr-xr-x	root/root	usr/lib/libksieveui.so.4.7.0
+lrwxrwxrwx	root/root	usr/lib/libksieveui.so.4 -> libksieveui.so.4.8.0
+-rwxr-xr-x	root/root	usr/lib/libksieveui.so.4.8.0
 lrwxrwxrwx	root/root	usr/lib/libmailcommon.so -> libmailcommon.so.4
-lrwxrwxrwx	root/root	usr/lib/libmailcommon.so.4 -> libmailcommon.so.4.7.0
--rwxr-xr-x	root/root	usr/lib/libmailcommon.so.4.7.0
+lrwxrwxrwx	root/root	usr/lib/libmailcommon.so.4 -> libmailcommon.so.4.8.0
+-rwxr-xr-x	root/root	usr/lib/libmailcommon.so.4.8.0
 lrwxrwxrwx	root/root	usr/lib/libmessagecomposer.so -> libmessagecomposer.so.4
-lrwxrwxrwx	root/root	usr/lib/libmessagecomposer.so.4 -> libmessagecomposer.so.4.7.0
--rwxr-xr-x	root/root	usr/lib/libmessagecomposer.so.4.7.0
+lrwxrwxrwx	root/root	usr/lib/libmessagecomposer.so.4 -> libmessagecomposer.so.4.8.0
+-rwxr-xr-x	root/root	usr/lib/libmessagecomposer.so.4.8.0
 lrwxrwxrwx	root/root	usr/lib/libmessagecore.so -> libmessagecore.so.4
-lrwxrwxrwx	root/root	usr/lib/libmessagecore.so.4 -> libmessagecore.so.4.7.0
--rwxr-xr-x	root/root	usr/lib/libmessagecore.so.4.7.0
+lrwxrwxrwx	root/root	usr/lib/libmessagecore.so.4 -> libmessagecore.so.4.8.0
+-rwxr-xr-x	root/root	usr/lib/libmessagecore.so.4.8.0
 lrwxrwxrwx	root/root	usr/lib/libmessagelist.so -> libmessagelist.so.4
-lrwxrwxrwx	root/root	usr/lib/libmessagelist.so.4 -> libmessagelist.so.4.7.0
--rwxr-xr-x	root/root	usr/lib/libmessagelist.so.4.7.0
+lrwxrwxrwx	root/root	usr/lib/libmessagelist.so.4 -> libmessagelist.so.4.8.0
+-rwxr-xr-x	root/root	usr/lib/libmessagelist.so.4.8.0
 lrwxrwxrwx	root/root	usr/lib/libmessageviewer.so -> libmessageviewer.so.4
-lrwxrwxrwx	root/root	usr/lib/libmessageviewer.so.4 -> libmessageviewer.so.4.7.0
--rwxr-xr-x	root/root	usr/lib/libmessageviewer.so.4.7.0
+lrwxrwxrwx	root/root	usr/lib/libmessageviewer.so.4 -> libmessageviewer.so.4.8.0
+-rwxr-xr-x	root/root	usr/lib/libmessageviewer.so.4.8.0
 lrwxrwxrwx	root/root	usr/lib/libtemplateparser.so -> libtemplateparser.so.4
-lrwxrwxrwx	root/root	usr/lib/libtemplateparser.so.4 -> libtemplateparser.so.4.7.0
--rwxr-xr-x	root/root	usr/lib/libtemplateparser.so.4.7.0
+lrwxrwxrwx	root/root	usr/lib/libtemplateparser.so.4 -> libtemplateparser.so.4.8.0
+-rwxr-xr-x	root/root	usr/lib/libtemplateparser.so.4.8.0
 drwxr-xr-x	root/root	usr/lib/strigi/
 -rwxr-xr-x	root/root	usr/lib/strigi/strigiea_ctg.so
 -rwxr-xr-x	root/root	usr/lib/strigi/strigiea_ics.so
@@ -350,7 +330,7 @@ drwxr-xr-x	root/root	usr/lib/strigi/
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/akonadi/
 drwxr-xr-x	root/root	usr/share/akonadi/agents/
--rw-r--r--	root/root	usr/share/akonadi/agents/nepomukemailfeeder.desktop
+-rw-r--r--	root/root	usr/share/akonadi/agents/mailfilteragent.desktop
 drwxr-xr-x	root/root	usr/share/applications/
 drwxr-xr-x	root/root	usr/share/applications/kde4/
 -rwxr-xr-x	root/root	usr/share/applications/kde4/KMail2.desktop
@@ -360,7 +340,6 @@ drwxr-xr-x	root/root	usr/share/applications/kde4/
 -rwxr-xr-x	root/root	usr/share/applications/kde4/akonadiconsole.desktop
 -rwxr-xr-x	root/root	usr/share/applications/kde4/akregator.desktop
 -rwxr-xr-x	root/root	usr/share/applications/kde4/blogilo.desktop
--rwxr-xr-x	root/root	usr/share/applications/kde4/groupwarewizard.desktop
 -rwxr-xr-x	root/root	usr/share/applications/kde4/kaddressbook-mobile.desktop
 -rwxr-xr-x	root/root	usr/share/applications/kde4/kaddressbook.desktop
 -rwxr-xr-x	root/root	usr/share/applications/kde4/kalarm.desktop
@@ -472,6 +451,8 @@ drwxr-xr-x	root/root	usr/share/apps/kconf_update/
 -rw-r--r--	root/root	usr/share/apps/kconf_update/korganizer.upd
 -rwxr-xr-x	root/root	usr/share/apps/kconf_update/kpgp-3.1-upgrade-address-data.pl
 -rw-r--r--	root/root	usr/share/apps/kconf_update/kpgp.upd
+-rw-r--r--	root/root	usr/share/apps/kconf_update/mailfilteragent.upd
+-rwxr-xr-x	root/root	usr/share/apps/kconf_update/migrate-kmail-filters.pl
 -rwxr-xr-x	root/root	usr/share/apps/kconf_update/upgrade-signature.pl
 -rwxr-xr-x	root/root	usr/share/apps/kconf_update/upgrade-transport.pl
 drwxr-xr-x	root/root	usr/share/apps/kdepimwidgets/
@@ -528,8 +509,6 @@ drwxr-xr-x	root/root	usr/share/apps/kmail-mobile/
 -rw-r--r--	root/root	usr/share/apps/kmail-mobile/SnippetsList.qml
 -rw-r--r--	root/root	usr/share/apps/kmail-mobile/VacationScriptIndicator.qml
 -rw-r--r--	root/root	usr/share/apps/kmail-mobile/add-attachment-button.png
--rw-r--r--	root/root	usr/share/apps/kmail-mobile/dividing-line-horizontal.png
--rw-r--r--	root/root	usr/share/apps/kmail-mobile/dividing-line.png
 -rw-r--r--	root/root	usr/share/apps/kmail-mobile/kmail-composer.qml
 -rw-r--r--	root/root	usr/share/apps/kmail-mobile/kmail-mobile-background.png
 -rw-r--r--	root/root	usr/share/apps/kmail-mobile/kmail-mobile.notifyrc
@@ -539,26 +518,27 @@ drwxr-xr-x	root/root	usr/share/apps/kmail-mobile/
 -rw-r--r--	root/root	usr/share/apps/kmail-mobile/toggle-encryption-button.png
 -rw-r--r--	root/root	usr/share/apps/kmail-mobile/toggle-signature-button.png
 drwxr-xr-x	root/root	usr/share/apps/kmail/
-drwxr-xr-x	root/root	usr/share/apps/kmail/about/
--rw-r--r--	root/root	usr/share/apps/kmail/about/kmail.css
--rw-r--r--	root/root	usr/share/apps/kmail/about/main.html
--rw-r--r--	root/root	usr/share/apps/kmail/about/top-left-kmail.png
 drwxr-xr-x	root/root	usr/share/apps/kmail/pics/
 -rw-r--r--	root/root	usr/share/apps/kmail/pics/key.png
 -rw-r--r--	root/root	usr/share/apps/kmail/pics/key_bad.png
 -rw-r--r--	root/root	usr/share/apps/kmail/pics/key_ok.png
 -rw-r--r--	root/root	usr/share/apps/kmail/pics/key_unknown.png
--rw-r--r--	root/root	usr/share/apps/kmail/pics/kmwizard.png
--rw-r--r--	root/root	usr/share/apps/kmail/pics/mail-deleted.png
--rw-r--r--	root/root	usr/share/apps/kmail/pics/mail-thread-ignored.png
--rw-r--r--	root/root	usr/share/apps/kmail/pics/mail-thread-watch.png
--rw-r--r--	root/root	usr/share/apps/kmail/pics/pgp-keys.png
 drwxr-xr-x	root/root	usr/share/apps/kmail2/
+drwxr-xr-x	root/root	usr/share/apps/kmail2/about/
+-rw-r--r--	root/root	usr/share/apps/kmail2/about/kmail.css
+-rw-r--r--	root/root	usr/share/apps/kmail2/about/main.html
+-rw-r--r--	root/root	usr/share/apps/kmail2/about/top-left-kmail.png
 -rw-r--r--	root/root	usr/share/apps/kmail2/kmail2.notifyrc
 -rw-r--r--	root/root	usr/share/apps/kmail2/kmail_part.rc
 -rw-r--r--	root/root	usr/share/apps/kmail2/kmcomposerui.rc
 -rw-r--r--	root/root	usr/share/apps/kmail2/kmmainwin.rc
 -rw-r--r--	root/root	usr/share/apps/kmail2/kmreadermainwin.rc
+drwxr-xr-x	root/root	usr/share/apps/kmail2/pics/
+-rw-r--r--	root/root	usr/share/apps/kmail2/pics/kmwizard.png
+-rw-r--r--	root/root	usr/share/apps/kmail2/pics/mail-deleted.png
+-rw-r--r--	root/root	usr/share/apps/kmail2/pics/mail-thread-ignored.png
+-rw-r--r--	root/root	usr/share/apps/kmail2/pics/mail-thread-watch.png
+-rw-r--r--	root/root	usr/share/apps/kmail2/pics/pgp-keys.png
 -rw-r--r--	root/root	usr/share/apps/kmail2/tips
 drwxr-xr-x	root/root	usr/share/apps/kmailcvt/
 drwxr-xr-x	root/root	usr/share/apps/kmailcvt/pics/
@@ -788,6 +768,7 @@ drwxr-xr-x	root/root	usr/share/apps/messageviewer/plugins/bodypartformatter/
 -rw-r--r--	root/root	usr/share/apps/messageviewer/plugins/bodypartformatter/text_vcard.desktop
 -rw-r--r--	root/root	usr/share/apps/messageviewer/plugins/bodypartformatter/text_xdiff.desktop
 drwxr-xr-x	root/root	usr/share/apps/mobileui/
+-rw-r--r--	root/root	usr/share/apps/mobileui/ScreenFunctions.js
 -rw-r--r--	root/root	usr/share/apps/mobileui/add-button.png
 -rw-r--r--	root/root	usr/share/apps/mobileui/back-to-list-button.png
 -rw-r--r--	root/root	usr/share/apps/mobileui/built-on-the-kde-platform.png
@@ -821,7 +802,6 @@ drwxr-xr-x	root/root	usr/share/config.kcfg/
 -rw-r--r--	root/root	usr/share/config.kcfg/akregator.kcfg
 -rw-r--r--	root/root	usr/share/config.kcfg/blogilo.kcfg
 -rw-r--r--	root/root	usr/share/config.kcfg/customtemplates_kfg.kcfg
--rw-r--r--	root/root	usr/share/config.kcfg/groupwise.kcfg
 -rw-r--r--	root/root	usr/share/config.kcfg/kalarmconfig.kcfg
 -rw-r--r--	root/root	usr/share/config.kcfg/kjots.kcfg
 -rw-r--r--	root/root	usr/share/config.kcfg/kmail.kcfg
@@ -1296,8 +1276,6 @@ drwxr-xr-x	root/root	usr/share/kde4/services/ServiceMenus/
 -rw-r--r--	root/root	usr/share/kde4/services/akregator_part.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/akregator_sharemicroblog_plugin.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/feed.protocol
--rw-r--r--	root/root	usr/share/kde4/services/groupwise.protocol
--rw-r--r--	root/root	usr/share/kde4/services/groupwises.protocol
 -rw-r--r--	root/root	usr/share/kde4/services/kaddressbookpart.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/kcm_kpimidentities.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/kcmapptsummary.desktop
@@ -1367,16 +1345,8 @@ drwxr-xr-x	root/root	usr/share/kde4/services/korganizer/
 -rw-r--r--	root/root	usr/share/kde4/services/korganizer_configviews.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/korganizer_part.desktop
 drwxr-xr-x	root/root	usr/share/kde4/services/kresources/
-drwxr-xr-x	root/root	usr/share/kde4/services/kresources/alarms/
--rw-r--r--	root/root	usr/share/kde4/services/kresources/alarms/local.desktop
--rw-r--r--	root/root	usr/share/kde4/services/kresources/alarms/localdir.desktop
--rw-r--r--	root/root	usr/share/kde4/services/kresources/alarms/remote.desktop
-drwxr-xr-x	root/root	usr/share/kde4/services/kresources/kabc/
--rw-r--r--	root/root	usr/share/kde4/services/kresources/kabc/kabc_groupwise.desktop
--rw-r--r--	root/root	usr/share/kde4/services/kresources/kalarm_manager.desktop
 drwxr-xr-x	root/root	usr/share/kde4/services/kresources/kcal/
 -rw-r--r--	root/root	usr/share/kde4/services/kresources/kcal/blog.desktop
--rw-r--r--	root/root	usr/share/kde4/services/kresources/kcal/kcal_groupwise.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/kresources/kcal/remote.desktop
 drwxr-xr-x	root/root	usr/share/kde4/services/kresources/knotes/
 -rw-r--r--	root/root	usr/share/kde4/services/kresources/knotes/local.desktop
diff --git a/kdepim/.md5sum.i686 b/kdepim/.md5sum.i686
index ad8abc6ea..b7c6f9a72 100644
--- a/kdepim/.md5sum.i686
+++ b/kdepim/.md5sum.i686
@@ -1 +1 @@
-fd197859ad0f3c55a175133c2a7b6c47  kdepim-4.7.4.tar.bz2
+502216fe546ee87b7bb66f2da5599417  kdepim-4.8.0.tar.bz2
diff --git a/kdepim/.md5sum.x86_64 b/kdepim/.md5sum.x86_64
index ad8abc6ea..b7c6f9a72 100644
--- a/kdepim/.md5sum.x86_64
+++ b/kdepim/.md5sum.x86_64
@@ -1 +1 @@
-fd197859ad0f3c55a175133c2a7b6c47  kdepim-4.7.4.tar.bz2
+502216fe546ee87b7bb66f2da5599417  kdepim-4.8.0.tar.bz2
diff --git a/kdepim/Pkgfile b/kdepim/Pkgfile
index 6f1a6f497..1bae5e7d6 100755
--- a/kdepim/Pkgfile
+++ b/kdepim/Pkgfile
@@ -6,7 +6,7 @@
 # Run on: kdelibs,kdepimlibs
 
 name=kdepim
-version=4.7.4
+version=4.8.0
 release=1
 
 source=( ftp://ftp.kde.org/pub/kde/stable/$version/src/$name-$version.tar.bz2)
diff --git a/kdepim/README b/kdepim/README
new file mode 100644
index 000000000..f53eaa948
--- /dev/null
+++ b/kdepim/README
@@ -0,0 +1,10 @@
+Si au lancement de kamil vous obtenez l'erreur suivante :
+
+KMail a rencontré une erreur fatale et va s'arrêter maintenant.
+L'erreur est :
+Échec de la récupération de la collection de la ressource.
+
+
+Il suffit de faire : 
+
+rm ~/.config/akonadi/*