gentoo resync : 12.05.2022

4 files changed, 2 insertions, 99 deletions

diff --git a/kde-frameworks/qqc2-desktop-style/Manifest b/kde-frameworks/qqc2-desktop-style/Manifest
index dd01cd30a679..c74a41b443e8 100644
--- a/kde-frameworks/qqc2-desktop-style/Manifest
+++ b/kde-frameworks/qqc2-desktop-style/Manifest
@@ -1,8 +1,5 @@
-AUX qqc2-desktop-style-5.90.0-KDEBUG-447289.patch 2692 BLAKE2B d6c6038c6aba645b866d1ed9f9666291fb2ac0ef107705b26813811e06b8e8f777c341298c0ef1bc9df403f8f0969ce9f80317e010751c267b07fcd6442f56d4 SHA512 57e48a1975ae4670cc3bf74ce6b1b8e54818e28518ee2d0831b1eb276b656252146309dc929f4e795d50a00dab1e9a85ff29dabef4cccd9ae89ed679fb68c924
-DIST qqc2-desktop-style-5.90.0.tar.xz 65004 BLAKE2B 19d0dbdfe2c6891458e80a2e1935f2a5357db565ac213eb31232b127136d6fc426ce8a8240837fa3f341753d311ca5caaf416a7bfde309dcca787199891bb660 SHA512 c0d95897624d08fd378a1c3e0392d703034775cf4ff7ec463c8117db071c0ada697d0bc05bf0382b19c9fbb865a75371062bc13cbeea7f65213db214b12bdc00
 DIST qqc2-desktop-style-5.92.0.tar.xz 65396 BLAKE2B 1cf4e6d27c7db8f518f5c9e46f77373a72b30a3060bac3e46d94473bcf6c6fa17c26a90d9589550bee2974b3c541963ed614a6422690b32d97a80b7dbfbc5434 SHA512 698675c526f8c1174c617045113c613a1eb4684db30bf6d88600b9863273c814c4ebe0bcf45b60f24023d7b3d8ef59dab4ab1b704add55131431cc3e701b3549
 DIST qqc2-desktop-style-5.93.0.tar.xz 65480 BLAKE2B 49a1323afa420ddf1ad144d19b81c8dd6a099a6c8c4b01cd0e89f3f2011df3443287c236bfec71359fc78566082200c8141c5feb5fd3c2d034a53714fef1b4a0 SHA512 07adbf3824bffa1887897bb9c59bd7e5e8732bc5a96986eb219305cacbb4d863c6c74cab9eb434eef4fd2f4eb9d8d6396ff5142cc6e8678f976eee6e52011e28
