gentoo resync : 20.03.2022

4 files changed, 6 insertions, 65 deletions

diff --git a/kde-frameworks/kirigami/Manifest b/kde-frameworks/kirigami/Manifest
index 8c835a4c9aa7..eb64540d1de2 100644
--- a/kde-frameworks/kirigami/Manifest
+++ b/kde-frameworks/kirigami/Manifest
@@ -1,6 +1,5 @@
-AUX kirigami-5.88.0-PageRowGlobalToolBarUI-dont-animate-opacity.patch 2047 BLAKE2B c166bb6c57b263abbe78cbeaebf6f9b9a3c8629dcad73ad1dcbaebc0a258904543ccb9b0a1127efc0c52a07f13b10fe0ebfb31243471bd38658496ac13ffc0fa SHA512 b87f1baf2093599c3ce0dc8766c3f0ee187656df92c1468c98b323c381f473ded33b03be244021b23b2fe6c5a739620c40b84cc74bf3b68e45cd581ee2915b82
-DIST kirigami2-5.88.0.tar.xz 333324 BLAKE2B cac7a79d5d3fd75aab31f0c7d6fe51b6dd6bf8755822a85682db7742cafc88007012e541de09ef302e1b2208a055c9cb4cce208362323c558e547a256f3bd397 SHA512 adb20c007bd8d1206be87d936a9affe1f7e2203158ec5ee241bde8e60e2b6e1d701393c4d85841644321f70496de1e67cb4feb9009c2cd7d153eba2407c480fb
 DIST kirigami2-5.90.0.tar.xz 349768 BLAKE2B e8a068f910feba99198d7ff14c2d19451e1dcf96a8c9739754aa5fb25c0a86c3ca362747e7525ff20c8a10c9508c82fe0b6e54d9f674974393f7b4d94d9a1917 SHA512 4b05fbc7921e7b6f2e93a6b043753983e2071cb1e477ad24bb94d1bc5c2ad4cec8c7f1bda8fa2cd5e932c206f21d060df5bef42e6ec21994793675dce22b523f
