gentoo resync : 12.05.2022

4 files changed, 53 insertions, 10 deletions

diff --git a/kde-apps/libksieve/Manifest b/kde-apps/libksieve/Manifest
index 65c95c6210f4..275e964ac1a9 100644
--- a/kde-apps/libksieve/Manifest
+++ b/kde-apps/libksieve/Manifest
@@ -1,6 +1,7 @@
 AUX libksieve-21.12.3-speech-optional.patch 8029 BLAKE2B f8dda7f2c6c3a3c2cf4feecaa66e8263282ec478823ab5d32b3583f5b202ce555174d73c8b5e9b0bb5ba9a4f79d25ba26e249b8186f87ab9c8b1238141e4bedc SHA512 1c319d2740615c041f8c630038d287b0894dfe7fb63300f4188c05772bba5e512293edf49d487eb511a5e3e2429d4904756401d77bb5a8f2111347a5b8a37f07
-DIST libksieve-21.08.3.tar.xz 569836 BLAKE2B 0b04ce3a3e00c62dc168b8a6bc0d32d465198f9ce3a2e6af0e7d2e1c14118a0f94f2bceac743cf51057d35fec2f2bec84293b0065d77a4f80d653029114d53eb SHA512 ed4a116e26e27606b54b83a4c48038b962b32f294cdfdfed87bc9dc280d660a6f3345312bee8a61a2e17c7fa2c896cabc6856991d6d364dad19969411840b819
+AUX libksieve-22.03.80-unused-dep.patch 1562 BLAKE2B 13c0262fd3b3be5d6d596b3d4a12db40ea981a5a96f520f207fe4a47d22d0c13841a29c1db0d4b2463a02a934f49c8ebd3491c5aafea93e607e89805b06a168d SHA512 e38f852a359c7e5e8d0efff911c6f41f2e074faf5672187f2921e78d8e67019c63f766b4f523bf96a8f5145e49d093c1432d032d7735d9906d4e8f9969e5952d
 DIST libksieve-21.12.3.tar.xz 572276 BLAKE2B 190a32d2e19abb6a28ef1419c73fa93bc73989086374e83b95427ab4ded93fa058c644c290052e273a9ac45895c842efee87eb3d626a8f769e0e969b547976d9 SHA512 ca4b970a3ec510a904187904c5070990728c7fcd3dc42e2052caf80cc828c0e00d31b00828457dbc8dc7a2f21927542f60552b1d67cfedc85b52a57f0c12d3a4
-EBUILD libksieve-21.08.3.ebuild 1404 BLAKE2B d01b40ba94e03e36273a76db1143ac3721d1d0a4c095296bdc0c63d6328b9300dc25073dbca9cdabc3c8608708729fabed9d581d9be34c7e33a4cc5a41e08f4e SHA512 a93fdf5651ef9fbd9dd1b20e5a5669e7992dbfdc035cfde2cbc90fb05aba1682faff215da45ac4fb9103f2ab9fd5e5d68ad88fc91e53951b502e52cc13bee5c0
-EBUILD libksieve-21.12.3.ebuild 1501 BLAKE2B 07077729db1ec11e507d9def67261d98c3898b259222a89d6f783dcd2ec123500d4c98969f392805abc23468afc1587a91f09dc8993606ac8e757f6be04c8f45 SHA512 f25e88c63d27f4a72c3dda35e84e2beb1b9d61b2e994d309198653e8d9b0b14d0eabf8b7faf1eb2c175b9bdfae131adcc6c660a82a104d0bdb9cac3cbad773be
+DIST libksieve-22.04.0.tar.xz 576100 BLAKE2B ec97d50b7d6be3a97aaae1e5fa104e7a72ee55af25c39efb3b84d30e8ef4e2fe4c5e9e3f5bceec2901b738d51252d1b7d85912dc9d05d07c1239482d58021e15 SHA512 72592106ff734787d82878608ae4ac4b2ee11ed50755acf1dca69040d333d11b23c2359988dae2fa1fc8f650ce2e4cb760c363c3a49eef818db2f72300a6d5a7
+EBUILD libksieve-21.12.3.ebuild 1500 BLAKE2B dcfe2d314a0d1a31412b935684938d32cbeddb0d7e65908861d78cbec03cd395b12a379481a9be69ecda1bf6b16603c4cc027000970e286bbf4b5fe8fe903395 SHA512 190f6c8dba843c2fc5acce23fa790ebb23c4f69df31e0fe3d6acad44b6b65be0302c4f151c42418cf49fd0a904ca5b187ca7912e5003ebb63bd2f905cec813cc
+EBUILD libksieve-22.04.0.ebuild 1499 BLAKE2B 4298a803d88f6408e0d896181295209fbb719db4514c4e37bd9142d24941b6d0b80b2a748cfc4d47cb3f79e9522e8acfdd12db354833dcd27983c7845a7eb4de SHA512 b77b2bb35373bd2124ff43942a3de927af5939ee02ac4e2146e530efcec848f4826dc66d5b571654e782f6e52d3f1f3ed1d3e75a1df35d84462be6ed7cfb8d6d
 MISC metadata.xml 392 BLAKE2B d284f1f6d15ec099b824fc8aae970cceca3e558cbd7e4dc4b1ca93911394fd57834785936d1ca6626b4b4ff6b71613cd872b93e45b8701104978f80d8170e9e9 SHA512 872b0653ecebb83d93e152d510808ad85502024f5c162bb5c40a94aa76cddac615c0e930c04313c53a9e0a1a5c4b383829e302bb34647db46a698b47edc7fbdb
