gentoo auto-resync : 15:01:2023 - 17:55:24

5 files changed, 1 insertions, 149 deletions

diff --git a/kde-frameworks/kwindowsystem/Manifest b/kde-frameworks/kwindowsystem/Manifest
index b068985d1e80..371600d6c441 100644
--- a/kde-frameworks/kwindowsystem/Manifest
+++ b/kde-frameworks/kwindowsystem/Manifest
@@ -1,9 +1,5 @@
-AUX kwindowsystem-5.101.0-always-provide-KX11Extras.patch 1313 BLAKE2B 3755d45569972c3df9dae5462a5952ae0fb5e5bf4d8401afaecc132eba08c018f06cec684560acb8467749606febafefce300ea9020a23898a805a2bb26a694a SHA512 e74329470a9ad65fa05c52b0ca995feadf01a6c926ccf2ec9a5f42400f373e913f5926e1889494d6125d15eed0ea5928e59af02aa49c72a77258c6e61d4d3e02
-AUX kwindowsystem-5.101.0-cmake.patch 1521 BLAKE2B 8b9eecd287a54ccb6baff6deea7eff9c1a7229766d3532e0df1c5046b40893a54d9c71052b2cbf83f899c0fabbd1664a9c8dcf00b0cfcf40f509c6743680549e SHA512 0d90dcc7867786d87daeeeb3afe2094cc77af98596feda5b5db17c6468da81c15fd5d8cb4301127a4d537fcdfd86f044e5ccc492b939f76782a94dd129e9d31c
-DIST kwindowsystem-5.101.0.tar.xz 2435020 BLAKE2B 1f1834eeea3fb0fc0c9bcb0141532fec62ef510122b0a3adef650de0f4c35a5a5acbb8bc9e5a03847f6025071b3eed386a897700d283b1e8b5cf0982bbaaa847 SHA512 86518f0f96a1e364bed48c00fb824a5a61226cb0ca0132f051c2a315cd7df6076c2bbbee0e3e14aff936a7fa60d44ca61f7ae6f20508474b2a02a380d8310ab2
 DIST kwindowsystem-5.102.0.tar.xz 2435292 BLAKE2B 250d5ecc7d174257e9e3c4d80c9e7768713e0d8547de2d40ebaa93de48e8bd0c88115aeb0be166738f2175128feae3051b7a5b213feef3af4f5c085c4b5946aa SHA512 bdd2045c3ec8d78e912f9291759b6131dfd4bd944fb510b92045820b0e02dfceeb1e80efaf2cb28dda6150464be015581da6dfaf632c03d24cf8cdaf6112eaac
 DIST kwindowsystem-5.99.0.tar.xz 182540 BLAKE2B c4789c96b65ba678e32264cb28c344866c39a08007a5324876247c3e823825202b8314c402e5a854569b6b459dabbcf8ffbc9bf8bd4c58ac95ef6eb8ff8e2cff SHA512 91719c273730693cd49dcd4a94701190d983a9c64a74cbd66143901efd77de8e78a6fffb0cc289888567ce66541ca64685458cac932b6fd7333e18a38487c1bd
