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 EBDD1139085 for ; Fri, 30 Dec 2016 00:56:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4F460E0C02; Fri, 30 Dec 2016 00:56:21 +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 23786E0C02 for ; Fri, 30 Dec 2016 00:56:21 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 1CC5E3416AD for ; Fri, 30 Dec 2016 00:56:20 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 174FE24E7 for ; Fri, 30 Dec 2016 00:56:18 +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: <1483058564.0547ce7a6ddce8c17cb3036f69bbe84f9604ca8c.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: 0547ce7a6ddce8c17cb3036f69bbe84f9604ca8c X-VCS-Branch: master Date: Fri, 30 Dec 2016 00:56:18 +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: 7077c2e6-1754-4fb5-8bb3-b3e87bf16d6f X-Archives-Hash: c5efa5dff146d0c07fb128c3e5dc8573 commit: 0547ce7a6ddce8c17cb3036f69bbe84f9604ca8c Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Dec 29 02:35:38 2016 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Dec 30 00:42:44 2016 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=0547ce7a app-office/calligra: Fix configure, remove file collisions Gentoo-bug: 603584, 603772 Package-Manager: portage-2.3.0 app-office/calligra/calligra-9999.ebuild | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild index 11d1221..a89e5bd 100644 --- a/app-office/calligra/calligra-9999.ebuild +++ b/app-office/calligra/calligra-9999.ebuild @@ -114,6 +114,7 @@ COMMON_DEPEND=" okular? ( $(add_kdeapps_dep okular) ) ) calligra_features_plan? ( + $(add_frameworks_dep khtml) $(add_qt_dep qtcore '' '' '5=') dev-libs/kdiagram:5 dev-libs/kproperty:5 @@ -196,10 +197,17 @@ src_configure() { local mycmakeargs=( -DPRODUCTSET="${myproducts[*]}" ) + if [[ ${KDE_BUILD_TYPE} == release ]] ; then + mycmakeargs+=( + -DRELEASE_BUILD=ON + -DBUILD_UNMAINTAINED=${experimental} + ) + fi + mycmakeargs+=( -DPACKAGERS_BUILD=OFF - -DBUILD_UNMAINTAINED=${experimental} -DWITH_Iconv=ON + $(cmake-utils_use_find_package activities KF5Activities) -DWITH_Qca-qt5=$(usex crypt) -DWITH_Eigen3=$(usex eigen) -DWITH_Fontconfig=$(usex fontconfig)