gentoo resync : 12.05.2022

4 files changed, 8 insertions, 63 deletions

diff --git a/kde-apps/pim-sieve-editor/Manifest b/kde-apps/pim-sieve-editor/Manifest
index 07068f13a86c..331b3557a702 100644
--- a/kde-apps/pim-sieve-editor/Manifest
+++ b/kde-apps/pim-sieve-editor/Manifest
@@ -1,6 +1,5 @@
-AUX pim-sieve-editor-21.08.3-unused-dep.patch 1666 BLAKE2B 0cac029124e25dc66eb31c12a5e7ffac07eb9787cf4cec6d7931d415b33b527965e7bf6150d1362f32ae11fdf3ca19927b7118ae7d0c588d2a2c13101ba993c9 SHA512 d75742ed7765a964f4404a388a70b9768983370dc34a7098b5ab9abb84d67e1c8565ed34708d4b60f94b2b27a4101b47d285cfaf569a1cc39ed77d4772e5c9dd
-DIST pim-sieve-editor-21.08.3.tar.xz 458408 BLAKE2B 92e3afc0802dfebae76e630044920d762ca3d05a7e576ed94d7b1d153de5269abd20cff7d0c1170da080776e5e948f621d0c8ccccbcd87d1381fbb722b29c0de SHA512 6aa0455b6dca25bdf6ac1413e262a710101a533fe56526f36a0584c3480b69db8f87ccd88eff01e3001b907cefe1efa3dd1e2c63df62f49b190f73b277d84ce7
 DIST pim-sieve-editor-21.12.3.tar.xz 457424 BLAKE2B 542414ec8506882541b4ebf2c8387ad8bcfbd034faa6e170ac6254358c7722e8249bb3a7c8cb065b5ddd3196c797816212c87335ec298010d99cd659269b9c3a SHA512 fb5788c85bb5b21cb0a3666bcede46f76305dcacae118cb7a0896de6c46bad53fe55d43e5d514c572a5f3f2a244627b1c3a40e2490eaac722b0bb073aba24209
