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 DADCC138330 for ; Tue, 9 Jan 2018 17:33:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E0DFEE0B01; Tue, 9 Jan 2018 17:33:12 +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 B2FABE0B01 for ; Tue, 9 Jan 2018 17:33:12 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 904B5335C37 for ; Tue, 9 Jan 2018 17:33:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D65701AE for ; Tue, 9 Jan 2018 17:33:08 +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: <1515518852.e78c849e93a233b6db6fd501c364f285e967c20c.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.0.9999.ebuild X-VCS-Directories: app-office/libreoffice/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: e78c849e93a233b6db6fd501c364f285e967c20c X-VCS-Branch: master Date: Tue, 9 Jan 2018 17:33:08 +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: 16f44888-922a-4744-8f3f-1b7887275da3 X-Archives-Hash: 4f56340b315c9d15650ae68084e59e89 commit: e78c849e93a233b6db6fd501c364f285e967c20c Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Jan 9 15:19:00 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Jan 9 17:27:32 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e78c849e app-office/libreoffice: Drop USE=qt5 from 6.0.x So unusable it does not make sense just yet, simplifies ebuild. Package-Manager: Portage-2.3.19, Repoman-2.3.6 app-office/libreoffice/libreoffice-6.0.9999.ebuild | 25 +++++----------------- 1 file changed, 5 insertions(+), 20 deletions(-) diff --git a/app-office/libreoffice/libreoffice-6.0.9999.ebuild b/app-office/libreoffice/libreoffice-6.0.9999.ebuild index 5fca4ae10c0..5b58caa856a 100644 --- a/app-office/libreoffice/libreoffice-6.0.9999.ebuild +++ b/app-office/libreoffice/libreoffice-6.0.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 gtk3 jemalloc kde libressl mysql odk pdfimport postgres qt4 qt5 test vlc +gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport postgres test vlc $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})" LICENSE="|| ( LGPL-3 MPL-1.1 )" @@ -163,16 +163,11 @@ COMMON_DEPEND="${PYTHON_DEPS} mysql? ( dev-db/mysql-connector-c++ ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) - qt4? ( + kde? ( 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} @@ -235,12 +230,10 @@ DEPEND="${COMMON_DEPEND} REQUIRED_USE="${PYTHON_REQUIRED_USE} bluetooth? ( dbus ) - kde? ( || ( qt4 qt5 ) ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java ) - qt4? ( kde ) " PATCHES=( @@ -254,9 +247,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." @@ -369,17 +359,12 @@ src_configure() { export PYTHON_CFLAGS=$(python_get_CFLAGS) export PYTHON_LIBS=$(python_get_LIBS) - if use qt4; then + if use kde; then # bug 544108, bug 599076 export QMAKE4="$(qt4_get_bindir)/qmake" export MOCQT4="$(qt4_get_bindir)/moc" fi - if use qt5; then - export QT5DIR="$(qt5_get_bindir)/../" - export MOC5="$(qt5_get_bindir)/moc" - fi - # system headers/libs/...: enforce using system packages # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad # --enable-cairo: ensure that cairo is always required @@ -413,6 +398,7 @@ src_configure() { --disable-gstreamer-0-10 --disable-online-update --disable-pdfium + --disable-qt5 --disable-report-builder --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") --with-build-version="Gentoo official package" @@ -446,8 +432,7 @@ src_configure() { $(use_enable odk) $(use_enable pdfimport) $(use_enable postgres postgresql-sdbc) - $(use_enable qt4 kde4) - $(use_enable qt5) + $(use_enable kde kde4) $(use_enable vlc) $(use_with coinmp system-coinmp) $(use_with googledrive gdrive-client-id ${google_default_client_id})