commit:     f4e8b9e02198c9c3227c96d8532db4e0e2f5e85e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 13 21:51:55 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Dec 13 23:18:41 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4e8b9e0

app-office/libreoffice: Switch src_configure to myeconfargs array

Package-Manager: Portage-2.3.18, Repoman-2.3.6

 app-office/libreoffice/libreoffice-5.4.9999.ebuild | 202 ++++++++++-----------
 app-office/libreoffice/libreoffice-6.0.9999.ebuild | 198 ++++++++++----------
 app-office/libreoffice/libreoffice-9999.ebuild     | 198 ++++++++++----------
 3 files changed, 296 insertions(+), 302 deletions(-)

diff --git a/app-office/libreoffice/libreoffice-5.4.9999.ebuild 
b/app-office/libreoffice/libreoffice-5.4.9999.ebuild
index 7215809cdb3..542f04bac54 100644
--- a/app-office/libreoffice/libreoffice-5.4.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.4.9999.ebuild
@@ -349,8 +349,6 @@ src_prepare() {
 }
 
 src_configure() {
-       local ext_opts gtk_opts java_opts
-
        # Set up Google API keys, see 
https://www.chromium.org/developers/how-tos/api-keys
        # Note: these are for Gentoo use ONLY. For your own distribution, 
please get
        # your own set of keys. Feel free to contact [email protected] for 
more info.
@@ -368,126 +366,126 @@ src_configure() {
                export OPENCOLLADA_LIBS="-L /usr/$(get_libdir)/opencollada 
-lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader 
-lGeneratedSaxParser"
        fi
 
+       if use kde; then
+               # bug 544108, bug 599076
+               export QMAKEQT4="$(qt4_get_bindir)/qmake"
+               export MOCQT4="$(qt4_get_bindir)/moc"
+       fi
+
+       # system headers/libs/...: enforce using system packages
+       # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
+       # --enable-cairo: ensure that cairo is always required
+       # --enable-*-link: link to the library rather than just dlopen on 
runtime
+       # --enable-release-build: build the libreoffice as release
+       # --disable-fetch-external: prevent dowloading during compile phase
+       # --enable-extension-integration: enable any extension integration 
support
+       # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+       # --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
+       # --disable-pdfium: not yet packaged
+       local myeconfargs=(
+               --with-system-dicts
+               --with-system-epoxy
+               --with-system-headers
+               --with-system-jars
+               --with-system-libs
+               --enable-cairo-canvas
+               --enable-largefile
+               --enable-mergelibs
+               --enable-neon
+               --enable-python=system
+               --enable-randr
+               --enable-release-build
+               --disable-breakpad
+               --disable-ccache
+               --disable-dependency-tracking
+               --disable-epm
+               --disable-fetch-external
+               --disable-gstreamer-0-10
+               --disable-online-update
+               --disable-pdfium
+               --disable-report-builder
+               --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system")
+               --with-build-version="Gentoo official package"
+               --enable-extension-integration
+               --with-external-dict-dir="${EPREFIX}/usr/share/myspell"
+               --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
+               --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
+               --with-external-tar="${DISTDIR}"
+               --with-lang=""
+               --with-parallelism=$(makeopts_jobs)
+               --with-system-ucpp
+               --with-vendor="Gentoo Foundation"
+               --with-x
+               --without-fonts
+               --without-myspell-dicts
+               --without-help
+               --with-helppack-integration
+               --with-system-gpgmepp
+               --without-system-sane
+               $(use_enable bluetooth sdremote-bluetooth)
+               $(use_enable coinmp)
+               $(use_enable collada)
+               $(use_enable cups)
+               $(use_enable debug)
+               $(use_enable dbus)
+               $(use_enable eds evolution2)
+               $(use_enable firebird firebird-sdbc)
+               $(use_enable gltf)
+               $(use_enable gstreamer gstreamer-1-0)
+               $(use_enable gtk)
+               $(use_enable gtk3)
+               $(use_enable kde kde4)
+               $(use_enable mysql ext-mariadb-connector)
+               $(use_enable odk)
+               $(use_enable pdfimport)
+               $(use_enable postgres postgresql-sdbc)
+               $(use_enable quickstarter systray)
+               $(use_enable vlc)
+               $(use_with coinmp system-coinmp)
+               $(use_with collada system-opencollada)
+               $(use_with gltf system-libgltf)
+               $(use_with googledrive gdrive-client-id 
${google_default_client_id})
+               $(use_with googledrive gdrive-client-secret 
${google_default_client_secret})
+               $(use_with java)
+               $(use_with mysql system-mysql-cppconn)
+               $(use_with odk doxygen)
+       )
+
+       if use eds || use gtk3; then
+               myeconfargs+=( --enable-dconf --enable-gio )
+       else
+               myeconfargs+=( --disable-dconf --disable-gio )
+       fi
+
        # libreoffice extensions handling
        for lo_xt in ${LO_EXTS}; do
                if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == 
"scripting-javascript" ]]; then
-                       ext_opts+=" $(use_enable 
libreoffice_extensions_${lo_xt} ${lo_xt})"
+                       myeconfargs+=( $(use_enable 
libreoffice_extensions_${lo_xt} ${lo_xt}) )
                else