diff --git a/kde-apps/libksieve/files/libksieve-22.03.80-unused-dep.patch b/kde-apps/libksieve/files/libksieve-22.03.80-unused-dep.patch
new file mode 100644
index 000000000000..2d0a36210ee6
--- /dev/null
+++ b/kde-apps/libksieve/files/libksieve-22.03.80-unused-dep.patch
@@ -0,0 +1,39 @@
+From 5e89420482da4f24ca4b0555562a9160cf259de4 Mon Sep 17 00:00:00 2001
+From: Laurent Montel <montel@kde.org>
+Date: Tue, 15 Mar 2022 06:49:17 +0100
+Subject: [PATCH] Use KWindowStateSaver directly
+
+---
+ src/ksieveui/editor/sieveeditortextmodewidget.cpp | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/ksieveui/editor/sieveeditortextmodewidget.cpp b/src/ksieveui/editor/sieveeditortextmodewidget.cpp
+index 7d7c385d..a9857d54 100644
+--- a/src/ksieveui/editor/sieveeditortextmodewidget.cpp
++++ b/src/ksieveui/editor/sieveeditortextmodewidget.cpp
+@@ -33,10 +33,11 @@
+ #include <KLocalizedString>
+ #include <KMessageBox>
+ #include <KSharedConfig>
++#include <KWindowStateSaver>
+ 
+-#include <PimCommon/KPimPrintPreviewDialog>
+ #include <QPointer>
+ #include <QPrintDialog>
++#include <QPrintPreviewDialog>
+ #include <QPrinter>
+ #include <QPushButton>
+ #include <QShortcut>
+@@ -442,7 +443,8 @@ void SieveEditorTextModeWidget::printPreview()
+     if (w == mEditorWidget) {
+         bool restoreSpellCheck = mTextEdit->checkSpellingEnabled();
+         mTextEdit->setCheckSpellingEnabled(false);
+-        QPointer<PimCommon::KPimPrintPreviewDialog> previewdlg = new PimCommon::KPimPrintPreviewDialog(this);
++        QPointer<QPrintPreviewDialog> previewdlg = new QPrintPreviewDialog(this);
++        new KWindowStateSaver(previewdlg.data(), "SieveEditorPrintPreviewDialog");
+         connect(previewdlg.data(), &QPrintPreviewDialog::paintRequested, this, [this](QPrinter *printer) {
+             mTextEdit->print(printer);
+         });
+-- 
+GitLab
+
diff --git a/kde-apps/libksieve/libksieve-21.12.3.ebuild b/kde-apps/libksieve/libksieve-21.12.3.ebuild
index 60339d9bfab1..0ea9f904ebea 100644
--- a/kde-apps/libksieve/libksieve-21.12.3.ebuild
+++ b/kde-apps/libksieve/libksieve-21.12.3.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="Common PIM libraries"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="speech"
 
 RESTRICT="test"
diff --git a/kde-apps/libksieve/libksieve-21.08.3.ebuild b/kde-apps/libksieve/libksieve-22.04.0.ebuild
index 9213e2079a0d..0866f23c295e 100644
--- a/kde-apps/libksieve/libksieve-21.08.3.ebuild
+++ b/kde-apps/libksieve/libksieve-22.04.0.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 ECM_HANDBOOK="forceoptional"
+ECM_QTHELP="true"
 ECM_TEST="true"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.84.0
+KFMIN=5.92.0
 QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
@@ -15,8 +16,10 @@ DESCRIPTION="Common PIM libraries"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="speech"
+
+RESTRICT="test"
 
 RDEPEND="
 	dev-libs/cyrus-sasl
@@ -28,7 +31,7 @@ RDEPEND="
 	>=dev-qt/qtwidgets-${QTMIN}:5
 	>=kde-apps/kidentitymanagement-${PVCUT}:5
 	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/kpimtextedit-${PVCUT}:5
+	>=kde-apps/kpimtextedit-${PVCUT}:5[speech=]
 	>=kde-apps/libkdepim-${PVCUT}:5
 	>=kde-apps/pimcommon-${PVCUT}:5
 	>=kde-frameworks/karchive-${KFMIN}:5
@@ -48,7 +51,7 @@ DEPEND="${RDEPEND}
 	>=kde-apps/kmailtransport-${PVCUT}:5
 "
 
-RESTRICT="test"
+PATCHES=( "${FILESDIR}/${PN}-22.03.80-unused-dep.patch" )
 
 src_prepare() {
 	ecm_src_prepare