[gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/, kde-plasma/kwayland-integration/, ...

[gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/, kde-plasma/kwayland-integration/, ...

[Andreas Sturmlechner]

commit:     f85d38630daf8bf561fbd34c4ee2cff5a397753d
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Apr  1 18:17:09 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Apr 18 11:23:06 2022 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=f85d3863

kde-plasma: Drop dev-qt/qtwayland as qtwaylandscanner provider

Qt 5.15.2 is gone now anyway, let's help Portage at figuring it out.

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

 .../kwayland-integration/kwayland-integration-5.24.49.9999.ebuild  | 5 +----
 kde-plasma/kwayland-server/kwayland-server-5.24.49.9999.ebuild     | 5 +----
 kde-plasma/kwin/kwin-5.24.49.9999.ebuild                           | 7 +------
 kde-plasma/layer-shell-qt/layer-shell-qt-5.24.49.9999.ebuild       | 5 +----
 kde-plasma/libkscreen/libkscreen-5.24.49.9999.ebuild               | 5 +----
 kde-plasma/plasma-workspace/plasma-workspace-5.24.49.9999.ebuild   | 5 +----
 .../xdg-desktop-portal-kde-5.24.49.9999.ebuild                     | 7 +------
 7 files changed, 7 insertions(+), 32 deletions(-)

diff --git a/kde-plasma/kwayland-integration/kwayland-integration-5.24.49.9999.ebuild b/kde-plasma/kwayland-integration/kwayland-integration-5.24.49.9999.ebuild
index f402a5b1e6..d72e07263a 100644
--- a/kde-plasma/kwayland-integration/kwayland-integration-5.24.49.9999.ebuild
+++ b/kde-plasma/kwayland-integration/kwayland-integration-5.24.49.9999.ebuild
@@ -40,9 +40,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 BDEPEND="
-	|| (
-		>=dev-qt/qtwaylandscanner-${QTMIN}:5
-		<dev-qt/qtwayland-5.15.3:5
-	)
+	>=dev-qt/qtwaylandscanner-${QTMIN}:5
 	virtual/pkgconfig
 "

diff --git a/kde-plasma/kwayland-server/kwayland-server-5.24.49.9999.ebuild b/kde-plasma/kwayland-server/kwayland-server-5.24.49.9999.ebuild
index b4e8908791..dab7139347 100644
--- a/kde-plasma/kwayland-server/kwayland-server-5.24.49.9999.ebuild
+++ b/kde-plasma/kwayland-server/kwayland-server-5.24.49.9999.ebuild
@@ -34,9 +34,6 @@ DEPEND="${RDEPEND}
 	>=dev-libs/wayland-protocols-1.24
 "
 BDEPEND="
-	|| (
-		>=dev-qt/qtwaylandscanner-${QTMIN}:5
-		<dev-qt/qtwayland-5.15.3:5
-	)
+	>=dev-qt/qtwaylandscanner-${QTMIN}:5
 	dev-util/wayland-scanner
 "

diff --git a/kde-plasma/kwin/kwin-5.24.49.9999.ebuild b/kde-plasma/kwin/kwin-5.24.49.9999.ebuild
index 50be75d095..aa263b3106 100644
--- a/kde-plasma/kwin/kwin-5.24.49.9999.ebuild
+++ b/kde-plasma/kwin/kwin-5.24.49.9999.ebuild
@@ -96,12 +96,7 @@ DEPEND="${COMMON_DEPEND}
 		>=dev-libs/wayland-protocols-1.19
 	)
 "
-BDEPEND="
-	test? ( || (
-		>=dev-qt/qtwaylandscanner-${QTMIN}:5
-		<dev-qt/qtwayland-5.15.3:5
-	) )
-"
+BDEPEND="test? ( >=dev-qt/qtwaylandscanner-${QTMIN}:5 )"
 PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5"
 
 src_prepare() {

diff --git a/kde-plasma/layer-shell-qt/layer-shell-qt-5.24.49.9999.ebuild b/kde-plasma/layer-shell-qt/layer-shell-qt-5.24.49.9999.ebuild
index 3bd529a599..15decc67cf 100644
--- a/kde-plasma/layer-shell-qt/layer-shell-qt-5.24.49.9999.ebuild
+++ b/kde-plasma/layer-shell-qt/layer-shell-qt-5.24.49.9999.ebuild
@@ -30,10 +30,7 @@ DEPEND="${RDEPEND}
 	dev-libs/wayland-protocols
 "
 BDEPEND="
-	|| (
-		>=dev-qt/qtwaylandscanner-${QTMIN}:5
-		<dev-qt/qtwayland-5.15.3:5
-	)
+	>=dev-qt/qtwaylandscanner-${QTMIN}:5
 	dev-util/wayland-scanner
 	virtual/pkgconfig
 "

diff --git a/kde-plasma/libkscreen/libkscreen-5.24.49.9999.ebuild b/kde-plasma/libkscreen/libkscreen-5.24.49.9999.ebuild
index fb6465d9f0..cb9f3fd25f 100644
--- a/kde-plasma/libkscreen/libkscreen-5.24.49.9999.ebuild
+++ b/kde-plasma/libkscreen/libkscreen-5.24.49.9999.ebuild
@@ -34,9 +34,6 @@ DEPEND="${RDEPEND}
 	>=dev-libs/plasma-wayland-protocols-1.6.0
 "
 BDEPEND="
-	|| (
-		>=dev-qt/qtwaylandscanner-${QTMIN}:5
-		<dev-qt/qtwayland-5.15.3:5
-	)
+	>=dev-qt/qtwaylandscanner-${QTMIN}:5
 	dev-util/wayland-scanner
 "

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.24.49.9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.24.49.9999.ebuild
index e197f4620d..0cbfcb11f6 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.24.49.9999.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.24.49.9999.ebuild
@@ -146,10 +146,7 @@ RDEPEND="${COMMON_DEPEND}
 	policykit? ( sys-apps/accountsservice )
 "
 BDEPEND="
-	|| (
-		>=dev-qt/qtwaylandscanner-${QTMIN}:5
-		<dev-qt/qtwayland-5.15.3:5
-	)
+	>=dev-qt/qtwaylandscanner-${QTMIN}:5
 	virtual/pkgconfig
 "
 PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5"

diff --git a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.24.49.9999.ebuild b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.24.49.9999.ebuild
index d98ad29b57..c2d986a279 100644
--- a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.24.49.9999.ebuild
+++ b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.24.49.9999.ebuild
@@ -39,9 +39,4 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
 	sys-apps/xdg-desktop-portal
 "
-BDEPEND="
-	|| (
-		>=dev-qt/qtwaylandscanner-${QTMIN}:5
-		<dev-qt/qtwayland-5.15.3:5
-	)
-"
+BDEPEND=">=dev-qt/qtwaylandscanner-${QTMIN}:5"