1 |
commit: 79464d74ba7ddfe45a11e033a462848d7ce93294 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Feb 17 08:46:24 2019 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Feb 17 08:46:24 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=79464d74 |
7 |
|
8 |
kde-frameworks: Move some dev-qt/* USE test from BDEPEND to DEPEND |
9 |
|
10 |
Thanks-to: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org> |
11 |
Package-Manager: Portage-2.3.60, Repoman-2.3.12 |
12 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
13 |
|
14 |
kde-frameworks/kconfig/kconfig-9999.ebuild | 7 ++++--- |
15 |
kde-frameworks/kcrash/kcrash-9999.ebuild | 2 +- |
16 |
kde-frameworks/kdelibs4support/kdelibs4support-9999.ebuild | 2 +- |
17 |
kde-frameworks/khtml/khtml-9999.ebuild | 2 +- |
18 |
kde-frameworks/ki18n/ki18n-9999.ebuild | 9 ++++----- |
19 |
kde-frameworks/kio/kio-9999.ebuild | 4 +--- |
20 |
kde-frameworks/kitemmodels/kitemmodels-9999.ebuild | 2 +- |
21 |
kde-frameworks/kservice/kservice-9999.ebuild | 7 ++++--- |
22 |
kde-frameworks/solid/solid-9999.ebuild | 7 ++++--- |
23 |
kde-frameworks/syndication/syndication-9999.ebuild | 12 ++++++------ |
24 |
10 files changed, 27 insertions(+), 27 deletions(-) |
25 |
|
26 |
diff --git a/kde-frameworks/kconfig/kconfig-9999.ebuild b/kde-frameworks/kconfig/kconfig-9999.ebuild |
27 |
index e35e32094b..a6d1b9ccac 100644 |
28 |
--- a/kde-frameworks/kconfig/kconfig-9999.ebuild |
29 |
+++ b/kde-frameworks/kconfig/kconfig-9999.ebuild |
30 |
@@ -13,14 +13,15 @@ IUSE="dbus nls" |
31 |
|
32 |
BDEPEND=" |
33 |
nls? ( $(add_qt_dep linguist-tools) ) |
34 |
- test? ( $(add_qt_dep qtconcurrent) ) |
35 |
" |
36 |
-DEPEND=" |
37 |
+RDEPEND=" |
38 |
$(add_qt_dep qtgui) |
39 |
$(add_qt_dep qtxml) |
40 |
dbus? ( $(add_qt_dep qtdbus) ) |
41 |
" |
42 |
-RDEPEND="${DEPEND}" |
43 |
+DEPEND="${RDEPEND} |
44 |
+ test? ( $(add_qt_dep qtconcurrent) ) |
45 |
+" |
46 |
|
47 |
# bug 560086 |
48 |
RESTRICT+=" test" |
49 |
|
50 |
diff --git a/kde-frameworks/kcrash/kcrash-9999.ebuild b/kde-frameworks/kcrash/kcrash-9999.ebuild |
51 |
index 4b67a59c6e..edb3fad0e2 100644 |
52 |
--- a/kde-frameworks/kcrash/kcrash-9999.ebuild |
53 |
+++ b/kde-frameworks/kcrash/kcrash-9999.ebuild |
54 |
@@ -16,7 +16,6 @@ RESTRICT+=" test" |
55 |
|
56 |
BDEPEND=" |
57 |
nls? ( $(add_qt_dep linguist-tools) ) |
58 |
- test? ( $(add_qt_dep qtwidgets) ) |
59 |
" |
60 |
RDEPEND=" |
61 |
$(add_frameworks_dep kcoreaddons) |
62 |
@@ -27,4 +26,5 @@ RDEPEND=" |
63 |
" |
64 |
DEPEND="${RDEPEND} |
65 |
x11-base/xorg-proto |
66 |
+ test? ( $(add_qt_dep qtwidgets) ) |
67 |
" |
68 |
|
69 |
diff --git a/kde-frameworks/kdelibs4support/kdelibs4support-9999.ebuild b/kde-frameworks/kdelibs4support/kdelibs4support-9999.ebuild |
70 |
index 0844dd2160..c20a24e815 100644 |
71 |
--- a/kde-frameworks/kdelibs4support/kdelibs4support-9999.ebuild |
72 |
+++ b/kde-frameworks/kdelibs4support/kdelibs4support-9999.ebuild |
73 |
@@ -16,7 +16,6 @@ IUSE="libressl X" |
74 |
BDEPEND=" |
75 |
dev-lang/perl |
76 |
dev-perl/URI |
77 |
- test? ( $(add_qt_dep qtconcurrent) ) |
78 |
" |
79 |
COMMON_DEPEND=" |
80 |
$(add_frameworks_dep kauth) |
81 |
@@ -67,6 +66,7 @@ COMMON_DEPEND=" |
82 |
" |
83 |
DEPEND="${COMMON_DEPEND} |
84 |
$(add_qt_dep designer) |
85 |
+ test? ( $(add_qt_dep qtconcurrent) ) |
86 |
X? ( x11-base/xorg-proto ) |
87 |
" |
88 |
RDEPEND="${COMMON_DEPEND} |
89 |
|
90 |
diff --git a/kde-frameworks/khtml/khtml-9999.ebuild b/kde-frameworks/khtml/khtml-9999.ebuild |
91 |
index 05e20f61c3..ccf59c3f4e 100644 |
92 |
--- a/kde-frameworks/khtml/khtml-9999.ebuild |
93 |
+++ b/kde-frameworks/khtml/khtml-9999.ebuild |
94 |
@@ -15,7 +15,6 @@ IUSE="libressl X" |
95 |
BDEPEND=" |
96 |
dev-lang/perl |
97 |
dev-util/gperf |
98 |
- test? ( $(add_qt_dep qtx11extras) ) |
99 |
" |
100 |
RDEPEND=" |
101 |
$(add_frameworks_dep karchive) |
102 |
@@ -58,6 +57,7 @@ RDEPEND=" |
103 |
) |
104 |
" |
105 |
DEPEND="${RDEPEND} |
106 |
+ test? ( $(add_qt_dep qtx11extras) ) |
107 |
X? ( x11-base/xorg-proto ) |
108 |
" |
109 |
|
110 |
|
111 |
diff --git a/kde-frameworks/ki18n/ki18n-9999.ebuild b/kde-frameworks/ki18n/ki18n-9999.ebuild |
112 |
index c884c6d473..b452e1b707 100644 |
113 |
--- a/kde-frameworks/ki18n/ki18n-9999.ebuild |
114 |
+++ b/kde-frameworks/ki18n/ki18n-9999.ebuild |
115 |
@@ -13,15 +13,14 @@ IUSE="" |
116 |
|
117 |
REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
118 |
|
119 |
-BDEPEND=" |
120 |
- test? ( $(add_qt_dep qtconcurrent) ) |
121 |
-" |
122 |
-DEPEND="${PYTHON_DEPS} |
123 |
+RDEPEND="${PYTHON_DEPS} |
124 |
$(add_qt_dep qtdeclarative) |
125 |
sys-devel/gettext |
126 |
virtual/libintl |
127 |
" |
128 |
-RDEPEND="${DEPEND}" |
129 |
+DEPEND="${RDEPEND} |
130 |
+ test? ( $(add_qt_dep qtconcurrent) ) |
131 |
+" |
132 |
|
133 |
pkg_setup() { |
134 |
kde5_pkg_setup |
135 |
|
136 |
diff --git a/kde-frameworks/kio/kio-9999.ebuild b/kde-frameworks/kio/kio-9999.ebuild |
137 |
index 050102e386..75ede5aa4a 100644 |
138 |
--- a/kde-frameworks/kio/kio-9999.ebuild |
139 |
+++ b/kde-frameworks/kio/kio-9999.ebuild |
140 |
@@ -13,9 +13,6 @@ KEYWORDS="" |
141 |
IUSE="acl +handbook kerberos +kwallet X" |
142 |
|
143 |
# drop qtnetwork subslot operator when QT_MINIMAL >= 5.12.0 |
144 |
-BDEPEND=" |
145 |
- test? ( sys-libs/zlib ) |
146 |
-" |
147 |
RDEPEND=" |
148 |
$(add_frameworks_dep kauth) |
149 |
$(add_frameworks_dep karchive) |
150 |
@@ -57,6 +54,7 @@ RDEPEND=" |
151 |
" |
152 |
DEPEND="${RDEPEND} |
153 |
$(add_qt_dep qtconcurrent) |
154 |
+ test? ( sys-libs/zlib ) |
155 |
X? ( |
156 |
x11-base/xorg-proto |
157 |
x11-libs/libX11 |
158 |
|
159 |
diff --git a/kde-frameworks/kitemmodels/kitemmodels-9999.ebuild b/kde-frameworks/kitemmodels/kitemmodels-9999.ebuild |
160 |
index 77fb4c606d..d213e59310 100644 |
161 |
--- a/kde-frameworks/kitemmodels/kitemmodels-9999.ebuild |
162 |
+++ b/kde-frameworks/kitemmodels/kitemmodels-9999.ebuild |
163 |
@@ -11,4 +11,4 @@ LICENSE="LGPL-2+" |
164 |
KEYWORDS="" |
165 |
IUSE="" |
166 |
|
167 |
-BDEPEND="test? ( $(add_qt_dep qtwidgets) )" |
168 |
+DEPEND="test? ( $(add_qt_dep qtwidgets) )" |
169 |
|
170 |
diff --git a/kde-frameworks/kservice/kservice-9999.ebuild b/kde-frameworks/kservice/kservice-9999.ebuild |
171 |
index 2862551b87..bf3a52cb30 100644 |
172 |
--- a/kde-frameworks/kservice/kservice-9999.ebuild |
173 |
+++ b/kde-frameworks/kservice/kservice-9999.ebuild |
174 |
@@ -14,9 +14,8 @@ BDEPEND=" |
175 |
sys-devel/bison |
176 |
sys-devel/flex |
177 |
man? ( $(add_frameworks_dep kdoctools) ) |
178 |
- test? ( $(add_qt_dep qtconcurrent) ) |
179 |
" |
180 |
-DEPEND=" |
181 |
+RDEPEND=" |
182 |
$(add_frameworks_dep kconfig) |
183 |
$(add_frameworks_dep kcoreaddons) |
184 |
$(add_frameworks_dep kcrash) |
185 |
@@ -25,7 +24,9 @@ DEPEND=" |
186 |
$(add_qt_dep qtdbus) |
187 |
$(add_qt_dep qtxml) |
188 |
" |
189 |
-RDEPEND="${DEPEND}" |
190 |
+DEPEND="${RDEPEND} |
191 |
+ test? ( $(add_qt_dep qtconcurrent) ) |
192 |
+" |
193 |
|
194 |
# requires running kde environment |
195 |
RESTRICT+=" test" |
196 |
|
197 |
diff --git a/kde-frameworks/solid/solid-9999.ebuild b/kde-frameworks/solid/solid-9999.ebuild |
198 |
index d42d3b1c34..eec12ad6bd 100644 |
199 |
--- a/kde-frameworks/solid/solid-9999.ebuild |
200 |
+++ b/kde-frameworks/solid/solid-9999.ebuild |
201 |
@@ -13,9 +13,8 @@ IUSE="nls" |
202 |
|
203 |
BDEPEND=" |
204 |
nls? ( $(add_qt_dep linguist-tools) ) |
205 |
- test? ( $(add_qt_dep qtconcurrent) ) |
206 |
" |
207 |
-DEPEND=" |
208 |
+RDEPEND=" |
209 |
$(add_qt_dep qtdbus) |
210 |
$(add_qt_dep qtdeclarative) |
211 |
$(add_qt_dep qtwidgets) |
212 |
@@ -23,7 +22,9 @@ DEPEND=" |
213 |
sys-fs/udisks:2 |
214 |
virtual/udev |
215 |
" |
216 |
-RDEPEND="${DEPEND}" |
217 |
+DEPEND="${RDEPEND} |
218 |
+ test? ( $(add_qt_dep qtconcurrent) ) |
219 |
+" |
220 |
|
221 |
pkg_postinst() { |
222 |
kde5_pkg_postinst |
223 |
|
224 |
diff --git a/kde-frameworks/syndication/syndication-9999.ebuild b/kde-frameworks/syndication/syndication-9999.ebuild |
225 |
index ec10e5d1c1..9045049854 100644 |
226 |
--- a/kde-frameworks/syndication/syndication-9999.ebuild |
227 |
+++ b/kde-frameworks/syndication/syndication-9999.ebuild |
228 |
@@ -11,16 +11,16 @@ LICENSE="LGPL-2+" |
229 |
KEYWORDS="" |
230 |
IUSE="" |
231 |
|
232 |
-BDEPEND=" |
233 |
+COMMON_DEPEND=" |
234 |
+ $(add_frameworks_dep kcodecs) |
235 |
+ $(add_qt_dep qtxml) |
236 |
+" |
237 |
+DEPEND="${COMMON_DEPEND} |
238 |
test? ( |
239 |
$(add_qt_dep qtnetwork) |
240 |
$(add_qt_dep qtwidgets) |
241 |
) |
242 |
" |
243 |
-DEPEND=" |
244 |
- $(add_frameworks_dep kcodecs) |
245 |
- $(add_qt_dep qtxml) |
246 |
-" |
247 |
-RDEPEND="${DEPEND} |
248 |
+RDEPEND="${COMMON_DEPEND} |
249 |
!kde-apps/syndication |
250 |
" |