| 1 |
commit: 079a603ed47c4e77553c763eec879fb35b71bf71 |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jan 21 11:00:21 2019 +0000 |
| 4 |
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jan 23 17:27:18 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=079a603e |
| 7 |
|
| 8 |
app-office/libreoffice: Added "mariadb" USE flag |
| 9 |
|
| 10 |
so users can choose between mariadb_config and mysql_config. |
| 11 |
|
| 12 |
Package-Manager: Portage-2.3.57, Repoman-2.3.12 |
| 13 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
| 14 |
Closes: https://github.com/gentoo/gentoo/pull/10879 |
| 15 |
Signed-off-by: Andreas K. Huettel <dilfridge <AT> gentoo.org> |
| 16 |
|
| 17 |
app-office/libreoffice/libreoffice-6.2.9999.ebuild | 7 +++++-- |
| 18 |
app-office/libreoffice/libreoffice-9999.ebuild | 7 +++++-- |
| 19 |
app-office/libreoffice/metadata.xml | 1 + |
| 20 |
3 files changed, 11 insertions(+), 4 deletions(-) |
| 21 |
|
| 22 |
diff --git a/app-office/libreoffice/libreoffice-6.2.9999.ebuild b/app-office/libreoffice/libreoffice-6.2.9999.ebuild |
| 23 |
index c7a98fa7f09..55ece7a7600 100644 |
| 24 |
--- a/app-office/libreoffice/libreoffice-6.2.9999.ebuild |
| 25 |
+++ b/app-office/libreoffice/libreoffice-6.2.9999.ebuild |
| 26 |
@@ -63,7 +63,7 @@ unset ADDONS_SRC |
| 27 |
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher" |
| 28 |
|
| 29 |
IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird |
| 30 |
-googledrive gstreamer +gtk gtk2 kde odk pdfimport postgres test vlc |
| 31 |
+googledrive gstreamer +gtk gtk2 kde +mariadb odk pdfimport postgres test vlc |
| 32 |
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})" |
| 33 |
|
| 34 |
REQUIRED_USE="${PYTHON_REQUIRED_USE} |
| 35 |
@@ -102,7 +102,6 @@ COMMON_DEPEND="${PYTHON_DEPS} |
| 36 |
app-text/mythes |
| 37 |
>=dev-cpp/clucene-2.3.3.4-r2 |
| 38 |
=dev-cpp/libcmis-0.5* |
| 39 |
- dev-db/mysql-connector-c |
| 40 |
dev-db/unixODBC |
| 41 |
dev-lang/perl |
| 42 |
dev-libs/boost:=[nls] |
| 43 |
@@ -188,6 +187,8 @@ COMMON_DEPEND="${PYTHON_DEPS} |
| 44 |
) |
| 45 |
libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) |
| 46 |
libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) |
| 47 |
+ mariadb? ( dev-db/mariadb-connector-c ) |
| 48 |
+ !mariadb? ( dev-db/mysql-connector-c ) |
| 49 |
pdfimport? ( app-text/poppler:=[cxx] ) |
| 50 |
postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) |
| 51 |
" |
| 52 |
@@ -401,6 +402,7 @@ src_configure() { |
| 53 |
--enable-randr |
| 54 |
--enable-release-build |
| 55 |
--disable-breakpad |
| 56 |
+ --disable-bundle-mariadb |
| 57 |
--disable-ccache |
| 58 |
--disable-dependency-tracking |
| 59 |
--disable-epm |
| 60 |
@@ -490,6 +492,7 @@ src_configure() { |
| 61 |
|
| 62 |
is-flagq "-flto*" && myeconfargs+=( --enable-lto ) |
| 63 |
|
| 64 |
+ MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \ |
| 65 |
econf "${myeconfargs[@]}" |
| 66 |
} |
| 67 |
|
| 68 |
|
| 69 |
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild |
| 70 |
index c7a98fa7f09..55ece7a7600 100644 |
| 71 |
--- a/app-office/libreoffice/libreoffice-9999.ebuild |
| 72 |
+++ b/app-office/libreoffice/libreoffice-9999.ebuild |
| 73 |
@@ -63,7 +63,7 @@ unset ADDONS_SRC |
| 74 |
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher" |
| 75 |
|
| 76 |
IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird |
| 77 |
-googledrive gstreamer +gtk gtk2 kde odk pdfimport postgres test vlc |
| 78 |
+googledrive gstreamer +gtk gtk2 kde +mariadb odk pdfimport postgres test vlc |
| 79 |
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})" |
| 80 |
|
| 81 |
REQUIRED_USE="${PYTHON_REQUIRED_USE} |
| 82 |
@@ -102,7 +102,6 @@ COMMON_DEPEND="${PYTHON_DEPS} |
| 83 |
app-text/mythes |
| 84 |
>=dev-cpp/clucene-2.3.3.4-r2 |
| 85 |
=dev-cpp/libcmis-0.5* |
| 86 |
- dev-db/mysql-connector-c |
| 87 |
dev-db/unixODBC |
| 88 |
dev-lang/perl |
| 89 |
dev-libs/boost:=[nls] |
| 90 |
@@ -188,6 +187,8 @@ COMMON_DEPEND="${PYTHON_DEPS} |
| 91 |
) |
| 92 |
libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) |
| 93 |
libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) |
| 94 |
+ mariadb? ( dev-db/mariadb-connector-c ) |
| 95 |
+ !mariadb? ( dev-db/mysql-connector-c ) |
| 96 |
pdfimport? ( app-text/poppler:=[cxx] ) |
| 97 |
postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) |
| 98 |
" |
| 99 |
@@ -401,6 +402,7 @@ src_configure() { |
| 100 |
--enable-randr |
| 101 |
--enable-release-build |
| 102 |
--disable-breakpad |
| 103 |
+ --disable-bundle-mariadb |
| 104 |
--disable-ccache |
| 105 |
--disable-dependency-tracking |
| 106 |
--disable-epm |
| 107 |
@@ -490,6 +492,7 @@ src_configure() { |
| 108 |
|
| 109 |
is-flagq "-flto*" && myeconfargs+=( --enable-lto ) |
| 110 |
|
| 111 |
+ MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \ |
| 112 |
econf "${myeconfargs[@]}" |
| 113 |
} |
| 114 |
|
| 115 |
|
| 116 |
diff --git a/app-office/libreoffice/metadata.xml b/app-office/libreoffice/metadata.xml |
| 117 |
index 103556859a0..6b514662f9a 100644 |
| 118 |
--- a/app-office/libreoffice/metadata.xml |
| 119 |
+++ b/app-office/libreoffice/metadata.xml |
| 120 |
@@ -14,6 +14,7 @@ version</longdescription> |
| 121 |
<flag name="coinmp">Use sci-libs/coinor-mp as alternative solver</flag> |
| 122 |
<flag name="googledrive">Enable support for remote files on Google Drive</flag> |
| 123 |
<flag name="gtk2">Enable legacy gtk2 frontend</flag> |
| 124 |
+ <flag name="mariadb">Prefer mariadb connector over mysql connector</flag> |
| 125 |
<flag name="odk">Build the Office Development Kit</flag> |
| 126 |
<flag name="pdfimport">Enable PDF import via the Poppler library</flag> |
| 127 |
<flag name="vlc">Use <pkg>media-video/vlc</pkg> for video embedding</flag> |
Archives