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 BC15B13832E for ; Sat, 20 Aug 2016 18:28:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2DBFDE08E1; Sat, 20 Aug 2016 18:28:51 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6FB66E08E1 for ; Sat, 20 Aug 2016 18:28:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 29E10340688 for ; Sat, 20 Aug 2016 18:28:49 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BE8B1244C for ; Sat, 20 Aug 2016 18:28:46 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1471717706.fc0dc4854cc4f610009d513bf66a706730d779d6.kensington@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-office/calligra/calligra-2.9.11.ebuild X-VCS-Directories: app-office/calligra/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: fc0dc4854cc4f610009d513bf66a706730d779d6 X-VCS-Branch: master Date: Sat, 20 Aug 2016 18:28:46 +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: 6076ff69-62ff-425a-b39d-882865108fbb X-Archives-Hash: ea64b6557a23d1b91fe37953d8577093 commit: fc0dc4854cc4f610009d513bf66a706730d779d6 Author: Andreas Sturmlechner gmail com> AuthorDate: Sat Aug 13 09:46:09 2016 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Sat Aug 20 18:28:26 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc0dc485 app-office/calligra: Add WEBKIT_REQUIRED=optional USE=-webkit disables: - Kexi web form widget - Web element for Calligra Reports - Braindump webshape plugin Package-Manager: portage-2.2.28 app-office/calligra/calligra-2.9.11.ebuild | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/app-office/calligra/calligra-2.9.11.ebuild b/app-office/calligra/calligra-2.9.11.ebuild index 27e0844..89311ab 100644 --- a/app-office/calligra/calligra-2.9.11.ebuild +++ b/app-office/calligra/calligra-2.9.11.ebuild @@ -12,6 +12,7 @@ CHECKREQS_DISK_BUILD="4G" KDE_HANDBOOK="optional" KDE_LINGUAS_LIVE_OVERRIDE="true" OPENGL_REQUIRED="optional" +WEBKIT_REQUIRED="optional" inherit check-reqs kde4-base versionator DESCRIPTION="KDE Office Suite" @@ -57,6 +58,7 @@ REQUIRED_USE=" calligra_features_krita? ( eigen exif lcms opengl ) calligra_features_plan? ( kdepim ) calligra_features_sheets? ( eigen ) + calligra_features_stage? ( webkit ) vc? ( calligra_features_krita ) test? ( calligra_features_karbon ) " @@ -150,6 +152,13 @@ pkg_setup() { check-reqs_pkg_setup } +src_prepare() { + if ! use webkit; then + sed -i CMakeLists.txt -e "/^find_package/ s/QtWebKit //" || die + fi + kde4-base_src_prepare +} + src_configure() { local cal_ft myproducts