gentoo resync : 05.12.2021

4 files changed, 56 insertions, 59 deletions

diff --git a/kde-apps/pim-sieve-editor/Manifest b/kde-apps/pim-sieve-editor/Manifest
index 77c7c5266266..8e83bb0c4ca9 100644
--- a/kde-apps/pim-sieve-editor/Manifest
+++ b/kde-apps/pim-sieve-editor/Manifest
@@ -1,5 +1,4 @@
-DIST pim-sieve-editor-21.04.3.tar.xz 458072 BLAKE2B cc1edb9e6720b83cb910c85e8df647cc4e1e59e20146824f57dfa37aea4e657ec4227bfdb47f58e37beb436d997f5b092aa4ae4319d22ef3e7d2d4dce572a8d8 SHA512 017f6825ae373ca8201be593f11f61ef2c26b5490776d3278ba77c61e961e25746e79a405caffef0e8c7c9218161a6b28ec09e195df1a193ae8a72c348a6ee74
+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
-EBUILD pim-sieve-editor-21.04.3.ebuild 1446 BLAKE2B f615dab9f44c9b3c0b462116d90f78fb167129777002d69698621b2eee7dfadfe7a3812d86fb5ec78f58598a0081c87ea8acda97074c531ae40e7ffc821c8b89 SHA512 6368567a8b2297b51f97fbc27ad1b500edc7d1c46a9f331f465812d5929e03182b92d477632401a96910dcf62a6d4cc69f266d2fa852a30df50c98c5ced7d782
-EBUILD pim-sieve-editor-21.08.3.ebuild 1435 BLAKE2B 4c07deac95f3637d9c23e017f5cae1b279239b6c8be3b7d8f011ff3fa77108a56ec785e3e4c04c1b50f3a6fac155bec774aff9a79db9f421c58c985abaa135e8 SHA512 d81316263ebd9f8654f427844addbc65bc329b935aff7a1235c5b228867a35ebfbe16b6c36c47247f03d4d418bf657e940d2cc099c50b31c2c7d56eab1de4d41
+EBUILD pim-sieve-editor-21.08.3-r1.ebuild 1481 BLAKE2B 16fa625c6e215abda2b241f47eaff55e955dac5d6ece609833a48f5be868722749d6dcffea8d2d878bf9ed0f4620d1416461696740a3d83b02f51857af6df612 SHA512 aba3cc099b80a2ce87abf37cd577ec2e8807dfc7cdd6821eaad3e2b3f0883975f9430b981bd9baa64a7e1e52aec5755131c25a8020dc6f4f96a7c212482c7fd4
 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
new file mode 100644
index 000000000000..c3a1bcb87540
--- /dev/null
+++ b/kde-apps/pim-sieve-editor/files/pim-sieve-editor-21.08.3-unused-dep.patch
@@ -0,0 +1,51 @@
+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.04.3.ebuild b/kde-apps/pim-sieve-editor/pim-sieve-editor-21.04.3.ebuild
deleted file mode 100644
index 98cfa8018c3b..000000000000
--- a/kde-apps/pim-sieve-editor/pim-sieve-editor-21.04.3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Assistant for editing IMAP Sieve filters"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE="telemetry"
-
-DEPEND="
-	dev-libs/qtkeychain:=
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-contacts-${PVCUT}:5
-	>=kde-apps/akonadi-mime-${PVCUT}:5
-	>=kde-apps/calendarsupport-${PVCUT}:5
-	>=kde-apps/kmailtransport-${PVCUT}:5
-	>=kde-apps/libksieve-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=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 )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package telemetry KUserFeedback)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/pim-sieve-editor/pim-sieve-editor-21.08.3.ebuild b/kde-apps/pim-sieve-editor/pim-sieve-editor-21.08.3-r1.ebuild
index 6271f76f494e..6695b71a915c 100644
--- a/kde-apps/pim-sieve-editor/pim-sieve-editor-21.08.3.ebuild
+++ b/kde-apps/pim-sieve-editor/pim-sieve-editor-21.08.3-r1.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="
@@ -46,6 +46,8 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}/${P}-unused-dep.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package telemetry KUserFeedback)