app-office/libreoffice: Re-add USE=firebird

Package-Manager: Portage-2.3.5, Repoman-2.3.1

diff --git a/app-office/libreoffice/libreoffice-5.3.3.2.ebuild b/app-office/libreoffice/libreoffice-5.3.3.2.ebuild
index 62c861f096b850c1bfe11c15bf90ded9c986f18f..d3a6ef3a9848cd89a1995ee15227ae94d29ed08f 100644 (file)
--- a/app-office/libreoffice/libreoffice-5.3.3.2.ebuild
+++ b/app-office/libreoffice/libreoffice-5.3.3.2.ebuild
@@ -76,7 +76,7 @@ unset ADDONS_SRC
 # Extensions that need extra work:
 LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
 
-IUSE="bluetooth +branding coinmp collada +cups dbus debug eds gltf gnome googledrive
+IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome googledrive
 gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport postgres quickstarter telepathy test vlc
 $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
 
@@ -86,7 +86,6 @@ SLOT="0"
 KEYWORDS=""
 #KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 
-# TODO: not packaged: firebird? ( >=dev-db/firebird-3.0 )
 COMMON_DEPEND="${PYTHON_DEPS}
        app-arch/unzip
        app-arch/zip
@@ -151,6 +150,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
                dev-libs/glib:2
                gnome-extra/evolution-data-server
        )
+       firebird? ( >=dev-db/firebird-2.5 )
        gltf? ( media-libs/libgltf )
        gnome? ( gnome-base/dconf )
        gstreamer? (
@@ -434,7 +434,6 @@ src_configure() {
        # --disable-report-builder: too much java packages pulled in without pkgs
        # --without-system-sane: just sane.h header that is used for scan in writer,
        #   not linked or anything else, worthless to depend on
-       # TODO: $(use_enable firebird firebird-sdbc)
        econf \
                --docdir="${EPREFIX}/usr/share/doc/${PF}/" \
                --with-system-dicts \
@@ -454,7 +453,6 @@ src_configure() {
                --disable-dependency-tracking \
                --disable-epm \
                --disable-fetch-external \
-               --disable-firebird-sdbc \
                --disable-gstreamer-0-10 \
                --disable-online-update \
                --disable-report-builder \
@@ -482,6 +480,7 @@ src_configure() {
                $(use_enable debug) \
                $(use_enable dbus) \
                $(use_enable eds evolution2) \
+               $(use_enable firebird firebird-sdbc) \
                $(use_enable gltf) \
                $(use_enable gnome gio) \
                $(use_enable gnome dconf) \
@@ -551,7 +550,7 @@ src_install() {
 
        # bug 593514
        if use gtk3; then
-               dosym /usr/$(get_libdir)/libreoffice/program/liblibreofficekitgtk.so \
+               dosym libreoffice/program/liblibreofficekitgtk.so \
                        /usr/$(get_libdir)/liblibreofficekitgtk.so
        fi