gentoo resync : 25.08.2020

5 files changed, 160 insertions, 9 deletions

diff --git a/kde-misc/zanshin/Manifest b/kde-misc/zanshin/Manifest
index 9567280aba02..3cb432bb2667 100644
--- a/kde-misc/zanshin/Manifest
+++ b/kde-misc/zanshin/Manifest
@@ -1,3 +1,6 @@
+AUX zanshin-0.5.71-akonadi-20.07.80.patch 605 BLAKE2B 7a7e3b8575499f53ec51dc958e2886dbd5202f9b533df7f7638ee1feed3de921bfff34de931274529a98b8f025116e044853b86ae315f0156cd62ec05ece49cd SHA512 cdf23cbaa72ec4179ddb85df41109f428614d66aa8d7a781135d092aaa51cf96ba2146a0f631ed1adbc93e8d78b007d5a7e2f94a5d237718c9f2f95f75a08121
+AUX zanshin-0.5.71-kontactinterface-20.07.80.patch 1656 BLAKE2B d28e5e881b31c3552939204ffc8aa68e1ee46c18045b67bbf711727e500105e6798c66e04399c90394da91d26efbb340674d359f87c2d55d468b880e9d0d84d9 SHA512 f2e588a92d7ef598ffcb7056868a008642ea32f06680d28cc17b1bb6f359de5bedaa37e6e709c3236b6e83532d145ffc739192ac7a2a15240634e05b393e0bc0
 DIST zanshin-0.5.71.tar.xz 307872 BLAKE2B 3b767af7527348177b7105126acedd47e222859985feb47f89066732293d77d89347ab105b3a8269717c5fc723f1b8bcd1a52e5242bf77828019e55a48e2db6a SHA512 47b4fa8797dd50372dcf176198e1c80348cd1ba604d1ed61cd973956e54ba5551caea33c766d857bc3ad598bd0eae9882ffc315e13e6e3b9c1033d01c8e029d8
