pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

kde application release: update to 20.12.3



Module Name:	pkgsrc-wip
Committed By:	Mark Davies <mark%ecs.vuw.ac.nz@localhost>
Pushed By:	markd
Date:		Thu Apr 8 19:01:56 2021 +1200
Changeset:	253a5f5ae57a506700e1dab3954a9ef003c97b31

Modified Files:
	akonadi-calendar-tools/PLIST
	akonadi-calendar-tools/distinfo
	akonadi-calendar/PLIST
	akonadi-calendar/distinfo
	akonadi-contacts/Makefile
	akonadi-contacts/PLIST
	akonadi-contacts/buildlink3.mk
	akonadi-contacts/distinfo
	akonadi-import-wizard/PLIST
	akonadi-import-wizard/distinfo
	akonadi-mime/PLIST
	akonadi-mime/distinfo
	akonadi-notes/PLIST
	akonadi-notes/distinfo
	akonadi-search/PLIST
	akonadi-search/distinfo
	akonadi/Makefile
	akonadi/PLIST
	akonadi/distinfo
	akonadiconsole/PLIST
	akonadiconsole/distinfo
	akregator/PLIST
	akregator/distinfo
	calendarsupport/Makefile
	calendarsupport/PLIST
	calendarsupport/buildlink3.mk
	calendarsupport/distinfo
	eventviews/PLIST
	eventviews/distinfo
	ffmpegthumbs/Makefile
	ffmpegthumbs/PLIST
	ffmpegthumbs/distinfo
	grantlee-editor/PLIST
	grantlee-editor/distinfo
	grantleetheme/PLIST
	grantleetheme/distinfo
	incidenceeditor/PLIST
	incidenceeditor/distinfo
	kaddressbook/Makefile
	kaddressbook/PLIST
	kaddressbook/distinfo
	kalarm/PLIST
	kalarm/distinfo
	kalarmcal/PLIST
	kalarmcal/distinfo
	kdebugsettings/PLIST
	kdebugsettings/distinfo
	kdepim-runtime/PLIST
	kdepim-runtime/distinfo
	kdialog/distinfo
	keditbookmarks/PLIST
	keditbookmarks/distinfo
	kfind/distinfo
	kget/Makefile
	kget/distinfo
	kgpg/PLIST
	kgpg/distinfo
	kleopatra/distinfo
	kmail-account-wizard/PLIST
	kmail-account-wizard/distinfo
	kmail/PLIST
	kmail/distinfo
	kmailtransport/PLIST
	kmailtransport/distinfo
	kmix/Makefile
	kmix/PLIST
	kmix/distinfo
	knotes/PLIST
	knotes/distinfo
	kontact/Makefile
	kontact/PLIST
	kontact/distinfo
	kontactinterface/PLIST
	kontactinterface/distinfo
	korganizer/PLIST
	korganizer/distinfo
	ktnef/PLIST
	ktnef/distinfo
	libgravatar/PLIST
	libgravatar/distinfo
	libkdepim/PLIST
	libkdepim/distinfo
	libkgapi/PLIST
	libkgapi/buildlink3.mk
	libkgapi/distinfo
	libkleo/PLIST
	libkleo/distinfo
	libksieve/PLIST
	libksieve/distinfo
	mailcommon/PLIST
	mailcommon/distinfo
	mailimporter/PLIST
	mailimporter/distinfo
	mbox-importer/PLIST
	mbox-importer/distinfo
	messagelib/Makefile
	messagelib/PLIST
	messagelib/buildlink3.mk
	messagelib/distinfo
	pim-data-exporter/PLIST
	pim-data-exporter/distinfo
	pim-sieve-editor/PLIST
	pim-sieve-editor/distinfo
	pimcommon/PLIST
	pimcommon/distinfo

Log Message:
kde application release: update to 20.12.3

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=253a5f5ae57a506700e1dab3954a9ef003c97b31

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 akonadi-calendar-tools/PLIST    |   3 +
 akonadi-calendar-tools/distinfo |   8 +-
 akonadi-calendar/PLIST          |   4 +-
 akonadi-calendar/distinfo       |   8 +-
 akonadi-contacts/Makefile       |   2 +
 akonadi-contacts/PLIST          |  25 +++++-
 akonadi-contacts/buildlink3.mk  |   2 +
 akonadi-contacts/distinfo       |   8 +-
 akonadi-import-wizard/PLIST     |   5 +-
 akonadi-import-wizard/distinfo  |   8 +-
 akonadi-mime/PLIST              |   8 +-
 akonadi-mime/distinfo           |   8 +-
 akonadi-notes/PLIST             |   6 +-
 akonadi-notes/distinfo          |   8 +-
 akonadi-search/PLIST            |  12 +--
 akonadi-search/distinfo         |   8 +-
 akonadi/Makefile                |   2 +-
 akonadi/PLIST                   |  24 +++---
 akonadi/distinfo                |   8 +-
 akonadiconsole/PLIST            |   2 +-
 akonadiconsole/distinfo         |   8 +-
 akregator/PLIST                 |  13 ++-
 akregator/distinfo              |   8 +-
 calendarsupport/Makefile        |   3 +-
 calendarsupport/PLIST           |   8 +-
 calendarsupport/buildlink3.mk   |   2 +-
 calendarsupport/distinfo        |   8 +-
 eventviews/PLIST                |   2 +-
 eventviews/distinfo             |   8 +-
 ffmpegthumbs/Makefile           |   1 +
 ffmpegthumbs/PLIST              |   5 ++
 ffmpegthumbs/distinfo           |   8 +-
 grantlee-editor/PLIST           |   2 +-
 grantlee-editor/distinfo        |   8 +-
 grantleetheme/PLIST             |   4 +-
 grantleetheme/distinfo          |   8 +-
 incidenceeditor/PLIST           |   2 +-
 incidenceeditor/distinfo        |   8 +-
 kaddressbook/Makefile           |   2 +-
 kaddressbook/PLIST              |  79 +++++++++++++++++-
 kaddressbook/distinfo           |   8 +-
 kalarm/PLIST                    |   4 +-
 kalarm/distinfo                 |   8 +-
 kalarmcal/PLIST                 |   3 +-
 kalarmcal/distinfo              |   8 +-
 kdebugsettings/PLIST            |   1 -
 kdebugsettings/distinfo         |   8 +-
 kdepim-runtime/PLIST            | 174 +++++++++++++++++++---------------------
 kdepim-runtime/distinfo         |   8 +-
 kdialog/distinfo                |   8 +-
 keditbookmarks/PLIST            |   6 ++
 keditbookmarks/distinfo         |   8 +-
 kfind/distinfo                  |   8 +-
 kget/Makefile                   |   1 -
 kget/distinfo                   |   8 +-
 kgpg/PLIST                      |   6 ++
 kgpg/distinfo                   |   8 +-
 kleopatra/distinfo              |   8 +-
 kmail-account-wizard/PLIST      |   1 +
 kmail-account-wizard/distinfo   |   8 +-
 kmail/PLIST                     |  38 ++++++++-
 kmail/distinfo                  |   8 +-
 kmailtransport/PLIST            |   4 +-
 kmailtransport/distinfo         |   8 +-
 kmix/Makefile                   |   8 +-
 kmix/PLIST                      |  12 ++-
 kmix/distinfo                   |   8 +-
 knotes/PLIST                    |  15 +++-
 knotes/distinfo                 |   8 +-
 kontact/Makefile                |   3 +-
 kontact/PLIST                   |   2 +-
 kontact/distinfo                |   8 +-
 kontactinterface/PLIST          |   3 +-
 kontactinterface/distinfo       |   8 +-
 korganizer/PLIST                |  17 ++--
 korganizer/distinfo             |   8 +-
 ktnef/PLIST                     |   2 +-
 ktnef/distinfo                  |   8 +-
 libgravatar/PLIST               |   6 +-
 libgravatar/distinfo            |   8 +-
 libkdepim/PLIST                 |  79 +-----------------
 libkdepim/distinfo              |   8 +-
 libkgapi/PLIST                  |  24 +++---
 libkgapi/buildlink3.mk          |  18 ++---
 libkgapi/distinfo               |   8 +-
 libkleo/PLIST                   |   6 +-
 libkleo/distinfo                |   8 +-
 libksieve/PLIST                 |  12 ++-
 libksieve/distinfo              |   8 +-
 mailcommon/PLIST                |  10 ++-
 mailcommon/distinfo             |   8 +-
 mailimporter/PLIST              |   4 +-
 mailimporter/distinfo           |   8 +-
 mbox-importer/PLIST             |   2 +
 mbox-importer/distinfo          |   8 +-
 messagelib/Makefile             |   2 +-
 messagelib/PLIST                |  32 ++++++--
 messagelib/buildlink3.mk        |   2 +-
 messagelib/distinfo             |   8 +-
 pim-data-exporter/PLIST         |  25 +++++-
 pim-data-exporter/distinfo      |   8 +-
 pim-sieve-editor/PLIST          |   5 +-
 pim-sieve-editor/distinfo       |   8 +-
 pimcommon/PLIST                 |  25 +++++-
 pimcommon/distinfo              |   8 +-
 105 files changed, 667 insertions(+), 487 deletions(-)

diffs:
diff --git a/akonadi-calendar-tools/PLIST b/akonadi-calendar-tools/PLIST
index fc043bbf4e..13ebb2316d 100644
--- a/akonadi-calendar-tools/PLIST
+++ b/akonadi-calendar-tools/PLIST
@@ -46,6 +46,7 @@ share/locale/da/LC_MESSAGES/calendarjanitor.mo
 share/locale/da/LC_MESSAGES/konsolekalendar.mo
 share/locale/de/LC_MESSAGES/calendarjanitor.mo
 share/locale/de/LC_MESSAGES/konsolekalendar.mo
+share/locale/el/LC_MESSAGES/calendarjanitor.mo
 share/locale/el/LC_MESSAGES/konsolekalendar.mo
 share/locale/en_GB/LC_MESSAGES/calendarjanitor.mo
 share/locale/en_GB/LC_MESSAGES/konsolekalendar.mo
@@ -54,6 +55,7 @@ share/locale/es/LC_MESSAGES/calendarjanitor.mo
 share/locale/es/LC_MESSAGES/konsolekalendar.mo
 share/locale/et/LC_MESSAGES/calendarjanitor.mo
 share/locale/et/LC_MESSAGES/konsolekalendar.mo
+share/locale/eu/LC_MESSAGES/calendarjanitor.mo
 share/locale/eu/LC_MESSAGES/konsolekalendar.mo
 share/locale/fa/LC_MESSAGES/konsolekalendar.mo
 share/locale/fi/LC_MESSAGES/calendarjanitor.mo
@@ -64,6 +66,7 @@ share/locale/ga/LC_MESSAGES/konsolekalendar.mo
 share/locale/gl/LC_MESSAGES/calendarjanitor.mo
 share/locale/gl/LC_MESSAGES/konsolekalendar.mo
 share/locale/he/LC_MESSAGES/konsolekalendar.mo
+share/locale/hi/LC_MESSAGES/calendarjanitor.mo
 share/locale/hi/LC_MESSAGES/konsolekalendar.mo
 share/locale/hr/LC_MESSAGES/konsolekalendar.mo
 share/locale/hu/LC_MESSAGES/calendarjanitor.mo
diff --git a/akonadi-calendar-tools/distinfo b/akonadi-calendar-tools/distinfo
index a838895a08..0d084ab97f 100644
--- a/akonadi-calendar-tools/distinfo
+++ b/akonadi-calendar-tools/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-SHA1 (akonadi-calendar-tools-20.04.1.tar.xz) = eb4657bd97393a250d7b0184d301cea6ed994b18
-RMD160 (akonadi-calendar-tools-20.04.1.tar.xz) = 369623ecc8ffcb4e650e9e3aa33717195ad5a9b4
-SHA512 (akonadi-calendar-tools-20.04.1.tar.xz) = b10597ae99a69a23f7387c9f74ec7d15dfb0ba9322c67238654c794e9698c5920a6b19001607a3495475438ea4c8a23d2d6b17d7acedba37ecf04082f6dab2b3
-Size (akonadi-calendar-tools-20.04.1.tar.xz) = 224572 bytes
+SHA1 (akonadi-calendar-tools-20.12.3.tar.xz) = ec6efdcd9023011df7c47b746a8ceca09e28591a
+RMD160 (akonadi-calendar-tools-20.12.3.tar.xz) = d9d5c6311900bcb3b3311f6b1d7a7a5093cfab94
+SHA512 (akonadi-calendar-tools-20.12.3.tar.xz) = 5890454e49f4cfb04e3edb4895eb4f4f7abfba691185ccc9b9b3c3efc3d675cfe8c7b493b3378143d5da552ff784a391fd194c7107e4ddd11434aa3c130e5d56
+Size (akonadi-calendar-tools-20.12.3.tar.xz) = 224860 bytes
diff --git a/akonadi-calendar/PLIST b/akonadi-calendar/PLIST
index 3e8c667021..fe6b6ff777 100644
--- a/akonadi-calendar/PLIST
+++ b/akonadi-calendar/PLIST
@@ -36,7 +36,7 @@ lib/cmake/KF5AkonadiCalendar/KF5AkonadiCalendarTargets-noconfig.cmake
 lib/cmake/KF5AkonadiCalendar/KF5AkonadiCalendarTargets.cmake
 lib/libKF5AkonadiCalendar.so
 lib/libKF5AkonadiCalendar.so.5
-lib/libKF5AkonadiCalendar.so.5.14.1
+lib/libKF5AkonadiCalendar.so.5.16.3
 qt5/mkspecs/modules/qt_AkonadiCalendar.pri
 qt5/plugins/akonadi_serializer_kcalcore.so
 share/akonadi/plugins/serializer/akonadi_serializer_kcalcore.desktop
@@ -62,6 +62,8 @@ share/locale/es/LC_MESSAGES/libakonadi-calendar5-serializer.mo
 share/locale/es/LC_MESSAGES/libakonadi-calendar5.mo
 share/locale/et/LC_MESSAGES/libakonadi-calendar5-serializer.mo
 share/locale/et/LC_MESSAGES/libakonadi-calendar5.mo
+share/locale/eu/LC_MESSAGES/libakonadi-calendar5-serializer.mo
+share/locale/eu/LC_MESSAGES/libakonadi-calendar5.mo
 share/locale/fi/LC_MESSAGES/libakonadi-calendar5-serializer.mo
 share/locale/fi/LC_MESSAGES/libakonadi-calendar5.mo
 share/locale/fr/LC_MESSAGES/libakonadi-calendar5-serializer.mo
diff --git a/akonadi-calendar/distinfo b/akonadi-calendar/distinfo
index e33ececf21..44a55fc132 100644
--- a/akonadi-calendar/distinfo
+++ b/akonadi-calendar/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-SHA1 (akonadi-calendar-20.04.1.tar.xz) = 4fc45fe0358294fbb8d117e5baf1f9fdf55c23b8
-RMD160 (akonadi-calendar-20.04.1.tar.xz) = b9de1d4b59af2c2690af498f0d48b8dc18503f56
-SHA512 (akonadi-calendar-20.04.1.tar.xz) = dd66915a648e4aa91f0d00a5825d4bf9ed037858ba36e1caaaeed4264e7b0316365fb60f666dbe488c6632c7294a716af0d8358212fb7efccde8e466ae90df7d
-Size (akonadi-calendar-20.04.1.tar.xz) = 331508 bytes
+SHA1 (akonadi-calendar-20.12.3.tar.xz) = 32009d0e33ccbf2a9cdb5b90ec4a35c61fe8de5a
+RMD160 (akonadi-calendar-20.12.3.tar.xz) = ad74fba30d308f3adb9f691aa88bc6b0a2fa00ae
+SHA512 (akonadi-calendar-20.12.3.tar.xz) = 739a7896d457283f92f94e022139edfc22e80383724818bdc457128d1c952f4024ec5e3c91a444c48977d1c8932c60f5b90bda7dd4dddc82fce7ede5bb04c89b
+Size (akonadi-calendar-20.12.3.tar.xz) = 342788 bytes
diff --git a/akonadi-contacts/Makefile b/akonadi-contacts/Makefile
index ba407c6597..f91b449097 100644
--- a/akonadi-contacts/Makefile
+++ b/akonadi-contacts/Makefile
@@ -23,6 +23,8 @@ SUBST_SED.fix-moc=	-e 's;"${PREFIX}/include",;;g'
 
 .include "../../devel/boost-headers/buildlink3.mk"
 .include "../../wip/akonadi-mime/buildlink3.mk"
+.include "../../wip/grantleetheme/buildlink3.mk"
+.include "../../wip/libkleo/buildlink3.mk"
 .include "../../misc/kcontacts/buildlink3.mk"
 .include "../../mail/kmime/buildlink3.mk"
 .include "../../graphics/prison/buildlink3.mk"
diff --git a/akonadi-contacts/PLIST b/akonadi-contacts/PLIST
index cb8a3b5302..100cc1d06c 100644
--- a/akonadi-contacts/PLIST
+++ b/akonadi-contacts/PLIST
@@ -2,9 +2,13 @@
 include/KF5/Akonadi/Contact/AbstractContactFormatter
 include/KF5/Akonadi/Contact/AbstractContactGroupFormatter
 include/KF5/Akonadi/Contact/AbstractEmailAddressSelectionDialog
+include/KF5/Akonadi/Contact/AddContactJob
+include/KF5/Akonadi/Contact/AddEmailAddressJob
+include/KF5/Akonadi/Contact/AddEmailDisplayJob
 include/KF5/Akonadi/Contact/ContactDefaultActions
 include/KF5/Akonadi/Contact/ContactEditor
 include/KF5/Akonadi/Contact/ContactEditorDialog
+include/KF5/Akonadi/Contact/ContactGrantleeWrapper
 include/KF5/Akonadi/Contact/ContactGroupEditor
 include/KF5/Akonadi/Contact/ContactGroupEditorDialog
 include/KF5/Akonadi/Contact/ContactGroupExpandJob
@@ -22,6 +26,11 @@ include/KF5/Akonadi/Contact/EmailAddressSelection
 include/KF5/Akonadi/Contact/EmailAddressSelectionDialog
 include/KF5/Akonadi/Contact/EmailAddressSelectionModel
 include/KF5/Akonadi/Contact/EmailAddressSelectionWidget
+include/KF5/Akonadi/Contact/GrantleeContactFormatter
+include/KF5/Akonadi/Contact/GrantleeContactGroupFormatter
+include/KF5/Akonadi/Contact/GrantleeContactViewer
+include/KF5/Akonadi/Contact/GrantleePrint
+include/KF5/Akonadi/Contact/OpenEmailAddressJob
 include/KF5/Akonadi/Contact/RecipientsEditorManager
 include/KF5/Akonadi/Contact/RecipientsPickerWidget
 include/KF5/Akonadi/Contact/SelectAddressBookDialog
@@ -33,10 +42,14 @@ include/KF5/ContactEditor/ContactEditorPagePlugin
 include/KF5/akonadi/contact/abstractcontactformatter.h
 include/KF5/akonadi/contact/abstractcontactgroupformatter.h
 include/KF5/akonadi/contact/abstractemailaddressselectiondialog.h
+include/KF5/akonadi/contact/addcontactjob.h
+include/KF5/akonadi/contact/addemailaddressjob.h
+include/KF5/akonadi/contact/addemaildisplayjob.h
 include/KF5/akonadi/contact/akonadi-contact_export.h
 include/KF5/akonadi/contact/contactdefaultactions.h
 include/KF5/akonadi/contact/contacteditor.h
 include/KF5/akonadi/contact/contacteditordialog.h
+include/KF5/akonadi/contact/contactgrantleewrapper.h
 include/KF5/akonadi/contact/contactgroupeditor.h
 include/KF5/akonadi/contact/contactgroupeditordialog.h
 include/KF5/akonadi/contact/contactgroupexpandjob.h
@@ -54,6 +67,11 @@ include/KF5/akonadi/contact/emailaddressselection.h
 include/KF5/akonadi/contact/emailaddressselectiondialog.h
 include/KF5/akonadi/contact/emailaddressselectionmodel.h
 include/KF5/akonadi/contact/emailaddressselectionwidget.h
+include/KF5/akonadi/contact/grantleecontactformatter.h
+include/KF5/akonadi/contact/grantleecontactgroupformatter.h
+include/KF5/akonadi/contact/grantleecontactviewer.h
+include/KF5/akonadi/contact/grantleeprint.h
+include/KF5/akonadi/contact/openemailaddressjob.h
 include/KF5/akonadi/contact/recipientseditormanager.h
 include/KF5/akonadi/contact/recipientspickerwidget.h
 include/KF5/akonadi/contact/selectaddressbookdialog.h
@@ -73,10 +91,10 @@ lib/cmake/KF5ContactEditor/KF5ContactEditorTargets-noconfig.cmake
 lib/cmake/KF5ContactEditor/KF5ContactEditorTargets.cmake
 lib/libKF5AkonadiContact.so
 lib/libKF5AkonadiContact.so.5
-lib/libKF5AkonadiContact.so.5.14.1
+lib/libKF5AkonadiContact.so.5.16.3
 lib/libKF5ContactEditor.so
 lib/libKF5ContactEditor.so.5
-lib/libKF5ContactEditor.so.5.14.1
+lib/libKF5ContactEditor.so.5.16.3
 qt5/mkspecs/modules/qt_AkonadiContact.pri
 qt5/mkspecs/modules/qt_ContactEditor.pri
 qt5/plugins/akonadi/contacts/plugins/categorieseditwidgetplugin.so
@@ -123,6 +141,9 @@ share/locale/es/LC_MESSAGES/kcm_akonadicontact_actions.mo
 share/locale/et/LC_MESSAGES/akonadicontact5-serializer.mo
 share/locale/et/LC_MESSAGES/akonadicontact5.mo
 share/locale/et/LC_MESSAGES/kcm_akonadicontact_actions.mo
+share/locale/eu/LC_MESSAGES/akonadicontact5-serializer.mo
+share/locale/eu/LC_MESSAGES/akonadicontact5.mo
+share/locale/eu/LC_MESSAGES/kcm_akonadicontact_actions.mo
 share/locale/fi/LC_MESSAGES/akonadicontact5-serializer.mo
 share/locale/fi/LC_MESSAGES/akonadicontact5.mo
 share/locale/fi/LC_MESSAGES/kcm_akonadicontact_actions.mo
diff --git a/akonadi-contacts/buildlink3.mk b/akonadi-contacts/buildlink3.mk
index 21bae9f323..4424544187 100644
--- a/akonadi-contacts/buildlink3.mk
+++ b/akonadi-contacts/buildlink3.mk
@@ -9,6 +9,8 @@ BUILDLINK_API_DEPENDS.akonadi-contacts+=	akonadi-contacts>=17.12.1
 BUILDLINK_PKGSRCDIR.akonadi-contacts?=		../../wip/akonadi-contacts
 
 .include "../../wip/akonadi-mime/buildlink3.mk"
+.include "../../wip/grantleetheme/buildlink3.mk"
+.include "../../wip/libkleo/buildlink3.mk"
 .include "../../misc/kcontacts/buildlink3.mk"
 .include "../../mail/kmime/buildlink3.mk"
 .include "../../graphics/prison/buildlink3.mk"
diff --git a/akonadi-contacts/distinfo b/akonadi-contacts/distinfo
index 06d46f4b05..8790663674 100644
--- a/akonadi-contacts/distinfo
+++ b/akonadi-contacts/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-SHA1 (akonadi-contacts-20.04.1.tar.xz) = e81dd1dc944f6ec3c070c7021df5c724b88a2ed8
-RMD160 (akonadi-contacts-20.04.1.tar.xz) = ae8b6abe4bb13c25b6f5639d0f75bdb64e58f5f1
-SHA512 (akonadi-contacts-20.04.1.tar.xz) = b27cc4f4a2381836f5e3d3f738590f4a77fe4f783e97bfb115f284f6ef0270ec40efcb667fb31b5a4e0d27e3c15c8be595675df65173c117003f784e10e2fc39
-Size (akonadi-contacts-20.04.1.tar.xz) = 393640 bytes
+SHA1 (akonadi-contacts-20.12.3.tar.xz) = 6f6b4e65d43aaccf110af89e70db4ab51fb484de
+RMD160 (akonadi-contacts-20.12.3.tar.xz) = 55eec692655df5c0ee11414c71694404b08d7641
+SHA512 (akonadi-contacts-20.12.3.tar.xz) = 41f201d7e37e7570667f4ef6fa61972622301a11b1952a3558491b9263fa8890fa468e55048353ccbe8b4b12339c36352a5f2630dea36e083e932e9b8c045d6a
+Size (akonadi-contacts-20.12.3.tar.xz) = 414416 bytes
diff --git a/akonadi-import-wizard/PLIST b/akonadi-import-wizard/PLIST
index a3ff003bfe..fe5b49be2a 100644
--- a/akonadi-import-wizard/PLIST
+++ b/akonadi-import-wizard/PLIST
@@ -22,7 +22,7 @@ lib/cmake/KPimImportWizard/KPimImportWizardTargets-noconfig.cmake
 lib/cmake/KPimImportWizard/KPimImportWizardTargets.cmake
 lib/libKPimImportWizard.so
 lib/libKPimImportWizard.so.5
-lib/libKPimImportWizard.so.5.14.1
+lib/libKPimImportWizard.so.5.16.3
 qt5/plugins/importwizard/balsaimporterplugin.so
 qt5/plugins/importwizard/clawsmailimporterplugin.so
 qt5/plugins/importwizard/evolutionv3importerplugin.so
@@ -45,8 +45,10 @@ share/doc/HTML/es/importwizard/index.cache.bz2
 share/doc/HTML/es/importwizard/index.docbook
 share/doc/HTML/et/importwizard/index.cache.bz2
 share/doc/HTML/et/importwizard/index.docbook
+share/doc/HTML/it/importwizard/import-selection.png
 share/doc/HTML/it/importwizard/index.cache.bz2
 share/doc/HTML/it/importwizard/index.docbook
+share/doc/HTML/it/importwizard/manual-import.png
 share/doc/HTML/nl/importwizard/index.cache.bz2
 share/doc/HTML/nl/importwizard/index.docbook
 share/doc/HTML/pt/importwizard/index.cache.bz2
@@ -77,6 +79,7 @@ share/locale/el/LC_MESSAGES/akonadiimportwizard.mo
 share/locale/en_GB/LC_MESSAGES/akonadiimportwizard.mo
 share/locale/es/LC_MESSAGES/akonadiimportwizard.mo
 share/locale/et/LC_MESSAGES/akonadiimportwizard.mo
+share/locale/eu/LC_MESSAGES/akonadiimportwizard.mo
 share/locale/fi/LC_MESSAGES/akonadiimportwizard.mo
 share/locale/fr/LC_MESSAGES/akonadiimportwizard.mo
 share/locale/ga/LC_MESSAGES/akonadiimportwizard.mo
diff --git a/akonadi-import-wizard/distinfo b/akonadi-import-wizard/distinfo
index ab5ed4f39c..1fb856ad98 100644
--- a/akonadi-import-wizard/distinfo
+++ b/akonadi-import-wizard/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-SHA1 (akonadi-import-wizard-20.04.1.tar.xz) = f30881bfb1032e41ea4d3da975a63695d06654af
-RMD160 (akonadi-import-wizard-20.04.1.tar.xz) = 26a6b1bb20802ae9c27b2ea4b2f295d8824381d6
-SHA512 (akonadi-import-wizard-20.04.1.tar.xz) = 3b1a14c8c579e785e2e50bda39d5a7224ae8d133c7a7753e961105a58cbd5e7718e22e44d754dfe05d3cf8910f18cda594d4cd7199ab5d493b815bb52f82899a
-Size (akonadi-import-wizard-20.04.1.tar.xz) = 439084 bytes
+SHA1 (akonadi-import-wizard-20.12.3.tar.xz) = 64aa246e82e55775167c6bf177c4d569781d981f
+RMD160 (akonadi-import-wizard-20.12.3.tar.xz) = 23f773c3958247692d407f4d50593ecb9a6e640f
+SHA512 (akonadi-import-wizard-20.12.3.tar.xz) = 8b35a37617347c39ef4c76eaec8e3a982d985e6bd41b6219ab353542a82168b6bb46f01fb383bf02ef2819c51a60b86b837e126a23415a8bbb025b27bfabef2d
+Size (akonadi-import-wizard-20.12.3.tar.xz) = 506664 bytes
diff --git a/akonadi-mime/PLIST b/akonadi-mime/PLIST
index 93394c3cac..14738067bf 100644
--- a/akonadi-mime/PLIST
+++ b/akonadi-mime/PLIST
@@ -9,6 +9,8 @@ include/KF5/Akonadi/KMime/MessageModel
 include/KF5/Akonadi/KMime/MessageParts
 include/KF5/Akonadi/KMime/MessageStatus
 include/KF5/Akonadi/KMime/MoveCommand
+include/KF5/Akonadi/KMime/NewMailNotifierAttribute
+include/KF5/Akonadi/KMime/Pop3ResourceAttribute
 include/KF5/Akonadi/KMime/RemoveDuplicatesJob
 include/KF5/Akonadi/KMime/SpecialMailCollections
 include/KF5/Akonadi/KMime/SpecialMailCollectionsDiscoveryJob
@@ -25,6 +27,8 @@ include/KF5/akonadi/kmime/messagemodel.h
 include/KF5/akonadi/kmime/messageparts.h
 include/KF5/akonadi/kmime/messagestatus.h
 include/KF5/akonadi/kmime/movecommand.h
+include/KF5/akonadi/kmime/newmailnotifierattribute.h
+include/KF5/akonadi/kmime/pop3resourceattribute.h
 include/KF5/akonadi/kmime/removeduplicatesjob.h
 include/KF5/akonadi/kmime/specialmailcollections.h
 include/KF5/akonadi/kmime/specialmailcollectionsdiscoveryjob.h
@@ -36,7 +40,7 @@ lib/cmake/KF5AkonadiMime/KF5AkonadiMimeTargets-noconfig.cmake
 lib/cmake/KF5AkonadiMime/KF5AkonadiMimeTargets.cmake
 lib/libKF5AkonadiMime.so
 lib/libKF5AkonadiMime.so.5
-lib/libKF5AkonadiMime.so.5.14.1
+lib/libKF5AkonadiMime.so.5.16.3
 qt5/mkspecs/modules/qt_AkonadiMime.pri
 qt5/plugins/akonadi_serializer_mail.so
 share/akonadi/plugins/serializer/akonadi_serializer_mail.desktop
@@ -52,6 +56,7 @@ share/locale/el/LC_MESSAGES/libakonadi-kmime5.mo
 share/locale/en_GB/LC_MESSAGES/libakonadi-kmime5.mo
 share/locale/es/LC_MESSAGES/libakonadi-kmime5.mo
 share/locale/et/LC_MESSAGES/libakonadi-kmime5.mo
+share/locale/eu/LC_MESSAGES/libakonadi-kmime5.mo
 share/locale/fi/LC_MESSAGES/libakonadi-kmime5.mo
 share/locale/fr/LC_MESSAGES/libakonadi-kmime5.mo
 share/locale/ga/LC_MESSAGES/libakonadi-kmime5.mo
@@ -68,6 +73,7 @@ share/locale/mr/LC_MESSAGES/libakonadi-kmime5.mo
 share/locale/nb/LC_MESSAGES/libakonadi-kmime5.mo
 share/locale/nds/LC_MESSAGES/libakonadi-kmime5.mo
 share/locale/nl/LC_MESSAGES/libakonadi-kmime5.mo
+share/locale/nn/LC_MESSAGES/libakonadi-kmime5.mo
 share/locale/pl/LC_MESSAGES/libakonadi-kmime5.mo
 share/locale/pt/LC_MESSAGES/libakonadi-kmime5.mo
 share/locale/pt_BR/LC_MESSAGES/libakonadi-kmime5.mo
