gentoo resync : 15.06.2021

4 files changed, 40 insertions, 8 deletions

diff --git a/kde-plasma/plasma-nm/Manifest b/kde-plasma/plasma-nm/Manifest
index 5a985297a95a..f5b9dfba0636 100644
--- a/kde-plasma/plasma-nm/Manifest
+++ b/kde-plasma/plasma-nm/Manifest
@@ -1,6 +1,7 @@
 AUX plasma-nm-5.21.5-missing-include.patch 930 BLAKE2B e73b80967df714f8b9a5afbddef8e5951d02c553b70d2b7a40f7162db5fdf2ab16930ceef649818fc3afa658989eb6caf6e0f4eb91476aa88581307545f1740e SHA512 2f67d123a5280303ddd8c904828da6c2b8aa6b8c6fb06853d55d47050255d154b5731703c70208802ced0e03ffdbe85d292636cb686f0f70777903c7c5bc1ed2
-DIST plasma-nm-5.20.5.tar.xz 865364 BLAKE2B 3a316674e9c9bbe7df09c34610f117bbacfa60515e93077103a7956aa1999cc8bef7e4e5add53d3ccb847557c7fadf17ab23d82e392e1b2822cecb9dc33598bb SHA512 6413dcbc6b8723384ecc6897331947343f399bedba6aff9148bc34485b54c5fd6a91b77d63390b0c398c8bcad8151de3f1746c71f3cfae9476632e2386ab6ff7
+AUX plasma-nm-5.22.0-qt-5.15.2ff-missing-include.patch 871 BLAKE2B 6d65acc1f5ec663529abba3ab69c9705b81553b229c73f535563fcc8c64331a880b600d892675e23f6517b72c02ae64550ca5b0fbf3eae13a43fbbdb06739a65 SHA512 9421f54bccc1e6c6489bf002331d0b4c1e8b3fe259baa14928596caec82652e3b5ba0cfab8ef640bbce4be7438e3c48963716c477f259bf8024c9deac0ad2f50
 DIST plasma-nm-5.21.5.tar.xz 902104 BLAKE2B 8b881f39e01b7de0107b897c81fffb7bfa429a0bd7d8eb58026328ac42c411d5dd8e154e843767098731174a492e64b6c8a28c8af474584862f58081d9a5e751 SHA512 ac074e50d5ee3be99bab515b02522e391b14936c1c8152ca067c7513af7a8e8b81cb55ab9b412ca703554f3e35fc9392368159c9872d8c372017089a4a65e3fa
-EBUILD plasma-nm-5.20.5.ebuild 2320 BLAKE2B aced27381cb8b277a01c3d4b3799cc51fc8936d867bc82112fe5511ac5cda11ef1a52bb76122974345c21449218d4185d461979a670898ccb3191903e683a7e7 SHA512 364e2fd1608293b335445c867a1f7b20d652127cb81fd6fd353f575058ab70271113765a09b99c7355662e63946aa205b4532b7a4b2a37d1cb6655956a7b48a0
-EBUILD plasma-nm-5.21.5.ebuild 2336 BLAKE2B dc9e3466e4fb1e67fa12af3139d14182e3b588a083417b1c1391b7cbddc4e8e87a25b2df69b54e63cd642a6754e77fa511068d780e7c45c9ff1e9d152a3509c2 SHA512 998385241a12e7f8e8b7e81885a4e433e574449d6ab07c47db847a273d161e2ebdb808ee6c7e88c695ad38463592d4cd9602819fef56c66ef6021366f55909f7
+DIST plasma-nm-5.22.0.tar.xz 899628 BLAKE2B 6b6f25a09d27ebf60ac8fb91191bbef258b857e0b4ecb0cb74b4ff9bd458350ac82b3d166f31a938058f09e9a0b2d5df245839d70cc9d6c3449df8e1d13dccc1 SHA512 5fea3c71bba5481b363abba0ced6a546a3384225f57166c4fcba9f370f89f3a3b0bb98320239e61733c496ed17230fa38b0bcaeae927206f113976467f116a43
+EBUILD plasma-nm-5.21.5.ebuild 2333 BLAKE2B 79c1df7a5e2f57323c73e9ea432093a05918f93956ad4ff3b13d308d04f62648ae8a34f8884fef890a786ba2183134eb4667e8e2ef979b51488bbadff4823b48 SHA512 04a6eb5b20bab5ee3372f2b0cc9d0ba21731119e70704ffc6cc6865af3ddef64621a69f49e25f0d01961511c9d4fde86e4501e35ebc4f612fbdd842051c6a7e1
+EBUILD plasma-nm-5.22.0.ebuild 2348 BLAKE2B 7357aa88f5f050c468eaecf1bb468944b34abe770c1f2c3c41afc8167ac1be1f9f9640d4106007021b791bd22107d1846633930f1fcb21684d1a0f7d6cef50f7 SHA512 be2e6494a282c5e20840c65a948ac4b1316e79c0f843e8b47711e1bc4e6d82eee90e93009d8f52df397b17c84f3f298e90b63f31a0119334cdc6ca8a011a44c8
 MISC metadata.xml 479 BLAKE2B 501f2ff581390f3119e9474e1aeafb45f2e13f3cf25650482f39ab38c7fb0e70ac006f269693ef546ef324730f302c454d27d79f0346e43b6f37583ccad1ca93 SHA512 69a8ce09c5a437814562c315dc7ac3142ac6c71906f37a6ea98e7b76fdd332362cfa76e823d0ee1ec920e92c8f7dda2a557071c758e9937886d7df78943b5689
