gentoo auto-resync : 22:04:2023 - 18:05:23

4 files changed, 2 insertions, 122 deletions

diff --git a/kde-frameworks/kidletime/Manifest b/kde-frameworks/kidletime/Manifest
index e9fdc3293f7b..c64c15b8f6d6 100644
--- a/kde-frameworks/kidletime/Manifest
+++ b/kde-frameworks/kidletime/Manifest
@@ -1,8 +1,5 @@
-AUX kidletime-5.102.0-wayland-baloo-crashfix.patch 1370 BLAKE2B 8ad609790367e77b0b5b57e5511666cd580b582060af675ddc9292bae8e5bf952938a0b0b2dcd22bdf637563c270fb00b680864d63d362cb613c62835ed8d03a SHA512 f4fef08f7e5dbe6b6aa5e200c8270b43bf539e2d330c789bb3e7b73b3acbe2ab4b45778e147702aca2224dfa3a82cfa2d0d20e4bc00fe20cfbd21f9b07125bd5
-DIST kidletime-5.102.0.tar.xz 30848 BLAKE2B ccb7b754ff573ab9dbdaf0badb5f403bb9db90ac22b0cd5a4210a866c2afd365a30ee7245337c7589c475323cbb20fbe5b3737bb99d344c3ab531c811c59833b SHA512 5aeddaf18d89c1ae5f9a23950a319d7d3659f713258e6297f1cb9a76c39514d434be80ec87e76c5fa892c445c69263742a13614ffcc5ae8a9c0cd47c57c43f08
 DIST kidletime-5.104.0.tar.xz 30856 BLAKE2B 526bb48e9350b9ccb91e3888b3ab96ba077bcee3b037b7160f8903ea8c22fbe6b4cde2526963dc8132de848de09ae1b3884e24d2ba1cf2a5c005883a9f4309b2 SHA512 eff99a7fc3292b85ba15c8a8c43c5b40a98c416694d4f52e39f40fa70236d7144fe436479a3b09b3a2970c42fb40a77ac9315af055ebc05eb52baf49a3e536b2
 DIST kidletime-5.105.0.tar.xz 30860 BLAKE2B dd667d97ce2b73dc5ccd8d8e1ea24ae0277c5fa29ce66e0fb96e875f475cdb5f78778847023e75c8556add9f154f441b67dde7dc4cc83cb8a47fa7acd96c7fe0 SHA512 f96c4c36ea22b8ff7b3d311caac28a938501249a9ef3740b2196d2f8298bf0c6069224c9fbc37c96428a1ccc7bc41eee21da474ae41f88a56d5d5ec910ea5b58