-EBUILD pim-sieve-editor-21.08.3-r1.ebuild 1481 BLAKE2B 16fa625c6e215abda2b241f47eaff55e955dac5d6ece609833a48f5be868722749d6dcffea8d2d878bf9ed0f4620d1416461696740a3d83b02f51857af6df612 SHA512 aba3cc099b80a2ce87abf37cd577ec2e8807dfc7cdd6821eaad3e2b3f0883975f9430b981bd9baa64a7e1e52aec5755131c25a8020dc6f4f96a7c212482c7fd4
-EBUILD pim-sieve-editor-21.12.3.ebuild 1392 BLAKE2B 7b16d06e171df3a3f6d7b56d602867782be8471dc2c556cc43c79ca7d0d4d30db2985a4afa2ae40b06ea88e072f3732f9a37526f3c2fabfafa770231aff6adb1 SHA512 87669afc17b98d76ab12fa94b7032d7e2baca4cdc74a2f452c1484caaa4686c227243281ffb809e223471ceae421242fd8f188c7e434262d9c66614e24628de3
+DIST pim-sieve-editor-22.04.0.tar.xz 452956 BLAKE2B 8933805d79d0573ce00b215c7e62086e384ba04b270462b1f71e6b5b2ff56e2f0ad95f90adf7393d222c123204d1f73b379bedaafe48a47390661b14fc68ea5c SHA512 4cfa975f2eb11b92387222a0b7caa57b4e93e77af9bf12276552e8eb694765030b8276bf06ec59e720119fcc3de64ddee84ab47c456165f79a4e9bf1987b1e16
+EBUILD pim-sieve-editor-21.12.3.ebuild 1391 BLAKE2B a21879928797ac926cdb001c68f41e15b029c5ee83412e2e62a4d7984263fd1bfc12b654942516241fb0cc60ee0034e4f113e56ff20c0fbc92a274ab02eb2d97 SHA512 2d0a3b54a1be8b6b710a44b34a0f1cc001ffca19b998f679c43716a8899603cc98b2b18e87ab9ecccc85d2f5fd10c864e2520e4dd5a8438206c68184f2ec4ea5
+EBUILD pim-sieve-editor-22.04.0.ebuild 1402 BLAKE2B cc3bf084c269b4c5e25bf73bea4c7df4b8437929ff1402ccc76e9f956adeda2106cabf5ef29ceccb6733bf0e7659557c4788f96d82a998363055a01a0c59a669 SHA512 80b28877a1ccc0e4d6ad99aa6e22f7110af784a9abe57081131c3e2c0bd9f27038569e2b386214071956ee32def6490519ed4d96d1bd5a8bb4375e205e0d68b3
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/pim-sieve-editor/files/pim-sieve-editor-21.08.3-unused-dep.patch b/kde-apps/pim-sieve-editor/files/pim-sieve-editor-21.08.3-unused-dep.patch
deleted file mode 100644
index c3a1bcb87540..000000000000
--- a/kde-apps/pim-sieve-editor/files/pim-sieve-editor-21.08.3-unused-dep.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From ffaa4290742302dc25976abefc7a7888fee65fec Mon Sep 17 00:00:00 2001
-From: Nicolas Fella <nicolas.fella@gmx.de>
-Date: Sat, 24 Apr 2021 20:46:28 +0200
-Subject: [PATCH] Remove unused KIconThemes dep
-
----
- CMakeLists.txt                | 1 -
- src/CMakeLists.txt            | 1 -
- src/sieveeditormainwindow.cpp | 2 --
- 3 files changed, 4 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d529344..a6f5aaa 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -59,7 +59,6 @@ find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Network)
- find_package(KF5DBusAddons ${KF5_MIN_VERSION} CONFIG REQUIRED)
- find_package(KF5Crash ${KF5_MIN_VERSION} REQUIRED)
- find_package(KF5Bookmarks ${KF5_MIN_VERSION} REQUIRED)
--find_package(KF5IconThemes ${KF5_MIN_VERSION} REQUIRED)
- find_package(KF5KIO ${KF5_MIN_VERSION} REQUIRED)
- find_package(KF5DocTools ${KF5_MIN_VERSION})
- set_package_properties(KF5DocTools PROPERTIES DESCRIPTION
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 565851a..c6c8914 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -85,7 +85,6 @@ target_link_libraries(libsieveeditor
-     KF5::MailTransport
-     KF5::Bookmarks
-     KF5::I18n
--    KF5::IconThemes
-     KF5::XmlGui
-     KF5::PimCommon
-     KF5::KSieveUi
-diff --git a/src/sieveeditormainwindow.cpp b/src/sieveeditormainwindow.cpp
-index 73e1c7d..bd4258b 100644
---- a/src/sieveeditormainwindow.cpp
-+++ b/src/sieveeditormainwindow.cpp
-@@ -17,8 +17,6 @@
- #include "sieveserversettings.h"
- #include <PimCommon/KActionMenuChangeCase>
- 
--#include <KIconEngine>
--#include <KIconLoader>
- #include <KSharedConfig>
- #include <PimCommon/NetworkManager>
- 
--- 
-GitLab
-
diff --git a/kde-apps/pim-sieve-editor/pim-sieve-editor-21.12.3.ebuild b/kde-apps/pim-sieve-editor/pim-sieve-editor-21.12.3.ebuild
index eaaef7c9c14f..46f7292e91e1 100644
--- a/kde-apps/pim-sieve-editor/pim-sieve-editor-21.12.3.ebuild
+++ b/kde-apps/pim-sieve-editor/pim-sieve-editor-21.12.3.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Assistant for editing IMAP Sieve filters"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="telemetry"
 
 DEPEND="
diff --git a/kde-apps/pim-sieve-editor/pim-sieve-editor-21.08.3-r1.ebuild b/kde-apps/pim-sieve-editor/pim-sieve-editor-22.04.0.ebuild
index 6695b71a915c..a90947f64f94 100644
--- a/kde-apps/pim-sieve-editor/pim-sieve-editor-21.08.3-r1.ebuild
+++ b/kde-apps/pim-sieve-editor/pim-sieve-editor-22.04.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -6,7 +6,7 @@ EAPI=8
 ECM_HANDBOOK="optional"
 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,7 +15,7 @@ DESCRIPTION="Assistant for editing IMAP Sieve filters"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="telemetry"
 
 DEPEND="
@@ -39,15 +39,12 @@ DEPEND="
 	>=kde-frameworks/kcrash-${KFMIN}:5
 	>=kde-frameworks/kdbusaddons-${KFMIN}:5
 	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	telemetry? ( dev-libs/kuserfeedback:5 )
+	telemetry? ( >=dev-libs/kuserfeedback-1.2.0:5 )
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/${P}-unused-dep.patch" )
-
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package telemetry KUserFeedback)