Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/dolphin-plugins-subversion/, kde-apps/dolphin-plugins-git/, ...
Date: Wed, 29 Dec 2021 18:46:07
Message-Id: 1640803463.5c3bb65fb83990520ffa28a70c5ed4a3a86c59ee.asturm@gentoo
1 commit: 5c3bb65fb83990520ffa28a70c5ed4a3a86c59ee
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Wed Dec 29 16:57:36 2021 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Wed Dec 29 18:44:23 2021 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=5c3bb65f
7
8 */*: Replace 'ecm_punt_bogus_dep KF5' with ecm_punt_kf_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 .../dolphin-plugins-dropbox-21.12.49.9999.ebuild | 2 +-
15 kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-9999.ebuild | 2 +-
16 kde-apps/dolphin-plugins-git/dolphin-plugins-git-21.12.49.9999.ebuild | 4 ++--
17 kde-apps/dolphin-plugins-git/dolphin-plugins-git-9999.ebuild | 4 ++--
18 .../dolphin-plugins-mercurial-21.12.49.9999.ebuild | 4 ++--
19 .../dolphin-plugins-mercurial/dolphin-plugins-mercurial-9999.ebuild | 4 ++--
20 .../dolphin-plugins-subversion-21.12.49.9999.ebuild | 4 ++--
21 .../dolphin-plugins-subversion/dolphin-plugins-subversion-9999.ebuild | 4 ++--
22 kde-misc/akonadiclient/akonadiclient-9999.ebuild | 2 +-
23 kde-plasma/discover/discover-5.23.49.9999.ebuild | 2 +-
24 kde-plasma/discover/discover-9999.ebuild | 2 +-
25 kde-plasma/plasma-desktop/plasma-desktop-5.23.49.9999.ebuild | 2 +-
26 kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild | 2 +-
27 15 files changed, 21 insertions(+), 21 deletions(-)
28
29 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
30 index 23b6285e06..c3da1ac509 100644
31 --- a/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-21.12.49.9999.ebuild
32 +++ b/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-21.12.49.9999.ebuild
33 @@ -40,7 +40,7 @@ src_prepare() {
34 ecm_src_prepare
35 # kxmlgui, qtnetwork only required by dropbox
36 ecm_punt_qt_module Network
37 - ecm_punt_bogus_dep KF5 XmlGui
38 + ecm_punt_kf_module XmlGui
39 # delete non-${PN} translations
40 if [[ ${KDE_BUILD_TYPE} = release ]]; then
41 find po -type f -name "*po" -and -not -name "*${MY_PLUGIN_NAME}plugin" -delete || die
42
43 diff --git a/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-9999.ebuild b/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-9999.ebuild
44 index 23b6285e06..c3da1ac509 100644
45 --- a/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-9999.ebuild
46 +++ b/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-9999.ebuild
47 @@ -40,7 +40,7 @@ src_prepare() {
48 ecm_src_prepare
49 # kxmlgui, qtnetwork only required by dropbox
50 ecm_punt_qt_module Network
51 - ecm_punt_bogus_dep KF5 XmlGui
52 + ecm_punt_kf_module XmlGui
53 # delete non-${PN} translations
54 if [[ ${KDE_BUILD_TYPE} = release ]]; then
55 find po -type f -name "*po" -and -not -name "*${MY_PLUGIN_NAME}plugin" -delete || die
56
57 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
58 index 3e060963ff..f49e88eb35 100644
59 --- a/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-21.12.49.9999.ebuild
60 +++ b/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-21.12.49.9999.ebuild
61 @@ -38,7 +38,7 @@ src_prepare() {
62 ecm_src_prepare
63 # solid, qtdbus only required by mountiso
64 ecm_punt_qt_module DBus
65 - ecm_punt_bogus_dep KF5 Solid
66 + ecm_punt_kf_module Solid
67 # delete non-${PN} translations
68 if [[ ${KDE_BUILD_TYPE} = release ]]; then
69 find po -type f -name "*po" -and -not -name "*${MY_PLUGIN_NAME}plugin" -delete || die
70
71 diff --git a/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-9999.ebuild b/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-9999.ebuild
72 index 3e060963ff..f49e88eb35 100644
73 --- a/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-9999.ebuild
74 +++ b/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-9999.ebuild
75 @@ -38,7 +38,7 @@ src_prepare() {
76 ecm_src_prepare
77 # solid, qtdbus only required by mountiso
78 ecm_punt_qt_module DBus
79 - ecm_punt_bogus_dep KF5 Solid
80 + ecm_punt_kf_module Solid
81 # delete non-${PN} translations
82 if [[ ${KDE_BUILD_TYPE} = release ]]; then
83 find po -type f -name "*po" -and -not -name "*${MY_PLUGIN_NAME}plugin" -delete || die
84
85 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
86 index be45fcb408..8fe07fdb40 100644
87 --- a/kde-apps/dolphin-plugins-git/dolphin-plugins-git-21.12.49.9999.ebuild
88 +++ b/kde-apps/dolphin-plugins-git/dolphin-plugins-git-21.12.49.9999.ebuild
89 @@ -38,10 +38,10 @@ src_prepare() {
90 ecm_src_prepare
91 # solid, qtdbus only required by mountiso
92 ecm_punt_qt_module DBus
93 - ecm_punt_bogus_dep KF5 Solid
94 + ecm_punt_kf_module Solid
95 # kxmlgui, qtnetwork only required by dropbox
96 ecm_punt_qt_module Network
97 - ecm_punt_bogus_dep KF5 XmlGui
98 + ecm_punt_kf_module XmlGui
99 # delete non-${PN} translations
100 if [[ ${KDE_BUILD_TYPE} = release ]]; then
101 find po -type f -name "*po" -and -not -name "*${MY_PLUGIN_NAME}plugin" -delete || die
102
103 diff --git a/kde-apps/dolphin-plugins-git/dolphin-plugins-git-9999.ebuild b/kde-apps/dolphin-plugins-git/dolphin-plugins-git-9999.ebuild
104 index be45fcb408..8fe07fdb40 100644
105 --- a/kde-apps/dolphin-plugins-git/dolphin-plugins-git-9999.ebuild
106 +++ b/kde-apps/dolphin-plugins-git/dolphin-plugins-git-9999.ebuild
107 @@ -38,10 +38,10 @@ src_prepare() {
108 ecm_src_prepare
109 # solid, qtdbus only required by mountiso
110 ecm_punt_qt_module DBus
111 - ecm_punt_bogus_dep KF5 Solid
112 + ecm_punt_kf_module Solid
113 # kxmlgui, qtnetwork only required by dropbox
114 ecm_punt_qt_module Network
115 - ecm_punt_bogus_dep KF5 XmlGui
116 + ecm_punt_kf_module XmlGui
117 # delete non-${PN} translations
118 if [[ ${KDE_BUILD_TYPE} = release ]]; then
119 find po -type f -name "*po" -and -not -name "*${MY_PLUGIN_NAME}plugin" -delete || die
120
121 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
122 index 8aaffd8d27..6336e1abfd 100644
123 --- a/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-21.12.49.9999.ebuild
124 +++ b/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-21.12.49.9999.ebuild
125 @@ -41,10 +41,10 @@ src_prepare() {
126 ecm_src_prepare
127 # solid, qtdbus only required by mountiso
128 ecm_punt_qt_module DBus
129 - ecm_punt_bogus_dep KF5 Solid
130 + ecm_punt_kf_module Solid
131 # kxmlgui, qtnetwork only required by dropbox
132 ecm_punt_qt_module Network
133 - ecm_punt_bogus_dep KF5 XmlGui
134 + ecm_punt_kf_module XmlGui
135 # delete non-${PN} translations
136 if [[ ${KDE_BUILD_TYPE} = release ]]; then
137 find po -type f -name "*po" -and -not -name "*${MY_PLUGIN_NAME}plugin" -delete || die
138
139 diff --git a/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-9999.ebuild b/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-9999.ebuild
140 index 8aaffd8d27..6336e1abfd 100644
141 --- a/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-9999.ebuild
142 +++ b/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-9999.ebuild
143 @@ -41,10 +41,10 @@ src_prepare() {
144 ecm_src_prepare
145 # solid, qtdbus only required by mountiso
146 ecm_punt_qt_module DBus
147 - ecm_punt_bogus_dep KF5 Solid
148 + ecm_punt_kf_module Solid
149 # kxmlgui, qtnetwork only required by dropbox
150 ecm_punt_qt_module Network
151 - ecm_punt_bogus_dep KF5 XmlGui
152 + ecm_punt_kf_module XmlGui
153 # delete non-${PN} translations
154 if [[ ${KDE_BUILD_TYPE} = release ]]; then
155 find po -type f -name "*po" -and -not -name "*${MY_PLUGIN_NAME}plugin" -delete || die
156
157 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
158 index 83d39ec8bb..fb014b2717 100644
159 --- a/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-21.12.49.9999.ebuild
160 +++ b/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-21.12.49.9999.ebuild
161 @@ -37,10 +37,10 @@ src_prepare() {
162 ecm_src_prepare
163 # solid, qtdbus only required by mountiso
164 ecm_punt_qt_module DBus
165 - ecm_punt_bogus_dep KF5 Solid
166 + ecm_punt_kf_module Solid
167 # kxmlgui, qtnetwork only required by dropbox
168 ecm_punt_qt_module Network
169 - ecm_punt_bogus_dep KF5 XmlGui
170 + ecm_punt_kf_module XmlGui
171 # delete non-${PN} translations
172 if [[ ${KDE_BUILD_TYPE} = release ]]; then
173 find po -type f -name "*po" -and -not -name "*${MY_PLUGIN_NAME}plugin" -delete || die
174
175 diff --git a/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-9999.ebuild b/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-9999.ebuild
176 index 83d39ec8bb..fb014b2717 100644
177 --- a/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-9999.ebuild
178 +++ b/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-9999.ebuild
179 @@ -37,10 +37,10 @@ src_prepare() {
180 ecm_src_prepare
181 # solid, qtdbus only required by mountiso
182 ecm_punt_qt_module DBus
183 - ecm_punt_bogus_dep KF5 Solid
184 + ecm_punt_kf_module Solid
185 # kxmlgui, qtnetwork only required by dropbox
186 ecm_punt_qt_module Network
187 - ecm_punt_bogus_dep KF5 XmlGui
188 + ecm_punt_kf_module XmlGui
189 # delete non-${PN} translations
190 if [[ ${KDE_BUILD_TYPE} = release ]]; then
191 find po -type f -name "*po" -and -not -name "*${MY_PLUGIN_NAME}plugin" -delete || die
192
193 diff --git a/kde-misc/akonadiclient/akonadiclient-9999.ebuild b/kde-misc/akonadiclient/akonadiclient-9999.ebuild
194 index 1c0b9d9e12..fb7eac3d46 100644
195 --- a/kde-misc/akonadiclient/akonadiclient-9999.ebuild
196 +++ b/kde-misc/akonadiclient/akonadiclient-9999.ebuild
197 @@ -30,5 +30,5 @@ RDEPEND="${DEPEND}"
198
199 src_prepare() {
200 ecm_src_prepare
201 - ecm_punt_bogus_dep KF5 KIO # we don't need it with >=Qt-5.10
202 + ecm_punt_kf_module KIO # we don't need it with >=Qt-5.10
203 }
204
205 diff --git a/kde-plasma/discover/discover-5.23.49.9999.ebuild b/kde-plasma/discover/discover-5.23.49.9999.ebuild
206 index 9079700821..6dd7eeae53 100644
207 --- a/kde-plasma/discover/discover-5.23.49.9999.ebuild
208 +++ b/kde-plasma/discover/discover-5.23.49.9999.ebuild
209 @@ -61,7 +61,7 @@ PATCHES=( "${FILESDIR}/${PN}-5.21.90-tests-optional.patch" )
210 src_prepare() {
211 ecm_src_prepare
212 # we don't need it with PackageKitBackend off
213 - ecm_punt_bogus_dep KF5 Archive
214 + ecm_punt_kf_module Archive
215 }
216
217 src_configure() {
218
219 diff --git a/kde-plasma/discover/discover-9999.ebuild b/kde-plasma/discover/discover-9999.ebuild
220 index c94a2d0760..eee6eb7f4d 100644
221 --- a/kde-plasma/discover/discover-9999.ebuild
222 +++ b/kde-plasma/discover/discover-9999.ebuild
223 @@ -61,7 +61,7 @@ PATCHES=( "${FILESDIR}/${PN}-5.21.90-tests-optional.patch" )
224 src_prepare() {
225 ecm_src_prepare
226 # we don't need it with PackageKitBackend off
227 - ecm_punt_bogus_dep KF5 Archive
228 + ecm_punt_kf_module Archive
229 }
230
231 src_configure() {
232
233 diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.23.49.9999.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.23.49.9999.ebuild
234 index faa4da9a04..1fa328f69f 100644
235 --- a/kde-plasma/plasma-desktop/plasma-desktop-5.23.49.9999.ebuild
236 +++ b/kde-plasma/plasma-desktop/plasma-desktop-5.23.49.9999.ebuild
237 @@ -129,7 +129,7 @@ src_prepare() {
238 ecm_src_prepare
239
240 if ! use policykit; then
241 - ecm_punt_bogus_dep KF5 Wallet
242 + ecm_punt_kf_module Wallet
243 cmake_run_in kcms cmake_comment_add_subdirectory users
244 fi
245
246
247 diff --git a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
248 index ad04575119..ebd8e16b5d 100644
249 --- a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
250 +++ b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
251 @@ -129,7 +129,7 @@ src_prepare() {
252 ecm_src_prepare
253
254 if ! use policykit; then
255 - ecm_punt_bogus_dep KF5 Wallet
256 + ecm_punt_kf_module Wallet
257 cmake_run_in kcms cmake_comment_add_subdirectory users
258 fi