Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: kde-misc/zanshin/files/, kde-misc/zanshin/
Date: Wed, 29 Dec 2021 15:42:08
Message-Id: 1640792482.dd7776f56d11cfc046d4a3d47641252ac223dd77.asturm@gentoo
1 commit: dd7776f56d11cfc046d4a3d47641252ac223dd77
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Tue Dec 28 16:47:48 2021 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Wed Dec 29 15:41:22 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd7776f5
7
8 kde-misc/zanshin: Drop 0.5.71-r2
9
10 Package-Manager: Portage-3.0.30, Repoman-3.0.3
11 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
12
13 kde-misc/zanshin/Manifest | 1 -
14 .../files/zanshin-0.5.71-akonadi-20.07.80.patch | 24 --------
15 .../zanshin-0.5.71-kontactinterface-20.07.80.patch | 58 -------------------
16 kde-misc/zanshin/zanshin-0.5.71-r2.ebuild | 67 ----------------------
17 4 files changed, 150 deletions(-)
18
19 diff --git a/kde-misc/zanshin/Manifest b/kde-misc/zanshin/Manifest
20 index b228a9f822d0..e8842d60f0ce 100644
21 --- a/kde-misc/zanshin/Manifest
22 +++ b/kde-misc/zanshin/Manifest
23 @@ -1,2 +1 @@
24 -DIST zanshin-0.5.71.tar.xz 307872 BLAKE2B 3b767af7527348177b7105126acedd47e222859985feb47f89066732293d77d89347ab105b3a8269717c5fc723f1b8bcd1a52e5242bf77828019e55a48e2db6a SHA512 47b4fa8797dd50372dcf176198e1c80348cd1ba604d1ed61cd973956e54ba5551caea33c766d857bc3ad598bd0eae9882ffc315e13e6e3b9c1033d01c8e029d8
25 DIST zanshin-21.12.0.tar.xz 350888 BLAKE2B 5757193d46b8265701b3bcc1ed40254fd1a11da2d7e5734025138e442a2048039f573f2ffc028cf73bd57bbb348cd15cbecf87bc0c05b3dacb74775b2d3014ac SHA512 02dd6aa99d9a7efd942bfdb2139cae17f0f89a231de4fc8945232d0faf5f6f856032d7ca5d33d7d940a3e43f735d6666e483f17a2003aa3da65704cbbe718c71
26
27 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
28 deleted file mode 100644
29 index 59afdfad7762..000000000000
30 --- a/kde-misc/zanshin/files/zanshin-0.5.71-akonadi-20.07.80.patch
31 +++ /dev/null
32 @@ -1,24 +0,0 @@
33 -From d37e34f78b3cb3ec5890ce22b0d15ad6e639f9be Mon Sep 17 00:00:00 2001
34 -From: Volker Krause <vkrause@×××.org>
35 -Date: Sat, 20 Jun 2020 09:44:44 +0200
36 -Subject: [PATCH] Build against a recent Akonadi
37 -
38 ----
39 - tests/testlib/CMakeLists.txt | 1 +
40 - 1 file changed, 1 insertion(+)
41 -
42 -diff --git a/tests/testlib/CMakeLists.txt b/tests/testlib/CMakeLists.txt
43 -index 794ac2b2..9b786b77 100644
44 ---- a/tests/testlib/CMakeLists.txt
45 -+++ b/tests/testlib/CMakeLists.txt
46 -@@ -21,6 +21,7 @@ target_link_libraries(testlib
47 - KF5::AkonadiCore
48 - KF5::AkonadiXml
49 - KF5::CalendarCore
50 -+ Qt5::DBus
51 - Qt5::Test
52 - )
53 -
54 ---
55 -GitLab
56 -
57
58 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
59 deleted file mode 100644
60 index a5b39bbe6756..000000000000
61 --- a/kde-misc/zanshin/files/zanshin-0.5.71-kontactinterface-20.07.80.patch
62 +++ /dev/null
63 @@ -1,58 +0,0 @@
64 -From 4850c08998b33b37af99c3312d193b063b3e8174 Mon Sep 17 00:00:00 2001
65 -From: David Faure <faure@×××.org>
66 -Date: Sat, 11 Apr 2020 17:36:25 +0200
67 -Subject: [PATCH] Port to kontactinterface >= 5.14.42, with ifdefs
68 -
69 ----
70 - src/zanshin/kontact/kontact_plugin.cpp | 7 +++++++
71 - src/zanshin/kontact/kontact_plugin.h | 5 +++++
72 - 2 files changed, 12 insertions(+)
73 -
74 -diff --git a/src/zanshin/kontact/kontact_plugin.cpp b/src/zanshin/kontact/kontact_plugin.cpp
75 -index b03d9674..4b0d2f92 100644
76 ---- a/src/zanshin/kontact/kontact_plugin.cpp
77 -+++ b/src/zanshin/kontact/kontact_plugin.cpp
78 -@@ -33,9 +33,16 @@ Plugin::Plugin(KontactInterface::Core *core, const QVariantList&)
79 - setComponentName(QStringLiteral("zanshin"), QStringLiteral("zanshin"));
80 - }
81 -
82 -+#if KONTACTINTERFACE_VERSION >= QT_VERSION_CHECK(5, 14, 42)
83 -+KParts::Part *Plugin::createPart()
84 -+{
85 -+ return loadPart();
86 -+}
87 -+#else
88 - KParts::ReadOnlyPart *Plugin::createPart()
89 - {
90 - return loadPart();
91 - }
92 -+#endif
93 -
94 - #include "kontact_plugin.moc"
95 -diff --git a/src/zanshin/kontact/kontact_plugin.h b/src/zanshin/kontact/kontact_plugin.h
96 -index 0d45564e..a270ba16 100644
97 ---- a/src/zanshin/kontact/kontact_plugin.h
98 -+++ b/src/zanshin/kontact/kontact_plugin.h
99 -@@ -25,6 +25,7 @@
100 - #define ZANSHIN_KONTACT_PLUGIN_H
101 -
102 - #include <KontactInterface/Plugin>
103 -+#include <kontactinterface_version.h>
104 -
105 - class Plugin : public KontactInterface::Plugin
106 - {
107 -@@ -36,7 +37,11 @@ public:
108 - int weight() const override { return 449; }
109 -
110 - protected:
111 -+#if KONTACTINTERFACE_VERSION >= QT_VERSION_CHECK(5, 14, 42)
112 -+ KParts::Part *createPart() override;
113 -+#else
114 - KParts::ReadOnlyPart *createPart() override;
115 -+#endif
116 - };
117 -
118 - #endif
119 ---
120 -GitLab
121 -
122
123 diff --git a/kde-misc/zanshin/zanshin-0.5.71-r2.ebuild b/kde-misc/zanshin/zanshin-0.5.71-r2.ebuild
124 deleted file mode 100644
125 index 1bc6659d444a..000000000000
126 --- a/kde-misc/zanshin/zanshin-0.5.71-r2.ebuild
127 +++ /dev/null
128 @@ -1,67 +0,0 @@
129 -# Copyright 1999-2021 Gentoo Authors
130 -# Distributed under the terms of the GNU General Public License v2
131 -
132 -EAPI=7
133 -
134 -ECM_TEST="forceoptional"
135 -KDE_APPS_MINIMAL=20.08.0
136 -KFMIN=5.60.0
137 -QTMIN=5.12.3
138 -VIRTUALX_REQUIRED="test"
139 -inherit ecm kde.org
140 -
141 -DESCRIPTION="Getting things done application by KDE"
142 -HOMEPAGE="https://zanshin.kde.org/ https://apps.kde.org/en/zanshin
143 -https://userbase.kde.org/Zanshin"
144 -
145 -if [[ ${KDE_BUILD_TYPE} = release ]]; then
146 - SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
147 - KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
148 -fi
149 -
150 -LICENSE="|| ( GPL-2 GPL-3 )"
151 -SLOT="5"
152 -IUSE=""
153 -
154 -BDEPEND="
155 - test? ( >=kde-apps/akonadi-${KDE_APPS_MINIMAL}:5[tools] )
156 -"
157 -COMMON_DEPEND="
158 - >=dev-qt/qtdbus-${QTMIN}:5
159 - >=dev-qt/qtgui-${QTMIN}:5
160 - >=dev-qt/qtnetwork-${QTMIN}:5
161 - >=dev-qt/qtwidgets-${QTMIN}:5
162 - >=kde-apps/akonadi-${KDE_APPS_MINIMAL}:5
163 - >=kde-apps/akonadi-calendar-${KDE_APPS_MINIMAL}:5
164 - >=kde-apps/akonadi-contacts-${KDE_APPS_MINIMAL}:5
165 - >=kde-apps/kmime-${KDE_APPS_MINIMAL}:5
166 - >=kde-apps/kontactinterface-${KDE_APPS_MINIMAL}:5
167 - >=kde-frameworks/kcalendarcore-${KFMIN}:5
168 - >=kde-frameworks/kcodecs-${KFMIN}:5
169 - >=kde-frameworks/kcompletion-${KFMIN}:5
170 - >=kde-frameworks/kconfig-${KFMIN}:5
171 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5
172 - >=kde-frameworks/kcontacts-${KFMIN}:5
173 - >=kde-frameworks/kcoreaddons-${KFMIN}:5
174 - >=kde-frameworks/ki18n-${KFMIN}:5
175 - >=kde-frameworks/kio-${KFMIN}:5
176 - >=kde-frameworks/kitemmodels-${KFMIN}:5
177 - >=kde-frameworks/kitemviews-${KFMIN}:5
178 - >=kde-frameworks/kjobwidgets-${KFMIN}:5
179 - >=kde-frameworks/kparts-${KFMIN}:5
180 - >=kde-frameworks/krunner-${KFMIN}:5
181 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
182 - >=kde-frameworks/kwindowsystem-${KFMIN}:5
183 - >=kde-frameworks/kxmlgui-${KFMIN}:5
184 -"
185 -DEPEND="${COMMON_DEPEND}
186 - dev-libs/boost
187 -"
188 -RDEPEND="${COMMON_DEPEND}
189 - >=kde-apps/kdepim-runtime-${KDE_APPS_MINIMAL}:5
190 -"
191 -
192 -PATCHES=(
193 - "${FILESDIR}/${P}-kontactinterface-20.07.80.patch"
194 - "${FILESDIR}/${P}-akonadi-20.07.80.patch"
195 -)