KDE/FreeBSD team presents KDE SC 4.14.2 and KDE Workspace 4.11.13!

USE_KDE4=kdehier component has been deprecated, new components added:
 baloo			- Baloo core libraries
 baloo-widgets		- Baloo widgets library
 kfilemetadata		- KDE library for extracting file metadata

New ports:
  graphics/kqtquickcharts	- QtQuick plugin to render interactive charts
  misc/artikulate		- Pronunciation trainer for KDE
				(not usable currently, links to both
				GStreamer 1.x and 0.10.x via dependencies)
  sysutils/baloo[-widgets]	- KDE framework for searching and
				managing user metadata
  sysutils/kfilemetadata	- Library for extracting file metadata

l10n ports:
- Farsi (Persian) and Indonesian translations has been readded
- Vietnamese didn't pass threshold for inclusion into release

astro/kstars:
- switch dependency from math/eigen2 to math/eigen3
- add PYKDE option for updating supernovae data

deskutils/kdepim4:
- update dependencies: add libkgapi and baloo,
  remove now needless clucene, link-grammar, strigi
- add patch to fix build with gcc42
- update COMMENT and description for all KDE PIM ports

devel/ruby-krossruby:
- remove BROKEN, it builds with ruby 2.x now

editors/kate:
- add patch to disable memory-hungry build of the kate tests [1]

graphics/okular:
- add dependency on graphics/libkscreen

math/cantor:
- add optional dependency on lang/luajit for LuaJIT backend
- fix gfortran detection [2]

misc/kdehier4:
- adapt to new pkg world. Now the purpose of kdehier4 only
  to link some stuff between KDE4_PREFIX and LOCALBASE.

science/kalzium:
- switch dependency from math/eigen2 to math/eigen3
- add dependence on science/chemical-mime-data

x11-themes/kdeartwork4
- switch dependency from math/eigen2 to math/eigen3

among other changes:
- drop deprecated USE_KDE4=kdehier
- drop @dirrm from plist
- clean up pkg-descr
- convert to options helpers
- other portlint fixes

The area51 repository features commits by alonso, rakuco and myself.

PR:		187150 [1]
Reported by:	pe.freethread@live.com
Patch by:	Tobias Berner <tcberner@gmail.com>

PR:		180674 [2]
Reported by:	torsten.eichstaedt@web.de

PR:		194316
Exp-run:	antoine

10 files changed, 90 insertions, 312 deletions

diff --git a/deskutils/kdepim4/Makefile b/deskutils/kdepim4/Makefile
index 48c8e7814eb5..d9e1b9b76ebf 100644
--- a/deskutils/kdepim4/Makefile
+++ b/deskutils/kdepim4/Makefile
@@ -3,33 +3,31 @@
 
 PORTNAME=	kdepim
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	3
 CATEGORIES=	deskutils kde
 MASTER_SITES=	KDE/${KDE4_BRANCH}/${PORTVERSION}/src
 DIST_SUBDIR=	KDE/${PORTVERSION}
 
 MAINTAINER=	kde@FreeBSD.org
-COMMENT=	Libraries for KDE-PIM applications
+COMMENT=	KDE PIM applications
 
 LIB_DEPENDS=	libgpgme.so:${PORTSDIR}/security/gpgme \
 		libassuan.so:${PORTSDIR}/security/libassuan \
 		libsasl2.so:${PORTSDIR}/security/cyrus-sasl2 \
 		libboost_thread.so:${PORTSDIR}/devel/boost-libs \
 		libgrantlee_gui.so:${PORTSDIR}/devel/grantlee \
-		libclucene-core.so:${PORTSDIR}/textproc/clucene \
-		liblink-grammar.so:${PORTSDIR}/textproc/link-grammar
+		libkgapi2.so:${PORTSDIR}/devel/libkgapi
 RUN_DEPENDS=	${KDE4_PREFIX}/bin/accountwizard:${PORTSDIR}/deskutils/kdepim4-runtime \
 		${LOCALBASE}/bin/gmd5sum:${PORTSDIR}/sysutils/coreutils
 
 CONFLICTS_INSTALL=	kdepim44-4.*
 
 USE_GNOME=	libxml2 libxslt:build
-USE_KDE4=	kdehier kdelibs kdeprefix pimlibs kactivities \
-		akonadi automoc4 ontologies soprano strigi nepomuk-widgets
+USE_KDE4=	kdelibs kdeprefix pimlibs kactivities \
+		akonadi automoc4 soprano nepomuk-widgets baloo
 USES=		cmake:outsource gmake iconv tar:xz
 USE_OPENLDAP=	yes
 USE_QT4=	corelib dbus declarative designer_build gui network opengl \
-		script sql webkit \
+		qt3support script sql webkit xml \
 		qmake_build moc_build rcc_build uic_build
 USE_XORG=	x11 xscrnsaver
 CMAKE_ARGS+=	-DKDEPIM_BUILD_MOBILE:BOOL=FALSE
@@ -39,6 +37,11 @@ CXXFLAGS+=	-Wno-error=return-type
 USE_LDCONFIG=	yes
 MAKE_ENV=	XDG_CONFIG_HOME=/dev/null
 