-                       ext_opts+=" $(use_enable 
libreoffice_extensions_${lo_xt} ext-${lo_xt})"
+                       myeconfargs+=( $(use_enable 
libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
                fi
        done
 
-       if use eds || use gtk3; then
-               gtk_opts=( --enable-dconf --enable-gio )
-       else
-               gtk_opts=( --disable-dconf --disable-gio )
-       fi
-
        if use java; then
                # hsqldb: system one is too new
-               java_opts="
+               myeconfargs+=(
                        --without-junit
                        --without-system-hsqldb
                        --with-ant-home="${ANT_HOME}"
                        --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
                        --with-jvm-path="${EPREFIX}/usr/lib/"
-               "
+               )
 
                use libreoffice_extensions_scripting-beanshell && \
-                       java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh 
bsh.jar)"
+                       myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar 
bsh bsh.jar) )
 
                use libreoffice_extensions_scripting-javascript && \
-                       java_opts+=" --with-rhino-jar=$(java-pkg_getjar 
rhino-1.6 js.jar)"
-       fi
-
-       if use kde; then
-               # bug 544108, bug 599076
-               export QMAKEQT4="$(qt4_get_bindir)/qmake"
-               export MOCQT4="$(qt4_get_bindir)/moc"
+                       myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar 
rhino-1.6 js.jar) )
        fi
 