diff --git a/akonadi-mime/distinfo b/akonadi-mime/distinfo
index d0f4264658..f54cdf2a6a 100644
--- a/akonadi-mime/distinfo
+++ b/akonadi-mime/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-SHA1 (akonadi-mime-20.04.1.tar.xz) = 22e81ca457b3cd762473ee7532901758de0c9501
-RMD160 (akonadi-mime-20.04.1.tar.xz) = 700faba88b0a769e9c30ce6667b284c0eae8c98e
-SHA512 (akonadi-mime-20.04.1.tar.xz) = 40c3bd89fd57421aa9c24f320e315fedd4c4e2f33f2a461b22cdcef29fe3bc37a4efdc5839da8346b683db3d107c7d81a8bd2f326e3a4712ef23fed03150420d
-Size (akonadi-mime-20.04.1.tar.xz) = 132060 bytes
+SHA1 (akonadi-mime-20.12.3.tar.xz) = 5e6a9e3885daf8a84dbe5a9958c0abebb40725fa
+RMD160 (akonadi-mime-20.12.3.tar.xz) = 512d9fcffdd15b6abcd9788bd8f14abbf1ca978b
+SHA512 (akonadi-mime-20.12.3.tar.xz) = 9ca435850f4c65ea285b0663d2b2f490ad79e7d238ec3161a1c60e58b0b897c98f0770e20ebc050c68827b129f10af173cf77ae3ec98fca684ef69839df53a93
+Size (akonadi-mime-20.12.3.tar.xz) = 136144 bytes
diff --git a/akonadi-notes/PLIST b/akonadi-notes/PLIST
index 2f94074e74..1373cbde9e 100644
--- a/akonadi-notes/PLIST
+++ b/akonadi-notes/PLIST
@@ -10,9 +10,10 @@ lib/cmake/KF5AkonadiNotes/KF5AkonadiNotesTargets-noconfig.cmake
 lib/cmake/KF5AkonadiNotes/KF5AkonadiNotesTargets.cmake
 lib/libKF5AkonadiNotes.so
 lib/libKF5AkonadiNotes.so.5
-lib/libKF5AkonadiNotes.so.5.14.1
+lib/libKF5AkonadiNotes.so.5.16.3
 qt5/mkspecs/modules/qt_AkonadiNotes.pri
 share/locale/ar/LC_MESSAGES/akonadinotes5.mo
+share/locale/ast/LC_MESSAGES/akonadinotes5.mo
 share/locale/bs/LC_MESSAGES/akonadinotes5.mo
 share/locale/ca/LC_MESSAGES/akonadinotes5.mo
 share/locale/ca@valencia/LC_MESSAGES/akonadinotes5.mo
@@ -23,11 +24,13 @@ share/locale/el/LC_MESSAGES/akonadinotes5.mo
 share/locale/en_GB/LC_MESSAGES/akonadinotes5.mo
 share/locale/es/LC_MESSAGES/akonadinotes5.mo
 share/locale/et/LC_MESSAGES/akonadinotes5.mo
+share/locale/eu/LC_MESSAGES/akonadinotes5.mo
 share/locale/fi/LC_MESSAGES/akonadinotes5.mo
 share/locale/fr/LC_MESSAGES/akonadinotes5.mo
 share/locale/ga/LC_MESSAGES/akonadinotes5.mo
 share/locale/gl/LC_MESSAGES/akonadinotes5.mo
 share/locale/he/LC_MESSAGES/akonadinotes5.mo
+share/locale/hi/LC_MESSAGES/akonadinotes5.mo
 share/locale/hu/LC_MESSAGES/akonadinotes5.mo
 share/locale/ia/LC_MESSAGES/akonadinotes5.mo
 share/locale/it/LC_MESSAGES/akonadinotes5.mo
@@ -40,6 +43,7 @@ share/locale/mr/LC_MESSAGES/akonadinotes5.mo
 share/locale/nb/LC_MESSAGES/akonadinotes5.mo
 share/locale/nds/LC_MESSAGES/akonadinotes5.mo
 share/locale/nl/LC_MESSAGES/akonadinotes5.mo
+share/locale/nn/LC_MESSAGES/akonadinotes5.mo
 share/locale/pl/LC_MESSAGES/akonadinotes5.mo
 share/locale/pt/LC_MESSAGES/akonadinotes5.mo
 share/locale/pt_BR/LC_MESSAGES/akonadinotes5.mo
diff --git a/akonadi-notes/distinfo b/akonadi-notes/distinfo
index 0cf126010b..907554c293 100644
--- a/akonadi-notes/distinfo
+++ b/akonadi-notes/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-SHA1 (akonadi-notes-20.04.1.tar.xz) = acba2b5b3b48cadd54c95e6758658d27b64e9111
-RMD160 (akonadi-notes-20.04.1.tar.xz) = c49cbcfbb656c50ef270e465f68fd8fb803b9e45
-SHA512 (akonadi-notes-20.04.1.tar.xz) = e95bf99395b3403139cb0d642c60af3aa5cc1b265b3073d62fea92f83809a693efcf04a13bd344ae6b57f138c7dea7fd7a4c1edd5f0ab20641533817b675fec6
-Size (akonadi-notes-20.04.1.tar.xz) = 24488 bytes
+SHA1 (akonadi-notes-20.12.3.tar.xz) = 0a607d6eed03a0c48bd1893f0de4d4e68e1513aa
+RMD160 (akonadi-notes-20.12.3.tar.xz) = 16212b85bc9d21f48b09e8978210ad90c6b749ff
+SHA512 (akonadi-notes-20.12.3.tar.xz) = 100d26caa3e8ace0d58c58ba58a71f301d9979c86dcd993e43d6bac63ccded76e063d942f86533ea4da20d6657eb9992321c83ec73ed0f5817aff6ce6c90d812
+Size (akonadi-notes-20.12.3.tar.xz) = 22876 bytes
diff --git a/akonadi-search/PLIST b/akonadi-search/PLIST
index 70918fdede..1da9c06b67 100644
--- a/akonadi-search/PLIST
+++ b/akonadi-search/PLIST
@@ -30,25 +30,24 @@ lib/cmake/KF5AkonadiSearch/KF5AkonadiSearchTargets-noconfig.cmake
 lib/cmake/KF5AkonadiSearch/KF5AkonadiSearchTargets.cmake
 lib/libKF5AkonadiSearchCore.so
 lib/libKF5AkonadiSearchCore.so.5
-lib/libKF5AkonadiSearchCore.so.5.14.1
+lib/libKF5AkonadiSearchCore.so.5.16.3
 lib/libKF5AkonadiSearchDebug.so
 lib/libKF5AkonadiSearchDebug.so.5
-lib/libKF5AkonadiSearchDebug.so.5.14.1
+lib/libKF5AkonadiSearchDebug.so.5.16.3
 lib/libKF5AkonadiSearchPIM.so
 lib/libKF5AkonadiSearchPIM.so.5
-lib/libKF5AkonadiSearchPIM.so.5.14.1
+lib/libKF5AkonadiSearchPIM.so.5.16.3
 lib/libKF5AkonadiSearchXapian.so
 lib/libKF5AkonadiSearchXapian.so.5
-lib/libKF5AkonadiSearchXapian.so.5.14.1
+lib/libKF5AkonadiSearchXapian.so.5.16.3
 qt5/plugins/akonadi/akonadi_search_plugin.so
 qt5/plugins/akonadi/calendarsearchstore.so
 qt5/plugins/akonadi/contactsearchstore.so
 qt5/plugins/akonadi/emailsearchstore.so
 qt5/plugins/akonadi/notesearchstore.so
 qt5/plugins/kcm_krunner_pimcontacts.so
-qt5/plugins/krunner_pimcontacts.so
+qt5/plugins/kf5/krunner/krunner_pimcontacts.so
 share/akonadi/agents/akonadiindexingagent.desktop
-share/kservices5/plasma-krunner-pimcontacts.desktop
 share/kservices5/plasma-krunner-pimcontacts_config.desktop
 share/locale/ar/LC_MESSAGES/akonadi_search.mo
 share/locale/ca/LC_MESSAGES/akonadi_search.mo
@@ -60,6 +59,7 @@ share/locale/el/LC_MESSAGES/akonadi_search.mo
 share/locale/en_GB/LC_MESSAGES/akonadi_search.mo
 share/locale/es/LC_MESSAGES/akonadi_search.mo
 share/locale/et/LC_MESSAGES/akonadi_search.mo
+share/locale/eu/LC_MESSAGES/akonadi_search.mo
 share/locale/fi/LC_MESSAGES/akonadi_search.mo
 share/locale/fr/LC_MESSAGES/akonadi_search.mo
 share/locale/gl/LC_MESSAGES/akonadi_search.mo
diff --git a/akonadi-search/distinfo b/akonadi-search/distinfo
index 7b5d718433..e98cc4daa3 100644
--- a/akonadi-search/distinfo
+++ b/akonadi-search/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-SHA1 (akonadi-search-20.04.1.tar.xz) = 7141e30c8193ec90870ccc2f04b390ebf4b92b6e
-RMD160 (akonadi-search-20.04.1.tar.xz) = 19ade1b6639b314972631906397601282df5ef99
-SHA512 (akonadi-search-20.04.1.tar.xz) = 6da61fda7a3c6a7acbc6fbbc9ed92ad0e85c0553e31b557b4c364a9f0692f05d408fd2b411c14baf3026249bd06953bb11ed89f4f0448611615e7b338c395fc4
-Size (akonadi-search-20.04.1.tar.xz) = 83168 bytes
+SHA1 (akonadi-search-20.12.3.tar.xz) = 5e22ab2faceca581b6000d28a5a8614da5afea37
+RMD160 (akonadi-search-20.12.3.tar.xz) = 41234dbc5ac832165be11cc10f1b5390ef2665ed
+SHA512 (akonadi-search-20.12.3.tar.xz) = 8942788fa0f5034661abd164136b33228ae71e2d305ad8dcbeb97737bfd9ea8d305d7ba6254ecccb160ac41047b3bcfd29e9ee17bb27a290e2e2e2033c09bc08
+Size (akonadi-search-20.12.3.tar.xz) = 93984 bytes
diff --git a/akonadi/Makefile b/akonadi/Makefile
index ceaa8bfd22..b1a739caeb 100644
--- a/akonadi/Makefile
+++ b/akonadi/Makefile
@@ -16,7 +16,7 @@ CMAKE_ARGS+=	-DMYSQLD_EXECUTABLE="${PREFIX}/sbin/mysqld"
 CMAKE_ARGS+=	-DPOSTGRES_PATH="${PREFIX}/bin"
 CMAKE_ARGS+=	-DINSTALL_APPARMOR=FALSE
 
-USE_TOOLS+=	pkg-config msgmerge
+USE_TOOLS+=	gmake msgmerge pkg-config
 
 .include "options.mk"
 
diff --git a/akonadi/PLIST b/akonadi/PLIST
index 8e1eccc492..a23d528ce7 100644
--- a/akonadi/PLIST
+++ b/akonadi/PLIST
@@ -36,7 +36,6 @@ include/KF5/AkonadiCore/AgentInstanceModel
 include/KF5/AkonadiCore/AgentManager
 include/KF5/AkonadiCore/AgentType
 include/KF5/AkonadiCore/AgentTypeModel
-include/KF5/AkonadiCore/AkOptional
 include/KF5/AkonadiCore/Attribute
 include/KF5/AkonadiCore/AttributeFactory
 include/KF5/AkonadiCore/CachePolicy
@@ -80,7 +79,6 @@ include/KF5/AkonadiCore/ItemCreateJob
 include/KF5/AkonadiCore/ItemDeleteJob
 include/KF5/AkonadiCore/ItemFetchJob
 include/KF5/AkonadiCore/ItemFetchScope
-include/KF5/AkonadiCore/ItemModel
 include/KF5/AkonadiCore/ItemModifyJob
 include/KF5/AkonadiCore/ItemMonitor
 include/KF5/AkonadiCore/ItemMoveJob
@@ -91,11 +89,9 @@ include/KF5/AkonadiCore/Job
 include/KF5/AkonadiCore/LinkJob
 include/KF5/AkonadiCore/MimeTypeChecker
 include/KF5/AkonadiCore/Monitor
-include/KF5/AkonadiCore/NewMailNotifierAttribute
 include/KF5/AkonadiCore/NotificationSubscriber
 include/KF5/AkonadiCore/PartFetcher
 include/KF5/AkonadiCore/PersistentSearchAttribute
-include/KF5/AkonadiCore/Pop3ResourceAttribute
 include/KF5/AkonadiCore/RecursiveCollectionFilterProxyModel
 include/KF5/AkonadiCore/RecursiveItemFetchJob
 include/KF5/AkonadiCore/Relation
@@ -141,7 +137,6 @@ include/KF5/AkonadiCore/agentmanager.h
 include/KF5/AkonadiCore/agenttype.h
 include/KF5/AkonadiCore/agenttypemodel.h
 include/KF5/AkonadiCore/akonadicore_export.h
-include/KF5/AkonadiCore/akoptional.h
 include/KF5/AkonadiCore/attribute.h
 include/KF5/AkonadiCore/attributefactory.h
 include/KF5/AkonadiCore/cachepolicy.h
@@ -186,7 +181,6 @@ include/KF5/AkonadiCore/itemcreatejob.h
 include/KF5/AkonadiCore/itemdeletejob.h
 include/KF5/AkonadiCore/itemfetchjob.h
 include/KF5/AkonadiCore/itemfetchscope.h
-include/KF5/AkonadiCore/itemmodel.h
 include/KF5/AkonadiCore/itemmodifyjob.h
 include/KF5/AkonadiCore/itemmonitor.h
 include/KF5/AkonadiCore/itemmovejob.h
@@ -198,12 +192,9 @@ include/KF5/AkonadiCore/job.h
 include/KF5/AkonadiCore/linkjob.h
 include/KF5/AkonadiCore/mimetypechecker.h
 include/KF5/AkonadiCore/monitor.h
-include/KF5/AkonadiCore/newmailnotifierattribute.h
 include/KF5/AkonadiCore/notificationsubscriber.h
-include/KF5/AkonadiCore/optional.hpp
 include/KF5/AkonadiCore/partfetcher.h
 include/KF5/AkonadiCore/persistentsearchattribute.h
-include/KF5/AkonadiCore/pop3resourceattribute.h
 include/KF5/AkonadiCore/qtest_akonadi.h
 include/KF5/AkonadiCore/recursivecollectionfilterproxymodel.h
 include/KF5/AkonadiCore/recursiveitemfetchjob.h
@@ -264,6 +255,7 @@ include/KF5/AkonadiWidgets/SubscriptionDialog
 include/KF5/AkonadiWidgets/TagEditWidget
 include/KF5/AkonadiWidgets/TagManagementDialog
 include/KF5/AkonadiWidgets/TagSelectWidget
+include/KF5/AkonadiWidgets/TagSelectionComboBox
 include/KF5/AkonadiWidgets/TagSelectionDialog
 include/KF5/AkonadiWidgets/TagWidget
 include/KF5/AkonadiWidgets/agentactionmanager.h
@@ -291,6 +283,7 @@ include/KF5/AkonadiWidgets/standardactionmanager.h
 include/KF5/AkonadiWidgets/subscriptiondialog.h
 include/KF5/AkonadiWidgets/tageditwidget.h
 include/KF5/AkonadiWidgets/tagmanagementdialog.h
+include/KF5/AkonadiWidgets/tagselectioncombobox.h
 include/KF5/AkonadiWidgets/tagselectiondialog.h
 include/KF5/AkonadiWidgets/tagselectwidget.h
 include/KF5/AkonadiWidgets/tagwidget.h
@@ -306,6 +299,7 @@ include/KF5/AkonadiXml/xmlwriter.h
 include/KF5/akonadi/abstractsearchplugin.h
 include/KF5/akonadi/private/akonadiprivate_export.h
 include/KF5/akonadi/private/capabilities_p.h
+include/KF5/akonadi/private/compressionstream_p.h
 include/KF5/akonadi/private/dbus_p.h
 include/KF5/akonadi/private/externalpartstorage_p.h
 include/KF5/akonadi/private/imapparser_p.h
@@ -325,19 +319,19 @@ lib/cmake/KF5Akonadi/KF5AkonadiTargets-noconfig.cmake
 lib/cmake/KF5Akonadi/KF5AkonadiTargets.cmake
 lib/libKF5AkonadiAgentBase.so
 lib/libKF5AkonadiAgentBase.so.5
-lib/libKF5AkonadiAgentBase.so.5.14.1
+lib/libKF5AkonadiAgentBase.so.5.16.3
 lib/libKF5AkonadiCore.so
 lib/libKF5AkonadiCore.so.5
-lib/libKF5AkonadiCore.so.5.14.1
+lib/libKF5AkonadiCore.so.5.16.3
 lib/libKF5AkonadiPrivate.so
 lib/libKF5AkonadiPrivate.so.5
-lib/libKF5AkonadiPrivate.so.5.14.1
+lib/libKF5AkonadiPrivate.so.5.16.3
 lib/libKF5AkonadiWidgets.so
 lib/libKF5AkonadiWidgets.so.5
-lib/libKF5AkonadiWidgets.so.5.14.1
+lib/libKF5AkonadiWidgets.so.5.16.3
 lib/libKF5AkonadiXml.so
 lib/libKF5AkonadiXml.so.5
-lib/libKF5AkonadiXml.so.5.14.1
+lib/libKF5AkonadiXml.so.5.16.3
 qt5/mkspecs/modules/qt_AkonadiAgentBase.pri
 qt5/mkspecs/modules/qt_AkonadiCore.pri
 qt5/mkspecs/modules/qt_AkonadiWidgets.pri
@@ -401,6 +395,8 @@ share/locale/es/LC_MESSAGES/akonadi_knut_resource.mo
 share/locale/es/LC_MESSAGES/libakonadi5.mo
 share/locale/et/LC_MESSAGES/akonadi_knut_resource.mo
 share/locale/et/LC_MESSAGES/libakonadi5.mo
+share/locale/eu/LC_MESSAGES/akonadi_knut_resource.mo
+share/locale/eu/LC_MESSAGES/libakonadi5.mo
 share/locale/fi/LC_MESSAGES/akonadi_knut_resource.mo
 share/locale/fi/LC_MESSAGES/libakonadi5.mo
 share/locale/fr/LC_MESSAGES/akonadi_knut_resource.mo
diff --git a/akonadi/distinfo b/akonadi/distinfo
index 8fdf20a8fc..bde735d258 100644
--- a/akonadi/distinfo
+++ b/akonadi/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-SHA1 (akonadi-20.04.1.tar.xz) = e114c7b633b88c4f209f60702311779e3df27ed7
-RMD160 (akonadi-20.04.1.tar.xz) = 319ea5c8307047d7220d0713f92c5ee8208d7f8f
-SHA512 (akonadi-20.04.1.tar.xz) = 25dcc2446b7a6143a6f709b4c6becb3b316e5680d0011a44f4af617289935b21c5c35936a6ccb96e56181a7ad4d00353dc0b6bcb6abe5fd042104adcb9c3e1d2
-Size (akonadi-20.04.1.tar.xz) = 1584156 bytes
+SHA1 (akonadi-20.12.3.tar.xz) = d08db9cd2a1297c5b671b323d86ff141aa28d27f
+RMD160 (akonadi-20.12.3.tar.xz) = 7d5bf421c58e524f3ddce0fb763a87204f7f5f32
+SHA512 (akonadi-20.12.3.tar.xz) = 516f240349b4a680ee8ab1986b8f3d018e9e54a8802aed404b3deb08491edd67413cc4bbb43aedc583f7110812b6bf41277f83908f54221cf21efb3b7f6e32df
+Size (akonadi-20.12.3.tar.xz) = 1593588 bytes
diff --git a/akonadiconsole/PLIST b/akonadiconsole/PLIST
index ea0e162f05..a4d4428eb0 100644
--- a/akonadiconsole/PLIST
+++ b/akonadiconsole/PLIST
@@ -1,7 +1,7 @@
 @comment $NetBSD$
 bin/akonadiconsole
 lib/libakonadiconsole.so.5
-lib/libakonadiconsole.so.5.14.1
+lib/libakonadiconsole.so.5.16.3
 share/applications/org.kde.akonadiconsole.desktop
 share/icons/hicolor/128x128/apps/akonadiconsole.png
 share/icons/hicolor/16x16/apps/akonadiconsole.png
diff --git a/akonadiconsole/distinfo b/akonadiconsole/distinfo
index 7d1f008743..09bb92c76f 100644
--- a/akonadiconsole/distinfo
+++ b/akonadiconsole/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-SHA1 (akonadiconsole-20.04.1.tar.xz) = 3c27672aa938a25b308d9813596b6c6e284839dd
-RMD160 (akonadiconsole-20.04.1.tar.xz) = ec82cf0ea7a3091be83fc4bf920510222ab6233b
-SHA512 (akonadiconsole-20.04.1.tar.xz) = d0c344bcdd0f4bc8917710f771a875f6039bc0b27d86de1f49a54b7b5dd85b026f09d11e114be0090990f70560fe70768e7237268cd88deb51d3ffc2b8152ecb
-Size (akonadiconsole-20.04.1.tar.xz) = 193596 bytes
+SHA1 (akonadiconsole-20.12.3.tar.xz) = e3ae24663cfa91d0030cba54a2d3f6e6b5a0d005
+RMD160 (akonadiconsole-20.12.3.tar.xz) = 74819420020e87033070195176300c570343bd47
+SHA512 (akonadiconsole-20.12.3.tar.xz) = 6a24e4ea642621472f28d9ead78247830393ce2b917a0f8386890c2a61de4a95250e9cf0823a58a53501955e250860c55c0b536486ffd2b9d71b2347f47d2e82
+Size (akonadiconsole-20.12.3.tar.xz) = 198064 bytes
diff --git a/akregator/PLIST b/akregator/PLIST
index c9a52dcf67..ccabe37aa7 100644
--- a/akregator/PLIST
+++ b/akregator/PLIST
@@ -3,9 +3,9 @@ bin/akregator
 bin/akregatorstorageexporter
 lib/libakregatorinterfaces.so
 lib/libakregatorinterfaces.so.5
-lib/libakregatorinterfaces.so.5.14.1
+lib/libakregatorinterfaces.so.5.16.3
 lib/libakregatorprivate.so.5
-lib/libakregatorprivate.so.5.14.1
+lib/libakregatorprivate.so.5.16.3
 qt5/plugins/akregator_config_advanced.so
 qt5/plugins/akregator_config_appearance.so
 qt5/plugins/akregator_config_archive.so
@@ -14,7 +14,7 @@ qt5/plugins/akregator_config_general.so
 qt5/plugins/akregator_config_plugins.so
 qt5/plugins/akregator_mk4storage_plugin.so
 qt5/plugins/akregatorpart.so
-qt5/plugins/kontact_akregatorplugin.so
+qt5/plugins/kontact5/kontact_akregatorplugin.so
 share/akregator/grantleetheme/5.2/combinedview.html
 share/akregator/grantleetheme/5.2/defaultnormalvisitfeed.html
 share/akregator/grantleetheme/5.2/defaultnormalvisitfolder.html
@@ -30,17 +30,13 @@ share/doc/HTML/ca/akregator/advanced-tab.png
 share/doc/HTML/ca/akregator/appearance-tab.png
 share/doc/HTML/ca/akregator/archive-tab.png
 share/doc/HTML/ca/akregator/browser-tab.png
-share/doc/HTML/ca/akregator/feed.png
 share/doc/HTML/ca/akregator/general-tab.png
 share/doc/HTML/ca/akregator/index.cache.bz2
 share/doc/HTML/ca/akregator/index.docbook
 share/doc/HTML/ca/akregator/interceptor-tab.png
-share/doc/HTML/ca/akregator/konq.png
-share/doc/HTML/ca/akregator/konq2.png
 share/doc/HTML/ca/akregator/main-window.png
 share/doc/HTML/ca/akregator/main-window2.png
 share/doc/HTML/ca/akregator/main-window4.png
-share/doc/HTML/ca/akregator/rss.png
 share/doc/HTML/de/akregator/index.cache.bz2
 share/doc/HTML/de/akregator/index.docbook
 share/doc/HTML/en/akregator/add-feed.png
@@ -69,6 +65,8 @@ share/doc/HTML/es/akregator/index.cache.bz2
 share/doc/HTML/es/akregator/index.docbook
 share/doc/HTML/et/akregator/index.cache.bz2
 share/doc/HTML/et/akregator/index.docbook
+share/doc/HTML/fr/akregator/index.cache.bz2
+share/doc/HTML/fr/akregator/index.docbook
 share/doc/HTML/it/akregator/index.cache.bz2
 share/doc/HTML/it/akregator/index.docbook
 share/doc/HTML/nl/akregator/index.cache.bz2
@@ -115,7 +113,6 @@ share/kservices5/akregator_config_browser.desktop
 share/kservices5/akregator_config_general.desktop
 share/kservices5/akregator_config_plugins.desktop
 share/kservices5/akregator_mk4storage_plugin.desktop
-share/kservices5/akregator_part.desktop
 share/kservices5/feed.protocol
 share/kservices5/kontact/akregatorplugin.desktop
 share/kservicetypes5/akregator_plugin.desktop
diff --git a/akregator/distinfo b/akregator/distinfo
index 1c7ea34def..66b03d8624 100644
--- a/akregator/distinfo
+++ b/akregator/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-SHA1 (akregator-20.04.1.tar.xz) = 7bd0b766ab54883a5d1b3138ef96ff3d6b2d6475
-RMD160 (akregator-20.04.1.tar.xz) = 7ecb89066c21de85444bd26f8355da7a5687d55d
-SHA512 (akregator-20.04.1.tar.xz) = 0589f533e2b7ced74ca61d27a4aa606a7a8eb9437e103c56f13bee7dfd0fcbda61360a8575d6004281a742b1f5fd869a1d0db817d0d2f818ed0c84a177b1fcb9
-Size (akregator-20.04.1.tar.xz) = 2196636 bytes
+SHA1 (akregator-20.12.3.tar.xz) = ccd7d7ba3fe7a848f8ac7f40bb95fe28395d181f
+RMD160 (akregator-20.12.3.tar.xz) = 92c903fe9e9322339c8d7e773cc8c6290fc78d1f
+SHA512 (akregator-20.12.3.tar.xz) = f223c45fb63a844a1f662c3a77a1f6d23a9b0f8de738fd3a0a88379a82c1be4343536f6ae11856839b03406181ed1bc42cee8ab2cb1ff2515a74a2adb2327ad7
+Size (akregator-20.12.3.tar.xz) = 2206188 bytes
diff --git a/calendarsupport/Makefile b/calendarsupport/Makefile
index ab1d144768..7fa87b8f0e 100644
--- a/calendarsupport/Makefile
+++ b/calendarsupport/Makefile
@@ -13,7 +13,8 @@ USE_TOOLS+=	msgmerge
 
 .include "../../devel/boost-headers/buildlink3.mk"
 .include "../../wip/akonadi-calendar/buildlink3.mk"
-.include "../../wip/kdepim-apps-libs/buildlink3.mk"
+.include "../../wip/akonadi-notes/buildlink3.mk"
+#.include "../../wip/kdepim-apps-libs/buildlink3.mk"
 .include "../../time/kholidays/buildlink3.mk"
 .include "../../wip/pimcommon/buildlink3.mk"
 .include "../../x11/qt5-qtbase/buildlink3.mk"
diff --git a/calendarsupport/PLIST b/calendarsupport/PLIST
index b6201feb6a..32f1828595 100644
--- a/calendarsupport/PLIST
+++ b/calendarsupport/PLIST
@@ -16,9 +16,12 @@ include/KF5/CalendarSupport/FreePeriodModel
 include/KF5/CalendarSupport/IdentityManager
 include/KF5/CalendarSupport/IncidenceViewer
 include/KF5/CalendarSupport/KCalPrefs
+include/KF5/CalendarSupport/KDatePickerPopup
 include/KF5/CalendarSupport/MessageWidget
+include/KF5/CalendarSupport/NoteEditDialog
 include/KF5/CalendarSupport/Plugin
 include/KF5/CalendarSupport/PrintPlugin
+include/KF5/CalendarSupport/UriHandler
 include/KF5/CalendarSupport/Utils
 include/KF5/calendarsupport/archivedialog.h
 include/KF5/calendarsupport/calendarsingleton.h
@@ -39,7 +42,9 @@ include/KF5/calendarsupport/identitymanager.h
 include/KF5/calendarsupport/incidenceviewer.h
 include/KF5/calendarsupport/kcalprefs.h
 include/KF5/calendarsupport/kcalprefs_base.h
+include/KF5/calendarsupport/kdatepickerpopup.h
 include/KF5/calendarsupport/messagewidget.h
+include/KF5/calendarsupport/noteeditdialog.h
 include/KF5/calendarsupport/plugin.h
 include/KF5/calendarsupport/printplugin.h
 include/KF5/calendarsupport/ui_calprintdayconfig_base.h
@@ -47,6 +52,7 @@ include/KF5/calendarsupport/ui_calprintincidenceconfig_base.h
 include/KF5/calendarsupport/ui_calprintmonthconfig_base.h
 include/KF5/calendarsupport/ui_calprinttodoconfig_base.h
 include/KF5/calendarsupport/ui_calprintweekconfig_base.h
+include/KF5/calendarsupport/urihandler.h
 include/KF5/calendarsupport/utils.h
 include/KF5/calendarsupport_version.h
 lib/cmake/KF5CalendarSupport/KF5CalendarSupportConfig.cmake
@@ -55,7 +61,7 @@ lib/cmake/KF5CalendarSupport/KF5CalendarSupportTargets-noconfig.cmake
 lib/cmake/KF5CalendarSupport/KF5CalendarSupportTargets.cmake
 lib/libKF5CalendarSupport.so
 lib/libKF5CalendarSupport.so.5
-lib/libKF5CalendarSupport.so.5.14.1
+lib/libKF5CalendarSupport.so.5.16.3
 qt5/mkspecs/modules/qt_CalendarSupport.pri
 share/kservicetypes5/calendarplugin.desktop
 share/locale/ar/LC_MESSAGES/calendarsupport.mo
diff --git a/calendarsupport/buildlink3.mk b/calendarsupport/buildlink3.mk
index 48cf32b5b5..9f0a99a610 100644
--- a/calendarsupport/buildlink3.mk
+++ b/calendarsupport/buildlink3.mk
@@ -9,7 +9,7 @@ BUILDLINK_API_DEPENDS.calendarsupport+=	calendarsupport>=20.04.1
 BUILDLINK_PKGSRCDIR.calendarsupport?=	../../wip/calendarsupport
 
 .include "../../wip/akonadi-calendar/buildlink3.mk"
-.include "../../wip/kdepim-apps-libs/buildlink3.mk"
+#.include "../../wip/kdepim-apps-libs/buildlink3.mk"
 .include "../../time/kholidays/buildlink3.mk"
 .include "../../wip/pimcommon/buildlink3.mk"
 .include "../../x11/qt5-qtbase/buildlink3.mk"
diff --git a/calendarsupport/distinfo b/calendarsupport/distinfo
index 29a34a197b..8929dc3f85 100644
--- a/calendarsupport/distinfo
+++ b/calendarsupport/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-SHA1 (calendarsupport-20.04.1.tar.xz) = 6e229cd1cdd3cb02cf1b1ea1ef0f153c4feee7da
-RMD160 (calendarsupport-20.04.1.tar.xz) = ce3329907b12ae8219185b2346fe8a27e6a5b8f0
-SHA512 (calendarsupport-20.04.1.tar.xz) = 20683b00caa3cc91457517e8f68b01a52c75952383887d0c9f9e41f49cb794246701da92194fbf43e25b67b99f852a4a4443e28b20bd955921678c53c980ec9d
-Size (calendarsupport-20.04.1.tar.xz) = 651560 bytes
+SHA1 (calendarsupport-20.12.3.tar.xz) = 98eb975dbe924820bbf45161797db683c7f5615e
+RMD160 (calendarsupport-20.12.3.tar.xz) = b894b42e2d281b6db9a61828bee6dbb24bbef2fe
+SHA512 (calendarsupport-20.12.3.tar.xz) = cfb2c1faabdeae1aee13d1f0a6e3b960b68e835e5f96dc86acb9af7c84d57516b3e7ab131e9f0dda12db41e26aabe65f02c4326c989ed2f54620325e6b11196e
+Size (calendarsupport-20.12.3.tar.xz) = 666200 bytes
diff --git a/eventviews/PLIST b/eventviews/PLIST
index 675d313b17..cd4683f220 100644
--- a/eventviews/PLIST
+++ b/eventviews/PLIST
@@ -41,7 +41,7 @@ lib/cmake/KF5EventViews/KF5EventViewsTargets-noconfig.cmake
 lib/cmake/KF5EventViews/KF5EventViewsTargets.cmake
 lib/libKF5EventViews.so
 lib/libKF5EventViews.so.5
