From 8cd065b1b19ecfd1db0053de6fa0032cd4f423fe Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Tue, 1 Jan 2019 17:49:19 +0100 Subject: 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 --- 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/" \ -- cgit v1.2.3-65-gdbad