-       # system headers/libs/...: enforce using system packages
-       # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
-       # --enable-cairo: ensure that cairo is always required
-       # --enable-*-link: link to the library rather than just dlopen on 
runtime
-       # --enable-release-build: build the libreoffice as release
-       # --disable-fetch-external: prevent dowloading during compile phase
-       # --enable-extension-integration: enable any extension integration 
support
-       # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
-       # --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
-       # --disable-pdfium: not yet packaged
-       econf \
-               --with-system-dicts \
-               --with-system-epoxy \
-               --with-system-headers \
-               --with-system-jars \
-               --with-system-libs \
-               --enable-cairo-canvas \
-               --enable-largefile \
-               --enable-mergelibs \
-               --enable-neon \
-               --enable-python=system \
-               --enable-randr \
-               --enable-release-build \
-               --disable-breakpad \
-               --disable-ccache \
-               --disable-dependency-tracking \
-               --disable-epm \
-               --disable-fetch-external \
-               --disable-gstreamer-0-10 \
-               --disable-online-update \
-               --disable-pdfium \
-               --disable-report-builder \
-               --with-alloc=$(use jemalloc && echo "jemalloc" || echo 
"system") \
-               --with-build-version="Gentoo official package" \
-               --enable-extension-integration \
-               --with-external-dict-dir="${EPREFIX}/usr/share/myspell" \
-               --with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \
-               --with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
-               --with-external-tar="${DISTDIR}" \
-               --with-lang="" \
-               --with-parallelism=$(makeopts_jobs) \
-               --with-system-ucpp \
-               --with-vendor="Gentoo Foundation" \
-               --with-x \
-               --without-fonts \
-               --without-myspell-dicts \
-               --without-help \
-               --with-helppack-integration \
-               --with-system-gpgmepp \
-               --without-system-sane \
-               $(use_enable bluetooth sdremote-bluetooth) \
-               $(use_enable coinmp) \
-               $(use_enable collada) \
-               $(use_enable cups) \
-               $(use_enable debug) \
-               $(use_enable dbus) \
-               $(use_enable eds evolution2) \
-               $(use_enable firebird firebird-sdbc) \
-               $(use_enable gltf) \
-               $(use_enable gstreamer gstreamer-1-0) \
-               $(use_enable gtk) \
-               $(use_enable gtk3) \
-               $(use_enable kde kde4) \
-               $(use_enable mysql ext-mariadb-connector) \
-               $(use_enable odk) \
-               $(use_enable pdfimport) \
-               $(use_enable postgres postgresql-sdbc) \
-               $(use_enable quickstarter systray) \
-               $(use_enable vlc) \
-               $(use_with coinmp system-coinmp) \
-               $(use_with collada system-opencollada) \
-               $(use_with gltf system-libgltf) \
-               $(use_with googledrive gdrive-client-id 
${google_default_client_id}) \
-               $(use_with googledrive gdrive-client-secret 
${google_default_client_secret}) \
-               $(use_with java) \
-               $(use_with mysql system-mysql-cppconn) \
-               $(use_with odk doxygen) \
-               ${ext_opts} \
-               ${gtk_opts[@]} \
-               ${java_opts}
+       econf "${myeconfargs[@]}"
 }
 
 src_compile() {

diff --git a/app-office/libreoffice/libreoffice-6.0.9999.ebuild 
b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
index e489cde34e3..6422eb9c9f8 100644
--- a/app-office/libreoffice/libreoffice-6.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
@@ -354,8 +354,6 @@ src_prepare() {
 }
 
 src_configure() {
-       local ext_opts gtk_opts java_opts
-
        # Set up Google API keys, see 
https://www.chromium.org/developers/how-tos/api-keys
        # Note: these are for Gentoo use ONLY. For your own distribution, 
please get
        # your own set of keys. Feel free to contact [email protected] for 
more info.
@@ -368,38 +366,6 @@ src_configure() {
        export PYTHON_CFLAGS=$(python_get_CFLAGS)
        export PYTHON_LIBS=$(python_get_LIBS)
 
-       # libreoffice extensions handling
-       for lo_xt in ${LO_EXTS}; do
-               if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == 
"scripting-javascript" ]]; then
-                       ext_opts+=" $(use_enable 
libreoffice_extensions_${lo_xt} ${lo_xt})"
-               else
-                       ext_opts+=" $(use_enable 
libreoffice_extensions_${lo_xt} ext-${lo_xt})"
-               fi
-       done
-
-       if use eds || use gtk3; then
-               gtk_opts=( --enable-dconf --enable-gio )
-       else
-               gtk_opts=( --disable-dconf --disable-gio )
-       fi
-
-       if use java; then
-               # hsqldb: system one is too new
-               java_opts="
-                       --without-junit
-                       --without-system-hsqldb
-                       --with-ant-home="${ANT_HOME}"
-                       --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
-                       --with-jvm-path="${EPREFIX}/usr/lib/"
-               "
-
-               use libreoffice_extensions_scripting-beanshell && \
-                       java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh 
bsh.jar)"
-
-               use libreoffice_extensions_scripting-javascript && \
-                       java_opts+=" --with-rhino-jar=$(java-pkg_getjar 
rhino-1.6 js.jar)"
-       fi
-
        if use qt4; then
                # bug 544108, bug 599076
                export QMAKE4="$(qt4_get_bindir)/qmake"
