gentoo resync : 15.06.2021

4 files changed, 7 insertions, 38 deletions

diff --git a/kde-plasma/khotkeys/Manifest b/kde-plasma/khotkeys/Manifest
index 4fe3ea36b664..67b575812a6a 100644
--- a/kde-plasma/khotkeys/Manifest
+++ b/kde-plasma/khotkeys/Manifest
@@ -1,6 +1,5 @@
-AUX khotkeys-5.20.4-unused-dep.patch 780 BLAKE2B 82fe708c5e56a2f848dffeba923ea21f1661888d985a63d399bf79d8ab0fc502a7c85e1702b540cd6f5dcead1befc899c7fd3ae0c57266ce63817c12cc2e84d4 SHA512 6ec31bfe5b0f8cf21ae5e35b018829f1b88fbbccc39c27aeeac4e2463cf6c766cf9a5c51d832d7b06b14b3fc2cecd76ad5114e52672e0bd6b569034544caf963
-DIST khotkeys-5.20.5.tar.xz 1856468 BLAKE2B a29c2c6dd9d34dbf2919ab4020bc6b3ec16d25f0462485ed1940598a238f99b8066176462e6ce24ec2784150601d574eabd469b1fa9760f2afb630392c4a7d4e SHA512 7a18896c40749611b333b3a7cd5c064e61449579b141856f2d75f02fe0db12924fc8e6ccada00c6cca29a57aac5877f0c791d7231dc047b8b32c168ac507e110
 DIST khotkeys-5.21.5.tar.xz 1861604 BLAKE2B 69f0057e62d4a03ce3e54092def09ea7bf73a4063ebd8e33c2fb81566d9fd1e02a1712b2e941295a491821b3ba4695f43884e5db532a5c166439a2d26389b1df SHA512 16409a928af050278dda012150e969b60617a66aa000cbb722781788defb02268ac56ef521916e55f257e4b166df8ddffcf14c9c35b49410a79491f197b4aef5
-EBUILD khotkeys-5.20.5.ebuild 1403 BLAKE2B 38399ad2dab11d01440e70a695d87252cebba536ac1d839b6716cd75d334663a2e0291970eb11a5ab9f850578aae65e2c894cd7f2dfb1d076b25f2d03b937982 SHA512 acace4a1d436a6b976909b4358e6f8e94bb4ff85983af66f631fafbfc602c018ba99d6517421a76a69375e1469ce0b1e9c053b269151af1a9b161d16a05a79e9
-EBUILD khotkeys-5.21.5.ebuild 1349 BLAKE2B 44f45d12ecbc77b5334007c0fec67393b6dace0eee0044d4bd1026735ab463c7759ec1d841d8d631beccd829680c6a85b5a47073c6d4d36feceb6795193901c5 SHA512 5792e75e05382883b6c1055448d8dbddd76d9316ed521fceb8dce8e05ee3f61396c1e2d3f9408af4a2a141ee307532cf5be5e14d3bff37005e75543b456f1b3c
+DIST khotkeys-5.22.0.tar.xz 1858420 BLAKE2B cf0d244a12d113f733c261691b1fd1f4997d44ed5bcab00818723956998ab5516c7d800eaa9d7048ea48fbddd667b646adf1ddfbf340f0d131d278de5a8f65e3 SHA512 722e6d67cd1c131c1ee56dd348e4305ae6d8a408ddbaf188bcbccbb5107a6c9e64cf93605165613b2830cfbeb5d0396c9987901bf029fa36f63a47d60b28ae24
+EBUILD khotkeys-5.21.5.ebuild 1346 BLAKE2B 98d708e9f0834e4a4572ecb4a13deb8ae3819bb25aae2191ebd12e6207c30f6404b9c1afd7b34592a96c2be5b8c2c166b7b74008a6df62419ba44fff535c5881 SHA512 de5172eb39e2d1da905fa46ffe4553efa11cff52b05f14b2842d2ff82a2daabcb76ab715ac1439497a24da9d9af23a2025b284f1ca0962000c3d921b029f9d1d
+EBUILD khotkeys-5.22.0.ebuild 1349 BLAKE2B 44f45d12ecbc77b5334007c0fec67393b6dace0eee0044d4bd1026735ab463c7759ec1d841d8d631beccd829680c6a85b5a47073c6d4d36feceb6795193901c5 SHA512 5792e75e05382883b6c1055448d8dbddd76d9316ed521fceb8dce8e05ee3f61396c1e2d3f9408af4a2a141ee307532cf5be5e14d3bff37005e75543b456f1b3c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/khotkeys/files/khotkeys-5.20.4-unused-dep.patch b/kde-plasma/khotkeys/files/khotkeys-5.20.4-unused-dep.patch
deleted file mode 100644
index 6d39c5465791..000000000000
--- a/kde-plasma/khotkeys/files/khotkeys-5.20.4-unused-dep.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 5f622844605a569eec776f3cdd0954ccefd8c99b Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Sun, 29 Nov 2020 11:55:10 +0100
-Subject: [PATCH] Drop unused KF5Plasma dependency
-
-This had been already dropped in commit 1d60f46f, which was reverted in
-commit 8ba8a29c. At least that part of it was correct though.
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMakeLists.txt | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a945dee..b49bff1 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -32,7 +32,6 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
-     KDELibs4Support
-     DBusAddons
-     KCMUtils
--    Plasma
- )
- 
- find_package(X11 REQUIRED OPTIONAL_COMPONENTS Xtst)
--- 
-2.29.2
-
diff --git a/kde-plasma/khotkeys/khotkeys-5.21.5.ebuild b/kde-plasma/khotkeys/khotkeys-5.21.5.ebuild
index c6e7519c239a..2d31ae1ce1b2 100644
--- a/kde-plasma/khotkeys/khotkeys-5.21.5.ebuild
+++ b/kde-plasma/khotkeys/khotkeys-5.21.5.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="KDE Plasma workspace hotkey module"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-plasma/khotkeys/khotkeys-5.20.5.ebuild b/kde-plasma/khotkeys/khotkeys-5.22.0.ebuild
index be70e0fb1def..c6e7519c239a 100644
--- a/kde-plasma/khotkeys/khotkeys-5.20.5.ebuild
+++ b/kde-plasma/khotkeys/khotkeys-5.22.0.ebuild
@@ -4,16 +4,16 @@
 EAPI=7
 
 ECM_HANDBOOK="forceoptional" # not optional until !kdelibs4support
-KFMIN=5.74.0
+KFMIN=5.82.0
 PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.1
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="KDE Plasma workspace hotkey module"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 COMMON_DEPEND="
@@ -48,5 +48,3 @@ RDEPEND="${COMMON_DEPEND}
 	>=kde-frameworks/kded-${KFMIN}:5
 	>=kde-plasma/kde-cli-tools-${PVCUT}:5
 "
-
-PATCHES=( "${FILESDIR}"/${PN}-5.20.4-unused-dep.patch )