app-office/libreoffice: Added "mariadb" USE flag

so users can choose between mariadb_config and mysql_config.

Package-Manager: Portage-2.3.57, Repoman-2.3.12
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/10879
Signed-off-by: Andreas K. Huettel <dilfridge@gentoo.org>

diff --git a/app-office/libreoffice/libreoffice-6.2.9999.ebuild b/app-office/libreoffice/libreoffice-6.2.9999.ebuild
index c7a98fa7f09641f2da4cc3ac39aad2aae97d2ed2..55ece7a7600d93db897199bdc780eec43a5d86a2 100644 (file)
--- a/app-office/libreoffice/libreoffice-6.2.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.2.9999.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}
@@ -102,7 +102,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]
@@ -188,6 +187,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] )
 "
@@ -401,6 +402,7 @@ src_configure() {
                --enable-randr
                --enable-release-build
                --disable-breakpad
+               --disable-bundle-mariadb
                --disable-ccache
                --disable-dependency-tracking
                --disable-epm
@@ -490,6 +492,7 @@ src_configure() {
 
        is-flagq "-flto*" && myeconfargs+=( --enable-lto )
 
+       MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
        econf "${myeconfargs[@]}"
 }
 

diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index c7a98fa7f09641f2da4cc3ac39aad2aae97d2ed2..55ece7a7600d93db897199bdc780eec43a5d86a2 100644 (file)
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.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}
@@ -102,7 +102,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]
@@ -188,6 +187,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] )
 "
@@ -401,6 +402,7 @@ src_configure() {
                --enable-randr
                --enable-release-build
                --disable-breakpad
+               --disable-bundle-mariadb
                --disable-ccache
                --disable-dependency-tracking
                --disable-epm
@@ -490,6 +492,7 @@ src_configure() {
 
        is-flagq "-flto*" && myeconfargs+=( --enable-lto )
 
+       MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
        econf "${myeconfargs[@]}"
 }
 

diff --git a/app-office/libreoffice/metadata.xml b/app-office/libreoffice/metadata.xml
index 103556859a03ddb3830521d180fc064dc69a0166..6b514662f9ab7e9b6f6799ec1c04e512e637b5fb 100644 (file)
--- a/app-office/libreoffice/metadata.xml
+++ b/app-office/libreoffice/metadata.xml
@@ -14,6 +14,7 @@ version</longdescription>
     <flag name="coinmp">Use sci-libs/coinor-mp as alternative solver</flag>
     <flag name="googledrive">Enable support for remote files on Google Drive</flag>
     <flag name="gtk2">Enable legacy gtk2 frontend</flag>
+    <flag name="mariadb">Prefer mariadb connector over mysql connector</flag>
     <flag name="odk">Build the Office Development Kit</flag>
     <flag name="pdfimport">Enable PDF import via the Poppler library</flag>
     <flag name="vlc">Use <pkg>media-video/vlc</pkg> for video embedding</flag>