gentoo resync : 12.05.2022

4 files changed, 6 insertions, 60 deletions

diff --git a/kde-plasma/libkworkspace/Manifest b/kde-plasma/libkworkspace/Manifest
index a224b4600113..37c188048484 100644
--- a/kde-plasma/libkworkspace/Manifest
+++ b/kde-plasma/libkworkspace/Manifest
@@ -1,7 +1,6 @@
 AUX libkworkspace-5.22.80-standalone.patch 4984 BLAKE2B e0f5c36ab657600326d0cbd29fe51c5ac6cf264caa7ec4c04473a2c5bf88113d8496b45618db103dd2e078efc1350b9fc613b25aeaa58bf0957d22ca4d37e5a0 SHA512 20c790d4860aec20b415c5c236537a5d8caf5666432c513adda0782694548320dc918c0d093ee0b716943df1fdab56c03a56f18ec691b0fc517443c35d0335ff
-AUX libkworkspace-5.23.3-synchronous-dbus-calls.patch 1532 BLAKE2B ac54ae6e42b9e20633b33d3f42e00b184f0d65fa57ffffab7695a1463631b7f577a25722d8c3dcc51bfd55023cf30d22d1a73eb1f9c065a3800a81d6ecf27569 SHA512 927ab4b0641285094b6599384012a629b27ec596291c124b3dc01176dfb781b0b551b920d651738b518dba4f0b71426d671f8d977856c6c12221e3e6cb57f3d9
-DIST plasma-workspace-5.23.5.tar.xz 9010724 BLAKE2B 215b862bcf31c4cadc381f80edbc28f6f63d73066dcb43200b1527a07312bda2721ed1cee700d009f4c67add01a1546a7b0cbae944b28dd3ad22e5ae29212bc5 SHA512 5f55137a1c0949ea65e61d8bbf5476a7ba56ef5afd721945c42817030d1c519ada86442426a4eda0dca164cd6676534f710ddc588c319f849415224b6c953099
 DIST plasma-workspace-5.24.4.tar.xz 18488324 BLAKE2B 140540a95360bc1c9ce1940ca03267bfe8c5d59a378b09a5c2abfed9ad8f8af89558c616465363f27a42a730025c081092f00dd0eb776cb7ee53a0aeff1b3881 SHA512 6c917d3ea307bca85e6ca12294357410c3442a9115a4864311df87af29919c20d8dab768f470379bbc4e0510367319a6cf8ce045ab7254db06e8c29477370d89
