commit: 73f1a3a992d7a2f802b643c0c6b0cc67db403259 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun Nov 29 11:02:09 2020 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun Nov 29 20:57:47 2020 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=73f1a3a9
kde-plasma/khotkeys: Update DEPENDs Upstream commit 8ba8a29, reverting commit 1d60f46f, see also: https://invent.kde.org/plasma/khotkeys/-/merge_requests/7 Package-Manager: Portage-3.0.11, Repoman-3.0.2 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../files/khotkeys-5.20.4-unused-dep.patch | 28 ++++++++++++++++++++++ kde-plasma/khotkeys/khotkeys-5.20.49.9999.ebuild | 3 +++ kde-plasma/khotkeys/khotkeys-9999.ebuild | 1 + 3 files changed, 32 insertions(+) diff --git a/kde-plasma/khotkeys/files/khotkeys-5.20.4-unused-dep.patch b/kde-plasma/khotkeys/files/khotkeys-5.20.4-unused-dep.patch new file mode 100644 index 0000000000..6d39c54657 --- /dev/null +++ b/kde-plasma/khotkeys/files/khotkeys-5.20.4-unused-dep.patch @@ -0,0 +1,28 @@ +From 5f622844605a569eec776f3cdd0954ccefd8c99b Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <ast...@gentoo.org> +Date: Sun, 29 Nov 2020 11:55:10 +0100 +Subject: [PATCH] Drop unused KF5Plasma dependency + +This had been already dropped in commit 1d60f46f, which was reverted in +commit 8ba8a29c. At least that part of it was correct though. + +Signed-off-by: Andreas Sturmlechner <ast...@gentoo.org> +--- + CMakeLists.txt | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a945dee..b49bff1 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -32,7 +32,6 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS + KDELibs4Support + DBusAddons + KCMUtils +- Plasma + ) + + find_package(X11 REQUIRED OPTIONAL_COMPONENTS Xtst) +-- +2.29.2 + diff --git a/kde-plasma/khotkeys/khotkeys-5.20.49.9999.ebuild b/kde-plasma/khotkeys/khotkeys-5.20.49.9999.ebuild index 4fb73e1d54..1186835fab 100644 --- a/kde-plasma/khotkeys/khotkeys-5.20.49.9999.ebuild +++ b/kde-plasma/khotkeys/khotkeys-5.20.49.9999.ebuild @@ -35,6 +35,7 @@ COMMON_DEPEND=" >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 >=kde-frameworks/kwindowsystem-${KFMIN}:5 >=kde-frameworks/kxmlgui-${KFMIN}:5 + >=kde-plasma/libkworkspace-${PVCUT}:5 x11-libs/libX11 x11-libs/libXtst " @@ -47,3 +48,5 @@ RDEPEND="${COMMON_DEPEND} >=kde-frameworks/kded-${KFMIN}:5 >=kde-plasma/kde-cli-tools-${PVCUT}:5 " + +PATCHES=( "${FILESDIR}"/${PN}-5.20.4-unused-dep.patch ) diff --git a/kde-plasma/khotkeys/khotkeys-9999.ebuild b/kde-plasma/khotkeys/khotkeys-9999.ebuild index 6e5a1b3061..9888497911 100644 --- a/kde-plasma/khotkeys/khotkeys-9999.ebuild +++ b/kde-plasma/khotkeys/khotkeys-9999.ebuild @@ -35,6 +35,7 @@ COMMON_DEPEND=" >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 >=kde-frameworks/kwindowsystem-${KFMIN}:5 >=kde-frameworks/kxmlgui-${KFMIN}:5 + >=kde-plasma/libkworkspace-${PVCUT}:5 x11-libs/libX11 x11-libs/libXtst "