-lib/libKF5EventViews.so.5.14.1
+lib/libKF5EventViews.so.5.16.3
 qt5/mkspecs/modules/qt_EventViews.pri
 share/kservicetypes5/calendardecoration.desktop
 share/locale/ar/LC_MESSAGES/libeventviews.mo
diff --git a/eventviews/distinfo b/eventviews/distinfo
index 1d759ef3a2..4c2cece422 100644
--- a/eventviews/distinfo
+++ b/eventviews/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-SHA1 (eventviews-20.04.1.tar.xz) = 7ea98d31fa00dd01edbe409e3356027d4f3e1847
-RMD160 (eventviews-20.04.1.tar.xz) = 0d7308d5954b0b3b052ea370940ca62da2c97d14
-SHA512 (eventviews-20.04.1.tar.xz) = a9e653be1b94aff0813d799f275381c15373151b0bf35885c385c54877323b52d0b1b90acf2960e08f9a726a57c430055b31685b613792de61d0148bc37c97b6
-Size (eventviews-20.04.1.tar.xz) = 443928 bytes
+SHA1 (eventviews-20.12.3.tar.xz) = d0963e3aab93f73ed4bf8bb5a44258b6ad3f968d
+RMD160 (eventviews-20.12.3.tar.xz) = d12a9a4ccea07358362e588b4933176be3c964ff
+SHA512 (eventviews-20.12.3.tar.xz) = a9f69fceffe8772cd059e5407660ef040bd9e4a4d8bff8ef4b4be3e18df989b74e4bb8c66b5d42251c89aeac9b1602fed08e75380e332182160c0a00c9a334cc
+Size (eventviews-20.12.3.tar.xz) = 444100 bytes
diff --git a/ffmpegthumbs/Makefile b/ffmpegthumbs/Makefile
index 8f9ddf7f96..f2fcd627a9 100644
--- a/ffmpegthumbs/Makefile
+++ b/ffmpegthumbs/Makefile
@@ -11,6 +11,7 @@ LICENSE=	gnu-gpl-v2 AND gnu-fdl-v1.2 AND gnu-lgpl-v2
 
 USE_TOOLS+=	pkg-config
 
+.include "../../audio/taglib/buildlink3.mk"
 .include "../../devel/kio/buildlink3.mk"
 .include "../../multimedia/ffmpeg4/buildlink3.mk"
 .include "../../x11/qt5-qtbase/buildlink3.mk"
diff --git a/ffmpegthumbs/PLIST b/ffmpegthumbs/PLIST
index 8d932734b8..83dd4b9d65 100644
--- a/ffmpegthumbs/PLIST
+++ b/ffmpegthumbs/PLIST
@@ -15,16 +15,21 @@ share/locale/eu/LC_MESSAGES/ffmpegthumbs.mo
 share/locale/fi/LC_MESSAGES/ffmpegthumbs.mo
 share/locale/fr/LC_MESSAGES/ffmpegthumbs.mo
 share/locale/gl/LC_MESSAGES/ffmpegthumbs.mo
+share/locale/hi/LC_MESSAGES/ffmpegthumbs.mo
+share/locale/ia/LC_MESSAGES/ffmpegthumbs.mo
 share/locale/it/LC_MESSAGES/ffmpegthumbs.mo
 share/locale/ja/LC_MESSAGES/ffmpegthumbs.mo
 share/locale/ko/LC_MESSAGES/ffmpegthumbs.mo
 share/locale/lt/LC_MESSAGES/ffmpegthumbs.mo
 share/locale/nl/LC_MESSAGES/ffmpegthumbs.mo
+share/locale/nn/LC_MESSAGES/ffmpegthumbs.mo
 share/locale/pl/LC_MESSAGES/ffmpegthumbs.mo
 share/locale/pt/LC_MESSAGES/ffmpegthumbs.mo
 share/locale/pt_BR/LC_MESSAGES/ffmpegthumbs.mo
+share/locale/ro/LC_MESSAGES/ffmpegthumbs.mo
 share/locale/ru/LC_MESSAGES/ffmpegthumbs.mo
 share/locale/sk/LC_MESSAGES/ffmpegthumbs.mo
+share/locale/sl/LC_MESSAGES/ffmpegthumbs.mo
 share/locale/sv/LC_MESSAGES/ffmpegthumbs.mo
 share/locale/uk/LC_MESSAGES/ffmpegthumbs.mo
 share/locale/zh_CN/LC_MESSAGES/ffmpegthumbs.mo
diff --git a/ffmpegthumbs/distinfo b/ffmpegthumbs/distinfo
index 92d4968c5a..cf1fc7405e 100644
--- a/ffmpegthumbs/distinfo
+++ b/ffmpegthumbs/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-SHA1 (ffmpegthumbs-20.04.1.tar.xz) = 2c6655a39f75332b39abe2d39900a97cec66f702
-RMD160 (ffmpegthumbs-20.04.1.tar.xz) = 36a47dd1c863a85a41bc0abb8912a1247cace090
-SHA512 (ffmpegthumbs-20.04.1.tar.xz) = 12e365401b415c5495bac0a9bed733c71f002dbf5060609d182aa41db7eada8ccc92f8e0cf99e5d0ea31338be42cb359d08f67215760341eb4b73b0b50a990eb
-Size (ffmpegthumbs-20.04.1.tar.xz) = 27372 bytes
+SHA1 (ffmpegthumbs-20.12.3.tar.xz) = db74414d1c0786e4e8b89ba74be30b490308f3e9
+RMD160 (ffmpegthumbs-20.12.3.tar.xz) = b00f563770ae5e4d0598e6c67e0c56d34275e8bd
+SHA512 (ffmpegthumbs-20.12.3.tar.xz) = d81f89fa3c26982d9f7e84f76b2deb562308467376b5f01af9acda1bc2d62e21cc3054afe5bcbad5d098e3ecf79d9e9b0adee7e719127aaab228ee8efa190aad
+Size (ffmpegthumbs-20.12.3.tar.xz) = 34088 bytes
diff --git a/grantlee-editor/PLIST b/grantlee-editor/PLIST
index e8eb9b3da9..3bb4d4ef6f 100644
--- a/grantlee-editor/PLIST
+++ b/grantlee-editor/PLIST
@@ -4,7 +4,7 @@ bin/contactthemeeditor
 bin/headerthemeeditor
 lib/libgrantleethemeeditor.so
 lib/libgrantleethemeeditor.so.5
-lib/libgrantleethemeeditor.so.5.14.1
+lib/libgrantleethemeeditor.so.5.16.3
 share/applications/org.kde.contactprintthemeeditor.desktop
 share/applications/org.kde.contactthemeeditor.desktop
 share/applications/org.kde.headerthemeeditor.desktop
diff --git a/grantlee-editor/distinfo b/grantlee-editor/distinfo
index b27a0b8d3d..e7d9323e53 100644
--- a/grantlee-editor/distinfo
+++ b/grantlee-editor/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-SHA1 (grantlee-editor-20.04.1.tar.xz) = c7dbfe6cf08cf0663737af7a9f7128aa495032c6
-RMD160 (grantlee-editor-20.04.1.tar.xz) = 656ab5e78e6a9cb21f2cbb71b8f1d6e2b3247764
-SHA512 (grantlee-editor-20.04.1.tar.xz) = 5f1a3141b3a43d8778a4af29b611ce53f75a0b8eeafff0fe5464e376f336825a4d4b9fc4dff74dfab25de618e81114d576ed984a14fd4db97a6b37e6d00f9d34
-Size (grantlee-editor-20.04.1.tar.xz) = 111228 bytes
+SHA1 (grantlee-editor-20.12.3.tar.xz) = f506fa8f8c9fbbdf20efc7dea046bda287e081da
+RMD160 (grantlee-editor-20.12.3.tar.xz) = a2fce8186d379d2f24379da9e0f33d2e13b7ff18
+SHA512 (grantlee-editor-20.12.3.tar.xz) = 7e601b8f180e502f639ee6fc62fea45c383602a8d9732034ffb5a14d27bf4ec47fe5115e09eb8bca6ba039fa703765fe57aab9b5221c70e05deac2438dcf2fbb
+Size (grantlee-editor-20.12.3.tar.xz) = 107424 bytes
diff --git a/grantleetheme/PLIST b/grantleetheme/PLIST
index accbc741c6..81da840333 100644
--- a/grantleetheme/PLIST
+++ b/grantleetheme/PLIST
@@ -26,7 +26,7 @@ lib/cmake/KF5GrantleeTheme/KF5GrantleeThemeTargets.cmake
 lib/grantlee/5.2/kde_grantlee_plugin.so
 lib/libKF5GrantleeTheme.so
 lib/libKF5GrantleeTheme.so.5
-lib/libKF5GrantleeTheme.so.5.14.1
+lib/libKF5GrantleeTheme.so.5.16.3
 qt5/mkspecs/modules/qt_GrantleeTheme.pri
 share/locale/ar/LC_MESSAGES/libgrantleetheme.mo
 share/locale/bg/LC_MESSAGES/libgrantleetheme.mo
@@ -40,6 +40,7 @@ share/locale/el/LC_MESSAGES/libgrantleetheme.mo
 share/locale/en_GB/LC_MESSAGES/libgrantleetheme.mo
 share/locale/es/LC_MESSAGES/libgrantleetheme.mo
 share/locale/et/LC_MESSAGES/libgrantleetheme.mo
+share/locale/eu/LC_MESSAGES/libgrantleetheme.mo
 share/locale/fi/LC_MESSAGES/libgrantleetheme.mo
 share/locale/fr/LC_MESSAGES/libgrantleetheme.mo
 share/locale/gl/LC_MESSAGES/libgrantleetheme.mo
@@ -53,6 +54,7 @@ share/locale/lt/LC_MESSAGES/libgrantleetheme.mo
 share/locale/nb/LC_MESSAGES/libgrantleetheme.mo
 share/locale/nds/LC_MESSAGES/libgrantleetheme.mo
 share/locale/nl/LC_MESSAGES/libgrantleetheme.mo
+share/locale/nn/LC_MESSAGES/libgrantleetheme.mo
 share/locale/pl/LC_MESSAGES/libgrantleetheme.mo
 share/locale/pt/LC_MESSAGES/libgrantleetheme.mo
 share/locale/pt_BR/LC_MESSAGES/libgrantleetheme.mo
diff --git a/grantleetheme/distinfo b/grantleetheme/distinfo
index df5d1747ee..a000682d09 100644
--- a/grantleetheme/distinfo
+++ b/grantleetheme/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-SHA1 (grantleetheme-20.04.1.tar.xz) = e3227bb6aa64752aebd5e79edfc575e729f1d94f
-RMD160 (grantleetheme-20.04.1.tar.xz) = 2cd406fc5e36164c8df2f20789054e1d9c2baa59
-SHA512 (grantleetheme-20.04.1.tar.xz) = 9521b239844c10729e74bcb0ab218563ce6d1a987608348f9f8e02fea745579a9f5a203f56cefecf4842c092f14b1aa881951cb7c91aa8ac7fc6faf370f23b39
-Size (grantleetheme-20.04.1.tar.xz) = 54964 bytes
+SHA1 (grantleetheme-20.12.3.tar.xz) = da9dd94a351d262274a68bf64811cb1e0b2572e6
+RMD160 (grantleetheme-20.12.3.tar.xz) = ed434ce054904307ad16f2bd0030ebc0a39950ec
+SHA512 (grantleetheme-20.12.3.tar.xz) = 8daa07c7903dbff3b2435c35f31e8ff0fc7b7d29ca6f8f05473ef09331c0fc14bb18f419c575c2f4f4778fb6847f5f202b2a30d6e2d699bc57711ee8028f3ac1
+Size (grantleetheme-20.12.3.tar.xz) = 56540 bytes
diff --git a/incidenceeditor/PLIST b/incidenceeditor/PLIST
index 7070653380..ecfe9fc44d 100644
--- a/incidenceeditor/PLIST
+++ b/incidenceeditor/PLIST
@@ -25,7 +25,7 @@ lib/cmake/KF5IncidenceEditor/KF5IncidenceEditorTargets-noconfig.cmake
 lib/cmake/KF5IncidenceEditor/KF5IncidenceEditorTargets.cmake
 lib/libKF5IncidenceEditor.so
 lib/libKF5IncidenceEditor.so.5
-lib/libKF5IncidenceEditor.so.5.14.1
+lib/libKF5IncidenceEditor.so.5.16.3
 qt5/mkspecs/modules/qt_IncidenceEditor.pri
 share/locale/ar/LC_MESSAGES/libincidenceeditors.mo
 share/locale/bs/LC_MESSAGES/libincidenceeditors.mo
diff --git a/incidenceeditor/distinfo b/incidenceeditor/distinfo
index 0547eb6e1e..849901c9e7 100644
--- a/incidenceeditor/distinfo
+++ b/incidenceeditor/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-SHA1 (incidenceeditor-20.04.1.tar.xz) = d8250db5a1e54f2d25d30e304c01905efa7aae1a
-RMD160 (incidenceeditor-20.04.1.tar.xz) = 04417563787c8bf767d62704168290f4c131ac4b
-SHA512 (incidenceeditor-20.04.1.tar.xz) = f9a578f1fb79f1bbc106668621116dbb7284dd955673a09d1affa994d094069820da53db9f032bc79850efc8ae021fdc2c81c2732dc84b1cf082e31df08b01c6
-Size (incidenceeditor-20.04.1.tar.xz) = 550032 bytes
+SHA1 (incidenceeditor-20.12.3.tar.xz) = f28e50fc4fecfbbbb0d22bbf06da4564c9209ad2
+RMD160 (incidenceeditor-20.12.3.tar.xz) = aa4496053ba1aaff6d3cef66740d6c0974c32d2c
+SHA512 (incidenceeditor-20.12.3.tar.xz) = cd344322ae026c9782fdd2756c5206b89bb8dc475f38addfc58b3622ea4ab8106287d32b0105506c0b4491c2575b227ea52570c486a29e019b7495f41ba5aa90
+Size (incidenceeditor-20.12.3.tar.xz) = 546308 bytes
diff --git a/kaddressbook/Makefile b/kaddressbook/Makefile
index 8c338c672c..6d8079b0de 100644
--- a/kaddressbook/Makefile
+++ b/kaddressbook/Makefile
@@ -16,7 +16,7 @@ USE_TOOLS+=	msgmerge
 .include "../../devel/boost-headers/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../wip/kdepim-runtime/buildlink3.mk"
-.include "../../wip/kdepim-apps-libs/buildlink3.mk"
+#.include "../../wip/kdepim-apps-libs/buildlink3.mk"
 .include "../../wip/kontactinterface/buildlink3.mk"
 .include "../../x11/qt5-qtbase/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/kaddressbook/PLIST b/kaddressbook/PLIST
index c8ac9fd7b2..2e2854d0e7 100644
--- a/kaddressbook/PLIST
+++ b/kaddressbook/PLIST
@@ -1,11 +1,40 @@
 @comment $NetBSD$
 bin/kaddressbook
+include/KPim/KAddressBookImportExport/ContactFields
+include/KPim/KAddressBookImportExport/ContactList
+include/KPim/KAddressBookImportExport/ContactSelectionDialog
+include/KPim/KAddressBookImportExport/ContactSelectionWidget
+include/KPim/KAddressBookImportExport/ExportSelectionWidget
+include/KPim/KAddressBookImportExport/ImportExportEngine
+include/KPim/KAddressBookImportExport/Plugin
+include/KPim/KAddressBookImportExport/PluginInterface
+include/KPim/KAddressBookImportExport/PluginManager
+include/KPim/kaddressbookimportexport/contactfields.h
+include/KPim/kaddressbookimportexport/contactlist.h
+include/KPim/kaddressbookimportexport/contactselectiondialog.h
+include/KPim/kaddressbookimportexport/contactselectionwidget.h
+include/KPim/kaddressbookimportexport/exportselectionwidget.h
+include/KPim/kaddressbookimportexport/importexportengine.h
+include/KPim/kaddressbookimportexport/kaddressbook_importexport_export.h
+include/KPim/kaddressbookimportexport/plugin.h
+include/KPim/kaddressbookimportexport/plugininterface.h
+include/KPim/kaddressbookimportexport/pluginmanager.h
+include/KPim/kaddressbookimportexport_version.h
+lib/cmake/KPimAddressbookImportExport/KPimAddressbookImportExportConfig.cmake
+lib/cmake/KPimAddressbookImportExport/KPimAddressbookImportExportConfigVersion.cmake
+lib/cmake/KPimAddressbookImportExport/KPimAddressbookImportExportTargets-noconfig.cmake
+lib/cmake/KPimAddressbookImportExport/KPimAddressbookImportExportTargets.cmake
+lib/libKPimAddressbookImportExport.so
+lib/libKPimAddressbookImportExport.so.5
+lib/libKPimAddressbookImportExport.so.5.16.3
 lib/libkaddressbookprivate.so.5
-lib/libkaddressbookprivate.so.5.14.1
+lib/libkaddressbookprivate.so.5.16.3
+qt5/mkspecs/modules/qt_KAddressbookImportExport.pri
 qt5/plugins/kaddressbook_config_plugins.so
 qt5/plugins/kaddressbookpart.so
-qt5/plugins/kontact_kaddressbookplugin.so
+qt5/plugins/kontact5/kontact_kaddressbookplugin.so
 share/applications/kaddressbook-importer.desktop
+share/applications/kaddressbook-view.desktop
 share/applications/org.kde.kaddressbook.desktop
 share/doc/HTML/ca/kaddressbook/docbook-reference.docbook
 share/doc/HTML/ca/kaddressbook/index.cache.bz2
@@ -29,6 +58,11 @@ share/doc/HTML/en/kaddressbook/addressbook121.png
 share/doc/HTML/en/kaddressbook/addressbook122.png
 share/doc/HTML/en/kaddressbook/addressbook123.png
 share/doc/HTML/en/kaddressbook/addressbook130.png
+share/doc/HTML/en/kaddressbook/addressbook131.png
+share/doc/HTML/en/kaddressbook/addressbook132.png
+share/doc/HTML/en/kaddressbook/addressbook133.png
+share/doc/HTML/en/kaddressbook/addressbook134.png
+share/doc/HTML/en/kaddressbook/addressbook135.png
 share/doc/HTML/en/kaddressbook/addressbook20.png
 share/doc/HTML/en/kaddressbook/addressbook30.png
 share/doc/HTML/en/kaddressbook/addressbook31.png
@@ -106,6 +140,46 @@ share/doc/HTML/en/kaddressbook/tools-report-bug.png
 share/doc/HTML/en/kaddressbook/user-group-new.png
 share/doc/HTML/en/kaddressbook/view-calendar-birthday.png
 share/doc/HTML/en/kaddressbook/view-refresh.png
+share/doc/HTML/it/kaddressbook/addressbook00.png
+share/doc/HTML/it/kaddressbook/addressbook10.png
+share/doc/HTML/it/kaddressbook/addressbook20.png
+share/doc/HTML/it/kaddressbook/addressbook30.png
+share/doc/HTML/it/kaddressbook/addressbook31.png
+share/doc/HTML/it/kaddressbook/addressbook32.png
+share/doc/HTML/it/kaddressbook/addressbook33.png
+share/doc/HTML/it/kaddressbook/addressbook34.png
+share/doc/HTML/it/kaddressbook/addressbook35.png
+share/doc/HTML/it/kaddressbook/addressbook40.png
+share/doc/HTML/it/kaddressbook/addressbook50.png
+share/doc/HTML/it/kaddressbook/addressbook51.png
+share/doc/HTML/it/kaddressbook/addressbook52.png
+share/doc/HTML/it/kaddressbook/addressbook53.png
+share/doc/HTML/it/kaddressbook/addressbook54.png
+share/doc/HTML/it/kaddressbook/addressbook55.png
+share/doc/HTML/it/kaddressbook/addressbook60.png
+share/doc/HTML/it/kaddressbook/addressbook61.png
+share/doc/HTML/it/kaddressbook/addressbook71.png
+share/doc/HTML/it/kaddressbook/addressbook72.png
+share/doc/HTML/it/kaddressbook/addressbook73.png
+share/doc/HTML/it/kaddressbook/addressbook74.png
+share/doc/HTML/it/kaddressbook/addressbook75.png
+share/doc/HTML/it/kaddressbook/addressbook76.png
+share/doc/HTML/it/kaddressbook/addressbook77.png
+share/doc/HTML/it/kaddressbook/addressbook80.png
+share/doc/HTML/it/kaddressbook/addressbook81.png
+share/doc/HTML/it/kaddressbook/addressbook82.png
+share/doc/HTML/it/kaddressbook/addressbook83.png
+share/doc/HTML/it/kaddressbook/addressbook84.png
+share/doc/HTML/it/kaddressbook/addressbook85.png
+share/doc/HTML/it/kaddressbook/addressbook86.png
+share/doc/HTML/it/kaddressbook/addressbook87.png
+share/doc/HTML/it/kaddressbook/addressbook92.png
+share/doc/HTML/it/kaddressbook/addressbook93.png
+share/doc/HTML/it/kaddressbook/addressbook94.png
+share/doc/HTML/it/kaddressbook/addressbook95.png
+share/doc/HTML/it/kaddressbook/docbook-reference.docbook
+share/doc/HTML/it/kaddressbook/index.cache.bz2
+share/doc/HTML/it/kaddressbook/index.docbook
 share/doc/HTML/nl/kaddressbook/docbook-reference.docbook
 share/doc/HTML/nl/kaddressbook/index.cache.bz2
 share/doc/HTML/nl/kaddressbook/index.docbook
@@ -192,7 +266,6 @@ share/kconf_update/kaddressbook-15.08-kickoff.sh
 share/kconf_update/kaddressbook.upd
 share/kontact/ksettingsdialog/kaddressbook.setdlg
 share/kservices5/kaddressbook_config_plugins.desktop
-share/kservices5/kaddressbookpart.desktop
 share/kservices5/kontact/kaddressbookplugin.desktop
 share/locale/ar/LC_MESSAGES/kaddressbook.mo
 share/locale/bg/LC_MESSAGES/kaddressbook.mo
diff --git a/kaddressbook/distinfo b/kaddressbook/distinfo
index d2251b9e55..1971d6ec46 100644
--- a/kaddressbook/distinfo
+++ b/kaddressbook/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-SHA1 (kaddressbook-20.04.1.tar.xz) = 7755c518e4c67a43edd832337340cb895c60b5a3
-RMD160 (kaddressbook-20.04.1.tar.xz) = 9f1d0e04ab817a7a48bc66ecb3970454768141bb
-SHA512 (kaddressbook-20.04.1.tar.xz) = e74ac9d5cec29cab9be2a1a69868927a2f95e8556edbf278af1a7230823c81b5a0680f97b22b653153f880b59e9a41bdbcf41a29cb46999e929a25fdf27d9afb
-Size (kaddressbook-20.04.1.tar.xz) = 2427612 bytes
+SHA1 (kaddressbook-20.12.3.tar.xz) = 3e9f998828c2b3c527d5ea359126ecf6e2d2950f
+RMD160 (kaddressbook-20.12.3.tar.xz) = 1f26e9b743eab5dc525fca5a388bb767060c655e
+SHA512 (kaddressbook-20.12.3.tar.xz) = 6f8b069222734fd3d42078d1bb2401db8dc4d8697c0383e49c47479b559fd7776b0ae7f7f757e2e767c2a173b1738c7ba8adda928481ac947dbfd404fdaa0434
+Size (kaddressbook-20.12.3.tar.xz) = 3263556 bytes
diff --git a/kalarm/PLIST b/kalarm/PLIST
index 949e0a5d2f..494ee8805e 100644
--- a/kalarm/PLIST
+++ b/kalarm/PLIST
@@ -14,7 +14,6 @@ share/doc/HTML/ca/kalarm/index.cache.bz2
 share/doc/HTML/ca/kalarm/index.docbook
 share/doc/HTML/ca/kalarm/mainwindow-calendars.png
 share/doc/HTML/ca/kalarm/mainwindow.png
-share/doc/HTML/ca/kalarm/spinbox.png
 share/doc/HTML/de/kalarm/index.cache.bz2
 share/doc/HTML/de/kalarm/index.docbook
 share/doc/HTML/en/kalarm/alarmmessage.png
@@ -37,6 +36,8 @@ share/doc/HTML/pt/kalarm/index.cache.bz2
 share/doc/HTML/pt/kalarm/index.docbook
 share/doc/HTML/pt_BR/kalarm/index.cache.bz2
 share/doc/HTML/pt_BR/kalarm/index.docbook
+share/doc/HTML/ru/kalarm/index.cache.bz2
+share/doc/HTML/ru/kalarm/index.docbook
 share/doc/HTML/sv/kalarm/index.cache.bz2
 share/doc/HTML/sv/kalarm/index.docbook
 share/doc/HTML/uk/kalarm/index.cache.bz2
@@ -64,6 +65,7 @@ share/kconf_update/kalarm-2.0.2-general.pl
 share/kconf_update/kalarm-2.1.5-general.pl
 share/kconf_update/kalarm-version.pl
 share/kconf_update/kalarm.upd
+share/knotifications5/kalarm.notifyrc
 share/kxmlgui5/kalarm/kalarmui.rc
 share/locale/ar/LC_MESSAGES/kalarm.mo
 share/locale/bg/LC_MESSAGES/kalarm.mo
diff --git a/kalarm/distinfo b/kalarm/distinfo
index 8920b6668e..c33d0b8872 100644
--- a/kalarm/distinfo
+++ b/kalarm/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-SHA1 (kalarm-20.04.1.tar.xz) = 18da7aefab7b66c6acefc5be83d7e380aef40957
-RMD160 (kalarm-20.04.1.tar.xz) = b9da59cfd8805cf6f1a23fd71d1d6bb986773b7d
-SHA512 (kalarm-20.04.1.tar.xz) = 7c803e244edfb041403eedfd3924ab6d4e0d56d74ce6f5c046928c0d925d7d2677113d43892251c3a103b5f5ff0e8ad851bee2ea04a0256545d85835c57977a1
-Size (kalarm-20.04.1.tar.xz) = 1840592 bytes
+SHA1 (kalarm-20.12.3.tar.xz) = 8bccbb255f0dae69bde4772b2d6f799acb6f01d2
+RMD160 (kalarm-20.12.3.tar.xz) = ff5040b5a46f78c017e461e99eaef96eebef437d
+SHA512 (kalarm-20.12.3.tar.xz) = c0e335e766349f0474a982325db6d8c6e4fc611a5a2e925a0dd4a108be6d4edb25493e88d08ab26cdc9167546cf1810c5898d036f6f9be32f491ff1662becfd1
+Size (kalarm-20.12.3.tar.xz) = 2110400 bytes
diff --git a/kalarmcal/PLIST b/kalarmcal/PLIST
index c024e1b0d0..98093c3f70 100644
--- a/kalarmcal/PLIST
+++ b/kalarmcal/PLIST
@@ -33,7 +33,7 @@ lib/cmake/KF5AlarmCalendar/KF5AlarmCalendarTargets-noconfig.cmake
 lib/cmake/KF5AlarmCalendar/KF5AlarmCalendarTargets.cmake
 lib/libKF5AlarmCalendar.so
 lib/libKF5AlarmCalendar.so.5
-lib/libKF5AlarmCalendar.so.5.14.1
+lib/libKF5AlarmCalendar.so.5.16.3
 qt5/mkspecs/modules/qt_KAlarmCal.pri
 qt5/plugins/akonadi_serializer_kalarm.so
 share/akonadi/plugins/serializer/akonadi_serializer_kalarm.desktop
@@ -101,6 +101,7 @@ share/locale/nds/LC_MESSAGES/libkalarmcal5-serializer.mo
 share/locale/nds/LC_MESSAGES/libkalarmcal5.mo
 share/locale/nl/LC_MESSAGES/libkalarmcal5-serializer.mo
 share/locale/nl/LC_MESSAGES/libkalarmcal5.mo
+share/locale/nn/LC_MESSAGES/libkalarmcal5-serializer.mo
 share/locale/nn/LC_MESSAGES/libkalarmcal5.mo
 share/locale/pa/LC_MESSAGES/libkalarmcal5-serializer.mo
 share/locale/pa/LC_MESSAGES/libkalarmcal5.mo
diff --git a/kalarmcal/distinfo b/kalarmcal/distinfo
index 6ddef7df4e..eb7ee6fdb9 100644
--- a/kalarmcal/distinfo
+++ b/kalarmcal/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-SHA1 (kalarmcal-20.04.1.tar.xz) = 1e7d3b940c6ac59fca03cd507df1b0d5668a66fa
-RMD160 (kalarmcal-20.04.1.tar.xz) = 70758fa5c9c3f08886fe526d31d43474b857b415
-SHA512 (kalarmcal-20.04.1.tar.xz) = 3c88c75fc9e1b248aa157b55b97c1c24b010cf9eb4ec0f6974fc50611a21599625fc7d8932148f11508c7b084eba1bd9c9b6ce64544bb4500daa81723a457c97
-Size (kalarmcal-20.04.1.tar.xz) = 574452 bytes
+SHA1 (kalarmcal-20.12.3.tar.xz) = d6fda5e5c01559a808f701caeb744e557940ab17
+RMD160 (kalarmcal-20.12.3.tar.xz) = 7a503050360f694f26ed341297b273ecac3391a0
+SHA512 (kalarmcal-20.12.3.tar.xz) = 97391ff398c404051ab2001811cdf317720e8d68100d6e654b8ff416c2f4d49cff8ef3ef65c5476e4990749ab92356c767310637d876e1a0cadc6bcd923f33b4
+Size (kalarmcal-20.12.3.tar.xz) = 576680 bytes
diff --git a/kdebugsettings/PLIST b/kdebugsettings/PLIST
index 9ded476619..ad712ccd18 100644
--- a/kdebugsettings/PLIST
+++ b/kdebugsettings/PLIST
@@ -39,6 +39,5 @@ share/locale/uk/LC_MESSAGES/kdebugsettings.mo
 share/locale/zh_CN/LC_MESSAGES/kdebugsettings.mo
 share/locale/zh_TW/LC_MESSAGES/kdebugsettings.mo
 share/metainfo/org.kde.kdebugsettings.appdata.xml
-share/qlogging-categories5/kde.categories
 share/qlogging-categories5/kde.renamecategories
 share/qlogging-categories5/kdebugsettings.categories
