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

3 files changed, 8 insertions, 124 deletions

diff --git a/kde-plasma/libksysguard/Manifest b/kde-plasma/libksysguard/Manifest
index 60205a725522..c881f3981116 100644
--- a/kde-plasma/libksysguard/Manifest
+++ b/kde-plasma/libksysguard/Manifest
@@ -1,7 +1,6 @@
 AUX libksysguard-5.22.80-no-detailed-mem-message.patch 1091 BLAKE2B 1c15fbea7e0f46cb60f1423523eb53ed564b2d0d8d6ab0429851f1e73e1aef844cbdcb23cfa70c4b0aac125587caa924fed50da94c5cb8de49d5f215fd38c03a SHA512 281b047e7f7e4d3a8e8d5ca9247dd4aca538cb13d1ff3e35303c059187140586233cff1b7c50caf5f289f9e4f63a2f57421ff0389cbbb50ad3f408a2addb396b
-AUX libksysguard-5.26.0-with_x11.patch 4087 BLAKE2B adacb60e121142b090c3cb01af68c4d6e2ce42bbfb5d802b2f18f0a9f6bc1b83deb34a1a1f447a5bb26254cd9c1b9ff9d51f84f7370ed2267ba373855a347473 SHA512 d2ff6d12e540274267ad900d9e8699c6ead71f8583e12856e47eb6d29353f715cfca3f9934efca287a511d048078805f833d60e7c00e6a514d50b1d4fb558e47
 DIST libksysguard-5.25.5.tar.xz 783508 BLAKE2B c0b174991b14b5d422a5c5a8d50c19ac15c63d843aad9b946f65cc4fd1365fadd6c3b9af23e426d8f4e2ea4c4de22d025141f0b34c83e90d23cf16e408e531ed SHA512 c26bd5b3d6ac92a914d909e9d97691f0a851dcd069f158c5231f04bcb8d621defe49c667b166fd9b6fbea789bf37cc1a7dd9a52f53c942281f1ff0d76623baf8
 DIST libksysguard-5.26.5.tar.xz 796464 BLAKE2B c3e02dd6f66aec96556ae6587f55006f6efa43bfbc10ef601f4d249f41c2d5b31834795a53a7c55e5d5e3c0148e3922e81d6bebceead6da8deeadd7f20a70af8 SHA512 7ea143fde6daf141b73eb9ee6eabace8d0e5a3eb99a3b8a00ec1fe37cff4267ef20fb6c685a36aff303601b5f7c1d8c46082a542dd8dd06033b4b50a69e6d396
 EBUILD libksysguard-5.25.5.ebuild 1804 BLAKE2B 6594f0b394b005dfcfbdf52bec2f344abd3272e5b7c846fa4adb8e4be1b802d7c2cc64fd57a5fb4e4a4b1f59489e6a9f352304691b370e6018b0ca4cdd2a9b2d SHA512 1251c8d4cc14f89fa40d167f3d25215fba1a6b42915eeac1a6f62642bfb8212996e653713d22eb1d4c9141f580136bf323d82612967308cd0f41741025b96c28
-EBUILD libksysguard-5.26.5.ebuild 1995 BLAKE2B ab87de2f3e471113268caf596da7911f134190ebe50891fbba76972ab5bb52c2f390de9a5800590146f57366255d6a8454d5b91564ba0c51cf83e3f7b15b1a1d SHA512 fccc85a1a513e8e52dabfece2fb66062de7e87bc24182adca6068d3fef305ae0a74412959deaddf962cea2f2887aab125848692e76b575b67275d89b8e48d6ee
+EBUILD libksysguard-5.26.5-r1.ebuild 1890 BLAKE2B 2db4218572a88b652aa9ddb89c52be67b9d54ae4e28f9d8f3a01c70ad7afd7a385f3bc25550cd201a9360453ae9a1f1b7758d62b882b4a1660be7a0bafe084bc SHA512 3f60fa5415fe241569e7bface38bc2ac0de6e25bcb2d1f11c3b0bddd3a8e41b0a32d2c419c5d9a8fb21b9c2a56748337981e60b447762746fa7bb1009f07afa3
 MISC metadata.xml 611 BLAKE2B 7e821b5bc0966b855561677eb598ec5eca351955c79f40e2f8622981eb02a206a07b47aec23db6efea5e08edfa2546a01f7f953ed7c7c3dae46ac1fa3f8cfeaa SHA512 ebdb86fa4d523efa0fd614acd9b2275284fb8298a75532d6afb272fe92cd927486044074121811f34ec8096d6de331934413347d1ca6f0f137e5beda0cdfc302