diff --git a/kde-plasma/plasma-nm/files/plasma-nm-5.22.0-qt-5.15.2ff-missing-include.patch b/kde-plasma/plasma-nm/files/plasma-nm-5.22.0-qt-5.15.2ff-missing-include.patch
new file mode 100644
index 000000000000..133b3e225c54
--- /dev/null
+++ b/kde-plasma/plasma-nm/files/plasma-nm-5.22.0-qt-5.15.2ff-missing-include.patch
@@ -0,0 +1,30 @@
+From 55ab9bfd83fb74d14e26cc1a3d8f257bc47c45ea Mon Sep 17 00:00:00 2001
+From: Heiko Becker <heiko.becker@kde.org>
+Date: Sun, 6 Jun 2021 19:34:16 +0200
+Subject: [PATCH] Add missing QFile include
+
+Used since 40d056195bc400bc4e249cd152993000011687c2. I suppose it's
+implicitly pulled in some cases, but for me the build fails against
+Qt from KDE's patch collection with "libs/handler.cpp:704:5: error:
+'QFile' was not declared in this scope;".
+
+(cherry picked from commit 6cac88b61da1277dcb9a801e47f2d69829c68086)
+---
+ libs/handler.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/libs/handler.cpp b/libs/handler.cpp
+index 470b0fc1..7c8302be 100644
+--- a/libs/handler.cpp
++++ b/libs/handler.cpp
+@@ -45,6 +45,7 @@
+ #include <QDBusError>
+ #include <QDBusMetaType>
+ #include <QDBusPendingReply>
++#include <QFile>
+ #include <QIcon>
+ 
+ #include <KNotification>
+-- 
+GitLab
+
diff --git a/kde-plasma/plasma-nm/plasma-nm-5.21.5.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.21.5.ebuild
index a24d6cab271b..8e934494dfe4 100644
--- a/kde-plasma/plasma-nm/plasma-nm-5.21.5.ebuild
+++ b/kde-plasma/plasma-nm/plasma-nm-5.21.5.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="KDE Plasma applet for NetworkManager"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="modemmanager openconnect teamd"
 
 DEPEND="
diff --git a/kde-plasma/plasma-nm/plasma-nm-5.20.5.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.22.0.ebuild
index 856dae591577..c33df322fdf5 100644
--- a/kde-plasma/plasma-nm/plasma-nm-5.20.5.ebuild
+++ b/kde-plasma/plasma-nm/plasma-nm-5.22.0.ebuild
@@ -4,16 +4,16 @@
 EAPI=7
 
 ECM_TEST="true"
-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 applet for NetworkManager"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="modemmanager openconnect teamd"
 
 DEPEND="
@@ -30,7 +30,6 @@ DEPEND="
 	>=kde-frameworks/kdbusaddons-${KFMIN}:5
 	>=kde-frameworks/kdeclarative-${KFMIN}:5
 	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
 	>=kde-frameworks/kio-${KFMIN}:5
 	>=kde-frameworks/kitemviews-${KFMIN}:5
 	>=kde-frameworks/knotifications-${KFMIN}:5
@@ -61,6 +60,8 @@ RDEPEND="${DEPEND}
 	>=kde-plasma/kde-cli-tools-${PVCUT}:5
 "
 
+PATCHES=( "${FILESDIR}/${P}-qt-5.15.2ff-missing-include.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		-DDISABLE_MODEMMANAGER_SUPPORT=$(usex !modemmanager)