diff options
| author | Andreas Sturmlechner <asturm@gentoo.org> | 2022-04-01 20:17:09 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2022-04-01 20:17:09 +0200 |
| commit | b32c48da900b3de9f21fb9da7c49bdfec5bef71e (patch) | |
| tree | d6c988f0d7e46b9a873282369819cf61cf3e7c8d | |
| parent | a626daadc0d9e5626aaa1ee3b52580e523b90b6c (diff) | |
| download | kde-b32c48da900b3de9f21fb9da7c49bdfec5bef71e.tar.gz kde-b32c48da900b3de9f21fb9da7c49bdfec5bef71e.tar.bz2 kde-b32c48da900b3de9f21fb9da7c49bdfec5bef71e.zip | |
kde-plasma: Drop dev-qt/qtwayland as qtwaylandscanner provider
KDE Plasma live depends on Qt 5.15.3 now anyway.
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-9999.ebuild b/kde-plasma/kwayland-integration/kwayland-integration-9999.ebuild index f3870ba45d0..52ead2774ef 100644 --- a/kde-plasma/kwayland-integration/kwayland-integration-9999.ebuild +++ b/kde-plasma/kwayland-integration/kwayland-integration-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-9999.ebuild b/kde-plasma/kwayland-server/kwayland-server-9999.ebuild index 48046cd3721..30007a6ca76 100644 --- a/kde-plasma/kwayland-server/kwayland-server-9999.ebuild +++ b/kde-plasma/kwayland-server/kwayland-server-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-9999.ebuild b/kde-plasma/kwin/kwin-9999.ebuild index f990ae6fd19..640f3ee0c37 100644 --- a/kde-plasma/kwin/kwin-9999.ebuild +++ b/kde-plasma/kwin/kwin-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-9999.ebuild b/kde-plasma/layer-shell-qt/layer-shell-qt-9999.ebuild index 67992cbd1e9..9dccfad64b1 100644 --- a/kde-plasma/layer-shell-qt/layer-shell-qt-9999.ebuild +++ b/kde-plasma/layer-shell-qt/layer-shell-qt-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-9999.ebuild b/kde-plasma/libkscreen/libkscreen-9999.ebuild index 3ea12a35bfa..8433e29b0e3 100644 --- a/kde-plasma/libkscreen/libkscreen-9999.ebuild +++ b/kde-plasma/libkscreen/libkscreen-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-9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild index bc9f5b385be..75552be2ba0 100644 --- a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild +++ b/kde-plasma/plasma-workspace/plasma-workspace-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-9999.ebuild b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-9999.ebuild index ec18940fcf9..8a27e9fc694 100644 --- a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-9999.ebuild +++ b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-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" |