diff --git a/kdebugsettings/distinfo b/kdebugsettings/distinfo
index eaf319d02d..410e31543e 100644
--- a/kdebugsettings/distinfo
+++ b/kdebugsettings/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-SHA1 (kdebugsettings-20.04.1.tar.xz) = e4831e2275d67caf7f3366e2f6a047a6a9eb91f2
-RMD160 (kdebugsettings-20.04.1.tar.xz) = 89a56e0b716e39b2677d61f3469068e7b5cbf8cb
-SHA512 (kdebugsettings-20.04.1.tar.xz) = 5793e0a370fd59dd01d3d79e2c6c658f250d7ee338feb8f94aa140804bbd6af5d50ccd98827305de2eb6c292f7ec31903664a35cf0c020005d3a5ebe862449b0
-Size (kdebugsettings-20.04.1.tar.xz) = 65428 bytes
+SHA1 (kdebugsettings-20.12.3.tar.xz) = b5cde54bd248988682b90861afe4fee88f48e045
+RMD160 (kdebugsettings-20.12.3.tar.xz) = 9ba4fa863d8b9675187527d0a1cbf3f4fb209468
+SHA512 (kdebugsettings-20.12.3.tar.xz) = ce03f09aa75a2691a0752dd2fcfbd4f359584b97e18f6b19cc571985d4b6e552a925c6d3c5e16e32e6894f2e7f09a9923a81bb98347255bb9b9bbab951de3fd5
+Size (kdebugsettings-20.12.3.tar.xz) = 68344 bytes
diff --git a/kdepim-runtime/PLIST b/kdepim-runtime/PLIST
index 15b7123819..e6519102c9 100644
--- a/kdepim-runtime/PLIST
+++ b/kdepim-runtime/PLIST
@@ -5,8 +5,7 @@ bin/akonadi_contacts_resource
 bin/akonadi_davgroupware_resource
 bin/akonadi_ews_resource
 bin/akonadi_ewsmta_resource
-bin/akonadi_googlecalendar_resource
-bin/akonadi_googlecontacts_resource
+bin/akonadi_google_resource
 bin/akonadi_ical_resource
 bin/akonadi_icaldir_resource
 bin/akonadi_imap_resource
@@ -27,15 +26,15 @@ bin/akonadi_vcard_resource
 bin/akonadi_vcarddir_resource
 bin/gidmigrator
 lib/libakonadi-filestore.so.5
-lib/libakonadi-filestore.so.5.14.1
+lib/libakonadi-filestore.so.5.16.3
 lib/libakonadi-singlefileresource.so.5
-lib/libakonadi-singlefileresource.so.5.14.1
+lib/libakonadi-singlefileresource.so.5.16.3
 lib/libfolderarchivesettings.so.5
-lib/libfolderarchivesettings.so.5.14.1
+lib/libfolderarchivesettings.so.5.16.3
 lib/libkmindexreader.so.5
-lib/libkmindexreader.so.5.14.1
+lib/libkmindexreader.so.5.16.3
 lib/libmaildir.so.5
-lib/libmaildir.so.5.14.1
+lib/libmaildir.so.5.16.3
 qt5/plugins/akonadi/config/akonotesconfig.so
 qt5/plugins/akonadi/config/birthdaysconfig.so
 qt5/plugins/akonadi/config/contactsconfig.so
@@ -53,6 +52,7 @@ qt5/plugins/akonadi/config/pop3config.so
 qt5/plugins/akonadi/config/tomboynotesconfig.so
 qt5/plugins/akonadi/config/vcardconfig.so
 qt5/plugins/akonadi/config/vcarddirconfig.so
+qt5/plugins/kcm_ldap.so
 qt5/plugins/kf5/kio/akonadi.so
 qt5/plugins/kf5/kio/pop3.so
 share/akonadi/accountwizard/contacts/contactswizard.desktop
@@ -89,8 +89,7 @@ share/akonadi/agents/contactsresource.desktop
 share/akonadi/agents/davgroupwareresource.desktop
 share/akonadi/agents/ewsmtaresource.desktop
 share/akonadi/agents/ewsresource.desktop
-share/akonadi/agents/googlecalendarresource.desktop
-share/akonadi/agents/googlecontactsresource.desktop
+share/akonadi/agents/googleresource.desktop
 share/akonadi/agents/icaldirresource.desktop
 share/akonadi/agents/icalresource.desktop
 share/akonadi/agents/imapresource.desktop
@@ -123,8 +122,16 @@ share/doc/HTML/en/kioslave5/pop3/index.cache.bz2
 share/doc/HTML/en/kioslave5/pop3/index.docbook
 share/doc/HTML/es/kioslave5/pop3/index.cache.bz2
 share/doc/HTML/es/kioslave5/pop3/index.docbook
+share/doc/HTML/et/kioslave5/pop3/index.cache.bz2
+share/doc/HTML/et/kioslave5/pop3/index.docbook
+share/doc/HTML/fr/kioslave5/pop3/index.cache.bz2
+share/doc/HTML/fr/kioslave5/pop3/index.docbook
+share/doc/HTML/gl/kioslave5/pop3/index.cache.bz2
+share/doc/HTML/gl/kioslave5/pop3/index.docbook
 share/doc/HTML/it/kioslave5/pop3/index.cache.bz2
 share/doc/HTML/it/kioslave5/pop3/index.docbook
+share/doc/HTML/ko/kioslave5/pop3/index.cache.bz2
+share/doc/HTML/ko/kioslave5/pop3/index.docbook
 share/doc/HTML/nl/kioslave5/pop3/index.cache.bz2
 share/doc/HTML/nl/kioslave5/pop3/index.docbook
 share/doc/HTML/pt/kioslave5/pop3/index.cache.bz2
@@ -154,6 +161,7 @@ share/icons/hicolor/64x64/apps/ox.png
 share/icons/hicolor/72x72/apps/akonadi-ews.png
 share/icons/hicolor/96x96/apps/akonadi-ews.png
 share/knotifications5/akonadi_ews_resource.notifyrc
+share/knotifications5/akonadi_google_resource.notifyrc
 share/knotifications5/akonadi_maildispatcher_agent.notifyrc
 share/knotifications5/akonadi_newmailnotifier_agent.notifyrc
 share/knotifications5/akonadi_pop3_resource.notifyrc
@@ -171,6 +179,7 @@ share/kservices5/akonadi/davgroupware-providers/sogo.desktop
 share/kservices5/akonadi/davgroupware-providers/yahoo.desktop
 share/kservices5/akonadi/davgroupware-providers/zarafa.desktop
 share/kservices5/akonadi/davgroupware-providers/zimbra.desktop
+share/kservices5/kcmldap.desktop
 share/kservices5/pop3.protocol
 share/kservices5/pop3s.protocol
 share/kservicetypes5/davgroupwareprovider.desktop
@@ -190,8 +199,7 @@ share/locale/ar/LC_MESSAGES/akonadi_contacts_resource.mo
 share/locale/ar/LC_MESSAGES/akonadi_davgroupware_resource.mo
 share/locale/ar/LC_MESSAGES/akonadi_ews_resource.mo
 share/locale/ar/LC_MESSAGES/akonadi_facebook_resource.mo
-share/locale/ar/LC_MESSAGES/akonadi_googlecalendar_resource.mo
-share/locale/ar/LC_MESSAGES/akonadi_googlecontacts_resource.mo
+share/locale/ar/LC_MESSAGES/akonadi_google_resource.mo
 share/locale/ar/LC_MESSAGES/akonadi_ical_resource.mo
 share/locale/ar/LC_MESSAGES/akonadi_icaldir_resource.mo
 share/locale/ar/LC_MESSAGES/akonadi_imap_resource.mo
@@ -236,8 +244,7 @@ share/locale/bs/LC_MESSAGES/akonadi-filestore.mo
 share/locale/bs/LC_MESSAGES/akonadi_birthdays_resource.mo
 share/locale/bs/LC_MESSAGES/akonadi_contacts_resource.mo
 share/locale/bs/LC_MESSAGES/akonadi_davgroupware_resource.mo
-share/locale/bs/LC_MESSAGES/akonadi_googlecalendar_resource.mo
-share/locale/bs/LC_MESSAGES/akonadi_googlecontacts_resource.mo
+share/locale/bs/LC_MESSAGES/akonadi_google_resource.mo
 share/locale/bs/LC_MESSAGES/akonadi_ical_resource.mo
 share/locale/bs/LC_MESSAGES/akonadi_icaldir_resource.mo
 share/locale/bs/LC_MESSAGES/akonadi_imap_resource.mo
@@ -271,10 +278,10 @@ share/locale/ca/LC_MESSAGES/akonadi-filestore.mo
 share/locale/ca/LC_MESSAGES/akonadi_birthdays_resource.mo
 share/locale/ca/LC_MESSAGES/akonadi_contacts_resource.mo
 share/locale/ca/LC_MESSAGES/akonadi_davgroupware_resource.mo
+share/locale/ca/LC_MESSAGES/akonadi_etesync_resource.mo
 share/locale/ca/LC_MESSAGES/akonadi_ews_resource.mo
 share/locale/ca/LC_MESSAGES/akonadi_facebook_resource.mo
-share/locale/ca/LC_MESSAGES/akonadi_googlecalendar_resource.mo
-share/locale/ca/LC_MESSAGES/akonadi_googlecontacts_resource.mo
+share/locale/ca/LC_MESSAGES/akonadi_google_resource.mo
 share/locale/ca/LC_MESSAGES/akonadi_ical_resource.mo
 share/locale/ca/LC_MESSAGES/akonadi_icaldir_resource.mo
 share/locale/ca/LC_MESSAGES/akonadi_imap_resource.mo
@@ -309,10 +316,10 @@ share/locale/ca@valencia/LC_MESSAGES/akonadi-filestore.mo
 share/locale/ca@valencia/LC_MESSAGES/akonadi_birthdays_resource.mo
 share/locale/ca@valencia/LC_MESSAGES/akonadi_contacts_resource.mo
 share/locale/ca@valencia/LC_MESSAGES/akonadi_davgroupware_resource.mo
+share/locale/ca@valencia/LC_MESSAGES/akonadi_etesync_resource.mo
 share/locale/ca@valencia/LC_MESSAGES/akonadi_ews_resource.mo
 share/locale/ca@valencia/LC_MESSAGES/akonadi_facebook_resource.mo
-share/locale/ca@valencia/LC_MESSAGES/akonadi_googlecalendar_resource.mo
-share/locale/ca@valencia/LC_MESSAGES/akonadi_googlecontacts_resource.mo
+share/locale/ca@valencia/LC_MESSAGES/akonadi_google_resource.mo
 share/locale/ca@valencia/LC_MESSAGES/akonadi_ical_resource.mo
 share/locale/ca@valencia/LC_MESSAGES/akonadi_icaldir_resource.mo
 share/locale/ca@valencia/LC_MESSAGES/akonadi_imap_resource.mo
@@ -347,10 +354,10 @@ share/locale/cs/LC_MESSAGES/akonadi-filestore.mo
 share/locale/cs/LC_MESSAGES/akonadi_birthdays_resource.mo
 share/locale/cs/LC_MESSAGES/akonadi_contacts_resource.mo
 share/locale/cs/LC_MESSAGES/akonadi_davgroupware_resource.mo
+share/locale/cs/LC_MESSAGES/akonadi_etesync_resource.mo
 share/locale/cs/LC_MESSAGES/akonadi_ews_resource.mo
 share/locale/cs/LC_MESSAGES/akonadi_facebook_resource.mo
-share/locale/cs/LC_MESSAGES/akonadi_googlecalendar_resource.mo
-share/locale/cs/LC_MESSAGES/akonadi_googlecontacts_resource.mo
+share/locale/cs/LC_MESSAGES/akonadi_google_resource.mo
 share/locale/cs/LC_MESSAGES/akonadi_ical_resource.mo
 share/locale/cs/LC_MESSAGES/akonadi_icaldir_resource.mo
 share/locale/cs/LC_MESSAGES/akonadi_imap_resource.mo
@@ -372,6 +379,7 @@ share/locale/cs/LC_MESSAGES/kio_akonadi.mo
 share/locale/cs/LC_MESSAGES/kio_pop3.mo
 share/locale/cs/LC_MESSAGES/libfolderarchivesettings.mo
 share/locale/da/LC_MESSAGES/accountwizard_contacts.mo
+share/locale/da/LC_MESSAGES/accountwizard_ews.mo
 share/locale/da/LC_MESSAGES/accountwizard_ical.mo
 share/locale/da/LC_MESSAGES/accountwizard_imap.mo
 share/locale/da/LC_MESSAGES/accountwizard_kolab.mo
@@ -384,8 +392,9 @@ share/locale/da/LC_MESSAGES/akonadi-filestore.mo
 share/locale/da/LC_MESSAGES/akonadi_birthdays_resource.mo
 share/locale/da/LC_MESSAGES/akonadi_contacts_resource.mo
 share/locale/da/LC_MESSAGES/akonadi_davgroupware_resource.mo
-share/locale/da/LC_MESSAGES/akonadi_googlecalendar_resource.mo
-share/locale/da/LC_MESSAGES/akonadi_googlecontacts_resource.mo
+share/locale/da/LC_MESSAGES/akonadi_ews_resource.mo
+share/locale/da/LC_MESSAGES/akonadi_facebook_resource.mo
+share/locale/da/LC_MESSAGES/akonadi_google_resource.mo
 share/locale/da/LC_MESSAGES/akonadi_ical_resource.mo
 share/locale/da/LC_MESSAGES/akonadi_icaldir_resource.mo
 share/locale/da/LC_MESSAGES/akonadi_imap_resource.mo
@@ -420,10 +429,10 @@ share/locale/de/LC_MESSAGES/akonadi-filestore.mo
 share/locale/de/LC_MESSAGES/akonadi_birthdays_resource.mo
 share/locale/de/LC_MESSAGES/akonadi_contacts_resource.mo
 share/locale/de/LC_MESSAGES/akonadi_davgroupware_resource.mo
+share/locale/de/LC_MESSAGES/akonadi_etesync_resource.mo
 share/locale/de/LC_MESSAGES/akonadi_ews_resource.mo
 share/locale/de/LC_MESSAGES/akonadi_facebook_resource.mo
-share/locale/de/LC_MESSAGES/akonadi_googlecalendar_resource.mo
-share/locale/de/LC_MESSAGES/akonadi_googlecontacts_resource.mo
+share/locale/de/LC_MESSAGES/akonadi_google_resource.mo
 share/locale/de/LC_MESSAGES/akonadi_ical_resource.mo
 share/locale/de/LC_MESSAGES/akonadi_icaldir_resource.mo
 share/locale/de/LC_MESSAGES/akonadi_imap_resource.mo
@@ -457,8 +466,7 @@ share/locale/el/LC_MESSAGES/akonadi-filestore.mo
 share/locale/el/LC_MESSAGES/akonadi_birthdays_resource.mo
 share/locale/el/LC_MESSAGES/akonadi_contacts_resource.mo
 share/locale/el/LC_MESSAGES/akonadi_davgroupware_resource.mo
-share/locale/el/LC_MESSAGES/akonadi_googlecalendar_resource.mo
-share/locale/el/LC_MESSAGES/akonadi_googlecontacts_resource.mo
+share/locale/el/LC_MESSAGES/akonadi_google_resource.mo
 share/locale/el/LC_MESSAGES/akonadi_ical_resource.mo
 share/locale/el/LC_MESSAGES/akonadi_icaldir_resource.mo
 share/locale/el/LC_MESSAGES/akonadi_imap_resource.mo
@@ -493,10 +501,10 @@ share/locale/en_GB/LC_MESSAGES/akonadi-filestore.mo
 share/locale/en_GB/LC_MESSAGES/akonadi_birthdays_resource.mo
 share/locale/en_GB/LC_MESSAGES/akonadi_contacts_resource.mo
 share/locale/en_GB/LC_MESSAGES/akonadi_davgroupware_resource.mo
+share/locale/en_GB/LC_MESSAGES/akonadi_etesync_resource.mo
 share/locale/en_GB/LC_MESSAGES/akonadi_ews_resource.mo
 share/locale/en_GB/LC_MESSAGES/akonadi_facebook_resource.mo
-share/locale/en_GB/LC_MESSAGES/akonadi_googlecalendar_resource.mo
-share/locale/en_GB/LC_MESSAGES/akonadi_googlecontacts_resource.mo
+share/locale/en_GB/LC_MESSAGES/akonadi_google_resource.mo
 share/locale/en_GB/LC_MESSAGES/akonadi_ical_resource.mo
 share/locale/en_GB/LC_MESSAGES/akonadi_icaldir_resource.mo
 share/locale/en_GB/LC_MESSAGES/akonadi_imap_resource.mo
@@ -552,10 +560,10 @@ share/locale/es/LC_MESSAGES/akonadi-filestore.mo
 share/locale/es/LC_MESSAGES/akonadi_birthdays_resource.mo
 share/locale/es/LC_MESSAGES/akonadi_contacts_resource.mo
 share/locale/es/LC_MESSAGES/akonadi_davgroupware_resource.mo
+share/locale/es/LC_MESSAGES/akonadi_etesync_resource.mo
 share/locale/es/LC_MESSAGES/akonadi_ews_resource.mo
 share/locale/es/LC_MESSAGES/akonadi_facebook_resource.mo
-share/locale/es/LC_MESSAGES/akonadi_googlecalendar_resource.mo
-share/locale/es/LC_MESSAGES/akonadi_googlecontacts_resource.mo
+share/locale/es/LC_MESSAGES/akonadi_google_resource.mo
 share/locale/es/LC_MESSAGES/akonadi_ical_resource.mo
 share/locale/es/LC_MESSAGES/akonadi_icaldir_resource.mo
 share/locale/es/LC_MESSAGES/akonadi_imap_resource.mo
@@ -592,8 +600,7 @@ share/locale/et/LC_MESSAGES/akonadi_contacts_resource.mo
 share/locale/et/LC_MESSAGES/akonadi_davgroupware_resource.mo
 share/locale/et/LC_MESSAGES/akonadi_ews_resource.mo
 share/locale/et/LC_MESSAGES/akonadi_facebook_resource.mo
-share/locale/et/LC_MESSAGES/akonadi_googlecalendar_resource.mo
-share/locale/et/LC_MESSAGES/akonadi_googlecontacts_resource.mo
+share/locale/et/LC_MESSAGES/akonadi_google_resource.mo
 share/locale/et/LC_MESSAGES/akonadi_ical_resource.mo
 share/locale/et/LC_MESSAGES/akonadi_icaldir_resource.mo
 share/locale/et/LC_MESSAGES/akonadi_imap_resource.mo
@@ -635,10 +642,10 @@ share/locale/fi/LC_MESSAGES/akonadi-filestore.mo
 share/locale/fi/LC_MESSAGES/akonadi_birthdays_resource.mo
 share/locale/fi/LC_MESSAGES/akonadi_contacts_resource.mo
 share/locale/fi/LC_MESSAGES/akonadi_davgroupware_resource.mo
+share/locale/fi/LC_MESSAGES/akonadi_etesync_resource.mo
 share/locale/fi/LC_MESSAGES/akonadi_ews_resource.mo
 share/locale/fi/LC_MESSAGES/akonadi_facebook_resource.mo
-share/locale/fi/LC_MESSAGES/akonadi_googlecalendar_resource.mo
-share/locale/fi/LC_MESSAGES/akonadi_googlecontacts_resource.mo
+share/locale/fi/LC_MESSAGES/akonadi_google_resource.mo
 share/locale/fi/LC_MESSAGES/akonadi_ical_resource.mo
 share/locale/fi/LC_MESSAGES/akonadi_icaldir_resource.mo
 share/locale/fi/LC_MESSAGES/akonadi_imap_resource.mo
@@ -673,10 +680,10 @@ share/locale/fr/LC_MESSAGES/akonadi-filestore.mo
 share/locale/fr/LC_MESSAGES/akonadi_birthdays_resource.mo
 share/locale/fr/LC_MESSAGES/akonadi_contacts_resource.mo
 share/locale/fr/LC_MESSAGES/akonadi_davgroupware_resource.mo
+share/locale/fr/LC_MESSAGES/akonadi_etesync_resource.mo
 share/locale/fr/LC_MESSAGES/akonadi_ews_resource.mo
 share/locale/fr/LC_MESSAGES/akonadi_facebook_resource.mo
-share/locale/fr/LC_MESSAGES/akonadi_googlecalendar_resource.mo
-share/locale/fr/LC_MESSAGES/akonadi_googlecontacts_resource.mo
+share/locale/fr/LC_MESSAGES/akonadi_google_resource.mo
 share/locale/fr/LC_MESSAGES/akonadi_ical_resource.mo
 share/locale/fr/LC_MESSAGES/akonadi_icaldir_resource.mo
 share/locale/fr/LC_MESSAGES/akonadi_imap_resource.mo
@@ -706,8 +713,7 @@ share/locale/ga/LC_MESSAGES/akonadi-filestore.mo
 share/locale/ga/LC_MESSAGES/akonadi_birthdays_resource.mo
 share/locale/ga/LC_MESSAGES/akonadi_contacts_resource.mo
 share/locale/ga/LC_MESSAGES/akonadi_davgroupware_resource.mo
-share/locale/ga/LC_MESSAGES/akonadi_googlecalendar_resource.mo
-share/locale/ga/LC_MESSAGES/akonadi_googlecontacts_resource.mo
+share/locale/ga/LC_MESSAGES/akonadi_google_resource.mo
 share/locale/ga/LC_MESSAGES/akonadi_ical_resource.mo
 share/locale/ga/LC_MESSAGES/akonadi_icaldir_resource.mo
 share/locale/ga/LC_MESSAGES/akonadi_imap_resource.mo
@@ -740,8 +746,7 @@ share/locale/gl/LC_MESSAGES/akonadi_contacts_resource.mo
 share/locale/gl/LC_MESSAGES/akonadi_davgroupware_resource.mo
 share/locale/gl/LC_MESSAGES/akonadi_ews_resource.mo
 share/locale/gl/LC_MESSAGES/akonadi_facebook_resource.mo
-share/locale/gl/LC_MESSAGES/akonadi_googlecalendar_resource.mo
-share/locale/gl/LC_MESSAGES/akonadi_googlecontacts_resource.mo
+share/locale/gl/LC_MESSAGES/akonadi_google_resource.mo
 share/locale/gl/LC_MESSAGES/akonadi_ical_resource.mo
 share/locale/gl/LC_MESSAGES/akonadi_icaldir_resource.mo
 share/locale/gl/LC_MESSAGES/akonadi_imap_resource.mo
@@ -781,8 +786,7 @@ share/locale/hu/LC_MESSAGES/akonadi-filestore.mo
 share/locale/hu/LC_MESSAGES/akonadi_birthdays_resource.mo
 share/locale/hu/LC_MESSAGES/akonadi_contacts_resource.mo
 share/locale/hu/LC_MESSAGES/akonadi_davgroupware_resource.mo
-share/locale/hu/LC_MESSAGES/akonadi_googlecalendar_resource.mo
-share/locale/hu/LC_MESSAGES/akonadi_googlecontacts_resource.mo
+share/locale/hu/LC_MESSAGES/akonadi_google_resource.mo
 share/locale/hu/LC_MESSAGES/akonadi_ical_resource.mo
 share/locale/hu/LC_MESSAGES/akonadi_icaldir_resource.mo
 share/locale/hu/LC_MESSAGES/akonadi_imap_resource.mo
@@ -816,10 +820,10 @@ share/locale/ia/LC_MESSAGES/akonadi-filestore.mo
 share/locale/ia/LC_MESSAGES/akonadi_birthdays_resource.mo
 share/locale/ia/LC_MESSAGES/akonadi_contacts_resource.mo
 share/locale/ia/LC_MESSAGES/akonadi_davgroupware_resource.mo
+share/locale/ia/LC_MESSAGES/akonadi_etesync_resource.mo
 share/locale/ia/LC_MESSAGES/akonadi_ews_resource.mo
 share/locale/ia/LC_MESSAGES/akonadi_facebook_resource.mo
-share/locale/ia/LC_MESSAGES/akonadi_googlecalendar_resource.mo
-share/locale/ia/LC_MESSAGES/akonadi_googlecontacts_resource.mo
+share/locale/ia/LC_MESSAGES/akonadi_google_resource.mo
 share/locale/ia/LC_MESSAGES/akonadi_ical_resource.mo
 share/locale/ia/LC_MESSAGES/akonadi_icaldir_resource.mo
 share/locale/ia/LC_MESSAGES/akonadi_imap_resource.mo
@@ -855,10 +859,10 @@ share/locale/it/LC_MESSAGES/akonadi-filestore.mo
 share/locale/it/LC_MESSAGES/akonadi_birthdays_resource.mo
 share/locale/it/LC_MESSAGES/akonadi_contacts_resource.mo
 share/locale/it/LC_MESSAGES/akonadi_davgroupware_resource.mo
+share/locale/it/LC_MESSAGES/akonadi_etesync_resource.mo
 share/locale/it/LC_MESSAGES/akonadi_ews_resource.mo
 share/locale/it/LC_MESSAGES/akonadi_facebook_resource.mo
-share/locale/it/LC_MESSAGES/akonadi_googlecalendar_resource.mo
-share/locale/it/LC_MESSAGES/akonadi_googlecontacts_resource.mo
+share/locale/it/LC_MESSAGES/akonadi_google_resource.mo
 share/locale/it/LC_MESSAGES/akonadi_ical_resource.mo
 share/locale/it/LC_MESSAGES/akonadi_icaldir_resource.mo
 share/locale/it/LC_MESSAGES/akonadi_imap_resource.mo
@@ -895,8 +899,7 @@ share/locale/ja/LC_MESSAGES/akonadi_contacts_resource.mo
 share/locale/ja/LC_MESSAGES/akonadi_davgroupware_resource.mo
 share/locale/ja/LC_MESSAGES/akonadi_ews_resource.mo
 share/locale/ja/LC_MESSAGES/akonadi_facebook_resource.mo
-share/locale/ja/LC_MESSAGES/akonadi_googlecalendar_resource.mo
-share/locale/ja/LC_MESSAGES/akonadi_googlecontacts_resource.mo
+share/locale/ja/LC_MESSAGES/akonadi_google_resource.mo
 share/locale/ja/LC_MESSAGES/akonadi_ical_resource.mo
 share/locale/ja/LC_MESSAGES/akonadi_icaldir_resource.mo
 share/locale/ja/LC_MESSAGES/akonadi_imap_resource.mo
@@ -926,8 +929,7 @@ share/locale/kk/LC_MESSAGES/akonadi-filestore.mo
 share/locale/kk/LC_MESSAGES/akonadi_birthdays_resource.mo
 share/locale/kk/LC_MESSAGES/akonadi_contacts_resource.mo
 share/locale/kk/LC_MESSAGES/akonadi_davgroupware_resource.mo
-share/locale/kk/LC_MESSAGES/akonadi_googlecalendar_resource.mo
-share/locale/kk/LC_MESSAGES/akonadi_googlecontacts_resource.mo
+share/locale/kk/LC_MESSAGES/akonadi_google_resource.mo
 share/locale/kk/LC_MESSAGES/akonadi_ical_resource.mo
 share/locale/kk/LC_MESSAGES/akonadi_icaldir_resource.mo
 share/locale/kk/LC_MESSAGES/akonadi_imap_resource.mo
@@ -955,8 +957,7 @@ share/locale/km/LC_MESSAGES/akonadi-filestore.mo
 share/locale/km/LC_MESSAGES/akonadi_birthdays_resource.mo
 share/locale/km/LC_MESSAGES/akonadi_contacts_resource.mo
 share/locale/km/LC_MESSAGES/akonadi_davgroupware_resource.mo
-share/locale/km/LC_MESSAGES/akonadi_googlecalendar_resource.mo
-share/locale/km/LC_MESSAGES/akonadi_googlecontacts_resource.mo
+share/locale/km/LC_MESSAGES/akonadi_google_resource.mo
 share/locale/km/LC_MESSAGES/akonadi_ical_resource.mo
 share/locale/km/LC_MESSAGES/akonadi_imap_resource.mo
 share/locale/km/LC_MESSAGES/akonadi_kalarm_resource.mo
@@ -987,8 +988,7 @@ share/locale/ko/LC_MESSAGES/akonadi_contacts_resource.mo
 share/locale/ko/LC_MESSAGES/akonadi_davgroupware_resource.mo
 share/locale/ko/LC_MESSAGES/akonadi_ews_resource.mo
 share/locale/ko/LC_MESSAGES/akonadi_facebook_resource.mo
-share/locale/ko/LC_MESSAGES/akonadi_googlecalendar_resource.mo
-share/locale/ko/LC_MESSAGES/akonadi_googlecontacts_resource.mo
+share/locale/ko/LC_MESSAGES/akonadi_google_resource.mo
 share/locale/ko/LC_MESSAGES/akonadi_ical_resource.mo
 share/locale/ko/LC_MESSAGES/akonadi_icaldir_resource.mo
 share/locale/ko/LC_MESSAGES/akonadi_imap_resource.mo
@@ -1023,10 +1023,10 @@ share/locale/lt/LC_MESSAGES/akonadi-filestore.mo
 share/locale/lt/LC_MESSAGES/akonadi_birthdays_resource.mo
 share/locale/lt/LC_MESSAGES/akonadi_contacts_resource.mo
 share/locale/lt/LC_MESSAGES/akonadi_davgroupware_resource.mo
+share/locale/lt/LC_MESSAGES/akonadi_etesync_resource.mo
 share/locale/lt/LC_MESSAGES/akonadi_ews_resource.mo
 share/locale/lt/LC_MESSAGES/akonadi_facebook_resource.mo
-share/locale/lt/LC_MESSAGES/akonadi_googlecalendar_resource.mo
-share/locale/lt/LC_MESSAGES/akonadi_googlecontacts_resource.mo
+share/locale/lt/LC_MESSAGES/akonadi_google_resource.mo
 share/locale/lt/LC_MESSAGES/akonadi_ical_resource.mo
 share/locale/lt/LC_MESSAGES/akonadi_icaldir_resource.mo
 share/locale/lt/LC_MESSAGES/akonadi_imap_resource.mo
@@ -1056,8 +1056,7 @@ share/locale/lv/LC_MESSAGES/akonadi-filestore.mo
 share/locale/lv/LC_MESSAGES/akonadi_birthdays_resource.mo
 share/locale/lv/LC_MESSAGES/akonadi_contacts_resource.mo
 share/locale/lv/LC_MESSAGES/akonadi_davgroupware_resource.mo
-share/locale/lv/LC_MESSAGES/akonadi_googlecalendar_resource.mo
-share/locale/lv/LC_MESSAGES/akonadi_googlecontacts_resource.mo
+share/locale/lv/LC_MESSAGES/akonadi_google_resource.mo
 share/locale/lv/LC_MESSAGES/akonadi_ical_resource.mo
 share/locale/lv/LC_MESSAGES/akonadi_imap_resource.mo
 share/locale/lv/LC_MESSAGES/akonadi_kalarm_resource.mo
@@ -1082,8 +1081,7 @@ share/locale/mr/LC_MESSAGES/akonadi-filestore.mo
 share/locale/mr/LC_MESSAGES/akonadi_birthdays_resource.mo
 share/locale/mr/LC_MESSAGES/akonadi_contacts_resource.mo
 share/locale/mr/LC_MESSAGES/akonadi_davgroupware_resource.mo
-share/locale/mr/LC_MESSAGES/akonadi_googlecalendar_resource.mo
-share/locale/mr/LC_MESSAGES/akonadi_googlecontacts_resource.mo
+share/locale/mr/LC_MESSAGES/akonadi_google_resource.mo
 share/locale/mr/LC_MESSAGES/akonadi_ical_resource.mo
 share/locale/mr/LC_MESSAGES/akonadi_icaldir_resource.mo
 share/locale/mr/LC_MESSAGES/akonadi_imap_resource.mo
@@ -1113,8 +1111,7 @@ share/locale/nb/LC_MESSAGES/akonadi-filestore.mo
 share/locale/nb/LC_MESSAGES/akonadi_birthdays_resource.mo
 share/locale/nb/LC_MESSAGES/akonadi_contacts_resource.mo
 share/locale/nb/LC_MESSAGES/akonadi_davgroupware_resource.mo
-share/locale/nb/LC_MESSAGES/akonadi_googlecalendar_resource.mo
-share/locale/nb/LC_MESSAGES/akonadi_googlecontacts_resource.mo
+share/locale/nb/LC_MESSAGES/akonadi_google_resource.mo
 share/locale/nb/LC_MESSAGES/akonadi_ical_resource.mo
 share/locale/nb/LC_MESSAGES/akonadi_icaldir_resource.mo
 share/locale/nb/LC_MESSAGES/akonadi_imap_resource.mo
