diff options
-rw-r--r-- | app-office/libreoffice/libreoffice-6.2.0.3.ebuild | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/app-office/libreoffice/libreoffice-6.2.0.3.ebuild b/app-office/libreoffice/libreoffice-6.2.0.3.ebuild index 2d7e26ac3104..4861ff9850d1 100644 --- a/app-office/libreoffice/libreoffice-6.2.0.3.ebuild +++ b/app-office/libreoffice/libreoffice-6.2.0.3.ebuild @@ -63,7 +63,7 @@ unset ADDONS_SRC LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher" IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird -googledrive gstreamer +gtk gtk2 kde odk pdfimport postgres test vlc +googledrive gstreamer +gtk gtk2 kde +mariadb odk pdfimport postgres test vlc $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})" REQUIRED_USE="${PYTHON_REQUIRED_USE} @@ -103,7 +103,6 @@ COMMON_DEPEND="${PYTHON_DEPS} app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* - dev-db/mysql-connector-c dev-db/unixODBC dev-lang/perl dev-libs/boost:=[nls] @@ -189,6 +188,8 @@ COMMON_DEPEND="${PYTHON_DEPS} ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) + mariadb? ( dev-db/mariadb-connector-c ) + !mariadb? ( dev-db/mysql-connector-c ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) " @@ -402,6 +403,7 @@ src_configure() { --enable-randr --enable-release-build --disable-breakpad + --disable-bundle-mariadb --disable-ccache --disable-dependency-tracking --disable-epm @@ -491,6 +493,7 @@ src_configure() { is-flagq "-flto*" && myeconfargs+=( --enable-lto ) + MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \ econf "${myeconfargs[@]}" } |