gentoo resync : 12.05.2022

4 files changed, 89 insertions, 8 deletions

diff --git a/kde-apps/calendarsupport/Manifest b/kde-apps/calendarsupport/Manifest
index 8428201f3ea2..2d73f7bb2791 100644
--- a/kde-apps/calendarsupport/Manifest
+++ b/kde-apps/calendarsupport/Manifest
@@ -1,5 +1,6 @@
-DIST calendarsupport-21.08.3.tar.xz 764564 BLAKE2B d8d81150b053ad39048e8b265088c4f0bec68816cf8306f775a55b681a263b8cd05b1d6908c4ce64a322e81f7c920d103d6932fc8528293910a3bdb834c65f1a SHA512 96b1bebe72c514b0888311e66a587994d3e7409e6cac23bf812bc4307927fabf75bcf9330474edf52ba15a4d913f8227c58a5abb1f6f821092c5349984965a21
+AUX calendarsupport-22.03.80-unused-dep.patch 2713 BLAKE2B 72efd1c6407ebc943fdaa9be3d968ee5cbd633902304f78139163662131135eab1b1717713a7fd1779847d335be6e8e95a47588d986921ad47e365fbc00a8561 SHA512 4052e5befc7c393a88414c5d091b14ea2ed275967648d6269a9c7a2cb45582d23edd3e794f92e3960a0b5150f049d6322690472971fb25fb69200b93c7105d0f
 DIST calendarsupport-21.12.3.tar.xz 764748 BLAKE2B f539c1e33305b8cfccc71bd7398941dbed9d75a68c75da3a52de81a6ff4e7294a9172e7dfe864ea89cbd1ff082d437d83b52b73922a2372bd87bc8a877de1f12 SHA512 fedb5927e5d67ebb2510709dbb0c3a27be32c81a88a85b37ac96b9681d0a98a00de542bdc5b3dcfa6568976aed2c34508c8010da634825bd926083464ef51932
-EBUILD calendarsupport-21.08.3.ebuild 1261 BLAKE2B 36a4ebb946228b9c87e0f9706b5f454727dec19a8beab0c2a464e4d8720cc62aa70c64452d8b9e15e50ec2496f5bcd4ad5db1793c00aeffe6f1d650fb1241e21 SHA512 9e8672731c4b9374792f941ac37a8ba039a1f8d46c0dca9f75783de44042677d4d31a7f39f8ee97145c832125f7eb7bd5dbd47f0d70b0f7e9c96a6550006585f
-EBUILD calendarsupport-21.12.3.ebuild 1280 BLAKE2B 5e6588511346b92a8a2a613e1006b70ae783641f226abc7fe73866c0643b8d3af14784ff6b3cca0a14a68b5e71439e314534141f0181ca5d66ff7e627f431ce8 SHA512 a769ae972b49722ed6fefbd958586ff74af075a150df35d560e20b6ca7f410b6640a0c8189625c5637723c1932d90648478846c0fe15efe59ab6b56e1314fe44
+DIST calendarsupport-22.04.0.tar.xz 767136 BLAKE2B 171a147d3e14cb4d935c63a7b042ab508408c5a3963ed59fcbe3a395bf2983e1475a9c3a9cf9a5f7f05ed5c5172f44ec43c0452fc47eeca6783f2e19ca9cf04b SHA512 228db6fd2575bb00ecb2abe9036abdd8ab3406c506730decb6f8ad4388a09e70127c83c67b9116fac681cee3b02a5ddbb9864b8179742fe303404938b24068a8
+EBUILD calendarsupport-21.12.3.ebuild 1279 BLAKE2B c0e665936ad72d0495789ec49c66bdf98a655759fc6ebac0b17f47ac7d9f5d6d584a00bef16362888b7eabd451b5e3153cbda2c2c9ed6071fd0cf39ad69c9816 SHA512 b56c6a6769c062e2fd21b83ccaa3c6e5f4878c054e23e6ff3a03d3c6a1014acbd1cc5e28fee460f02338c7dd37ff74b9c6522d6ae3540e4b87a198da017e9bf9
+EBUILD calendarsupport-22.04.0.ebuild 1308 BLAKE2B 3eafc89cdd616ca0d53698f042bebb0911bcf9e55ed123a66d9cff1092153ed1e187fa2abfe235538b84b5cc5738c82defe3263c246bba3a4e18693e07896076 SHA512 0c63beff70b57b7bad56088cdf1ce56aeaa1c6421e172568ef487b3b30fee0e412991948060afd69247bdcca27322b4fbae7d98ba3afcde353209ed99b3412af
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/calendarsupport/calendarsupport-21.12.3.ebuild b/kde-apps/calendarsupport/calendarsupport-21.12.3.ebuild
index c9797874a666..114f3e853b3c 100644
--- a/kde-apps/calendarsupport/calendarsupport-21.12.3.ebuild
+++ b/kde-apps/calendarsupport/calendarsupport-21.12.3.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Calendar support library"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/calendarsupport/calendarsupport-21.08.3.ebuild b/kde-apps/calendarsupport/calendarsupport-22.04.0.ebuild
index 9804a9e7d93c..d5b684149851 100644
--- a/kde-apps/calendarsupport/calendarsupport-21.08.3.ebuild
+++ b/kde-apps/calendarsupport/calendarsupport-22.04.0.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
+ECM_QTHELP="true"
 ECM_TEST="false"
