diff options
| author | Andreas Sturmlechner <asturm@gentoo.org> | 2022-04-01 20:17:09 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2022-04-18 13:23:06 +0200 |
| commit | f85d38630daf8bf561fbd34c4ee2cff5a397753d (patch) | |
| tree | 7ef2131a2fef9c62226147eacbab8f7345dd4b73 | |
| parent | 2a4772c31cfce89634406f8e9e96f9ec5f28c50d (diff) | |
| download | kde-f85d38630daf8bf561fbd34c4ee2cff5a397753d.tar.gz kde-f85d38630daf8bf561fbd34c4ee2cff5a397753d.tar.bz2 kde-f85d38630daf8bf561fbd34c4ee2cff5a397753d.zip | |
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@gentoo.org>
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 f402a5b1e61..d72e07263ab 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 b4e8908791c..dab7139347d 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 50be75d0952..aa263b31066 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 3bd529a599a..15decc67cf7 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 fb6465d9f05..cb9f3fd25f1 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 e197f4620d4..0cbfcb11f69 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 d98ad29b570..c2d986a2799 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" |