commit: cbdfb14f8f6b44e8d58bc856ca3a55f67a2508cc
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:35:21 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbdfb14f
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>
kde-plasma/kwayland-integration/kwayland-integration-5.23.5.ebuild | 5 +----
kde-plasma/kwayland-integration/kwayland-integration-5.24.4.ebuild | 5 +----
kde-plasma/kwayland-server/kwayland-server-5.23.5.ebuild | 5 +----
kde-plasma/kwayland-server/kwayland-server-5.24.4-r1.ebuild | 5 +----
kde-plasma/kwin/kwin-5.23.5-r1.ebuild | 7 +------
kde-plasma/kwin/kwin-5.24.4.ebuild | 7 +------
kde-plasma/layer-shell-qt/layer-shell-qt-5.23.5.ebuild | 5 +----
kde-plasma/layer-shell-qt/layer-shell-qt-5.24.4.ebuild | 5 +----
kde-plasma/libkscreen/libkscreen-5.23.5-r1.ebuild | 5 +----
kde-plasma/libkscreen/libkscreen-5.24.4.ebuild | 5 +----
kde-plasma/plasma-workspace/plasma-workspace-5.23.5-r2.ebuild | 5 +----
kde-plasma/plasma-workspace/plasma-workspace-5.24.4.ebuild | 5 +----
.../xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.23.5.ebuild | 7 +------
.../xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.24.4.ebuild | 7 +------
14 files changed, 14 insertions(+), 64 deletions(-)
diff --git a/kde-plasma/kwayland-integration/kwayland-integration-5.23.5.ebuild
b/kde-plasma/kwayland-integration/kwayland-integration-5.23.5.ebuild
index 913a35584290..5e4a97832944 100644
--- a/kde-plasma/kwayland-integration/kwayland-integration-5.23.5.ebuild
+++ b/kde-plasma/kwayland-integration/kwayland-integration-5.23.5.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-integration/kwayland-integration-5.24.4.ebuild
b/kde-plasma/kwayland-integration/kwayland-integration-5.24.4.ebuild
index e635d8fd2e52..84eca0211ad6 100644
--- a/kde-plasma/kwayland-integration/kwayland-integration-5.24.4.ebuild
+++ b/kde-plasma/kwayland-integration/kwayland-integration-5.24.4.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.23.5.ebuild
b/kde-plasma/kwayland-server/kwayland-server-5.23.5.ebuild
index 749ea067790f..a62984a70af7 100644
--- a/kde-plasma/kwayland-server/kwayland-server-5.23.5.ebuild
+++ b/kde-plasma/kwayland-server/kwayland-server-5.23.5.ebuild
@@ -34,9 +34,6 @@ DEPEND="${RDEPEND}
>=dev-libs/wayland-protocols-1.21
"
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/kwayland-server/kwayland-server-5.24.4-r1.ebuild
b/kde-plasma/kwayland-server/kwayland-server-5.24.4-r1.ebuild
index 033b2c03dc1c..6091d5d55af8 100644
--- a/kde-plasma/kwayland-server/kwayland-server-5.24.4-r1.ebuild
+++ b/kde-plasma/kwayland-server/kwayland-server-5.24.4-r1.ebuild
@@ -34,10 +34,7 @@ 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.23.5-r1.ebuild
b/kde-plasma/kwin/kwin-5.23.5-r1.ebuild
index 744aefd646ac..f324a0c619ad 100644
--- a/kde-plasma/kwin/kwin-5.23.5-r1.ebuild
+++ b/kde-plasma/kwin/kwin-5.23.5-r1.ebuild
@@ -95,12 +95,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"
# https://mail.kde.org/pipermail/distributions/2022-February/001127.html
diff --git a/kde-plasma/kwin/kwin-5.24.4.ebuild
b/kde-plasma/kwin/kwin-5.24.4.ebuild
index 7c0506735d47..a47f4289b4c9 100644
--- a/kde-plasma/kwin/kwin-5.24.4.ebuild
+++ b/kde-plasma/kwin/kwin-5.24.4.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.23.5.ebuild
b/kde-plasma/layer-shell-qt/layer-shell-qt-5.23.5.ebuild
index 257463ff2c30..5a7f70830539 100644
--- a/kde-plasma/layer-shell-qt/layer-shell-qt-5.23.5.ebuild
+++ b/kde-plasma/layer-shell-qt/layer-shell-qt-5.23.5.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/layer-shell-qt/layer-shell-qt-5.24.4.ebuild
b/kde-plasma/layer-shell-qt/layer-shell-qt-5.24.4.ebuild
index 3d3deeb5f091..853077c48cf6 100644
--- a/kde-plasma/layer-shell-qt/layer-shell-qt-5.24.4.ebuild
+++ b/kde-plasma/layer-shell-qt/layer-shell-qt-5.24.4.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.23.5-r1.ebuild
b/kde-plasma/libkscreen/libkscreen-5.23.5-r1.ebuild
index 0f8497b6f960..6ea4f0f177e4 100644
--- a/kde-plasma/libkscreen/libkscreen-5.23.5-r1.ebuild
+++ b/kde-plasma/libkscreen/libkscreen-5.23.5-r1.ebuild
@@ -34,9 +34,6 @@ DEPEND="${RDEPEND}
>=dev-libs/plasma-wayland-protocols-1.4.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/libkscreen/libkscreen-5.24.4.ebuild
b/kde-plasma/libkscreen/libkscreen-5.24.4.ebuild
index 3a8515872607..8aed7bcf7d06 100644
--- a/kde-plasma/libkscreen/libkscreen-5.24.4.ebuild
+++ b/kde-plasma/libkscreen/libkscreen-5.24.4.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.23.5-r2.ebuild
b/kde-plasma/plasma-workspace/plasma-workspace-5.23.5-r2.ebuild
index d3c17ff48ed8..13be0e401a84 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.23.5-r2.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.23.5-r2.ebuild
@@ -145,10 +145,7 @@ RDEPEND="${COMMON_DEPEND}
!<kde-plasma/plasma-desktop-5.21.90:5
"
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/plasma-workspace/plasma-workspace-5.24.4.ebuild
b/kde-plasma/plasma-workspace/plasma-workspace-5.24.4.ebuild
index a783b627b934..4a64d1146f77 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.24.4.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.24.4.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.23.5.ebuild
b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.23.5.ebuild
index f0a81f75e03a..ec4733cd204e 100644
--- a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.23.5.ebuild
+++ b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.23.5.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"
diff --git
a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.24.4.ebuild
b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.24.4.ebuild
index daaa5a417460..be8a43271f3b 100644
--- a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.24.4.ebuild
+++ b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.24.4.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"