-KFMIN=5.84.0
+KFMIN=5.92.0
 PVCUT=$(ver_cut 1-3)
 QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
@@ -14,7 +15,7 @@ DESCRIPTION="Calendar support library"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="
@@ -31,7 +32,6 @@ DEPEND="
 	>=kde-apps/kidentitymanagement-${PVCUT}:5
 	>=kde-apps/kmime-${PVCUT}:5
 	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
 	>=kde-frameworks/kcalendarcore-${KFMIN}:5
 	>=kde-frameworks/kcodecs-${KFMIN}:5
 	>=kde-frameworks/kcompletion-${KFMIN}:5
@@ -45,3 +45,5 @@ DEPEND="
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 "
 RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-22.03.80-unused-dep.patch" )
diff --git a/kde-apps/calendarsupport/files/calendarsupport-22.03.80-unused-dep.patch b/kde-apps/calendarsupport/files/calendarsupport-22.03.80-unused-dep.patch
new file mode 100644
index 000000000000..3402e0855939
--- /dev/null
+++ b/kde-apps/calendarsupport/files/calendarsupport-22.03.80-unused-dep.patch
@@ -0,0 +1,78 @@
+From 3287867734062c60dd6d5ccc66aa03fb73795f9e Mon Sep 17 00:00:00 2001
+From: Volker Krause <vkrause@kde.org>
+Date: Mon, 14 Mar 2022 17:22:48 +0100
+Subject: [PATCH] Use KWindowStateSaver for the print preview dialog
+
+This obsoletes KPimPrintPreviewDialog, and even allows us to remove the
+dependency to pimcommon here.
+---
+ CMakeLists.txt              |  2 --
+ src/CMakeLists.txt          |  1 -
+ src/printing/calprinter.cpp | 10 +++++-----
+ 3 files changed, 5 insertions(+), 8 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f684ab9..5225c82 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -59,7 +58,6 @@ find_package(KF5CalendarCore ${KF5_MIN_VERSION} CONFIG REQUIRED)
+ find_package(KF5IdentityManagement ${IDENTITYMANAGEMENT_LIB_VERSION} CONFIG REQUIRED)
+ find_package(KF5Holidays ${KF5_MIN_VERSION} CONFIG REQUIRED)
+ find_package(KF5AkonadiCalendar ${AKONADICALENDAR_LIB_VERSION} CONFIG REQUIRED)
+-find_package(KF5PimCommon ${PIMCOMMON_LIB_VERSION} CONFIG REQUIRED)
+ find_package(KF5AkonadiNotes ${AKONADI_NOTES_VERSION} CONFIG REQUIRED)
+ 
+ ecm_setup_version(PROJECT VARIABLE_PREFIX CALENDARSUPPORT
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index f8c2e3b..2846328 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -116,7 +116,6 @@ PRIVATE
+   KF5::AkonadiCore
+   KF5::CalendarCore
+   KF5::CalendarUtils
+-  KF5::PimCommon
+ )
+ 
+ set_target_properties(KF5CalendarSupport PROPERTIES
+diff --git a/src/printing/calprinter.cpp b/src/printing/calprinter.cpp
+index 0ef3da7..0eb7f8f 100644
+--- a/src/printing/calprinter.cpp
++++ b/src/printing/calprinter.cpp
+@@ -10,11 +10,11 @@
+ #include "journalprint.h"
+ #include "yearprint.h"
+ 
++#include <KConfigGroup>
+ #include <KMessageBox>
+ #include <KStandardGuiItem>
+-#include <QVBoxLayout>
++#include <KWindowStateSaver>
+ 
+-#include <KConfigGroup>
+ #include <QButtonGroup>
+ #include <QDialogButtonBox>
+ #include <QGridLayout>
+@@ -23,8 +23,7 @@
+ #include <QPrintPreviewDialog>
+ #include <QSplitter>
+ #include <QStackedWidget>
+-
+-#include <PimCommon/KPimPrintPreviewDialog>
++#include <QVBoxLayout>
+ 
+ using namespace CalendarSupport;
+ 
+@@ -132,7 +131,8 @@ void CalPrinter::doPrint(PrintPlugin *selectedStyle, CalPrinter::ePrintOrientati
+     }
+ 
+     if (preview) {
+-        QPointer<PimCommon::KPimPrintPreviewDialog> printPreview = new PimCommon::KPimPrintPreviewDialog(&printer);
++        QPointer<QPrintPreviewDialog> printPreview = new QPrintPreviewDialog(&printer);
++        new KWindowStateSaver(printPreview.data(), "CalendarPrintPreviewDialog");
+         connect(printPreview.data(), &QPrintPreviewDialog::paintRequested, this, [selectedStyle, &printer]() {
+             selectedStyle->doPrint(&printer);
+         });
+-- 
+GitLab
+