@@ -423,72 +389,104 @@ src_configure() {
        # --without-system-sane: just sane.h header that is used for scan in 
writer,
        #   not linked or anything else, worthless to depend on
        # --disable-pdfium: not yet packaged
-       econf \
-               --with-system-dicts \
-               --with-system-epoxy \
-               --with-system-headers \
-               --with-system-jars \
-               --with-system-libs \
-               --enable-cairo-canvas \
-               --enable-largefile \
-               --enable-mergelibs \
-               --enable-neon \
-               --enable-python=system \
-               --enable-randr \
-               --enable-release-build \
-               --disable-breakpad \
-               --disable-ccache \
-               --disable-dependency-tracking \
-               --disable-epm \
-               --disable-fetch-external \
-               --disable-gstreamer-0-10 \
-               --disable-online-update \
-               --disable-pdfium \
-               --disable-report-builder \
-               --with-alloc=$(use jemalloc && echo "jemalloc" || echo 
"system") \
-               --with-build-version="Gentoo official package" \
-               --enable-extension-integration \
-               --with-external-dict-dir="${EPREFIX}/usr/share/myspell" \
-               --with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \
-               --with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
-               --with-external-tar="${DISTDIR}" \
-               --with-lang="" \
-               --with-parallelism=$(makeopts_jobs) \
-               --with-system-ucpp \
-               --with-vendor="Gentoo Foundation" \
-               --with-x \
-               --without-fonts \
-               --without-myspell-dicts \
-               --without-help \
-               --with-helppack-integration \
-               --with-system-gpgmepp \
-               --without-system-sane \
-               $(use_enable bluetooth sdremote-bluetooth) \
-               $(use_enable coinmp) \
-               $(use_enable cups) \
-               $(use_enable debug) \
-               $(use_enable dbus) \
-               $(use_enable eds evolution2) \
-               $(use_enable firebird firebird-sdbc) \
-               $(use_enable gstreamer gstreamer-1-0) \
-               $(use_enable gtk) \
-               $(use_enable gtk3) \
-               $(use_enable mysql ext-mariadb-connector) \
-               $(use_enable odk) \
-               $(use_enable pdfimport) \
-               $(use_enable postgres postgresql-sdbc) \
-               $(use_enable qt4 kde4) \
-               $(use_enable qt5) \
-               $(use_enable vlc) \
-               $(use_with coinmp system-coinmp) \
-               $(use_with googledrive gdrive-client-id 
${google_default_client_id}) \
-               $(use_with googledrive gdrive-client-secret 
${google_default_client_secret}) \
-               $(use_with java) \
-               $(use_with mysql system-mysql-cppconn) \
-               $(use_with odk doxygen) \
-               ${ext_opts} \
-               ${gtk_opts[@]} \
-               ${java_opts}
+       local myeconfargs=(
+               --with-system-dicts
+               --with-system-epoxy
+               --with-system-headers
+               --with-system-jars
+               --with-system-libs
+               --enable-cairo-canvas
+               --enable-largefile
+               --enable-mergelibs
+               --enable-neon
+               --enable-python=system
+               --enable-randr
+               --enable-release-build
+               --disable-breakpad
+               --disable-ccache
+               --disable-dependency-tracking
+               --disable-epm
+               --disable-fetch-external
+               --disable-gstreamer-0-10
+               --disable-online-update
+               --disable-pdfium
+               --disable-report-builder
+               --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system")
+               --with-build-version="Gentoo official package"
+               --enable-extension-integration
+               --with-external-dict-dir="${EPREFIX}/usr/share/myspell"
+               --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
+               --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
+               --with-external-tar="${DISTDIR}"
+               --with-lang=""
+               --with-parallelism=$(makeopts_jobs)
+               --with-system-ucpp
+               --with-vendor="Gentoo Foundation"
+               --with-x
+               --without-fonts
+               --without-myspell-dicts
+               --without-help
+               --with-helppack-integration
+               --with-system-gpgmepp
+               --without-system-sane
+               $(use_enable bluetooth sdremote-bluetooth)
+               $(use_enable coinmp)
+               $(use_enable cups)
+               $(use_enable debug)
+               $(use_enable dbus)
+               $(use_enable eds evolution2)
+               $(use_enable firebird firebird-sdbc)
+               $(use_enable gstreamer gstreamer-1-0)
+               $(use_enable gtk)
+               $(use_enable gtk3)
+               $(use_enable mysql ext-mariadb-connector)
+               $(use_enable odk)
+               $(use_enable pdfimport)
+               $(use_enable postgres postgresql-sdbc)
+               $(use_enable qt4 kde4)
+               $(use_enable qt5)
+               $(use_enable vlc)
+               $(use_with coinmp system-coinmp)
+               $(use_with googledrive gdrive-client-id 
${google_default_client_id})
+               $(use_with googledrive gdrive-client-secret 
${google_default_client_secret})
+               $(use_with java)
+               $(use_with mysql system-mysql-cppconn)
+               $(use_with odk doxygen)
+       )
+
+       if use eds || use gtk3; then
+               myeconfargs+=( --enable-dconf --enable-gio )
+       else
+               myeconfargs+=( --disable-dconf --disable-gio )
+       fi
+
+       # libreoffice extensions handling
+       for lo_xt in ${LO_EXTS}; do
+               if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == 
"scripting-javascript" ]]; then
+                       myeconfargs+=( $(use_enable 
libreoffice_extensions_${lo_xt} ${lo_xt}) )
+               else
+                       myeconfargs+=( $(use_enable 
libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
+               fi
+       done
+
+       if use java; then
+               # hsqldb: system one is too new
+               myeconfargs+=(
+                       --without-junit
+                       --without-system-hsqldb
+                       --with-ant-home="${ANT_HOME}"
+                       --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
+                       --with-jvm-path="${EPREFIX}/usr/lib/"
+               )
+
+               use libreoffice_extensions_scripting-beanshell && \
+                       myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar 
bsh bsh.jar) )
+
+               use libreoffice_extensions_scripting-javascript && \
+                       myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar 
rhino-1.6 js.jar) )
+       fi
+
+       econf "${myeconfargs[@]}"
 }
 
 src_compile() {

diff --git a/app-office/libreoffice/libreoffice-9999.ebuild 
b/app-office/libreoffice/libreoffice-9999.ebuild
index e489cde34e3..6422eb9c9f8 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -354,8 +354,6 @@ src_prepare() {
 }
 
 src_configure() {
-       local ext_opts gtk_opts java_opts
-
        # Set up Google API keys, see 
https://www.chromium.org/developers/how-tos/api-keys
        # Note: these are for Gentoo use ONLY. For your own distribution, 
please get
        # your own set of keys. Feel free to contact [email protected] for 
more info.
@@ -368,38 +366,6 @@ src_configure() {
        export PYTHON_CFLAGS=$(python_get_CFLAGS)
        export PYTHON_LIBS=$(python_get_LIBS)
 
-       # libreoffice extensions handling
-       for lo_xt in ${LO_EXTS}; do
-               if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == 
"scripting-javascript" ]]; then
-                       ext_opts+=" $(use_enable 
libreoffice_extensions_${lo_xt} ${lo_xt})"
-               else
-                       ext_opts+=" $(use_enable 
libreoffice_extensions_${lo_xt} ext-${lo_xt})"
-               fi
-       done
-
-       if use eds || use gtk3; then
-               gtk_opts=( --enable-dconf --enable-gio )
-       else
-               gtk_opts=( --disable-dconf --disable-gio )
-       fi
-
-       if use java; then
-               # hsqldb: system one is too new
-               java_opts="
-                       --without-junit
-                       --without-system-hsqldb
-                       --with-ant-home="${ANT_HOME}"
-                       --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
-                       --with-jvm-path="${EPREFIX}/usr/lib/"
-               "
-
-               use libreoffice_extensions_scripting-beanshell && \
-                       java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh 
bsh.jar)"
-
-               use libreoffice_extensions_scripting-javascript && \
-                       java_opts+=" --with-rhino-jar=$(java-pkg_getjar 
rhino-1.6 js.jar)"
-       fi
-
        if use qt4; then
                # bug 544108, bug 599076
                export QMAKE4="$(qt4_get_bindir)/qmake"