-EBUILD zanshin-0.5.71-r1.ebuild 1831 BLAKE2B 8b09c397f7ab81504875be6c6f80aff65f0e1c9d0fbd5038f4b92763b4843c4efbd2276b6e1a7630d303d8eeab47f1feba7ffac1dd639799ec995c9f7ee4fc39 SHA512 36154332e7212d62d2e881c947eb761546e4c63ad0a47185e7a5e1d874ee36bacf1e2d8dbe4a2969fa012bfcaf43da6fb2fbf8bed8497470f2ed589ef1b8b705
+EBUILD zanshin-0.5.71-r1.ebuild 1708 BLAKE2B 7a2587d90857f7072138f408b8a0a2ad4b04a2b8e337f0f855c3c985e595789229e8a879c34c7c651aea2ce8ac2a3e2f585bd34c1c63410bd59aac4fa1f12f8a SHA512 bf35cfd229c687f143ad323964375fd8e6144be0a66a8ea0213460fb93100e1633ef93e9a1a98d054ce614c1d8393e64effd822779fd9d84faae549dd3627eb4
+EBUILD zanshin-0.5.71-r2.ebuild 1918 BLAKE2B 89ac432b66deb52aa29aeec3b27b4dbc8ae5833651a7352ab413466e4118aeb7716acf98d92ecaa66024dd079511952d95c8b7bb823ecc17c0ccb5f951d44d6c SHA512 f9f9757261be097e06d89c85bdbb78a32183c1a800b5d7a777011f309ef17615601294d897ca638de3756836b8755ce3b208263964843811244db1adb8c1f1a0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-misc/zanshin/files/zanshin-0.5.71-akonadi-20.07.80.patch b/kde-misc/zanshin/files/zanshin-0.5.71-akonadi-20.07.80.patch
new file mode 100644
index 000000000000..59afdfad7762
--- /dev/null
+++ b/kde-misc/zanshin/files/zanshin-0.5.71-akonadi-20.07.80.patch
@@ -0,0 +1,24 @@
+From d37e34f78b3cb3ec5890ce22b0d15ad6e639f9be Mon Sep 17 00:00:00 2001
+From: Volker Krause <vkrause@kde.org>
+Date: Sat, 20 Jun 2020 09:44:44 +0200
+Subject: [PATCH] Build against a recent Akonadi
+
+---
+ tests/testlib/CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/tests/testlib/CMakeLists.txt b/tests/testlib/CMakeLists.txt
+index 794ac2b2..9b786b77 100644
+--- a/tests/testlib/CMakeLists.txt
++++ b/tests/testlib/CMakeLists.txt
+@@ -21,6 +21,7 @@ target_link_libraries(testlib
+     KF5::AkonadiCore
+     KF5::AkonadiXml
+     KF5::CalendarCore
++    Qt5::DBus
+     Qt5::Test
+ )
+ 
+-- 
+GitLab
+
diff --git a/kde-misc/zanshin/files/zanshin-0.5.71-kontactinterface-20.07.80.patch b/kde-misc/zanshin/files/zanshin-0.5.71-kontactinterface-20.07.80.patch
new file mode 100644
index 000000000000..a5b39bbe6756
--- /dev/null
+++ b/kde-misc/zanshin/files/zanshin-0.5.71-kontactinterface-20.07.80.patch
@@ -0,0 +1,58 @@
+From 4850c08998b33b37af99c3312d193b063b3e8174 Mon Sep 17 00:00:00 2001
+From: David Faure <faure@kde.org>
+Date: Sat, 11 Apr 2020 17:36:25 +0200
+Subject: [PATCH] Port to kontactinterface >= 5.14.42, with ifdefs
+
+---
+ src/zanshin/kontact/kontact_plugin.cpp | 7 +++++++
+ src/zanshin/kontact/kontact_plugin.h   | 5 +++++
+ 2 files changed, 12 insertions(+)
+
+diff --git a/src/zanshin/kontact/kontact_plugin.cpp b/src/zanshin/kontact/kontact_plugin.cpp
+index b03d9674..4b0d2f92 100644
+--- a/src/zanshin/kontact/kontact_plugin.cpp
++++ b/src/zanshin/kontact/kontact_plugin.cpp
+@@ -33,9 +33,16 @@ Plugin::Plugin(KontactInterface::Core *core, const QVariantList&)
+     setComponentName(QStringLiteral("zanshin"), QStringLiteral("zanshin"));
+ }
+ 
++#if KONTACTINTERFACE_VERSION >= QT_VERSION_CHECK(5, 14, 42)
++KParts::Part *Plugin::createPart()
++{
++    return loadPart();
++}
++#else
+ KParts::ReadOnlyPart *Plugin::createPart()
+ {
+     return loadPart();
+ }
++#endif
+ 
+ #include "kontact_plugin.moc"
+diff --git a/src/zanshin/kontact/kontact_plugin.h b/src/zanshin/kontact/kontact_plugin.h
+index 0d45564e..a270ba16 100644
+--- a/src/zanshin/kontact/kontact_plugin.h
++++ b/src/zanshin/kontact/kontact_plugin.h
+@@ -25,6 +25,7 @@
+ #define ZANSHIN_KONTACT_PLUGIN_H
+ 
+ #include <KontactInterface/Plugin>
++#include <kontactinterface_version.h>
+ 
+ class Plugin : public KontactInterface::Plugin
+ {
+@@ -36,7 +37,11 @@ public:
+     int weight() const override { return 449; }
+ 
+ protected:
++#if KONTACTINTERFACE_VERSION >= QT_VERSION_CHECK(5, 14, 42)
++    KParts::Part *createPart() override;
++#else
+     KParts::ReadOnlyPart *createPart() override;
++#endif
+ };
+ 
+ #endif
+-- 
+GitLab
+
diff --git a/kde-misc/zanshin/zanshin-0.5.71-r1.ebuild b/kde-misc/zanshin/zanshin-0.5.71-r1.ebuild
index 7a3ae88bf309..d864e26cf2b1 100644
--- a/kde-misc/zanshin/zanshin-0.5.71-r1.ebuild
+++ b/kde-misc/zanshin/zanshin-0.5.71-r1.ebuild
@@ -4,7 +4,6 @@
 EAPI=7
 
 ECM_TEST="forceoptional"
