gentoo resync : 15.06.2021

4 files changed, 8 insertions, 49 deletions

diff --git a/kde-plasma/kdeplasma-addons/Manifest b/kde-plasma/kdeplasma-addons/Manifest
index baf89835dd71..d3a4ba65d8e0 100644
--- a/kde-plasma/kdeplasma-addons/Manifest
+++ b/kde-plasma/kdeplasma-addons/Manifest
@@ -1,7 +1,6 @@
 AUX kdeplasma-addons-5.19.3-kross-optional.patch 1956 BLAKE2B 922b8e73147439a706a37fcec29dcf7fb424e8ceaa8bfa1e4e54ca6c5851cf937318ee91654bf5cb352b80076aa90c9063ec07b02c7fbade8613f3d560178e86 SHA512 f9c87b27b0e8d020519259fda8df118266dd11b589873a3a8a5b4bcdf1e77e65fad29334aee80717cfe208c54021d39caee36533d144538bd80b5c1618cd36b4
-AUX kdeplasma-addons-5.20.5-no-kiconthemes.patch 1004 BLAKE2B a1b1e95d377b15ab9753df6ca0d4121f6690de8e32782b3cda5f3d42b5be2791d400189c990ae4f2820820c8da68d3e39150bbc6de95db7a0104da4c74a01ed3 SHA512 376c8b2cd185b7ee633c43067192e775db61cb05456df615c6230076ca3ed0e5ae04e7e1ebb1147cbf482094d82748b3a29d1c52fa81d5a5fbbb9b6f18ab9499
-DIST kdeplasma-addons-5.20.5.tar.xz 644352 BLAKE2B 2579fafc102210006a8cdb4b303c865ec3aabe149c0d0acfa47640c272e4327fa84934f33e14f6c2fad20656fbe145793d375c81fa4028251cf623e37b243aaa SHA512 3a4f0715ac1dbc9edbb62f253b48520f9b011c29f87ef0a7ba25ea14dc24dcc698405e7d8e83593b51bab2976b274b0ac869cab8b17a50ba34902bd8121ee421
 DIST kdeplasma-addons-5.21.5.tar.xz 630108 BLAKE2B a3a4ee1885cce41621150cc1eb5fa5d6470b627f8a30231078938d82f39f888927f6482048403905cb3e680928be892718e0c4741a8da11f0e317fa06cee8106 SHA512 7c7afebd726e400c859be7051c14dc2ade658df7995b02f43595be5394f8d79322c7a7edeff6761e3980bc20aaedfc49d063308c4ee9974a400b8f855a89efe1
-EBUILD kdeplasma-addons-5.20.5.ebuild 2129 BLAKE2B f81e68e4c5a6d7624c5d6e593c39a2c076e7ff7eb329cf95d1922a9c901bf6a82812e05cd42139897ed40f9cc44e4fc77988ff5bf4432de32ce982bc8fc5baf9 SHA512 0bd0d2de34d489cb113bfb81c91032dfbb5ebd9241751801334331dc2f5373950776b8b02ac099635cb6199cd716d8aaa8060dff0488d8c614cfb8ea304d3222
-EBUILD kdeplasma-addons-5.21.5.ebuild 2082 BLAKE2B 7c48249ad97f9f6261825768fe7eda3e3c89612cb988f8ecfa208b1d06d08a8c8bf786d35b4bdff200d476174f35358fdda440f29db2b983e993bdbff710495a SHA512 72dfb4b13eedd04f46259d2f3bfcea9722e9dd73920176065154861bf589d8ba81e52386a2d4170ea4597b6b8d403ab890217602dfc88277997601df5cb7351b
+DIST kdeplasma-addons-5.22.0.tar.xz 633336 BLAKE2B 9e11954e7756bbcf5c27699fd76684c950db41b495ea033360db05cebe2cae906e361374e5884de4880ba0f591a455229e996af815f4aef630317e39590052eb SHA512 027b54c290011ad0b031515a744ce7ad1b18734054f892c119eddce744078b838583b6125014419c05dea3ba97207b095a487ede0d3e03e2df34d16fe189a543
+EBUILD kdeplasma-addons-5.21.5.ebuild 2079 BLAKE2B 19c27c73a2d26ffae8a1cc44e48350b3d391a45d33b8e61ca81b5b7ca8fa1b026867720fe34f79f4a11b6322e4ed8a86f3d7528fe5fbae503605af71d8671650 SHA512 db7612e36ce39cab39f65c8707e347cae01a3cd572f856e9512bfdf2d006558f92bc5e47c68cb897baff800d2abef9b6add55dc879d5b0939c09e0ad78c719dc
+EBUILD kdeplasma-addons-5.22.0.ebuild 2082 BLAKE2B 7c48249ad97f9f6261825768fe7eda3e3c89612cb988f8ecfa208b1d06d08a8c8bf786d35b4bdff200d476174f35358fdda440f29db2b983e993bdbff710495a SHA512 72dfb4b13eedd04f46259d2f3bfcea9722e9dd73920176065154861bf589d8ba81e52386a2d4170ea4597b6b8d403ab890217602dfc88277997601df5cb7351b
 MISC metadata.xml 567 BLAKE2B 5009c2a6fd74956562b1b3b33322a457a0d295ae472f89208c3756d9847aed9f7b501d0a7e135e95c1a455a57f65876dca71e94446043b9b7d3dc551d58da854 SHA512 2e2fdba9c39b93e082b24d38b1134245e682b07a99b587c9eb6060aae318dd10d08af661880df478a1a97a23c46f1259a4753b9b6169af6af75babfbccf1c7ce
