kde-plasma/plasma-desktop: drop 6.0.4

Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

3 files changed, 0 insertions, 304 deletions

diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index cba406dced17..d12ab0a8da32 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -1,5 +1,4 @@
 DIST plasma-desktop-5.27.11.tar.xz 14729900 BLAKE2B 3c023febf5c6dc72fdd3ca3696d5c5c84c5c099e8d66497e9fccde601a23ec19fc001d6b48f9b1160946ab46e0436e54dc20a91c56dafae455e8455fa558bfc4 SHA512 644bfe2235dcfc591ae66fc7090ca1e67fc8dfe80033c1b0bedc32cd76299a3f47e6c74eadee7ce80241efb31d20b561d9c06af457aa36b6528548b4eaee3eb9
-DIST plasma-desktop-6.0.4.tar.xz 15635644 BLAKE2B e3f468a603290c5ceb8cd530b66b32438b8625a65d933e333ede107da69dc1f8d2bd117905a839f6abc7098a6fb19eb1d0cbf8439a375cee43b9f23675a1b253 SHA512 6e682e2ff91bda05331f581a36afbf1ea571c8855a27280d871e0ae1cd570373f5bb781d078c010d8cf74da0f062deabd9186b161a08a3178304ea6c50816860
 DIST plasma-desktop-6.0.5.tar.xz 15632868 BLAKE2B 9ece4d16440ecd9f38bad29dc5039439662abf9c872103d9faa58c742b1b93d7825ad4bf6716778c5a3881b877c30d58dcecbaef117fb9ade2ef7d804acece3c SHA512 59ab3e024a5a947603556d596f52bbcedbe94a997f67955583534ad4fce9c95c03e98e977f6df47be13d6014c55266c3f0fee88fdde682fe5d1036c170577499
 DIST plasma-desktop-override-include-dirs-3.tar.xz 8288 BLAKE2B f05ece81d1b744d45a21a5963750011c1e815156bcaac6075fa67451ba8ab1ea0fcc5ca59c8109c6fe65f9d4db6ac003bb7e26bf011e124c5f9b7f9e1b3afef5 SHA512 fbfc08a4c057dab3ef96e3c56d5e6087916e952ff32280c6e23c0822e18739441082894ea36412be04eda0893a4e10b9a0fbf0a10e0e44f046b6e872840c4dbb
 DIST plasma-desktop-override-include-dirs-4.tar.xz 6360 BLAKE2B 8d4340f7b520ec2a4d47d7679028d5d75ceb141877248f7c411a082197ca9c0735ff2d21bd30333236c50dcae8bbdabd41164daa392b803504d2707ffd013960 SHA512 5273df12260d90e7aacc90b9ed7f6f1868c8996e2609229c59a771b3fb541b720f53fe2c2198d9d91870b05d06797bc4b2cec5afcf97d8b2b754f0da197584a1
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.90.0-override-include-dirs.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.90.0-override-include-dirs.patch
deleted file mode 100644
index de53c25d0114..000000000000
--- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.90.0-override-include-dirs.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-From 45f2c2ce1fc9d4b2f0d6418a95f04a71337239d4 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Mon, 6 Apr 2020 00:41:07 +0200
-Subject: [PATCH] Replace input drivers pkg_check_modules calls with manual
- targets
-
-All they need is one header each, allow include dir overrides.
-
-Evdev - evdev-properties.h
-XorgLibinput - libinput-properties.h
-XorgServer - xserver-properties.h
----
- CMakeLists.txt                   |  8 +-------
- config-gentoo.cmake              | 22 ++++++++++++++++++++++
- kcms/mouse/CMakeLists.txt        |  6 ------
- kcms/touchpad/CMakeLists.txt     |  3 ---
- kcms/touchpad/backends/x11.cmake |  2 +-
- 5 files changed, 24 insertions(+), 17 deletions(-)
- create mode 100644 config-gentoo.cmake
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b8868a130..ea950b050 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -224,16 +224,10 @@ set_package_properties(XCB PROPERTIES TYPE REQUIRED)
- add_feature_info("XCB-XKB" XCB_XKB_FOUND "Required for building kcm/keyboard")
- add_feature_info("libxft" X11_Xft_FOUND "X FreeType interface library required for font installation")
- 
--pkg_check_modules(XORGLIBINPUT xorg-libinput IMPORTED_TARGET)
--pkg_check_modules(EVDEV xorg-evdev>=2.8.99.1 IMPORTED_TARGET)
--pkg_check_modules(XORGSERVER xorg-server IMPORTED_TARGET)
-+include(config-gentoo.cmake)
- 
- ecm_find_qmlmodule(org.kde.pipewire 0.1)
- 
--if(XORGLIBINPUT_FOUND)
--  set(HAVE_XORGLIBINPUT 1)
--endif()
--
- include(ConfigureChecks.cmake)
- 
- find_package(PackageKitQt6)
-diff --git a/config-gentoo.cmake b/config-gentoo.cmake
-new file mode 100644
-index 000000000..0d7353c27
---- /dev/null
-+++ b/config-gentoo.cmake
-@@ -0,0 +1,22 @@
-+if(BUILD_KCM_MOUSE_X11)
-+    add_library(PkgConfig::XORGLIBINPUT INTERFACE IMPORTED)
-+    set_property(TARGET PkgConfig::XORGLIBINPUT PROPERTY
-+                INTERFACE_INCLUDE_DIRECTORIES "${XORGLIBINPUT_INCLUDE_DIRS}"
-+                )
-+
-+    add_library(PkgConfig::EVDEV INTERFACE IMPORTED)
-+    set_property(TARGET PkgConfig::EVDEV PROPERTY
-+                INTERFACE_INCLUDE_DIRECTORIES "${EVDEV_INCLUDE_DIRS}"
-+                )
-+endif()
-+
-+if(BUILD_KCM_TOUCHPAD_X11)
-+    add_library(PkgConfig::XORGSERVER INTERFACE IMPORTED)
-+    set_property(TARGET PkgConfig::XORGSERVER PROPERTY
-+                INTERFACE_INCLUDE_DIRECTORIES "${XORGSERVER_INCLUDE_DIRS}"
-+                )
-+endif()
-+
-+if(BUILD_KCM_MOUSE_X11 OR BUILD_KCM_TOUCHPAD_X11)
-+    set(HAVE_XORGLIBINPUT 1)
-+endif()
-diff --git a/kcms/mouse/CMakeLists.txt b/kcms/mouse/CMakeLists.txt
-index 639981380..2c9009061 100644
---- a/kcms/mouse/CMakeLists.txt
-+++ b/kcms/mouse/CMakeLists.txt
-@@ -32,12 +32,6 @@ if (BUILD_KCM_MOUSE_KWIN_WAYLAND)
- endif()
- 
- if (BUILD_KCM_MOUSE_X11)
--    if (NOT EVDEV_FOUND)
--        list(APPEND MISSING_DEPS "xorg-evdev")
--    endif()
--    if (NOT XORGLIBINPUT_FOUND)
--        list(APPEND MISSING_DEPS "xorg-libinput")
--    endif()
-     if (NOT X11_Xi_FOUND)
-         list(APPEND MISSING_DEPS "X11_Xi")
-     endif()
-diff --git a/kcms/touchpad/CMakeLists.txt b/kcms/touchpad/CMakeLists.txt
-index 309cb247d..33b4f8428 100644
---- a/kcms/touchpad/CMakeLists.txt
-+++ b/kcms/touchpad/CMakeLists.txt
-@@ -17,9 +17,6 @@ if (BUILD_KCM_TOUCHPAD_X11)
-     if (NOT X11_Xi_FOUND)
-         list(APPEND MISSING_DEPS "X11_Xi")
-     endif()
--    if (NOT XORGSERVER_FOUND)
--        list(APPEND MISSING_DEPS "xorg-server")
--    endif()
-     if (MISSING_DEPS)
-         message(FATAL_ERROR "Missing X11 dependencies for kcm_touchpad: ${MISSING_DEPS}. Install dependencies or set CMake option -DBUILD_KCM_TOUCHPAD_X11=OFF.")
-     endif()
-diff --git a/kcms/touchpad/backends/x11.cmake b/kcms/touchpad/backends/x11.cmake
-index 88bf0c676..33be94c49 100644
---- a/kcms/touchpad/backends/x11.cmake
-+++ b/kcms/touchpad/backends/x11.cmake
-@@ -10,7 +10,7 @@ SET(backend_SRCS
-     backends/x11/xrecordkeyboardmonitor.cpp
- )
- 
--if (XORGLIBINPUT_FOUND)
-+if (HAVE_XORGLIBINPUT)
- 
-     SET(backend_SRCS
-         ${backend_SRCS}
--- 
-2.43.0
-
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-6.0.4.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-6.0.4.ebuild
deleted file mode 100644
index c1de5247a60d..000000000000
--- a/kde-plasma/plasma-desktop/plasma-desktop-6.0.4.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="true"
-KFMIN=6.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=6.6.2
-inherit ecm plasma.kde.org optfeature
-
-DESCRIPTION="KDE Plasma desktop"
-XORGHDRS="${PN}-override-include-dirs-3"
-SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64"
-IUSE="ibus kaccounts scim screencast sdl +semantic-desktop X"
-
-RESTRICT="test" # missing selenium-webdriver-at-spi
-
-# slot op: Uses Qt6::GuiPrivate for qtx11extras_p.h
-# kde-frameworks/kwindowsystem[X]: Uses KX11Extras
-COMMON_DEPEND="
-	dev-libs/icu:=
-	dev-libs/wayland
-	>=dev-qt/qt5compat-${QTMIN}:6[qml]
-	>=dev-qt/qtbase-${QTMIN}:6=[concurrent,dbus,gui,network,sql,widgets,xml]
-	>=dev-qt/qtdeclarative-${QTMIN}:6
-	>=dev-qt/qtsvg-${QTMIN}:6
-	>=dev-qt/qtwayland-${QTMIN}:6
-	>=kde-frameworks/attica-${KFMIN}:6
-	>=kde-frameworks/karchive-${KFMIN}:6
-	>=kde-frameworks/kauth-${KFMIN}:6
-	>=kde-frameworks/kbookmarks-${KFMIN}:6
-	>=kde-frameworks/kcmutils-${KFMIN}:6
-	>=kde-frameworks/kcodecs-${KFMIN}:6
-	>=kde-frameworks/kcompletion-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/kded-${KFMIN}:6
-	>=kde-frameworks/kglobalaccel-${KFMIN}:6
-	>=kde-frameworks/kguiaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kiconthemes-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kitemmodels-${KFMIN}:6
-	>=kde-frameworks/kitemviews-${KFMIN}:6
-	>=kde-frameworks/kjobwidgets-${KFMIN}:6
-	>=kde-frameworks/knewstuff-${KFMIN}:6
-	>=kde-frameworks/knotifications-${KFMIN}:6
-	>=kde-frameworks/knotifyconfig-${KFMIN}:6
-	>=kde-frameworks/kpackage-${KFMIN}:6
-	>=kde-frameworks/kparts-${KFMIN}:6
-	>=kde-frameworks/krunner-${KFMIN}:6
-	>=kde-frameworks/kservice-${KFMIN}:6
-	>=kde-frameworks/ksvg-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kwindowsystem-${KFMIN}:6[X]
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-	>=kde-frameworks/solid-${KFMIN}:6
-	>=kde-frameworks/sonnet-${KFMIN}:6
-	>=kde-plasma/kwin-${PVCUT}:6
-	>=kde-plasma/libksysguard-${PVCUT}:6
-	>=kde-plasma/libplasma-${PVCUT}:6
-	>=kde-plasma/plasma-activities-${PVCUT}:6
-	>=kde-plasma/plasma-activities-stats-${PVCUT}:6
-	>=kde-plasma/plasma-workspace-${PVCUT}:6[screencast?]
-	>=kde-plasma/plasma5support-${PVCUT}:6
-	media-libs/libcanberra
-	x11-libs/libX11
-	x11-libs/libXi
-	X? (
-		x11-libs/libxcb
-		x11-libs/libXcursor
-		x11-libs/libxkbcommon
-		x11-libs/libxkbfile
-	)
-	ibus? (
-		app-i18n/ibus
-		dev-libs/glib:2
-		x11-libs/xcb-util-keysyms
-	)
-	kaccounts? (
-		kde-apps/kaccounts-integration:6
-		>=net-libs/accounts-qt-1.16_p20220803[qt6]
-	)
-	scim? ( app-i18n/scim )
-	sdl? ( media-libs/libsdl2[joystick] )
-	semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:6 )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/wayland-protocols-1.25
-	dev-libs/boost
-	x11-base/xorg-proto
-	test? (
-		>=kde-frameworks/qqc2-desktop-style-${KFMIN}:6
-		>=kde-plasma/kactivitymanagerd-${PVCUT}:6
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	!<kde-plasma/kdeplasma-addons-5.25.50
-	dev-libs/kirigami-addons:6
-	>=dev-qt/qtwayland-${QTMIN}:6
-	>=kde-frameworks/kirigami-${KFMIN}:6
-	>=kde-frameworks/qqc2-desktop-style-${KFMIN}:6
-	>=kde-plasma/kde-cli-tools-${PVCUT}:*
-	>=kde-plasma/oxygen-${PVCUT}:6
-	media-fonts/noto-emoji
-	sys-apps/util-linux
-	x11-apps/setxkbmap
-	x11-misc/xdg-user-dirs
-	kaccounts? ( >=net-libs/signon-oauth2-0.25_p20210102[qt6] )
-	screencast? ( >=kde-plasma/kpipewire-${PVCUT}:6 )
-"
-BDEPEND="
-	dev-util/intltool
-	dev-util/wayland-scanner
-	>=kde-frameworks/kcmutils-${KFMIN}:6
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.90.0-override-include-dirs.patch" # downstream patch
-)
-
-src_prepare() {
-	ecm_src_prepare
-
-	if ! use ibus; then
-		sed -e "s/XCB_XCB_FOUND AND XCB_KEYSYMS_FOUND/false/" \
-			-i applets/kimpanel/backend/ibus/CMakeLists.txt || die
-	fi
-
-	# TODO: try to get a build switch upstreamed
-	if ! use scim; then
-		sed -e "s/^pkg_check_modules.*SCIM/#&/" -i CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt6=ON # not packaged
-		$(cmake_use_find_package ibus GLIB2)
-		$(cmake_use_find_package kaccounts AccountsQt6)
-		$(cmake_use_find_package kaccounts KAccounts6)
-		$(cmake_use_find_package sdl SDL2)
-		$(cmake_use_find_package semantic-desktop KF6Baloo)
-		-DBUILD_KCM_MOUSE_X11=$(usex X)
-		-DBUILD_KCM_TOUCHPAD_X11=$(usex X)
-	)
-
-	if use X; then
-		mycmakeargs+=(
-			-DEVDEV_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
-			-DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
-			-DXORGSERVER_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
-		)
-	fi
-
-	ecm_src_configure
-}
-
-src_test() {
-	# parallel tests fail, foldermodeltest,positionertest hang, bug #646890
-	# test_kio_fonts needs D-Bus, bug #634166
-	# lookandfeel-kcmTest is unreliable for a long time, bug #607918
-	local myctestargs=(
-		-j1
-		-E "(foldermodeltest|positionertest|test_kio_fonts|lookandfeel-kcmTest)"
-	)
-
-	ecm_src_test
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		optfeature "screen reader support" "app-accessibility/orca"
-	fi
-	ecm_pkg_postinst
-}