@@ -1146,8 +1143,7 @@ share/locale/nds/LC_MESSAGES/akonadi-filestore.mo
 share/locale/nds/LC_MESSAGES/akonadi_birthdays_resource.mo
 share/locale/nds/LC_MESSAGES/akonadi_contacts_resource.mo
 share/locale/nds/LC_MESSAGES/akonadi_davgroupware_resource.mo
-share/locale/nds/LC_MESSAGES/akonadi_googlecalendar_resource.mo
-share/locale/nds/LC_MESSAGES/akonadi_googlecontacts_resource.mo
+share/locale/nds/LC_MESSAGES/akonadi_google_resource.mo
 share/locale/nds/LC_MESSAGES/akonadi_ical_resource.mo
 share/locale/nds/LC_MESSAGES/akonadi_icaldir_resource.mo
 share/locale/nds/LC_MESSAGES/akonadi_imap_resource.mo
@@ -1181,10 +1177,10 @@ share/locale/nl/LC_MESSAGES/akonadi-filestore.mo
 share/locale/nl/LC_MESSAGES/akonadi_birthdays_resource.mo
 share/locale/nl/LC_MESSAGES/akonadi_contacts_resource.mo
 share/locale/nl/LC_MESSAGES/akonadi_davgroupware_resource.mo
+share/locale/nl/LC_MESSAGES/akonadi_etesync_resource.mo
 share/locale/nl/LC_MESSAGES/akonadi_ews_resource.mo
 share/locale/nl/LC_MESSAGES/akonadi_facebook_resource.mo
-share/locale/nl/LC_MESSAGES/akonadi_googlecalendar_resource.mo
-share/locale/nl/LC_MESSAGES/akonadi_googlecontacts_resource.mo
+share/locale/nl/LC_MESSAGES/akonadi_google_resource.mo
 share/locale/nl/LC_MESSAGES/akonadi_ical_resource.mo
 share/locale/nl/LC_MESSAGES/akonadi_icaldir_resource.mo
 share/locale/nl/LC_MESSAGES/akonadi_imap_resource.mo
@@ -1261,10 +1257,10 @@ share/locale/pl/LC_MESSAGES/akonadi-filestore.mo
 share/locale/pl/LC_MESSAGES/akonadi_birthdays_resource.mo
 share/locale/pl/LC_MESSAGES/akonadi_contacts_resource.mo
 share/locale/pl/LC_MESSAGES/akonadi_davgroupware_resource.mo
+share/locale/pl/LC_MESSAGES/akonadi_etesync_resource.mo
 share/locale/pl/LC_MESSAGES/akonadi_ews_resource.mo
 share/locale/pl/LC_MESSAGES/akonadi_facebook_resource.mo
-share/locale/pl/LC_MESSAGES/akonadi_googlecalendar_resource.mo
-share/locale/pl/LC_MESSAGES/akonadi_googlecontacts_resource.mo
+share/locale/pl/LC_MESSAGES/akonadi_google_resource.mo
 share/locale/pl/LC_MESSAGES/akonadi_ical_resource.mo
 share/locale/pl/LC_MESSAGES/akonadi_icaldir_resource.mo
 share/locale/pl/LC_MESSAGES/akonadi_imap_resource.mo
@@ -1299,10 +1295,10 @@ share/locale/pt/LC_MESSAGES/akonadi-filestore.mo
 share/locale/pt/LC_MESSAGES/akonadi_birthdays_resource.mo
 share/locale/pt/LC_MESSAGES/akonadi_contacts_resource.mo
 share/locale/pt/LC_MESSAGES/akonadi_davgroupware_resource.mo
+share/locale/pt/LC_MESSAGES/akonadi_etesync_resource.mo
 share/locale/pt/LC_MESSAGES/akonadi_ews_resource.mo
 share/locale/pt/LC_MESSAGES/akonadi_facebook_resource.mo
-share/locale/pt/LC_MESSAGES/akonadi_googlecalendar_resource.mo
-share/locale/pt/LC_MESSAGES/akonadi_googlecontacts_resource.mo
+share/locale/pt/LC_MESSAGES/akonadi_google_resource.mo
 share/locale/pt/LC_MESSAGES/akonadi_ical_resource.mo
 share/locale/pt/LC_MESSAGES/akonadi_icaldir_resource.mo
 share/locale/pt/LC_MESSAGES/akonadi_imap_resource.mo
@@ -1337,10 +1333,10 @@ share/locale/pt_BR/LC_MESSAGES/akonadi-filestore.mo
 share/locale/pt_BR/LC_MESSAGES/akonadi_birthdays_resource.mo
 share/locale/pt_BR/LC_MESSAGES/akonadi_contacts_resource.mo
 share/locale/pt_BR/LC_MESSAGES/akonadi_davgroupware_resource.mo
+share/locale/pt_BR/LC_MESSAGES/akonadi_etesync_resource.mo
 share/locale/pt_BR/LC_MESSAGES/akonadi_ews_resource.mo
 share/locale/pt_BR/LC_MESSAGES/akonadi_facebook_resource.mo
-share/locale/pt_BR/LC_MESSAGES/akonadi_googlecalendar_resource.mo
-share/locale/pt_BR/LC_MESSAGES/akonadi_googlecontacts_resource.mo
+share/locale/pt_BR/LC_MESSAGES/akonadi_google_resource.mo
 share/locale/pt_BR/LC_MESSAGES/akonadi_ical_resource.mo
 share/locale/pt_BR/LC_MESSAGES/akonadi_icaldir_resource.mo
 share/locale/pt_BR/LC_MESSAGES/akonadi_imap_resource.mo
@@ -1404,8 +1400,7 @@ share/locale/ru/LC_MESSAGES/akonadi_contacts_resource.mo
 share/locale/ru/LC_MESSAGES/akonadi_davgroupware_resource.mo
 share/locale/ru/LC_MESSAGES/akonadi_ews_resource.mo
 share/locale/ru/LC_MESSAGES/akonadi_facebook_resource.mo
-share/locale/ru/LC_MESSAGES/akonadi_googlecalendar_resource.mo
-share/locale/ru/LC_MESSAGES/akonadi_googlecontacts_resource.mo
+share/locale/ru/LC_MESSAGES/akonadi_google_resource.mo
 share/locale/ru/LC_MESSAGES/akonadi_ical_resource.mo
 share/locale/ru/LC_MESSAGES/akonadi_icaldir_resource.mo
 share/locale/ru/LC_MESSAGES/akonadi_imap_resource.mo
@@ -1440,10 +1435,10 @@ share/locale/sk/LC_MESSAGES/akonadi-filestore.mo
 share/locale/sk/LC_MESSAGES/akonadi_birthdays_resource.mo
 share/locale/sk/LC_MESSAGES/akonadi_contacts_resource.mo
 share/locale/sk/LC_MESSAGES/akonadi_davgroupware_resource.mo
+share/locale/sk/LC_MESSAGES/akonadi_etesync_resource.mo
 share/locale/sk/LC_MESSAGES/akonadi_ews_resource.mo
 share/locale/sk/LC_MESSAGES/akonadi_facebook_resource.mo
-share/locale/sk/LC_MESSAGES/akonadi_googlecalendar_resource.mo
-share/locale/sk/LC_MESSAGES/akonadi_googlecontacts_resource.mo
+share/locale/sk/LC_MESSAGES/akonadi_google_resource.mo
 share/locale/sk/LC_MESSAGES/akonadi_ical_resource.mo
 share/locale/sk/LC_MESSAGES/akonadi_icaldir_resource.mo
 share/locale/sk/LC_MESSAGES/akonadi_imap_resource.mo
@@ -1478,9 +1473,10 @@ share/locale/sl/LC_MESSAGES/akonadi-filestore.mo
 share/locale/sl/LC_MESSAGES/akonadi_birthdays_resource.mo
 share/locale/sl/LC_MESSAGES/akonadi_contacts_resource.mo
 share/locale/sl/LC_MESSAGES/akonadi_davgroupware_resource.mo
+share/locale/sl/LC_MESSAGES/akonadi_etesync_resource.mo
+share/locale/sl/LC_MESSAGES/akonadi_ews_resource.mo
 share/locale/sl/LC_MESSAGES/akonadi_facebook_resource.mo
-share/locale/sl/LC_MESSAGES/akonadi_googlecalendar_resource.mo
-share/locale/sl/LC_MESSAGES/akonadi_googlecontacts_resource.mo
+share/locale/sl/LC_MESSAGES/akonadi_google_resource.mo
 share/locale/sl/LC_MESSAGES/akonadi_ical_resource.mo
 share/locale/sl/LC_MESSAGES/akonadi_icaldir_resource.mo
 share/locale/sl/LC_MESSAGES/akonadi_imap_resource.mo
@@ -1516,8 +1512,7 @@ share/locale/sr/LC_MESSAGES/akonadi_birthdays_resource.mo
 share/locale/sr/LC_MESSAGES/akonadi_contacts_resource.mo
 share/locale/sr/LC_MESSAGES/akonadi_davgroupware_resource.mo
 share/locale/sr/LC_MESSAGES/akonadi_facebook_resource.mo
-share/locale/sr/LC_MESSAGES/akonadi_googlecalendar_resource.mo
-share/locale/sr/LC_MESSAGES/akonadi_googlecontacts_resource.mo
+share/locale/sr/LC_MESSAGES/akonadi_google_resource.mo
 share/locale/sr/LC_MESSAGES/akonadi_ical_resource.mo
 share/locale/sr/LC_MESSAGES/akonadi_icaldir_resource.mo
 share/locale/sr/LC_MESSAGES/akonadi_imap_resource.mo
@@ -1552,10 +1547,10 @@ share/locale/sv/LC_MESSAGES/akonadi-filestore.mo
 share/locale/sv/LC_MESSAGES/akonadi_birthdays_resource.mo
 share/locale/sv/LC_MESSAGES/akonadi_contacts_resource.mo
 share/locale/sv/LC_MESSAGES/akonadi_davgroupware_resource.mo
+share/locale/sv/LC_MESSAGES/akonadi_etesync_resource.mo
 share/locale/sv/LC_MESSAGES/akonadi_ews_resource.mo
 share/locale/sv/LC_MESSAGES/akonadi_facebook_resource.mo
-share/locale/sv/LC_MESSAGES/akonadi_googlecalendar_resource.mo
-share/locale/sv/LC_MESSAGES/akonadi_googlecontacts_resource.mo
+share/locale/sv/LC_MESSAGES/akonadi_google_resource.mo
 share/locale/sv/LC_MESSAGES/akonadi_ical_resource.mo
 share/locale/sv/LC_MESSAGES/akonadi_icaldir_resource.mo
 share/locale/sv/LC_MESSAGES/akonadi_imap_resource.mo
@@ -1590,8 +1585,7 @@ share/locale/tr/LC_MESSAGES/akonadi_birthdays_resource.mo
 share/locale/tr/LC_MESSAGES/akonadi_contacts_resource.mo
 share/locale/tr/LC_MESSAGES/akonadi_davgroupware_resource.mo
 share/locale/tr/LC_MESSAGES/akonadi_facebook_resource.mo
-share/locale/tr/LC_MESSAGES/akonadi_googlecalendar_resource.mo
-share/locale/tr/LC_MESSAGES/akonadi_googlecontacts_resource.mo
+share/locale/tr/LC_MESSAGES/akonadi_google_resource.mo
 share/locale/tr/LC_MESSAGES/akonadi_ical_resource.mo
 share/locale/tr/LC_MESSAGES/akonadi_icaldir_resource.mo
 share/locale/tr/LC_MESSAGES/akonadi_imap_resource.mo
@@ -1621,8 +1615,7 @@ share/locale/ug/LC_MESSAGES/akonadi-filestore.mo
 share/locale/ug/LC_MESSAGES/akonadi_birthdays_resource.mo
 share/locale/ug/LC_MESSAGES/akonadi_contacts_resource.mo
 share/locale/ug/LC_MESSAGES/akonadi_davgroupware_resource.mo
-share/locale/ug/LC_MESSAGES/akonadi_googlecalendar_resource.mo
-share/locale/ug/LC_MESSAGES/akonadi_googlecontacts_resource.mo
+share/locale/ug/LC_MESSAGES/akonadi_google_resource.mo
 share/locale/ug/LC_MESSAGES/akonadi_ical_resource.mo
 share/locale/ug/LC_MESSAGES/akonadi_icaldir_resource.mo
 share/locale/ug/LC_MESSAGES/akonadi_imap_resource.mo
@@ -1653,10 +1646,10 @@ share/locale/uk/LC_MESSAGES/akonadi-filestore.mo
 share/locale/uk/LC_MESSAGES/akonadi_birthdays_resource.mo
 share/locale/uk/LC_MESSAGES/akonadi_contacts_resource.mo
 share/locale/uk/LC_MESSAGES/akonadi_davgroupware_resource.mo
+share/locale/uk/LC_MESSAGES/akonadi_etesync_resource.mo
 share/locale/uk/LC_MESSAGES/akonadi_ews_resource.mo
 share/locale/uk/LC_MESSAGES/akonadi_facebook_resource.mo
-share/locale/uk/LC_MESSAGES/akonadi_googlecalendar_resource.mo
-share/locale/uk/LC_MESSAGES/akonadi_googlecontacts_resource.mo
+share/locale/uk/LC_MESSAGES/akonadi_google_resource.mo
 share/locale/uk/LC_MESSAGES/akonadi_ical_resource.mo
 share/locale/uk/LC_MESSAGES/akonadi_icaldir_resource.mo
 share/locale/uk/LC_MESSAGES/akonadi_imap_resource.mo
@@ -1691,10 +1684,10 @@ share/locale/zh_CN/LC_MESSAGES/akonadi-filestore.mo
 share/locale/zh_CN/LC_MESSAGES/akonadi_birthdays_resource.mo
 share/locale/zh_CN/LC_MESSAGES/akonadi_contacts_resource.mo
 share/locale/zh_CN/LC_MESSAGES/akonadi_davgroupware_resource.mo
+share/locale/zh_CN/LC_MESSAGES/akonadi_etesync_resource.mo
 share/locale/zh_CN/LC_MESSAGES/akonadi_ews_resource.mo
 share/locale/zh_CN/LC_MESSAGES/akonadi_facebook_resource.mo
-share/locale/zh_CN/LC_MESSAGES/akonadi_googlecalendar_resource.mo
-share/locale/zh_CN/LC_MESSAGES/akonadi_googlecontacts_resource.mo
+share/locale/zh_CN/LC_MESSAGES/akonadi_google_resource.mo
 share/locale/zh_CN/LC_MESSAGES/akonadi_ical_resource.mo
 share/locale/zh_CN/LC_MESSAGES/akonadi_icaldir_resource.mo
 share/locale/zh_CN/LC_MESSAGES/akonadi_imap_resource.mo
@@ -1731,8 +1724,7 @@ share/locale/zh_TW/LC_MESSAGES/akonadi_contacts_resource.mo
 share/locale/zh_TW/LC_MESSAGES/akonadi_davgroupware_resource.mo
 share/locale/zh_TW/LC_MESSAGES/akonadi_ews_resource.mo
 share/locale/zh_TW/LC_MESSAGES/akonadi_facebook_resource.mo
-share/locale/zh_TW/LC_MESSAGES/akonadi_googlecalendar_resource.mo
-share/locale/zh_TW/LC_MESSAGES/akonadi_googlecontacts_resource.mo
+share/locale/zh_TW/LC_MESSAGES/akonadi_google_resource.mo
 share/locale/zh_TW/LC_MESSAGES/akonadi_ical_resource.mo
 share/locale/zh_TW/LC_MESSAGES/akonadi_icaldir_resource.mo
 share/locale/zh_TW/LC_MESSAGES/akonadi_imap_resource.mo
diff --git a/kdepim-runtime/distinfo b/kdepim-runtime/distinfo
index 56c7ac075c..c20a52ea4f 100644
--- a/kdepim-runtime/distinfo
+++ b/kdepim-runtime/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-SHA1 (kdepim-runtime-20.04.1.tar.xz) = 35d2f3fc463c4c0ec09ea48c49614eb9ec279b70
-RMD160 (kdepim-runtime-20.04.1.tar.xz) = f4f9410aa8aa3daecc08b9725d26cb7b72aca386
-SHA512 (kdepim-runtime-20.04.1.tar.xz) = cca6f80a95ad5a64327b02353c1ef09a84a6a443d99b08d96688f0aa02f5fc920deb03f8f3c221f304bd4bfe29a0a365aa93d2051f957266ce2adc2f1d0dfb62
-Size (kdepim-runtime-20.04.1.tar.xz) = 1740016 bytes
+SHA1 (kdepim-runtime-20.12.3.tar.xz) = e4169daa62ad9f78ce402d31582285a3a47c80ee
+RMD160 (kdepim-runtime-20.12.3.tar.xz) = 6c2d5803900464c7554d424e5a33920c44884e5e
+SHA512 (kdepim-runtime-20.12.3.tar.xz) = 5dcc122c80575b6ebd7e220d72f71c58fa96fb894c7419ed5f3549eca6c5d3702d20f826baf1b2f7a0e8b80ce03afa5ede26cb558b9d01e38edf38976ab9b12a
+Size (kdepim-runtime-20.12.3.tar.xz) = 1801580 bytes
diff --git a/kdialog/distinfo b/kdialog/distinfo
index 370b6d96de..342e10a72a 100644
--- a/kdialog/distinfo
+++ b/kdialog/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-SHA1 (kdialog-20.04.1.tar.xz) = 019c546763a0c42658142c8d22b25393ec5c655d
-RMD160 (kdialog-20.04.1.tar.xz) = f99634fceb6b90a8156d650c520c71883c133219
-SHA512 (kdialog-20.04.1.tar.xz) = b86bc303abf83b55742d516db127bac5b4d9cebb0a54188723eb05506c845cc4150d36cc5e8fddae9487d374251a4f2947f6e0e5e26fa3074213653d91b0fee6
-Size (kdialog-20.04.1.tar.xz) = 103916 bytes
+SHA1 (kdialog-20.12.3.tar.xz) = eb64d6f244e23bed5f33cf3b857efffa18e9e54d
+RMD160 (kdialog-20.12.3.tar.xz) = c363cc6a716ffaa053ca4bec25b8b28171748428
+SHA512 (kdialog-20.12.3.tar.xz) = 09794892b150b8e9637f74971432c231c8abe9f2355b2c0c0ddd2527b5512d024a81f2d3dbab4dfd381495f729d4cb474caa46cfa8784f396abe223f989e243b
+Size (kdialog-20.12.3.tar.xz) = 108492 bytes
diff --git a/keditbookmarks/PLIST b/keditbookmarks/PLIST
index 0c6e9b45f3..f9a8bf6153 100644
--- a/keditbookmarks/PLIST
+++ b/keditbookmarks/PLIST
@@ -32,6 +32,8 @@ share/doc/HTML/en/keditbookmarks/index.cache.bz2
 share/doc/HTML/en/keditbookmarks/index.docbook
 share/doc/HTML/es/keditbookmarks/index.cache.bz2
 share/doc/HTML/es/keditbookmarks/index.docbook
+share/doc/HTML/fr/keditbookmarks/index.cache.bz2
+share/doc/HTML/fr/keditbookmarks/index.docbook
 share/doc/HTML/it/keditbookmarks/index.cache.bz2
 share/doc/HTML/it/keditbookmarks/index.docbook
 share/doc/HTML/nl/keditbookmarks/index.cache.bz2
@@ -40,10 +42,14 @@ share/doc/HTML/pt/keditbookmarks/index.cache.bz2
 share/doc/HTML/pt/keditbookmarks/index.docbook
 share/doc/HTML/pt_BR/keditbookmarks/index.cache.bz2
 share/doc/HTML/pt_BR/keditbookmarks/index.docbook
+share/doc/HTML/ru/keditbookmarks/index.cache.bz2
+share/doc/HTML/ru/keditbookmarks/index.docbook
 share/doc/HTML/sv/keditbookmarks/index.cache.bz2
 share/doc/HTML/sv/keditbookmarks/index.docbook
 share/doc/HTML/uk/keditbookmarks/index.cache.bz2
 share/doc/HTML/uk/keditbookmarks/index.docbook
+share/doc/HTML/zh_CN/keditbookmarks/index.cache.bz2
+share/doc/HTML/zh_CN/keditbookmarks/index.docbook
 share/kxmlgui5/keditbookmarks/keditbookmarks-genui.rc
 share/kxmlgui5/keditbookmarks/keditbookmarksui.rc
 share/locale/ar/LC_MESSAGES/keditbookmarks.mo
diff --git a/keditbookmarks/distinfo b/keditbookmarks/distinfo
index b30855a590..a176e73316 100644
--- a/keditbookmarks/distinfo
+++ b/keditbookmarks/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-SHA1 (keditbookmarks-20.04.1.tar.xz) = a0791c8917aebfb2d7593eaf90037ab1e0ff36d8
-RMD160 (keditbookmarks-20.04.1.tar.xz) = 9e36b15699aa554b56da7acbcb98759fce2fd86f
-SHA512 (keditbookmarks-20.04.1.tar.xz) = 626efc79a94194617b71d136a5ceae24c73c15fd164292108985ad826ebe1b2336029569d5857475a40e1649f26c3251f68cb97a12358b18920eb6dd273ba519
-Size (keditbookmarks-20.04.1.tar.xz) = 187732 bytes
+SHA1 (keditbookmarks-20.12.3.tar.xz) = 5eb2a558dbf73d64609824c7b050648f1a2d3c5f
+RMD160 (keditbookmarks-20.12.3.tar.xz) = 9a555121a90f3247375c81d10976e5ed803059ad
+SHA512 (keditbookmarks-20.12.3.tar.xz) = 6b8341f94e1d170994100e0fd06f0cf7bac7e5b1ad31f595f74b3bff980e0b7ac286f985b7d4bf83bd6f29a4540d89b2d964cabc46dd95769e8e823536f873f7
+Size (keditbookmarks-20.12.3.tar.xz) = 191892 bytes
diff --git a/kfind/distinfo b/kfind/distinfo
index 0bb7468058..afcc6af5f0 100644
--- a/kfind/distinfo
+++ b/kfind/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-SHA1 (kfind-20.04.1.tar.xz) = 9a8d085801329419c6b892fbed4ff7a5d3de9453
-RMD160 (kfind-20.04.1.tar.xz) = e5298b047aff45b8f257f535b63d322a4e49a856
-SHA512 (kfind-20.04.1.tar.xz) = b8bd613d41d3b7b74a7768c2a4ab7300a782506fd58d9a291d81355a0e4f41417cbf5c2aa72a2452321780d194282f41c12b8e9d68a538f7e4d94e4db59036cc
-Size (kfind-20.04.1.tar.xz) = 272016 bytes
+SHA1 (kfind-20.12.3.tar.xz) = 717b4974f3b4bb028ce0505b11416d551b59bfe5
+RMD160 (kfind-20.12.3.tar.xz) = 047dba25035fc22ad6d0754a42f5ddb6ad29b13b
+SHA512 (kfind-20.12.3.tar.xz) = e66ef911138c844ddad606b31c9075b8b0d3984315e52f95beb6f3035d8ddbf16a40bc1390d4d7ef1e93eaf27aeb4d1b1566db3db0d1b26691c8dea443b0eca9
+Size (kfind-20.12.3.tar.xz) = 278656 bytes
diff --git a/kget/Makefile b/kget/Makefile
index 00a7ad1ccb..5c80fe29e0 100644
--- a/kget/Makefile
+++ b/kget/Makefile
@@ -1,7 +1,6 @@
 # $NetBSD: Makefile,v 1.25 2016/01/10 20:01:05 markd Exp $
 
 DISTNAME=	kget-${KAPPSVER}
-PKGREVISION=	1
 CATEGORIES=	net
 
 HOMEPAGE=	https://kde.org/applications/internet/kget/
diff --git a/kget/distinfo b/kget/distinfo
index f8e494985e..228f86ac3f 100644
--- a/kget/distinfo
+++ b/kget/distinfo
@@ -1,6 +1,6 @@
 $NetBSD: distinfo,v 1.5 2016/01/10 19:20:48 markd Exp $
 
-SHA1 (kget-19.08.0.tar.xz) = 146e3b9b76ff04e4e085dc84f05999de55ec1220
-RMD160 (kget-19.08.0.tar.xz) = ada9e08683abe12dc36ee4f93cd017aa20b44dcb
-SHA512 (kget-19.08.0.tar.xz) = 65f843d626f5164e2c391bae222079c8208a4df5d654a570dad852c30ecbf68323afcf4cbb988e15f0c03fd016f50fbede2a51d182c292a14e945fece3ef572f
-Size (kget-19.08.0.tar.xz) = 5233592 bytes
+SHA1 (kget-20.04.1.tar.xz) = 26cad2cd65a7ef7db0fa21a300ec3e144b503888
+RMD160 (kget-20.04.1.tar.xz) = 7dd8eab644e48b8298167e890b7204f5f91b76bc
+SHA512 (kget-20.04.1.tar.xz) = 100bd20d89e06372477c9ac7cbf4869aa5ed330863c52e4d2d08210b7b318356ff94837fb2a6310c6bbdf78e1404c3011e3eed8ab97751d95f37cbd173a621d8
+Size (kget-20.04.1.tar.xz) = 5238960 bytes
diff --git a/kgpg/PLIST b/kgpg/PLIST
index ce5bc4bfea..7040b1c0cf 100644
--- a/kgpg/PLIST
+++ b/kgpg/PLIST
@@ -41,9 +41,13 @@ share/doc/HTML/it/kgpg/index.cache.bz2
 share/doc/HTML/it/kgpg/index.docbook
 share/doc/HTML/it/kgpg/keygen.png
 share/doc/HTML/it/kgpg/keymanage.png
+share/doc/HTML/it/kgpg/keyprop.png
 share/doc/HTML/it/kgpg/keys.png
+share/doc/HTML/it/kgpg/keyserver-search.png
+share/doc/HTML/it/kgpg/keyserver.png
 share/doc/HTML/it/kgpg/kicker.png
 share/doc/HTML/it/kgpg/options.png
+share/doc/HTML/it/kgpg/select-secret-key.png
 share/doc/HTML/lt/kgpg/index.cache.bz2
 share/doc/HTML/lt/kgpg/index.docbook
 share/doc/HTML/nl/kgpg/index.cache.bz2
@@ -62,6 +66,8 @@ share/doc/HTML/pt_BR/kgpg/keyserver.png
 share/doc/HTML/pt_BR/kgpg/options.png
 share/doc/HTML/pt_BR/kgpg/select-secret-key.png
 share/doc/HTML/pt_BR/kgpg/systray.png
+share/doc/HTML/ru/kgpg/index.cache.bz2
+share/doc/HTML/ru/kgpg/index.docbook
 share/doc/HTML/sr/kgpg/index.cache.bz2
 share/doc/HTML/sr/kgpg/index.docbook
 share/doc/HTML/sv/kgpg/editor.png
diff --git a/kgpg/distinfo b/kgpg/distinfo
index dc3a7d3c02..15361e0e8f 100644
--- a/kgpg/distinfo
+++ b/kgpg/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-SHA1 (kgpg-20.04.1.tar.xz) = 2da1f3c9336d6e24de0d9be0ee8e38960b8f453c
-RMD160 (kgpg-20.04.1.tar.xz) = 74a1d93d3a66aac28c08d4c675b08a76aef68a99
-SHA512 (kgpg-20.04.1.tar.xz) = 77851b0bd28e46073c14eab0845080b9adac7db17a139012342a46dd07b73d5ac97c4cac3ac31ff8bd9b50d0a3eb93eff19b4c7bf75ad86617ac55602518209d
-Size (kgpg-20.04.1.tar.xz) = 2790884 bytes
+SHA1 (kgpg-20.12.3.tar.xz) = e6562ee12909530b0c09cf49cc817ab047215c89
+RMD160 (kgpg-20.12.3.tar.xz) = 2d3682cb888c6c3762399e1bc48357f006127e60
+SHA512 (kgpg-20.12.3.tar.xz) = 0816b1a2cf5d1bdc3d01230da57c84b357f8b7b5fd5a1afcab0ae47c257ef3ed3f4be6934db48896905437d9e3276c91c441da7139502c511582eba4bc6cb338
+Size (kgpg-20.12.3.tar.xz) = 2892236 bytes
diff --git a/kleopatra/distinfo b/kleopatra/distinfo
index 46e2c6ec5a..965e57532b 100644
--- a/kleopatra/distinfo
+++ b/kleopatra/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-SHA1 (kleopatra-20.04.1.tar.xz) = 41d92526b2a36832b6f2e48de0bb4de0209d3fff
-RMD160 (kleopatra-20.04.1.tar.xz) = 17284b8e98142e469f08b1d5dd402775d79797e7
-SHA512 (kleopatra-20.04.1.tar.xz) = 6d2e3033bb9a507287787278f65598d74603ab31a11dfb581fd5f1abedfa8ab1d48fd2973290e1283ba187cd03a89bd30578e202cffb466d2122504ef4bc5f6f
-Size (kleopatra-20.04.1.tar.xz) = 1935748 bytes
+SHA1 (kleopatra-20.12.3.tar.xz) = 6697e811381c1e23a893785f293dcb7491dcd5a8
+RMD160 (kleopatra-20.12.3.tar.xz) = f53848a8033ee04c68a8e9f874ee80343efcf07e
+SHA512 (kleopatra-20.12.3.tar.xz) = 8f27930714988d53622c0d8e5e5e3cd82e58eaf6582ed150f4a7326f61837c44fbb6dee2881934bdea1a0d8976b7173ef5d580154ccfeb84e75e3b0c38019433
+Size (kleopatra-20.12.3.tar.xz) = 2001196 bytes
diff --git a/kmail-account-wizard/PLIST b/kmail-account-wizard/PLIST
index a5fd7ea178..eedeecc8f3 100644
--- a/kmail-account-wizard/PLIST
+++ b/kmail-account-wizard/PLIST
@@ -65,6 +65,7 @@ share/locale/nds/LC_MESSAGES/accountwizard_tine20.mo
 share/locale/nl/LC_MESSAGES/accountwizard.mo
 share/locale/nl/LC_MESSAGES/accountwizard_tine20.mo
 share/locale/nn/LC_MESSAGES/accountwizard.mo
+share/locale/nn/LC_MESSAGES/accountwizard_tine20.mo
 share/locale/pa/LC_MESSAGES/accountwizard.mo
 share/locale/pl/LC_MESSAGES/accountwizard.mo
 share/locale/pl/LC_MESSAGES/accountwizard_tine20.mo
diff --git a/kmail-account-wizard/distinfo b/kmail-account-wizard/distinfo
index b8f3470303..70a8bee1d7 100644
--- a/kmail-account-wizard/distinfo
+++ b/kmail-account-wizard/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-SHA1 (kmail-account-wizard-20.04.1.tar.xz) = c7c4d92b80e6dff8377babca6e5523c273a14de0
-RMD160 (kmail-account-wizard-20.04.1.tar.xz) = 969db7ccbfb419aaa6bd9974c6f6679634c4a95d
-SHA512 (kmail-account-wizard-20.04.1.tar.xz) = c3c7b74668544ef7e47524ca61f273abdf8a4ba8168bc4903a22d56e5174eb1ae0dbaffcfcf5763371b2d70ef51f59e98698d716629dbfc28fe60302158bb09d
-Size (kmail-account-wizard-20.04.1.tar.xz) = 158288 bytes
+SHA1 (kmail-account-wizard-20.12.3.tar.xz) = e46a9e77d398a8492c3d572d6f74ba19f28e4099
+RMD160 (kmail-account-wizard-20.12.3.tar.xz) = e9a1684dda3a077e95e5be95a85b9698ce8416ff
+SHA512 (kmail-account-wizard-20.12.3.tar.xz) = 08508bd5e28ee20953dac413f56a62cef49b4d5d8ce5c14cb8482feb9b5c9f2abd65473923b5035977112bfce320b1da466d98bb64f931dbb435406327b57ed5
+Size (kmail-account-wizard-20.12.3.tar.xz) = 160704 bytes
diff --git a/kmail/PLIST b/kmail/PLIST
index adfe55aa77..8b2be24737 100644
--- a/kmail/PLIST
+++ b/kmail/PLIST
@@ -8,15 +8,15 @@ bin/kmail
 bin/kmail-refresh-settings
 bin/ktnef
 lib/libkmailprivate.so.5
