From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (unknown [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A5BB4138334 for ; Sun, 27 Jan 2019 23:13:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 60F77E0DDD; Sun, 27 Jan 2019 23:13:39 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3A048E0DDD for ; Sun, 27 Jan 2019 23:13:38 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9FE5C335D6C for ; Sun, 27 Jan 2019 23:13:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B6DAB522 for ; Sun, 27 Jan 2019 23:13:35 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1548630721.e2f96e17e79810c1aee9aa788cd6e46ac986df9a.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-office/libreoffice/libreoffice-6.2.0.3.ebuild X-VCS-Directories: app-office/libreoffice/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: e2f96e17e79810c1aee9aa788cd6e46ac986df9a X-VCS-Branch: master Date: Sun, 27 Jan 2019 23:13:35 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d2f14c34-af6d-4b17-80ed-1048155f40a8 X-Archives-Hash: 56f9094f7b1a1a8f19eafbf1ef8e36e9 commit: e2f96e17e79810c1aee9aa788cd6e46ac986df9a Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Jan 27 18:25:44 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Jan 27 23:12:01 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2f96e17 app-office/libreoffice: Re-apply add mariadb USE flag Package-Manager: Portage-2.3.58, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> app-office/libreoffice/libreoffice-6.2.0.3.ebuild | 7 +++++-- 1 file 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 2d7e26ac310..4861ff9850d 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[@]}" }