-EBUILD qqc2-desktop-style-5.90.0-r1.ebuild 777 BLAKE2B 6fda9f4ea692b7dd236217aee263aa1f38917bfd2db0054a1d5bc9028da30856de8ff06b5c56f1ba1906beb92b5777f00e14e751c65fdf0eaa456183a9ef113e SHA512 d30dcc4b1f0859dff2d2be12c235870cbcf2e6039ad6af8471fbef710303938658ba0547b52c6798dc347602501f9ec86675c9e40bdf30a7af5d1f42bbbf0a80
-EBUILD qqc2-desktop-style-5.92.0.ebuild 728 BLAKE2B 205cc37f90622e03fc1892dd1e52e5301d4431cc65fea1584e16a81b86f26435aa9ae8fe8aac18514885be272dfe3cb6b06bc4066170dae88e3d403812a72253 SHA512 11a0a78dcf3dbb7f664a3a169673492324873486837742b5a2eeb0e6157186125f443e55b431ecd419b5b8a19f9321c70013d363fa1c1eeb7c04388cdab1d7ad
+EBUILD qqc2-desktop-style-5.92.0.ebuild 725 BLAKE2B 519eeacecba5a7692f868ab520f9aaf407250943f0c9a7ae50b861be49f3555fe8c1ae6ab84fe779486b93d5649e040ea0a0893982f452f3195eca6f4c2d7611 SHA512 5b969c02b61b9381c6992fdb512082042c7abd6ccbef1453cda96316f73123119ccb9b6b9f118d5a2a2732a9f0af0f8ba6c3d31bdc23f0b98a476ce0e6264a35
 EBUILD qqc2-desktop-style-5.93.0.ebuild 728 BLAKE2B 205cc37f90622e03fc1892dd1e52e5301d4431cc65fea1584e16a81b86f26435aa9ae8fe8aac18514885be272dfe3cb6b06bc4066170dae88e3d403812a72253 SHA512 11a0a78dcf3dbb7f664a3a169673492324873486837742b5a2eeb0e6157186125f443e55b431ecd419b5b8a19f9321c70013d363fa1c1eeb7c04388cdab1d7ad
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/qqc2-desktop-style/files/qqc2-desktop-style-5.90.0-KDEBUG-447289.patch b/kde-frameworks/qqc2-desktop-style/files/qqc2-desktop-style-5.90.0-KDEBUG-447289.patch
deleted file mode 100644
index 69991acb5c75..000000000000
--- a/kde-frameworks/qqc2-desktop-style/files/qqc2-desktop-style-5.90.0-KDEBUG-447289.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From bc0ca29bd47ce45b30c66bd8743b6a48e20123d2 Mon Sep 17 00:00:00 2001
-From: Nate Graham <nate@kde.org>
-Date: Thu, 23 Dec 2021 12:11:28 -0700
-Subject: [PATCH] Use metrics from Breeze for menu items
-
-We can't read them dynamically right now, unfortunately. So the values
-are hardcoded.
-
-BUG: 447289
-FIXED-IN: 5.91
----
- org.kde.desktop/Menu.qml     | 3 +++
- org.kde.desktop/MenuItem.qml | 6 +++---
- 2 files changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/org.kde.desktop/Menu.qml b/org.kde.desktop/Menu.qml
-index adaf644..205c0b7 100644
---- a/org.kde.desktop/Menu.qml
-+++ b/org.kde.desktop/Menu.qml
-@@ -37,6 +37,9 @@ T.Menu {
-             }
-             return maxWidth;
-         }
-+
-+        spacing: 0 // Hardcoded to the Breeze theme value
-+
-         interactive: ApplicationWindow.window ? contentHeight > ApplicationWindow.window.height : false
-         clip: true
-         currentIndex: control.currentIndex || 0
-diff --git a/org.kde.desktop/MenuItem.qml b/org.kde.desktop/MenuItem.qml
-index d8a7cf0..f0c95e5 100644
---- a/org.kde.desktop/MenuItem.qml
-+++ b/org.kde.desktop/MenuItem.qml
-@@ -25,7 +25,7 @@ T.MenuItem {
- 
-     Layout.fillWidth: true
-     padding: Kirigami.Units.smallSpacing
--    verticalPadding: Math.floor(Kirigami.Units.smallSpacing * 1.5)
-+    verticalPadding: 4 // Hardcoded to the Breeze theme value
-     hoverEnabled: !Kirigami.Settings.isMobile
- 
-     Kirigami.MnemonicData.enabled: controlRoot.enabled && controlRoot.visible
-@@ -53,7 +53,7 @@ T.MenuItem {
-             visible: (controlRoot.ListView.view && controlRoot.ListView.view.hasIcons) || (controlRoot.icon != undefined && (controlRoot.icon.name.length > 0 || controlRoot.icon.source.length > 0))
-             source: controlRoot.icon ? (controlRoot.icon.name || controlRoot.icon.source) : ""
-             color: controlRoot.icon ? controlRoot.icon.color : "transparent"
--            Layout.preferredHeight: Math.max(Kirigami.Units.iconSizes.roundedIconSize(label.height), Kirigami.Units.iconSizes.small)
-+            Layout.preferredHeight: Kirigami.Units.iconSizes.small
-             Layout.preferredWidth: Layout.preferredHeight
-         }
-         Label {
-@@ -94,7 +94,7 @@ T.MenuItem {
-         x: controlRoot.mirrored ? controlRoot.padding : controlRoot.width - width - controlRoot.padding
-         y: controlRoot.topPadding + (controlRoot.availableHeight - height) / 2
-         source: controlRoot.mirrored ? "go-next-symbolic-rtl" : "go-next-symbolic"
--        width: Math.max(Kirigami.Units.iconSizes.roundedIconSize(label.height), Kirigami.Units.iconSizes.small)
-+        width: Kirigami.Units.iconSizes.small
-         height: width
-         visible: controlRoot.subMenu
-     }
--- 
-GitLab
-
diff --git a/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.90.0-r1.ebuild b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.90.0-r1.ebuild
deleted file mode 100644
index aca379beec2f..000000000000
--- a/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.90.0-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_QTHELP="false"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Style for QtQuickControls 2 that uses QWidget's QStyle for painting"
-
-LICENSE="|| ( GPL-2+ LGPL-3+ )"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdeclarative-${QTMIN}:5=
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
-	=kde-frameworks/kiconthemes-${PVCUT}*:5
-	=kde-frameworks/kirigami-${PVCUT}*:5
-	=kde-frameworks/sonnet-${PVCUT}*:5[qml]
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-"
-
-PATCHES=( "${FILESDIR}/${P}-KDEBUG-447289.patch" )
diff --git a/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.92.0.ebuild b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.92.0.ebuild
index 6b92d3a6fc3c..284764a1485c 100644
--- a/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.92.0.ebuild
+++ b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.92.0.ebuild
@@ -11,7 +11,7 @@ inherit ecm kde.org
 DESCRIPTION="Style for QtQuickControls 2 that uses QWidget's QStyle for painting"
 
 LICENSE="|| ( GPL-2+ LGPL-3+ )"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 DEPEND="