1 |
commit: b32c48da900b3de9f21fb9da7c49bdfec5bef71e |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Apr 1 18:17:09 2022 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Apr 1 18:17:09 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=b32c48da |
7 |
|
8 |
kde-plasma: Drop dev-qt/qtwayland as qtwaylandscanner provider |
9 |
|
10 |
KDE Plasma live depends on Qt 5.15.3 now anyway. |
11 |
|
12 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
13 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
14 |
|
15 |
kde-plasma/kwayland-integration/kwayland-integration-9999.ebuild | 5 +---- |
16 |
kde-plasma/kwayland-server/kwayland-server-9999.ebuild | 5 +---- |
17 |
kde-plasma/kwin/kwin-9999.ebuild | 7 +------ |
18 |
kde-plasma/layer-shell-qt/layer-shell-qt-9999.ebuild | 5 +---- |
19 |
kde-plasma/libkscreen/libkscreen-9999.ebuild | 5 +---- |
20 |
kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild | 5 +---- |
21 |
.../xdg-desktop-portal-kde/xdg-desktop-portal-kde-9999.ebuild | 7 +------ |
22 |
7 files changed, 7 insertions(+), 32 deletions(-) |
23 |
|
24 |
diff --git a/kde-plasma/kwayland-integration/kwayland-integration-9999.ebuild b/kde-plasma/kwayland-integration/kwayland-integration-9999.ebuild |
25 |
index f3870ba45d..52ead2774e 100644 |
26 |
--- a/kde-plasma/kwayland-integration/kwayland-integration-9999.ebuild |
27 |
+++ b/kde-plasma/kwayland-integration/kwayland-integration-9999.ebuild |
28 |
@@ -40,9 +40,6 @@ DEPEND=" |
29 |
" |
30 |
RDEPEND="${DEPEND}" |
31 |
BDEPEND=" |
32 |
- || ( |
33 |
- >=dev-qt/qtwaylandscanner-${QTMIN}:5 |
34 |
- <dev-qt/qtwayland-5.15.3:5 |
35 |
- ) |
36 |
+ >=dev-qt/qtwaylandscanner-${QTMIN}:5 |
37 |
virtual/pkgconfig |
38 |
" |
39 |
|
40 |
diff --git a/kde-plasma/kwayland-server/kwayland-server-9999.ebuild b/kde-plasma/kwayland-server/kwayland-server-9999.ebuild |
41 |
index 48046cd372..30007a6ca7 100644 |
42 |
--- a/kde-plasma/kwayland-server/kwayland-server-9999.ebuild |
43 |
+++ b/kde-plasma/kwayland-server/kwayland-server-9999.ebuild |
44 |
@@ -34,9 +34,6 @@ DEPEND="${RDEPEND} |
45 |
>=dev-libs/wayland-protocols-1.24 |
46 |
" |
47 |
BDEPEND=" |
48 |
- || ( |
49 |
- >=dev-qt/qtwaylandscanner-${QTMIN}:5 |
50 |
- <dev-qt/qtwayland-5.15.3:5 |
51 |
- ) |
52 |
+ >=dev-qt/qtwaylandscanner-${QTMIN}:5 |
53 |
dev-util/wayland-scanner |
54 |
" |
55 |
|
56 |
diff --git a/kde-plasma/kwin/kwin-9999.ebuild b/kde-plasma/kwin/kwin-9999.ebuild |
57 |
index f990ae6fd1..640f3ee0c3 100644 |
58 |
--- a/kde-plasma/kwin/kwin-9999.ebuild |
59 |
+++ b/kde-plasma/kwin/kwin-9999.ebuild |
60 |
@@ -96,12 +96,7 @@ DEPEND="${COMMON_DEPEND} |
61 |
>=dev-libs/wayland-protocols-1.19 |
62 |
) |
63 |
" |
64 |
-BDEPEND=" |
65 |
- test? ( || ( |
66 |
- >=dev-qt/qtwaylandscanner-${QTMIN}:5 |
67 |
- <dev-qt/qtwayland-5.15.3:5 |
68 |
- ) ) |
69 |
-" |
70 |
+BDEPEND="test? ( >=dev-qt/qtwaylandscanner-${QTMIN}:5 )" |
71 |
PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5" |
72 |
|
73 |
src_prepare() { |
74 |
|
75 |
diff --git a/kde-plasma/layer-shell-qt/layer-shell-qt-9999.ebuild b/kde-plasma/layer-shell-qt/layer-shell-qt-9999.ebuild |
76 |
index 67992cbd1e..9dccfad64b 100644 |
77 |
--- a/kde-plasma/layer-shell-qt/layer-shell-qt-9999.ebuild |
78 |
+++ b/kde-plasma/layer-shell-qt/layer-shell-qt-9999.ebuild |
79 |
@@ -30,10 +30,7 @@ DEPEND="${RDEPEND} |
80 |
dev-libs/wayland-protocols |
81 |
" |
82 |
BDEPEND=" |
83 |
- || ( |
84 |
- >=dev-qt/qtwaylandscanner-${QTMIN}:5 |
85 |
- <dev-qt/qtwayland-5.15.3:5 |
86 |
- ) |
87 |
+ >=dev-qt/qtwaylandscanner-${QTMIN}:5 |
88 |
dev-util/wayland-scanner |
89 |
virtual/pkgconfig |
90 |
" |
91 |
|
92 |
diff --git a/kde-plasma/libkscreen/libkscreen-9999.ebuild b/kde-plasma/libkscreen/libkscreen-9999.ebuild |
93 |
index 3ea12a35bf..8433e29b0e 100644 |
94 |
--- a/kde-plasma/libkscreen/libkscreen-9999.ebuild |
95 |
+++ b/kde-plasma/libkscreen/libkscreen-9999.ebuild |
96 |
@@ -34,9 +34,6 @@ DEPEND="${RDEPEND} |
97 |
>=dev-libs/plasma-wayland-protocols-1.6.0 |
98 |
" |
99 |
BDEPEND=" |
100 |
- || ( |
101 |
- >=dev-qt/qtwaylandscanner-${QTMIN}:5 |
102 |
- <dev-qt/qtwayland-5.15.3:5 |
103 |
- ) |
104 |
+ >=dev-qt/qtwaylandscanner-${QTMIN}:5 |
105 |
dev-util/wayland-scanner |
106 |
" |
107 |
|
108 |
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild |
109 |
index bc9f5b385b..75552be2ba 100644 |
110 |
--- a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild |
111 |
+++ b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild |
112 |
@@ -146,10 +146,7 @@ RDEPEND="${COMMON_DEPEND} |
113 |
policykit? ( sys-apps/accountsservice ) |
114 |
" |
115 |
BDEPEND=" |
116 |
- || ( |
117 |
- >=dev-qt/qtwaylandscanner-${QTMIN}:5 |
118 |
- <dev-qt/qtwayland-5.15.3:5 |
119 |
- ) |
120 |
+ >=dev-qt/qtwaylandscanner-${QTMIN}:5 |
121 |
virtual/pkgconfig |
122 |
" |
123 |
PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5" |
124 |
|
125 |
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 |
126 |
index ec18940fcf..8a27e9fc69 100644 |
127 |
--- a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-9999.ebuild |
128 |
+++ b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-9999.ebuild |
129 |
@@ -39,9 +39,4 @@ DEPEND="${COMMON_DEPEND} |
130 |
RDEPEND="${COMMON_DEPEND} |
131 |
sys-apps/xdg-desktop-portal |
132 |
" |
133 |
-BDEPEND=" |
134 |
- || ( |
135 |
- >=dev-qt/qtwaylandscanner-${QTMIN}:5 |
136 |
- <dev-qt/qtwayland-5.15.3:5 |
137 |
- ) |
138 |
-" |
139 |
+BDEPEND=">=dev-qt/qtwaylandscanner-${QTMIN}:5" |