gentoo resync : 15.12.2019

11 files changed, 4 insertions, 673 deletions

diff --git a/app-office/calligraplan/Manifest b/app-office/calligraplan/Manifest
index 7a8a5db2891c..a4572e55f56f 100644
--- a/app-office/calligraplan/Manifest
+++ b/app-office/calligraplan/Manifest
@@ -1,12 +1,3 @@
-AUX calligraplan-3.1.0-kcalcore-19.08-1.patch 1917 BLAKE2B 83a31567dd6a36564b613eeb4f48d9e7c833fad0523ef4a86d25208a9ae7fa7636a6b3122ca56a260a23cbfc35c1ae94f17d5278dbdad9d7a217f715e21a0440 SHA512 e303aae1707230e2e57d0695bf28df141f22f70508861515e00989e747c80dc7ff8d8222150d44b2bcd2ee00242cdb29c5bc31ac322ca0501d71343c03f57783
-AUX calligraplan-3.1.0-kcalcore-19.08-2.patch 3664 BLAKE2B 1a631c4fa8e323868a291bc7356d8485171963f883540e88ca5da963d3aa0356e0edbcb4b932d9b1a3dc7f309d49e61a038db2be884feb5dcc23c9c0e30491f5 SHA512 146658f0cb82583171ff2cc700fce1ecf87ee4b4baf545904b65e4328f08ccb230004ed63a8ca952ffbfc177061bd3831b8272186f0887922aa3338c8a31f7e3
-AUX calligraplan-3.1.0-missing-header.patch 629 BLAKE2B 8b6debd0dcaf51a492be0f17a7f35d184fe26ff9ff636329858526a9f42c00ac6e66f26fc2d4a94b7ce6878dd3a4176d891b38808119d964f5dd43ff6d639213 SHA512 fdf4511240bb89df0253b2e140209583edf769993fa2ed8c27580d72a062da877d51a2dd0bc3878c386c0bb1042ce4ec50eec5675702db99377ddafcece6311d
-AUX calligraplan-3.1.0-qca.patch 3725 BLAKE2B dfcc41d00c7c90691e6c9a8a8c25308ace7819c88282ed2f4a36725b9d26ce6ae7d1bf547ec01d097971302278bee914f23039bbf66e952ed1a5fedd84423bbc SHA512 df94f3348d824de566c0a6566f076ff2a25236030353907c828a0e1cde58768c6403e2d699c419e8ef05635e6af43cb3c7cb4780568c7bf8c9e6bdcf0086463c
-AUX calligraplan-3.1.0-qt-5.11.patch 3618 BLAKE2B b1b3053e07f83eb2b07a8fde231a7deb727a34e9922246e75690e469b8b599525eb8148a5babd5771e18421bed1930bc800fddcafca6ce43d08eab1093f2d135 SHA512 3db56dfc75c667ab141259718899e7294b000ddc10084266fa9d6226da4ccde74e70673ef5603b4dbc4f92322eb0fbaaf3b0ec6bca312603f4da95463414df10
-AUX calligraplan-3.1.0-unused-deps.patch 1594 BLAKE2B 9e24816c0a69eb725e0bda2718cc629399f5fe30491f08e69a1dc9f6ab86057ce9d832f873358953c3a68ec235ac69e06e56fb076c6bc70ed8871b38c0233d82 SHA512 2f59c6c5dda49e7f579b0a623a4fc2aabbb2fa896abd4bc3ab28267d3d04e26db318da7940830563289c2deddf9ce8ad9a08fc98b528dddc67d00656c49969b1
-DIST calligraplan-3.1.0.tar.xz 3617600 BLAKE2B af45aa28529c18c9fa9fae2b7c03ea1b795d3fec3fd44dbcc4ed056a4b1b843b10cb8a9ad6dab319775a7d7032520721a4719605859dd60100a19eafdcb621ed SHA512 a8ccc6ee2f0381b811926a296122464bdb79aad7c75ff0f7a554e4596165ff7fd7ef62c9af9232ea36542d6b538446c8920fe77cbbe7ffacdf6e6b99a1b68156
-DIST calligraplan-3.2.0.tar.xz 3416652 BLAKE2B 655457ff4a8a223efff5845d7438e0a9eddaafaef76a83a2d328902c835206bafb62add6ede379e2988af1f41ebcca867ca974ca3bb470deaa9689b2f493f89a SHA512 7b9b40b90a831be64da72c7ec50f230df4f29dd9bac2c5202ee774ab1d31caf62336ce9d007a88a92da781d6a69dd1a4727957cbe557325741b659de6a9f7164
-EBUILD calligraplan-3.1.0-r1.ebuild 2583 BLAKE2B ae97f0026b07912dd74628d3f071f6233b3758e9c553d9eec00d236092fc35b1b18f7209e87ffeb6ab2edc9203a35390e06bc43daafbdddd6debed72cd9c081b SHA512 7d8624dfa0483ca08dee39c9c7691e553f5bcebc462e7152d711d9fa0da9ef8cb06bb7dbe21b3ddb61011248293b88dbf37b6553418d23a0f820291beabfd13d
-EBUILD calligraplan-3.1.0-r3.ebuild 2668 BLAKE2B dd1519967ed7c1b67fffd9ca368178c3fa1efa2d263ae735fb6bbb84def77f73882be13297e0431ed357b84faf84d566a440928fad9dc44eda9f64b4bfe82e1d SHA512 f43707eb9cd1fb67df831867dd6ec49a8d840a1fa1c682724019abee14d38c12b63c9682941131a32a993b4cfcbf4bb3d481d3672a5409c07743f4dc3c55a108
-EBUILD calligraplan-3.2.0.ebuild 2492 BLAKE2B 517a2936edbd93f42b068fbf15e1d2ae2a5ac596fe424e2f49ad9fa03b621edd18128b5514199f2029ea58915fbf413642fb52d0daae61a9bdc76298f9cdfa92 SHA512 6cc10e14011cbfa85e2423c2ab0defa4991529ab2af21e4a59ecc496ffba8f824d9ce652e49dab4ee50ab508a826929662f054b78cbb38d57622f43c32f4ad63
-MISC metadata.xml 724 BLAKE2B dd7cca931c7ffc08be44c9df711973d13fadc3deee2956b235af3653aab250977cbb491ac308da5a5502efbd359114e646ae1cb10e3f445308b90b4eeab8a6dd SHA512 367dbf0d7d0a2d03167e4e7abec2975ada6d047dd767a60967532c1fb89db09f2082ff52c1940a306dbff4feec5c8050f163d2fff6170dbe287b241d3f7c1c02
+DIST calligraplan-3.2.1.tar.xz 3417328 BLAKE2B dee2fe03a013abee0fab17495b98927eaf6ef3d2d4daaa344fccfcbd06dbaeb64717d4e844dc8659c61773a39a367fe3f93ba69b621a4dfaa9919835112e5ce9 SHA512 cd73a6ef0b9230f41d5edfeffb3664465643ca7dde8179eab0f7e4fc5e26d1331d110222256bbe18926feb39a2928abbaf0186af0376e7262df2f863941696c5
+EBUILD calligraplan-3.2.1.ebuild 2475 BLAKE2B 688ca5a860fe0e86ccc3e13669b8eec59088115486f823c6f16c8f9b97e542fe10c00498b105a0fa37d8918631f5476c85e35d4cd4abd1f67bed443b5c5dac7e SHA512 7d268eb4b2b04d7eb6ae265f36d03c746bd77fad389cac3b8f78a4518a3746a8d4911c6415ae9f33abf02054e650e5a10e6721229c7548c29fb907fe058cf138
+MISC metadata.xml 649 BLAKE2B 24dd20d4a19187e71952aad0d157b7b66adbbd8de24344e2de7aabe714cffd1db1f69f88b34aed13dfadaa62c51b3be7bc057f651d6388a0e98595688db3dc1b SHA512 44d54e0b08e4422a504a0107c73c7cbd2186698f60bc40b2c523d302150de877a86c482edb6b59ac613ef1a4ea2f04f1124ab7ab6e00c42a097a51e55a0a1dcc
diff --git a/app-office/calligraplan/calligraplan-3.1.0-r1.ebuild b/app-office/calligraplan/calligraplan-3.1.0-r1.ebuild
deleted file mode 100644
index 98cc37a75950..000000000000
--- a/app-office/calligraplan/calligraplan-3.1.0-r1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-inherit kde5
-
-DESCRIPTION="Project management application"
-HOMEPAGE="https://www.calligra.org/"
-SRC_URI="mirror://kde/stable/${PN/plan/}/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-IUSE="activities +holidays kwallet pim X"
-
-# FIXME: Disabled by upstream for good reason
-# Crashes (https://bugs.kde.org/show_bug.cgi?id=311940)
-# $(add_kdeapps_dep akonadi)
-# $(add_kdeapps_dep akonadi-contacts)
-# Currently upstream-disabled:
-# =dev-libs/kproperty-3.0*:5
-# =dev-libs/kreport-3.0*:5
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep khtml)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep designer)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	dev-lang/perl
-	dev-libs/kdiagram:5
-	sys-libs/zlib
-	activities? ( $(add_frameworks_dep kactivities) )
-	holidays? ( $(add_frameworks_dep kholidays) )
-	kwallet? (
-		$(add_frameworks_dep kwallet)
-		app-crypt/qca:2[qt5(+)]
-	)
-	pim? (
-		<kde-apps/kcalcore-19.04.50:5
-		$(add_kdeapps_dep kcontacts)
-	)
-	X? (
-		$(add_qt_dep qtx11extras)
-		x11-libs/libX11
-	)
-"
-RDEPEND="${DEPEND}
-	!app-office/calligra[calligra_features_plan(-)]
-	!app-office/calligra-l10n:4
-	$(add_qt_dep qtsvg)
-"
-
-RESTRICT+=" test"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-qt-5.11.patch
-	"${FILESDIR}"/${P}-qca.patch
-	"${FILESDIR}"/${P}-missing-header.patch
-	"${FILESDIR}"/${P}-unused-deps.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package activities KF5Activities)
-		$(cmake-utils_use_find_package holidays KF5Holidays)
-		$(cmake-utils_use_find_package pim KF5CalendarCore)
-		$(cmake-utils_use_find_package pim KF5Contacts)
-		$(cmake-utils_use_find_package kwallet Qca-qt5)
-		$(cmake-utils_use_find_package kwallet KF5Wallet)
-	)
-	# Qt5DBus can't be disabled because of KF5DBusAddons dependency
-
-	kde5_src_configure
-}
diff --git a/app-office/calligraplan/calligraplan-3.1.0-r3.ebuild b/app-office/calligraplan/calligraplan-3.1.0-r3.ebuild
deleted file mode 100644
index 2f0f38c3d9f9..000000000000
--- a/app-office/calligraplan/calligraplan-3.1.0-r3.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_APPS_MINIMAL="19.08.0"
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-inherit kde5
-
-DESCRIPTION="Project management application"
-HOMEPAGE="https://www.calligra.org/"
-SRC_URI="mirror://kde/stable/${PN/plan/}/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="activities +holidays kwallet pim X"
-
-# FIXME: Disabled by upstream for good reason
-# Crashes (https://bugs.kde.org/show_bug.cgi?id=311940)
-# $(add_kdeapps_dep akonadi)
-# $(add_kdeapps_dep akonadi-contacts)
-# Currently upstream-disabled:
-# =dev-libs/kproperty-3.0*:5
-# =dev-libs/kreport-3.0*:5
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep khtml)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep designer)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	dev-lang/perl
-	dev-libs/kdiagram:5
-	sys-libs/zlib
-	activities? ( $(add_frameworks_dep kactivities) )
-	holidays? ( $(add_frameworks_dep kholidays) )
-	kwallet? (
-		$(add_frameworks_dep kwallet)
-		app-crypt/qca:2[qt5(+)]
-	)
-	pim? (
-		$(add_frameworks_dep kcalendarcore)
-		$(add_frameworks_dep kcontacts)
-	)
-	X? (
-		$(add_qt_dep qtx11extras)
-		x11-libs/libX11
-	)
-"
-RDEPEND="${DEPEND}
-	!app-office/calligra[calligra_features_plan(-)]
-	!app-office/calligra-l10n:4
-	$(add_qt_dep qtsvg)
-"
-
-RESTRICT+=" test"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-qt-5.11.patch
-	"${FILESDIR}"/${P}-qca.patch
-	"${FILESDIR}"/${P}-missing-header.patch
-	"${FILESDIR}"/${P}-unused-deps.patch
-	"${FILESDIR}"/${P}-kcalcore-19.08-{1,2}.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package activities KF5Activities)
-		$(cmake-utils_use_find_package holidays KF5Holidays)
-		$(cmake-utils_use_find_package pim KF5CalendarCore)
-		$(cmake-utils_use_find_package pim KF5Contacts)
-		$(cmake-utils_use_find_package kwallet Qca-qt5)
-		$(cmake-utils_use_find_package kwallet KF5Wallet)
-	)
-	# Qt5DBus can't be disabled because of KF5DBusAddons dependency
-
-	kde5_src_configure
-}
diff --git a/app-office/calligraplan/calligraplan-3.2.0.ebuild b/app-office/calligraplan/calligraplan-3.2.1.ebuild
index 512af68cc64f..fa152b865999 100644
--- a/app-office/calligraplan/calligraplan-3.2.0.ebuild
+++ b/app-office/calligraplan/calligraplan-3.2.1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.calligra.org/"
 
 if [[ ${KDE_BUILD_TYPE} == release ]]; then
 	SRC_URI="mirror://kde/stable/calligra/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-2"