diff --git a/kde-plasma/libksysguard/files/libksysguard-5.26.0-with_x11.patch b/kde-plasma/libksysguard/files/libksysguard-5.26.0-with_x11.patch
deleted file mode 100644
index d27504413384..000000000000
--- a/kde-plasma/libksysguard/files/libksysguard-5.26.0-with_x11.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-From c389fbdaff34e35b0cd5de32b52e818714e13d40 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Mon, 1 Aug 2022 16:53:42 +0200
-Subject: [PATCH] Add CMake option to build WITH_X11
-
-We want to be able to build without X11 support even if some of the used
-libraries may not work w/o X11 themselves yet or need to be built with
-X11 support for other reverse dependencies.
-
-HAVE_X11 already exists and is set automagically so far, but using
--DCMAKE_DISABLE_FIND_PACKAGE_X11 will break if any dependencies list X11
-as required in their cmake config.
-
-- Cleanup HAVE_* definitions a bit
-- Clarify X11 PURPOSE a bit
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMakeLists.txt           | 44 ++++++++++++++++++++++------------------
- processui/CMakeLists.txt |  4 ++--
- 2 files changed, 26 insertions(+), 22 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 55938c4..5d4e085 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -65,25 +65,31 @@ ecm_setup_version(${PROJECT_VERSION}
-                   SOVERSION 9
- )
- 
--find_package(X11)
--set_package_properties(X11 PROPERTIES DESCRIPTION "X11 libraries"
--                        URL "https://www.x.org"
--                        TYPE OPTIONAL
--                        PURPOSE "Required for building the X11 based workspace"
--                    )
--if(X11_FOUND)
--    if (QT_MAJOR_VERSION STREQUAL "5")
--        find_package(Qt5X11Extras REQUIRED)
--    elseif (QT_MAJOR_VERSION STREQUAL "6")
--        find_package(Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} CONFIG REQUIRED Gui) # qtx11extras_p.h
--    endif()
--    set(HAVE_X11 1)
--    find_library(X11_XRes_LIB XRes ${X11_LIB_SEARCH_PATH})
--    find_path(X11_XRes_INCLUDE_PATH X11/extensions/XRes.h ${X11_INC_SEARCH_PATH})
--
--    if(X11_XRes_LIB AND X11_XRes_INCLUDE_PATH)
--        set(X11_XRes_FOUND TRUE)
-+option(WITH_X11 "Build with X11 support." ON)
-+if(WITH_X11)
-+    find_package(X11)
-+    set_package_properties(X11 PROPERTIES DESCRIPTION "X11 libraries"
-+                            URL "https://www.x.org"
-+                            TYPE OPTIONAL
-+                            PURPOSE "Required for building Process UI with X11 support"
-+                        )
-+    if(X11_FOUND)
-+        if (QT_MAJOR_VERSION STREQUAL "5")
-+            find_package(Qt5X11Extras REQUIRED)
-+        elseif (QT_MAJOR_VERSION STREQUAL "6")
-+            find_package(Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} CONFIG REQUIRED Gui) # qtx11extras_p.h
-+        endif()
-+        set(HAVE_X11 1)
-+        find_library(X11_XRes_LIB XRes ${X11_LIB_SEARCH_PATH})
-+        find_path(X11_XRes_INCLUDE_PATH X11/extensions/XRes.h ${X11_INC_SEARCH_PATH})
-+
-+        if(X11_XRes_LIB AND X11_XRes_INCLUDE_PATH)
-+            set(HAVE_XRES 1)
-+        endif()
-     endif()
-+else()
-+    set(HAVE_X11 0)
-+    set(HAVE_XRES 0)
- endif()
- 
- set(WEBENGINE_SCRIPTING_ENABLED FALSE)
-@@ -122,8 +128,6 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-         PURPOSE "Used for reading hardware sensors")
- endif()
- 
--set(HAVE_X11 ${X11_FOUND})
--set(HAVE_XRES ${X11_XRes_FOUND})
- configure_file(config-ksysguard.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-ksysguard.h )
- 
- option(BUILD_DESIGNERPLUGIN "Build plugin for Qt Designer" ON)
-diff --git a/processui/CMakeLists.txt b/processui/CMakeLists.txt
-index 2932733..c9bd800 100644
---- a/processui/CMakeLists.txt
-+++ b/processui/CMakeLists.txt
-@@ -30,7 +30,7 @@ ki18n_wrap_ui( processui_LIB_SRCS
- add_library(processui ${processui_LIB_SRCS})
- add_library(KSysGuard::ProcessUi ALIAS processui)
- 
--if(X11_XRes_FOUND)
-+if(HAVE_XRES)
-     target_link_libraries(processui PRIVATE ${X11_XRes_LIB} ${X11_LIBRARIES})
-     include_directories(${X11_XRes_INCLUDE_PATH})
- endif()
-@@ -59,7 +59,7 @@ target_include_directories(processui
-         "$<BUILD_INTERFACE:${libksysguard_SOURCE_DIR}>"
-         "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR}/ksysguard>"
- )
--if(X11_FOUND)
-+if(HAVE_X11)
-     if (QT_MAJOR_VERSION STREQUAL "5")
-        target_link_libraries(processui PRIVATE Qt::X11Extras KF5::WindowSystem)
-     else()
--- 
-2.35.1
-
diff --git a/kde-plasma/libksysguard/libksysguard-5.26.5.ebuild b/kde-plasma/libksysguard/libksysguard-5.26.5-r1.ebuild
index d9c38f3b05fc..43bb682c183b 100644
--- a/kde-plasma/libksysguard/libksysguard-5.26.5.ebuild
+++ b/kde-plasma/libksysguard/libksysguard-5.26.5-r1.ebuild
@@ -15,8 +15,9 @@ DESCRIPTION="Task management and system monitoring library"
 LICENSE="LGPL-2+"
 SLOT="5/9"
 KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
-IUSE="webengine X"
+IUSE="webengine"
 
+# kde-frameworks/kwindowsystem[X]: Unconditional use of KX11Extras
 COMMON_DEPEND="
 	dev-libs/libnl:3
 	>=dev-qt/qtdbus-${QTMIN}:5
@@ -24,6 +25,7 @@ COMMON_DEPEND="
 	>=dev-qt/qtgui-${QTMIN}:5
 	>=dev-qt/qtnetwork-${QTMIN}:5
 	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
 	>=kde-frameworks/kauth-${KFMIN}:5
 	>=kde-frameworks/kcompletion-${KFMIN}:5
 	>=kde-frameworks/kconfig-${KFMIN}:5[qml]
@@ -34,24 +36,21 @@ COMMON_DEPEND="
 	>=kde-frameworks/knewstuff-${KFMIN}:5
 	>=kde-frameworks/kpackage-${KFMIN}:5
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5[X]
 	net-libs/libpcap
 	sys-apps/lm-sensors:=
 	sys-libs/libcap
 	sys-libs/zlib
+	x11-libs/libX11
+	x11-libs/libXres
 	webengine? (
 		>=dev-qt/qtwebchannel-${QTMIN}:5
 		>=dev-qt/qtwebengine-${QTMIN}:5
 	)
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libX11
-		x11-libs/libXres
-	)
 "
 DEPEND="${COMMON_DEPEND}
 	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	X? ( x11-base/xorg-proto )
+	x11-base/xorg-proto
 "
 RDEPEND="${COMMON_DEPEND}
 	!<kde-plasma/ksysguard-5.21.90:5
@@ -60,16 +59,12 @@ RDEPEND="${COMMON_DEPEND}
 PATCHES=(
 	# downstream patch
 	"${FILESDIR}/${PN}-5.22.80-no-detailed-mem-message.patch"
-	# pending upstream:
-	# https://invent.kde.org/plasma/libksysguard/-/merge_requests/238
-	"${FILESDIR}/${PN}-5.26.0-with_x11.patch"
 )
 
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package webengine Qt5WebChannel)
 		$(cmake_use_find_package webengine Qt5WebEngineWidgets)
-		-DWITH_X11=$(usex X)
 	)
 
 	ecm_src_configure