gentoo resync : 02.02.2022

6 files changed, 8 insertions, 236 deletions

diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index 7e4d02868ba5..15dabef62e98 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -1,9 +1,6 @@
-AUX plasma-desktop-5.23.4-fix-panel-initial-sizing.patch 4777 BLAKE2B 9f085e07968f1ab8f61185b398e7b17dd155eaf00d3c03ce06593f47184277cee7beaca91635364b383af502fc88ebbfe3d460beae4ed8ee8fa5427a5ff7b014 SHA512 063486320416c80ef9df98a978ffa2caa2df45e77226a27d47586e7c25304e6aa89c3776e9954a8ee63a364065c5ce8f2208a5bc40bd9900c986eb8479ce9b8f
-AUX plasma-desktop-5.23.4-fix-touchpad-applet-popup-close-on-click.patch 1763 BLAKE2B 914ca5adea4cff6edd2d2a8884c6de355b07a681957a9dbbb7c2208c82170befb0ddb52c0e65b070aef0ddf0149e380668dd179a5886fbafe8c0b0e45619a6e5 SHA512 3d90ba82ba8825c6cd91878e0d156838ee1e9a12a65a37ef0f4ce92b6ccc9cf2ffbd7f167b58389c3d6a3997078cfd4be02d6d3a478342970290be6b9eee0e3a
-AUX plasma-desktop-5.23.4-fix-touchpad-mousearea-lookup.patch 1131 BLAKE2B 708014048f1d08bb3913f6501c32e25350a579f59f6aea7588d351647083ce67ed4ee154eb0f6aa6ae1c238c2f84124a854745313a600521799241aed244e1cc SHA512 96ac54cbf027614095734282470252c16b0f96e214b692bff2565d836ac46dd48f83430b8acb915695a4bac32ed1eb7a8a2f56c0133e097318bf9c8583b2b36f
-DIST plasma-desktop-5.23.4.tar.xz 15796556 BLAKE2B 876d308272bfd395ba3006cf70aa3bd3fc4fead5000cddf49c6be0bdfc95bb171c4dcac23636341766318d0156c7d473b9a8f5f0e37a57ea4e73b4b224b85abc SHA512 afbf8d3f7ca755ec207cda5258329b4f77dc0b26cd735eeb67e266d0937e892dc63172822792ffc7053cd52b9a34253cd4dcd1d1f52b54dd8a80f4dfa31a9f08
 DIST plasma-desktop-5.23.5.tar.xz 15794548 BLAKE2B 6e215cc5ef10598308a9fbe6c58ea67ea16ee3c3394c69bebcd1167b939e8ff1442bc839c87428cc5a57b274cc95d02983a67ab0e8fac6c27435e446f84c8630 SHA512 14cd20b24e265ef9cc4e4ebbfc743151cf5f9ba0a94fbc19e44571c7e68db61d68bab17dd1feea6f4e0844ab448110010fbfe85212b426c1e12232b73bd1c531
+DIST plasma-desktop-5.23.90.tar.xz 6223344 BLAKE2B b613a2e230603a35e076bed653963dda18aefeaa2427cfe2c7be0c3c79cfdc030e43ccb279bb270101eecb063cace0ed71a4137c5109d8e9fadfa1c0232db02c SHA512 afe4f886bd957786be2595a5937f1f394ab46e3ed96506c53f3bbb70b2f5d482815c459404fc15defb89482d161f0ce09a6956b1ec9fe3ba7d0ea326bcfff8cc
 DIST plasma-desktop-override-include-dirs-1.tar.xz 7888 BLAKE2B f1e416fa0ed27cfe6e049cafc66d1603bb4f76f0cec16dc47339a238cbb485b202adf08ececbb8933a5e1a54954cbd21653d2c9dfec27baa49fdf583acf0d75f SHA512 aa26b4966a5d00c378128ee8ee56025d637f139fcd315bf0aabefa080caecadf8cd3176dee3df87d4f8bdc48446df535260cf64a65055857fb895fa8988e1a20