-EBUILD kwindowsystem-5.101.0-r1.ebuild 1060 BLAKE2B 9faebbaa6221c808cb9e1185e29cef174a369127d44fb13142a3be2ac9bbf24ddc7bb8fbf6a58d5a426309c8d302a915c02e54c74750272a1b4dfd748c41bd0a SHA512 a048e7c4ed03900afa0a0b8336e8e63bb98cf1bed759125dba788f4754abac353eeb891bbf96238b62e1e528156d89bd0e59ab98229da6df40767d3e68876ee6
-EBUILD kwindowsystem-5.102.0.ebuild 1025 BLAKE2B 64c8e79d2a3728b23950ea9c541ba2773091b5c252c5ca70b5d1e211b4c0aa51687690e3d17743e7661d48d386c312c7fbcc1a23391fbd59de0fcd5a994590f6 SHA512 02977efa965e5be216d3afe294e861951951da1a0ed5b7762d194398277d9a8d864ef2e49236b2c5582b344c8a48a35ffc4dafd1094a06da4e8b51546a2e3d74
+EBUILD kwindowsystem-5.102.0-r1.ebuild 939 BLAKE2B 002a30af40333aea2c1496e516a7979ce9a0f2ea63f3c7bbb4c869f81ed18d16c20f31f2ec79c688d09afd5afb9b7de009c38184ecb41b3f9fa9f3b4c235fc45 SHA512 9f2d93685d28cb1155c50b963f033c57ee2506dac349f856f86e3e18eef1526f281adf7278112c025890f0e85b5bb0ed85e10e1722e502b68d77afbd32d8935d
 EBUILD kwindowsystem-5.99.0-r1.ebuild 936 BLAKE2B 40e28fc73ab17309cf56c8905bfa6884edd53f1b4a5af60993dcaa1f93e04e320b6ea5fe5f17135ae5c2f26c80a3dc821baece2757e75768265449b6ddbf2b10 SHA512 88d097c65a055fe68bb4506b46d548f594fda1e9ea7d859854e707553b24dae1fe8f841bbe43a126181a17d07b605944a0c0520241599a11f259578563367bec
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kwindowsystem/files/kwindowsystem-5.101.0-always-provide-KX11Extras.patch b/kde-frameworks/kwindowsystem/files/kwindowsystem-5.101.0-always-provide-KX11Extras.patch
deleted file mode 100644
index 94c019c82e5b..000000000000
--- a/kde-frameworks/kwindowsystem/files/kwindowsystem-5.101.0-always-provide-KX11Extras.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 9f4229d2628d882b5aa2248546ad23f2e8d280dd Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Thu, 5 Jan 2023 13:38:38 +0100
-Subject: [PATCH 2/2] Always provide KX11Extras
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- src/CMakeLists.txt | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 27577ef..fb7c28e 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -36,6 +36,10 @@ ecm_qt_declare_logging_category(KF5WindowSystem
-     EXPORT KWINDOWSYSTEM
- )
- 
-+target_sources(KF5WindowSystem PRIVATE
-+    kx11extras.cpp
-+)
-+
- if (KWINDOWSYSTEM_HAVE_X11)
-    if(NOT X11_Xfixes_LIB)
-       message(FATAL_ERROR "The XFixes library could not be found. Please install the development package for it.")
-@@ -71,7 +75,6 @@ if (KWINDOWSYSTEM_HAVE_X11)
-         platforms/xcb/kxmessages.cpp
-         platforms/xcb/kxutils.cpp
-         platforms/xcb/netwm.cpp
--        kx11extras.cpp
-    )
- 
-    # we install kkeyserver_x11.h which needs the X11 headers available
-@@ -149,7 +152,7 @@ ecm_generate_headers(KWindowSystem_HEADERS
-   REQUIRED_HEADERS KWindowSystem_HEADERS
- )
- 
--if (KWINDOWSYSTEM_HAVE_X11)
-+if (TRUE)
-     ecm_generate_headers(KWindowSystem_HEADERS
-     HEADER_NAMES
-     KX11Extras
--- 
-2.39.0
-
diff --git a/kde-frameworks/kwindowsystem/files/kwindowsystem-5.101.0-cmake.patch b/kde-frameworks/kwindowsystem/files/kwindowsystem-5.101.0-cmake.patch
deleted file mode 100644
index 721f1ee997c4..000000000000
--- a/kde-frameworks/kwindowsystem/files/kwindowsystem-5.101.0-cmake.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 765dd7112f728369d63e3be91c844e0cdf8674c1 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Thu, 5 Jan 2023 13:21:00 +0100
-Subject: [PATCH 1/2] Merge two KWINDOWSYSTEM_HAVE_X11 sections into one
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- src/CMakeLists.txt | 15 +++++----------
- 1 file changed, 5 insertions(+), 10 deletions(-)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 163ea38..27577ef 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -36,16 +36,6 @@ ecm_qt_declare_logging_category(KF5WindowSystem
-     EXPORT KWINDOWSYSTEM
- )
- 
--if (KWINDOWSYSTEM_HAVE_X11)
--  target_sources(KF5WindowSystem PRIVATE
--    platforms/xcb/kselectionowner.cpp
--    platforms/xcb/kselectionwatcher.cpp
--    platforms/xcb/kxerrorhandler.cpp
--    platforms/xcb/kxutils.cpp
--    kx11extras.cpp
--  )
--endif()
--
- if (KWINDOWSYSTEM_HAVE_X11)
-    if(NOT X11_Xfixes_LIB)
-       message(FATAL_ERROR "The XFixes library could not be found. Please install the development package for it.")
-@@ -75,8 +65,13 @@ if (KWINDOWSYSTEM_HAVE_X11)
- 
-    target_sources(KF5WindowSystem PRIVATE
-         platforms/xcb/kkeyserver.cpp
-+        platforms/xcb/kselectionowner.cpp
-+        platforms/xcb/kselectionwatcher.cpp
-+        platforms/xcb/kxerrorhandler.cpp
-         platforms/xcb/kxmessages.cpp
-+        platforms/xcb/kxutils.cpp
-         platforms/xcb/netwm.cpp
-+        kx11extras.cpp
-    )
- 
-    # we install kkeyserver_x11.h which needs the X11 headers available
--- 
-2.39.0
-
diff --git a/kde-frameworks/kwindowsystem/kwindowsystem-5.101.0-r1.ebuild b/kde-frameworks/kwindowsystem/kwindowsystem-5.101.0-r1.ebuild
deleted file mode 100644
index 4841645c5e3c..000000000000
--- a/kde-frameworks/kwindowsystem/kwindowsystem-5.101.0-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QTMIN=5.15.5
-VIRTUALX_REQUIRED="test"
-inherit ecm frameworks.kde.org
-
-DESCRIPTION="Framework providing access to properties and features of the window manager"
-
-LICENSE="|| ( LGPL-2.1 LGPL-3 ) MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
-IUSE="wayland X"
-
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libX11
-		x11-libs/libXfixes
-		x11-libs/libxcb
-		x11-libs/xcb-util-keysyms
-	)
-"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )
-	test? ( >=dev-qt/qtwidgets-${QTMIN}:5 )
-"
-BDEPEND=">=dev-qt/linguist-tools-${QTMIN}:5"
-PDEPEND="wayland? ( >=kde-plasma/kwayland-integration-5.25.5-r1:5 )"
-
-DOCS=( docs/README.kstartupinfo )
-
-PATCHES=(
-	"${FILESDIR}/${P}-cmake.patch" # KF 5.102
-	"${FILESDIR}/${P}-always-provide-KX11Extras.patch" # bug 885525
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DKWINDOWSYSTEM_NO_WIDGETS=ON
-		$(cmake_use_find_package X X11)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-frameworks/kwindowsystem/kwindowsystem-5.102.0.ebuild b/kde-frameworks/kwindowsystem/kwindowsystem-5.102.0-r1.ebuild
index 87045dd4e1d0..0b3f7a48a882 100644
--- a/kde-frameworks/kwindowsystem/kwindowsystem-5.102.0.ebuild
+++ b/kde-frameworks/kwindowsystem/kwindowsystem-5.102.0-r1.ebuild
@@ -34,8 +34,6 @@ PDEPEND="wayland? ( >=kde-plasma/kwayland-integration-5.25.5-r1:5 )"
 
 DOCS=( docs/README.kstartupinfo )
 
-PATCHES=( "${FILESDIR}/${PN}-5.101.0-always-provide-KX11Extras.patch" ) # bug 885525
-
 src_configure() {
 	local mycmakeargs=(
 		-DKWINDOWSYSTEM_NO_WIDGETS=ON