From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1000855-garchives=archives.gentoo.org@lists.gentoo.org>
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 0FF111382C5
for <garchives@archives.gentoo.org>; Wed, 31 Jan 2018 17:51:42 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 5785FE0C8D;
Wed, 31 Jan 2018 17:51:41 +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 34440E0C8D
for <gentoo-commits@lists.gentoo.org>; Wed, 31 Jan 2018 17:51:41 +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 0F337335C59
for <gentoo-commits@lists.gentoo.org>; Wed, 31 Jan 2018 17:51:40 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 7D1DD1C3
for <gentoo-commits@lists.gentoo.org>; Wed, 31 Jan 2018 17:51:38 +0000 (UTC)
From: "Andreas Sturmlechner" <asturm@gentoo.org>
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" <asturm@gentoo.org>
Message-ID: <1517421083.0b6583ee076c90cf3e14081cafc081a94e7e0aa1.asturm@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/
X-VCS-Repository: repo/gentoo
X-VCS-Files: app-office/calligra/calligra-3.1.0.ebuild
X-VCS-Directories: app-office/calligra/
X-VCS-Committer: asturm
X-VCS-Committer-Name: Andreas Sturmlechner
X-VCS-Revision: 0b6583ee076c90cf3e14081cafc081a94e7e0aa1
X-VCS-Branch: master
Date: Wed, 31 Jan 2018 17:51:38 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 977eeac0-ffde-495a-bbeb-0621f2844b80
X-Archives-Hash: 41de5870ffd3ed3eedaffbf08e4d9701
commit: 0b6583ee076c90cf3e14081cafc081a94e7e0aa1
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 31 16:51:26 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jan 31 17:51:23 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b6583ee
app-office/calligra: Fix CALLIGRA_EXPERIMENTAL_FEATURES_STAGE
Reported-by: Dennis Schridde <devurandom <AT> gmx.net>
Closes: https://bugs.gentoo.org/646164
Package-Manager: Portage-2.3.21, Repoman-2.3.6
app-office/calligra/calligra-3.1.0.ebuild | 22 ++++++----------------
1 file changed, 6 insertions(+), 16 deletions(-)
diff --git a/app-office/calligra/calligra-3.1.0.ebuild b/app-office/calligra/calligra-3.1.0.ebuild
index b053f117b3a..e74f8c930b4 100644
--- a/app-office/calligra/calligra-3.1.0.ebuild
+++ b/app-office/calligra/calligra-3.1.0.ebuild
@@ -188,30 +188,19 @@ src_configure() {
# applications
for cal_ft in ${CAL_FTS[@]}; do
- if use calligra_features_${cal_ft} ; then
- myproducts+=( "${cal_ft^^}" )
- fi
+ use calligra_features_${cal_ft} && myproducts+=( "${cal_ft^^}" )
done
- [[ ${KDE_BUILD_TYPE} == release ]] && \
- use calligra_experimental_features_stage && \
- myproducts+=( CALLIGRA_FEATURES_STAGE )
+ use calligra_experimental_features_stage && myproducts+=( STAGE )
use lcms && myproducts+=( PLUGIN_COLORENGINES )
use spacenav && myproducts+=( PLUGIN_SPACENAVIGATOR )
- local mycmakeargs=( -DPRODUCTSET="${myproducts[*]}" )
-
- if [[ ${KDE_BUILD_TYPE} == release ]] ; then
- mycmakeargs+=(
- -DRELEASE_BUILD=ON
- -DBUILD_UNMAINTAINED=$(usex calligra_experimental_features_stage)
- )
- fi
-
- mycmakeargs+=(
+ local mycmakeargs=(
-DPACKAGERS_BUILD=OFF
+ -DRELEASE_BUILD=ON
-DWITH_Iconv=ON
+ -DPRODUCTSET="${myproducts[*]}"
$(cmake-utils_use_find_package activities KF5Activities)
-DWITH_Qca-qt5=$(usex crypt)
-DWITH_Fontconfig=$(usex fontconfig)
@@ -233,6 +222,7 @@ src_configure() {
-DWITH_OpenEXR=$(usex openexr)
-DWITH_Poppler=$(usex pdf)
-DWITH_Eigen3=$(usex calligra_features_sheets)
+ -DBUILD_UNMAINTAINED=$(usex calligra_experimental_features_stage)
-ENABLE_CSTESTER_TESTING=$(usex test)
-DWITH_Freetype=$(usex truetype)
)