-EBUILD kidletime-5.102.0-r1.ebuild 1279 BLAKE2B 9ba0dcee01b5196644b62a1c7b159bfb5b7591a27be7163e713a7e1f82890571fc4b594339890b4c41ebe11097597ab976706b70baa09ec3df4f881dc6130845 SHA512 fbc0055516b7c9cf78b65432d0b6d239f83833abc3f780153616f6ee1974517844f27aff175abf41a767e460ce4b50f7eb66dbb3d6d86fe748d92934495f628a
-EBUILD kidletime-5.104.0.ebuild 1208 BLAKE2B cf464157d48ab0e252066f2c813d71dc4c6a1bd76fa1901a2a2800ccd22f374445174d0b2b06ce3ed7514bbe81a8d87cece0c3f042c03f0269b0ed031bf8ab79 SHA512 d5f06d3040dc56ebc837ddc50e9344670959ecb1752fe06d3a04b493e7b377bac2cab081de525b3d83aa7b0c151cbf4a9ab45c364e33970e9ba6ced2babdc11e
+EBUILD kidletime-5.104.0.ebuild 1205 BLAKE2B b5951404af7c12c24b1b0feaa28ca53ca1e2dd346de44e4d57ef309a369ee47d30e59d40000dedb0726a780bb2a4d249cf815377c72912e5c54bd1ac4d4d14b7 SHA512 7c9c619c48b8a1d49a572520d5c9d4c3a4a0d42220fcf925e49c70d806d8aa462d6367e6b57af94cfc4e0b305a22268e55d29552f93e3022c88a12e0a6996de9
 EBUILD kidletime-5.105.0.ebuild 1208 BLAKE2B cf464157d48ab0e252066f2c813d71dc4c6a1bd76fa1901a2a2800ccd22f374445174d0b2b06ce3ed7514bbe81a8d87cece0c3f042c03f0269b0ed031bf8ab79 SHA512 d5f06d3040dc56ebc837ddc50e9344670959ecb1752fe06d3a04b493e7b377bac2cab081de525b3d83aa7b0c151cbf4a9ab45c364e33970e9ba6ced2babdc11e
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kidletime/files/kidletime-5.102.0-wayland-baloo-crashfix.patch b/kde-frameworks/kidletime/files/kidletime-5.102.0-wayland-baloo-crashfix.patch
deleted file mode 100644
index da2faa692cd2..000000000000
--- a/kde-frameworks/kidletime/files/kidletime-5.102.0-wayland-baloo-crashfix.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From a0da010b8c4c97792543d24f6597ba1c1b3ceaef Mon Sep 17 00:00:00 2001
-From: David Redondo <kde@david-redondo.de>
-Date: Thu, 16 Feb 2023 12:16:03 +0100
-Subject: [PATCH] wayland: Guard wayland object destructors
-
-Kidletime is a singleton and the client API works by supplying ints to add
-or remove timeouts. When not all timeouts are removed before program exits,
-trying to destroy the wayland objects will crash since the lifetime of the
-wayland connection is tied to the QGuiApplication.
-BUG:465801
-FIXED-IN:5.104
-
-
-(cherry picked from commit 53779a8d8fb177762d0435634c8ca45b0a47f1db)
----
- src/plugins/wayland/poller.cpp | 10 +++++++---
- 1 file changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/src/plugins/wayland/poller.cpp b/src/plugins/wayland/poller.cpp
-index 918766b..9c1d7ad 100644
---- a/src/plugins/wayland/poller.cpp
-+++ b/src/plugins/wayland/poller.cpp
-@@ -50,7 +50,9 @@ public:
- 
-     ~IdleTimeoutKwin()
-     {
--        release();
-+        if (qGuiApp) {
-+            release();
-+        }
-     }
- 
- protected:
-@@ -74,7 +76,9 @@ public:
- 
-     ~IdleTimeoutExt()
-     {
--        destroy();
-+        if (qGuiApp) {
-+            destroy();
-+        }
-     }
- 
- protected:
-@@ -120,7 +124,7 @@ public:
-     }
-     ~IdleManagerExt()
-     {
--        if (isActive()) {
-+        if (qGuiApp && isActive()) {
-             destroy();
-         }
-     }
--- 
-GitLab
-
diff --git a/kde-frameworks/kidletime/kidletime-5.102.0-r1.ebuild b/kde-frameworks/kidletime/kidletime-5.102.0-r1.ebuild
deleted file mode 100644
index 828fe14c1501..000000000000
--- a/kde-frameworks/kidletime/kidletime-5.102.0-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="false"
-QTMIN=5.15.5
-inherit ecm frameworks.kde.org
-
-DESCRIPTION="Framework for detection and notification of device idle time"
-
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-IUSE="wayland X xscreensaver"
-
-REQUIRED_USE="xscreensaver? ( X )"
-
-RDEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	wayland? (
-		dev-libs/wayland
-		>=dev-qt/qtgui-${QTMIN}:5=[wayland]
-		>=dev-qt/qtwayland-${QTMIN}:5
-	)
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libX11
-		x11-libs/libxcb
-		x11-libs/libXext
-	)
-	xscreensaver? (
-		>=dev-qt/qtdbus-${QTMIN}:5
-		x11-libs/libXScrnSaver
-	)
-"
-DEPEND="${RDEPEND}
-	wayland? (
-		>=dev-libs/plasma-wayland-protocols-1.7.0
-		>=dev-libs/wayland-protocols-1.27:0
-	)
-"
-BDEPEND="wayland? ( >=dev-qt/qtwaylandscanner-${QTMIN}:5 )"
-
-PATCHES=( "${FILESDIR}/${P}-wayland-baloo-crashfix.patch" ) # bug 895636
-
-src_prepare() {
-	ecm_src_prepare
-	if ! use xscreensaver; then
-		sed -i -e "s/\${X11_Xscreensaver_FOUND}/0/" CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package wayland Qt5WaylandClient)
-		$(cmake_use_find_package X X11)
-		$(cmake_use_find_package X XCB)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-frameworks/kidletime/kidletime-5.104.0.ebuild b/kde-frameworks/kidletime/kidletime-5.104.0.ebuild
index da0df79b1718..abe35a8f772c 100644
--- a/kde-frameworks/kidletime/kidletime-5.104.0.ebuild
+++ b/kde-frameworks/kidletime/kidletime-5.104.0.ebuild
@@ -10,7 +10,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Framework for detection and notification of device idle time"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
 IUSE="wayland X xscreensaver"
 
 REQUIRED_USE="xscreensaver? ( X )"