gentoo resync : 02.02.2022

7 files changed, 18 insertions, 121 deletions

diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest
index 7108e0909129..d907cfae7f9c 100644
--- a/kde-plasma/plasma-workspace/Manifest
+++ b/kde-plasma/plasma-workspace/Manifest
@@ -2,11 +2,8 @@ AUX 10-agent-shutdown.sh 398 BLAKE2B f6c06021040aee856421ba536b96b81f119153f099c
 AUX 10-agent-startup.sh 2139 BLAKE2B 7ea9ee0e6d949eecbdfbc41bd0286919094b6d6837e4c7a6ba1a8d223e890ca2287f9c842019e04ead5015840d6d2f9b9d89320a7b0f6c20197b1d90d56506b4 SHA512 718feed12544deb1750730bebf1d618cbccdec9a4815a28b9f17278fdc9c21466b098778b9a20785625b99b5eb930049a84a67a0c033b684610ec8eb5b5ec678
 AUX plasma-workspace-5.21.5-split-libkworkspace.patch 1154 BLAKE2B d37f649971b95c3fd99c551ec7512054460d8ba04c265e56c2ee53d968c7885929724c81df2895eeae8609a5a0a4c28839461429579f56bcbde4dcaa5646e15b SHA512 c41d2c56170914a309c9765a58a6cccaf4a9afae937ce762387590f3b2ccf59969b5873f702986369c4c3118c74d314f8b68916bfabce5e7379b3cb27daebb50
 AUX plasma-workspace-5.22.5-krunner-cwd-at-home.patch 804 BLAKE2B 4bb337ea04037f8992988b70a40896166a2e10b2b557fa5518e3c2bd7129a221fe2efe064465cbffcc3db4abebb13d354599f44884eaf8c1bc029646280921bb SHA512 e49635bbb42c1beeaa9eee6a803f8c96497bc6e768a72d93886281edec922cb641a373fc0a1a482cedb36bd1f400f77b0030247f621373ebc141760a97ef5bbd
-AUX plasma-workspace-5.23.4-fix-klipper-actions-content-truncation.patch 1048 BLAKE2B 23649837c3d0c62bd4476b79856bf5f7c7770ada3b0286f2fd1e3aed576ea7de2ac23c7e0837876026be74b0405f24449bd9c1e00ec0d90c287e9fc79406032c SHA512 75a2f98f609eb37ee56d5c2afbf7ba3ce8ffc6480efd0af9c8f4197dbfab51a3b0a4af328ca28e42d866365949b75d130a8abb08a68544ed08a37d7f0a4d4e34
-AUX plasma-workspace-5.23.4-fix-klipper-use-full-text.patch 1039 BLAKE2B ed5a04d66a276c626cb976560f02af7da653b052ea10aa69ba7e6f5542e16abfeaacf930bc7a7761ff73c05ae8afbc6aa162a091923e4ec44abbc3464b31c584 SHA512 5c76b4c50053c2f570d9fa5b8d465432dcec61a8f9e85643c36c16c4bb24be940ea47968e5aa6347e240e8a91d884f37f3cc2f3d56700e5e4de51b5065772b5d
-AUX plasma-workspace-5.23.4-fix-systemsettings-crash.patch 1343 BLAKE2B 5c88d61f01447b7b3dcbf34f84817fd86a1bc0e3fb57618b6b98b6a6307d245b30878dec1297fc48e413e7d3e178a1e07137abd18388c03eba64a1ea46880906 SHA512 b959d01dcf51ac542336a888a7a81e30e5a22c6ed2612a56fbf6411705945d4d83cc51e09713a3c0b41979971cd4b95d520c6276412c32c8648e100f8c654d61
-DIST plasma-workspace-5.23.4.tar.xz 9012468 BLAKE2B 491c211bbfdecb1a4e7adb15647c6f9d7d2ded3314ddef855b79b4a222e1bedb4ac88b8a380d66ea296b6696248d67d0ce4757853d01300abdfbe85394936abe SHA512 730e8a69e5dc2e22db1356832aa2adc9255de179ed139c0abe06ad6b44dd0cffb8f214b32eb1f882eb73c337f44e16f64873789130939e25b2b8bab23d2dcfc2
 DIST plasma-workspace-5.23.5.tar.xz 9010724 BLAKE2B 215b862bcf31c4cadc381f80edbc28f6f63d73066dcb43200b1527a07312bda2721ed1cee700d009f4c67add01a1546a7b0cbae944b28dd3ad22e5ae29212bc5 SHA512 5f55137a1c0949ea65e61d8bbf5476a7ba56ef5afd721945c42817030d1c519ada86442426a4eda0dca164cd6676534f710ddc588c319f849415224b6c953099
