[gentoo-commits] proj/kde:master commit in: kde-plasma/kwin/

[Andreas Sturmlechner]

commit:     47b618343c70b76a5b62ce4481c17824a72d4fd2
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 29 13:19:23 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Nov 29 13:20:35 2021 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=47b61834

kde-plasma/kwin: Add missing RDEPEND on sys-apps/hwdata

Upstream commit 33a1777a5ab0668da997e18173f4a50643748f1c

Bug: https://bugs.gentoo.org/717216
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-plasma/kwin/kwin-5.23.49.9999.ebuild | 7 ++-----
 kde-plasma/kwin/kwin-9999.ebuild         | 7 ++-----
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/kde-plasma/kwin/kwin-5.23.49.9999.ebuild b/kde-plasma/kwin/kwin-5.23.49.9999.ebuild
index 268d538ba1..d9929b0bb5 100644
--- a/kde-plasma/kwin/kwin-5.23.49.9999.ebuild
+++ b/kde-plasma/kwin/kwin-5.23.49.9999.ebuild
@@ -76,17 +76,14 @@ COMMON_DEPEND="
 	plasma? ( >=kde-frameworks/krunner-${KFMIN}:5 )
 	screencast? ( >=media-video/pipewire-0.3:= )
 "
-# TODO: sys-apps/hwdata? not packaged yet; commit 33a1777a, Gentoo-bug 717216
 RDEPEND="${COMMON_DEPEND}
 	>=dev-qt/qtquickcontrols-${QTMIN}:5
 	>=dev-qt/qtquickcontrols2-${QTMIN}:5
 	>=dev-qt/qtvirtualkeyboard-${QTMIN}:5
 	>=kde-frameworks/kirigami-${KFMIN}:5
 	>=kde-frameworks/kitemmodels-${KFMIN}:5[qml]
-	|| (
-		x11-base/xwayland
-		x11-base/xorg-server[wayland(-)]
-	)
+	sys-apps/hwdata
+	x11-base/xwayland
 	multimedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5[gstreamer,qml] )
 "
 DEPEND="${COMMON_DEPEND}

diff --git a/kde-plasma/kwin/kwin-9999.ebuild b/kde-plasma/kwin/kwin-9999.ebuild
index b7452293ae..f0a061b8f4 100644
--- a/kde-plasma/kwin/kwin-9999.ebuild
+++ b/kde-plasma/kwin/kwin-9999.ebuild
@@ -76,17 +76,14 @@ COMMON_DEPEND="
 	plasma? ( >=kde-frameworks/krunner-${KFMIN}:5 )
 	screencast? ( >=media-video/pipewire-0.3:= )
 "
-# TODO: sys-apps/hwdata? not packaged yet; commit 33a1777a, Gentoo-bug 717216
 RDEPEND="${COMMON_DEPEND}
 	>=dev-qt/qtquickcontrols-${QTMIN}:5
 	>=dev-qt/qtquickcontrols2-${QTMIN}:5
 	>=dev-qt/qtvirtualkeyboard-${QTMIN}:5
 	>=kde-frameworks/kirigami-${KFMIN}:5
 	>=kde-frameworks/kitemmodels-${KFMIN}:5[qml]
-	|| (
-		x11-base/xwayland
-		x11-base/xorg-server[wayland(-)]
-	)
+	sys-apps/hwdata
+	x11-base/xwayland
 	multimedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5[gstreamer,qml] )
 "
 DEPEND="${COMMON_DEPEND}