gentoo resync : 20.03.2022

4 files changed, 6 insertions, 47 deletions

diff --git a/kde-frameworks/kdeclarative/Manifest b/kde-frameworks/kdeclarative/Manifest
index acf222a8229c..c2b33096ad5e 100644
--- a/kde-frameworks/kdeclarative/Manifest
+++ b/kde-frameworks/kdeclarative/Manifest
@@ -1,6 +1,5 @@
-AUX kdeclarative-5.88.0-KeySequenceItem-record-on-correct-window.patch 1357 BLAKE2B 9fc0cffec430fc2aa190032762d74f1732722079a37694ff682647f1b5202ea2e2242331c190d65876d73a98fba8cfba866da272edf0dd3660b2e8ac93cfe038 SHA512 ec8bf047826bc6a64b4b1b7d920d83e6d118b69d53371e8a504f16077a5760bdaeec46ea5f459d8556bd88eef5ebc71a81888f8fbc7b3f8465f8de45e6815aa8
-DIST kdeclarative-5.88.0.tar.xz 191048 BLAKE2B 113ed6a1ff297251cec4baf143352d3b8cb1d80cd0aca45ad21ec4d1583a5a9603897c9edfda99fe0bfc3c5c09a78c609c563602accb2e2fe7b76c3b1e7e0d1e SHA512 f72221bd6bd5fa739994482607161ea2ed7e659c18c4c9f3a161a765925c10a18cf7b5737a0489e589de13201c624d5a597e248eddaa77e1006b22ef8f19efb2
 DIST kdeclarative-5.90.0.tar.xz 199308 BLAKE2B 6cc7cbe7ab1b70fe238c32ba61f7187c251ffe04129a3681c2c441584fc8b3ee8d6026465c918a1477897f20e748f8451823e7551b905e1769cbffbfd11c80a7 SHA512 6e2dc0c19f16915b35f0c0bd1526b986987fbd450ad75666c1b5c94e2f30efbef857ffff424f3026a3da3762209dbb166d48a8146540b0d625d2203d4dda0679
