1 |
commit: e4a738799e02a5b5b005ced1943f9525ccca0ce3 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Jan 1 17:22:37 2019 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jan 1 19:40:10 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4a73879 |
7 |
|
8 |
app-office/calligra: Move stage into CALLIGRA_FEATURES |
9 |
|
10 |
Simplifies ebuild. |
11 |
|
12 |
Package-Manager: Portage-2.3.52, Repoman-2.3.12 |
13 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
14 |
|
15 |
app-office/calligra/calligra-3.1.0-r3.ebuild | 15 +++++---------- |
16 |
1 file changed, 5 insertions(+), 10 deletions(-) |
17 |
|
18 |
diff --git a/app-office/calligra/calligra-3.1.0-r3.ebuild b/app-office/calligra/calligra-3.1.0-r3.ebuild |
19 |
index 0fe2f8fc959..f126c2aad96 100644 |
20 |
--- a/app-office/calligra/calligra-3.1.0-r3.ebuild |
21 |
+++ b/app-office/calligra/calligra-3.1.0-r3.ebuild |
22 |
@@ -16,11 +16,10 @@ SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" |
23 |
LICENSE="GPL-2" |
24 |
KEYWORDS="~amd64 ~x86" |
25 |
|
26 |
-CAL_FTS=( karbon sheets words ) |
27 |
+CAL_FTS=( karbon sheets stage words ) |
28 |
|
29 |
IUSE="activities +crypt +fontconfig gemini gsl import-filter +lcms okular openexr +pdf |
30 |
- phonon pim spacenav +truetype X $(printf 'calligra_features_%s ' ${CAL_FTS[@]}) |
31 |
- calligra_experimental_features_stage" |
32 |
+ phonon pim spacenav +truetype X $(printf 'calligra_features_%s ' ${CAL_FTS[@]})" |
33 |
|
34 |
# TODO: Not packaged: Cauchy (https://bitbucket.org/cyrille/cauchy) |
35 |
# Required for the matlab/octave formula tool |
36 |
@@ -94,10 +93,8 @@ COMMON_DEPEND=" |
37 |
$(add_qt_dep qtx11extras) |
38 |
x11-libs/libX11 |
39 |
) |
40 |
- calligra_experimental_features_stage? ( |
41 |
- okular? ( $(add_kdeapps_dep okular) ) |
42 |
- ) |
43 |
calligra_features_sheets? ( dev-cpp/eigen:3 ) |
44 |
+ calligra_features_stage? ( okular? ( $(add_kdeapps_dep okular) ) ) |
45 |
calligra_features_words? ( |
46 |
dev-libs/libxslt |
47 |
okular? ( $(add_kdeapps_dep okular) ) |
48 |
@@ -153,7 +150,7 @@ src_prepare() { |
49 |
extras/CMakeLists.txt || die "Failed to disable OKULAR_GENERATOR_ODT" |
50 |
fi |
51 |
|
52 |
- if use okular && ! use calligra_experimental_features_stage; then |
53 |
+ if use okular && ! use calligra_features_stage; then |
54 |
sed -i -e "/add_subdirectory( *okularodpgenerator *)/ s/^/#DONT/" \ |
55 |
extras/CMakeLists.txt || die "Failed to disable OKULAR_GENERATOR_ODP" |
56 |
fi |
57 |
@@ -167,8 +164,6 @@ src_configure() { |
58 |
use calligra_features_${cal_ft} && myproducts+=( "${cal_ft^^}" ) |
59 |
done |
60 |
|
61 |
- use calligra_experimental_features_stage && myproducts+=( STAGE ) |
62 |
- |
63 |
use lcms && myproducts+=( PLUGIN_COLORENGINES ) |
64 |
use spacenav && myproducts+=( PLUGIN_SPACENAVIGATOR ) |
65 |
|
66 |
@@ -197,7 +192,7 @@ src_configure() { |
67 |
-DWITH_OpenEXR=$(usex openexr) |
68 |
-DWITH_Poppler=$(usex pdf) |
69 |
-DWITH_Eigen3=$(usex calligra_features_sheets) |
70 |
- -DBUILD_UNMAINTAINED=$(usex calligra_experimental_features_stage) |
71 |
+ -DBUILD_UNMAINTAINED=$(usex calligra_features_stage) |
72 |
-ENABLE_CSTESTER_TESTING=$(usex test) |
73 |
-DWITH_Freetype=$(usex truetype) |
74 |
) |