commit: e82b4313d11aceba23245ee0c1fde15f21e57018
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 24 10:56:47 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jan 24 12:46:39 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e82b4313
app-office/libreoffice: Switch default gtk+ frontend to gtk+3
It is no longer declared experimental in >=6.0.
Package-Manager: Portage-2.3.20, Repoman-2.3.6
app-office/libreoffice/libreoffice-6.0.9999.ebuild | 18 +++++++++---------
app-office/libreoffice/libreoffice-9999.ebuild | 18 +++++++++---------
app-office/libreoffice/metadata.xml | 3 ++-
3 files changed, 20 insertions(+), 19 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-6.0.9999.ebuild
b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
index 5b58caa856a..90f72941a9b 100644
--- a/app-office/libreoffice/libreoffice-6.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
@@ -64,7 +64,7 @@ unset ADDONS_SRC
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
IUSE="bluetooth +branding coinmp +cups dbus debug eds firebird googledrive
-gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport postgres test vlc
+gstreamer +gtk gtk2 jemalloc kde libressl mysql odk pdfimport postgres test vlc
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
LICENSE="|| ( LGPL-3 MPL-1.1 )"
@@ -148,15 +148,15 @@ COMMON_DEPEND="${PYTHON_DEPS}
media-libs/gst-plugins-base:1.0
)
gtk? (
- x11-libs/gdk-pixbuf
- >=x11-libs/gtk+-2.24:2
- )
- gtk3? (
dev-libs/glib:2
dev-libs/gobject-introspection
gnome-base/dconf
x11-libs/gtk+:3
)
+ gtk2? (
+ x11-libs/gdk-pixbuf
+ >=x11-libs/gtk+-2.24:2
+ )
jemalloc? ( dev-libs/jemalloc )
libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
@@ -426,8 +426,8 @@ src_configure() {
$(use_enable eds evolution2)
$(use_enable firebird firebird-sdbc)
$(use_enable gstreamer gstreamer-1-0)
- $(use_enable gtk)
- $(use_enable gtk3)
+ $(use_enable gtk gtk3)
+ $(use_enable gtk2 gtk)
$(use_enable mysql ext-mariadb-connector)
$(use_enable odk)
$(use_enable pdfimport)
@@ -442,7 +442,7 @@ src_configure() {
$(use_with odk doxygen)
)
- if use eds || use gtk3; then
+ if use eds || use gtk; then
myeconfargs+=( --enable-dconf --enable-gio )
else
myeconfargs+=( --disable-dconf --disable-gio )
@@ -519,7 +519,7 @@ src_install() {
make DESTDIR="${D}" distro-pack-install -o build -o check || die
# bug 593514
- if use gtk3; then
+ if use gtk; then
dosym libreoffice/program/liblibreofficekitgtk.so \
/usr/$(get_libdir)/liblibreofficekitgtk.so
fi
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild
b/app-office/libreoffice/libreoffice-9999.ebuild
index 664bacbda8e..7bfe88d60c1 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -64,7 +64,7 @@ unset ADDONS_SRC
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
IUSE="bluetooth +branding coinmp +cups dbus debug eds firebird googledrive
-gstreamer +gtk gtk3 kde libressl mysql odk pdfimport postgres qt4 qt5 test vlc
+gstreamer +gtk gtk2 kde libressl mysql odk pdfimport postgres qt4 qt5 test vlc
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
LICENSE="|| ( LGPL-3 MPL-1.1 )"
@@ -148,15 +148,15 @@ COMMON_DEPEND="${PYTHON_DEPS}
media-libs/gst-plugins-base:1.0
)
gtk? (
- x11-libs/gdk-pixbuf
- >=x11-libs/gtk+-2.24:2
- )
- gtk3? (
dev-libs/glib:2
dev-libs/gobject-introspection
gnome-base/dconf
x11-libs/gtk+:3
)
+ gtk2? (
+ x11-libs/gdk-pixbuf
+ >=x11-libs/gtk+-2.24:2
+ )
libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
mysql? ( dev-db/mysql-connector-c++ )
@@ -438,8 +438,8 @@ src_configure() {
$(use_enable eds evolution2)
$(use_enable firebird firebird-sdbc)
$(use_enable gstreamer gstreamer-1-0)
- $(use_enable gtk)
- $(use_enable gtk3)
+ $(use_enable gtk gtk3)
+ $(use_enable gtk2 gtk)
$(use_enable mysql ext-mariadb-connector)
$(use_enable odk)
$(use_enable pdfimport)
@@ -455,7 +455,7 @@ src_configure() {
$(use_with odk doxygen)
)
- if use eds || use gtk3; then
+ if use eds || use gtk; then
myeconfargs+=( --enable-dconf --enable-gio )
else
myeconfargs+=( --disable-dconf --disable-gio )
@@ -532,7 +532,7 @@ src_install() {
make DESTDIR="${D}" distro-pack-install -o build -o check || die
# bug 593514
- if use gtk3; then
+ if use gtk; then
dosym libreoffice/program/liblibreofficekitgtk.so \
/usr/$(get_libdir)/liblibreofficekitgtk.so
fi
diff --git a/app-office/libreoffice/metadata.xml
b/app-office/libreoffice/metadata.xml
index 1d3010d4130..f72d5cc7d18 100644
--- a/app-office/libreoffice/metadata.xml
+++ b/app-office/libreoffice/metadata.xml
@@ -15,7 +15,8 @@ version</longdescription>
<flag name="collada">Enable Collada for rendering 3D models stored in
*.dae and *.kmz format</flag>
<flag name="gltf">Use media-libs/libgltf for inserting 3D models in the
glTF format into presentations</flag>
<flag name="googledrive">Enable support for remote files on Google
Drive</flag>
- <flag name="gtk3">Enable highly experimental gtk3 frontend</flag>
+ <flag name="gtk2">Enable legacy gtk2 frontend</flag>
+ <flag name="gtk3">Enable experimental gtk3 frontend</flag>
<flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for
allocations</flag>
<flag name="odk">Build the Office Development Kit</flag>
<flag name="pdfimport">Enable PDF import via the Poppler library</flag>