-PLIST_SUB=	GRANTLEE_VER=0.4
+PLIST_SUB=	GRANTLEE_VER=0.5
+
+post-patch:
+# Remove BOM
+	${REINPLACE_CMD} -e '1 s|^.*/|/|g' \
+		${WRKSRC}/knotes/configdialog/knotecollectionconfigwidget.cpp
 
 .include <bsd.port.mk>
diff --git a/deskutils/kdepim4/distinfo b/deskutils/kdepim4/distinfo
index b22080fd32e1..0915bd7d34aa 100644
--- a/deskutils/kdepim4/distinfo
+++ b/deskutils/kdepim4/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/4.12.5/kdepim-4.12.5.tar.xz) = 5e26dc33b5d36eb305a24a834b153515990ea8a501498b63ee10103df94c6ff0
-SIZE (KDE/4.12.5/kdepim-4.12.5.tar.xz) = 14259060
+SHA256 (KDE/4.14.2/kdepim-4.14.2.tar.xz) = c5ad234c524537b4b29daa323c2fde424e3e4c910ce769db5789632d4b46906b
+SIZE (KDE/4.14.2/kdepim-4.14.2.tar.xz) = 14468416
diff --git a/deskutils/kdepim4/files/patch-blogilo__src__blogger.h b/deskutils/kdepim4/files/patch-blogilo__src__blogger.h
new file mode 100644
index 000000000000..5ee4abe895e5
--- /dev/null
+++ b/deskutils/kdepim4/files/patch-blogilo__src__blogger.h
@@ -0,0 +1,11 @@
+--- blogilo/src/blogger.h.orig	2014-09-11 21:23:20 UTC
++++ blogilo/src/blogger.h
+@@ -93,7 +93,7 @@
+                       signal emitted after previous authenticate() call.
+       @see authenticated(QMap\<QString,QString\>)
+     */
+-    void authenticate(const QMap<QString, QString> &authData = QMap<QString, QString>());
++    void authenticate(const QMap<QString, QString> &authData = (QMap<QString, QString>()));
+ 
+     /**
+       Sets Google OAuth application API key.
diff --git a/deskutils/kdepim4/files/patch-grantleetheme__grantleethememanager.cpp b/deskutils/kdepim4/files/patch-grantleetheme__grantleethememanager.cpp
deleted file mode 100644
index 55716c1d3ac9..000000000000
--- a/deskutils/kdepim4/files/patch-grantleetheme__grantleethememanager.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-commit 8c64e00460a173141d69624cb36fca19801405b4
-Author: Raphael Kubo da Costa <rakuco@FreeBSD.org>
-Date:   Sun May 4 23:33:29 2014 +0300
-
-    Stop needlessly calling KDirWatch::stopScan().
-    
-    Not only should the call be unnecessary, but it also causes an infinite
-    loop when KDirWatch is set to use QFileSystemWatcher: the
-    KDirWatch::stopScan()/addDir()/startScan() combination makes the slot
-    where they're called end up being infinitely triggered.
-    
-    Discussed with dfaure.
-    
-    REVIEW:		117993
-
---- grantleetheme/grantleethememanager.cpp
-+++ grantleetheme/grantleethememanager.cpp
-@@ -95,7 +95,6 @@ public:
-     void updateThemesPath()
-     {
-         if ( !themesDirectories.isEmpty() ) {
--            watch->stopScan();
-             Q_FOREACH (const QString &directory, themesDirectories) {
-                 watch->removeDir( directory );
-             }
diff --git a/deskutils/kdepim4/files/patch-kleopatra__models__keylistmodel.cpp b/deskutils/kdepim4/files/patch-kleopatra__models__keylistmodel.cpp
deleted file mode 100644
index a53c01bc1895..000000000000
--- a/deskutils/kdepim4/files/patch-kleopatra__models__keylistmodel.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
---- kleopatra/models/keylistmodel.cpp
-+++ kleopatra/models/keylistmodel.cpp
-@@ -73,7 +73,7 @@
- #include <iterator>
- #include <cassert>
- 
--#ifdef __GNUC__
-+#ifdef __GLIBCXX__
- #include <ext/algorithm> // for is_sorted
- #endif
- 
-@@ -460,7 +460,7 @@ QModelIndex FlatKeyListModel::doMapFromKey( const Key & key, int col ) const {
- }
- 
- QList<QModelIndex> FlatKeyListModel::doAddKeys( const std::vector<Key> & keys ) {
--#ifdef __GNUC__
-+#ifdef __GLIBCXX__
-     assert( __gnu_cxx::is_sorted( keys.begin(), keys.end(), _detail::ByFingerprint<std::less>() ) );
- #endif
-     if ( keys.empty() )
-@@ -717,7 +717,7 @@ static std::vector<Key> topological_sort( const std::vector<Key> & keys ) {
- }
- 
- QList<QModelIndex> HierarchicalKeyListModel::doAddKeys( const std::vector<Key> & keys ) {
--#ifdef __GNUC__
-+#ifdef __GLIBCXX__
-     assert( __gnu_cxx::is_sorted( keys.begin(), keys.end(), _detail::ByFingerprint<std::less>() ) );
- #endif
-     if ( keys.empty() )
diff --git a/deskutils/kdepim4/files/patch-kleopatra__uiserver__assuanserverconnection.cpp b/deskutils/kdepim4/files/patch-kleopatra__uiserver__assuanserverconnection.cpp
deleted file mode 100644
index 0a97de117e40..000000000000
--- a/deskutils/kdepim4/files/patch-kleopatra__uiserver__assuanserverconnection.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- kleopatra/uiserver/assuanserverconnection.cpp
-+++ kleopatra/uiserver/assuanserverconnection.cpp
-@@ -96,7 +96,7 @@
- 
- #include <errno.h>
- 
--#ifdef __GNUC__
-+#ifdef __GLIBCXX__
- # include <ext/algorithm> // for is_sorted
- #endif
- 
-@@ -827,7 +827,7 @@ AssuanServerConnection::Private::Private( assuan_fd_t fd_, const std::vector< sh
-       sessionId( 0 ),
-       factories( factories_ )
- {
--#ifdef __GNUC__
-+#ifdef __GLIBCXX__
-     assert( __gnu_cxx::is_sorted( factories_.begin(), factories_.end(), _detail::ByName<std::less>() ) );
- #endif
- 
diff --git a/deskutils/kdepim4/files/patch-kleopatra__utils__classify.cpp b/deskutils/kdepim4/files/patch-kleopatra__utils__classify.cpp
deleted file mode 100644
index a794cf62bb70..000000000000
--- a/deskutils/kdepim4/files/patch-kleopatra__utils__classify.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
---- kleopatra/utils/classify.cpp
-+++ kleopatra/utils/classify.cpp
-@@ -43,7 +43,7 @@
- 
- #include <boost/range.hpp>
- 
--#ifdef __GNUC__
-+#ifdef __GLIBCXX__
- # include <ext/algorithm>
- #endif
- 
-@@ -150,7 +150,7 @@ unsigned int Kleo::classify( const QStringList & fileNames ) {
- }
- 
- unsigned int Kleo::classify( const QString & filename ) {
--#ifdef __GNUC__
-+#ifdef __GLIBCXX__
-     assert( __gnu_cxx::is_sorted( begin( classifications ), end( classifications ), ByExtension<std::less>() ) );
- #endif
- 
-@@ -179,7 +179,7 @@ unsigned int Kleo::classify( const QString & filename ) {
- }
- 
- unsigned int Kleo::classifyContent( const QByteArray & data ) {
--#ifdef __GNUC__
-+#ifdef __GLIBCXX__
-     assert( __gnu_cxx::is_sorted( begin( content_classifications ), end( content_classifications ), ByContent<std::less>(100) ) );
- #endif
- 
diff --git a/deskutils/kdepim4/files/patch-pimsettingexporter__mail__exportmailjob.h b/deskutils/kdepim4/files/patch-pimsettingexporter__mail__exportmailjob.h
deleted file mode 100644
index 3244820bf8bf..000000000000
--- a/deskutils/kdepim4/files/patch-pimsettingexporter__mail__exportmailjob.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- pimsettingexporter/mail/exportmailjob.h.orig	2013-08-14 09:58:28.333460897 +0000
-+++ pimsettingexporter/mail/exportmailjob.h	2013-08-14 10:01:42.142460369 +0000
-@@ -18,6 +18,8 @@
- #ifndef ExportMailJob_H
- #define ExportMailJob_H
- 
-+#include <time.h>
-+
- #include "abstractimportexportjob.h"
- #include <KSharedConfig>
- class KUrl;
diff --git a/deskutils/kdepim4/pkg-descr b/deskutils/kdepim4/pkg-descr
index a28514b796a4..5d13557c3d47 100644
--- a/deskutils/kdepim4/pkg-descr
+++ b/deskutils/kdepim4/pkg-descr
@@ -1,8 +1,16 @@
-KDE4 is the K Desktop Environment for Unix, Windows, and Mac OS X.
+KDE Personal Information Management suite.
 
-These kde4 ports intend to provide early access to KDE4 for FreeBSD
-developers, porters and beta testers. Use at your own risk!
-
-This package provides PIM applications for KDE4.
+blogio - The KDE blogging client
+kaddressbook - Keeps your addresses on file
+akregator - Feed reader
+kalarm - A personal alarm message, command and email scheduler
+kjots - A note taker
+kleopatra - KDE Key Manager
+kmail - Fully featured Email client
+knode - KDE News (Usenet) reader
+knotes - Popup notes
+kontact - Brings together all the KDE PIM applications under one roof
+korganizer - KDE Calendar and scheduling
+ktimetracker - time tracker
 
 WWW: http://www.kde.org/
diff --git a/deskutils/kdepim4/pkg-plist b/deskutils/kdepim4/pkg-plist
index 54683a717650..ed69ca5d8b78 100644
--- a/deskutils/kdepim4/pkg-plist
+++ b/deskutils/kdepim4/pkg-plist
@@ -1,6 +1,7 @@
 bin/akonadi_archivemail_agent
-bin/akonadi_folderarchive_agent
+bin/akonadi_followupreminder_agent
 bin/akonadi_mailfilter_agent
+bin/akonadi_notes_agent
 bin/akonadi_sendlater_agent
 bin/akonadiconsole
 bin/akregator
@@ -39,6 +40,8 @@ bin/ktnef
 bin/kwatchgnupg
 bin/mboximporter
 bin/pimsettingexporter
+bin/sieveeditor
+bin/storageservicemanager
 etc/dbus-1/system.d/org.kde.kalarmrtcwake.conf
 lib/akonadi/contact/editorpageplugins/cryptopageplugin.so
 lib/kde4/akregator_config_advanced.so
@@ -50,7 +53,6 @@ lib/kde4/akregator_config_sharemicroblog.so
 lib/kde4/akregator_mk4storage_plugin.so
 lib/kde4/akregator_sharemicroblog_plugin.so
 lib/kde4/akregatorpart.so
-lib/kde4/grammar_link.so
 lib/kde4/kaddressbookpart.so
 lib/kde4/kcal_blog.so
 lib/kde4/kcal_remote.so
@@ -61,19 +63,18 @@ lib/kde4/kcm_kmail.so
 lib/kde4/kcm_kmailsummary.so
 lib/kde4/kcm_knode.so
 lib/kde4/kcm_knote.so
+lib/kde4/kcm_knotessummary.so
 lib/kde4/kcm_kontact.so
 lib/kde4/kcm_kontactsummary.so
 lib/kde4/kcm_korganizer.so
 lib/kde4/kcm_kpimidentities.so
 lib/kde4/kcm_ktimetracker.so
 lib/kde4/kcm_ldap.so
-lib/kde4/kcm_pimactivity.so
 lib/kde4/kcm_sdsummary.so
 lib/kde4/kcm_todosummary.so
 lib/kde4/kjotspart.so
 lib/kde4/kmailpart.so
 lib/kde4/knodepart.so
-lib/kde4/knotes_local.so
 lib/kde4/kontact_akregatorplugin.so
 lib/kde4/kontact_journalplugin.so
 lib/kde4/kontact_kaddressbookplugin.so
@@ -87,10 +88,8 @@ lib/kde4/kontact_summaryplugin.so
 lib/kde4/kontact_todoplugin.so
 lib/kde4/korg_datenums.so
 lib/kde4/korg_hebrew.so
-lib/kde4/korg_journalprint.so
 lib/kde4/korg_picoftheday.so
 lib/kde4/korg_thisdayinhistory.so
-lib/kde4/korg_yearprint.so
 lib/kde4/korganizerpart.so
 lib/kde4/ktexteditorkabcbridge.so
 lib/kde4/ktimetrackerpart.so
@@ -123,12 +122,9 @@ lib/libcomposereditorng.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libeventviews.so
 lib/libeventviews.so.4
 lib/libeventviews.so.%%KDE4_GENERIC_LIB_VERSION%%
-lib/libfolderarchive.so
-lib/libfolderarchive.so.4
-lib/libfolderarchive.so.%%KDE4_GENERIC_LIB_VERSION%%
-lib/libgrammar.so
-lib/libgrammar.so.4
-lib/libgrammar.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libfollowupreminder.so
+lib/libfollowupreminder.so.4
+lib/libfollowupreminder.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libgrantleetheme.so
 lib/libgrantleetheme.so.4
 lib/libgrantleetheme.so.%%KDE4_GENERIC_LIB_VERSION%%
@@ -216,9 +212,9 @@ lib/libmessagelist.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libmessageviewer.so
 lib/libmessageviewer.so.4
 lib/libmessageviewer.so.%%KDE4_GENERIC_LIB_VERSION%%
-lib/libpimactivity.so
-lib/libpimactivity.so.4
-lib/libpimactivity.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libnoteshared.so
+lib/libnoteshared.so.4
+lib/libnoteshared.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libpimcommon.so
 lib/libpimcommon.so.4
 lib/libpimcommon.so.%%KDE4_GENERIC_LIB_VERSION%%
@@ -231,7 +227,9 @@ lib/libtemplateparser.so.%%KDE4_GENERIC_LIB_VERSION%%
 man/man1/kabcclient.1.gz
 share/akonadi/agents/archivemailagent.desktop
 share/akonadi/agents/folderarchiveagent.desktop
+share/akonadi/agents/followupreminder.desktop
 share/akonadi/agents/mailfilteragent.desktop
+share/akonadi/agents/notesagent.desktop
 share/akonadi/agents/sendlateragent.desktop
 share/applications/kde4/KMail2.desktop
 share/applications/kde4/KNode.desktop
@@ -243,6 +241,7 @@ share/applications/kde4/blogilo.desktop
 share/applications/kde4/contactthemeeditor.desktop
 share/applications/kde4/headerthemeeditor.desktop
 share/applications/kde4/importwizard.desktop
+share/applications/kde4/kaddressbook-importer.desktop
 share/applications/kde4/kaddressbook.desktop
 share/applications/kde4/kalarm.desktop
 share/applications/kde4/kleopatra.desktop
@@ -256,9 +255,13 @@ share/applications/kde4/korganizer.desktop
 share/applications/kde4/ktimetracker.desktop
 share/applications/kde4/ktnef.desktop
 share/applications/kde4/mboximporter.desktop
+share/applications/kde4/pimsettingexporter.desktop
+share/applications/kde4/sieveeditor.desktop
+share/applications/kde4/storageservicemanager.desktop
 share/apps/akonadi_archivemail_agent/akonadi_archivemail_agent.notifyrc
-share/apps/akonadi_folderarchive_agent/akonadi_folderarchive_agent.notifyrc
+share/apps/akonadi_followupreminder_agent/akonadi_followupreminder_agent.notifyrc
 share/apps/akonadi_mailfilter_agent/akonadi_mailfilter_agent.notifyrc
+share/apps/akonadi_notes_agent/akonadi_notes_agent.notifyrc
 share/apps/akonadi_sendlater_agent/akonadi_sendlater_agent.notifyrc
 share/apps/akonadiconsole/akonadiconsoleui.rc
 share/apps/akregator/about/akregator.css
@@ -286,6 +289,8 @@ share/apps/kaddressbook/printing/themes/big-theme-example/theme.desktop
 share/apps/kaddressbook/printing/themes/big-theme-example/theme.html
 share/apps/kaddressbook/printing/themes/default/theme.desktop
 share/apps/kaddressbook/printing/themes/default/theme.html
+share/apps/kaddressbook/printing/themes/full/theme.desktop
+share/apps/kaddressbook/printing/themes/full/theme.html
 share/apps/kaddressbook/viewertemplates/default/contact.html
 share/apps/kaddressbook/viewertemplates/default/contact_embedded.html
 share/apps/kaddressbook/viewertemplates/default/contact_row.html
@@ -335,6 +340,7 @@ share/apps/kconf_update/kpgp-3.1-upgrade-address-data.pl
 share/apps/kconf_update/kpgp.upd
 share/apps/kconf_update/mailfilteragent.upd
 share/apps/kconf_update/migrate-kmail-filters.pl
+share/apps/kconf_update/noteglobalsettings.upd
 share/apps/kconf_update/upgrade-signature.pl
 share/apps/kconf_update/upgrade-transport.pl
 share/apps/kdepimwidgets/pics/addresseelineedit.png
@@ -412,7 +418,8 @@ share/apps/knode/pics/snderr.png
 share/apps/knotes/knotes_part.rc
 share/apps/knotes/knotesappui.rc
 share/apps/knotes/knotesui.rc
-share/apps/knotes/print/themes/TODO
+share/apps/knotes/print/themes/background-color/theme.desktop
+share/apps/knotes/print/themes/background-color/theme.html
 share/apps/knotes/print/themes/big-title/theme.desktop
 share/apps/knotes/print/themes/big-title/theme.html
 share/apps/knotes/print/themes/default/theme.desktop
@@ -539,6 +546,11 @@ share/apps/messageviewer/themes/example_fancy/header.desktop
 share/apps/messageviewer/themes/example_fancy/header.html
 share/apps/pimsettingexporter/backup-structure.txt
 share/apps/pimsettingexporter/pimsettingexporter.rc
+share/apps/sieve/scripts/copy/template.desktop
+share/apps/sieve/scripts/copy/template.txt
+share/apps/sieveeditor/sieveeditorui.rc
+share/apps/storageservicemanager/storageservicemanager.notifyrc
+share/apps/storageservicemanager/storageservicemanagerui.rc
 share/autostart/kalarm.autostart.desktop
 share/autostart/korgac.desktop
 share/config.kcfg/akregator.kcfg
@@ -547,7 +559,6 @@ share/config.kcfg/customtemplates_kfg.kcfg
 share/config.kcfg/kalarmconfig.kcfg
 share/config.kcfg/kjots.kcfg
 share/config.kcfg/kmail.kcfg
-share/config.kcfg/knoteconfig.kcfg
 share/config.kcfg/knotesglobalconfig.kcfg
 share/config.kcfg/kontact.kcfg
 share/config.kcfg/korganizer.kcfg
@@ -555,6 +566,7 @@ share/config.kcfg/templatesconfiguration_kfg.kcfg
 share/config/kaddressbook_themes.knsrc
 share/config/kmail.antispamrc
 share/config/kmail.antivirusrc
+share/config/knotes_printing_theme.knsrc
 share/config/korganizer.knsrc
 share/config/ksieve_script.knsrc
 share/config/libkleopatrarc
@@ -578,10 +590,12 @@ share/doc/HTML/en/akonadi_archivemail_agent/common
 share/doc/HTML/en/akonadi_archivemail_agent/configure-archive-mail-agent.png
 share/doc/HTML/en/akonadi_archivemail_agent/index.cache.bz2
 share/doc/HTML/en/akonadi_archivemail_agent/index.docbook
-share/doc/HTML/en/akonadi_folderarchive_agent/common
-share/doc/HTML/en/akonadi_folderarchive_agent/folderarchiveagent.png
-share/doc/HTML/en/akonadi_folderarchive_agent/index.cache.bz2
-share/doc/HTML/en/akonadi_folderarchive_agent/index.docbook
+share/doc/HTML/en/akonadi_followupreminder_agent/common
+share/doc/HTML/en/akonadi_followupreminder_agent/index.cache.bz2
+share/doc/HTML/en/akonadi_followupreminder_agent/index.docbook
+share/doc/HTML/en/akonadi_notes_agent/common
+share/doc/HTML/en/akonadi_notes_agent/index.cache.bz2
+share/doc/HTML/en/akonadi_notes_agent/index.docbook
 share/doc/HTML/en/akonadi_sendlater_agent/common
 share/doc/HTML/en/akonadi_sendlater_agent/index.cache.bz2
 share/doc/HTML/en/akonadi_sendlater_agent/index.docbook
@@ -620,6 +634,9 @@ share/doc/HTML/en/blogilo/toolbox-1.png
 share/doc/HTML/en/blogilo/toolbox-2.png
 share/doc/HTML/en/blogilo/toolbox-3.png
 share/doc/HTML/en/blogilo/toolbox-4.png
+share/doc/HTML/en/contactthemeeditor/common
+share/doc/HTML/en/contactthemeeditor/index.cache.bz2
+share/doc/HTML/en/contactthemeeditor/index.docbook
 share/doc/HTML/en/headerthemeeditor/common
 share/doc/HTML/en/headerthemeeditor/index.cache.bz2
 share/doc/HTML/en/headerthemeeditor/index.docbook
@@ -825,6 +842,9 @@ share/doc/HTML/en/pimsettingexporter/common
 share/doc/HTML/en/pimsettingexporter/index.cache.bz2
 share/doc/HTML/en/pimsettingexporter/index.docbook
 share/doc/HTML/en/pimsettingexporter/pimsettingexporter.png
+share/doc/HTML/en/sieveeditor/common
+share/doc/HTML/en/sieveeditor/index.cache.bz2
+share/doc/HTML/en/sieveeditor/index.docbook
 share/icons/hicolor/128x128/actions/upload-media.png
 share/icons/hicolor/128x128/apps/akonadiconsole.png
 share/icons/hicolor/128x128/apps/akregator.png
@@ -858,6 +878,8 @@ share/icons/hicolor/16x16/apps/akregator_empty.png
 share/icons/hicolor/16x16/apps/blogilo.png
 share/icons/hicolor/16x16/apps/kaddressbook.png
 share/icons/hicolor/16x16/apps/kalarm.png
+share/icons/hicolor/16x16/apps/kdepim-dropbox.png
+share/icons/hicolor/16x16/apps/kdepim-googledrive.png
 share/icons/hicolor/16x16/apps/kjots.png
 share/icons/hicolor/16x16/apps/kleopatra.png
 share/icons/hicolor/16x16/apps/kmail.png
@@ -882,6 +904,8 @@ share/icons/hicolor/22x22/apps/akregator.png
 share/icons/hicolor/22x22/apps/blogilo.png
 share/icons/hicolor/22x22/apps/kaddressbook.png
 share/icons/hicolor/22x22/apps/kalarm.png
+share/icons/hicolor/22x22/apps/kdepim-dropbox.png
+share/icons/hicolor/22x22/apps/kdepim-googledrive.png
 share/icons/hicolor/22x22/apps/kjots.png
 share/icons/hicolor/22x22/apps/kleopatra.png
 share/icons/hicolor/22x22/apps/kmail.png
@@ -903,6 +927,8 @@ share/icons/hicolor/32x32/apps/akregator.png
 share/icons/hicolor/32x32/apps/blogilo.png
 share/icons/hicolor/32x32/apps/kaddressbook.png
 share/icons/hicolor/32x32/apps/kalarm.png
+share/icons/hicolor/32x32/apps/kdepim-dropbox.png
+share/icons/hicolor/32x32/apps/kdepim-googledrive.png
 share/icons/hicolor/32x32/apps/kjots.png
 share/icons/hicolor/32x32/apps/kleopatra.png
 share/icons/hicolor/32x32/apps/kmail.png
@@ -921,6 +947,8 @@ share/icons/hicolor/48x48/apps/akregator.png
 share/icons/hicolor/48x48/apps/blogilo.png
 share/icons/hicolor/48x48/apps/kaddressbook.png
 share/icons/hicolor/48x48/apps/kalarm.png
+share/icons/hicolor/48x48/apps/kdepim-dropbox.png
+share/icons/hicolor/48x48/apps/kdepim-googledrive.png
 share/icons/hicolor/48x48/apps/kjots.png
 share/icons/hicolor/48x48/apps/kleopatra.png
 share/icons/hicolor/48x48/apps/kmail.png
@@ -997,14 +1025,13 @@ share/kde4/services/akregator_mk4storage_plugin.desktop
 share/kde4/services/akregator_part.desktop
 share/kde4/services/akregator_sharemicroblog_plugin.desktop
 share/kde4/services/feed.protocol
-share/kde4/services/grammar_link.desktop
 share/kde4/services/kaddressbookpart.desktop
 share/kde4/services/kcm_kpimidentities.desktop
 share/kde4/services/kcmapptsummary.desktop
 share/kde4/services/kcmkmailsummary.desktop
+share/kde4/services/kcmknotessummary.desktop
 share/kde4/services/kcmkontactsummary.desktop
 share/kde4/services/kcmldap.desktop
-share/kde4/services/kcmpimactivity.desktop
 share/kde4/services/kcmsdsummary.desktop
 share/kde4/services/kcmtodosummary.desktop
 share/kde4/services/kjots_config_misc.desktop
@@ -1032,8 +1059,10 @@ share/kde4/services/knode_config_post_news.desktop
 share/kde4/services/knode_config_privacy.desktop
 share/kde4/services/knode_config_read_news.desktop
 share/kde4/services/knote_config_action.desktop
+share/kde4/services/knote_config_collection.desktop
 share/kde4/services/knote_config_display.desktop
 share/kde4/services/knote_config_editor.desktop
+share/kde4/services/knote_config_misc.desktop
 share/kde4/services/knote_config_network.desktop
 share/kde4/services/knote_config_print.desktop
 share/kde4/services/kontact/akregatorplugin.desktop
@@ -1050,10 +1079,8 @@ share/kde4/services/kontact/todoplugin.desktop
 share/kde4/services/kontactconfig.desktop
 share/kde4/services/korganizer/datenums.desktop
 share/kde4/services/korganizer/hebrew.desktop
-share/kde4/services/korganizer/journalprint.desktop
 share/kde4/services/korganizer/picoftheday.desktop
 share/kde4/services/korganizer/thisdayinhistory.desktop
-share/kde4/services/korganizer/yearprint.desktop
 share/kde4/services/korganizer_configcolorsandfonts.desktop
 share/kde4/services/korganizer_configdesignerfields.desktop
 share/kde4/services/korganizer_configfreebusy.desktop
@@ -1065,8 +1092,6 @@ share/kde4/services/korganizer_configviews.desktop
 share/kde4/services/korganizer_part.desktop
 share/kde4/services/kresources/kcal/blog.desktop
 share/kde4/services/kresources/kcal/remote.desktop
-share/kde4/services/kresources/knotes/local.desktop
-share/kde4/services/kresources/knotes_manager.desktop
 share/kde4/services/ktimetracker_config_behavior.desktop
 share/kde4/services/ktimetracker_config_display.desktop
 share/kde4/services/ktimetracker_config_storage.desktop
@@ -1077,159 +1102,4 @@ share/kde4/servicetypes/calendardecoration.desktop
 share/kde4/servicetypes/calendarplugin.desktop
 share/kde4/servicetypes/dbuscalendar.desktop
 share/kde4/servicetypes/dbusmail.desktop
-share/kde4/servicetypes/korganizerpart.desktop
-share/kde4/servicetypes/korgprintplugin.desktop
-share/ontology/kde/messagetag.ontology
-share/ontology/kde/messagetag.trig
 share/polkit-1/actions/org.kde.kalarmrtcwake.policy
-@dirrmtry share/ontology/kde
-@dirrmtry share/ontology
-@dirrm share/kde4/services/kresources/knotes
-@dirrm share/kde4/services/korganizer
-@dirrm share/kde4/services/kontact
-@dirrmtry share/icons/oxygen/512x512/mimetypes
-@dirrmtry share/icons/oxygen/512x512
-@dirrmtry share/icons/locolor/32x32/apps
-@dirrmtry share/icons/locolor/32x32
-@dirrmtry share/icons/locolor/16x16/apps
-@dirrmtry share/icons/locolor/16x16/actions
-@dirrmtry share/icons/locolor/16x16
-@dirrmtry share/icons/locolor
-@dirrm share/doc/HTML/en/pimsettingexporter
-@dirrm share/doc/HTML/en/kwatchgnupg
-@dirrm share/doc/HTML/en/ktnef
-@dirrm share/doc/HTML/en/ktimetracker
-@dirrm share/doc/HTML/en/korganizer
-@dirrm share/doc/HTML/en/kontact-admin
-@dirrm share/doc/HTML/en/kontact
-@dirrm share/doc/HTML/en/konsolekalendar
-@dirrm share/doc/HTML/en/knotes
-@dirrm share/doc/HTML/en/knode
-@dirrm share/doc/HTML/en/kmailcvt
-@dirrm share/doc/HTML/en/kmail
-@dirrm share/doc/HTML/en/kleopatra
-@dirrm share/doc/HTML/en/kjots
-@dirrm share/doc/HTML/en/kioslave/news
-@dirrm share/doc/HTML/en/kalarm
-@dirrm share/doc/HTML/en/kabcclient
-@dirrm share/doc/HTML/en/importwizard
-@dirrm share/doc/HTML/en/headerthemeeditor
-@dirrm share/doc/HTML/en/blogilo
-@dirrm share/doc/HTML/en/akregator
-@dirrm share/doc/HTML/en/akonadi_sendlater_agent
-@dirrm share/doc/HTML/en/akonadi_folderarchive_agent
-@dirrm share/doc/HTML/en/akonadi_archivemail_agent
-@dirrm share/apps/pimsettingexporter
-@dirrm share/apps/messageviewer/themes/example_fancy
-@dirrm share/apps/messageviewer/themes/example
-@dirrm share/apps/messageviewer/themes
-@dirrm share/apps/messageviewer/plugins/bodypartformatter
-@dirrm share/apps/messageviewer/plugins
-@dirrm share/apps/messageviewer/about
-@dirrm share/apps/messageviewer
-@dirrm share/apps/messagelist/pics
-@dirrm share/apps/messagelist
-@dirrm share/apps/libmessageviewer/pics
-@dirrm share/apps/libmessageviewer
-@dirrm share/apps/libkleopatra/pics
-@dirrm share/apps/libkleopatra
-@dirrm share/apps/kwatchgnupg/pics
-@dirrm share/apps/kwatchgnupg
-@dirrm share/apps/ktnef
-@dirrm share/apps/ktimetracker/pics
-@dirrm share/apps/ktimetracker/icons/hicolor/scalable/actions
-@dirrm share/apps/ktimetracker/icons/hicolor/scalable
-@dirrm share/apps/ktimetracker/icons/hicolor/64x64/actions
-@dirrm share/apps/ktimetracker/icons/hicolor/64x64
-@dirrm share/apps/ktimetracker/icons/hicolor/48x48/actions
-@dirrm share/apps/ktimetracker/icons/hicolor/48x48
-@dirrm share/apps/ktimetracker/icons/hicolor/32x32/actions
-@dirrm share/apps/ktimetracker/icons/hicolor/32x32
-@dirrm share/apps/ktimetracker/icons/hicolor/22x22/actions
-@dirrm share/apps/ktimetracker/icons/hicolor/22x22
-@dirrm share/apps/ktimetracker/icons/hicolor/16x16/actions
-@dirrm share/apps/ktimetracker/icons/hicolor/16x16
-@dirrm share/apps/ktimetracker/icons/hicolor/128x128/actions
-@dirrm share/apps/ktimetracker/icons/hicolor/128x128
-@dirrm share/apps/ktimetracker/icons/hicolor
-@dirrm share/apps/ktimetracker/icons
-@dirrm share/apps/ktimetracker
-@dirrm share/apps/korganizer/sounds
-@dirrm share/apps/korganizer
-@dirrm share/apps/korgac/icons/hicolor/scalable/apps
-@dirrm share/apps/korgac/icons/hicolor/scalable
-@dirrm share/apps/korgac/icons/hicolor/64x64/apps
-@dirrm share/apps/korgac/icons/hicolor/64x64
-@dirrm share/apps/korgac/icons/hicolor/32x32/apps
-@dirrm share/apps/korgac/icons/hicolor/32x32
-@dirrm share/apps/korgac/icons/hicolor/256x256/apps
-@dirrm share/apps/korgac/icons/hicolor/256x256
-@dirrm share/apps/korgac/icons/hicolor/22x22/apps
-@dirrm share/apps/korgac/icons/hicolor/22x22
-@dirrm share/apps/korgac/icons/hicolor/16x16/apps
-@dirrm share/apps/korgac/icons/hicolor/16x16
-@dirrm share/apps/korgac/icons/hicolor/128x128/apps
-@dirrm share/apps/korgac/icons/hicolor/128x128
-@dirrm share/apps/korgac/icons/hicolor
-@dirrm share/apps/korgac/icons
-@dirrm share/apps/korgac
-@dirrm share/apps/kontactsummary
-@dirrm share/apps/kontact/ksettingsdialog
-@dirrm share/apps/kontact/about
-@dirrm share/apps/kontact
-@dirrm share/apps/knotes/print/themes/default
-@dirrm share/apps/knotes/print/themes/big-title
-@dirrm share/apps/knotes/print/themes
-@dirrm share/apps/knotes/print
-@dirrm share/apps/knotes
-@dirrm share/apps/knode/pics
-@dirrm share/apps/knode/filters
-@dirrm share/apps/knode
-@dirrm share/apps/kmailcvt/pics
-@dirrm share/apps/kmailcvt
-@dirrm share/apps/kmail2/pics
-@dirrm share/apps/kmail2/about
-@dirrm share/apps/kmail2
-@dirrm share/apps/kleopatra/pics
-@dirrm share/apps/kleopatra
-@dirrm share/apps/kjots/themes/xml_output
-@dirrm share/apps/kjots/themes/plain_text
-@dirrm share/apps/kjots/themes/other
-@dirrm share/apps/kjots/themes/default
-@dirrm share/apps/kjots/themes
-@dirrm share/apps/kjots
-@dirrm share/apps/kdepimwidgets/pics
-@dirrm share/apps/kdepimwidgets
-@dirrm share/apps/kalarm/icons/oxygen/22x22/actions
-@dirrm share/apps/kalarm/icons/oxygen/22x22
-@dirrm share/apps/kalarm/icons/oxygen/16x16/actions
-@dirrm share/apps/kalarm/icons/oxygen/16x16
-@dirrm share/apps/kalarm/icons/oxygen
-@dirrm share/apps/kalarm/icons
-@dirrm share/apps/kalarm
-@dirrm share/apps/kaddressbook/viewertemplates/default
-@dirrm share/apps/kaddressbook/viewertemplates
-@dirrm share/apps/kaddressbook/printing/themes/default
-@dirrm share/apps/kaddressbook/printing/themes/big-theme-example
-@dirrm share/apps/kaddressbook/printing/themes
-@dirrm share/apps/kaddressbook/printing
-@dirrm share/apps/kaddressbook
-@dirrm share/apps/headerthemeeditor
-@dirrm share/apps/contactthemeeditor
-@dirrm share/apps/composereditor
-@dirrm share/apps/blogilo
-@dirrm share/apps/akregator_sharemicroblog_plugin
-@dirrmtry share/apps/akregator/pics
-@dirrm share/apps/akregator/about
-@dirrmtry share/apps/akregator
-@dirrmtry share/apps/akonadiconsole
-@dirrm share/apps/akonadi_sendlater_agent
-@dirrm share/apps/akonadi_mailfilter_agent
-@dirrm share/apps/akonadi_folderarchive_agent
-@dirrm share/apps/akonadi_archivemail_agent
-@dirrmtry share/akonadi/agents
-@dirrmtry share/akonadi
-@dirrmtry lib/kde4/plugins/accessible
-@dirrmtry lib/akonadi/contact/editorpageplugins
-@dirrmtry lib/akonadi/contact
-@dirrmtry lib/akonadi