1 |
commit: 9bf0329a1d5b3a355f8ea1e4c0132ed469bdfed7 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Nov 19 00:12:37 2018 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Nov 22 21:48:36 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bf0329a |
7 |
|
8 |
app-office/libreoffice: Fix font test deps |
9 |
|
10 |
Package-Manager: Portage-2.3.51, Repoman-2.3.12 |
11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
12 |
|
13 |
app-office/libreoffice/libreoffice-6.1.9999.ebuild | 4 ++-- |
14 |
app-office/libreoffice/libreoffice-9999.ebuild | 4 ++-- |
15 |
2 files changed, 4 insertions(+), 4 deletions(-) |
16 |
|
17 |
diff --git a/app-office/libreoffice/libreoffice-6.1.9999.ebuild b/app-office/libreoffice/libreoffice-6.1.9999.ebuild |
18 |
index 94aaaa087d8..437ac1b2f00 100644 |
19 |
--- a/app-office/libreoffice/libreoffice-6.1.9999.ebuild |
20 |
+++ b/app-office/libreoffice/libreoffice-6.1.9999.ebuild |
21 |
@@ -193,9 +193,7 @@ RDEPEND="${COMMON_DEPEND} |
22 |
!app-office/libreoffice-bin |
23 |
!app-office/libreoffice-bin-debug |
24 |
!app-office/openoffice |
25 |
- media-fonts/dejavu |
26 |
media-fonts/liberation-fonts |
27 |
- media-fonts/libertine |
28 |
|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) |
29 |
java? ( >=virtual/jre-1.6 ) |
30 |
kde? ( kde-frameworks/breeze-icons:* ) |
31 |
@@ -213,6 +211,7 @@ fi |
32 |
# FIXME: cppunit should be moved to test conditional |
33 |
# after everything upstream is under gbuild |
34 |
# as dmake execute tests right away |
35 |
+# tests apparently also need google-carlito-fonts (not packaged) |
36 |
DEPEND="${COMMON_DEPEND} |
37 |
>=dev-libs/libatomic_ops-7.2d |
38 |
dev-perl/Archive-Zip |
39 |
@@ -238,6 +237,7 @@ DEPEND="${COMMON_DEPEND} |
40 |
app-crypt/gnupg |
41 |
dev-util/cppunit |
42 |
media-fonts/dejavu |
43 |
+ media-fonts/liberation-fonts |
44 |
) |
45 |
" |
46 |
|
47 |
|
48 |
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild |
49 |
index 4cf5eb3b938..d2235c0033d 100644 |
50 |
--- a/app-office/libreoffice/libreoffice-9999.ebuild |
51 |
+++ b/app-office/libreoffice/libreoffice-9999.ebuild |
52 |
@@ -196,9 +196,7 @@ RDEPEND="${COMMON_DEPEND} |
53 |
!app-office/libreoffice-bin |
54 |
!app-office/libreoffice-bin-debug |
55 |
!app-office/openoffice |
56 |
- media-fonts/dejavu |
57 |
media-fonts/liberation-fonts |
58 |
- media-fonts/libertine |
59 |
|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) |
60 |
java? ( >=virtual/jre-1.6 ) |
61 |
kde? ( kde-frameworks/breeze-icons:* ) |
62 |
@@ -216,6 +214,7 @@ fi |
63 |
# FIXME: cppunit should be moved to test conditional |
64 |
# after everything upstream is under gbuild |
65 |
# as dmake execute tests right away |
66 |
+# tests apparently also need google-carlito-fonts (not packaged) |
67 |
DEPEND="${COMMON_DEPEND} |
68 |
>=dev-libs/libatomic_ops-7.2d |
69 |
dev-perl/Archive-Zip |
70 |
@@ -241,6 +240,7 @@ DEPEND="${COMMON_DEPEND} |
71 |
app-crypt/gnupg |
72 |
dev-util/cppunit |
73 |
media-fonts/dejavu |
74 |
+ media-fonts/liberation-fonts |
75 |
) |
76 |
" |