| 1 |
commit: 025869b527860b938e2ca7a9edd9b909b4eda648 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Dec 9 15:50:28 2017 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Dec 9 15:52:36 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=025869b5 |
| 7 |
|
| 8 |
app-office/libreoffice: Merge USE=gnome into gtk3 |
| 9 |
|
| 10 |
It makes no sense to keep them split. Simplifies REQUIRED_USE. |
| 11 |
No difference for USE=eds users in terms of dependencies. |
| 12 |
Negligible depgraph change for USE=gtk3 users. |
| 13 |
|
| 14 |
Bug: https://bugs.gentoo.org/638012 |
| 15 |
Package-Manager: Portage-2.3.17, Repoman-2.3.6 |
| 16 |
|
| 17 |
app-office/libreoffice/libreoffice-5.4.9999.ebuild | 17 ++++++++--------- |
| 18 |
app-office/libreoffice/libreoffice-6.0.9999.ebuild | 17 ++++++++--------- |
| 19 |
app-office/libreoffice/libreoffice-9999.ebuild | 17 ++++++++--------- |
| 20 |
3 files changed, 24 insertions(+), 27 deletions(-) |
| 21 |
|
| 22 |
diff --git a/app-office/libreoffice/libreoffice-5.4.9999.ebuild b/app-office/libreoffice/libreoffice-5.4.9999.ebuild |
| 23 |
index 92815ff4ba5..201395b5c80 100644 |
| 24 |
--- a/app-office/libreoffice/libreoffice-5.4.9999.ebuild |
| 25 |
+++ b/app-office/libreoffice/libreoffice-5.4.9999.ebuild |
| 26 |
@@ -64,7 +64,7 @@ unset ADDONS_SRC |
| 27 |
# Extensions that need extra work: |
| 28 |
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher" |
| 29 |
|
| 30 |
-IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome googledrive |
| 31 |
+IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf googledrive |
| 32 |
gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport postgres quickstarter test vlc |
| 33 |
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})" |
| 34 |
|
| 35 |
@@ -125,13 +125,13 @@ COMMON_DEPEND="${PYTHON_DEPS} |
| 36 |
net-misc/curl |
| 37 |
net-nds/openldap |
| 38 |
sci-mathematics/lpsolve |
| 39 |
+ virtual/glu |
| 40 |
+ virtual/jpeg:0 |
| 41 |
+ virtual/opengl |
| 42 |
x11-libs/cairo[X] |
| 43 |
x11-libs/libXinerama |
| 44 |
x11-libs/libXrandr |
| 45 |
x11-libs/libXrender |
| 46 |
- virtual/glu |
| 47 |
- virtual/jpeg:0 |
| 48 |
- virtual/opengl |
| 49 |
bluetooth? ( net-wireless/bluez ) |
| 50 |
coinmp? ( sci-libs/coinor-mp ) |
| 51 |
collada? ( media-libs/opencollada ) |
| 52 |
@@ -143,7 +143,6 @@ COMMON_DEPEND="${PYTHON_DEPS} |
| 53 |
) |
| 54 |
firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1 ) |
| 55 |
gltf? ( >=media-libs/libgltf-0.1.0 ) |
| 56 |
- gnome? ( gnome-base/dconf ) |
| 57 |
gstreamer? ( |
| 58 |
media-libs/gstreamer:1.0 |
| 59 |
media-libs/gst-plugins-base:1.0 |
| 60 |
@@ -155,6 +154,7 @@ COMMON_DEPEND="${PYTHON_DEPS} |
| 61 |
gtk3? ( |
| 62 |
dev-libs/glib:2 |
| 63 |
dev-libs/gobject-introspection |
| 64 |
+ gnome-base/dconf |
| 65 |
x11-libs/gtk+:3 |
| 66 |
) |
| 67 |
jemalloc? ( dev-libs/jemalloc ) |
| 68 |
@@ -231,8 +231,7 @@ DEPEND="${COMMON_DEPEND} |
| 69 |
REQUIRED_USE="${PYTHON_REQUIRED_USE} |
| 70 |
bluetooth? ( dbus ) |
| 71 |
collada? ( gltf ) |
| 72 |
- eds? ( gnome ) |
| 73 |
- gnome? ( gtk ) |
| 74 |
+ eds? ( gtk3 ) |
| 75 |
libreoffice_extensions_nlpsolver? ( java ) |
| 76 |
libreoffice_extensions_scripting-beanshell? ( java ) |
| 77 |
libreoffice_extensions_scripting-javascript? ( java ) |
| 78 |
@@ -463,11 +462,11 @@ src_configure() { |
| 79 |
$(use_enable eds evolution2) \ |
| 80 |
$(use_enable firebird firebird-sdbc) \ |
| 81 |
$(use_enable gltf) \ |
| 82 |
- $(use_enable gnome gio) \ |
| 83 |
- $(use_enable gnome dconf) \ |
| 84 |
$(use_enable gstreamer gstreamer-1-0) \ |
| 85 |
$(use_enable gtk) \ |
| 86 |
$(use_enable gtk3) \ |
| 87 |
+ $(use_enable gtk3 dconf) \ |
| 88 |
+ $(use_enable gtk3 gio) \ |
| 89 |
$(use_enable kde kde4) \ |
| 90 |
$(use_enable mysql ext-mariadb-connector) \ |
| 91 |
$(use_enable odk) \ |
| 92 |
|
| 93 |
diff --git a/app-office/libreoffice/libreoffice-6.0.9999.ebuild b/app-office/libreoffice/libreoffice-6.0.9999.ebuild |
| 94 |
index a9461079bcb..6033b315d7e 100644 |
| 95 |
--- a/app-office/libreoffice/libreoffice-6.0.9999.ebuild |
| 96 |
+++ b/app-office/libreoffice/libreoffice-6.0.9999.ebuild |
| 97 |
@@ -63,7 +63,7 @@ unset ADDONS_SRC |
| 98 |
# Extensions that need extra work: |
| 99 |
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher" |
| 100 |
|
| 101 |
-IUSE="bluetooth +branding coinmp +cups dbus debug eds firebird gnome googledrive |
| 102 |
+IUSE="bluetooth +branding coinmp +cups dbus debug eds firebird googledrive |
| 103 |
gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport postgres qt4 qt5 test vlc |
| 104 |
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})" |
| 105 |
|
| 106 |
@@ -126,13 +126,13 @@ COMMON_DEPEND="${PYTHON_DEPS} |
| 107 |
net-misc/curl |
| 108 |
net-nds/openldap |
| 109 |
sci-mathematics/lpsolve |
| 110 |
+ virtual/glu |
| 111 |
+ virtual/jpeg:0 |
| 112 |
+ virtual/opengl |
| 113 |
x11-libs/cairo[X] |
| 114 |
x11-libs/libXinerama |
| 115 |
x11-libs/libXrandr |
| 116 |
x11-libs/libXrender |
| 117 |
- virtual/glu |
| 118 |
- virtual/jpeg:0 |
| 119 |
- virtual/opengl |
| 120 |
bluetooth? ( net-wireless/bluez ) |
| 121 |
coinmp? ( sci-libs/coinor-mp ) |
| 122 |
cups? ( net-print/cups ) |
| 123 |
@@ -142,7 +142,6 @@ COMMON_DEPEND="${PYTHON_DEPS} |
| 124 |
gnome-extra/evolution-data-server |
| 125 |
) |
| 126 |
firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1 ) |
| 127 |
- gnome? ( gnome-base/dconf ) |
| 128 |
gstreamer? ( |
| 129 |
media-libs/gstreamer:1.0 |
| 130 |
media-libs/gst-plugins-base:1.0 |
| 131 |
@@ -154,6 +153,7 @@ COMMON_DEPEND="${PYTHON_DEPS} |
| 132 |
gtk3? ( |
| 133 |
dev-libs/glib:2 |
| 134 |
dev-libs/gobject-introspection |
| 135 |
+ gnome-base/dconf |
| 136 |
x11-libs/gtk+:3 |
| 137 |
) |
| 138 |
jemalloc? ( dev-libs/jemalloc ) |
| 139 |
@@ -234,8 +234,7 @@ DEPEND="${COMMON_DEPEND} |
| 140 |
|
| 141 |
REQUIRED_USE="${PYTHON_REQUIRED_USE} |
| 142 |
bluetooth? ( dbus ) |
| 143 |
- eds? ( gnome ) |
| 144 |
- gnome? ( gtk ) |
| 145 |
+ eds? ( gtk3 ) |
| 146 |
kde? ( || ( qt4 qt5 ) ) |
| 147 |
libreoffice_extensions_nlpsolver? ( java ) |
| 148 |
libreoffice_extensions_scripting-beanshell? ( java ) |
| 149 |
@@ -466,11 +465,11 @@ src_configure() { |
| 150 |
$(use_enable dbus) \ |
| 151 |
$(use_enable eds evolution2) \ |
| 152 |
$(use_enable firebird firebird-sdbc) \ |
| 153 |
- $(use_enable gnome gio) \ |
| 154 |
- $(use_enable gnome dconf) \ |
| 155 |
$(use_enable gstreamer gstreamer-1-0) \ |
| 156 |
$(use_enable gtk) \ |
| 157 |
$(use_enable gtk3) \ |
| 158 |
+ $(use_enable gtk3 dconf) \ |
| 159 |
+ $(use_enable gtk3 gio) \ |
| 160 |
$(use_enable mysql ext-mariadb-connector) \ |
| 161 |
$(use_enable odk) \ |
| 162 |
$(use_enable pdfimport) \ |
| 163 |
|
| 164 |
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild |
| 165 |
index a9461079bcb..6033b315d7e 100644 |
| 166 |
--- a/app-office/libreoffice/libreoffice-9999.ebuild |
| 167 |
+++ b/app-office/libreoffice/libreoffice-9999.ebuild |
| 168 |
@@ -63,7 +63,7 @@ unset ADDONS_SRC |
| 169 |
# Extensions that need extra work: |
| 170 |
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher" |
| 171 |
|
| 172 |
-IUSE="bluetooth +branding coinmp +cups dbus debug eds firebird gnome googledrive |
| 173 |
+IUSE="bluetooth +branding coinmp +cups dbus debug eds firebird googledrive |
| 174 |
gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport postgres qt4 qt5 test vlc |
| 175 |
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})" |
| 176 |
|
| 177 |
@@ -126,13 +126,13 @@ COMMON_DEPEND="${PYTHON_DEPS} |
| 178 |
net-misc/curl |
| 179 |
net-nds/openldap |
| 180 |
sci-mathematics/lpsolve |
| 181 |
+ virtual/glu |
| 182 |
+ virtual/jpeg:0 |
| 183 |
+ virtual/opengl |
| 184 |
x11-libs/cairo[X] |
| 185 |
x11-libs/libXinerama |
| 186 |
x11-libs/libXrandr |
| 187 |
x11-libs/libXrender |
| 188 |
- virtual/glu |
| 189 |
- virtual/jpeg:0 |
| 190 |
- virtual/opengl |
| 191 |
bluetooth? ( net-wireless/bluez ) |
| 192 |
coinmp? ( sci-libs/coinor-mp ) |
| 193 |
cups? ( net-print/cups ) |
| 194 |
@@ -142,7 +142,6 @@ COMMON_DEPEND="${PYTHON_DEPS} |
| 195 |
gnome-extra/evolution-data-server |
| 196 |
) |
| 197 |
firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1 ) |
| 198 |
- gnome? ( gnome-base/dconf ) |
| 199 |
gstreamer? ( |
| 200 |
media-libs/gstreamer:1.0 |
| 201 |
media-libs/gst-plugins-base:1.0 |
| 202 |
@@ -154,6 +153,7 @@ COMMON_DEPEND="${PYTHON_DEPS} |
| 203 |
gtk3? ( |
| 204 |
dev-libs/glib:2 |
| 205 |
dev-libs/gobject-introspection |
| 206 |
+ gnome-base/dconf |
| 207 |
x11-libs/gtk+:3 |
| 208 |
) |
| 209 |
jemalloc? ( dev-libs/jemalloc ) |
| 210 |
@@ -234,8 +234,7 @@ DEPEND="${COMMON_DEPEND} |
| 211 |
|
| 212 |
REQUIRED_USE="${PYTHON_REQUIRED_USE} |
| 213 |
bluetooth? ( dbus ) |
| 214 |
- eds? ( gnome ) |
| 215 |
- gnome? ( gtk ) |
| 216 |
+ eds? ( gtk3 ) |
| 217 |
kde? ( || ( qt4 qt5 ) ) |
| 218 |
libreoffice_extensions_nlpsolver? ( java ) |
| 219 |
libreoffice_extensions_scripting-beanshell? ( java ) |
| 220 |
@@ -466,11 +465,11 @@ src_configure() { |
| 221 |
$(use_enable dbus) \ |
| 222 |
$(use_enable eds evolution2) \ |
| 223 |
$(use_enable firebird firebird-sdbc) \ |
| 224 |
- $(use_enable gnome gio) \ |
| 225 |
- $(use_enable gnome dconf) \ |
| 226 |
$(use_enable gstreamer gstreamer-1-0) \ |
| 227 |
$(use_enable gtk) \ |
| 228 |
$(use_enable gtk3) \ |
| 229 |
+ $(use_enable gtk3 dconf) \ |
| 230 |
+ $(use_enable gtk3 gio) \ |
| 231 |
$(use_enable mysql ext-mariadb-connector) \ |
| 232 |
$(use_enable odk) \ |
| 233 |
$(use_enable pdfimport) \ |
Archives