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 B211E138335 for ; Tue, 1 Jan 2019 21:46:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9C4F2E0C7C; Tue, 1 Jan 2019 21:46:10 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 64C54E0C5E for ; Tue, 1 Jan 2019 21:46:10 +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 AF5B9335CF4 for ; Tue, 1 Jan 2019 21:46:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AC1A7326 for ; Tue, 1 Jan 2019 21:46:06 +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: <1546361359.8cd065b1b19ecfd1db0053de6fa0032cd4f423fe.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: app-office/calligra/ X-VCS-Repository: proj/kde X-VCS-Files: app-office/calligra/calligra-9999.ebuild X-VCS-Directories: app-office/calligra/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 8cd065b1b19ecfd1db0053de6fa0032cd4f423fe X-VCS-Branch: master Date: Tue, 1 Jan 2019 21:46:06 +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: 0d089d29-3a1e-4eb3-b358-f071c7def1c9 X-Archives-Hash: 0313d9785e5fca5a62e53376830677ef commit: 8cd065b1b19ecfd1db0053de6fa0032cd4f423fe Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Jan 1 16:49:19 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Jan 1 16:49:19 2019 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=8cd065b1 app-office/calligra: Drop unused Qt5WebKit dependency Upstream commit 9817c4c2ee1e11ae1d2eacb31b8a2a65d6ea6e8d Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> app-office/calligra/calligra-9999.ebuild | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild index c8bdc8cb76..1c65c68094 100644 --- a/app-office/calligra/calligra-9999.ebuild +++ b/app-office/calligra/calligra-9999.ebuild @@ -1,13 +1,8 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -if [[ ${KDE_BUILD_TYPE} == release ]]; then - SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz" - KEYWORDS="~amd64 ~x86" -fi - CHECKREQS_DISK_BUILD="4G" KDE_HANDBOOK="forceoptional" KDE_TEST="forceoptional" @@ -16,6 +11,11 @@ inherit check-reqs kde5 DESCRIPTION="KDE Office Suite" HOMEPAGE="https://www.calligra.org/" +if [[ ${KDE_BUILD_TYPE} == release ]]; then + SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz" + KEYWORDS="~amd64 ~x86" +fi + CAL_FTS=( karbon sheets words ) LICENSE="GPL-2" @@ -96,7 +96,6 @@ COMMON_DEPEND=" x11-libs/libX11 ) calligra_experimental_features_stage? ( - $(add_qt_dep qtwebkit) okular? ( $(add_kdeapps_dep okular) ) ) calligra_features_sheets? ( @@ -144,11 +143,6 @@ src_prepare() { punt_bogus_dep Qt5 Declarative punt_bogus_dep Qt5 OpenGL - if ! use calligra_experimental_features_stage; then - punt_bogus_dep Qt5 WebKitWidgets - punt_bogus_dep Qt5 WebKit - fi - # Hack around the excessive use of CMake macros if use okular && ! use calligra_features_words; then sed -i -e "/add_subdirectory( *okularodtgenerator *)/ s/^/#DONT/" \