From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [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 8A4B11382C5 for ; Wed, 24 Jan 2018 12:46:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F20CEE0993; Wed, 24 Jan 2018 12:46:58 +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 B6A5CE0993 for ; Wed, 24 Jan 2018 12:46:58 +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 90131335C36 for ; Wed, 24 Jan 2018 12:46:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 280181D0 for ; Wed, 24 Jan 2018 12:46:55 +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: <1516798000.b21b8546554f5684dba5d53b9da8a94e4badb19c.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-9999.ebuild X-VCS-Directories: app-office/libreoffice/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: b21b8546554f5684dba5d53b9da8a94e4badb19c X-VCS-Branch: master Date: Wed, 24 Jan 2018 12:46:55 +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-Archives-Salt: 6359d0d7-77c3-4a79-9062-17b7be07d033 X-Archives-Hash: 5a5f9e058bd286d74ce52bcbe173ed7b commit: b21b8546554f5684dba5d53b9da8a94e4badb19c Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Jan 24 10:48:02 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Jan 24 12:46:40 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b21b8546 app-office/libreoffice: Enable gtk3-kde5 (sic!) vcl-plugin Upstream commit ecb5fcff336c8b0e5ad2503f0880c439a6c323a5 Package-Manager: Portage-2.3.20, Repoman-2.3.6 app-office/libreoffice/libreoffice-9999.ebuild | 36 ++++++++------------------ 1 file changed, 11 insertions(+), 25 deletions(-) diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild index 7bfe88d60c1..a9f9652d40c 100644 --- a/app-office/libreoffice/libreoffice-9999.ebuild +++ b/app-office/libreoffice/libreoffice-9999.ebuild @@ -64,7 +64,7 @@ unset ADDONS_SRC LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher" IUSE="bluetooth +branding coinmp +cups dbus debug eds firebird googledrive -gstreamer +gtk gtk2 kde libressl mysql odk pdfimport postgres qt4 qt5 test vlc +gstreamer +gtk gtk2 kde libressl mysql odk pdfimport postgres test vlc $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})" LICENSE="|| ( LGPL-3 MPL-1.1 )" @@ -157,21 +157,16 @@ COMMON_DEPEND="${PYTHON_DEPS} x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 ) + kde? ( + dev-qt/qtcore:5 + dev-qt/qtwidgets:5 + kde-frameworks/kcoreaddons:5 + ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mysql? ( dev-db/mysql-connector-c++ ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) - qt4? ( - dev-qt/qtcore:4 - dev-qt/qtgui:4 - kde-frameworks/kdelibs - ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtwidgets:5 - kde-frameworks/kcoreaddons:5 - ) " RDEPEND="${COMMON_DEPEND} @@ -234,12 +229,11 @@ DEPEND="${COMMON_DEPEND} REQUIRED_USE="${PYTHON_REQUIRED_USE} bluetooth? ( dbus ) - kde? ( || ( qt4 qt5 ) ) + kde? ( gtk ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java ) - qt4? ( kde ) " PATCHES=( @@ -252,9 +246,6 @@ PATCHES=( ) pkg_pretend() { - use qt5 && \ - ewarn "Qt5 is a work in progress. Do _NOT_ file bugs at bugs.gentoo.org related to Qt5 support!" - use java || \ ewarn "If you plan to use Base application you should enable java or you will get various crashes." @@ -367,13 +358,7 @@ src_configure() { export PYTHON_CFLAGS=$(python_get_CFLAGS) export PYTHON_LIBS=$(python_get_LIBS) - if use qt4; then - # bug 544108, bug 599076 - export QMAKE4="$(qt4_get_bindir)/qmake" - export MOCQT4="$(qt4_get_bindir)/moc" - fi - - if use qt5; then + if use kde; then export QT5DIR="$(qt5_get_bindir)/../" export MOC5="$(qt5_get_bindir)/moc" fi @@ -440,12 +425,13 @@ src_configure() { $(use_enable gstreamer gstreamer-1-0) $(use_enable gtk gtk3) $(use_enable gtk2 gtk) + $(use_enable kde qt5) + $(use_enable kde kde5) + $(use_enable kde gtk3-kde5) $(use_enable mysql ext-mariadb-connector) $(use_enable odk) $(use_enable pdfimport) $(use_enable postgres postgresql-sdbc) - $(use_enable qt4 kde4) - $(use_enable qt5) $(use_enable vlc) $(use_with coinmp system-coinmp) $(use_with googledrive gdrive-client-id ${google_default_client_id})