| 1 |
commit: db2cde57c5d6e41198378844df710f64bcf6c435 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jan 1 17:28:56 2019 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jan 1 21:45:39 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=db2cde57 |
| 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-9999.ebuild | 15 +++++---------- |
| 16 |
1 file changed, 5 insertions(+), 10 deletions(-) |
| 17 |
|
| 18 |
diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild |
| 19 |
index 1c65c68094..f2912e9e58 100644 |
| 20 |
--- a/app-office/calligra/calligra-9999.ebuild |
| 21 |
+++ b/app-office/calligra/calligra-9999.ebuild |
| 22 |
@@ -16,12 +16,11 @@ if [[ ${KDE_BUILD_TYPE} == release ]]; then |
| 23 |
KEYWORDS="~amd64 ~x86" |
| 24 |
fi |
| 25 |
|
| 26 |
-CAL_FTS=( karbon sheets words ) |
| 27 |
+CAL_FTS=( karbon sheets stage words ) |
| 28 |
|
| 29 |
LICENSE="GPL-2" |
| 30 |
IUSE="activities +crypt +fontconfig gemini gsl import-filter +lcms okular openexr +pdf |
| 31 |
- phonon pim spacenav +truetype X $(printf 'calligra_features_%s ' ${CAL_FTS[@]}) |
| 32 |
- calligra_experimental_features_stage" |
| 33 |
+ phonon pim spacenav +truetype X $(printf 'calligra_features_%s ' ${CAL_FTS[@]})" |
| 34 |
|
| 35 |
# TODO: Not packaged: Cauchy (https://bitbucket.org/cyrille/cauchy) |
| 36 |
# Required for the matlab/octave formula tool |
| 37 |
@@ -95,13 +94,11 @@ COMMON_DEPEND=" |
| 38 |
$(add_qt_dep qtx11extras) |
| 39 |
x11-libs/libX11 |
| 40 |
) |
| 41 |
- calligra_experimental_features_stage? ( |
| 42 |
- okular? ( $(add_kdeapps_dep okular) ) |
| 43 |
- ) |
| 44 |
calligra_features_sheets? ( |
| 45 |
dev-cpp/eigen:3 |
| 46 |
dev-libs/kdiagram:5 |
| 47 |
) |
| 48 |
+ calligra_features_stage? ( okular? ( $(add_kdeapps_dep okular) ) ) |
| 49 |
calligra_features_words? ( |
| 50 |
dev-libs/libxslt |
| 51 |
okular? ( $(add_kdeapps_dep okular) ) |
| 52 |
@@ -149,7 +146,7 @@ src_prepare() { |
| 53 |
extras/CMakeLists.txt || die "Failed to disable OKULAR_GENERATOR_ODT" |
| 54 |
fi |
| 55 |
|
| 56 |
- if use okular && ! use calligra_experimental_features_stage; then |
| 57 |
+ if use okular && ! use calligra_features_stage; then |
| 58 |
sed -i -e "/add_subdirectory( *okularodpgenerator *)/ s/^/#DONT/" \ |
| 59 |
extras/CMakeLists.txt || die "Failed to disable OKULAR_GENERATOR_ODP" |
| 60 |
fi |
| 61 |
@@ -163,8 +160,6 @@ src_configure() { |
| 62 |
use calligra_features_${cal_ft} && myproducts+=( "${cal_ft^^}" ) |
| 63 |
done |
| 64 |
|
| 65 |
- use calligra_experimental_features_stage && myproducts+=( STAGE ) |
| 66 |
- |
| 67 |
use lcms && myproducts+=( PLUGIN_COLORENGINES ) |
| 68 |
use spacenav && myproducts+=( PLUGIN_SPACENAVIGATOR ) |
| 69 |
|
| 70 |
@@ -193,7 +188,7 @@ src_configure() { |
| 71 |
-DWITH_OpenEXR=$(usex openexr) |
| 72 |
-DWITH_Poppler=$(usex pdf) |
| 73 |
-DWITH_Eigen3=$(usex calligra_features_sheets) |
| 74 |
- -DBUILD_UNMAINTAINED=$(usex calligra_experimental_features_stage) |
| 75 |
+ -DBUILD_UNMAINTAINED=$(usex calligra_features_stage) |
| 76 |
-ENABLE_CSTESTER_TESTING=$(usex test) |
| 77 |
-DWITH_Freetype=$(usex truetype) |
| 78 |
) |
Archives