[gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-desktop/, kde-plasma/plasma-meta/, kde-plasma/libkworkspace/, ...

[gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-desktop/, kde-plasma/plasma-meta/, kde-plasma/libkworkspace/, ...

[Andreas Sturmlechner]

commit:     9df042d20745c3e1eefcbb43ffafef8ebbc52a8e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 15 22:09:29 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jun 15 22:13:35 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=9df042d2

kde-plasma: Drop optional gui-wm/kwinft support from 5.19 stable branch

Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-plasma/libkscreen/libkscreen-5.19.49.9999.ebuild       | 14 +-------------
 kde-plasma/libkworkspace/libkworkspace-5.19.49.9999.ebuild |  5 +----
 .../plasma-desktop/plasma-desktop-5.19.49.9999.ebuild      |  5 +----
 kde-plasma/plasma-meta/plasma-meta-5.19.49.9999.ebuild     |  7 +++----
 .../plasma-workspace/plasma-workspace-5.19.49.9999.ebuild  |  5 +----
 5 files changed, 7 insertions(+), 29 deletions(-)

diff --git a/kde-plasma/libkscreen/libkscreen-5.19.49.9999.ebuild b/kde-plasma/libkscreen/libkscreen-5.19.49.9999.ebuild
index 551db497d2..5bfd8aa704 100644
--- a/kde-plasma/libkscreen/libkscreen-5.19.49.9999.ebuild
+++ b/kde-plasma/libkscreen/libkscreen-5.19.49.9999.ebuild
@@ -12,12 +12,11 @@ VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
 DESCRIPTION="Plasma screen management library"
-SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PN}-wrapland-support-5.18.80.tar.xz"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5/7"
 KEYWORDS=""
-IUSE="kwinft"
+IUSE=""
 
 DEPEND="
 	>=dev-qt/qtdbus-${QTMIN}:5
@@ -26,19 +25,8 @@ DEPEND="
 	>=kde-frameworks/kcoreaddons-${KFMIN}:5
 	>=kde-frameworks/kwayland-${KFMIN}:5
 	x11-libs/libxcb
-	kwinft? ( gui-libs/wrapland:5 )
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${WORKDIR}/${PN}-wrapland-support.patch" )
-
 # requires running session
 RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package kwinft Wrapland)
-	)
-
-	ecm_src_configure
-}

diff --git a/kde-plasma/libkworkspace/libkworkspace-5.19.49.9999.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.19.49.9999.ebuild
index 48a430ee12..d1b3caf2f2 100644
--- a/kde-plasma/libkworkspace/libkworkspace-5.19.49.9999.ebuild
+++ b/kde-plasma/libkworkspace/libkworkspace-5.19.49.9999.ebuild
@@ -32,10 +32,7 @@ COMMON_DEPEND="
 	x11-libs/libXau
 "
 DEPEND="${COMMON_DEPEND}
-	|| (
-		>=kde-plasma/kwin-${PVCUT}:5
-		>=gui-wm/kwinft-$(ver_cut 1-2):5
-	)
+	>=kde-plasma/kwin-${PVCUT}:5
 "
 RDEPEND="${COMMON_DEPEND}
 	!<kde-plasma/plasma-workspace-5.14.2:5

diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.19.49.9999.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.19.49.9999.ebuild
index 6b78081122..229e777060 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.19.49.9999.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.19.49.9999.ebuild
@@ -70,10 +70,7 @@ COMMON_DEPEND="
 	>=kde-frameworks/plasma-${KFMIN}:5
 	>=kde-frameworks/solid-${KFMIN}:5
 	>=kde-frameworks/sonnet-${KFMIN}:5
-	|| (
-		>=kde-plasma/kwin-${PVCUT}:5
-		>=gui-wm/kwinft-$(ver_cut 1-2):5
-	)
+	>=kde-plasma/kwin-${PVCUT}:5
 	>=kde-plasma/libksysguard-${PVCUT}:5
 	>=kde-plasma/plasma-workspace-${PVCUT}:5
 	media-libs/phonon[qt5(+)]

diff --git a/kde-plasma/plasma-meta/plasma-meta-5.19.49.9999.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.19.49.9999.ebuild
index 5443c4e4aa..eaecb7d814 100644
--- a/kde-plasma/plasma-meta/plasma-meta-5.19.49.9999.ebuild
+++ b/kde-plasma/plasma-meta/plasma-meta-5.19.49.9999.ebuild
@@ -10,7 +10,7 @@ LICENSE="metapackage"
 SLOT="5"
 KEYWORDS=""
 IUSE="bluetooth +browser-integration crypt +desktop-portal discover
-+display-manager elogind grub gtk +handbook +kwallet kwinft +legacy-systray
++display-manager elogind grub gtk +handbook +kwallet +legacy-systray
 +networkmanager plymouth pulseaudio qrcode +sddm sdk systemd thunderbolt +wallpapers"
 
 REQUIRED_USE="?? ( elogind systemd )"
@@ -32,10 +32,9 @@ RDEPEND="
 	>=kde-plasma/ksysguard-${PV}:${SLOT}
 	>=kde-plasma/kwayland-integration-${PV}:${SLOT}
 	>=kde-plasma/kwayland-server-${PV}:${SLOT}
-	!kwinft? ( >=kde-plasma/kwin-${PV}:${SLOT} )
-	kwinft? ( >=gui-wm/kwinft-$(ver_cut 1-2):${SLOT} )
+	>=kde-plasma/kwin-${PV}:${SLOT}
 	>=kde-plasma/kwrited-${PV}:${SLOT}
-	>=kde-plasma/libkscreen-${PV}:${SLOT}[kwinft?]
+	>=kde-plasma/libkscreen-${PV}:${SLOT}
 	>=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.19.49.9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.19.49.9999.ebuild
index 0206dfe4c6..95964d10c7 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.19.49.9999.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.19.49.9999.ebuild
@@ -68,10 +68,7 @@ COMMON_DEPEND="
 	>=kde-frameworks/plasma-${KFMIN}:5
 	>=kde-frameworks/solid-${KFMIN}:5
 	>=kde-plasma/kscreenlocker-${PVCUT}:5
-	|| (
-		>=kde-plasma/kwin-${PVCUT}:5
-		>=gui-wm/kwinft-$(ver_cut 1-2):5
-	)
+	>=kde-plasma/kwin-${PVCUT}:5
 	>=kde-plasma/libkscreen-${PVCUT}:5
 	>=kde-plasma/libksysguard-${PVCUT}:5
 	>=kde-plasma/libkworkspace-${PVCUT}:5