gentoo resync : 16.04.2022

5 files changed, 80 insertions, 6 deletions

diff --git a/kde-frameworks/kconfigwidgets/Manifest b/kde-frameworks/kconfigwidgets/Manifest
index 550ec8648053..30ec325580d4 100644
--- a/kde-frameworks/kconfigwidgets/Manifest
+++ b/kde-frameworks/kconfigwidgets/Manifest
@@ -1,5 +1,8 @@
+AUX kconfigwidgets-5.92.0-khamburgermenu-ensure-polished.patch 1357 BLAKE2B f4d08627592c941fd909e700982a5e7695d373baaeaa5df4027ed97d7f3d214912cecd1bfbd46fc5f84f231a53d52f64db199e62e9daad624921c2ca62ee3dd8 SHA512 1f3c653a42dbec293fafaf44e0f0ca4ab96ac018e42beb6c2527179b4c99f669e3a19b978db47caf03204055800e85c4e83cd61be60d2d01f13de7406b4ece3f
 DIST kconfigwidgets-5.90.1.tar.xz 414176 BLAKE2B 3e6bdcefd2dc0b275b2c8d7e6d314e98fb3f2911fc60e4445b6a07adb52240b247927cb869a27695f2c43d0304e545a534de809518a84b2f53c34cce9fa73ed0 SHA512 51e1f388a4d6c41f538b7adc01b0fd87242b483f10c425f8ff0e4920e82cded5b9c921ec0e1ad858cdb905bd3fdc32befd5e17424702c7861ec2c9fbf517a208
 DIST kconfigwidgets-5.92.0.tar.xz 414528 BLAKE2B 688c6c509577e67558e0d3d080c7b11dc0041a6607c9b5d10d7e057e7c38db57b49bb0e28535a4314f32906d2a9bf55a6b96dc8e064a8775d08d3faf270351aa SHA512 50d07daab3469a3ac9bea2a5ff37b9b1be13bd833a94892825d25f5cd066dc5eb8d44d37319811463e6edc94123da0255851d4f6463ed3c723c6fc69e1902a5f
+DIST kconfigwidgets-5.93.0.tar.xz 416572 BLAKE2B c15a76b1e7230f168b2848e2f6e36041e02278580d3437bd74eb0afc6168ca616ea8f67373377b3407a7d3bddda06cba99e73a6cb7cd05794bc7b2419a6f1ec6 SHA512 d25d61be21cc2270ec3beb4e27fa7555d3c5d99c9a4440f2b79bd5531f73cb48cfeea38c7c969762ad0f9992f9ac91a641709a8c4a2a6b7c28132fc54632a32f
 EBUILD kconfigwidgets-5.90.1.ebuild 1002 BLAKE2B 1854eacaa26b8b7876f7cfd316fb345502272bb43aa3eafc70f5de686b0bc004e53293b14bc8cae4e54b9dce6662ff17409f9a048d909d4be1c0ddd29e137955 SHA512 69ab2a2dda85be6413ecb18cf7f22f2c5165696a08ee07aed5bc291d055a09546cd500d4ba70d153715b393e86e3a37e68aa55ad5044859da0a492e16b9625c5