-EBUILD libkworkspace-5.23.5.ebuild 1487 BLAKE2B 9dae732b433c82d2bd382c293c3941f071f7aac49148edd6adb408b74c69c5abda6e5c6c4628be4121acce550731fe3893cdf2b2f574bc91e5e0cd964cdda626 SHA512 a0cac32262e07d59bfb05695cdc5b7a59b68df2ede7e6585633551e2d35e92900564e51e6eebd2a472142c41af0bcf119acd2dfbee19dc9f79efa18e0e0b540b
-EBUILD libkworkspace-5.24.4.ebuild 1326 BLAKE2B cb4ff766c38da76d2911d83742d71c8374e6f1330a4729c708423b1ff14a25b5f0c87a9f31fda7354382d4522a8437a8c921f62e7bc8a3438c676f1977124e0c SHA512 cda025d5ee5821c0f4322471c6cc941679f72659a46a1b0c0190ea0c7c3c2c6bd844ea7e706e63090596dfbcedb903ff23fd0f4a52ec94773dd2218cc15b4570
+DIST plasma-workspace-5.24.5.tar.xz 18490588 BLAKE2B 5a9681620f40604f631cd7ef0c9d6256cc490436dc5e29ef9434d0f129324c2d405c5647da12778c208976c0cb0b4da698a90a22b70c1cb2723cbc58f69bda1d SHA512 ae40fe545b03e42e9f8fe2e8885d3853f4b52d4fd2ed3ecf7d24fa59b4924b8f8b389e8713ec6a3a875bc66df3952de9157d4a5631b283105a9329a1a1825996
+EBUILD libkworkspace-5.24.4.ebuild 1323 BLAKE2B d9ab9b5cfc16e0bf7cd166e397a8d2cc7943da467bcca451ca51575a9615c028fe29ca8c2ecc340c5a7b364addc7e26749da9434e919a9e21cc9f818885e7108 SHA512 c3b583cabc1e62bee0f9c4cd8476d3ab523f4566ec3412035eb429a54b91479b953287e65f1d0203c4d77b2feb2400697d0f7b5333e2f2e7231a72dc652c16f4
+EBUILD libkworkspace-5.24.5.ebuild 1326 BLAKE2B cb4ff766c38da76d2911d83742d71c8374e6f1330a4729c708423b1ff14a25b5f0c87a9f31fda7354382d4522a8437a8c921f62e7bc8a3438c676f1977124e0c SHA512 cda025d5ee5821c0f4322471c6cc941679f72659a46a1b0c0190ea0c7c3c2c6bd844ea7e706e63090596dfbcedb903ff23fd0f4a52ec94773dd2218cc15b4570
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/libkworkspace/files/libkworkspace-5.23.3-synchronous-dbus-calls.patch b/kde-plasma/libkworkspace/files/libkworkspace-5.23.3-synchronous-dbus-calls.patch
deleted file mode 100644
index 411bebf70412..000000000000
--- a/kde-plasma/libkworkspace/files/libkworkspace-5.23.3-synchronous-dbus-calls.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 9ecd45f28dc5c3a4b1716d09e0ba121ec5fb2a50 Mon Sep 17 00:00:00 2001
-From: Joe Breuer <kde@jmbreuer.net>
-Date: Mon, 1 Nov 2021 07:19:51 +0000
-Subject: [PATCH] Fix sleep/suspend sometimes not working ... from
- ksmserver-logout-greeter, by making the DBus calls synchronous.
-
----
- libkworkspace/sessionmanagementbackend.cpp | 9 +++++----
- 1 file changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/sessionmanagementbackend.cpp b/sessionmanagementbackend.cpp
-index 83cd39395..a77a8a475 100644
---- a/sessionmanagementbackend.cpp
-+++ b/sessionmanagementbackend.cpp
-@@ -137,7 +137,6 @@ void LogindSessionBackend::shutdown()
- {
-     // logind will confirm credentials with the caller, if the app quits after sending this
-     // this may fail
--    // its not really needed for suspend tasks where the calling app won't be closing
-     m_login1->PowerOff(true).waitForFinished();
- }
- 
-@@ -148,17 +147,19 @@ void LogindSessionBackend::reboot()
- 
- void LogindSessionBackend::suspend()
- {
--    m_login1->Suspend(true);
-+    // these need to be synchronous as well - ksmserver-logout-greeter specifically calls these
-+    // and will quit immediately after
-+    m_login1->Suspend(true).waitForFinished();
- }
- 
- void LogindSessionBackend::hybridSuspend()
- {
--    m_login1->HybridSleep(true);
-+    m_login1->HybridSleep(true).waitForFinished();
- }
- 
- void LogindSessionBackend::hibernate()
- {
--    m_login1->Hibernate(true);
-+    m_login1->Hibernate(true).waitForFinished();;
- }
- 
- bool LogindSessionBackend::canShutdown() const
--- 
-GitLab
-
diff --git a/kde-plasma/libkworkspace/libkworkspace-5.24.4.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.24.4.ebuild
index 7b3149edc1d7..14acef8df3b4 100644
--- a/kde-plasma/libkworkspace/libkworkspace-5.24.4.ebuild
+++ b/kde-plasma/libkworkspace/libkworkspace-5.24.4.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Workspace library to interact with the Plasma session manager"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-plasma/libkworkspace/libkworkspace-5.23.5.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.24.5.ebuild
index b98c065c49a8..7b3149edc1d7 100644
--- a/kde-plasma/libkworkspace/libkworkspace-5.23.5.ebuild
+++ b/kde-plasma/libkworkspace/libkworkspace-5.24.5.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 ECM_TEST="true"
 KDE_ORG_NAME="plasma-workspace"
-KFMIN=5.86.0
+KFMIN=5.90.0
 PVCUT=$(ver_cut 1-3)
 QTMIN=5.15.2
 inherit ecm kde.org
@@ -14,7 +14,7 @@ DESCRIPTION="Workspace library to interact with the Plasma session manager"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND="
@@ -37,11 +37,6 @@ DEPEND="${RDEPEND}
 
 S="${S}/${PN}"
 
-PATCHES=(
-	# Pending: https://invent.kde.org/plasma/plasma-workspace/-/merge_requests/1164
-	"${FILESDIR}"/${PN}-5.23.3-synchronous-dbus-calls.patch # bug 818124
-)
-
 src_prepare() {
 	# delete colliding libkworkspace translations, let ecm_src_prepare do its magic
 	if [[ ${KDE_BUILD_TYPE} = release ]]; then