-EBUILD plasma-desktop-5.23.4-r1.ebuild 5635 BLAKE2B 6230e3fe289231dab4e97408e3c49312b0d401c14fc1a2ffdb296203e9828a3b1300acaf8a344df2c6d180299521d5bb15f40fc4a01ce842c64d2518b88a5b9c SHA512 533a0a98e189457b08e960c0f7017c71595a376599cd4c03d7132a37a98b8dba3904c0defaa409910afa2f53e70c11613537694ee051aa0305b5bd71509ff3a0
-EBUILD plasma-desktop-5.23.5.ebuild 5428 BLAKE2B a77529db34d13868e15ddb5aacc783aa438a15a1649b10c3b348dcd19714f3ff518c93d46e35fd85960d272ba4967dc906cb343ab6175d405cf556ef4178c3d7 SHA512 fe812210a5fef48d612a36db31ff335d09825d8eba4b7ea863370875ed54e12769e99734a0cf4bbe68ff48c67cc205af079b54495a3cdd0eb74efa80910da05d
+EBUILD plasma-desktop-5.23.5.ebuild 5425 BLAKE2B 3345f625372e51ca02df9ad84b53f05d5cbc24ce3911e068f6642cc1fe00b2c30123d6623e21bbaf9815eac58818db636566e2e6d1ca4275af3beed6804630a7 SHA512 f454f3f02cc9bed2323697b3c9667f582adedb7abe0b6cebeaea9b94fccf02ffdfbaa27be615727a322a4f3174e146a97d1e4531109e135b8f8978b86afe2376
+EBUILD plasma-desktop-5.23.90.ebuild 5208 BLAKE2B b79fb71d47cacfa9dd1462c6f79887800efb0063a7234759cbf6766a1637e9d77ee97a3532f3275d021f4470ac46c7cfa4552112ab1be6849d5a06294054f641 SHA512 4d3017b2e53c9f0d283a25690e2ae4ac9df2d0e1f25c3e41367a2151a52d0088aa366979126dc62bd7ebb04a05b9099421edf30c841847d3339104170bf088cb
 MISC metadata.xml 807 BLAKE2B 50ef818039bb95543085a7c18aa1b60bd4a9b235380e594ff1cbef8a30c571d93de5c8e82974b03de706818bf5b01657dc8f0db12ff36e665e4aecf4b922566a SHA512 f209621d214fdfd9c6bbf2c67b8453c45a3a7d645077d7b2827021648d74c4e449b8c64d1f5ebff100bc9141f341f4ca0aa5dfc884a4081001dec30ba1b2d724
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.23.4-fix-panel-initial-sizing.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.23.4-fix-panel-initial-sizing.patch
deleted file mode 100644
index d77187409738..000000000000
--- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.23.4-fix-panel-initial-sizing.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-From 9f19af95e9699420b057b6ff7e99968faf8948a3 Mon Sep 17 00:00:00 2001
-From: David Edmundson <kde@davidedmundson.co.uk>
-Date: Fri, 3 Dec 2021 16:34:40 +0000
-Subject: [PATCH] containments/panel: Fix initial sizing
-
-Timers for anything that affect layouts are universally wrong.
-
-Ultimately this breaks layouts internal usage of QQmlParserStatus. For
-runtime changes layout internally most relayouting is buffered
-internally till the polish event which is once per frame.
-
-Removing this makes startup faster, less glitchy and more declarative.
-
-
-(cherry picked from commit b2fd1578a0063938a3eda8d8e41f14394b7635f7)
----
- containments/panel/contents/ui/main.qml | 34 ++++++-------------------
- 1 file changed, 8 insertions(+), 26 deletions(-)
-
-diff --git a/containments/panel/contents/ui/main.qml b/containments/panel/contents/ui/main.qml
-index 0a5477476..9b5656acf 100644
---- a/containments/panel/contents/ui/main.qml
-+++ b/containments/panel/contents/ui/main.qml
-@@ -154,14 +154,12 @@ function checkLastSpacer() {
- 
- //BEGIN connections
-     Component.onCompleted: {
--        currentLayout.isLayoutHorizontal = isHorizontal
-         LayoutManager.plasmoid = plasmoid;
-         LayoutManager.root = root;
-         LayoutManager.layout = currentLayout;
-         LayoutManager.lastSpacer = lastSpacer;
-         LayoutManager.marginHighlights = [];
-         LayoutManager.restore();
--        containmentSizeSyncTimer.restart();
- 
-         plasmoid.action("configure").visible = Qt.binding(function() {
-             return !plasmoid.immutable;
-@@ -200,7 +198,6 @@ function checkLastSpacer() {
-         event.accept(event.proposedAction);
-         root.fixedWidth = 0;
-         root.fixedHeight = 0;
--        containmentSizeSyncTimer.restart();
-     }
- 
- 
-@@ -215,8 +212,6 @@ function checkLastSpacer() {
-     }
- 
-     Plasmoid.onUserConfiguringChanged: {
--        containmentSizeSyncTimer.restart();
--
-         if (plasmoid.immutable) {
-             if (dragOverlay) {
-                 dragOverlay.destroy();
-@@ -245,11 +240,7 @@ function checkLastSpacer() {
-         }
-     }
- 
--    Plasmoid.onFormFactorChanged: containmentSizeSyncTimer.restart();
--    Containment.onEditModeChanged: containmentSizeSyncTimer.restart();
--
-     onToolBoxChanged: {
--        containmentSizeSyncTimer.restart();
-         if (startupTimer.running) {
-             startupTimer.restart();
-         }
-@@ -478,10 +469,16 @@ function checkLastSpacer() {
- 
-     GridLayout {
-         id: currentLayout
--        property bool isLayoutHorizontal
-+        readonly property bool isLayoutHorizontal: root.isHorizontal
-         rowSpacing: PlasmaCore.Units.smallSpacing
-         columnSpacing: PlasmaCore.Units.smallSpacing
- 
-+        x: (isLayoutHorizontal && root.toolBox && Qt.application.layoutDirection === Qt.RightToLeft && plasmoid.editMode) ? root.toolBox.width : 0;
-+        y: 0
-+
-+        width: root.width - (isLayoutHorizontal && root.toolBox && plasmoid.editMode ? root.toolBox.width : 0)
-+        height: root.height - (!isLayoutHorizontal && root.toolBox && plasmoid.editMode ? root.toolBox.height : 0)
-+
-         Layout.preferredWidth: {
-             var width = 0;
-             for (var i = 0, length = currentLayout.children.length; i < length; ++i) {
-@@ -505,36 +502,21 @@ function checkLastSpacer() {
-         rows: 1
-         columns: 1
-         //when horizontal layout top-to-bottom, this way it will obey our limit of one row and actually lay out left to right
--        flow: isHorizontal ? GridLayout.TopToBottom : GridLayout.LeftToRight
-+        flow: isLayoutHorizontal ? GridLayout.TopToBottom : GridLayout.LeftToRight
-         layoutDirection: Qt.application.layoutDirection
-     }
- 
-     onWidthChanged: {
--        containmentSizeSyncTimer.restart()
-         if (startupTimer.running) {
-             startupTimer.restart();
-         }
-     }
-     onHeightChanged: {
--        containmentSizeSyncTimer.restart()
-         if (startupTimer.running) {
-             startupTimer.restart();
-         }
-     }
- 
--    Timer {
--        id: containmentSizeSyncTimer
--        interval: 150
--        onTriggered: {
--            dndSpacer.parent = root;
--            currentLayout.x = (isHorizontal && toolBox && Qt.application.layoutDirection === Qt.RightToLeft && plasmoid.editMode) ? toolBox.width : 0;
--            currentLayout.y = 0
--            currentLayout.width = root.width - (isHorizontal && toolBox && plasmoid.editMode ? toolBox.width : 0)
--            currentLayout.height = root.height - (!isHorizontal && toolBox && plasmoid.editMode ? toolBox.height : 0)
--            currentLayout.isLayoutHorizontal = isHorizontal
--        }
--    }
--
-     //FIXME: I don't see other ways at the moment a way to see when the UI is REALLY ready
-     Timer {
-         id: startupTimer
--- 
-GitLab
-
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.23.4-fix-touchpad-applet-popup-close-on-click.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.23.4-fix-touchpad-applet-popup-close-on-click.patch
deleted file mode 100644
index 1c9a2b79e31e..000000000000
--- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.23.4-fix-touchpad-applet-popup-close-on-click.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 2131daa05195a2b55f593acf3d323cf4c2a89936 Mon Sep 17 00:00:00 2001
-From: Nate Graham <nate@kde.org>
-Date: Thu, 2 Dec 2021 20:13:46 -0700
-Subject: [PATCH] kcms/touchpad/applet: Make the popup close on click
-
-BUG: 445982
-FIXED-IN: 5.23.5
-(cherry picked from commit 4cb2de984ab79bc257af0135bf92ea7390d5617f)
----
- .../applet/qml/contents/ui/touchpad.qml       | 23 +++++++++++--------
- 1 file changed, 13 insertions(+), 10 deletions(-)
-
-diff --git a/kcms/touchpad/applet/qml/contents/ui/touchpad.qml b/kcms/touchpad/applet/qml/contents/ui/touchpad.qml
-index 3f5eb722f..106859c3a 100644
---- a/kcms/touchpad/applet/qml/contents/ui/touchpad.qml
-+++ b/kcms/touchpad/applet/qml/contents/ui/touchpad.qml
-@@ -56,20 +56,23 @@ Item {
-         connectedSources: dataSource.sources
-     }
- 
--    Plasmoid.compactRepresentation: PlasmaCore.ToolTipArea {
--        id: toolTip
-+    Plasmoid.compactRepresentation: PlasmaCore.IconItem {
-+        implicitWidth: PlasmaCore.Units.iconSizes.small
-+        implicitHeight: PlasmaCore.Units.iconSizes.small
- 
--        Layout.minimumWidth: PlasmaCore.Units.iconSizes.small
--        Layout.minimumHeight: Layout.minimumWidth
-+        source: plasmoid.icon
-+        active: parent.containsMouse
- 
--        mainText: plasmoid.title
--        subText: plasmoid.toolTipSubText
-+        PlasmaCore.ToolTipArea {
-+            mainText: plasmoid.title
-+            subText: plasmoid.toolTipSubText
-+        }
- 
--        PlasmaCore.IconItem {
-+        MouseArea {
-             anchors.fill: parent
--            source: plasmoid.icon
--            active: parent.containsMouse
--            enabled: root.hasTouchpad
-+            onClicked: {
-+                plasmoid.expanded = !plasmoid.expanded;
-+            }
-         }
-     }
- 
--- 
-GitLab
-
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.23.4-fix-touchpad-mousearea-lookup.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.23.4-fix-touchpad-mousearea-lookup.patch
deleted file mode 100644
index 07d741424005..000000000000
--- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.23.4-fix-touchpad-mousearea-lookup.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From aadab772fb81ff3d97c8b5342a8a018f51b2ef60 Mon Sep 17 00:00:00 2001
-From: Nate Graham <nate@kde.org>
-Date: Fri, 3 Dec 2021 09:36:47 -0700
-Subject: [PATCH] kcms/touchpad/applet: Fix mousearea lookup
-
-(cherry picked from commit f4060c48b264a5054c2ffa795c208910d42bfd42)
----
- kcms/touchpad/applet/qml/contents/ui/touchpad.qml | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/kcms/touchpad/applet/qml/contents/ui/touchpad.qml b/kcms/touchpad/applet/qml/contents/ui/touchpad.qml
-index 106859c3a..aa1034e59 100644
---- a/kcms/touchpad/applet/qml/contents/ui/touchpad.qml
-+++ b/kcms/touchpad/applet/qml/contents/ui/touchpad.qml
-@@ -61,7 +61,7 @@ Item {
-         implicitHeight: PlasmaCore.Units.iconSizes.small
- 
-         source: plasmoid.icon
--        active: parent.containsMouse
-+        active: mousearea.containsMouse
- 
-         PlasmaCore.ToolTipArea {
-             mainText: plasmoid.title
-@@ -69,6 +69,8 @@ Item {
-         }
- 
-         MouseArea {
-+            id: mousearea
-+
-             anchors.fill: parent
-             onClicked: {
-                 plasmoid.expanded = !plasmoid.expanded;
--- 
-GitLab
-
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.23.5.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.23.5.ebuild
index 7a3c7757294a..7faa99b22779 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.23.5.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.23.5.ebuild
@@ -17,7 +17,7 @@ SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE="emoji ibus +kaccounts +policykit scim +semantic-desktop telemetry"
 
 COMMON_DEPEND="
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.23.4-r1.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.23.90.ebuild
index dcd98ea5397d..d35b171b5bf8 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.23.4-r1.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-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="true"
-KFMIN=5.86.0
+KFMIN=5.90.0
 PVCUT=$(ver_cut 1-3)
 QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
@@ -17,8 +17,8 @@ SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE="emoji ibus +kaccounts +policykit scim +semantic-desktop telemetry"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="emoji ibus +kaccounts scim +semantic-desktop telemetry"
 
 COMMON_DEPEND="
 	>=dev-qt/qtconcurrent-${QTMIN}:5
@@ -96,7 +96,6 @@ COMMON_DEPEND="
 		kde-apps/kaccounts-integration:5
 		net-libs/accounts-qt
 	)
-	policykit? ( >=kde-frameworks/kwallet-${KFMIN}:5 )
 	scim? ( app-i18n/scim )
 	semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
 	telemetry? ( dev-libs/kuserfeedback:5 )
@@ -117,26 +116,16 @@ RDEPEND="${COMMON_DEPEND}
 	x11-apps/setxkbmap
 	x11-misc/xdg-user-dirs
 	kaccounts? ( net-libs/signon-oauth2 )
-	policykit? ( sys-apps/accountsservice )
 "
 BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${WORKDIR}/${XORGHDRS}/override-include-dirs.patch" # downstream patch
-	# 5.23 branch
-	"${FILESDIR}"/${P}-fix-panel-initial-sizing.patch
-	"${FILESDIR}"/${P}-fix-touchpad-applet-popup-close-on-click.patch # KDE-bug 445982
-	"${FILESDIR}"/${P}-fix-touchpad-mousearea-lookup.patch
 )
 
 src_prepare() {
 	ecm_src_prepare
 
-	if ! use policykit; then
-		ecm_punt_bogus_dep KF5 Wallet
-		cmake_run_in kcms cmake_comment_add_subdirectory users
-	fi
-
 	if ! use ibus; then
 		sed -e "s/Qt5X11Extras_FOUND AND XCB_XCB_FOUND AND XCB_KEYSYMS_FOUND/false/" \
 			-i applets/kimpanel/backend/ibus/CMakeLists.txt || die