From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1064780-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 A6E29138334
for <garchives@archives.gentoo.org>; Tue, 1 Jan 2019 19:40:42 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 78A77E08DC;
Tue, 1 Jan 2019 19:40:41 +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 36640E08DC
for <gentoo-commits@lists.gentoo.org>; Tue, 1 Jan 2019 19:40: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 1C389335CF4
for <gentoo-commits@lists.gentoo.org>; Tue, 1 Jan 2019 19:40:39 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 519B4505
for <gentoo-commits@lists.gentoo.org>; Tue, 1 Jan 2019 19:40:37 +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: <1546371610.e4a738799e02a5b5b005ced1943f9525ccca0ce3.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-r3.ebuild
X-VCS-Directories: app-office/calligra/
X-VCS-Committer: asturm
X-VCS-Committer-Name: Andreas Sturmlechner
X-VCS-Revision: e4a738799e02a5b5b005ced1943f9525ccca0ce3
X-VCS-Branch: master
Date: Tue, 1 Jan 2019 19:40:37 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: dccdb06e-cc9a-4336-b2dd-d292583a96f8
X-Archives-Hash: cb39a8b53b78d52c4e59c068dfa23df6
commit: e4a738799e02a5b5b005ced1943f9525ccca0ce3
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 1 17:22:37 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jan 1 19:40:10 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4a73879
app-office/calligra: Move stage into CALLIGRA_FEATURES
Simplifies ebuild.
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/calligra/calligra-3.1.0-r3.ebuild | 15 +++++----------
1 file changed, 5 insertions(+), 10 deletions(-)
diff --git a/app-office/calligra/calligra-3.1.0-r3.ebuild b/app-office/calligra/calligra-3.1.0-r3.ebuild
index 0fe2f8fc959..f126c2aad96 100644
--- a/app-office/calligra/calligra-3.1.0-r3.ebuild
+++ b/app-office/calligra/calligra-3.1.0-r3.ebuild
@@ -16,11 +16,10 @@ SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
LICENSE="GPL-2"
KEYWORDS="~amd64 ~x86"
-CAL_FTS=( karbon sheets words )
+CAL_FTS=( karbon sheets stage words )
IUSE="activities +crypt +fontconfig gemini gsl import-filter +lcms okular openexr +pdf
- phonon pim spacenav +truetype X $(printf 'calligra_features_%s ' ${CAL_FTS[@]})
- calligra_experimental_features_stage"
+ phonon pim spacenav +truetype X $(printf 'calligra_features_%s ' ${CAL_FTS[@]})"
# TODO: Not packaged: Cauchy (https://bitbucket.org/cyrille/cauchy)
# Required for the matlab/octave formula tool
@@ -94,10 +93,8 @@ COMMON_DEPEND="
$(add_qt_dep qtx11extras)
x11-libs/libX11
)
- calligra_experimental_features_stage? (
- okular? ( $(add_kdeapps_dep okular) )
- )
calligra_features_sheets? ( dev-cpp/eigen:3 )
+ calligra_features_stage? ( okular? ( $(add_kdeapps_dep okular) ) )
calligra_features_words? (
dev-libs/libxslt
okular? ( $(add_kdeapps_dep okular) )
@@ -153,7 +150,7 @@ src_prepare() {
extras/CMakeLists.txt || die "Failed to disable OKULAR_GENERATOR_ODT"
fi
- if use okular && ! use calligra_experimental_features_stage; then
+ if use okular && ! use calligra_features_stage; then
sed -i -e "/add_subdirectory( *okularodpgenerator *)/ s/^/#DONT/" \
extras/CMakeLists.txt || die "Failed to disable OKULAR_GENERATOR_ODP"
fi
@@ -167,8 +164,6 @@ src_configure() {
use calligra_features_${cal_ft} && myproducts+=( "${cal_ft^^}" )
done
- use calligra_experimental_features_stage && myproducts+=( STAGE )
-
use lcms && myproducts+=( PLUGIN_COLORENGINES )
use spacenav && myproducts+=( PLUGIN_SPACENAVIGATOR )
@@ -197,7 +192,7 @@ src_configure() {
-DWITH_OpenEXR=$(usex openexr)
-DWITH_Poppler=$(usex pdf)
-DWITH_Eigen3=$(usex calligra_features_sheets)
- -DBUILD_UNMAINTAINED=$(usex calligra_experimental_features_stage)
+ -DBUILD_UNMAINTAINED=$(usex calligra_features_stage)
-ENABLE_CSTESTER_TESTING=$(usex test)
-DWITH_Freetype=$(usex truetype)
)