| 1 |
commit: 6a77b6e583fcadcba8e3c72eb6af444b645f7c03 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jul 14 07:38:42 2018 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jul 14 08:20:24 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a77b6e5 |
| 7 |
|
| 8 |
app-office/libreoffice: Fix DEPENDs |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.42, Repoman-2.3.9 |
| 11 |
|
| 12 |
app-office/libreoffice/libreoffice-6.0.5.2-r1.ebuild | 6 +++--- |
| 13 |
app-office/libreoffice/libreoffice-6.0.9999.ebuild | 6 +++--- |
| 14 |
app-office/libreoffice/libreoffice-6.1.9999.ebuild | 6 +++--- |
| 15 |
app-office/libreoffice/libreoffice-9999.ebuild | 6 +++--- |
| 16 |
4 files changed, 12 insertions(+), 12 deletions(-) |
| 17 |
|
| 18 |
diff --git a/app-office/libreoffice/libreoffice-6.0.5.2-r1.ebuild b/app-office/libreoffice/libreoffice-6.0.5.2-r1.ebuild |
| 19 |
index 383dfdd8a99..f1a8586df01 100644 |
| 20 |
--- a/app-office/libreoffice/libreoffice-6.0.5.2-r1.ebuild |
| 21 |
+++ b/app-office/libreoffice/libreoffice-6.0.5.2-r1.ebuild |
| 22 |
@@ -113,6 +113,8 @@ COMMON_DEPEND="${PYTHON_DEPS} |
| 23 |
dev-libs/libgpg-error |
| 24 |
>=dev-libs/liborcus-0.13.3 |
| 25 |
dev-libs/librevenge |
| 26 |
+ dev-libs/libxml2 |
| 27 |
+ dev-libs/libxslt |
| 28 |
dev-libs/nspr |
| 29 |
dev-libs/nss |
| 30 |
>=dev-libs/redland-1.0.16 |
| 31 |
@@ -133,6 +135,7 @@ COMMON_DEPEND="${PYTHON_DEPS} |
| 32 |
net-misc/curl |
| 33 |
net-nds/openldap |
| 34 |
sci-mathematics/lpsolve |
| 35 |
+ sys-libs/zlib:= |
| 36 |
virtual/glu |
| 37 |
virtual/jpeg:0 |
| 38 |
virtual/opengl |
| 39 |
@@ -210,8 +213,6 @@ fi |
| 40 |
# as dmake execute tests right away |
| 41 |
DEPEND="${COMMON_DEPEND} |
| 42 |
>=dev-libs/libatomic_ops-7.2d |
| 43 |
- >=dev-libs/libxml2-2.7.8 |
| 44 |
- dev-libs/libxslt |
| 45 |
dev-perl/Archive-Zip |
| 46 |
>=dev-util/cppunit-1.14.0 |
| 47 |
>=dev-util/gperf-3 |
| 48 |
@@ -222,7 +223,6 @@ DEPEND="${COMMON_DEPEND} |
| 49 |
sys-devel/flex |
| 50 |
sys-devel/gettext |
| 51 |
sys-devel/ucpp |
| 52 |
- sys-libs/zlib |
| 53 |
virtual/pkgconfig |
| 54 |
x11-base/xorg-proto |
| 55 |
x11-libs/libXt |
| 56 |
|
| 57 |
diff --git a/app-office/libreoffice/libreoffice-6.0.9999.ebuild b/app-office/libreoffice/libreoffice-6.0.9999.ebuild |
| 58 |
index c8aabf7c905..c3904450efc 100644 |
| 59 |
--- a/app-office/libreoffice/libreoffice-6.0.9999.ebuild |
| 60 |
+++ b/app-office/libreoffice/libreoffice-6.0.9999.ebuild |
| 61 |
@@ -113,6 +113,8 @@ COMMON_DEPEND="${PYTHON_DEPS} |
| 62 |
dev-libs/libgpg-error |
| 63 |
>=dev-libs/liborcus-0.13.3 |
| 64 |
dev-libs/librevenge |
| 65 |
+ dev-libs/libxml2 |
| 66 |
+ dev-libs/libxslt |
| 67 |
dev-libs/nspr |
| 68 |
dev-libs/nss |
| 69 |
>=dev-libs/redland-1.0.16 |
| 70 |
@@ -133,6 +135,7 @@ COMMON_DEPEND="${PYTHON_DEPS} |
| 71 |
net-misc/curl |
| 72 |
net-nds/openldap |
| 73 |
sci-mathematics/lpsolve |
| 74 |
+ sys-libs/zlib:= |
| 75 |
virtual/glu |
| 76 |
virtual/jpeg:0 |
| 77 |
virtual/opengl |
| 78 |
@@ -210,8 +213,6 @@ fi |
| 79 |
# as dmake execute tests right away |
| 80 |
DEPEND="${COMMON_DEPEND} |
| 81 |
>=dev-libs/libatomic_ops-7.2d |
| 82 |
- >=dev-libs/libxml2-2.7.8 |
| 83 |
- dev-libs/libxslt |
| 84 |
dev-perl/Archive-Zip |
| 85 |
>=dev-util/cppunit-1.14.0 |
| 86 |
>=dev-util/gperf-3 |
| 87 |
@@ -222,7 +223,6 @@ DEPEND="${COMMON_DEPEND} |
| 88 |
sys-devel/flex |
| 89 |
sys-devel/gettext |
| 90 |
sys-devel/ucpp |
| 91 |
- sys-libs/zlib |
| 92 |
virtual/pkgconfig |
| 93 |
x11-base/xorg-proto |
| 94 |
x11-libs/libXt |
| 95 |
|
| 96 |
diff --git a/app-office/libreoffice/libreoffice-6.1.9999.ebuild b/app-office/libreoffice/libreoffice-6.1.9999.ebuild |
| 97 |
index e887936e67f..d3b626eef82 100644 |
| 98 |
--- a/app-office/libreoffice/libreoffice-6.1.9999.ebuild |
| 99 |
+++ b/app-office/libreoffice/libreoffice-6.1.9999.ebuild |
| 100 |
@@ -114,6 +114,8 @@ COMMON_DEPEND="${PYTHON_DEPS} |
| 101 |
dev-libs/libgpg-error |
| 102 |
>=dev-libs/liborcus-0.13.3 |
| 103 |
dev-libs/librevenge |
| 104 |
+ dev-libs/libxml2 |
| 105 |
+ dev-libs/libxslt |
| 106 |
dev-libs/nspr |
| 107 |
dev-libs/nss |
| 108 |
>=dev-libs/redland-1.0.16 |
| 109 |
@@ -134,6 +136,7 @@ COMMON_DEPEND="${PYTHON_DEPS} |
| 110 |
net-misc/curl |
| 111 |
net-nds/openldap |
| 112 |
sci-mathematics/lpsolve |
| 113 |
+ sys-libs/zlib:= |
| 114 |
virtual/glu |
| 115 |
virtual/jpeg:0 |
| 116 |
virtual/opengl |
| 117 |
@@ -210,8 +213,6 @@ fi |
| 118 |
# as dmake execute tests right away |
| 119 |
DEPEND="${COMMON_DEPEND} |
| 120 |
>=dev-libs/libatomic_ops-7.2d |
| 121 |
- >=dev-libs/libxml2-2.7.8 |
| 122 |
- dev-libs/libxslt |
| 123 |
dev-perl/Archive-Zip |
| 124 |
>=dev-util/cppunit-1.14.0 |
| 125 |
>=dev-util/gperf-3 |
| 126 |
@@ -222,7 +223,6 @@ DEPEND="${COMMON_DEPEND} |
| 127 |
sys-devel/flex |
| 128 |
sys-devel/gettext |
| 129 |
sys-devel/ucpp |
| 130 |
- sys-libs/zlib |
| 131 |
virtual/pkgconfig |
| 132 |
x11-base/xorg-proto |
| 133 |
x11-libs/libXt |
| 134 |
|
| 135 |
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild |
| 136 |
index c578ddf3023..556bbaf02b1 100644 |
| 137 |
--- a/app-office/libreoffice/libreoffice-9999.ebuild |
| 138 |
+++ b/app-office/libreoffice/libreoffice-9999.ebuild |
| 139 |
@@ -114,6 +114,8 @@ COMMON_DEPEND="${PYTHON_DEPS} |
| 140 |
dev-libs/libgpg-error |
| 141 |
>=dev-libs/liborcus-0.13.3 |
| 142 |
dev-libs/librevenge |
| 143 |
+ dev-libs/libxml2 |
| 144 |
+ dev-libs/libxslt |
| 145 |
dev-libs/nspr |
| 146 |
dev-libs/nss |
| 147 |
>=dev-libs/redland-1.0.16 |
| 148 |
@@ -134,6 +136,7 @@ COMMON_DEPEND="${PYTHON_DEPS} |
| 149 |
net-misc/curl |
| 150 |
net-nds/openldap |
| 151 |
sci-mathematics/lpsolve |
| 152 |
+ sys-libs/zlib:= |
| 153 |
virtual/glu |
| 154 |
virtual/jpeg:0 |
| 155 |
virtual/opengl |
| 156 |
@@ -210,8 +213,6 @@ fi |
| 157 |
# as dmake execute tests right away |
| 158 |
DEPEND="${COMMON_DEPEND} |
| 159 |
>=dev-libs/libatomic_ops-7.2d |
| 160 |
- >=dev-libs/libxml2-2.7.8 |
| 161 |
- dev-libs/libxslt |
| 162 |
dev-perl/Archive-Zip |
| 163 |
>=dev-util/cppunit-1.14.0 |
| 164 |
>=dev-util/gperf-3 |
| 165 |
@@ -222,7 +223,6 @@ DEPEND="${COMMON_DEPEND} |
| 166 |
sys-devel/flex |
| 167 |
sys-devel/gettext |
| 168 |
sys-devel/ucpp |
| 169 |
- sys-libs/zlib |
| 170 |
virtual/pkgconfig |
| 171 |
x11-base/xorg-proto |
| 172 |
x11-libs/libXt |
Archives