-EBUILD kdeclarative-5.88.0-r1.ebuild 1041 BLAKE2B f5c799d58b34d22a0a34d769f0721ff42df2dc79666ed844637fb0028ed1230143f779bf542d7f1d04057896741e1dc073a7bd518bdbf79114b41d22d85820b8 SHA512 274e3aa1f7ead5e4e452096c3467f4a6fba1cd9e30ba3508c6e5c90876d6fae63d41219d5dcc447f4767da18ff42ccff5c3d67f977825e149257c27c3d8c74a8
-EBUILD kdeclarative-5.90.0.ebuild 947 BLAKE2B ac48c5e4c90fe04381a2446cb4cdba5b6c04b5a1d4c7a7a5f4f301e5cdb3b543288263adc5b1691ea57f35be2f0f09505abe8fdba9a59af5fcac88199959ffab SHA512 c02c7ec0d58a56ba407316379af303b5ac7eaf550287cd9b0c3fb959c82921ea1ff88c684bd2a3e32e2015cb462313950d141e1b65a8fb4604c09bc94b13cd10
+DIST kdeclarative-5.92.0.tar.xz 202924 BLAKE2B bb7d67ee68bcef340223c89f827357bbcf04cc8838c643dbbe0338ddb9fbbcd35306bd293b6a8b00dca5d76a75476b63f659b8308deeeee3b51c776290908cff SHA512 f4dee788269405607be0818593420ca7e018fc48972d38f716e9d0319a8ef6557557ca553cff3c62d4f123999e6639e106089c2a4eccd0df824cd0bbdd5cad4b
+EBUILD kdeclarative-5.90.0.ebuild 944 BLAKE2B eedca9ff52fd3d86b73ea12b8251efe7aa1136631a5eb69b118c91cc9ec506310ec9e4e62e0948089c30c4fef95373e50e95d9e87791aa034f88f70e5888ef3f SHA512 3ce5b83d7ad536f0e69d156b8ef61bc09591acbe5bd6b62815d445e2af0ad78c245d6e721638fd314ff16ec48afba355caba0bb59df1d63086dc1435a3ac584b
+EBUILD kdeclarative-5.92.0.ebuild 947 BLAKE2B ac48c5e4c90fe04381a2446cb4cdba5b6c04b5a1d4c7a7a5f4f301e5cdb3b543288263adc5b1691ea57f35be2f0f09505abe8fdba9a59af5fcac88199959ffab SHA512 c02c7ec0d58a56ba407316379af303b5ac7eaf550287cd9b0c3fb959c82921ea1ff88c684bd2a3e32e2015cb462313950d141e1b65a8fb4604c09bc94b13cd10
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kdeclarative/files/kdeclarative-5.88.0-KeySequenceItem-record-on-correct-window.patch b/kde-frameworks/kdeclarative/files/kdeclarative-5.88.0-KeySequenceItem-record-on-correct-window.patch
deleted file mode 100644
index bf4d6fc5dddb..000000000000
--- a/kde-frameworks/kdeclarative/files/kdeclarative-5.88.0-KeySequenceItem-record-on-correct-window.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 2caa62d11f322ca5c9829b6bc91839e8afd42686 Mon Sep 17 00:00:00 2001
-From: David Redondo <kde@david-redondo.de>
-Date: Mon, 22 Nov 2021 14:22:14 +0100
-Subject: [PATCH] KeySequenceItem: Make sure we record on the correct window
-
-Unfortunately renderWindowFor is just a simple function call and
-so the binding is not updated when it would change. Now we make sure
-to update the window before each recording.
-BUG:445277
----
- src/qmlcontrols/kquickcontrols/KeySequenceItem.qml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/qmlcontrols/kquickcontrols/KeySequenceItem.qml b/src/qmlcontrols/kquickcontrols/KeySequenceItem.qml
-index 7b404bd..a41bf18 100644
---- a/src/qmlcontrols/kquickcontrols/KeySequenceItem.qml
-+++ b/src/qmlcontrols/kquickcontrols/KeySequenceItem.qml
-@@ -42,7 +42,6 @@ RowLayout {
- 
-     KQuickControlsPrivate.KeySequenceHelper {
-         id: _helper
--        window: renderWindow(parent.Window.window)
-         onGotKeySequence: {
-             if (isKeySequenceAvailable(keySequence)) {
-                 root.keySequence = keySequence
-@@ -95,6 +94,7 @@ RowLayout {
- 
-         onCheckedChanged: {
-             if (checked) {
-+                _helper.window = _helper.renderWindow(parent.Window.window)
-                 mainButton.forceActiveFocus()
-                 _helper.startRecording()
-             }
--- 
-GitLab
-
diff --git a/kde-frameworks/kdeclarative/kdeclarative-5.90.0.ebuild b/kde-frameworks/kdeclarative/kdeclarative-5.90.0.ebuild
index efde9124aa47..8b04052c9d68 100644
--- a/kde-frameworks/kdeclarative/kdeclarative-5.90.0.ebuild
+++ b/kde-frameworks/kdeclarative/kdeclarative-5.90.0.ebuild
@@ -11,7 +11,7 @@ inherit ecm kde.org
 DESCRIPTION="Framework providing integration of QML and KDE work spaces"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-frameworks/kdeclarative/kdeclarative-5.88.0-r1.ebuild b/kde-frameworks/kdeclarative/kdeclarative-5.92.0.ebuild
index 49aae073b5e3..efde9124aa47 100644
--- a/kde-frameworks/kdeclarative/kdeclarative-5.88.0-r1.ebuild
+++ b/kde-frameworks/kdeclarative/kdeclarative-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
@@ -11,7 +11,7 @@ inherit ecm kde.org
 DESCRIPTION="Framework providing integration of QML and KDE work spaces"
 
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
@@ -33,7 +33,3 @@ DEPEND="
 	media-libs/libepoxy
 "
 RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-KeySequenceItem-record-on-correct-window.patch" # KDE-bug 445277
-)