@@ -423,72 +389,104 @@ src_configure() {
        # --without-system-sane: just sane.h header that is used for scan in 
writer,
        #   not linked or anything else, worthless to depend on
        # --disable-pdfium: not yet packaged
-       econf \
-               --with-system-dicts \
-               --with-system-epoxy \
-               --with-system-headers \
-               --with-system-jars \
-               --with-system-libs \
-               --enable-cairo-canvas \
-               --enable-largefile \
-               --enable-mergelibs \
-               --enable-neon \
-               --enable-python=system \
-               --enable-randr \
-               --enable-release-build \
-               --disable-breakpad \
-               --disable-ccache \
-               --disable-dependency-tracking \
-               --disable-epm \
-               --disable-fetch-external \
-               --disable-gstreamer-0-10 \
-               --disable-online-update \
-               --disable-pdfium \
-               --disable-report-builder \
-               --with-alloc=$(use jemalloc && echo "jemalloc" || echo 
"system") \
-               --with-build-version="Gentoo official package" \
-               --enable-extension-integration \
-               --with-external-dict-dir="${EPREFIX}/usr/share/myspell" \
-               --with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \
-               --with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
-               --with-external-tar="${DISTDIR}" \
-               --with-lang="" \
-               --with-parallelism=$(makeopts_jobs) \
-               --with-system-ucpp \
-               --with-vendor="Gentoo Foundation" \
-               --with-x \
-               --without-fonts \
-               --without-myspell-dicts \
-               --without-help \
-               --with-helppack-integration \
-               --with-system-gpgmepp \
-               --without-system-sane \
-               $(use_enable bluetooth sdremote-bluetooth) \
-               $(use_enable coinmp) \
-               $(use_enable cups) \
-               $(use_enable debug) \
-               $(use_enable dbus) \
-               $(use_enable eds evolution2) \
-               $(use_enable firebird firebird-sdbc) \
-               $(use_enable gstreamer gstreamer-1-0) \
-               $(use_enable gtk) \
-               $(use_enable gtk3) \
-               $(use_enable mysql ext-mariadb-connector) \
-               $(use_enable odk) \
-               $(use_enable pdfimport) \
-               $(use_enable postgres postgresql-sdbc) \
-               $(use_enable qt4 kde4) \
-               $(use_enable qt5) \
-               $(use_enable vlc) \
-               $(use_with coinmp system-coinmp) \
-               $(use_with googledrive gdrive-client-id 
${google_default_client_id}) \
-               $(use_with googledrive gdrive-client-secret 
${google_default_client_secret}) \
-               $(use_with java) \
-               $(use_with mysql system-mysql-cppconn) \
-               $(use_with odk doxygen) \
-               ${ext_opts} \
-               ${gtk_opts[@]} \
-               ${java_opts}
+       local myeconfargs=(
+               --with-system-dicts
+               --with-system-epoxy
+               --with-system-headers
+               --with-system-jars
+               --with-system-libs
+               --enable-cairo-canvas
+               --enable-largefile
+               --enable-mergelibs
+               --enable-neon
+               --enable-python=system
+               --enable-randr
+               --enable-release-build
+               --disable-breakpad
+               --disable-ccache
+               --disable-dependency-tracking
+               --disable-epm
+               --disable-fetch-external
+               --disable-gstreamer-0-10
+               --disable-online-update
+               --disable-pdfium
+               --disable-report-builder
+               --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system")
+               --with-build-version="Gentoo official package"
+               --enable-extension-integration
+               --with-external-dict-dir="${EPREFIX}/usr/share/myspell"
+               --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
+               --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
+               --with-external-tar="${DISTDIR}"
+               --with-lang=""
+               --with-parallelism=$(makeopts_jobs)
+               --with-system-ucpp
+               --with-vendor="Gentoo Foundation"
+               --with-x
+               --without-fonts
+               --without-myspell-dicts
+               --without-help
+               --with-helppack-integration
+               --with-system-gpgmepp
+               --without-system-sane
+               $(use_enable bluetooth sdremote-bluetooth)
+               $(use_enable coinmp)
+               $(use_enable cups)
+               $(use_enable debug)
+               $(use_enable dbus)
+               $(use_enable eds evolution2)
+               $(use_enable firebird firebird-sdbc)
+               $(use_enable gstreamer gstreamer-1-0)
+               $(use_enable gtk)
+               $(use_enable gtk3)
+               $(use_enable mysql ext-mariadb-connector)
+               $(use_enable odk)
+               $(use_enable pdfimport)
+               $(use_enable postgres postgresql-sdbc)
+               $(use_enable qt4 kde4)
+               $(use_enable qt5)
+               $(use_enable vlc)
+               $(use_with coinmp system-coinmp)
+               $(use_with googledrive gdrive-client-id 
${google_default_client_id})
+               $(use_with googledrive gdrive-client-secret 
${google_default_client_secret})
+               $(use_with java)
+               $(use_with mysql system-mysql-cppconn)
+               $(use_with odk doxygen)
+       )
+
+       if use eds || use gtk3; then
+               myeconfargs+=( --enable-dconf --enable-gio )
+       else
+               myeconfargs+=( --disable-dconf --disable-gio )
+       fi
+
+       # libreoffice extensions handling
+       for lo_xt in ${LO_EXTS}; do
+               if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == 
"scripting-javascript" ]]; then
+                       myeconfargs+=( $(use_enable 
libreoffice_extensions_${lo_xt} ${lo_xt}) )
+               else
+                       myeconfargs+=( $(use_enable 
libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
+               fi
+       done
+
+       if use java; then
+               # hsqldb: system one is too new
+               myeconfargs+=(
+                       --without-junit
+                       --without-system-hsqldb
+                       --with-ant-home="${ANT_HOME}"
+                       --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
+                       --with-jvm-path="${EPREFIX}/usr/lib/"
+               )
+
+               use libreoffice_extensions_scripting-beanshell && \
+                       myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar 
bsh bsh.jar) )
+
+               use libreoffice_extensions_scripting-javascript && \
+                       myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar 
rhino-1.6 js.jar) )
+       fi
+
+       econf "${myeconfargs[@]}"
 }
 
 src_compile() {

Reply via email to