-EBUILD plasma-workspace-5.23.4-r1.ebuild 6540 BLAKE2B b7c00eac76e94a2232b15ac791e92a6786e284830f780e1ef078b3a11798fbb8aff98c39520fbbdfb69b90dcb5555b10ec9ff081f116ee793ecda3f92e2a95a8 SHA512 702f20dcdf6be4b257c59a2694f41f2d23145786c7724bbf3e6dc87547117d29c481aeb8c8ebf4333d417a8a199e12428053f0f84b7dff4c1cb1c6ab04000743
-EBUILD plasma-workspace-5.23.5.ebuild 6309 BLAKE2B 901e46c4debe5600d7eb7bc5fe19b897273eb744cc4f144eadb74dcba07d7b06cbcccedaedbe3055403469b02aa6dec0b8794bf4a8abfd1508e7bc3fed39b64d SHA512 6bb8e07f61ca5070f508341058183198fe9786f490881314ef3240df666ea830b0b836be8ecd129aab07a16f9d09c14179f6b17c016f3e44b96744006efa831b
-MISC metadata.xml 794 BLAKE2B 9347a321add3734ec04c45476253f76cb4bb0de8a91227733743c5a971a69e3bd9e6ecc8e0052a46c7a6955cc1da749332a5c009b3bfd424d66b130c076c0d9d SHA512 53a4f25ba06997c1dd082837b400e37fed6350ef60938cfddc4c89f4b9001f28c23e18ce68887c124149c998268867e23d35c0435118e429c1e77eaebb792829
+DIST plasma-workspace-5.23.90.tar.xz 18479952 BLAKE2B cb7a6115230c27504a8c9b6439362baaacd70706bc76533c32d9c793bdae3d504b645ba2b6172254d81224d02c29468278cf1d9939a636cf3990633b118f45f1 SHA512 521f6a33649549af9a15c55c1143b364fa0d094ee1265f8a9d113e8f1730fb766a31aa60a10aab35bd07b2e669b8390e426ab0aeb7ba2313c05bb2c983b21cf5
+EBUILD plasma-workspace-5.23.5.ebuild 6306 BLAKE2B ea02a5714aee6588112e5d6857068b99d27b17cddef7d8bc039629c22c3adef3f410cca0603930a2bbec0e3cc8f5da0f34f5ddc27a70d561610ff35e7a73f4cf SHA512 b0ea8deac9d2ef8cb7c27fb689d9abe81c88053c2554626137f5325c87596d2434c419b7399230e92ee85091c3661980251fa1ac1f050e1869df5344f75203b0
+EBUILD plasma-workspace-5.23.90.ebuild 6317 BLAKE2B e84950332e0e415ccca4d3e1343075f8de49374a3154993e3a22830e7a01f69813bf44395ff5e41fc21df64cd0601af13f2bfb5347631cf702feeef1e4366b9e SHA512 1e6018e7727d090e1235345e38f715c37252a01645291cf3e0e2c94cc4532864c598641842c6639045378da82b0f40f70819c63c3a36ecf7f8730a869660e6b1
+MISC metadata.xml 919 BLAKE2B f8ac08e31ccc060e3cc16370cc23258f49957e2a026905baa85669a46e673c83370486e2e06b0796c7385d92904cf078be73cffa934dd7188c9b231338f64093 SHA512 16c0b3e0ea50e6c145da3993cce54f99c4cea79846d3c7da5326f1d754aac27c62db8e670d449e8bcdd9057a03a846fbf40f811ae96a11c1feff484af990dba4
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.4-fix-klipper-actions-content-truncation.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.4-fix-klipper-actions-content-truncation.patch
deleted file mode 100644
index 1153c9f006f1..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.4-fix-klipper-actions-content-truncation.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From beb34e3d9781c7728260d486a835c52be21a6d83 Mon Sep 17 00:00:00 2001
-From: ValdikSS ValdikSS <iam@valdikss.org.ru>
-Date: Sun, 5 Dec 2021 15:46:00 +0300
-Subject: [PATCH] Fix Klipper Actions content truncation
-
-Commit f9669af2 introduced a regression with Klipper Actions: it used
-truncated text as a source for the action, which resulted in truncated
-output.
-
-BUG: 444365
-
-
-(cherry picked from commit 49365857623f7e986013bee7d3160594d2272fe2)
----
- klipper/urlgrabber.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/klipper/urlgrabber.cpp b/klipper/urlgrabber.cpp
-index fb7c0d0a2..185a6a5d6 100644
---- a/klipper/urlgrabber.cpp
-+++ b/klipper/urlgrabber.cpp
-@@ -245,7 +245,7 @@ void URLGrabber::execute(const ClipAction *action, int cmdIdx) const
-     ClipCommand command = action->command(cmdIdx);
- 
-     if (command.isEnabled) {
--        QString text(m_myClipItem->text());
-+        QString text(m_myClipItem->mimeData()->text());
-         if (m_stripWhiteSpace) {
-             text = text.trimmed();
-         }
--- 
-GitLab
-
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.4-fix-klipper-use-full-text.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.4-fix-klipper-use-full-text.patch
deleted file mode 100644
index 29640f8262e6..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.4-fix-klipper-use-full-text.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From c8b8c8dd389ae381831fdd23f354617f48f3edd4 Mon Sep 17 00:00:00 2001
-From: David Edmundson <kde@davidedmundson.co.uk>
-Date: Sun, 5 Dec 2021 08:26:45 +0000
-Subject: [PATCH] [klipper] Use full text for DBus return values
-
-In a recent commit HistoryItem::text() became the visual representation
-of the mimedata; often a truncated string.
-
-mimeData()->text() always returns the full value.
-
-BUG: 446441
-
-
-(cherry picked from commit 2db375f6a71cb730e1e099f9ff17ef7092850d9d)
----
- klipper/klipper.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/klipper/klipper.cpp b/klipper/klipper.cpp
-index b090a2409..3b12d1f95 100644
---- a/klipper/klipper.cpp
-+++ b/klipper/klipper.cpp
-@@ -838,7 +838,7 @@ QString Klipper::getClipboardHistoryItem(int i)
-     if (item) {
-         do {
-             if (i-- == 0) {
--                return item->text();
-+                return item->mimeData()->text();
-             }
-             item = history()->find(item->next_uuid());
-         } while (item != history()->first());
--- 
-GitLab
-
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.4-fix-systemsettings-crash.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.4-fix-systemsettings-crash.patch
deleted file mode 100644
index d46f33486785..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.4-fix-systemsettings-crash.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From a8b613505e326dd047707e0a0e4d6f5ecc4a9baa Mon Sep 17 00:00:00 2001
-From: Alexander Lohnau <alexander.lohnau@gmx.de>
-Date: Wed, 8 Dec 2021 18:25:36 +0100
-Subject: [PATCH] lookandfeel: Add missing check if list of files is empty
-
-BUG: 439797
-
-
-(cherry picked from commit d168d2a50366c528dab65415cd4f6e82afdfb645)
----
- kcms/lookandfeel/kcm.cpp | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/kcms/lookandfeel/kcm.cpp b/kcms/lookandfeel/kcm.cpp
-index 75ce19197..349761aad 100644
---- a/kcms/lookandfeel/kcm.cpp
-+++ b/kcms/lookandfeel/kcm.cpp
-@@ -123,7 +123,9 @@ void KCMLookandFeel::knsEntryChanged(KNSCore::EntryWrapper *wrapper)
-     if (entry.status() == KNS3::Entry::Deleted && !entry.uninstalledFiles().isEmpty()) {
-         removeItemFromModel();
-     } else if (entry.status() == KNS3::Entry::Installed && !entry.installedFiles().isEmpty()) {
--        removeItemFromModel(); // In case we updated it we don't want to have it in twice
-+        if (!entry.uninstalledFiles().isEmpty()) {
-+            removeItemFromModel(); // In case we updated it we don't want to have it in twice
-+        }
-         KPackage::Package pkg = KPackage::PackageLoader::self()->loadPackage(QStringLiteral("Plasma/LookAndFeel"));
-         pkg.setPath(entry.installedFiles().constFirst());
-         addKPackageToModel(pkg);
--- 
-GitLab
-
diff --git a/kde-plasma/plasma-workspace/metadata.xml b/kde-plasma/plasma-workspace/metadata.xml
index 835e52229949..0af150c3e6df 100644
--- a/kde-plasma/plasma-workspace/metadata.xml
+++ b/kde-plasma/plasma-workspace/metadata.xml
@@ -12,6 +12,7 @@
 		<flag name="appstream">Enable AppStream software metadata support</flag>
 		<flag name="calculator">Enable calculator runner using <pkg>sci-libs/libqalculate</pkg></flag>
 		<flag name="geolocation">Enables dataengine providing location information</flag>
+		<flag name="policykit">Build the Users KCM using <pkg>sys-apps/accountsservice</pkg> and <pkg>sys-auth/polkit</pkg></flag>
 		<flag name="screencast">Enable screencast portal using <pkg>media-video/pipewire</pkg></flag>
 		<flag name="telemetry">Enable User Feedback control module for <pkg>kde-plasma/systemsettings</pkg></flag>
 	</use>
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.23.5.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.23.5.ebuild
index 0735907874df..204a23153bd8 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.23.5.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.23.5.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="KDE Plasma workspace"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE="appstream +calculator +calendar +fontconfig geolocation gps screencast
 +semantic-desktop telemetry"
 
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.23.4-r1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.23.90.ebuild
index e2c646f9117d..dbfb0482e579 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.23.4-r1.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.23.90.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="forceoptional"
-KFMIN=5.86.0
+KFMIN=5.90.0
 PVCUT=$(ver_cut 1-3)
 QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
@@ -15,9 +15,9 @@ DESCRIPTION="KDE Plasma workspace"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE="appstream +calculator +calendar +fontconfig geolocation gps screencast
-+semantic-desktop telemetry"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="appstream +calendar +fontconfig geolocation gps +policykit
+screencast +semantic-desktop telemetry"
 
 REQUIRED_USE="gps? ( geolocation )"
 RESTRICT="test"
@@ -84,6 +84,7 @@ COMMON_DEPEND="
 	>=kde-plasma/libksysguard-${PVCUT}:5
 	>=kde-plasma/libkworkspace-${PVCUT}:5
 	>=media-libs/phonon-4.11.0
+	sci-libs/libqalculate:=
 	sys-libs/zlib
 	x11-libs/libICE
 	x11-libs/libSM
@@ -97,7 +98,6 @@ COMMON_DEPEND="
 	x11-libs/xcb-util
 	x11-libs/xcb-util-image
 	appstream? ( dev-libs/appstream[qt5] )
-	calculator? ( sci-libs/libqalculate:= )
 	calendar? ( >=kde-frameworks/kholidays-${KFMIN}:5 )
 	fontconfig? (
 		>=dev-qt/qtprintsupport-${QTMIN}:5
@@ -117,7 +117,7 @@ COMMON_DEPEND="
 	telemetry? ( dev-libs/kuserfeedback:5 )
 "
 DEPEND="${COMMON_DEPEND}
-	>=dev-libs/plasma-wayland-protocols-1.1.1
+	>=dev-libs/plasma-wayland-protocols-1.6.0
 	>=dev-qt/qtconcurrent-${QTMIN}:5
 	>=dev-util/wayland-scanner-1.19.0
 	x11-base/xorg-proto
@@ -142,7 +142,8 @@ RDEPEND="${COMMON_DEPEND}
 	x11-apps/xrdb
 	x11-apps/xsetroot
 	!<kde-plasma/breeze-5.22.90:5
-	!<kde-plasma/plasma-desktop-5.21.90:5
+	!<kde-plasma/plasma-desktop-5.23.90:5
+	policykit? ( sys-apps/accountsservice )
 "
 BDEPEND="virtual/pkgconfig"
 PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5"
@@ -150,10 +151,6 @@ PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5"
 PATCHES=(
 	"${FILESDIR}/${PN}-5.21.5-split-libkworkspace.patch" # downstream
 	"${FILESDIR}/${PN}-5.22.5-krunner-cwd-at-home.patch" # TODO upstream: KDE-bug 432975, bug 767478
-	# 5.23 branch
-	"${FILESDIR}"/${P}-fix-klipper-use-full-text.patch # KDE-bug 446441
-	"${FILESDIR}"/${P}-fix-klipper-actions-content-truncation.patch # KDE-bug 444365
-	"${FILESDIR}"/${P}-fix-systemsettings-crash.patch # KDE-bug 439797
 )
 
 src_prepare() {
@@ -170,9 +167,9 @@ src_prepare() {
 		sed -e "s/^pkg_check_modules.*PipeWire/#&/" -i CMakeLists.txt || die
 	fi
 
-	# KDE-bug: 433730
-	use calculator ||
-		cmake_run_in runners cmake_comment_add_subdirectory calculator
+	if ! use policykit; then
+		cmake_run_in kcms cmake_comment_add_subdirectory users
+	fi
 }
 
 src_configure() {