commit: d964079e461022aab8e1adbece117f1a2dcd1fae Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Thu Apr 16 11:36:14 2020 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Thu Apr 16 13:56:29 2020 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=d964079e
kde-plasma: Optional gui-wm/kwinft support Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> kde-plasma/libkworkspace/libkworkspace-5.18.49.9999.ebuild | 5 ++++- kde-plasma/libkworkspace/libkworkspace-9999.ebuild | 5 ++++- kde-plasma/plasma-desktop/plasma-desktop-5.18.49.9999.ebuild | 5 ++++- kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild | 5 ++++- kde-plasma/plasma-meta/metadata.xml | 1 + kde-plasma/plasma-meta/plasma-meta-5.18.49.9999.ebuild | 9 +++++---- kde-plasma/plasma-meta/plasma-meta-9999.ebuild | 9 +++++---- kde-plasma/plasma-workspace/plasma-workspace-5.18.49.9999.ebuild | 5 ++++- kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild | 5 ++++- 9 files changed, 35 insertions(+), 14 deletions(-) diff --git a/kde-plasma/libkworkspace/libkworkspace-5.18.49.9999.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.18.49.9999.ebuild index 879922830e..a634618ea7 100644 --- a/kde-plasma/libkworkspace/libkworkspace-5.18.49.9999.ebuild +++ b/kde-plasma/libkworkspace/libkworkspace-5.18.49.9999.ebuild @@ -31,7 +31,10 @@ COMMON_DEPEND=" x11-libs/libXau " DEPEND="${COMMON_DEPEND} - >=kde-plasma/kwin-${PVCUT}:5 + || ( + >=kde-plasma/kwin-${PVCUT}:5 + >=gui-wm/kwinft-$(ver_cut 1-2):5 + ) " RDEPEND="${COMMON_DEPEND} !<kde-plasma/plasma-workspace-5.14.2:5 diff --git a/kde-plasma/libkworkspace/libkworkspace-9999.ebuild b/kde-plasma/libkworkspace/libkworkspace-9999.ebuild index f762643294..6773679c8a 100644 --- a/kde-plasma/libkworkspace/libkworkspace-9999.ebuild +++ b/kde-plasma/libkworkspace/libkworkspace-9999.ebuild @@ -32,7 +32,10 @@ COMMON_DEPEND=" x11-libs/libXau " DEPEND="${COMMON_DEPEND} - >=kde-plasma/kwin-${PVCUT}:5 + || ( + >=kde-plasma/kwin-${PVCUT}:5 + >=gui-wm/kwinft-$(ver_cut 1-2):5 + ) " RDEPEND="${COMMON_DEPEND} !<kde-plasma/plasma-workspace-5.14.2:5 diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.18.49.9999.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.18.49.9999.ebuild index 7d850cd93e..516d269bb9 100644 --- a/kde-plasma/plasma-desktop/plasma-desktop-5.18.49.9999.ebuild +++ b/kde-plasma/plasma-desktop/plasma-desktop-5.18.49.9999.ebuild @@ -77,7 +77,10 @@ COMMON_DEPEND=" >=kde-frameworks/plasma-${KFMIN}:5 >=kde-frameworks/solid-${KFMIN}:5 >=kde-frameworks/sonnet-${KFMIN}:5 - >=kde-plasma/kwin-${PVCUT}:5 + || ( + >=kde-plasma/kwin-${PVCUT}:5 + >=gui-wm/kwinft-$(ver_cut 1-2):5 + ) >=kde-plasma/libksysguard-${PVCUT}:5 >=kde-plasma/plasma-workspace-${PVCUT}:5 media-libs/phonon[qt5(+)] diff --git a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild index ec6504cb73..fd31f2ac7b 100644 --- a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild +++ b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild @@ -77,7 +77,10 @@ COMMON_DEPEND=" >=kde-frameworks/plasma-${KFMIN}:5 >=kde-frameworks/solid-${KFMIN}:5 >=kde-frameworks/sonnet-${KFMIN}:5 - >=kde-plasma/kwin-${PVCUT}:5 + || ( + >=kde-plasma/kwin-${PVCUT}:5 + >=gui-wm/kwinft-$(ver_cut 1-2):5 + ) >=kde-plasma/libksysguard-${PVCUT}:5 >=kde-plasma/plasma-workspace-${PVCUT}:5 media-libs/phonon[qt5(+)] diff --git a/kde-plasma/plasma-meta/metadata.xml b/kde-plasma/plasma-meta/metadata.xml index ad4cccb579..e3ad14b3e9 100644 --- a/kde-plasma/plasma-meta/metadata.xml +++ b/kde-plasma/plasma-meta/metadata.xml @@ -15,6 +15,7 @@ <flag name="elogind">Use <pkg>sys-auth/elogind</pkg> for session tracking</flag> <flag name="grub">Pull in Breeze theme for <pkg>sys-boot/grub</pkg></flag> <flag name="gtk">Enable Breeze widget style and system settings module for GTK+</flag> + <flag name="kwinft">Pull in <pkg>gui-wm/kwinft</pkg> instead of <pkg>kde-plasma/kwin</pkg></flag> <flag name="legacy-systray">Add support for legacy applications using <pkg>kde-plasma/xembed-sni-proxy</pkg></flag> <flag name="pam">Enable support for kwallet auto-unlocking</flag> <flag name="plymouth">Pull in Breeze theme for <pkg>sys-boot/plymouth</pkg></flag> diff --git a/kde-plasma/plasma-meta/plasma-meta-5.18.49.9999.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.18.49.9999.ebuild index f55a635c96..5cb896a062 100644 --- a/kde-plasma/plasma-meta/plasma-meta-5.18.49.9999.ebuild +++ b/kde-plasma/plasma-meta/plasma-meta-5.18.49.9999.ebuild @@ -10,8 +10,8 @@ LICENSE="metapackage" SLOT="5" KEYWORDS="" IUSE="bluetooth +browser-integration consolekit crypt +desktop-portal discover -+display-manager elogind grub gtk +handbook +legacy-systray networkmanager pam -plymouth pulseaudio qrcode +sddm sdk systemd thunderbolt +wallpapers" ++display-manager elogind grub gtk +handbook kwinft +legacy-systray networkmanager +pam plymouth pulseaudio qrcode +sddm sdk systemd thunderbolt +wallpapers" REQUIRED_USE="?? ( consolekit elogind systemd )" @@ -31,9 +31,10 @@ RDEPEND=" >=kde-plasma/ksshaskpass-${PV}:${SLOT} >=kde-plasma/ksysguard-${PV}:${SLOT} >=kde-plasma/kwayland-integration-${PV}:${SLOT} - >=kde-plasma/kwin-${PV}:${SLOT} + !kwinft? ( >=kde-plasma/kwin-${PV}:${SLOT} ) + kwinft? ( >=gui-wm/kwinft-$(ver_cut 1-2):${SLOT} ) >=kde-plasma/kwrited-${PV}:${SLOT} - >=kde-plasma/libkscreen-${PV}:${SLOT} + >=kde-plasma/libkscreen-${PV}:${SLOT}[kwinft?] >=kde-plasma/libksysguard-${PV}:${SLOT} >=kde-plasma/milou-${PV}:${SLOT} >=kde-plasma/oxygen-${PV}:${SLOT} diff --git a/kde-plasma/plasma-meta/plasma-meta-9999.ebuild b/kde-plasma/plasma-meta/plasma-meta-9999.ebuild index f55a635c96..5cb896a062 100644 --- a/kde-plasma/plasma-meta/plasma-meta-9999.ebuild +++ b/kde-plasma/plasma-meta/plasma-meta-9999.ebuild @@ -10,8 +10,8 @@ LICENSE="metapackage" SLOT="5" KEYWORDS="" IUSE="bluetooth +browser-integration consolekit crypt +desktop-portal discover -+display-manager elogind grub gtk +handbook +legacy-systray networkmanager pam -plymouth pulseaudio qrcode +sddm sdk systemd thunderbolt +wallpapers" ++display-manager elogind grub gtk +handbook kwinft +legacy-systray networkmanager +pam plymouth pulseaudio qrcode +sddm sdk systemd thunderbolt +wallpapers" REQUIRED_USE="?? ( consolekit elogind systemd )" @@ -31,9 +31,10 @@ RDEPEND=" >=kde-plasma/ksshaskpass-${PV}:${SLOT} >=kde-plasma/ksysguard-${PV}:${SLOT} >=kde-plasma/kwayland-integration-${PV}:${SLOT} - >=kde-plasma/kwin-${PV}:${SLOT} + !kwinft? ( >=kde-plasma/kwin-${PV}:${SLOT} ) + kwinft? ( >=gui-wm/kwinft-$(ver_cut 1-2):${SLOT} ) >=kde-plasma/kwrited-${PV}:${SLOT} - >=kde-plasma/libkscreen-${PV}:${SLOT} + >=kde-plasma/libkscreen-${PV}:${SLOT}[kwinft?] >=kde-plasma/libksysguard-${PV}:${SLOT} >=kde-plasma/milou-${PV}:${SLOT} >=kde-plasma/oxygen-${PV}:${SLOT} diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.18.49.9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.18.49.9999.ebuild index 29b5032465..0207d36acc 100644 --- a/kde-plasma/plasma-workspace/plasma-workspace-5.18.49.9999.ebuild +++ b/kde-plasma/plasma-workspace/plasma-workspace-5.18.49.9999.ebuild @@ -69,7 +69,10 @@ COMMON_DEPEND=" >=kde-frameworks/plasma-${KFMIN}:5 >=kde-frameworks/solid-${KFMIN}:5 >=kde-plasma/kscreenlocker-${PVCUT}:5 - >=kde-plasma/kwin-${PVCUT}:5 + || ( + >=kde-plasma/kwin-${PVCUT}:5 + >=gui-wm/kwinft-$(ver_cut 1-2):5 + ) >=kde-plasma/libkscreen-${PVCUT}:5 >=kde-plasma/libksysguard-${PVCUT}:5 >=kde-plasma/libkworkspace-${PVCUT}:5 diff --git a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild index b80062b2de..3feeef8312 100644 --- a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild +++ b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild @@ -68,7 +68,10 @@ COMMON_DEPEND=" >=kde-frameworks/plasma-${KFMIN}:5 >=kde-frameworks/solid-${KFMIN}:5 >=kde-plasma/kscreenlocker-${PVCUT}:5 - >=kde-plasma/kwin-${PVCUT}:5 + || ( + >=kde-plasma/kwin-${PVCUT}:5 + >=gui-wm/kwinft-$(ver_cut 1-2):5 + ) >=kde-plasma/libkscreen-${PVCUT}:5 >=kde-plasma/libksysguard-${PVCUT}:5 >=kde-plasma/libkworkspace-${PVCUT}:5