-EBUILD kirigami-5.88.0-r1.ebuild 1062 BLAKE2B 2c2353ea1d38a74d6f8875b015c9a7e6897d371d1491812ff03607897b7d997f82dcd0db18e4f904b7a06cdb550bf829a8af10b1a4765987fe9794809457aaae SHA512 574ee9382bb263d9868db9fc9014fbe969b0dba7db60f1df9a9b6151ffb24e4f3cd4aab9fb441de5fcab1a3d9b5a6c493d4adb7daf5318c4accae5dabcce3878
-EBUILD kirigami-5.90.0.ebuild 983 BLAKE2B d4cb5eec8d4121f251c9ce6fbc7a08048b4f75bb7cdc8d226d8bfa446db0678f995df63700a0efca1b135aad3dc6439792a40f241117f8afc5402c612ff4a041 SHA512 221dd7519f94ce0962ecaf48d4bc9550ea00718ef25d7316c6807ad8d32e6d706482a5c384f86d0d5cff0eef4695c35ecb5032b8023245b0b3d5a5ee326a3027
+DIST kirigami2-5.92.0.tar.xz 354848 BLAKE2B 7aab1579693f7cf57a61f45eb3d7bc7431bee01ed1ede918e0068d3b4d41abe2f5b5f97cae9538068ae6ebe27a5abce3797c7ade7ff225a40ac49cf46c61a742 SHA512 42d75b8931f28ce2fa200c19acfc9194518b856dd33d9bbeb490f24ddb0ae03ba7c01443a5bc2a07088de69a9300245434460ddcd28cb2b1caa2f2288e45405a
+EBUILD kirigami-5.90.0.ebuild 980 BLAKE2B eecb512afd954f72d8f93bb03d6a8343befb6d601875fed876155388c797ae742397e5fd975863df283c7bbfaf88816972e84d85e9143400093b410337d587e9 SHA512 ebef3201d61ef8e1e68cdd4a53313a3632c65292b94a555b56ce3f08395c30f5e90d47ab69bfd5c5c53f4be2469a03e68261d0d7f10fbf04bea9fc093aff4938
+EBUILD kirigami-5.92.0.ebuild 983 BLAKE2B d4cb5eec8d4121f251c9ce6fbc7a08048b4f75bb7cdc8d226d8bfa446db0678f995df63700a0efca1b135aad3dc6439792a40f241117f8afc5402c612ff4a041 SHA512 221dd7519f94ce0962ecaf48d4bc9550ea00718ef25d7316c6807ad8d32e6d706482a5c384f86d0d5cff0eef4695c35ecb5032b8023245b0b3d5a5ee326a3027
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kirigami/files/kirigami-5.88.0-PageRowGlobalToolBarUI-dont-animate-opacity.patch b/kde-frameworks/kirigami/files/kirigami-5.88.0-PageRowGlobalToolBarUI-dont-animate-opacity.patch
deleted file mode 100644
index 85b2a24f5909..000000000000
--- a/kde-frameworks/kirigami/files/kirigami-5.88.0-PageRowGlobalToolBarUI-dont-animate-opacity.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 67ec2a1873e3d750529043b243043cfd2e2f9ec6 Mon Sep 17 00:00:00 2001
-From: Nate Graham <nate@kde.org>
-Date: Wed, 10 Nov 2021 20:44:53 -0700
-Subject: [PATCH] PageRowGlobalToolBarUI: don't animate opacity
-
-Doing so causes flickering in System Settings and KInfoCenter because of
-how the titles are rendered. It also doesn't make conceptual sense since
-the style of toolbar generally doesn't change so the user would never
-actually see the animated opacity change in the first place.
-
-BUG: 417636
-FIXED-IN: 5.89
----
- .../globaltoolbar/PageRowGlobalToolBarUI.qml        | 13 +++----------
- 1 file changed, 3 insertions(+), 10 deletions(-)
-
-diff --git a/src/controls/private/globaltoolbar/PageRowGlobalToolBarUI.qml b/src/controls/private/globaltoolbar/PageRowGlobalToolBarUI.qml
-index 640ab51e..c536fed7 100644
---- a/src/controls/private/globaltoolbar/PageRowGlobalToolBarUI.qml
-+++ b/src/controls/private/globaltoolbar/PageRowGlobalToolBarUI.qml
-@@ -106,8 +106,8 @@ Kirigami.AbstractApplicationHeader {
-             Layout.preferredHeight: -1
-             property Kirigami.PageRow pageRow: root
- 
--            opacity: layerIsMainRow && active
--            enabled: opacity > 0
-+            visible: layerIsMainRow && active
-+            enabled: visible
- 
-             asynchronous: true
- 
-@@ -115,13 +115,6 @@ Kirigami.AbstractApplicationHeader {
- 
-             //TODO: different implementation?
-             source: globalToolBar.actualStyle == Kirigami.ApplicationHeaderStyle.TabBar ? Qt.resolvedUrl("TabBarControl.qml") : Qt.resolvedUrl("BreadcrumbControl.qml")
--
--            Behavior on opacity {
--                OpacityAnimator {
--                    duration: Kirigami.Units.longDuration
--                    easing.type: Easing.InOutQuad
--                }
--            }
-         }
- 
-         Item {
-@@ -137,6 +130,6 @@ Kirigami.AbstractApplicationHeader {
-             Layout.preferredWidth: height
-         }
-     }
--    background.opacity: breadcrumbLoader.opacity
-+    background.visible: breadcrumbLoader.visible
- }
- 
--- 
-GitLab
-
diff --git a/kde-frameworks/kirigami/kirigami-5.90.0.ebuild b/kde-frameworks/kirigami/kirigami-5.90.0.ebuild
index 0619dd651b00..dbdfee7923b1 100644
--- a/kde-frameworks/kirigami/kirigami-5.90.0.ebuild
+++ b/kde-frameworks/kirigami/kirigami-5.90.0.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://techbase.kde.org/Kirigami"
 EGIT_REPO_URI="${EGIT_REPO_URI/${PN}2/${PN}}"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 # requires package to already be installed
diff --git a/kde-frameworks/kirigami/kirigami-5.88.0-r1.ebuild b/kde-frameworks/kirigami/kirigami-5.92.0.ebuild
index ed9391b88895..0619dd651b00 100644
--- a/kde-frameworks/kirigami/kirigami-5.88.0-r1.ebuild
+++ b/kde-frameworks/kirigami/kirigami-5.92.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,7 @@ HOMEPAGE="https://techbase.kde.org/Kirigami"
 EGIT_REPO_URI="${EGIT_REPO_URI/${PN}2/${PN}}"
 
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 # requires package to already be installed
@@ -37,8 +37,6 @@ RDEPEND="${DEPEND}
 	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
 "
 
-PATCHES=( "${FILESDIR}"/${P}-PageRowGlobalToolBarUI-dont-animate-opacity.patch )
-
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_EXAMPLES=$(usex examples)