-lib/libkmailprivate.so.5.14.1
+lib/libkmailprivate.so.5.16.3
 qt5/plugins/akonadi/config/archivemailagentconfig.so
 qt5/plugins/akonadi/config/followupreminderagentconfig.so
 qt5/plugins/kcm_kmail.so
 qt5/plugins/kcm_kmailsummary.so
 qt5/plugins/kcm_kontactsummary.so
 qt5/plugins/kmailpart.so
-qt5/plugins/kontact_kmailplugin.so
-qt5/plugins/kontact_summaryplugin.so
+qt5/plugins/kontact5/kontact_kmailplugin.so
+qt5/plugins/kontact5/kontact_summaryplugin.so
 share/akonadi/agents/archivemailagent.desktop
 share/akonadi/agents/followupreminder.desktop
 share/akonadi/agents/mailfilteragent.desktop
@@ -84,17 +84,28 @@ share/doc/HTML/en/akonadi_sendlater_agent/index.docbook
 share/doc/HTML/en/akonadi_sendlater_agent/sendlateragent-configure.png
 share/doc/HTML/en/akonadi_sendlater_agent/sendlateragent-dialog.png
 share/doc/HTML/en/kmail2/accountwizard.png
+share/doc/HTML/en/kmail2/accountwizard2.png
+share/doc/HTML/en/kmail2/accountwizard3.png
+share/doc/HTML/en/kmail2/accountwizard4.png
 share/doc/HTML/en/kmail2/aggregationtheme.png
+share/doc/HTML/en/kmail2/composer-window.png
 share/doc/HTML/en/kmail2/configure.docbook
 share/doc/HTML/en/kmail2/configure.png
+share/doc/HTML/en/kmail2/configurebutton.png
 share/doc/HTML/en/kmail2/credits-and-licenses.docbook
+share/doc/HTML/en/kmail2/document-decrypt.png
+share/doc/HTML/en/kmail2/document-edit.png
+share/doc/HTML/en/kmail2/document-import.png
+share/doc/HTML/en/kmail2/document-new.png
+share/doc/HTML/en/kmail2/document-open.png
 share/doc/HTML/en/kmail2/faq.docbook
+share/doc/HTML/en/kmail2/filter-dialog.png
 share/doc/HTML/en/kmail2/folder-example.png
 share/doc/HTML/en/kmail2/folder-properties.png
 share/doc/HTML/en/kmail2/folderarchiveagent.png
 share/doc/HTML/en/kmail2/getting-started.docbook
+share/doc/HTML/en/kmail2/go-down.png
 share/doc/HTML/en/kmail2/identitiesadvanced.png
-share/doc/HTML/en/kmail2/identity.png
 share/doc/HTML/en/kmail2/identitycryptography.png
 share/doc/HTML/en/kmail2/identitygeneral.png
 share/doc/HTML/en/kmail2/identitypicture.png
@@ -105,15 +116,27 @@ share/doc/HTML/en/kmail2/index.docbook
 share/doc/HTML/en/kmail2/intro.docbook
 share/doc/HTML/en/kmail2/kmailwelcome.png
 share/doc/HTML/en/kmail2/layout.png
+share/doc/HTML/en/kmail2/mail-attachment.png
 share/doc/HTML/en/kmail2/mail-mark-important.png
 share/doc/HTML/en/kmail2/mail-mark-read.png
 share/doc/HTML/en/kmail2/mail-mark-task.png
 share/doc/HTML/en/kmail2/mail-mark-unread.png
+share/doc/HTML/en/kmail2/mail-message-new.png
+share/doc/HTML/en/kmail2/mail-queue.png
+share/doc/HTML/en/kmail2/mail-receive.png
+share/doc/HTML/en/kmail2/mail-send.png
 share/doc/HTML/en/kmail2/mail-thread-ignored.png
 share/doc/HTML/en/kmail2/mail-thread-watch.png
 share/doc/HTML/en/kmail2/menus.docbook
 share/doc/HTML/en/kmail2/message.png
 share/doc/HTML/en/kmail2/messagelisttheme.png
+share/doc/HTML/en/kmail2/newidentity.png
+share/doc/HTML/en/kmail2/newidentity2.png
+share/doc/HTML/en/kmail2/preferences-desktop-font.png
+share/doc/HTML/en/kmail2/preview.png
+share/doc/HTML/en/kmail2/receiving.png
+share/doc/HTML/en/kmail2/sending.png
+share/doc/HTML/en/kmail2/sending2.png
 share/doc/HTML/en/kmail2/smile.png
 share/doc/HTML/en/kmail2/troubleshooting.docbook
 share/doc/HTML/en/kmail2/using-kmail.docbook
@@ -343,6 +366,8 @@ share/locale/da/LC_MESSAGES/akonadi_archivemail_agent.mo
 share/locale/da/LC_MESSAGES/akonadi_followupreminder_agent.mo
 share/locale/da/LC_MESSAGES/akonadi_mailfilter_agent.mo
 share/locale/da/LC_MESSAGES/akonadi_sendlater_agent.mo
+share/locale/da/LC_MESSAGES/akonadi_unifiedmailbox_agent.mo
+share/locale/da/LC_MESSAGES/kmail-refresh-settings.mo
 share/locale/da/LC_MESSAGES/kmail.mo
 share/locale/da/LC_MESSAGES/ktnef.mo
 share/locale/de/LC_MESSAGES/akonadi_archivemail_agent.mo
@@ -354,8 +379,11 @@ share/locale/de/LC_MESSAGES/kmail-refresh-settings.mo
 share/locale/de/LC_MESSAGES/kmail.mo
 share/locale/de/LC_MESSAGES/ktnef.mo
 share/locale/el/LC_MESSAGES/akonadi_archivemail_agent.mo
+share/locale/el/LC_MESSAGES/akonadi_followupreminder_agent.mo
 share/locale/el/LC_MESSAGES/akonadi_mailfilter_agent.mo
 share/locale/el/LC_MESSAGES/akonadi_sendlater_agent.mo
+share/locale/el/LC_MESSAGES/akonadi_unifiedmailbox_agent.mo
+share/locale/el/LC_MESSAGES/kmail-refresh-settings.mo
 share/locale/el/LC_MESSAGES/kmail.mo
 share/locale/el/LC_MESSAGES/ktnef.mo
 share/locale/en_GB/LC_MESSAGES/akonadi_archivemail_agent.mo
@@ -549,6 +577,8 @@ share/locale/sl/LC_MESSAGES/akonadi_archivemail_agent.mo
 share/locale/sl/LC_MESSAGES/akonadi_followupreminder_agent.mo
 share/locale/sl/LC_MESSAGES/akonadi_mailfilter_agent.mo
 share/locale/sl/LC_MESSAGES/akonadi_sendlater_agent.mo
+share/locale/sl/LC_MESSAGES/akonadi_unifiedmailbox_agent.mo
+share/locale/sl/LC_MESSAGES/kmail-refresh-settings.mo
 share/locale/sl/LC_MESSAGES/kmail.mo
 share/locale/sl/LC_MESSAGES/ktnef.mo
 share/locale/sr/LC_MESSAGES/akonadi_archivemail_agent.mo
diff --git a/kmail/distinfo b/kmail/distinfo
index 9f2d7e3e82..e12a8311d7 100644
--- a/kmail/distinfo
+++ b/kmail/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-SHA1 (kmail-20.04.1.tar.xz) = 03971e6a5a37c3fa9661d3ace2df75402894d4a2
-RMD160 (kmail-20.04.1.tar.xz) = 278358bbe107dca29cd0eeebaca9c2bae7dbec5b
-SHA512 (kmail-20.04.1.tar.xz) = 2babbdec5b4c825aaad8d1f8e31797cdaeb8cacd366bd450c608ccc2cc004c074e417935e6312ae1afe6c447786217e673d6a026cc361c34cefafeebc6b2d602
-Size (kmail-20.04.1.tar.xz) = 4721272 bytes
+SHA1 (kmail-20.12.3.tar.xz) = 88e0594f3a654e971dfff694e64b9fe4142175c8
+RMD160 (kmail-20.12.3.tar.xz) = 4df48e393381ff2f202c9005f40d5fd0771b3ede
+SHA512 (kmail-20.12.3.tar.xz) = ddb05673fb8d8a11a4aaf8b8cb5cc7fcdc74d2ab26482ebd61f426d12d5247518f3a4fedd74d78812bbacdeca83cc24db9b749efd40bf8caece4bcb2f77902c8
+Size (kmail-20.12.3.tar.xz) = 4671256 bytes
diff --git a/kmailtransport/PLIST b/kmailtransport/PLIST
index 3705c4fa59..074b534f1e 100644
--- a/kmailtransport/PLIST
+++ b/kmailtransport/PLIST
@@ -49,10 +49,10 @@ lib/cmake/KF5MailTransportAkonadi/KF5MailTransportAkonadiTargets-noconfig.cmake
 lib/cmake/KF5MailTransportAkonadi/KF5MailTransportAkonadiTargets.cmake
 lib/libKF5MailTransport.so
 lib/libKF5MailTransport.so.5
-lib/libKF5MailTransport.so.5.14.1
+lib/libKF5MailTransport.so.5.16.3
 lib/libKF5MailTransportAkonadi.so
 lib/libKF5MailTransportAkonadi.so.5
-lib/libKF5MailTransportAkonadi.so.5.14.1
+lib/libKF5MailTransportAkonadi.so.5.16.3
 qt5/mkspecs/modules/qt_KMailTransport.pri
 qt5/mkspecs/modules/qt_KMailTransportAkonadi.pri
 qt5/plugins/kcm_mailtransport.so
diff --git a/kmailtransport/distinfo b/kmailtransport/distinfo
index a5436e91a6..2408fa1eac 100644
--- a/kmailtransport/distinfo
+++ b/kmailtransport/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-SHA1 (kmailtransport-20.04.1.tar.xz) = 5cfe781fc84f2dac80cb8fe043d58b28429010a0
-RMD160 (kmailtransport-20.04.1.tar.xz) = 9bc275139d4488b292b3fc5dd5161cce8aa105f8
-SHA512 (kmailtransport-20.04.1.tar.xz) = 80c2208e187949c3521281897cc24d4b3ad92e5551639a15776a2539860af44d9937cbb897e0bae1480b5863c2cae1b6462253d114a775693a4401fbe703770e
-Size (kmailtransport-20.04.1.tar.xz) = 166368 bytes
+SHA1 (kmailtransport-20.12.3.tar.xz) = 4d9a499406bb229dcfee36f03796d2168616de67
+RMD160 (kmailtransport-20.12.3.tar.xz) = a3a4c2bdb10379950da858f33a655eed599b0e1e
+SHA512 (kmailtransport-20.12.3.tar.xz) = 7f270ee8d6695dac72611ff3f092a84ebd36bc8b4e373e04f8e80bce04080fec9f8f4eb0d88e968a641b62f7b860a7758b168ad992d5b849f6c18334a3e716a7
+Size (kmailtransport-20.12.3.tar.xz) = 168148 bytes
diff --git a/kmix/Makefile b/kmix/Makefile
index 857a40901e..b97840c1e0 100644
--- a/kmix/Makefile
+++ b/kmix/Makefile
@@ -1,7 +1,6 @@
 # $NetBSD: Makefile,v 1.69 2017/12/08 08:52:58 maya Exp $
 
 DISTNAME=	kmix-${KAPPSVER}
-PKGREVISION=	1
 CATEGORIES=	multimedia
 
 HOMEPAGE=	https://kde.org/applications/multimedia/kmix/
@@ -31,9 +30,10 @@ CONF_FILES+=	${PREFIX}/share/examples/kde-xdg/autostart/restore_kmix_volumes.des
 SUBST_CLASSES+=		fix-moc
 SUBST_STAGE.fix-moc=	post-configure
 SUBST_MESSAGE.fix-moc=	Cleaning up MOC includes
-SUBST_FILES.fix-moc=	_KDE_build/CMakeFiles/kded_kmixd_autogen.dir/AutogenInfo.cmake
-SUBST_FILES.fix-moc+=	_KDE_build/plasma/engine/CMakeFiles/plasma_engine_mixer_autogen.dir/AutogenInfo.cmake
-SUBST_SED.fix-moc=	-e 's,;${PREFIX}/include;,;,g'
+SUBST_FILES.fix-moc=	_KDE_build/CMakeFiles/kded_kmixd_autogen.dir/AutogenInfo.json
+SUBST_FILES.fix-moc+=	_KDE_build/plasma/engine/CMakeFiles/plasma_engine_mixer_autogen.dir/AutogenInfo.json
+SUBST_NOOP_OK.fix-moc=	yes
+SUBST_SED.fix-moc=	-e 's;"${PREFIX}/include",;;g'
 
 .include "../../audio/alsa-lib/buildlink3.mk"
 .include "../../audio/libcanberra/buildlink3.mk"
diff --git a/kmix/PLIST b/kmix/PLIST
index e10ab50025..9f29185658 100644
--- a/kmix/PLIST
+++ b/kmix/PLIST
@@ -43,11 +43,20 @@ share/doc/HTML/fr/kmix/index.cache.bz2
 share/doc/HTML/fr/kmix/index.docbook
 share/doc/HTML/gl/kmix/index.cache.bz2
 share/doc/HTML/gl/kmix/index.docbook
+share/doc/HTML/id/kmix/index.cache.bz2
+share/doc/HTML/id/kmix/index.docbook
 share/doc/HTML/it/kmix/index.cache.bz2
 share/doc/HTML/it/kmix/index.docbook
 share/doc/HTML/it/kmix/kmix-channel-playback.png
 share/doc/HTML/it/kmix/kmix-channel-record.png
+share/doc/HTML/it/kmix/kmix-configure-general.png
+share/doc/HTML/it/kmix/kmix-configure-sound-menu.png
+share/doc/HTML/it/kmix/kmix-configure-start.png
+share/doc/HTML/it/kmix/kmix-file.png
+share/doc/HTML/it/kmix/kmix-master.png
+share/doc/HTML/it/kmix/kmix-options.png
 share/doc/HTML/it/kmix/kmix-window.png
+share/doc/HTML/it/kmix/kmix.png
 share/doc/HTML/lt/kmix/index.cache.bz2
 share/doc/HTML/lt/kmix/index.docbook
 share/doc/HTML/nl/kmix/index.cache.bz2
@@ -84,9 +93,6 @@ share/icons/hicolor/16x16/actions/kmix.png
 share/icons/hicolor/32x32/actions/kmix.png
 share/icons/hicolor/48x48/actions/kmix.png
 share/icons/hicolor/64x64/actions/kmix.png
-share/kmix/pics/kmixdocked.png
-share/kmix/pics/kmixdocked_error.png
-share/kmix/pics/kmixdocked_mute.png
 share/kmix/pics/mixer-ac97.png
 share/kmix/pics/mixer-capture.png
 share/kmix/pics/mixer-cd.png
diff --git a/kmix/distinfo b/kmix/distinfo
index d747c8398a..e2b8a6695d 100644
--- a/kmix/distinfo
+++ b/kmix/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-SHA1 (kmix-19.08.0.tar.xz) = 69bd399316c49d649ecebdbd326516bfc3bdc448
-RMD160 (kmix-19.08.0.tar.xz) = 830ca5c6545cc83f25b0558bc6d91b96712fd955
-SHA512 (kmix-19.08.0.tar.xz) = a2d7793cd9a8ee456287b484f7dca5abc04868728f1073bddc3d75b75a754d62b923464d2a2ea4d01e7dc7a825cf30f06ca067948d2b457987bc763b0fc1be1f
-Size (kmix-19.08.0.tar.xz) = 1004452 bytes
+SHA1 (kmix-20.12.3.tar.xz) = b0e4d97664c508dc35aa2a02c4fea31e8e751d1e
+RMD160 (kmix-20.12.3.tar.xz) = 079188ea212919179af359eb5d4efcf950ad4e0b
+SHA512 (kmix-20.12.3.tar.xz) = cd261b9b42e81187136366a8cfcce7296d576553e8ec541785b5d53f9529cfd570af43c952dc0c36a5d3ad22abc56b02dbe040b7aebf5e9353b0ea3e670a6480
+Size (kmix-20.12.3.tar.xz) = 1150476 bytes
diff --git a/knotes/PLIST b/knotes/PLIST
index 6890d8adb8..4647b99515 100644
--- a/knotes/PLIST
+++ b/knotes/PLIST
@@ -2,12 +2,12 @@
 bin/akonadi_notes_agent
 bin/knotes
 lib/libknotesprivate.so.5
-lib/libknotesprivate.so.5.14.1
+lib/libknotesprivate.so.5.16.3
 lib/libnotesharedprivate.so.5
-lib/libnotesharedprivate.so.5.14.1
+lib/libnotesharedprivate.so.5.16.3
 qt5/plugins/kcm_knote.so
 qt5/plugins/kcm_knotessummary.so
-qt5/plugins/kontact_knotesplugin.so
+qt5/plugins/kontact5/kontact_knotesplugin.so
 share/akonadi/agents/notesagent.desktop
 share/applications/org.kde.knotes.desktop
 share/config.kcfg/knotesglobalconfig.kcfg
@@ -35,6 +35,10 @@ share/doc/HTML/et/akonadi_notes_agent/index.cache.bz2
 share/doc/HTML/et/akonadi_notes_agent/index.docbook
 share/doc/HTML/et/knotes/index.cache.bz2
 share/doc/HTML/et/knotes/index.docbook
+share/doc/HTML/fr/akonadi_notes_agent/index.cache.bz2
+share/doc/HTML/fr/akonadi_notes_agent/index.docbook
+share/doc/HTML/fr/knotes/index.cache.bz2
+share/doc/HTML/fr/knotes/index.docbook
 share/doc/HTML/it/akonadi_notes_agent/index.cache.bz2
 share/doc/HTML/it/akonadi_notes_agent/index.docbook
 share/doc/HTML/it/knotes/index.cache.bz2
@@ -117,6 +121,7 @@ share/locale/de/LC_MESSAGES/knotes.mo
 share/locale/de/LC_MESSAGES/libnoteshared.mo
 share/locale/el/LC_MESSAGES/akonadi_notes_agent.mo
 share/locale/el/LC_MESSAGES/knotes.mo
+share/locale/el/LC_MESSAGES/libnoteshared.mo
 share/locale/en_GB/LC_MESSAGES/akonadi_notes_agent.mo
 share/locale/en_GB/LC_MESSAGES/knotes.mo
 share/locale/en_GB/LC_MESSAGES/libnoteshared.mo
@@ -127,7 +132,9 @@ share/locale/es/LC_MESSAGES/libnoteshared.mo
 share/locale/et/LC_MESSAGES/akonadi_notes_agent.mo
 share/locale/et/LC_MESSAGES/knotes.mo
 share/locale/et/LC_MESSAGES/libnoteshared.mo
+share/locale/eu/LC_MESSAGES/akonadi_notes_agent.mo
 share/locale/eu/LC_MESSAGES/knotes.mo
+share/locale/eu/LC_MESSAGES/libnoteshared.mo
 share/locale/fa/LC_MESSAGES/knotes.mo
 share/locale/fi/LC_MESSAGES/akonadi_notes_agent.mo
 share/locale/fi/LC_MESSAGES/knotes.mo
@@ -174,7 +181,9 @@ share/locale/nds/LC_MESSAGES/libnoteshared.mo
 share/locale/nl/LC_MESSAGES/akonadi_notes_agent.mo
 share/locale/nl/LC_MESSAGES/knotes.mo
 share/locale/nl/LC_MESSAGES/libnoteshared.mo
+share/locale/nn/LC_MESSAGES/akonadi_notes_agent.mo
 share/locale/nn/LC_MESSAGES/knotes.mo
+share/locale/nn/LC_MESSAGES/libnoteshared.mo
 share/locale/pa/LC_MESSAGES/knotes.mo
 share/locale/pl/LC_MESSAGES/akonadi_notes_agent.mo
 share/locale/pl/LC_MESSAGES/knotes.mo
diff --git a/knotes/distinfo b/knotes/distinfo
index e1b644f566..b0db73046e 100644
--- a/knotes/distinfo
+++ b/knotes/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-SHA1 (knotes-20.04.1.tar.xz) = 11929c2559fd1e7382604973264613dde3909860
-RMD160 (knotes-20.04.1.tar.xz) = 3d415cb6628b133a243f1d2cfd8c41029ba12424
-SHA512 (knotes-20.04.1.tar.xz) = 36b04a7b72508c9be22da68935e91f4636f4ded4c7291e77f84b1060aedf6c4f740c1c05f436fb57cfe772bb4e6c1024ffd06fac533c9e0f7736a517df15de36
-Size (knotes-20.04.1.tar.xz) = 320772 bytes
+SHA1 (knotes-20.12.3.tar.xz) = 09e7ea8444f1e0dca6ea3f5e0c16aed29ec743f9
+RMD160 (knotes-20.12.3.tar.xz) = 7d268ca3134ebe8cac3a7fed55f7132682db5b23
+SHA512 (knotes-20.12.3.tar.xz) = 077cee2df4165c619a12ab05f2d6289e750a54606a62d09dc2747a45a97e336acdc908e84b81968b983963c712b3597e5da3a9c60a26cab488912a5420dede14
+Size (knotes-20.12.3.tar.xz) = 329536 bytes
diff --git a/kontact/Makefile b/kontact/Makefile
index f7d8197c0f..c8cc89e2d1 100644
--- a/kontact/Makefile
+++ b/kontact/Makefile
@@ -17,8 +17,9 @@ USE_TOOLS+=	msgmerge
 .include "../../devel/boost-headers/buildlink3.mk"
 .include "../../devel/kcmutils/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../wip/kdepim-apps-libs/buildlink3.mk"
+#.include "../../wip/kdepim-apps-libs/buildlink3.mk"
 .include "../../wip/kontactinterface/buildlink3.mk"
+.include "../../wip/pimcommon/buildlink3.mk"
 .include "../../x11/qt5-qtwebengine/buildlink3.mk"
 .include "../../x11/qt5-qtbase/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/kontact/PLIST b/kontact/PLIST
index 076f996604..391a192072 100644
--- a/kontact/PLIST
+++ b/kontact/PLIST
@@ -1,7 +1,7 @@
 @comment $NetBSD$
 bin/kontact
 lib/libkontactprivate.so.5
-lib/libkontactprivate.so.5.14.1
+lib/libkontactprivate.so.5.16.3
 qt5/plugins/kcm_kontact.so
 share/applications/org.kde.kontact.desktop
 share/config.kcfg/kontact.kcfg
diff --git a/kontact/distinfo b/kontact/distinfo
index eb6b80e813..b4aaa21920 100644
--- a/kontact/distinfo
+++ b/kontact/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-SHA1 (kontact-20.04.1.tar.xz) = b76d0474dbd332eadf839e1cb1a8936575e0c4cc
-RMD160 (kontact-20.04.1.tar.xz) = a733bf30c4bd31390c286cc41193706512c74c27
-SHA512 (kontact-20.04.1.tar.xz) = e01efd23a96cb64829acf3ce2ba9f6bdf02cf713e0fd80a3d54e108c7a7931a93f29f362511d3e7a662168970a0f3346e0bb01c05c64c9fb1384ef78881b5e27
-Size (kontact-20.04.1.tar.xz) = 793320 bytes
+SHA1 (kontact-20.12.3.tar.xz) = 4f6b0763ec861a42dc46598df6f8d3d837a7f356
+RMD160 (kontact-20.12.3.tar.xz) = 7cb4344d035d7f551786e024c80f7555084aeb5a
+SHA512 (kontact-20.12.3.tar.xz) = a957917a175b2fbf33bd15788e1c9e93520e13fc7f9204b91d317e9c99ef03a76bfa71a5e1651b24f24d3cf8ac663e74b964362f65515073170d55ac335eb23a
+Size (kontact-20.12.3.tar.xz) = 791076 bytes
diff --git a/kontactinterface/PLIST b/kontactinterface/PLIST
index 8047d7e310..a9a0523c89 100644
--- a/kontactinterface/PLIST
+++ b/kontactinterface/PLIST
@@ -19,7 +19,7 @@ lib/cmake/KF5KontactInterface/KF5KontactInterfaceTargets-noconfig.cmake
 lib/cmake/KF5KontactInterface/KF5KontactInterfaceTargets.cmake
 lib/libKF5KontactInterface.so
 lib/libKF5KontactInterface.so.5
-lib/libKF5KontactInterface.so.5.14.1
+lib/libKF5KontactInterface.so.5.16.3
 qt5/mkspecs/modules/qt_KontactInterface.pri
 share/kservicetypes5/kontactplugin.desktop
 share/locale/ar/LC_MESSAGES/kontactinterfaces5.mo
@@ -40,6 +40,7 @@ share/locale/fr/LC_MESSAGES/kontactinterfaces5.mo
 share/locale/ga/LC_MESSAGES/kontactinterfaces5.mo
 share/locale/gl/LC_MESSAGES/kontactinterfaces5.mo
 share/locale/he/LC_MESSAGES/kontactinterfaces5.mo
+share/locale/hi/LC_MESSAGES/kontactinterfaces5.mo
 share/locale/hu/LC_MESSAGES/kontactinterfaces5.mo
 share/locale/ia/LC_MESSAGES/kontactinterfaces5.mo
 share/locale/it/LC_MESSAGES/kontactinterfaces5.mo
diff --git a/kontactinterface/distinfo b/kontactinterface/distinfo
index b27e57cf38..00f57636bc 100644
--- a/kontactinterface/distinfo
+++ b/kontactinterface/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-SHA1 (kontactinterface-20.04.1.tar.xz) = bc30d2edcd15e543adb17442048e68ca01c2b9b9
-RMD160 (kontactinterface-20.04.1.tar.xz) = 7abdd740fc383a306954f0d5f1be10fcf9cd1d8f
-SHA512 (kontactinterface-20.04.1.tar.xz) = 2a91d4a26a1152763915d3ff421c085b304c7edaed0b9d8f3c9946eee4f6043a95ded0d7cfb5aaf8d45a2fbeec9c53df639bbb17a9ed07559edaa221cc0a8dd4
-Size (kontactinterface-20.04.1.tar.xz) = 33048 bytes
+SHA1 (kontactinterface-20.12.3.tar.xz) = 3323fb7d7bb43f5dfd40fb0644689e69256d70e8
+RMD160 (kontactinterface-20.12.3.tar.xz) = 4dfa4d7b1c62ac93202fcff45a76ee7313ffad12
+SHA512 (kontactinterface-20.12.3.tar.xz) = 619b68a856e14795241e814cd148660477c320a10ee26f198aff83f0828861b718dec542cc28c161de0a771c5b36c4241585d2e67c17959ad04def346438b71b
+Size (kontactinterface-20.12.3.tar.xz) = 36056 bytes
diff --git a/korganizer/PLIST b/korganizer/PLIST
index 5fc4f71b23..a332572358 100644
--- a/korganizer/PLIST
+++ b/korganizer/PLIST
@@ -3,27 +3,29 @@ bin/korgac
 bin/korganizer
 lib/libkorganizer_core.so
 lib/libkorganizer_core.so.5
-lib/libkorganizer_core.so.5.14.1
+lib/libkorganizer_core.so.5.16.3
 lib/libkorganizer_interfaces.so
 lib/libkorganizer_interfaces.so.5
-lib/libkorganizer_interfaces.so.5.14.1
+lib/libkorganizer_interfaces.so.5.16.3
 lib/libkorganizerprivate.so.5
-lib/libkorganizerprivate.so.5.14.1
+lib/libkorganizerprivate.so.5.16.3
 qt5/plugins/kcm_apptsummary.so
 qt5/plugins/kcm_korganizer.so
 qt5/plugins/kcm_sdsummary.so
 qt5/plugins/kcm_todosummary.so
-qt5/plugins/kontact_journalplugin.so
-qt5/plugins/kontact_korganizerplugin.so
-qt5/plugins/kontact_specialdatesplugin.so
-qt5/plugins/kontact_todoplugin.so
+qt5/plugins/kontact5/kontact_journalplugin.so
+qt5/plugins/kontact5/kontact_korganizerplugin.so
+qt5/plugins/kontact5/kontact_specialdatesplugin.so
+qt5/plugins/kontact5/kontact_todoplugin.so
 qt5/plugins/korganizerpart.so
 share/applications/korganizer-import.desktop
+share/applications/korganizer-view.desktop
 share/applications/org.kde.korganizer.desktop
 share/config.kcfg/korganizer.kcfg
 share/dbus-1/interfaces/org.kde.Korganizer.Calendar.xml
 share/dbus-1/interfaces/org.kde.korganizer.KOrgac.xml
 share/dbus-1/interfaces/org.kde.korganizer.Korganizer.xml
+share/dbus-1/services/org.kde.korgac.service
 share/dbus-1/services/org.kde.korganizer.service
 share/doc/HTML/ca/korganizer/index.cache.bz2
 share/doc/HTML/ca/korganizer/index.docbook
@@ -165,6 +167,7 @@ share/locale/da/LC_MESSAGES/korgac.mo
 share/locale/da/LC_MESSAGES/korganizer.mo
 share/locale/de/LC_MESSAGES/korgac.mo
 share/locale/de/LC_MESSAGES/korganizer.mo
+share/locale/el/LC_MESSAGES/korgac.mo
 share/locale/el/LC_MESSAGES/korganizer.mo
 share/locale/en_GB/LC_MESSAGES/korgac.mo
 share/locale/en_GB/LC_MESSAGES/korganizer.mo
diff --git a/korganizer/distinfo b/korganizer/distinfo
index be62fa633e..55834ef762 100644
--- a/korganizer/distinfo
+++ b/korganizer/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-SHA1 (korganizer-20.04.1.tar.xz) = 3ab55e38b4805eeff2daffed13c94d2b5754daad
-RMD160 (korganizer-20.04.1.tar.xz) = 5968ef7e98a3f26b4abea945910b54e90ac1af90
-SHA512 (korganizer-20.04.1.tar.xz) = 8014164d5cebfb9fdd62554b06195003b0e788c43f8d6c0a7481b63b3ec0262748f2288abfd3298e2920836f8b7c02f44ca929c93d4c1c4a5bd716e5234e22a9
-Size (korganizer-20.04.1.tar.xz) = 2240224 bytes
+SHA1 (korganizer-20.12.3.tar.xz) = 5441356299c75ac1b8038a0fd02b34611afca806
+RMD160 (korganizer-20.12.3.tar.xz) = 4d8ec2f0b2b400cd762c00fb8d0b80420bc52bd9
+SHA512 (korganizer-20.12.3.tar.xz) = 3b8b7026704acb1afcdf83d3a0c8e0ea01ae4a2ed6f3667a7e2fc504cc2189395b6967b7b7ae36dcd0b92ab88451c6ad5e786a9b5f5cdee594cc03a9a328f974
+Size (korganizer-20.12.3.tar.xz) = 2246496 bytes
diff --git a/ktnef/PLIST b/ktnef/PLIST
index ea0d1c5484..a4b79ae6d7 100644
--- a/ktnef/PLIST
+++ b/ktnef/PLIST
@@ -23,7 +23,7 @@ lib/cmake/KF5Tnef/KF5TnefTargets-noconfig.cmake
 lib/cmake/KF5Tnef/KF5TnefTargets.cmake
 lib/libKF5Tnef.so
 lib/libKF5Tnef.so.5
-lib/libKF5Tnef.so.5.14.1
+lib/libKF5Tnef.so.5.16.3
 qt5/mkspecs/modules/qt_KTNef.pri
 share/locale/ar/LC_MESSAGES/libktnef5.mo
 share/locale/bs/LC_MESSAGES/libktnef5.mo