diff --git a/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.20.5-no-kiconthemes.patch b/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.20.5-no-kiconthemes.patch
deleted file mode 100644
index 5981fe4a7ef4..000000000000
--- a/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.20.5-no-kiconthemes.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 88fe32d4d6543c860bcec4e63782ee82fac2c75f Mon Sep 17 00:00:00 2001
-From: Nicolas Fella <nicolas.fella@gmx.de>
-Date: Mon, 14 Dec 2020 18:26:33 +0100
-Subject: [PATCH] Remove unused KIconThemes dependency
-
----
- CMakeLists.txt                 | 1 -
- applets/weather/CMakeLists.txt | 1 -
- 2 files changed, 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 15e121e7f..bc3782f1f 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -47,7 +47,6 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
-     Declarative
-     Holidays
-     I18n
--    IconThemes
-     KIO
-     KCMUtils
-     Kross
-diff --git a/applets/weather/CMakeLists.txt b/applets/weather/CMakeLists.txt
-index d88c5fcc0..fe88b68c5 100644
---- a/applets/weather/CMakeLists.txt
-+++ b/applets/weather/CMakeLists.txt
-@@ -33,7 +33,6 @@ add_library(weatherplugin SHARED ${weather_SRCS})
- target_link_libraries(weatherplugin
-     KF5::Plasma
-     KF5::UnitConversion
--    KF5::IconThemes
-     KF5::I18n
-     Qt5::Qml
- )
--- 
-GitLab
-
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.21.5.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.21.5.ebuild
index 7d312067f3f2..11489f598f86 100644
--- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.21.5.ebuild
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.21.5.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Extra Plasma applets and engines"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="comic share webengine"
 
 RESTRICT+=" test" # bug 727846
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.20.5.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.22.0.ebuild
index d5e4bee93e2f..7d312067f3f2 100644
--- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.20.5.ebuild
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.22.0.ebuild
@@ -4,9 +4,9 @@
 EAPI=7
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.74.0
+KFMIN=5.82.0
 PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.1
+QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org optfeature
 
@@ -14,7 +14,7 @@ DESCRIPTION="Extra Plasma applets and engines"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="comic share webengine"
 
 RESTRICT+=" test" # bug 727846
@@ -55,10 +55,7 @@ RDEPEND="${DEPEND}
 	>=kde-plasma/plasma-workspace-${PVCUT}:5
 "
 
-PATCHES=(
-	"${FILESDIR}/${PN}-5.20.5-no-kiconthemes.patch"
-	"${FILESDIR}/${PN}-5.19.3-kross-optional.patch" # downstream patch
-)
+PATCHES=( "${FILESDIR}/${PN}-5.19.3-kross-optional.patch" ) # downstream patch
 
 src_configure() {
 	local mycmakeargs=(