-EBUILD kconfigwidgets-5.92.0.ebuild 977 BLAKE2B 81fa5c46d271f35bca0c196e9965dff5f9276bb333bde5b2e7e8c4586580f37d113929537d7e17c4b17040dfbb869b9f70c3713ce96ee09ac7fcda3cb8cbb3e8 SHA512 ecdf2239a29ed3535c398951af5c3bfef717e87e88dc9b936f8f107b4aa6b32ac5073dfa380f50adbedd365fb3cb6658ded782f47a454ac9a60de1086b1c0c5c
-MISC metadata.xml 640 BLAKE2B 52c9d5ed9112001bc1111ca95b80d3e261b240658ca4e0ce08b8b852a6894af72b6170f31c16fa28c834dba95e0df79380fc1639dc337484909b118c5b005916 SHA512 4a1995fa56a5d0bdecb9d10654239d48706d670a6e0a38837c59f404dc1165b12a690be51f60880327d85c8b3c778e866826cb73d3d07331cbce9f4303754316
+EBUILD kconfigwidgets-5.92.0-r1.ebuild 1019 BLAKE2B d3768b2ab2b20106a8e8c47ecf25365fb2333b1b2a012fcd635b5616c9f05da9384d3c389e0ac5c68714c36d493813c003eab7914e1f663c88249dd818be6a0b SHA512 e6196eb88367f4d0bc03bdc8aa09b74a3bdc8e491e93c2c1c265559fb1bd53fec40cd6a8c0689891f59c15fb566a67e0b2c0a6413e338c042e6feaca16fa2090
+EBUILD kconfigwidgets-5.93.0.ebuild 933 BLAKE2B 9c122ea12abe0d1ed711bbe43919f771c9d3a2caf05f6da473c14e6a2e7400be4021c8d7ae0b09bbf52cf5e73e85489f09bad5bb61a9154fe0b4d24cc1684199 SHA512 bc773f92ee05c032065c7c9a0977bcacb2d423efb989974bec913a67039d458f7c87385c64917f833db4a36f7def181150072967e418bbebebc470045c8e2db9
+MISC metadata.xml 547 BLAKE2B 127ee4110b748cd3e3c26b63248d35f78b233b00cf4466ccc0145a613062a5aa9cc2e9ebd91d0e7482c67f6e265938176b169a9c52eda30bfcddf02549ec8f06 SHA512 2d36585b1af6205dc1bfcff7c3cb24c85376716159317b5c105c866143d49e89e91e501c9a4cf2d63265c30a09e8df71bca841319bd3f2b551e79fde90b1d96e
diff --git a/kde-frameworks/kconfigwidgets/files/kconfigwidgets-5.92.0-khamburgermenu-ensure-polished.patch b/kde-frameworks/kconfigwidgets/files/kconfigwidgets-5.92.0-khamburgermenu-ensure-polished.patch
new file mode 100644
index 000000000000..34249bb1d7dc
--- /dev/null
+++ b/kde-frameworks/kconfigwidgets/files/kconfigwidgets-5.92.0-khamburgermenu-ensure-polished.patch
@@ -0,0 +1,32 @@
+From babd8078cc92b3f46dbab0286d7629ada1c2d10f Mon Sep 17 00:00:00 2001
+From: David Redondo <kde@david-redondo.de>
+Date: Tue, 22 Mar 2022 10:52:04 +0100
+Subject: [PATCH] khamburgermenu: Ensure menu is polished before creating
+ window
+
+By force creating the window, there is no chance for the style
+to change the surface format that will be used because it's fixed
+once the window has been created.
+This caused for example  in a graphical glitch with Breeze, so
+manually ensure the menu is polished.
+---
+ src/khamburgermenuhelpers.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/khamburgermenuhelpers.cpp b/src/khamburgermenuhelpers.cpp
+index d1ae2835..beecba7c 100644
+--- a/src/khamburgermenuhelpers.cpp
++++ b/src/khamburgermenuhelpers.cpp
+@@ -50,6 +50,9 @@ bool ButtonPressListener::eventFilter(QObject *watched, QEvent *event)
+         if (!menu) {
+             return false;
+         }
++        // ensure polished so the style can change the surfaceformat of the window which is
++        // not possible once the window has been created
++        menu->ensurePolished();
+         menu->winId(); // trigger being a native widget already, to ensure windowHandle created
+         // generic code if not known if the available parent widget is a native widget or not
+         auto parentWindowHandle = watchedButton->windowHandle();
+-- 
+GitLab
+
diff --git a/kde-frameworks/kconfigwidgets/kconfigwidgets-5.92.0-r1.ebuild b/kde-frameworks/kconfigwidgets/kconfigwidgets-5.92.0-r1.ebuild
new file mode 100644
index 000000000000..f8823acf4896
--- /dev/null
+++ b/kde-frameworks/kconfigwidgets/kconfigwidgets-5.92.0-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_DESIGNERPLUGIN="true"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework providing an assortment of configuration-related widgets"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+man"
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	=kde-frameworks/kauth-${PVCUT}*:5
+	=kde-frameworks/kcodecs-${PVCUT}*:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/kguiaddons-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+"
+RDEPEND="${DEPEND}"
+BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )"
+
+PATCHES=( "${FILESDIR}/${P}-khamburgermenu-ensure-polished.patch" ) # KDE-bug 452211
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package man KF5DocTools)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kconfigwidgets/kconfigwidgets-5.92.0.ebuild b/kde-frameworks/kconfigwidgets/kconfigwidgets-5.93.0.ebuild
index 7312473f399e..087a2919b488 100644
--- a/kde-frameworks/kconfigwidgets/kconfigwidgets-5.92.0.ebuild
+++ b/kde-frameworks/kconfigwidgets/kconfigwidgets-5.93.0.ebuild
@@ -13,26 +13,25 @@ DESCRIPTION="Framework providing an assortment of configuration-related widgets"
 
 LICENSE="LGPL-2+"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="+auth +man"
+IUSE="+man"
 
 DEPEND="
 	>=dev-qt/qtdbus-${QTMIN}:5
 	>=dev-qt/qtgui-${QTMIN}:5
 	>=dev-qt/qtwidgets-${QTMIN}:5
+	=kde-frameworks/kauth-${PVCUT}*:5
 	=kde-frameworks/kcodecs-${PVCUT}*:5
 	=kde-frameworks/kconfig-${PVCUT}*:5
 	=kde-frameworks/kcoreaddons-${PVCUT}*:5
 	=kde-frameworks/kguiaddons-${PVCUT}*:5
 	=kde-frameworks/ki18n-${PVCUT}*:5
 	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-	auth? ( =kde-frameworks/kauth-${PVCUT}*:5 )
 "
 RDEPEND="${DEPEND}"
 BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )"
 
 src_configure() {
 	local mycmakeargs=(
-		-DWITH_KAUTH=$(usex auth)
 		$(cmake_use_find_package man KF5DocTools)
 	)
 
diff --git a/kde-frameworks/kconfigwidgets/metadata.xml b/kde-frameworks/kconfigwidgets/metadata.xml
index dcf525b73fcc..3ace511214fd 100644
--- a/kde-frameworks/kconfigwidgets/metadata.xml
+++ b/kde-frameworks/kconfigwidgets/metadata.xml
@@ -9,7 +9,6 @@
 		<bugs-to>https://bugs.kde.org/</bugs-to>
 	</upstream>
 	<use>
-		<flag name="auth">Enable authentication support via <pkg>kde-frameworks/kauth</pkg></flag>
 		<flag name="designer">Build plugins for <pkg>dev-qt/designer</pkg></flag>
 	</use>
 	<slots>