1 |
commit: 0b6583ee076c90cf3e14081cafc081a94e7e0aa1 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jan 31 16:51:26 2018 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jan 31 17:51:23 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b6583ee |
7 |
|
8 |
app-office/calligra: Fix CALLIGRA_EXPERIMENTAL_FEATURES_STAGE |
9 |
|
10 |
Reported-by: Dennis Schridde <devurandom <AT> gmx.net> |
11 |
Closes: https://bugs.gentoo.org/646164 |
12 |
Package-Manager: Portage-2.3.21, Repoman-2.3.6 |
13 |
|
14 |
app-office/calligra/calligra-3.1.0.ebuild | 22 ++++++---------------- |
15 |
1 file changed, 6 insertions(+), 16 deletions(-) |
16 |
|
17 |
diff --git a/app-office/calligra/calligra-3.1.0.ebuild b/app-office/calligra/calligra-3.1.0.ebuild |
18 |
index b053f117b3a..e74f8c930b4 100644 |
19 |
--- a/app-office/calligra/calligra-3.1.0.ebuild |
20 |
+++ b/app-office/calligra/calligra-3.1.0.ebuild |
21 |
@@ -188,30 +188,19 @@ src_configure() { |
22 |
|
23 |
# applications |
24 |
for cal_ft in ${CAL_FTS[@]}; do |
25 |
- if use calligra_features_${cal_ft} ; then |
26 |
- myproducts+=( "${cal_ft^^}" ) |
27 |
- fi |
28 |
+ use calligra_features_${cal_ft} && myproducts+=( "${cal_ft^^}" ) |
29 |
done |
30 |
|
31 |
- [[ ${KDE_BUILD_TYPE} == release ]] && \ |
32 |
- use calligra_experimental_features_stage && \ |
33 |
- myproducts+=( CALLIGRA_FEATURES_STAGE ) |
34 |
+ use calligra_experimental_features_stage && myproducts+=( STAGE ) |
35 |
|
36 |
use lcms && myproducts+=( PLUGIN_COLORENGINES ) |
37 |
use spacenav && myproducts+=( PLUGIN_SPACENAVIGATOR ) |
38 |
|
39 |
- local mycmakeargs=( -DPRODUCTSET="${myproducts[*]}" ) |
40 |
- |
41 |
- if [[ ${KDE_BUILD_TYPE} == release ]] ; then |
42 |
- mycmakeargs+=( |
43 |
- -DRELEASE_BUILD=ON |
44 |
- -DBUILD_UNMAINTAINED=$(usex calligra_experimental_features_stage) |
45 |
- ) |
46 |
- fi |
47 |
- |
48 |
- mycmakeargs+=( |
49 |
+ local mycmakeargs=( |
50 |
-DPACKAGERS_BUILD=OFF |
51 |
+ -DRELEASE_BUILD=ON |
52 |
-DWITH_Iconv=ON |
53 |
+ -DPRODUCTSET="${myproducts[*]}" |
54 |
$(cmake-utils_use_find_package activities KF5Activities) |
55 |
-DWITH_Qca-qt5=$(usex crypt) |
56 |
-DWITH_Fontconfig=$(usex fontconfig) |
57 |
@@ -233,6 +222,7 @@ src_configure() { |
58 |
-DWITH_OpenEXR=$(usex openexr) |
59 |
-DWITH_Poppler=$(usex pdf) |
60 |
-DWITH_Eigen3=$(usex calligra_features_sheets) |
61 |
+ -DBUILD_UNMAINTAINED=$(usex calligra_experimental_features_stage) |
62 |
-ENABLE_CSTESTER_TESTING=$(usex test) |
63 |
-DWITH_Freetype=$(usex truetype) |
64 |
) |