1 |
commit: c6bfd1025fed3403492d28630625d2ae3b484380 |
2 |
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> |
3 |
AuthorDate: Sat Jun 4 19:06:43 2016 +0000 |
4 |
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jul 2 21:15:52 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6bfd102 |
7 |
|
8 |
app-office/libreoffice: Sort and cleanup *DEPENDs |
9 |
|
10 |
Package-Manager: portage-2.2.28 |
11 |
|
12 |
app-office/libreoffice/libreoffice-5.1.9999.ebuild | 35 ++++++++++------------ |
13 |
app-office/libreoffice/libreoffice-5.2.9999.ebuild | 35 ++++++++++------------ |
14 |
app-office/libreoffice/libreoffice-9999.ebuild | 35 ++++++++++------------ |
15 |
3 files changed, 48 insertions(+), 57 deletions(-) |
16 |
|
17 |
diff --git a/app-office/libreoffice/libreoffice-5.1.9999.ebuild b/app-office/libreoffice/libreoffice-5.1.9999.ebuild |
18 |
index 9d7daf4..3111ec9 100644 |
19 |
--- a/app-office/libreoffice/libreoffice-5.1.9999.ebuild |
20 |
+++ b/app-office/libreoffice/libreoffice-5.1.9999.ebuild |
21 |
@@ -5,7 +5,6 @@ |
22 |
EAPI=6 |
23 |
|
24 |
KDE_REQUIRED="optional" |
25 |
-QT_MINIMAL="4.7.4" |
26 |
KDE_SCM="git" |
27 |
CMAKE_REQUIRED="never" |
28 |
|
29 |
@@ -95,16 +94,14 @@ SLOT="0" |
30 |
[[ ${PV} == *9999* ]] || \ |
31 |
KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux" |
32 |
|
33 |
-COMMON_DEPEND=" |
34 |
- ${PYTHON_DEPS} |
35 |
- app-arch/zip |
36 |
+COMMON_DEPEND="${PYTHON_DEPS} |
37 |
app-arch/unzip |
38 |
+ app-arch/zip |
39 |
app-text/hunspell |
40 |
- app-text/mythes |
41 |
>=app-text/libabw-0.1.0 |
42 |
- app-text/libexttextcat |
43 |
>=app-text/libebook-0.1 |
44 |
>=app-text/libetonyek-0.1 |
45 |
+ app-text/libexttextcat |
46 |
app-text/liblangtag |
47 |
>=app-text/libmspub-0.1.0 |
48 |
>=app-text/libmwaw-0.3.1 |
49 |
@@ -112,10 +109,12 @@ COMMON_DEPEND=" |
50 |
app-text/libwpd:0.10[tools] |
51 |
app-text/libwpg:0.3 |
52 |
>=app-text/libwps-0.4 |
53 |
+ app-text/mythes |
54 |
app-text/poppler:=[cxx] |
55 |
>=dev-cpp/clucene-2.3.3.4-r2 |
56 |
=dev-cpp/libcmis-0.5* |
57 |
dev-db/unixODBC |
58 |
+ dev-lang/perl |
59 |
>=dev-libs/boost-1.55:= |
60 |
dev-libs/expat |
61 |
dev-libs/hyphen |
62 |
@@ -124,7 +123,6 @@ COMMON_DEPEND=" |
63 |
dev-libs/librevenge |
64 |
dev-libs/nspr |
65 |
dev-libs/nss |
66 |
- >=dev-lang/perl-5.0 |
67 |
!libressl? ( >=dev-libs/openssl-1.0.0d:0 ) |
68 |
libressl? ( dev-libs/libressl ) |
69 |
>=dev-libs/redland-1.0.16 |
70 |
@@ -134,13 +132,13 @@ COMMON_DEPEND=" |
71 |
>=media-libs/glew-1.10 |
72 |
>=media-libs/harfbuzz-0.9.18:=[icu(+)] |
73 |
media-libs/lcms:2 |
74 |
- >=media-libs/libpng-1.4:0= |
75 |
>=media-libs/libcdr-0.1.0 |
76 |
>=media-libs/libfreehand-0.1.0 |
77 |
media-libs/libpagemaker |
78 |
+ >=media-libs/libpng-1.4:0= |
79 |
>=media-libs/libvisio-0.1.0 |
80 |
- net-misc/curl |
81 |
net-libs/neon |
82 |
+ net-misc/curl |
83 |
net-nds/openldap |
84 |
sci-mathematics/lpsolve |
85 |
virtual/jpeg:0 |
86 |
@@ -161,6 +159,10 @@ COMMON_DEPEND=" |
87 |
) |
88 |
firebird? ( >=dev-db/firebird-2.5 ) |
89 |
gltf? ( media-libs/libgltf ) |
90 |
+ gstreamer? ( |
91 |
+ media-libs/gstreamer:1.0 |
92 |
+ media-libs/gst-plugins-base:1.0 |
93 |
+ ) |
94 |
gtk? ( |
95 |
x11-libs/gdk-pixbuf |
96 |
>=x11-libs/gtk+-2.24:2 |
97 |
@@ -170,10 +172,6 @@ COMMON_DEPEND=" |
98 |
dev-libs/gobject-introspection |
99 |
>=x11-libs/gtk+-3.8:3 |
100 |
) |
101 |
- gstreamer? ( |
102 |
- media-libs/gstreamer:1.0 |
103 |
- media-libs/gst-plugins-base:1.0 |
104 |
- ) |
105 |
jemalloc? ( dev-libs/jemalloc ) |
106 |
libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) |
107 |
libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) |
108 |
@@ -186,8 +184,8 @@ RDEPEND="${COMMON_DEPEND} |
109 |
!app-office/libreoffice-bin |
110 |
!app-office/libreoffice-bin-debug |
111 |
!app-office/openoffice |
112 |
- media-fonts/libertine |
113 |
media-fonts/liberation-fonts |
114 |
+ media-fonts/libertine |
115 |
media-fonts/urw-fonts |
116 |
java? ( >=virtual/jre-1.6 ) |
117 |
kde? ( $(add_kdeapps_dep kioclient) ) |
118 |
@@ -206,6 +204,7 @@ fi |
119 |
# after everything upstream is under gbuild |
120 |
# as dmake execute tests right away |
121 |
DEPEND="${COMMON_DEPEND} |
122 |
+ !<sys-devel/make-3.82 |
123 |
>=dev-libs/libatomic_ops-7.2d |
124 |
>=dev-libs/libxml2-2.7.8 |
125 |
dev-libs/libxslt |
126 |
@@ -219,7 +218,6 @@ DEPEND="${COMMON_DEPEND} |
127 |
sys-devel/bison |
128 |
sys-devel/flex |
129 |
sys-devel/gettext |
130 |
- !<sys-devel/make-3.82 |
131 |
sys-devel/ucpp |
132 |
sys-libs/zlib |
133 |
virtual/pkgconfig |
134 |
@@ -230,15 +228,14 @@ DEPEND="${COMMON_DEPEND} |
135 |
x11-proto/xineramaproto |
136 |
x11-proto/xproto |
137 |
java? ( |
138 |
+ dev-java/ant-core |
139 |
>=virtual/jdk-1.6 |
140 |
- >=dev-java/ant-core-1.7 |
141 |
) |
142 |
odk? ( >=app-doc/doxygen-1.8.4 ) |
143 |
test? ( dev-util/cppunit ) |
144 |
" |
145 |
|
146 |
-REQUIRED_USE=" |
147 |
- ${PYTHON_REQUIRED_USE} |
148 |
+REQUIRED_USE="${PYTHON_REQUIRED_USE} |
149 |
bluetooth? ( dbus ) |
150 |
collada? ( gltf ) |
151 |
eds? ( gnome ) |
152 |
@@ -551,7 +548,7 @@ src_install() { |
153 |
insinto /usr/$(get_libdir)/libreoffice/help |
154 |
doins xmlhelp/util/*.xsl |
155 |
|
156 |
- # Remove desktop files for support to old installs that can't parse mime |
157 |
+ # Remove desktop files to support old installs that can't parse mime |
158 |
rm -r "${ED}"usr/share/mimelnk/ || die |
159 |
|
160 |
# FIXME: Hack add missing file |
161 |
|
162 |
diff --git a/app-office/libreoffice/libreoffice-5.2.9999.ebuild b/app-office/libreoffice/libreoffice-5.2.9999.ebuild |
163 |
index 31a01d6..7ae6ee1 100644 |
164 |
--- a/app-office/libreoffice/libreoffice-5.2.9999.ebuild |
165 |
+++ b/app-office/libreoffice/libreoffice-5.2.9999.ebuild |
166 |
@@ -5,7 +5,6 @@ |
167 |
EAPI=6 |
168 |
|
169 |
KDE_REQUIRED="optional" |
170 |
-QT_MINIMAL="4.7.4" |
171 |
KDE_SCM="git" |
172 |
CMAKE_REQUIRED="never" |
173 |
|
174 |
@@ -94,16 +93,14 @@ SLOT="0" |
175 |
[[ ${PV} == *9999* ]] || \ |
176 |
KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux" |
177 |
|
178 |
-COMMON_DEPEND=" |
179 |
- ${PYTHON_DEPS} |
180 |
- app-arch/zip |
181 |
+COMMON_DEPEND="${PYTHON_DEPS} |
182 |
app-arch/unzip |
183 |
+ app-arch/zip |
184 |
app-text/hunspell |
185 |
- app-text/mythes |
186 |
>=app-text/libabw-0.1.0 |
187 |
- app-text/libexttextcat |
188 |
>=app-text/libebook-0.1 |
189 |
>=app-text/libetonyek-0.1 |
190 |
+ app-text/libexttextcat |
191 |
app-text/liblangtag |
192 |
>=app-text/libmspub-0.1.0 |
193 |
>=app-text/libmwaw-0.3.1 |
194 |
@@ -111,10 +108,12 @@ COMMON_DEPEND=" |
195 |
app-text/libwpd:0.10[tools] |
196 |
app-text/libwpg:0.3 |
197 |
>=app-text/libwps-0.4 |
198 |
+ app-text/mythes |
199 |
app-text/poppler:=[cxx] |
200 |
>=dev-cpp/clucene-2.3.3.4-r2 |
201 |
=dev-cpp/libcmis-0.5* |
202 |
dev-db/unixODBC |
203 |
+ dev-lang/perl |
204 |
>=dev-libs/boost-1.55:= |
205 |
dev-libs/expat |
206 |
dev-libs/hyphen |
207 |
@@ -123,7 +122,6 @@ COMMON_DEPEND=" |
208 |
dev-libs/librevenge |
209 |
dev-libs/nspr |
210 |
dev-libs/nss |
211 |
- >=dev-lang/perl-5.0 |
212 |
!libressl? ( >=dev-libs/openssl-1.0.0d:0 ) |
213 |
libressl? ( dev-libs/libressl ) |
214 |
>=dev-libs/redland-1.0.16 |
215 |
@@ -133,13 +131,13 @@ COMMON_DEPEND=" |
216 |
>=media-libs/glew-1.10 |
217 |
>=media-libs/harfbuzz-0.9.18:=[icu(+)] |
218 |
media-libs/lcms:2 |
219 |
- >=media-libs/libpng-1.4:0= |
220 |
>=media-libs/libcdr-0.1.0 |
221 |
>=media-libs/libfreehand-0.1.0 |
222 |
media-libs/libpagemaker |
223 |
+ >=media-libs/libpng-1.4:0= |
224 |
>=media-libs/libvisio-0.1.0 |
225 |
- net-misc/curl |
226 |
net-libs/neon |
227 |
+ net-misc/curl |
228 |
net-nds/openldap |
229 |
sci-mathematics/lpsolve |
230 |
virtual/jpeg:0 |
231 |
@@ -160,6 +158,10 @@ COMMON_DEPEND=" |
232 |
) |
233 |
firebird? ( >=dev-db/firebird-2.5 ) |
234 |
gltf? ( media-libs/libgltf ) |
235 |
+ gstreamer? ( |
236 |
+ media-libs/gstreamer:1.0 |
237 |
+ media-libs/gst-plugins-base:1.0 |
238 |
+ ) |
239 |
gtk? ( |
240 |
x11-libs/gdk-pixbuf |
241 |
>=x11-libs/gtk+-2.24:2 |
242 |
@@ -169,10 +171,6 @@ COMMON_DEPEND=" |
243 |
dev-libs/gobject-introspection |
244 |
>=x11-libs/gtk+-3.8:3 |
245 |
) |
246 |
- gstreamer? ( |
247 |
- media-libs/gstreamer:1.0 |
248 |
- media-libs/gst-plugins-base:1.0 |
249 |
- ) |
250 |
jemalloc? ( dev-libs/jemalloc ) |
251 |
libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) |
252 |
libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) |
253 |
@@ -185,8 +183,8 @@ RDEPEND="${COMMON_DEPEND} |
254 |
!app-office/libreoffice-bin |
255 |
!app-office/libreoffice-bin-debug |
256 |
!app-office/openoffice |
257 |
- media-fonts/libertine |
258 |
media-fonts/liberation-fonts |
259 |
+ media-fonts/libertine |
260 |
media-fonts/urw-fonts |
261 |
java? ( >=virtual/jre-1.6 ) |
262 |
kde? ( $(add_kdeapps_dep kioclient) ) |
263 |
@@ -205,6 +203,7 @@ fi |
264 |
# after everything upstream is under gbuild |
265 |
# as dmake execute tests right away |
266 |
DEPEND="${COMMON_DEPEND} |
267 |
+ !<sys-devel/make-3.82 |
268 |
>=dev-libs/libatomic_ops-7.2d |
269 |
>=dev-libs/libxml2-2.7.8 |
270 |
dev-libs/libxslt |
271 |
@@ -217,7 +216,6 @@ DEPEND="${COMMON_DEPEND} |
272 |
sys-devel/bison |
273 |
sys-devel/flex |
274 |
sys-devel/gettext |
275 |
- !<sys-devel/make-3.82 |
276 |
sys-devel/ucpp |
277 |
sys-libs/zlib |
278 |
virtual/pkgconfig |
279 |
@@ -228,15 +226,14 @@ DEPEND="${COMMON_DEPEND} |
280 |
x11-proto/xineramaproto |
281 |
x11-proto/xproto |
282 |
java? ( |
283 |
+ dev-java/ant-core |
284 |
>=virtual/jdk-1.6 |
285 |
- >=dev-java/ant-core-1.7 |
286 |
) |
287 |
odk? ( >=app-doc/doxygen-1.8.4 ) |
288 |
test? ( dev-util/cppunit ) |
289 |
" |
290 |
|
291 |
-REQUIRED_USE=" |
292 |
- ${PYTHON_REQUIRED_USE} |
293 |
+REQUIRED_USE="${PYTHON_REQUIRED_USE} |
294 |
bluetooth? ( dbus ) |
295 |
collada? ( gltf ) |
296 |
eds? ( gnome ) |
297 |
@@ -538,7 +535,7 @@ src_install() { |
298 |
insinto /usr/$(get_libdir)/libreoffice/help |
299 |
doins xmlhelp/util/*.xsl |
300 |
|
301 |
- # Remove desktop files for support to old installs that can't parse mime |
302 |
+ # Remove desktop files to support old installs that can't parse mime |
303 |
rm -r "${ED}"usr/share/mimelnk/ || die |
304 |
|
305 |
# FIXME: Hack add missing file |
306 |
|
307 |
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild |
308 |
index 31a01d6..7ae6ee1 100644 |
309 |
--- a/app-office/libreoffice/libreoffice-9999.ebuild |
310 |
+++ b/app-office/libreoffice/libreoffice-9999.ebuild |
311 |
@@ -5,7 +5,6 @@ |
312 |
EAPI=6 |
313 |
|
314 |
KDE_REQUIRED="optional" |
315 |
-QT_MINIMAL="4.7.4" |
316 |
KDE_SCM="git" |
317 |
CMAKE_REQUIRED="never" |
318 |
|
319 |
@@ -94,16 +93,14 @@ SLOT="0" |
320 |
[[ ${PV} == *9999* ]] || \ |
321 |
KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux" |
322 |
|
323 |
-COMMON_DEPEND=" |
324 |
- ${PYTHON_DEPS} |
325 |
- app-arch/zip |
326 |
+COMMON_DEPEND="${PYTHON_DEPS} |
327 |
app-arch/unzip |
328 |
+ app-arch/zip |
329 |
app-text/hunspell |
330 |
- app-text/mythes |
331 |
>=app-text/libabw-0.1.0 |
332 |
- app-text/libexttextcat |
333 |
>=app-text/libebook-0.1 |
334 |
>=app-text/libetonyek-0.1 |
335 |
+ app-text/libexttextcat |
336 |
app-text/liblangtag |
337 |
>=app-text/libmspub-0.1.0 |
338 |
>=app-text/libmwaw-0.3.1 |
339 |
@@ -111,10 +108,12 @@ COMMON_DEPEND=" |
340 |
app-text/libwpd:0.10[tools] |
341 |
app-text/libwpg:0.3 |
342 |
>=app-text/libwps-0.4 |
343 |
+ app-text/mythes |
344 |
app-text/poppler:=[cxx] |
345 |
>=dev-cpp/clucene-2.3.3.4-r2 |
346 |
=dev-cpp/libcmis-0.5* |
347 |
dev-db/unixODBC |
348 |
+ dev-lang/perl |
349 |
>=dev-libs/boost-1.55:= |
350 |
dev-libs/expat |
351 |
dev-libs/hyphen |
352 |
@@ -123,7 +122,6 @@ COMMON_DEPEND=" |
353 |
dev-libs/librevenge |
354 |
dev-libs/nspr |
355 |
dev-libs/nss |
356 |
- >=dev-lang/perl-5.0 |
357 |
!libressl? ( >=dev-libs/openssl-1.0.0d:0 ) |
358 |
libressl? ( dev-libs/libressl ) |
359 |
>=dev-libs/redland-1.0.16 |
360 |
@@ -133,13 +131,13 @@ COMMON_DEPEND=" |
361 |
>=media-libs/glew-1.10 |
362 |
>=media-libs/harfbuzz-0.9.18:=[icu(+)] |
363 |
media-libs/lcms:2 |
364 |
- >=media-libs/libpng-1.4:0= |
365 |
>=media-libs/libcdr-0.1.0 |
366 |
>=media-libs/libfreehand-0.1.0 |
367 |
media-libs/libpagemaker |
368 |
+ >=media-libs/libpng-1.4:0= |
369 |
>=media-libs/libvisio-0.1.0 |
370 |
- net-misc/curl |
371 |
net-libs/neon |
372 |
+ net-misc/curl |
373 |
net-nds/openldap |
374 |
sci-mathematics/lpsolve |
375 |
virtual/jpeg:0 |
376 |
@@ -160,6 +158,10 @@ COMMON_DEPEND=" |
377 |
) |
378 |
firebird? ( >=dev-db/firebird-2.5 ) |
379 |
gltf? ( media-libs/libgltf ) |
380 |
+ gstreamer? ( |
381 |
+ media-libs/gstreamer:1.0 |
382 |
+ media-libs/gst-plugins-base:1.0 |
383 |
+ ) |
384 |
gtk? ( |
385 |
x11-libs/gdk-pixbuf |
386 |
>=x11-libs/gtk+-2.24:2 |
387 |
@@ -169,10 +171,6 @@ COMMON_DEPEND=" |
388 |
dev-libs/gobject-introspection |
389 |
>=x11-libs/gtk+-3.8:3 |
390 |
) |
391 |
- gstreamer? ( |
392 |
- media-libs/gstreamer:1.0 |
393 |
- media-libs/gst-plugins-base:1.0 |
394 |
- ) |
395 |
jemalloc? ( dev-libs/jemalloc ) |
396 |
libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) |
397 |
libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) |
398 |
@@ -185,8 +183,8 @@ RDEPEND="${COMMON_DEPEND} |
399 |
!app-office/libreoffice-bin |
400 |
!app-office/libreoffice-bin-debug |
401 |
!app-office/openoffice |
402 |
- media-fonts/libertine |
403 |
media-fonts/liberation-fonts |
404 |
+ media-fonts/libertine |
405 |
media-fonts/urw-fonts |
406 |
java? ( >=virtual/jre-1.6 ) |
407 |
kde? ( $(add_kdeapps_dep kioclient) ) |
408 |
@@ -205,6 +203,7 @@ fi |
409 |
# after everything upstream is under gbuild |
410 |
# as dmake execute tests right away |
411 |
DEPEND="${COMMON_DEPEND} |
412 |
+ !<sys-devel/make-3.82 |
413 |
>=dev-libs/libatomic_ops-7.2d |
414 |
>=dev-libs/libxml2-2.7.8 |
415 |
dev-libs/libxslt |
416 |
@@ -217,7 +216,6 @@ DEPEND="${COMMON_DEPEND} |
417 |
sys-devel/bison |
418 |
sys-devel/flex |
419 |
sys-devel/gettext |
420 |
- !<sys-devel/make-3.82 |
421 |
sys-devel/ucpp |
422 |
sys-libs/zlib |
423 |
virtual/pkgconfig |
424 |
@@ -228,15 +226,14 @@ DEPEND="${COMMON_DEPEND} |
425 |
x11-proto/xineramaproto |
426 |
x11-proto/xproto |
427 |
java? ( |
428 |
+ dev-java/ant-core |
429 |
>=virtual/jdk-1.6 |
430 |
- >=dev-java/ant-core-1.7 |
431 |
) |
432 |
odk? ( >=app-doc/doxygen-1.8.4 ) |
433 |
test? ( dev-util/cppunit ) |
434 |
" |
435 |
|
436 |
-REQUIRED_USE=" |
437 |
- ${PYTHON_REQUIRED_USE} |
438 |
+REQUIRED_USE="${PYTHON_REQUIRED_USE} |
439 |
bluetooth? ( dbus ) |
440 |
collada? ( gltf ) |
441 |
eds? ( gnome ) |
442 |
@@ -538,7 +535,7 @@ src_install() { |
443 |
insinto /usr/$(get_libdir)/libreoffice/help |
444 |
doins xmlhelp/util/*.xsl |
445 |
|
446 |
- # Remove desktop files for support to old installs that can't parse mime |
447 |
+ # Remove desktop files to support old installs that can't parse mime |
448 |
rm -r "${ED}"usr/share/mimelnk/ || die |
449 |
|
450 |
# FIXME: Hack add missing file |