1 |
commit: e0a189e78f91be44070df8f2bf442d14bbe26283 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Dec 29 16:54:33 2021 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Dec 29 18:44:22 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=e0a189e7 |
7 |
|
8 |
*/*: Replace 'ecm_punt_bogus_dep Qt5' with ecm_punt_qt_module |
9 |
|
10 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
11 |
|
12 |
.../dolphin-plugins-mountiso-21.12.49.9999.ebuild | 2 +- |
13 |
app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-9999.ebuild | 2 +- |
14 |
app-office/calligra/calligra-9999.ebuild | 4 ++-- |
15 |
app-office/kexi/kexi-9999.ebuild | 4 ++-- |
16 |
.../dolphin-plugins-dropbox-21.12.49.9999.ebuild | 2 +- |
17 |
kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-9999.ebuild | 2 +- |
18 |
kde-apps/dolphin-plugins-git/dolphin-plugins-git-21.12.49.9999.ebuild | 4 ++-- |
19 |
kde-apps/dolphin-plugins-git/dolphin-plugins-git-9999.ebuild | 4 ++-- |
20 |
.../dolphin-plugins-mercurial-21.12.49.9999.ebuild | 4 ++-- |
21 |
.../dolphin-plugins-mercurial/dolphin-plugins-mercurial-9999.ebuild | 4 ++-- |
22 |
.../dolphin-plugins-subversion-21.12.49.9999.ebuild | 4 ++-- |
23 |
.../dolphin-plugins-subversion/dolphin-plugins-subversion-9999.ebuild | 4 ++-- |
24 |
.../kdsoap-ws-discovery-client/kdsoap-ws-discovery-client-9999.ebuild | 2 +- |
25 |
13 files changed, 21 insertions(+), 21 deletions(-) |
26 |
|
27 |
diff --git a/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-21.12.49.9999.ebuild b/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-21.12.49.9999.ebuild |
28 |
index 00302cb7f3..23b6285e06 100644 |
29 |
--- a/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-21.12.49.9999.ebuild |
30 |
+++ b/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-21.12.49.9999.ebuild |
31 |
@@ -39,7 +39,7 @@ RDEPEND="${DEPEND}" |
32 |
src_prepare() { |
33 |
ecm_src_prepare |
34 |
# kxmlgui, qtnetwork only required by dropbox |
35 |
- ecm_punt_bogus_dep Qt5 Network |
36 |
+ ecm_punt_qt_module Network |
37 |
ecm_punt_bogus_dep KF5 XmlGui |
38 |
# delete non-${PN} translations |
39 |
if [[ ${KDE_BUILD_TYPE} = release ]]; then |
40 |
|
41 |
diff --git a/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-9999.ebuild b/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-9999.ebuild |
42 |
index 00302cb7f3..23b6285e06 100644 |
43 |
--- a/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-9999.ebuild |
44 |
+++ b/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-9999.ebuild |
45 |
@@ -39,7 +39,7 @@ RDEPEND="${DEPEND}" |
46 |
src_prepare() { |
47 |
ecm_src_prepare |
48 |
# kxmlgui, qtnetwork only required by dropbox |
49 |
- ecm_punt_bogus_dep Qt5 Network |
50 |
+ ecm_punt_qt_module Network |
51 |
ecm_punt_bogus_dep KF5 XmlGui |
52 |
# delete non-${PN} translations |
53 |
if [[ ${KDE_BUILD_TYPE} = release ]]; then |
54 |
|
55 |
diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild |
56 |
index aea9b71186..977ad16b2a 100644 |
57 |
--- a/app-office/calligra/calligra-9999.ebuild |
58 |
+++ b/app-office/calligra/calligra-9999.ebuild |
59 |
@@ -129,8 +129,8 @@ src_prepare() { |
60 |
ecm_src_prepare |
61 |
|
62 |
# Unconditionally disable deprecated deps (required by QtQuick1) |
63 |
- ecm_punt_bogus_dep Qt5 Declarative |
64 |
- ecm_punt_bogus_dep Qt5 OpenGL |
65 |
+ ecm_punt_qt_module Declarative |
66 |
+ ecm_punt_qt_module OpenGL |
67 |
} |
68 |
|
69 |
src_configure() { |
70 |
|
71 |
diff --git a/app-office/kexi/kexi-9999.ebuild b/app-office/kexi/kexi-9999.ebuild |
72 |
index 0e9e6cf3d2..19f1f6a03a 100644 |
73 |
--- a/app-office/kexi/kexi-9999.ebuild |
74 |
+++ b/app-office/kexi/kexi-9999.ebuild |
75 |
@@ -64,8 +64,8 @@ DEPEND=" |
76 |
RDEPEND="${DEPEND}" |
77 |
|
78 |
src_prepare() { |
79 |
- ecm_punt_bogus_dep Qt5 WebKit |
80 |
- ecm_punt_bogus_dep Qt5 WebKitWidgets |
81 |
+ ecm_punt_qt_module WebKit |
82 |
+ ecm_punt_qt_module WebKitWidgets |
83 |
|
84 |
ecm_src_prepare |
85 |
} |
86 |
|
87 |
diff --git a/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-21.12.49.9999.ebuild b/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-21.12.49.9999.ebuild |
88 |
index c89af4af85..3e060963ff 100644 |
89 |
--- a/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-21.12.49.9999.ebuild |
90 |
+++ b/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-21.12.49.9999.ebuild |
91 |
@@ -37,7 +37,7 @@ RDEPEND="${DEPEND} |
92 |
src_prepare() { |
93 |
ecm_src_prepare |
94 |
# solid, qtdbus only required by mountiso |
95 |
- ecm_punt_bogus_dep Qt5 DBus |
96 |
+ ecm_punt_qt_module DBus |
97 |
ecm_punt_bogus_dep KF5 Solid |
98 |
# delete non-${PN} translations |
99 |
if [[ ${KDE_BUILD_TYPE} = release ]]; then |
100 |
|
101 |
diff --git a/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-9999.ebuild b/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-9999.ebuild |
102 |
index c89af4af85..3e060963ff 100644 |
103 |
--- a/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-9999.ebuild |
104 |
+++ b/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-9999.ebuild |
105 |
@@ -37,7 +37,7 @@ RDEPEND="${DEPEND} |
106 |
src_prepare() { |
107 |
ecm_src_prepare |
108 |
# solid, qtdbus only required by mountiso |
109 |
- ecm_punt_bogus_dep Qt5 DBus |
110 |
+ ecm_punt_qt_module DBus |
111 |
ecm_punt_bogus_dep KF5 Solid |
112 |
# delete non-${PN} translations |
113 |
if [[ ${KDE_BUILD_TYPE} = release ]]; then |
114 |
|
115 |
diff --git a/kde-apps/dolphin-plugins-git/dolphin-plugins-git-21.12.49.9999.ebuild b/kde-apps/dolphin-plugins-git/dolphin-plugins-git-21.12.49.9999.ebuild |
116 |
index 8675456768..be45fcb408 100644 |
117 |
--- a/kde-apps/dolphin-plugins-git/dolphin-plugins-git-21.12.49.9999.ebuild |
118 |
+++ b/kde-apps/dolphin-plugins-git/dolphin-plugins-git-21.12.49.9999.ebuild |
119 |
@@ -37,10 +37,10 @@ RDEPEND="${DEPEND} |
120 |
src_prepare() { |
121 |
ecm_src_prepare |
122 |
# solid, qtdbus only required by mountiso |
123 |
- ecm_punt_bogus_dep Qt5 DBus |
124 |
+ ecm_punt_qt_module DBus |
125 |
ecm_punt_bogus_dep KF5 Solid |
126 |
# kxmlgui, qtnetwork only required by dropbox |
127 |
- ecm_punt_bogus_dep Qt5 Network |
128 |
+ ecm_punt_qt_module Network |
129 |
ecm_punt_bogus_dep KF5 XmlGui |
130 |
# delete non-${PN} translations |
131 |
if [[ ${KDE_BUILD_TYPE} = release ]]; then |
132 |
|
133 |
diff --git a/kde-apps/dolphin-plugins-git/dolphin-plugins-git-9999.ebuild b/kde-apps/dolphin-plugins-git/dolphin-plugins-git-9999.ebuild |
134 |
index 8675456768..be45fcb408 100644 |
135 |
--- a/kde-apps/dolphin-plugins-git/dolphin-plugins-git-9999.ebuild |
136 |
+++ b/kde-apps/dolphin-plugins-git/dolphin-plugins-git-9999.ebuild |
137 |
@@ -37,10 +37,10 @@ RDEPEND="${DEPEND} |
138 |
src_prepare() { |
139 |
ecm_src_prepare |
140 |
# solid, qtdbus only required by mountiso |
141 |
- ecm_punt_bogus_dep Qt5 DBus |
142 |
+ ecm_punt_qt_module DBus |
143 |
ecm_punt_bogus_dep KF5 Solid |
144 |
# kxmlgui, qtnetwork only required by dropbox |
145 |
- ecm_punt_bogus_dep Qt5 Network |
146 |
+ ecm_punt_qt_module Network |
147 |
ecm_punt_bogus_dep KF5 XmlGui |
148 |
# delete non-${PN} translations |
149 |
if [[ ${KDE_BUILD_TYPE} = release ]]; then |
150 |
|
151 |
diff --git a/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-21.12.49.9999.ebuild b/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-21.12.49.9999.ebuild |
152 |
index 57cb1badec..8aaffd8d27 100644 |
153 |
--- a/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-21.12.49.9999.ebuild |
154 |
+++ b/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-21.12.49.9999.ebuild |
155 |
@@ -40,10 +40,10 @@ RDEPEND="${DEPEND} |
156 |
src_prepare() { |
157 |
ecm_src_prepare |
158 |
# solid, qtdbus only required by mountiso |
159 |
- ecm_punt_bogus_dep Qt5 DBus |
160 |
+ ecm_punt_qt_module DBus |
161 |
ecm_punt_bogus_dep KF5 Solid |
162 |
# kxmlgui, qtnetwork only required by dropbox |
163 |
- ecm_punt_bogus_dep Qt5 Network |
164 |
+ ecm_punt_qt_module Network |
165 |
ecm_punt_bogus_dep KF5 XmlGui |
166 |
# delete non-${PN} translations |
167 |
if [[ ${KDE_BUILD_TYPE} = release ]]; then |
168 |
|
169 |
diff --git a/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-9999.ebuild b/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-9999.ebuild |
170 |
index 57cb1badec..8aaffd8d27 100644 |
171 |
--- a/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-9999.ebuild |
172 |
+++ b/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-9999.ebuild |
173 |
@@ -40,10 +40,10 @@ RDEPEND="${DEPEND} |
174 |
src_prepare() { |
175 |
ecm_src_prepare |
176 |
# solid, qtdbus only required by mountiso |
177 |
- ecm_punt_bogus_dep Qt5 DBus |
178 |
+ ecm_punt_qt_module DBus |
179 |
ecm_punt_bogus_dep KF5 Solid |
180 |
# kxmlgui, qtnetwork only required by dropbox |
181 |
- ecm_punt_bogus_dep Qt5 Network |
182 |
+ ecm_punt_qt_module Network |
183 |
ecm_punt_bogus_dep KF5 XmlGui |
184 |
# delete non-${PN} translations |
185 |
if [[ ${KDE_BUILD_TYPE} = release ]]; then |
186 |
|
187 |
diff --git a/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-21.12.49.9999.ebuild b/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-21.12.49.9999.ebuild |
188 |
index bc0681f2f2..83d39ec8bb 100644 |
189 |
--- a/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-21.12.49.9999.ebuild |
190 |
+++ b/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-21.12.49.9999.ebuild |
191 |
@@ -36,10 +36,10 @@ RDEPEND="${DEPEND} |
192 |
src_prepare() { |
193 |
ecm_src_prepare |
194 |
# solid, qtdbus only required by mountiso |
195 |
- ecm_punt_bogus_dep Qt5 DBus |
196 |
+ ecm_punt_qt_module DBus |
197 |
ecm_punt_bogus_dep KF5 Solid |
198 |
# kxmlgui, qtnetwork only required by dropbox |
199 |
- ecm_punt_bogus_dep Qt5 Network |
200 |
+ ecm_punt_qt_module Network |
201 |
ecm_punt_bogus_dep KF5 XmlGui |
202 |
# delete non-${PN} translations |
203 |
if [[ ${KDE_BUILD_TYPE} = release ]]; then |
204 |
|
205 |
diff --git a/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-9999.ebuild b/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-9999.ebuild |
206 |
index bc0681f2f2..83d39ec8bb 100644 |
207 |
--- a/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-9999.ebuild |
208 |
+++ b/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-9999.ebuild |
209 |
@@ -36,10 +36,10 @@ RDEPEND="${DEPEND} |
210 |
src_prepare() { |
211 |
ecm_src_prepare |
212 |
# solid, qtdbus only required by mountiso |
213 |
- ecm_punt_bogus_dep Qt5 DBus |
214 |
+ ecm_punt_qt_module DBus |
215 |
ecm_punt_bogus_dep KF5 Solid |
216 |
# kxmlgui, qtnetwork only required by dropbox |
217 |
- ecm_punt_bogus_dep Qt5 Network |
218 |
+ ecm_punt_qt_module Network |
219 |
ecm_punt_bogus_dep KF5 XmlGui |
220 |
# delete non-${PN} translations |
221 |
if [[ ${KDE_BUILD_TYPE} = release ]]; then |
222 |
|
223 |
diff --git a/net-libs/kdsoap-ws-discovery-client/kdsoap-ws-discovery-client-9999.ebuild b/net-libs/kdsoap-ws-discovery-client/kdsoap-ws-discovery-client-9999.ebuild |
224 |
index a0241210a8..66791e1a92 100644 |
225 |
--- a/net-libs/kdsoap-ws-discovery-client/kdsoap-ws-discovery-client-9999.ebuild |
226 |
+++ b/net-libs/kdsoap-ws-discovery-client/kdsoap-ws-discovery-client-9999.ebuild |
227 |
@@ -42,7 +42,7 @@ PATCHES=( "${FILESDIR}"/${PN}-0.2_pre20200317-no-install-docs.patch ) |
228 |
|
229 |
src_prepare() { |
230 |
ecm_src_prepare |
231 |
- use test || ecm_punt_bogus_dep Qt5 Xml |
232 |
+ use test || ecm_punt_qt_module Xml |
233 |
} |
234 |
|
235 |
src_configure() { |