@@ -57,7 +57,6 @@ DEPEND="
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 	dev-lang/perl
 	dev-libs/kdiagram:5
-	sys-libs/zlib
 	activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
 	holidays? ( >=kde-frameworks/kholidays-${KFMIN}:5 )
 	kwallet? (
diff --git a/app-office/calligraplan/files/calligraplan-3.1.0-kcalcore-19.08-1.patch b/app-office/calligraplan/files/calligraplan-3.1.0-kcalcore-19.08-1.patch
deleted file mode 100644
index cfe8b552d9dc..000000000000
--- a/app-office/calligraplan/files/calligraplan-3.1.0-kcalcore-19.08-1.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 3a01affd66f8dfdcc124e23595217f3ae5a09723 Mon Sep 17 00:00:00 2001
-From: Dag Andersen <danders@get2net.dk>
-Date: Thu, 20 Jun 2019 10:52:00 +0200
-Subject: ICal: Adapt to api changes in KCalCore
-
----
- CMakeLists.txt                                     | 37 +++++++++++-----------
- src/CMakeLists.txt                                 |  4 +++
- .../filters/icalendar/export/icalendarexport.cpp   |  5 +++
- 3 files changed, 27 insertions(+), 19 deletions(-)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 0dabbaf..49fa642 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -75,6 +75,10 @@ if ("${KF5CalendarCore_VERSION}" VERSION_GREATER 5.6.40)
-     set(HAVE_QDATETIME_KCALCORE TRUE)
- endif()
- 
-+if ("${KF5CalendarCore_VERSION}" VERSION_GREATER 5.11.42)
-+    set(KCALCORE_HAVE_NO_PERSION_PTR TRUE)
-+endif()
-+
- if (PLANCHARTDEBUG)
-     add_definitions(-DPLAN_CHART_DEBUG)
- endif ()
-diff --git a/src/plugins/filters/icalendar/export/icalendarexport.cpp b/src/plugins/filters/icalendar/export/icalendarexport.cpp
-index cd75598..ce29bfe 100644
---- a/src/plugins/filters/icalendar/export/icalendarexport.cpp
-+++ b/src/plugins/filters/icalendar/export/icalendarexport.cpp
-@@ -141,8 +141,13 @@ void ICalendarExport::createTodos(KCalCore::Calendar::Ptr cal, const Node *node,
-         todo->setOrganizer(node->projectNode()->leader());
-     }
-     if ( node->type() != Node::Type_Project && ! node->leader().isEmpty()) {
-+#if KCALCORE_HAVE_NO_PERSION_PTR
-+        KCalCore::Person p = KCalCore::Person::fromFullName(node->leader());
-+        KCalCore::Attendee::Ptr a(new KCalCore::Attendee(p.name(), p.email()));
-+#else
-         KCalCore::Person::Ptr p = KCalCore::Person::fromFullName(node->leader());
-         KCalCore::Attendee::Ptr a(new KCalCore::Attendee(p->name(), p->email()));
-+#endif
-         a->setRole(KCalCore::Attendee::NonParticipant);
-         todo->addAttendee(a);
-     }
--- 
-cgit v1.1
diff --git a/app-office/calligraplan/files/calligraplan-3.1.0-kcalcore-19.08-2.patch b/app-office/calligraplan/files/calligraplan-3.1.0-kcalcore-19.08-2.patch
deleted file mode 100644
index 02c67d5ada73..000000000000
--- a/app-office/calligraplan/files/calligraplan-3.1.0-kcalcore-19.08-2.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From a9eaf1c98ed408fd6e8897fa9e2f99ed17db1ebc Mon Sep 17 00:00:00 2001
-From: David Faure <faure@kde.org>
-Date: Tue, 23 Jul 2019 12:26:17 +0200
-Subject: Port to KCalCore API changes
-
-The code is in #if 0, but I tested compilation of this in the calligra
-stable branch:
-https://commits.kde.org/calligra/2d484fda1b31a72659088a4bfce5c3708e923cb0
-
-So you can use KCalCore again if you want :-)
-It's turning into a KF5 framework so the API will be stable from now on.
-
-CCMAIL: danders@get2net.dk
----
- .../filters/icalendar/export/icalendarexport.cpp     | 20 +++++++++++++++++---
- 1 file changed, 17 insertions(+), 3 deletions(-)
-
-diff --git a/src/plugins/filters/icalendar/export/icalendarexport.cpp b/src/plugins/filters/icalendar/export/icalendarexport.cpp
-index b21320f..828b641 100644
---- a/src/plugins/filters/icalendar/export/icalendarexport.cpp
-+++ b/src/plugins/filters/icalendar/export/icalendarexport.cpp
-@@ -35,6 +35,7 @@
- #include <kcalcore/attachment.h>
- #include <kcalcore/icalformat.h>
- #include <kcalcore/memorycalendar.h>
-+#include <kcalcore_version.h>
- 
- #include <QTextCodec>
- #include <QByteArray>
-@@ -355,14 +356,15 @@ void ICalendarExport::createTodos(KCalCore::Calendar::Ptr cal, const Node *node,
-         todo->setOrganizer(node->projectNode()->leader());
-     }
-     if ( node->type() != Node::Type_Project && ! node->leader().isEmpty()) {
--#if KCALCORE_HAVE_NO_PERSION_PTR
-+#if KCALCORE_VERSION >= QT_VERSION_CHECK(5, 11, 80)
-         KCalCore::Person p = KCalCore::Person::fromFullName(node->leader());
--        KCalCore::Attendee::Ptr a(new KCalCore::Attendee(p.name(), p.email()));
-+        KCalCore::Attendee a(p.name(), p.email());
-+        a.setRole(KCalCore::Attendee::NonParticipant);
- #else
-         KCalCore::Person::Ptr p = KCalCore::Person::fromFullName(node->leader());
-         KCalCore::Attendee::Ptr a(new KCalCore::Attendee(p->name(), p->email()));
--#endif
-         a->setRole(KCalCore::Attendee::NonParticipant);
-+#endif
-         todo->addAttendee(a);
-     }
-     DateTime st = node->startTime(id);
-@@ -381,13 +383,21 @@ void ICalendarExport::createTodos(KCalCore::Calendar::Ptr cal, const Node *node,
-             const QList<Resource*> lst = task->requestedResources();
-             foreach(const Resource *r, lst) {
-                 if (r->type() == Resource::Type_Work) {
-+#if KCALCORE_VERSION >= QT_VERSION_CHECK(5, 11, 80)
-+                    todo->addAttendee(KCalCore::Attendee(r->name(), r->email()));
-+#else
-                     todo->addAttendee(KCalCore::Attendee::Ptr(new KCalCore::Attendee(r->name(), r->email())));
-+#endif
-                 }
-             }
-         } else {
-             foreach(const Resource *r, s->resources()) {
-                 if (r->type() == Resource::Type_Work) {
-+#if KCALCORE_VERSION >= QT_VERSION_CHECK(5, 11, 80)
-+                    todo->addAttendee(KCalCore::Attendee(r->name(), r->email()));
-+#else
-                     todo->addAttendee(KCalCore::Attendee::Ptr(new KCalCore::Attendee(r->name(), r->email())));
-+#endif
-                 }
-             }
- 
-@@ -398,7 +408,11 @@ void ICalendarExport::createTodos(KCalCore::Calendar::Ptr cal, const Node *node,
-         todo->setPercentComplete(task->completion().percentFinished());
-     }
-     foreach(const Document *doc, node->documents().documents()) {
-+#if KCALCORE_VERSION >= QT_VERSION_CHECK(5, 11, 80)
-+        todo->addAttachment(KCalCore::Attachment(doc->url().url()));
-+#else
-         todo->addAttachment(KCalCore::Attachment::Ptr(new KCalCore::Attachment(doc->url().url())));
-+#endif
-     }
-     if (! parent.isNull()) {
-         todo->setRelatedTo(parent->uid(), KCalCore::Incidence::RelTypeParent);
--- 
-cgit v1.1
diff --git a/app-office/calligraplan/files/calligraplan-3.1.0-missing-header.patch b/app-office/calligraplan/files/calligraplan-3.1.0-missing-header.patch
deleted file mode 100644
index 4ee031865a39..000000000000
--- a/app-office/calligraplan/files/calligraplan-3.1.0-missing-header.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From fe36bf6f0dc1f0c1e927850dd78093cfe3b7aae2 Mon Sep 17 00:00:00 2001
-From: Albert Astals Cid <aacid@kde.org>
-Date: Sun, 28 Jul 2019 00:07:33 +0200
-Subject: Fix compile on CI
-
-src/workpackage/view.h:148:31: error: field m_scheduleActions has incomplete type QMap<QAction*, KPlato::Schedule*>
----
- src/workpackage/view.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/workpackage/view.h b/src/workpackage/view.h
-index 6cae32b..cd2fc4e 100644
---- a/src/workpackage/view.h
-+++ b/src/workpackage/view.h
-@@ -24,6 +24,7 @@
- 
- #include <KoView.h>
- 
-+#include <QMap>
- #include <QStackedWidget>
- 
- class QPrinter;
--- 
-cgit v1.1
diff --git a/app-office/calligraplan/files/calligraplan-3.1.0-qca.patch b/app-office/calligraplan/files/calligraplan-3.1.0-qca.patch
deleted file mode 100644
index 213cc9935bea..000000000000
--- a/app-office/calligraplan/files/calligraplan-3.1.0-qca.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-From 9c5eb86128da46899e719209a92a65df012c6d8e Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Tue, 1 Jan 2019 19:19:19 +0100
-Subject: [PATCH] Re-add accidentally removed test for QCA, KF5Wallet is
- optional
-
----
- CMakeLists.txt                | 18 +++++++++++++++++-
- src/libs/store/CMakeLists.txt | 15 +++++++--------
- 2 files changed, 24 insertions(+), 9 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index eed9d3c..3cb4b63 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -128,7 +128,6 @@ find_package(KF5 ${REQUIRED_KF5_VERSION} REQUIRED
-             Parts
- #             Sonnet
-             TextWidgets
--            Wallet
-             WidgetsAddons
-             WindowSystem
-             XmlGui
-@@ -260,6 +259,23 @@ set_package_properties(KChart PROPERTIES
-         TYPE REQUIRED
-     )
- 
-+##
-+## Test for QCA2
-+##
-+macro_optional_find_package(Qca-qt5 2.1.0 QUIET)
-+set_package_properties(Qca-qt5 PROPERTIES
-+    DESCRIPTION "Qt Cryptographic Architecture"
-+    URL "https:/download.kde.org/stable/qca-qt5"
-+    PURPOSE "Required for encrypted OpenDocument files and encrypted xls files support"
-+    TYPE OPTIONAL
-+)
-+
-+find_package(KF5Wallet ${REQUIRED_KF5_VERSION})
-+
-+if(Qca-qt5_FOUND AND KF5Wallet_FOUND)
-+    add_definitions( -DQCA2 )
-+endif()
-+
-     find_package(Perl REQUIRED)
-     find_package(ZLIB REQUIRED)
- 
-diff --git a/src/libs/store/CMakeLists.txt b/src/libs/store/CMakeLists.txt
-index 2c96fa7..f998264 100644
---- a/src/libs/store/CMakeLists.txt
-+++ b/src/libs/store/CMakeLists.txt
-@@ -4,14 +4,8 @@ endif()
- 
- ########### libkostore ###############
- 
--if( Qca-qt5_FOUND )
--    add_definitions( -DQCA2 )
--endif()
--
- set(kostore_LIB_SRCS
-     KoDirectoryStore.cpp
--    KoEncryptedStore.cpp
--    KoEncryptionChecker.cpp
-     KoLZF.cpp
-     KoStore.cpp
-     KoStoreDevice.cpp
-@@ -23,6 +17,12 @@ set(kostore_LIB_SRCS
-     StoreDebug.cpp
-     KoNetAccess.cpp # temporary while porting
- )
-+if( Qca-qt5_FOUND )
-+    set(kostore_LIB_SRCS ${kostore_LIB_SRCS}
-+        KoEncryptedStore.cpp
-+        KoEncryptionChecker.cpp
-+    )
-+endif()
- 
- add_library(planstore SHARED ${kostore_LIB_SRCS})
- generate_export_header(planstore BASE_NAME kostore)
-@@ -35,12 +35,11 @@ target_link_libraries(planstore
-     PRIVATE
-         Qt5::Gui
-         KF5::Archive
--        KF5::Wallet
-         KF5::KIOWidgets
-         KF5::I18n
- )
- if( Qca-qt5_FOUND )
--    target_link_libraries(planstore PRIVATE qca-qt5)
-+    target_link_libraries(planstore PRIVATE qca-qt5 KF5::Wallet)
- endif()
- 
- set_target_properties(planstore PROPERTIES
-diff --git a/src/libs/widgets/KoDocumentInfoDlg.cpp b/src/libs/widgets/KoDocumentInfoDlg.cpp
-index 1615a61..55e2c32 100644
---- a/src/libs/widgets/KoDocumentInfoDlg.cpp
-+++ b/src/libs/widgets/KoDocumentInfoDlg.cpp
-@@ -26,7 +26,9 @@
- #include "KoDocumentInfo.h"
- #include "KoDocumentBase.h"
- #include "KoGlobal.h"
-+#ifdef QCA2
- #include <KoEncryptionChecker.h>
-+#endif
- #include "KoPageWidgetItem.h"
- //#include <KoDocumentRdfBase.h>
- #include <KoIcon.h>
-@@ -105,12 +107,16 @@ KoDocumentInfoDlg::KoDocumentInfoDlg(QWidget* parent, KoDocumentInfo* docInfo)
-     d->aboutUi = new Ui::KoDocumentInfoAboutWidget();
-     QWidget *infodlg = new QWidget();
-     d->aboutUi->setupUi(infodlg);
-+#ifdef QCA2
-     if (!KoEncryptionChecker::isEncryptionSupported()) {
-+#endif
-         d->aboutUi->lblEncryptedDesc->setVisible(false);
-         d->aboutUi->lblEncrypted->setVisible(false);
-         d->aboutUi->pbEncrypt->setVisible(false);
-         d->aboutUi->lblEncryptedPic->setVisible(false);
-+#ifdef QCA2
-     }
-+#endif
-     d->aboutUi->cbLanguage->addItems(KoGlobal::listOfLanguages());
-     d->aboutUi->cbLanguage->setCurrentIndex(-1);
- 
--- 
-2.20.1
-
diff --git a/app-office/calligraplan/files/calligraplan-3.1.0-qt-5.11.patch b/app-office/calligraplan/files/calligraplan-3.1.0-qt-5.11.patch
deleted file mode 100644
index 584d14e447e7..000000000000
--- a/app-office/calligraplan/files/calligraplan-3.1.0-qt-5.11.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-From f53805bdc108b608e40f217e6a78e7e4df4284f2 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Sun, 18 Mar 2018 11:56:57 +0100
-Subject: [PATCH] Fix build with Qt 5.11 (missing headers)
-
-Reviewers: #calligra:_3.0
-
-Tags: #calligra:_3.0
-
-Differential Revision: https://phabricator.kde.org/D11454
----
- src/kptview.h                                         | 1 +
- src/kptviewlist.cpp                                   | 1 +
- src/libs/ui/kptaccountseditor.cpp                     | 1 +
- src/libs/ui/kptdocumentspanel.h                       | 1 +
- src/libs/ui/kptitemviewsettup.cpp                     | 2 +-
- src/libs/ui/kpttaskeditor.cpp                         | 1 +
- src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp | 1 +
- src/libs/widgets/KoPageLayoutWidget.cpp               | 2 ++
- 15 files changed, 18 insertions(+), 1 deletion(-)
-
-diff --git a/src/kptview.h b/src/kptview.h
-index 44d11935e71..a98e55342db 100644
---- a/src/kptview.h
-+++ b/src/kptview.h
-@@ -28,6 +28,7 @@
- #include "kptcontext.h"
- #include "kptviewbase.h"
- 
-+#include <QActionGroup>
- #include <QDockWidget>
- #include <QMap>
- 
-diff --git a/src/kptviewlist.cpp b/src/kptviewlist.cpp
-index f34e702e055..0e6db7b2ffe 100644
---- a/src/kptviewlist.cpp
-+++ b/src/kptviewlist.cpp
-@@ -25,6 +25,7 @@
- #include <QStyle>
- #include <QBrush>
- #include <QContextMenuEvent>
-+#include <QHeaderView>
- #include <QMenu>
- 
- #include <kmessagebox.h>
-diff --git a/src/libs/ui/kptaccountseditor.cpp b/src/libs/ui/kptaccountseditor.cpp
-index 7991fafd779..54e3a87c94f 100644
---- a/src/libs/ui/kptaccountseditor.cpp
-+++ b/src/libs/ui/kptaccountseditor.cpp
-@@ -40,6 +40,7 @@
- #include <QContextMenuEvent>
- #include <QMenu>
- #include <QAction>
-+#include <QHeaderView>
- 
- #include <KLocalizedString>
- #include <kactioncollection.h>
-diff --git a/src/libs/ui/kptdocumentspanel.h b/src/libs/ui/kptdocumentspanel.h
-index 00ea3af80b2..491cb1ebb86 100644
---- a/src/libs/ui/kptdocumentspanel.h
-+++ b/src/libs/ui/kptdocumentspanel.h
-@@ -26,6 +26,7 @@
- 
- #include "kptdocuments.h"
- 
-+#include <QModelIndexList>
- #include <QWidget>
- #include <kundo2qstack.h>
- 
-diff --git a/src/libs/ui/kptitemviewsettup.cpp b/src/libs/ui/kptitemviewsettup.cpp
-index d1c3b1fc157..7c97a070b9a 100644
---- a/src/libs/ui/kptitemviewsettup.cpp
-+++ b/src/libs/ui/kptitemviewsettup.cpp
-@@ -25,9 +25,9 @@
- 
- #include "KoPageLayoutWidget.h"
- 
-+#include <QHeaderView>
- #include <QPushButton>
- 
--
- namespace KPlato
- {
- 
-diff --git a/src/libs/ui/kpttaskeditor.cpp b/src/libs/ui/kpttaskeditor.cpp
-index 21546118d33..91db5acbb18 100644
---- a/src/libs/ui/kpttaskeditor.cpp
-+++ b/src/libs/ui/kpttaskeditor.cpp
-@@ -45,6 +45,7 @@
- #include <QVBoxLayout>
- #include <QDragMoveEvent>
- #include <QAction>
-+#include <QHeaderView>
- #include <QMenu>
- 
- #include <kactionmenu.h>
-diff --git a/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp b/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp
-index 344ebc2b599..9146f06ab8c 100644
---- a/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp
-+++ b/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp
-@@ -31,6 +31,7 @@
- #include <KFile>
- 
- #include <QAction>
-+#include <QHeaderView>
- #include <QTreeView>
- #include <QStandardItemModel>
- #include <QModelIndex>
-diff --git a/src/libs/widgets/KoPageLayoutWidget.cpp b/src/libs/widgets/KoPageLayoutWidget.cpp
-index c9e17b748a9..b67e9848807 100644
---- a/src/libs/widgets/KoPageLayoutWidget.cpp
-+++ b/src/libs/widgets/KoPageLayoutWidget.cpp
-@@ -23,6 +23,8 @@
- 
- #include <KoUnit.h>
- 
-+#include <QButtonGroup>
-+
- class Q_DECL_HIDDEN KoPageLayoutWidget::Private
- {
- public:
--- 
-2.16.2
-
diff --git a/app-office/calligraplan/files/calligraplan-3.1.0-unused-deps.patch b/app-office/calligraplan/files/calligraplan-3.1.0-unused-deps.patch
deleted file mode 100644
index 707b6c8cdd5a..000000000000
--- a/app-office/calligraplan/files/calligraplan-3.1.0-unused-deps.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 5924e3ad82b5dfc95acf9f6751946d5f086d9ce7 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Tue, 1 Jan 2019 20:13:57 +0100
-Subject: Drop unused dependencies
-
-Test Plan: Built fine with deps removed.
-
-Reviewers: #calligra:_3.0, danders
-
-Reviewed By: #calligra:_3.0, danders
-
-Subscribers: danders
-
-Differential Revision: https://phabricator.kde.org/D17903
----
- CMakeLists.txt | 14 ++------------
- 1 file changed, 2 insertions(+), 12 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3cb4b63..a6a3c79 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -121,7 +121,6 @@ find_package(KF5 ${REQUIRED_KF5_VERSION} REQUIRED
-             IconThemes
-             ItemViews
-             JobWidgets
--            KCMUtils
-             KIO
-             Notifications
- #             NotifyConfig
-@@ -169,22 +168,13 @@ find_package(Qt5 ${REQUIRED_QT_VERSION} REQUIRED
-         COMPONENTS
-             Core
-             Gui
--            Network
-             PrintSupport
--            Svg
-             Test
-             Widgets
-             Xml
-     )
--    find_package(Qt5 ${REQUIRED_QT_VERSION} QUIET
--        COMPONENTS
--            DBus
--            OpenGL
--    #        Quick
--    #        Sql
--    #         WebKit
--    #         WebKitWidgets
--    )
-+    find_package(Qt5DBus ${REQUIRED_QT_VERSION} QUIET)
-+
-     # Qt5Declarative was removed in Qt 5.6.0 so search for it in a separate call
-     # Including it in a collected find_package(Qt5 ...) call can lead to a fatal not-found error:
-     # * Qt5 (required version >= 5.3.0)
--- 
-cgit v1.1
diff --git a/app-office/calligraplan/metadata.xml b/app-office/calligraplan/metadata.xml
index a7529db60e61..192aa1d0ef07 100644
--- a/app-office/calligraplan/metadata.xml
+++ b/app-office/calligraplan/metadata.xml
@@ -13,6 +13,5 @@
 		<flag name="activities">Enable kactivities support</flag>
 		<flag name="holidays">Enable <pkg>kde-frameworks/kholidays</pkg> integration</flag>
 		<flag name="kwallet">Enable access to encrypted OpenDocument files with <pkg>kde-frameworks/kwallet</pkg> storage</flag>
-		<flag name="pim">Enable support for KDE PIM resources integration</flag>
 	</use>
 </pkgmetadata>