-KDE_APPS_MINIMAL=19.08.3
 KFMIN=5.60.0
 QTMIN=5.12.3
 VIRTUALX_REQUIRED="test"
@@ -24,18 +23,18 @@ SLOT="5"
 IUSE=""
 
 BDEPEND="
-	test? ( >=kde-apps/akonadi-${KDE_APPS_MINIMAL}:5[tools] )
+	test? ( <kde-apps/akonadi-20.04.50[tools] )
 "
 COMMON_DEPEND="
 	>=dev-qt/qtdbus-${QTMIN}:5
 	>=dev-qt/qtgui-${QTMIN}:5
 	>=dev-qt/qtnetwork-${QTMIN}:5
 	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-${KDE_APPS_MINIMAL}:5
-	>=kde-apps/akonadi-calendar-${KDE_APPS_MINIMAL}:5
-	>=kde-apps/akonadi-contacts-${KDE_APPS_MINIMAL}:5
-	>=kde-apps/kmime-${KDE_APPS_MINIMAL}:5
-	>=kde-apps/kontactinterface-${KDE_APPS_MINIMAL}:5
+	<kde-apps/akonadi-20.04.50
+	<kde-apps/akonadi-calendar-20.04.50
+	<kde-apps/akonadi-contacts-20.04.50
+	<kde-apps/kmime-20.04.50
+	<kde-apps/kontactinterface-20.04.50
 	>=kde-frameworks/kcalendarcore-${KFMIN}:5
 	>=kde-frameworks/kcodecs-${KFMIN}:5
 	>=kde-frameworks/kcompletion-${KFMIN}:5
@@ -59,5 +58,5 @@ DEPEND="${COMMON_DEPEND}
 "
 RDEPEND="${COMMON_DEPEND}
 	!kde-misc/zanshin:4
-	>=kde-apps/kdepim-runtime-${KDE_APPS_MINIMAL}:5
+	<kde-apps/kdepim-runtime-20.04.50
 "
diff --git a/kde-misc/zanshin/zanshin-0.5.71-r2.ebuild b/kde-misc/zanshin/zanshin-0.5.71-r2.ebuild
new file mode 100644
index 000000000000..e8fe90d5d2c2
--- /dev/null
+++ b/kde-misc/zanshin/zanshin-0.5.71-r2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="forceoptional"
+KDE_APPS_MINIMAL=20.08.0
+KFMIN=5.60.0
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Getting things done application by KDE"
+HOMEPAGE="https://zanshin.kde.org/ https://userbase.kde.org/Zanshin
+https://kde.org/applications/utilities/org.kde.zanshin"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="|| ( GPL-2 GPL-3 )"
+SLOT="5"
+IUSE=""
+
+BDEPEND="
+	test? ( >=kde-apps/akonadi-${KDE_APPS_MINIMAL}:5[tools] )
+"
+COMMON_DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-apps/akonadi-${KDE_APPS_MINIMAL}:5
+	>=kde-apps/akonadi-calendar-${KDE_APPS_MINIMAL}:5
+	>=kde-apps/akonadi-contacts-${KDE_APPS_MINIMAL}:5
+	>=kde-apps/kmime-${KDE_APPS_MINIMAL}:5
+	>=kde-apps/kontactinterface-${KDE_APPS_MINIMAL}:5
+	>=kde-frameworks/kcalendarcore-${KFMIN}:5
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcontacts-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/krunner-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+"
+RDEPEND="${COMMON_DEPEND}
+	>=kde-apps/kdepim-runtime-${KDE_APPS_MINIMAL}:5
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-kontactinterface-20.07.80.patch"
+	"${FILESDIR}/${P}-akonadi-20.07.80.patch"
+)