| 1 |
commit: 2a1efea44a772aad03ef3ce1b3c0f8de62952ead |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jan 20 19:30:48 2019 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jan 20 19:31:18 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a1efea4 |
| 7 |
|
| 8 |
app-office/libreoffice: Drop USE mysql in >=6.2 |
| 9 |
|
| 10 |
There is apparently no way to switch it off at this point. |
| 11 |
|
| 12 |
Closes: https://bugs.gentoo.org/666684 |
| 13 |
Package-Manager: Portage-2.3.56, Repoman-2.3.12 |
| 14 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 15 |
|
| 16 |
app-office/libreoffice/libreoffice-6.2.9999.ebuild | 5 ++--- |
| 17 |
app-office/libreoffice/libreoffice-9999.ebuild | 7 +++---- |
| 18 |
2 files changed, 5 insertions(+), 7 deletions(-) |
| 19 |
|
| 20 |
diff --git a/app-office/libreoffice/libreoffice-6.2.9999.ebuild b/app-office/libreoffice/libreoffice-6.2.9999.ebuild |
| 21 |
index dbeed62a746..c7a98fa7f09 100644 |
| 22 |
--- a/app-office/libreoffice/libreoffice-6.2.9999.ebuild |
| 23 |
+++ b/app-office/libreoffice/libreoffice-6.2.9999.ebuild |
| 24 |
@@ -63,7 +63,7 @@ unset ADDONS_SRC |
| 25 |
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher" |
| 26 |
|
| 27 |
IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird |
| 28 |
-googledrive gstreamer +gtk gtk2 kde mysql odk pdfimport postgres test vlc |
| 29 |
+googledrive gstreamer +gtk gtk2 kde odk pdfimport postgres test vlc |
| 30 |
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})" |
| 31 |
|
| 32 |
REQUIRED_USE="${PYTHON_REQUIRED_USE} |
| 33 |
@@ -102,6 +102,7 @@ COMMON_DEPEND="${PYTHON_DEPS} |
| 34 |
app-text/mythes |
| 35 |
>=dev-cpp/clucene-2.3.3.4-r2 |
| 36 |
=dev-cpp/libcmis-0.5* |
| 37 |
+ dev-db/mysql-connector-c |
| 38 |
dev-db/unixODBC |
| 39 |
dev-lang/perl |
| 40 |
dev-libs/boost:=[nls] |
| 41 |
@@ -187,7 +188,6 @@ COMMON_DEPEND="${PYTHON_DEPS} |
| 42 |
) |
| 43 |
libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) |
| 44 |
libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) |
| 45 |
- mysql? ( dev-db/mysql-connector-c ) |
| 46 |
pdfimport? ( app-text/poppler:=[cxx] ) |
| 47 |
postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) |
| 48 |
" |
| 49 |
@@ -440,7 +440,6 @@ src_configure() { |
| 50 |
$(use_enable gtk2 gtk) |
| 51 |
$(use_enable kde kde5) |
| 52 |
$(use_enable kde qt5) |
| 53 |
- $(use_enable mysql bundle-mariadb) |
| 54 |
$(use_enable odk) |
| 55 |
$(use_enable pdfimport) |
| 56 |
$(use_enable postgres postgresql-sdbc) |
| 57 |
|
| 58 |
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild |
| 59 |
index b75bd717a25..c7a98fa7f09 100644 |
| 60 |
--- a/app-office/libreoffice/libreoffice-9999.ebuild |
| 61 |
+++ b/app-office/libreoffice/libreoffice-9999.ebuild |
| 62 |
@@ -1,4 +1,4 @@ |
| 63 |
-# Copyright 1999-2018 Gentoo Authors |
| 64 |
+# Copyright 1999-2019 Gentoo Authors |
| 65 |
# Distributed under the terms of the GNU General Public License v2 |
| 66 |
|
| 67 |
EAPI=6 |
| 68 |
@@ -63,7 +63,7 @@ unset ADDONS_SRC |
| 69 |
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher" |
| 70 |
|
| 71 |
IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird |
| 72 |
-googledrive gstreamer +gtk gtk2 kde mysql odk pdfimport postgres test vlc |
| 73 |
+googledrive gstreamer +gtk gtk2 kde odk pdfimport postgres test vlc |
| 74 |
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})" |
| 75 |
|
| 76 |
REQUIRED_USE="${PYTHON_REQUIRED_USE} |
| 77 |
@@ -102,6 +102,7 @@ COMMON_DEPEND="${PYTHON_DEPS} |
| 78 |
app-text/mythes |
| 79 |
>=dev-cpp/clucene-2.3.3.4-r2 |
| 80 |
=dev-cpp/libcmis-0.5* |
| 81 |
+ dev-db/mysql-connector-c |
| 82 |
dev-db/unixODBC |
| 83 |
dev-lang/perl |
| 84 |
dev-libs/boost:=[nls] |
| 85 |
@@ -187,7 +188,6 @@ COMMON_DEPEND="${PYTHON_DEPS} |
| 86 |
) |
| 87 |
libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) |
| 88 |
libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) |
| 89 |
- mysql? ( dev-db/mysql-connector-c ) |
| 90 |
pdfimport? ( app-text/poppler:=[cxx] ) |
| 91 |
postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) |
| 92 |
" |
| 93 |
@@ -440,7 +440,6 @@ src_configure() { |
| 94 |
$(use_enable gtk2 gtk) |
| 95 |
$(use_enable kde kde5) |
| 96 |
$(use_enable kde qt5) |
| 97 |
- $(use_enable mysql bundle-mariadb) |
| 98 |
$(use_enable odk) |
| 99 |
$(use_enable pdfimport) |
| 100 |
$(use_enable postgres postgresql-sdbc) |
Archives