diff --git a/ktnef/distinfo b/ktnef/distinfo
index 69f9bf36fe..75c5118eda 100644
--- a/ktnef/distinfo
+++ b/ktnef/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-SHA1 (ktnef-20.04.1.tar.xz) = 412ae9a848d7baa8a651c9fb6d1a51a94c0f68fe
-RMD160 (ktnef-20.04.1.tar.xz) = a9876c9140f7560939ea7a9abd5c1486b90b3889
-SHA512 (ktnef-20.04.1.tar.xz) = d0f0b75a6a37ab8a05c20b4d0956b95e1436d3295c3358aaa080361556f4acddf4b19121319e0250f45b7ec3c36af79312670880e17cab19e6d8c2e8a5970e97
-Size (ktnef-20.04.1.tar.xz) = 299916 bytes
+SHA1 (ktnef-20.12.3.tar.xz) = 4f31a7b3dd0e067348e4d1f2648c30771f756ba5
+RMD160 (ktnef-20.12.3.tar.xz) = ca20b27b805b9ca70828a97b76f9f16ae60c2be7
+SHA512 (ktnef-20.12.3.tar.xz) = b6173d2db8e76060c470bd1cf4679d1763d586dad5d84de88a64b744c499901322f09548efa6cafd857680a491d18a83912c80da3ebc1d349a683793368418ec
+Size (ktnef-20.12.3.tar.xz) = 299852 bytes
diff --git a/libgravatar/PLIST b/libgravatar/PLIST
index ac3b96fd1e..3dbd522b79 100644
--- a/libgravatar/PLIST
+++ b/libgravatar/PLIST
@@ -20,7 +20,7 @@ lib/cmake/KF5Gravatar/KF5GravatarTargets-noconfig.cmake
 lib/cmake/KF5Gravatar/KF5GravatarTargets.cmake
 lib/libKF5Gravatar.so
 lib/libKF5Gravatar.so.5
-lib/libKF5Gravatar.so.5.14.1
+lib/libKF5Gravatar.so.5.16.3
 qt5/mkspecs/modules/qt_Gravatar.pri
 share/locale/ar/LC_MESSAGES/libgravatar.mo
 share/locale/ca/LC_MESSAGES/libgravatar.mo
@@ -28,9 +28,11 @@ share/locale/ca@valencia/LC_MESSAGES/libgravatar.mo
 share/locale/cs/LC_MESSAGES/libgravatar.mo
 share/locale/da/LC_MESSAGES/libgravatar.mo
 share/locale/de/LC_MESSAGES/libgravatar.mo
+share/locale/el/LC_MESSAGES/libgravatar.mo
 share/locale/en_GB/LC_MESSAGES/libgravatar.mo
 share/locale/es/LC_MESSAGES/libgravatar.mo
 share/locale/et/LC_MESSAGES/libgravatar.mo
+share/locale/eu/LC_MESSAGES/libgravatar.mo
 share/locale/fi/LC_MESSAGES/libgravatar.mo
 share/locale/fr/LC_MESSAGES/libgravatar.mo
 share/locale/gl/LC_MESSAGES/libgravatar.mo
@@ -40,9 +42,11 @@ share/locale/ja/LC_MESSAGES/libgravatar.mo
 share/locale/ko/LC_MESSAGES/libgravatar.mo
 share/locale/lt/LC_MESSAGES/libgravatar.mo
 share/locale/nl/LC_MESSAGES/libgravatar.mo
+share/locale/nn/LC_MESSAGES/libgravatar.mo
 share/locale/pl/LC_MESSAGES/libgravatar.mo
 share/locale/pt/LC_MESSAGES/libgravatar.mo
 share/locale/pt_BR/LC_MESSAGES/libgravatar.mo
+share/locale/ro/LC_MESSAGES/libgravatar.mo
 share/locale/ru/LC_MESSAGES/libgravatar.mo
 share/locale/sk/LC_MESSAGES/libgravatar.mo
 share/locale/sl/LC_MESSAGES/libgravatar.mo
diff --git a/libgravatar/distinfo b/libgravatar/distinfo
index 0d7e39ebd8..8c507d9e6c 100644
--- a/libgravatar/distinfo
+++ b/libgravatar/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-SHA1 (libgravatar-20.04.1.tar.xz) = c6f0eba474af91b10dbb80b04770cabf2fe8d839
-RMD160 (libgravatar-20.04.1.tar.xz) = f242726f3a5184ccb01697e6c10a7ae21f7b0825
-SHA512 (libgravatar-20.04.1.tar.xz) = 926676fb148a8078d7ed8ebca381c509459a6040de095ca17c9578df07b7f99442abfb6ed56168d66226eb284a5a2332ed6d1e250721e8e6a29eb399d8f0c172
-Size (libgravatar-20.04.1.tar.xz) = 31428 bytes
+SHA1 (libgravatar-20.12.3.tar.xz) = 49947f33d2e0b9c09521492f2eda927571d71bd2
+RMD160 (libgravatar-20.12.3.tar.xz) = 2698b9f6bfa12313263d75e117dc494ff651cd36
+SHA512 (libgravatar-20.12.3.tar.xz) = 920e4db3c9c2813cb02b8324772494b600865372ae6fa4ab7e883e013c837c04ce55b2b8cff74e00d89f7afd3eb7120e10e80640a139d06d05d0646be0fd6ee0
+Size (libgravatar-20.12.3.tar.xz) = 31160 bytes
diff --git a/libkdepim/PLIST b/libkdepim/PLIST
index 0485c20531..b987147104 100644
--- a/libkdepim/PLIST
+++ b/libkdepim/PLIST
@@ -1,111 +1,38 @@
 @comment $NetBSD$
-include/KF5/Libkdepim/AddHostDialog
-include/KF5/Libkdepim/AddresseeLineEditUtil
-include/KF5/Libkdepim/BroadcastStatus
-include/KF5/Libkdepim/CustomLogWidget
-include/KF5/Libkdepim/EmailValidator
 include/KF5/Libkdepim/KCheckComboBox
-include/KF5/Libkdepim/KCursorSaver
-include/KF5/Libkdepim/KDatePickerPopup
-include/KF5/Libkdepim/KPrefsDialog
-include/KF5/Libkdepim/KWeekdayCheckCombo
 include/KF5/Libkdepim/KWidgetLister
-include/KF5/Libkdepim/LdapClient
-include/KF5/Libkdepim/LdapClientSearch
-include/KF5/Libkdepim/LdapClientSearchConfig
-include/KF5/Libkdepim/LdapConfigureWidget
-include/KF5/Libkdepim/LdapSearchDialog
-include/KF5/Libkdepim/MaillistDrag
+include/KF5/Libkdepim/LineEditCatchReturnKey
 include/KF5/Libkdepim/MultiplyingLine
 include/KF5/Libkdepim/MultiplyingLineEditor
-include/KF5/Libkdepim/OverlayWidget
-include/KF5/Libkdepim/PIMMessageBox
 include/KF5/Libkdepim/ProgressDialog
 include/KF5/Libkdepim/ProgressIndicatorLabel
 include/KF5/Libkdepim/ProgressManager
 include/KF5/Libkdepim/ProgressStatusBarWidget
-include/KF5/Libkdepim/RecentAddresses
 include/KF5/Libkdepim/StatusbarProgressWidget
-include/KF5/Libkdepim/UiStateSaver
-include/KF5/LibkdepimAkonadi/AddContactJob
-include/KF5/LibkdepimAkonadi/AddEmailAddressJob
-include/KF5/LibkdepimAkonadi/AddEmailDisplayJob
-include/KF5/LibkdepimAkonadi/AddresseeLineEdit
-include/KF5/LibkdepimAkonadi/CompletionConfigureDialog
-include/KF5/LibkdepimAkonadi/CompletionOrderEditor
-include/KF5/LibkdepimAkonadi/OpenEmailAddressJob
-include/KF5/LibkdepimAkonadi/ProgressManagerAkonadi
-include/KF5/LibkdepimAkonadi/TagSelectionCombo
-include/KF5/LibkdepimAkonadi/TagWidgets
-include/KF5/libkdepim/addhostdialog.h
-include/KF5/libkdepim/addresseelineeditutil.h
-include/KF5/libkdepim/broadcaststatus.h
-include/KF5/libkdepim/customlogwidget.h
-include/KF5/libkdepim/emailvalidator.h
 include/KF5/libkdepim/kcheckcombobox.h
-include/KF5/libkdepim/kcursorsaver.h
-include/KF5/libkdepim/kdatepickerpopup.h
 include/KF5/libkdepim/kdepim_export.h
-include/KF5/libkdepim/kprefsdialog.h
-include/KF5/libkdepim/kweekdaycheckcombo.h
 include/KF5/libkdepim/kwidgetlister.h
-include/KF5/libkdepim/ldapclient.h
-include/KF5/libkdepim/ldapclientsearch.h
-include/KF5/libkdepim/ldapclientsearchconfig.h
-include/KF5/libkdepim/ldapconfigurewidget.h
-include/KF5/libkdepim/ldapsearchdialog.h
-include/KF5/libkdepim/maillistdrag.h
+include/KF5/libkdepim/lineeditcatchreturnkey.h
 include/KF5/libkdepim/multiplyingline.h
 include/KF5/libkdepim/multiplyinglineeditor.h
-include/KF5/libkdepim/overlaywidget.h
-include/KF5/libkdepim/pimmessagebox.h
 include/KF5/libkdepim/progressdialog.h
 include/KF5/libkdepim/progressindicatorlabel.h
 include/KF5/libkdepim/progressmanager.h
 include/KF5/libkdepim/progressstatusbarwidget.h
-include/KF5/libkdepim/recentaddresses.h
 include/KF5/libkdepim/statusbarprogresswidget.h
-include/KF5/libkdepim/uistatesaver.h
 include/KF5/libkdepim_version.h
-include/KF5/libkdepimakonadi/addcontactjob.h
-include/KF5/libkdepimakonadi/addemailaddressjob.h
-include/KF5/libkdepimakonadi/addemaildisplayjob.h
-include/KF5/libkdepimakonadi/addresseelineedit.h
-include/KF5/libkdepimakonadi/completionconfiguredialog.h
-include/KF5/libkdepimakonadi/completionordereditor.h
-include/KF5/libkdepimakonadi/kdepimakonadi_export.h
-include/KF5/libkdepimakonadi/openemailaddressjob.h
-include/KF5/libkdepimakonadi/progressmanagerakonadi.h
-include/KF5/libkdepimakonadi/tagselectioncombo.h
-include/KF5/libkdepimakonadi/tagwidgets.h
-include/KF5/libkdepimakonadi_version.h
 lib/cmake/KF5Libkdepim/KF5LibkdepimConfig.cmake
 lib/cmake/KF5Libkdepim/KF5LibkdepimConfigVersion.cmake
 lib/cmake/KF5Libkdepim/KF5LibkdepimTargets-noconfig.cmake
 lib/cmake/KF5Libkdepim/KF5LibkdepimTargets.cmake
-lib/cmake/KF5LibkdepimAkonadi/KF5LibkdepimAkonadiConfig.cmake
-lib/cmake/KF5LibkdepimAkonadi/KF5LibkdepimAkonadiConfigVersion.cmake
-lib/cmake/KF5LibkdepimAkonadi/KF5LibkdepimAkonadiTargets-noconfig.cmake
-lib/cmake/KF5LibkdepimAkonadi/KF5LibkdepimAkonadiTargets.cmake
 lib/cmake/MailTransportDBusService/MailTransportDBusServiceConfig.cmake
 lib/libKF5Libkdepim.so
 lib/libKF5Libkdepim.so.5
-lib/libKF5Libkdepim.so.5.14.1
-lib/libKF5LibkdepimAkonadi.so
-lib/libKF5LibkdepimAkonadi.so.5
-lib/libKF5LibkdepimAkonadi.so.5.14.1
+lib/libKF5Libkdepim.so.5.16.3
 qt5/mkspecs/modules/qt_Libkdepim.pri
-qt5/mkspecs/modules/qt_LibkdepimAkonadi.pri
-qt5/plugins/designer/kdepimakonadiwidgets.so
 qt5/plugins/designer/kdepimwidgets.so
-qt5/plugins/kcm_ldap.so
 share/dbus-1/interfaces/org.kde.addressbook.service.xml
 share/dbus-1/interfaces/org.kde.mailtransport.service.xml
-share/kdepimwidgets/pics/addresseelineedit.png
-share/kdepimwidgets/pics/clicklineedit.png
-share/kdepimwidgets/pics/kdateedit.png
-share/kdepimwidgets/pics/ktimeedit.png
-share/kservices5/kcmldap.desktop
 share/locale/ar/LC_MESSAGES/libkdepim.mo
 share/locale/bg/LC_MESSAGES/libkdepim.mo
 share/locale/bs/LC_MESSAGES/libkdepim.mo
diff --git a/libkdepim/distinfo b/libkdepim/distinfo
index 2592d5825b..13f8f73b4d 100644
--- a/libkdepim/distinfo
+++ b/libkdepim/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-SHA1 (libkdepim-20.04.1.tar.xz) = ef66113e2cc9644e7984d8c3f0a15462032a9599
-RMD160 (libkdepim-20.04.1.tar.xz) = 54385dd0fc08a00aa3eb6968af92ff799523086b
-SHA512 (libkdepim-20.04.1.tar.xz) = 9277960c017e2eeac06d672d512fb99d36e713db8c96430098bbfdc5d03f08a3b2a2330ae45a91f84ea8aa406ff653aaf4afc338b4d155a48003f9d1a171037d
-Size (libkdepim-20.04.1.tar.xz) = 333836 bytes
+SHA1 (libkdepim-20.12.3.tar.xz) = d06f22afd684a4c80a38732d3e59af272a0217da
+RMD160 (libkdepim-20.12.3.tar.xz) = 116ee050a10340265841dc14f17d8e93960a92a4
+SHA512 (libkdepim-20.12.3.tar.xz) = 9d491c72cc5ab5745380b3381b50a7d2e94dc6c5b8d52fa36f26d8ba7666635a97b412294211f7dc032d5aba5bb4ce97d499e22218f11cd6f723d051e452fd74
+Size (libkdepim-20.12.3.tar.xz) = 238528 bytes
diff --git a/libkgapi/PLIST b/libkgapi/PLIST
index fd50c4dd14..a6fa312679 100644
--- a/libkgapi/PLIST
+++ b/libkgapi/PLIST
@@ -4,7 +4,6 @@ include/KPim/KGAPI/KGAPI/AccountInfo
 include/KPim/KGAPI/KGAPI/AccountInfoFetchJob
 include/KPim/KGAPI/KGAPI/AccountManager
 include/KPim/KGAPI/KGAPI/AuthJob
-include/KPim/KGAPI/KGAPI/AuthWidget
 include/KPim/KGAPI/KGAPI/Blogger/Blog
 include/KPim/KGAPI/KGAPI/Blogger/BlogFetchJob
 include/KPim/KGAPI/KGAPI/Blogger/Comment
@@ -71,6 +70,7 @@ include/KPim/KGAPI/KGAPI/Drive/DrivesSearchQuery
 include/KPim/KGAPI/KGAPI/Drive/File
 include/KPim/KGAPI/KGAPI/Drive/FileAbstractDataJob
 include/KPim/KGAPI/KGAPI/Drive/FileAbstractModifyJob
+include/KPim/KGAPI/KGAPI/Drive/FileAbstractResumableJob
 include/KPim/KGAPI/KGAPI/Drive/FileAbstractUploadJob
 include/KPim/KGAPI/KGAPI/Drive/FileCopyJob
 include/KPim/KGAPI/KGAPI/Drive/FileCreateJob
@@ -78,6 +78,8 @@ include/KPim/KGAPI/KGAPI/Drive/FileDeleteJob
 include/KPim/KGAPI/KGAPI/Drive/FileFetchContentJob
 include/KPim/KGAPI/KGAPI/Drive/FileFetchJob
 include/KPim/KGAPI/KGAPI/Drive/FileModifyJob
+include/KPim/KGAPI/KGAPI/Drive/FileResumableCreateJob
+include/KPim/KGAPI/KGAPI/Drive/FileResumableModifyJob
 include/KPim/KGAPI/KGAPI/Drive/FileSearchQuery
 include/KPim/KGAPI/KGAPI/Drive/FileTouchJob
 include/KPim/KGAPI/KGAPI/Drive/FileTrashJob
@@ -135,7 +137,6 @@ include/KPim/KGAPI/kgapi/accountinfo.h
 include/KPim/KGAPI/kgapi/accountinfofetchjob.h
 include/KPim/KGAPI/kgapi/accountmanager.h
 include/KPim/KGAPI/kgapi/authjob.h
-include/KPim/KGAPI/kgapi/authwidget.h
 include/KPim/KGAPI/kgapi/blogger/blog.h
 include/KPim/KGAPI/kgapi/blogger/blogfetchjob.h
 include/KPim/KGAPI/kgapi/blogger/comment.h
@@ -205,6 +206,7 @@ include/KPim/KGAPI/kgapi/drive/drivessearchquery.h
 include/KPim/KGAPI/kgapi/drive/file.h
 include/KPim/KGAPI/kgapi/drive/fileabstractdatajob.h
 include/KPim/KGAPI/kgapi/drive/fileabstractmodifyjob.h
+include/KPim/KGAPI/kgapi/drive/fileabstractresumablejob.h
 include/KPim/KGAPI/kgapi/drive/fileabstractuploadjob.h
 include/KPim/KGAPI/kgapi/drive/filecopyjob.h
 include/KPim/KGAPI/kgapi/drive/filecreatejob.h
@@ -212,6 +214,8 @@ include/KPim/KGAPI/kgapi/drive/filedeletejob.h
 include/KPim/KGAPI/kgapi/drive/filefetchcontentjob.h
 include/KPim/KGAPI/kgapi/drive/filefetchjob.h
 include/KPim/KGAPI/kgapi/drive/filemodifyjob.h
+include/KPim/KGAPI/kgapi/drive/fileresumablecreatejob.h
+include/KPim/KGAPI/kgapi/drive/fileresumablemodifyjob.h
 include/KPim/KGAPI/kgapi/drive/filesearchquery.h
 include/KPim/KGAPI/kgapi/drive/filetouchjob.h
 include/KPim/KGAPI/kgapi/drive/filetrashjob.h
@@ -276,28 +280,28 @@ lib/cmake/KPimGAPI/KPimGAPITargets-noconfig.cmake
 lib/cmake/KPimGAPI/KPimGAPITargets.cmake
 lib/libKPimGAPIBlogger.so
 lib/libKPimGAPIBlogger.so.5
-lib/libKPimGAPIBlogger.so.5.14.1
+lib/libKPimGAPIBlogger.so.5.16.3
 lib/libKPimGAPICalendar.so
 lib/libKPimGAPICalendar.so.5
-lib/libKPimGAPICalendar.so.5.14.1
+lib/libKPimGAPICalendar.so.5.16.3
 lib/libKPimGAPIContacts.so
 lib/libKPimGAPIContacts.so.5
-lib/libKPimGAPIContacts.so.5.14.1
+lib/libKPimGAPIContacts.so.5.16.3
 lib/libKPimGAPICore.so
 lib/libKPimGAPICore.so.5
-lib/libKPimGAPICore.so.5.14.1
+lib/libKPimGAPICore.so.5.16.3
 lib/libKPimGAPIDrive.so
 lib/libKPimGAPIDrive.so.5
-lib/libKPimGAPIDrive.so.5.14.1
+lib/libKPimGAPIDrive.so.5.16.3
 lib/libKPimGAPILatitude.so
 lib/libKPimGAPILatitude.so.5
-lib/libKPimGAPILatitude.so.5.14.1
+lib/libKPimGAPILatitude.so.5.16.3
 lib/libKPimGAPIMaps.so
 lib/libKPimGAPIMaps.so.5
-lib/libKPimGAPIMaps.so.5.14.1
+lib/libKPimGAPIMaps.so.5.16.3
 lib/libKPimGAPITasks.so
 lib/libKPimGAPITasks.so.5
-lib/libKPimGAPITasks.so.5.14.1
+lib/libKPimGAPITasks.so.5.16.3
 lib/sasl2/libkdexoauth2.so
 lib/sasl2/libkdexoauth2.so.3
 lib/sasl2/libkdexoauth2.so.3.0.0
diff --git a/libkgapi/buildlink3.mk b/libkgapi/buildlink3.mk
index 0272735ee0..f403f5115a 100644
--- a/libkgapi/buildlink3.mk
+++ b/libkgapi/buildlink3.mk
@@ -8,18 +8,12 @@ LIBKGAPI_BUILDLINK3_MK:=
 BUILDLINK_API_DEPENDS.libkgapi+=	libkgapi>=20.04.1
 BUILDLINK_PKGSRCDIR.libkgapi?=	../../wip/libkgapi
 
-# XXX
-# XXX Uncomment and keep only the buildlink3 lines below which are directly
-# XXX needed for dependencies to compile, link, and run.  If this package
-# XXX provides a wrappered API or otherwise does not expose the APIs of the
-# XXX buildlink3 lines below to dependencies, remove them.
-# XXX
-#.include "../../devel/kio/buildlink3.mk"
-#.include "../../time/kcalendarcore/buildlink3.mk"
-#.include "../../misc/kcontacts/buildlink3.mk"
-#.include "../../security/cyrus-sasl/buildlink3.mk"
-#.include "../../wip/qt5-qtwebengine/buildlink3.mk"
-#.include "../../x11/qt5-qtbase/buildlink3.mk"
+.include "../../devel/kio/buildlink3.mk"
+.include "../../time/kcalendarcore/buildlink3.mk"
+.include "../../misc/kcontacts/buildlink3.mk"
+.include "../../security/cyrus-sasl/buildlink3.mk"
+.include "../../wip/qt5-qtwebengine/buildlink3.mk"
+.include "../../x11/qt5-qtbase/buildlink3.mk"
 .endif	# LIBKGAPI_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-libkgapi
diff --git a/libkgapi/distinfo b/libkgapi/distinfo
index 3a0f580b07..dca8ddf345 100644
--- a/libkgapi/distinfo
+++ b/libkgapi/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-SHA1 (libkgapi-20.04.1.tar.xz) = 4463561bd94148200b5e26055c34059cb04a5428
-RMD160 (libkgapi-20.04.1.tar.xz) = 32ab289e3bc9d59bb1d3742a2cc78e0fc6e9d780
-SHA512 (libkgapi-20.04.1.tar.xz) = 678ca1d1247954c8e772c62096aa6cec8d88299ec364b8102fd32453a376d523ac7fea1a0a00f68f49bee8b70585f8f22e5a6a6b891dc47d076d9d8dc0881f11
-Size (libkgapi-20.04.1.tar.xz) = 239964 bytes
+SHA1 (libkgapi-20.12.3.tar.xz) = 035483d71c9c57bc44048d4d4e41ed8ccd292a8e
+RMD160 (libkgapi-20.12.3.tar.xz) = 5b9ca09bc7fc3410b1510025363a895780e1375a
+SHA512 (libkgapi-20.12.3.tar.xz) = 5376773bdaad0970abc1a9fd43fc904eaf39601c56fc626f2d08fed5b2b48ee0df79c18a33d9426913efde048642b4ced59a29cb5532a0e4661e565beb30283d
+Size (libkgapi-20.12.3.tar.xz) = 246100 bytes
diff --git a/libkleo/PLIST b/libkleo/PLIST
index 6f3cc7c4df..7a44c9eb64 100644
--- a/libkleo/PLIST
+++ b/libkleo/PLIST
@@ -9,7 +9,6 @@ include/KF5/Libkleo/DefaultKeyGenerationJob
 include/KF5/Libkleo/DirectoryServicesWidget
 include/KF5/Libkleo/Dn
 include/KF5/Libkleo/Enum
-include/KF5/Libkleo/Exception
 include/KF5/Libkleo/FileNameRequester
 include/KF5/Libkleo/FileSystemWatcher
 include/KF5/Libkleo/Formatting
@@ -28,6 +27,7 @@ include/KF5/Libkleo/KeyRequester
 include/KF5/Libkleo/KeyResolver
 include/KF5/Libkleo/KeySelectionCombo
 include/KF5/Libkleo/KeySelectionDialog
+include/KF5/Libkleo/KleoException
 include/KF5/Libkleo/MessageBox
 include/KF5/Libkleo/NewKeyApprovalDialog
 include/KF5/Libkleo/OidMap
@@ -46,7 +46,6 @@ include/KF5/libkleo/directoryserviceswidget.h
 include/KF5/libkleo/dn.h
 include/KF5/libkleo/dnattributeorderconfigwidget.h
 include/KF5/libkleo/enum.h
-include/KF5/libkleo/exception.h
 include/KF5/libkleo/filenamerequester.h
 include/KF5/libkleo/filesystemwatcher.h
 include/KF5/libkleo/formatting.h
@@ -66,6 +65,7 @@ include/KF5/libkleo/keyresolver.h
 include/KF5/libkleo/keyselectioncombo.h
 include/KF5/libkleo/keyselectiondialog.h
 include/KF5/libkleo/kleo_export.h
+include/KF5/libkleo/kleoexception.h
 include/KF5/libkleo/messagebox.h
 include/KF5/libkleo/newkeyapprovaldialog.h
 include/KF5/libkleo/oidmap.h
@@ -81,7 +81,7 @@ lib/cmake/KF5Libkleo/KF5LibkleoTargets-noconfig.cmake
 lib/cmake/KF5Libkleo/KF5LibkleoTargets.cmake
 lib/libKF5Libkleo.so
 lib/libKF5Libkleo.so.5
-lib/libKF5Libkleo.so.5.14.1
+lib/libKF5Libkleo.so.5.16.3
 qt5/mkspecs/modules/qt_Libkleo.pri
 share/examples/kde-xdg/libkleopatrarc
 share/libkleopatra/pics/chiasmus_chi.png
diff --git a/libkleo/distinfo b/libkleo/distinfo
index 1a51e5b004..adbe657f6b 100644
--- a/libkleo/distinfo
+++ b/libkleo/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-SHA1 (libkleo-20.04.1.tar.xz) = 77bd4aacbfa42f2eddd77d46d99d412cb565c94a
-RMD160 (libkleo-20.04.1.tar.xz) = a7e97b871607f7a5e3f4bd72e1963e88dac3f85a
-SHA512 (libkleo-20.04.1.tar.xz) = c8f1bd4cc58a942f2442bfbf3b0065264eca240876f5c5e29f7dda5c79d81f0c9f414e4b6667cfe0cd6d23e45a12595139f0ce5a65864a6837de9ffc21460ca7
-Size (libkleo-20.04.1.tar.xz) = 351752 bytes
+SHA1 (libkleo-20.12.3.tar.xz) = a8d26c9ce1161db63c3325645a34cccdc27c10d9
+RMD160 (libkleo-20.12.3.tar.xz) = c13a52f9f1f8e3e6d174b89afdb14f6ca0450b99
+SHA512 (libkleo-20.12.3.tar.xz) = 006b6074f6e77fff1e95be7ea209042306b5dfbea6e99ee0502e78cf37709e1d8e4e02deb3011a434712dd98d62b2f1fdb5bf9140913def8075ca45e67e45623
+Size (libkleo-20.12.3.tar.xz) = 358540 bytes
diff --git a/libksieve/PLIST b/libksieve/PLIST
index b61684a244..f92d148d4e 100644
--- a/libksieve/PLIST
+++ b/libksieve/PLIST
@@ -53,13 +53,13 @@ lib/cmake/KF5LibKSieve/KF5LibKSieveTargets-noconfig.cmake
 lib/cmake/KF5LibKSieve/KF5LibKSieveTargets.cmake
 lib/libKF5KManageSieve.so
 lib/libKF5KManageSieve.so.5
-lib/libKF5KManageSieve.so.5.14.1
+lib/libKF5KManageSieve.so.5.16.3
 lib/libKF5KSieve.so
 lib/libKF5KSieve.so.5
-lib/libKF5KSieve.so.5.14.1
+lib/libKF5KSieve.so.5.16.3
 lib/libKF5KSieveUi.so
 lib/libKF5KSieveUi.so.5
-lib/libKF5KSieveUi.so.5.14.1
+lib/libKF5KSieveUi.so.5.16.3
 qt5/mkspecs/modules/qt_KManageSieve.pri
 qt5/mkspecs/modules/qt_KSieve.pri
 qt5/mkspecs/modules/qt_KSieveUi.pri
@@ -72,8 +72,14 @@ share/doc/HTML/en/kioslave5/sieve/index.cache.bz2
 share/doc/HTML/en/kioslave5/sieve/index.docbook
 share/doc/HTML/es/kioslave5/sieve/index.cache.bz2
 share/doc/HTML/es/kioslave5/sieve/index.docbook
+share/doc/HTML/et/kioslave5/sieve/index.cache.bz2
+share/doc/HTML/et/kioslave5/sieve/index.docbook
+share/doc/HTML/fr/kioslave5/sieve/index.cache.bz2
+share/doc/HTML/fr/kioslave5/sieve/index.docbook
 share/doc/HTML/it/kioslave5/sieve/index.cache.bz2
 share/doc/HTML/it/kioslave5/sieve/index.docbook
+share/doc/HTML/ko/kioslave5/sieve/index.cache.bz2
+share/doc/HTML/ko/kioslave5/sieve/index.docbook
 share/doc/HTML/nl/kioslave5/sieve/index.cache.bz2
 share/doc/HTML/nl/kioslave5/sieve/index.docbook
 share/doc/HTML/pt/kioslave5/sieve/index.cache.bz2
diff --git a/libksieve/distinfo b/libksieve/distinfo
index 152f890558..c353c1daa9 100644
--- a/libksieve/distinfo
+++ b/libksieve/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-SHA1 (libksieve-20.04.1.tar.xz) = e0b9d3feb06d792367c19a4a4006034b3ff840ef
-RMD160 (libksieve-20.04.1.tar.xz) = 9f85233e330007b8e27bf3e06e05ecda6a049add
-SHA512 (libksieve-20.04.1.tar.xz) = f6be11d5487ea3b4d377702ed6d3bb09cd503ea7a043f17de52055d7608e1562330d9548d4068623c120629aa9899923aa0b432ef06900a1596f18699f9c397c
-Size (libksieve-20.04.1.tar.xz) = 554840 bytes
+SHA1 (libksieve-20.12.3.tar.xz) = 9bd19c6ebfe66e7e7740250f62b8daf9418ea850
+RMD160 (libksieve-20.12.3.tar.xz) = f63b965d649142761e404fb4e06153d41bdecc78
+SHA512 (libksieve-20.12.3.tar.xz) = 0782de6b15000e97194c111e6b692721eb89e0414b4e854f8ad9bf989ad03b6792b4ae9af39549521db2f4d4c69ee07508c283f666c74d64ab5a7c51eea3091a
+Size (libksieve-20.12.3.tar.xz) = 558368 bytes
diff --git a/mailcommon/PLIST b/mailcommon/PLIST
index b5c61432fd..dfd4a5f3d3 100644
--- a/mailcommon/PLIST
+++ b/mailcommon/PLIST
@@ -3,7 +3,11 @@ include/KF5/MailCommon/AccountConfigOrderDialog
 include/KF5/MailCommon/AddTagDialog
 include/KF5/MailCommon/BackupJob
 include/KF5/MailCommon/CollectionExpiryPage
+include/KF5/MailCommon/CollectionExpiryWidget
 include/KF5/MailCommon/CollectionGeneralPage
+include/KF5/MailCommon/CollectionGeneralWidget
+include/KF5/MailCommon/CollectionTemplatesWidget
+include/KF5/MailCommon/CollectionViewWidget
 include/KF5/MailCommon/CryptoUtils
 include/KF5/MailCommon/DBusOperators
 include/KF5/MailCommon/ExpireCollectionAttribute
@@ -51,7 +55,11 @@ include/KF5/mailcommon/accountconfigorderdialog.h
 include/KF5/mailcommon/addtagdialog.h
 include/KF5/mailcommon/backupjob.h
 include/KF5/mailcommon/collectionexpirypage.h
+include/KF5/mailcommon/collectionexpirywidget.h
 include/KF5/mailcommon/collectiongeneralpage.h
+include/KF5/mailcommon/collectiongeneralwidget.h
+include/KF5/mailcommon/collectiontemplateswidget.h
+include/KF5/mailcommon/collectionviewwidget.h
 include/KF5/mailcommon/cryptoutils.h
 include/KF5/mailcommon/dbusoperators.h
 include/KF5/mailcommon/expirecollectionattribute.h
@@ -105,7 +113,7 @@ lib/cmake/KF5MailCommon/KF5MailCommonTargets-noconfig.cmake
 lib/cmake/KF5MailCommon/KF5MailCommonTargets.cmake
 lib/libKF5MailCommon.so
 lib/libKF5MailCommon.so.5
-lib/libKF5MailCommon.so.5.14.1
+lib/libKF5MailCommon.so.5.16.3
 qt5/mkspecs/modules/qt_MailCommon.pri
 qt5/plugins/designer/mailcommonwidgets.so
 share/locale/ar/LC_MESSAGES/libmailcommon.mo
diff --git a/mailcommon/distinfo b/mailcommon/distinfo
index 48808da183..79a583ecc1 100644
--- a/mailcommon/distinfo
+++ b/mailcommon/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-SHA1 (mailcommon-20.04.1.tar.xz) = 191b63d077d119c9da975ad4ea974454cee872ab
-RMD160 (mailcommon-20.04.1.tar.xz) = 2852a62c9e8d748d62ea1c2cef65a193a215a63c
-SHA512 (mailcommon-20.04.1.tar.xz) = c1454e08c664eeada637cc26987319eab39c81307c6c6db77a57e398267de576a18a0a81b82d3ca25d6c17ef5e26f3cbbc5453c149906e8fa8ba555859751829
-Size (mailcommon-20.04.1.tar.xz) = 707400 bytes
+SHA1 (mailcommon-20.12.3.tar.xz) = 2965dca5a32f08819091aa76e53dcc00d601f265
+RMD160 (mailcommon-20.12.3.tar.xz) = 4273d7c02d10527dc1668a640cc83cab37b53cc5
+SHA512 (mailcommon-20.12.3.tar.xz) = 348c8ed4db7e4db234adbb1eeadccb2cbc85e59d47fca607b834ead5b6f65a0c62b9c1396bd34ee4eae91cdb95b5fc52b9caedf3b23d5ffbd9efbafd6e56ed32
+Size (mailcommon-20.12.3.tar.xz) = 723876 bytes
diff --git a/mailimporter/PLIST b/mailimporter/PLIST
index 470d3032ee..2e48ef305e 100644
--- a/mailimporter/PLIST
+++ b/mailimporter/PLIST
@@ -71,10 +71,10 @@ lib/cmake/KF5MailImporterAkonadi/KF5MailImporterAkonadiTargets-noconfig.cmake
 lib/cmake/KF5MailImporterAkonadi/KF5MailImporterAkonadiTargets.cmake
 lib/libKF5MailImporter.so
 lib/libKF5MailImporter.so.5
-lib/libKF5MailImporter.so.5.14.1
+lib/libKF5MailImporter.so.5.16.3
 lib/libKF5MailImporterAkonadi.so
 lib/libKF5MailImporterAkonadi.so.5
-lib/libKF5MailImporterAkonadi.so.5.14.1
+lib/libKF5MailImporterAkonadi.so.5.16.3
 qt5/mkspecs/modules/qt_MailImporter.pri
 qt5/mkspecs/modules/qt_MailImporterAkonadi.pri
 share/locale/ar/LC_MESSAGES/libmailimporter.mo
diff --git a/mailimporter/distinfo b/mailimporter/distinfo
index f9cc8ceee3..c9b0aeb711 100644
--- a/mailimporter/distinfo
+++ b/mailimporter/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-SHA1 (mailimporter-20.04.1.tar.xz) = e92c18805c6a96e81d3293a1ae6dcea629366d86
-RMD160 (mailimporter-20.04.1.tar.xz) = f46b396b03bf3f9131d0c678f463b3e60aa4e3e9
-SHA512 (mailimporter-20.04.1.tar.xz) = da2a9e0436b542e31b1d9e9e803eac82ea3f19b82529c42da445597a566be5cdd8ed9a0db7b5e796c6bb1295dfef7e1de880f20479de851c76468176a75fa7d1
-Size (mailimporter-20.04.1.tar.xz) = 540412 bytes
+SHA1 (mailimporter-20.12.3.tar.xz) = 60f73c2509e460f4124c4e8aca37aa4d828f4ba0
+RMD160 (mailimporter-20.12.3.tar.xz) = 4da34f63c522848945802f4e5f1b22b5a9f2eefb
+SHA512 (mailimporter-20.12.3.tar.xz) = 2952c7f7bba61dc7e36bc877516aa6d46c5ec75b998f2f080a5d40d7f95ee553c97b8cc950a36b03929a57063b7c9899dc997e3397fd574c0278b01ffe2b4994
+Size (mailimporter-20.12.3.tar.xz) = 548588 bytes
diff --git a/mbox-importer/PLIST b/mbox-importer/PLIST
index 31ed33e48a..99cf9f4912 100644
--- a/mbox-importer/PLIST
+++ b/mbox-importer/PLIST
@@ -9,6 +9,7 @@ share/locale/ca@valencia/LC_MESSAGES/mboximporter.mo
 share/locale/cs/LC_MESSAGES/mboximporter.mo
 share/locale/da/LC_MESSAGES/mboximporter.mo
 share/locale/de/LC_MESSAGES/mboximporter.mo
+share/locale/el/LC_MESSAGES/mboximporter.mo
 share/locale/en_GB/LC_MESSAGES/mboximporter.mo
 share/locale/es/LC_MESSAGES/mboximporter.mo
 share/locale/et/LC_MESSAGES/mboximporter.mo
@@ -25,6 +26,7 @@ share/locale/lt/LC_MESSAGES/mboximporter.mo
 share/locale/nb/LC_MESSAGES/mboximporter.mo
 share/locale/nds/LC_MESSAGES/mboximporter.mo
 share/locale/nl/LC_MESSAGES/mboximporter.mo
+share/locale/nn/LC_MESSAGES/mboximporter.mo
 share/locale/pl/LC_MESSAGES/mboximporter.mo
 share/locale/pt/LC_MESSAGES/mboximporter.mo
 share/locale/pt_BR/LC_MESSAGES/mboximporter.mo
diff --git a/mbox-importer/distinfo b/mbox-importer/distinfo
index 8971fdd4f0..ce84f9568f 100644
--- a/mbox-importer/distinfo
+++ b/mbox-importer/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-SHA1 (mbox-importer-20.04.1.tar.xz) = 962064c9c4db79915a9a01b9d40da21d68eb328c
-RMD160 (mbox-importer-20.04.1.tar.xz) = 0a2f0fc4d06fd876693152a667d9352822868a63
-SHA512 (mbox-importer-20.04.1.tar.xz) = 525a654a5d7114a9d44004732c0d6001f327bdd7845bee04011080f46c82d94b1ec9e3aea6d136a4ef7aed033eb49b4577ce09c63782c5e45eae8a54fd778ae5
-Size (mbox-importer-20.04.1.tar.xz) = 33516 bytes
+SHA1 (mbox-importer-20.12.3.tar.xz) = c1f4e9be4dee4a9b3f114ef000017654357aa4f2
+RMD160 (mbox-importer-20.12.3.tar.xz) = a5babe6613fae401493678873290bbd11877cace
+SHA512 (mbox-importer-20.12.3.tar.xz) = 0907a158a2830eb08455270dc52ccb03c24c595435b372eae58291f36b92270ff6069391264100db13b1da8bea642858ac88b7a0540989ee6e1888ba8ddbf237
+Size (mbox-importer-20.12.3.tar.xz) = 24760 bytes
diff --git a/messagelib/Makefile b/messagelib/Makefile
index 0c0afb56c7..e1cb83027f 100644
--- a/messagelib/Makefile
+++ b/messagelib/Makefile
@@ -20,7 +20,7 @@ USE_TOOLS+=	msgmerge
 .include "../../misc/kidentitymanagement/buildlink3.mk"
 .include "../../wip/kmailtransport/buildlink3.mk"
 .include "../../mail/kmbox/buildlink3.mk"
-.include "../../wip/kdepim-apps-libs/buildlink3.mk"
+#.include "../../wip/kdepim-apps-libs/buildlink3.mk"
 .include "../../wip/libgravatar/buildlink3.mk"
 .include "../../security/qca2-qt5/buildlink3.mk"
 .include "../../x11/qt5-qtwebengine/buildlink3.mk"
diff --git a/messagelib/PLIST b/messagelib/PLIST
index 721d5c05f6..00dd5722ce 100644
--- a/messagelib/PLIST
+++ b/messagelib/PLIST
@@ -19,6 +19,7 @@ include/KF5/MessageComposer/ConvertSnippetVariablesJob
 include/KF5/MessageComposer/ConvertSnippetVariablesUtil
 include/KF5/MessageComposer/EncryptJob
 include/KF5/MessageComposer/FollowUpReminderSelectDateDialog
+include/KF5/MessageComposer/FollowupReminder
 include/KF5/MessageComposer/FollowupReminderCreateJob
 include/KF5/MessageComposer/GlobalPart
 include/KF5/MessageComposer/ImageScalingWidget
@@ -55,11 +56,19 @@ include/KF5/MessageComposer/PluginEditorInitInterface
 include/KF5/MessageComposer/PluginEditorInitManager
 include/KF5/MessageComposer/PluginEditorInterface
 include/KF5/MessageComposer/PluginEditorManager
+include/KF5/MessageComposer/ProtectedHeadersJob
 include/KF5/MessageComposer/Recipient
 include/KF5/MessageComposer/RecipientLine
 include/KF5/MessageComposer/RecipientsEditor
 include/KF5/MessageComposer/RichTextComposerNg
 include/KF5/MessageComposer/RichTextComposerSignatures
+include/KF5/MessageComposer/SendLaterCreateJob
+include/KF5/MessageComposer/SendLaterDialog
+include/KF5/MessageComposer/SendLaterInfo
+include/KF5/MessageComposer/SendLaterJob
+include/KF5/MessageComposer/SendLaterRemoveJob
+include/KF5/MessageComposer/SendLaterUtil
+include/KF5/MessageComposer/SignEncryptJob
 include/KF5/MessageComposer/SignJob
 include/KF5/MessageComposer/SignatureController
 include/KF5/MessageComposer/SinglepartJob
@@ -230,6 +239,7 @@ include/KF5/messagecomposer/convertsnippetvariablemenu.h
 include/KF5/messagecomposer/convertsnippetvariablesjob.h
 include/KF5/messagecomposer/convertsnippetvariablesutil.h
 include/KF5/messagecomposer/encryptjob.h
+include/KF5/messagecomposer/followupreminder.h
 include/KF5/messagecomposer/followupremindercreatejob.h
 include/KF5/messagecomposer/followupreminderselectdatedialog.h
 include/KF5/messagecomposer/globalpart.h
@@ -270,12 +280,20 @@ include/KF5/messagecomposer/plugineditorinitinterface.h
 include/KF5/messagecomposer/plugineditorinitmanager.h
 include/KF5/messagecomposer/plugineditorinterface.h
 include/KF5/messagecomposer/plugineditormanager.h
+include/KF5/messagecomposer/protectedheadersjob.h
 include/KF5/messagecomposer/recipient.h
 include/KF5/messagecomposer/recipientline.h
 include/KF5/messagecomposer/recipientseditor.h
 include/KF5/messagecomposer/richtextcomposerng.h
 include/KF5/messagecomposer/richtextcomposersignatures.h
+include/KF5/messagecomposer/sendlatercreatejob.h
+include/KF5/messagecomposer/sendlaterdialog.h
+include/KF5/messagecomposer/sendlaterinfo.h
+include/KF5/messagecomposer/sendlaterjob.h
+include/KF5/messagecomposer/sendlaterremovejob.h
+include/KF5/messagecomposer/sendlaterutil.h
 include/KF5/messagecomposer/signaturecontroller.h
+include/KF5/messagecomposer/signencryptjob.h
 include/KF5/messagecomposer/signjob.h
 include/KF5/messagecomposer/singlepartjob.h
 include/KF5/messagecomposer/skeletonmessagejob.h
@@ -478,25 +496,25 @@ lib/cmake/KF5WebEngineViewer/KF5WebEngineViewerTargets-noconfig.cmake
 lib/cmake/KF5WebEngineViewer/KF5WebEngineViewerTargets.cmake
 lib/libKF5MessageComposer.so
 lib/libKF5MessageComposer.so.5
-lib/libKF5MessageComposer.so.5.14.1
+lib/libKF5MessageComposer.so.5.16.3
 lib/libKF5MessageCore.so
 lib/libKF5MessageCore.so.5
-lib/libKF5MessageCore.so.5.14.1
+lib/libKF5MessageCore.so.5.16.3
 lib/libKF5MessageList.so
 lib/libKF5MessageList.so.5
-lib/libKF5MessageList.so.5.14.1
+lib/libKF5MessageList.so.5.16.3
 lib/libKF5MessageViewer.so
 lib/libKF5MessageViewer.so.5
-lib/libKF5MessageViewer.so.5.14.1
+lib/libKF5MessageViewer.so.5.16.3
 lib/libKF5MimeTreeParser.so
 lib/libKF5MimeTreeParser.so.5
-lib/libKF5MimeTreeParser.so.5.14.1
+lib/libKF5MimeTreeParser.so.5.16.3
 lib/libKF5TemplateParser.so
 lib/libKF5TemplateParser.so.5
-lib/libKF5TemplateParser.so.5.14.1
+lib/libKF5TemplateParser.so.5.16.3
 lib/libKF5WebEngineViewer.so
 lib/libKF5WebEngineViewer.so.5
-lib/libKF5WebEngineViewer.so.5.14.1
+lib/libKF5WebEngineViewer.so.5.16.3
 qt5/mkspecs/modules/qt_MessageComposer.pri
 qt5/mkspecs/modules/qt_MessageCore.pri
 qt5/mkspecs/modules/qt_MessageList.pri
diff --git a/messagelib/buildlink3.mk b/messagelib/buildlink3.mk
index ae403bafae..69493edd10 100644
--- a/messagelib/buildlink3.mk
+++ b/messagelib/buildlink3.mk
@@ -11,7 +11,7 @@ BUILDLINK_PKGSRCDIR.messagelib?=	../../wip/messagelib
 .include "../../misc/kidentitymanagement/buildlink3.mk"
 .include "../../wip/kmailtransport/buildlink3.mk"
 .include "../../mail/kmbox/buildlink3.mk"
-.include "../../wip/kdepim-apps-libs/buildlink3.mk"
+#.include "../../wip/kdepim-apps-libs/buildlink3.mk"
 .include "../../wip/libgravatar/buildlink3.mk"
 .include "../../security/qca2-qt5/buildlink3.mk"
 .include "../../x11/qt5-qtwebengine/buildlink3.mk"
diff --git a/messagelib/distinfo b/messagelib/distinfo
index 51360819e0..bda9871ad4 100644
--- a/messagelib/distinfo
+++ b/messagelib/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-SHA1 (messagelib-20.04.1.tar.xz) = b6bb854b5fa021278860febca388ab4976717e46
-RMD160 (messagelib-20.04.1.tar.xz) = ac1afac501eec56b8a628d0713f6de6f9e82a1a9
-SHA512 (messagelib-20.04.1.tar.xz) = 889a8862878eac134bd5588f3756207a82fb087f9087807e5152f31f78600794b93cd53a32427352a1df83f791f0413f3b89c0c548b9b24f3c423fb42ed839fc
-Size (messagelib-20.04.1.tar.xz) = 10483264 bytes
+SHA1 (messagelib-20.12.3.tar.xz) = 646cb85939ed3018c6b9a2bc580ecd320046cceb
+RMD160 (messagelib-20.12.3.tar.xz) = 0347fbe3618e0a72a19c948d7ef62bbe6f54ca42
+SHA512 (messagelib-20.12.3.tar.xz) = bd7fbab82cc53d141e27e6148a9b957603beef508ed10786fe3052df94e27d23f424ea3cdf8a6c1aa412ecb999ec21c3b61705dcc29d85ece2ccfdf4c4ff159e
+Size (messagelib-20.12.3.tar.xz) = 10527968 bytes
diff --git a/pim-data-exporter/PLIST b/pim-data-exporter/PLIST
index c3a25d027f..78b0aa93f1 100644
--- a/pim-data-exporter/PLIST
+++ b/pim-data-exporter/PLIST
@@ -2,12 +2,35 @@
 bin/pimdataexporter
 bin/pimdataexporterconsole
 lib/libpimdataexporterprivate.so.5
-lib/libpimdataexporterprivate.so.5.14.1
+lib/libpimdataexporterprivate.so.5.16.3
 share/applications/org.kde.pimdataexporter.desktop
 share/config.kcfg/pimdataexporterglobalconfig.kcfg
+share/doc/HTML/ca/pimsettingexporter/index.cache.bz2
+share/doc/HTML/ca/pimsettingexporter/index.docbook
+share/doc/HTML/ca/pimsettingexporter/selection-dialog.png
+share/doc/HTML/de/pimsettingexporter/index.cache.bz2
+share/doc/HTML/de/pimsettingexporter/index.docbook
 share/doc/HTML/en/pimdataexporter/index.cache.bz2
 share/doc/HTML/en/pimdataexporter/index.docbook
 share/doc/HTML/en/pimdataexporter/selection-dialog.png
+share/doc/HTML/es/pimsettingexporter/index.cache.bz2
+share/doc/HTML/es/pimsettingexporter/index.docbook
+share/doc/HTML/et/pimsettingexporter/index.cache.bz2
+share/doc/HTML/et/pimsettingexporter/index.docbook
+share/doc/HTML/it/pimsettingexporter/index.cache.bz2
+share/doc/HTML/it/pimsettingexporter/index.docbook
+share/doc/HTML/nl/pimsettingexporter/index.cache.bz2
+share/doc/HTML/nl/pimsettingexporter/index.docbook
+share/doc/HTML/pt/pimsettingexporter/index.cache.bz2
+share/doc/HTML/pt/pimsettingexporter/index.docbook
+share/doc/HTML/pt_BR/pimsettingexporter/index.cache.bz2
+share/doc/HTML/pt_BR/pimsettingexporter/index.docbook
+share/doc/HTML/ru/pimsettingexporter/index.cache.bz2
+share/doc/HTML/ru/pimsettingexporter/index.docbook
+share/doc/HTML/sv/pimsettingexporter/index.cache.bz2
+share/doc/HTML/sv/pimsettingexporter/index.docbook
+share/doc/HTML/uk/pimsettingexporter/index.cache.bz2
+share/doc/HTML/uk/pimsettingexporter/index.docbook
 share/kconf_update/pimsettingexporter-15.08-kickoff.sh
 share/kconf_update/pimsettingexporter.upd
 share/locale/ar/LC_MESSAGES/pimdataexporter.mo
diff --git a/pim-data-exporter/distinfo b/pim-data-exporter/distinfo
index 3227a3aded..f32d3fa653 100644
--- a/pim-data-exporter/distinfo
+++ b/pim-data-exporter/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-SHA1 (pim-data-exporter-20.04.1.tar.xz) = 3f9c567b90097d9e21f79669ba8d258bbc868180
-RMD160 (pim-data-exporter-20.04.1.tar.xz) = 048f1cacbf071562d9df8a929084eb585a979ca3
-SHA512 (pim-data-exporter-20.04.1.tar.xz) = 16e72013c6dc62cd7a92e1a2aa319c299dc9f2ad9155f5aaad37970ce17cf903cd42bd5c2749baa46ba205cb58a6ff110f78e2fcb32acb2efd46b424d56057e8
-Size (pim-data-exporter-20.04.1.tar.xz) = 207792 bytes
+SHA1 (pim-data-exporter-20.12.3.tar.xz) = 14924c33864483bfb4394f9216f62e2a0c59f583
+RMD160 (pim-data-exporter-20.12.3.tar.xz) = 544570da725a659ae241ce9672458763f25d6936
+SHA512 (pim-data-exporter-20.12.3.tar.xz) = d9b96081967f6271908624b303fcb358ebabf90fad2aa731f2c0e67e421921f47dfbc054d59fbdea875c3719407a717c40fd708fe915baef179dbe22c3242129
+Size (pim-data-exporter-20.12.3.tar.xz) = 401632 bytes
diff --git a/pim-sieve-editor/PLIST b/pim-sieve-editor/PLIST
index d22ae19c6c..941eeeb2a5 100644
--- a/pim-sieve-editor/PLIST
+++ b/pim-sieve-editor/PLIST
@@ -1,15 +1,12 @@
 @comment $NetBSD$
 bin/sieveeditor
 lib/libsieveeditor.so.5
-lib/libsieveeditor.so.5.14.1
+lib/libsieveeditor.so.5.16.3
 share/applications/org.kde.sieveeditor.desktop
 share/config.kcfg/sieveeditorglobalconfig.kcfg
 share/doc/HTML/ca/sieveeditor/first-start.png
 share/doc/HTML/ca/sieveeditor/index.cache.bz2
 share/doc/HTML/ca/sieveeditor/index.docbook
-share/doc/HTML/ca/sieveeditor/script-edit.png
-share/doc/HTML/ca/sieveeditor/script-help.png
-share/doc/HTML/ca/sieveeditor/script-tools.png
 share/doc/HTML/de/sieveeditor/index.cache.bz2
 share/doc/HTML/de/sieveeditor/index.docbook
 share/doc/HTML/en/sieveeditor/first-start.png
diff --git a/pim-sieve-editor/distinfo b/pim-sieve-editor/distinfo
index e90974c9a5..573084457f 100644
--- a/pim-sieve-editor/distinfo
+++ b/pim-sieve-editor/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-SHA1 (pim-sieve-editor-20.04.1.tar.xz) = b69a382b6dda3d8066b9b388161f694aae212e72
-RMD160 (pim-sieve-editor-20.04.1.tar.xz) = 29953a1f2dfee016117a2f1ce1586cc7a81f5514
-SHA512 (pim-sieve-editor-20.04.1.tar.xz) = 407c1c7d2803b65603ed9f464f76d3a67b3f684c43aa2804307dba4036a548a364a73df80081799e997e63feef28434a70c1ffdf9af78b8f7cf48a9d30286a08
-Size (pim-sieve-editor-20.04.1.tar.xz) = 452876 bytes
+SHA1 (pim-sieve-editor-20.12.3.tar.xz) = 2192017e9f3f47c50670ae4364351f6bba22f4d5
+RMD160 (pim-sieve-editor-20.12.3.tar.xz) = e21c3b398c8f47fdc1fce3af5c103f9a95e6ff2f
+SHA512 (pim-sieve-editor-20.12.3.tar.xz) = 27270916ec2c41e2222ed1f5248091b19e6569564f82ff56d75204c81a6ad1ea7c0d6dbc907e2dc4d1a02f032162ecc443915f936f1577b0245f1b40d52166e9
+Size (pim-sieve-editor-20.12.3.tar.xz) = 455152 bytes
diff --git a/pimcommon/PLIST b/pimcommon/PLIST
index a61eb137ad..89f1e08564 100644
--- a/pimcommon/PLIST
+++ b/pimcommon/PLIST
@@ -4,15 +4,18 @@ include/KF5/PimCommon/AbstractGenericPluginInterface
 include/KF5/PimCommon/AutoCorrection
 include/KF5/PimCommon/AutoCorrectionLanguage
 include/KF5/PimCommon/AutoCorrectionWidget
+include/KF5/PimCommon/BroadcastStatus
 include/KF5/PimCommon/ConfigureImmutableWidgetUtils
 include/KF5/PimCommon/ConfigurePluginDialog
 include/KF5/PimCommon/ConfigurePluginsListWidget
 include/KF5/PimCommon/ConfigurePluginsWidget
+include/KF5/PimCommon/CustomLogWidget
 include/KF5/PimCommon/CustomToolsPlugin
 include/KF5/PimCommon/CustomToolsPluginManager
 include/KF5/PimCommon/CustomToolsViewInterface
 include/KF5/PimCommon/CustomToolsWidgetng
 include/KF5/PimCommon/CustomTreeView
+include/KF5/PimCommon/EmailValidator
 include/KF5/PimCommon/GenericPlugin
 include/KF5/PimCommon/GenericPluginManager
 include/KF5/PimCommon/KActionMenuChangeCase
@@ -35,36 +38,44 @@ include/KF5/PimCommon/SpellCheckLineEdit
 include/KF5/PimCommon/TemplateListWidget
 include/KF5/PimCommon/TemplateManager
 include/KF5/PimCommon/TranslatorWidget
+include/KF5/PimCommonAkonadi/AddresseeLineEdit
 include/KF5/PimCommonAkonadi/AnnotationDialog
 include/KF5/PimCommonAkonadi/CheckedCollectionWidget
 include/KF5/PimCommonAkonadi/CollectionAclPage
 include/KF5/PimCommonAkonadi/CollectionAnnotationsAttribute
 include/KF5/PimCommonAkonadi/CollectionTypeUtil
+include/KF5/PimCommonAkonadi/CompletionConfigureDialog
+include/KF5/PimCommonAkonadi/CompletionOrderEditor
 include/KF5/PimCommonAkonadi/ContentTypeWidget
 include/KF5/PimCommonAkonadi/CreateResource
-include/KF5/PimCommonAkonadi/FetchRecursiveCollectionsJob
 include/KF5/PimCommonAkonadi/GenericPluginInterface
 include/KF5/PimCommonAkonadi/ImapAclAttribute
 include/KF5/PimCommonAkonadi/ImapResourceCapabilitiesManager
 include/KF5/PimCommonAkonadi/IncidencesForWidget
+include/KF5/PimCommonAkonadi/LdapSearchDialog
 include/KF5/PimCommonAkonadi/MailUtil
 include/KF5/PimCommonAkonadi/ManageServerSideSubscriptionJob
 include/KF5/PimCommonAkonadi/PluginInterface
+include/KF5/PimCommonAkonadi/ProgressManagerAkonadi
+include/KF5/PimCommonAkonadi/RecentAddresses
 include/KF5/PimCommonAkonadi/SelectMultiCollectionDialog
 include/KF5/pimcommon/abstractgenericplugin.h
 include/KF5/pimcommon/abstractgenericplugininterface.h
 include/KF5/pimcommon/autocorrection.h
 include/KF5/pimcommon/autocorrectionlanguage.h
 include/KF5/pimcommon/autocorrectionwidget.h
+include/KF5/pimcommon/broadcaststatus.h
 include/KF5/pimcommon/configureimmutablewidgetutils.h
 include/KF5/pimcommon/configureplugindialog.h
 include/KF5/pimcommon/configurepluginslistwidget.h
 include/KF5/pimcommon/configurepluginswidget.h
+include/KF5/pimcommon/customlogwidget.h
 include/KF5/pimcommon/customtoolsplugin.h
 include/KF5/pimcommon/customtoolspluginmanager.h
 include/KF5/pimcommon/customtoolsviewinterface.h
 include/KF5/pimcommon/customtoolswidgetng.h
 include/KF5/pimcommon/customtreeview.h
+include/KF5/pimcommon/emailvalidator.h
 include/KF5/pimcommon/genericplugin.h
 include/KF5/pimcommon/genericpluginmanager.h
 include/KF5/pimcommon/imapresourcesettings.h
@@ -91,22 +102,27 @@ include/KF5/pimcommon/templatelistwidget.h
 include/KF5/pimcommon/templatemanager.h
 include/KF5/pimcommon/translatorwidget.h
 include/KF5/pimcommon_version.h
+include/KF5/pimcommonakonadi/addresseelineedit.h
 include/KF5/pimcommonakonadi/annotationdialog.h
 include/KF5/pimcommonakonadi/checkedcollectionwidget.h
 include/KF5/pimcommonakonadi/collectionaclpage.h
 include/KF5/pimcommonakonadi/collectionannotationsattribute.h
 include/KF5/pimcommonakonadi/collectiontypeutil.h
+include/KF5/pimcommonakonadi/completionconfiguredialog.h
+include/KF5/pimcommonakonadi/completionordereditor.h
 include/KF5/pimcommonakonadi/contenttypewidget.h
 include/KF5/pimcommonakonadi/createresource.h
-include/KF5/pimcommonakonadi/fetchrecursivecollectionsjob.h
 include/KF5/pimcommonakonadi/genericplugininterface.h
 include/KF5/pimcommonakonadi/imapaclattribute.h
 include/KF5/pimcommonakonadi/imapresourcecapabilitiesmanager.h
 include/KF5/pimcommonakonadi/incidencesforwidget.h
+include/KF5/pimcommonakonadi/ldapsearchdialog.h
 include/KF5/pimcommonakonadi/mailutil.h
 include/KF5/pimcommonakonadi/manageserversidesubscriptionjob.h
 include/KF5/pimcommonakonadi/pimcommonakonadi_export.h
 include/KF5/pimcommonakonadi/plugininterface.h
+include/KF5/pimcommonakonadi/progressmanagerakonadi.h
+include/KF5/pimcommonakonadi/recentaddresses.h
 include/KF5/pimcommonakonadi/selectmulticollectiondialog.h
 include/KF5/pimcommonakonadi_version.h
 lib/cmake/KF5PimCommon/KF5PimCommonConfig.cmake
@@ -119,12 +135,13 @@ lib/cmake/KF5PimCommonAkonadi/KF5PimCommonAkonadiTargets-noconfig.cmake
 lib/cmake/KF5PimCommonAkonadi/KF5PimCommonAkonadiTargets.cmake
 lib/libKF5PimCommon.so
 lib/libKF5PimCommon.so.5
-lib/libKF5PimCommon.so.5.14.1
+lib/libKF5PimCommon.so.5.16.3
 lib/libKF5PimCommonAkonadi.so
 lib/libKF5PimCommonAkonadi.so.5
-lib/libKF5PimCommonAkonadi.so.5.14.1
+lib/libKF5PimCommonAkonadi.so.5.16.3
 qt5/mkspecs/modules/qt_PimCommon.pri
 qt5/mkspecs/modules/qt_PimCommonAkonadi.pri
+qt5/plugins/designer/pimcommoniakonadiwidgets.so
 qt5/plugins/designer/pimcommonwidgets.so
 share/locale/ar/LC_MESSAGES/libpimcommon.mo
 share/locale/bs/LC_MESSAGES/libpimcommon.mo
diff --git a/pimcommon/distinfo b/pimcommon/distinfo
index 5c003fa7b2..9b4e35614e 100644
--- a/pimcommon/distinfo
+++ b/pimcommon/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-SHA1 (pimcommon-20.04.1.tar.xz) = 2ec19bf97ae9c8842e440ae04cc57fbe8d6a5188
-RMD160 (pimcommon-20.04.1.tar.xz) = 12cd42ad9879e2e4222854ef8512880165e2febf
-SHA512 (pimcommon-20.04.1.tar.xz) = 4d62647bb88ce19e015c1d6f2f0e91635b7791b7e6289ff87688851fe960f8e908a5c75cfdfed69d3b327d061eec1229d2c3ee5ecc65f8e2c3ab03431661bfe7
-Size (pimcommon-20.04.1.tar.xz) = 294392 bytes
+SHA1 (pimcommon-20.12.3.tar.xz) = 65a4bceb6df8e3d41ec97609c74e3d550c3ad6b0
+RMD160 (pimcommon-20.12.3.tar.xz) = 243253a75cefcfb194940693e6d6e2150671a09b
+SHA512 (pimcommon-20.12.3.tar.xz) = f016b68ca9f768b7e3c506034f2d9d8e13e2325aa3291ded274cb8d71abcea521051180342a9b6ee4488ad54715da729adf48c0f2ab562030622dcc64de96df0
+Size (pimcommon-20.12.3.tar.xz) = 364304 bytes


Home | Main Index | Thread Index | Old Index