[gentoo-commits] proj/kde:master commit in: app-office/calligra/

[Andreas Sturmlechner]

commit:     db2cde57c5d6e41198378844df710f64bcf6c435
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  1 17:28:56 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jan  1 21:45:39 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=db2cde57

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-9999.ebuild | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/app-office/calligra/calligra-9999.ebuild 
b/app-office/calligra/calligra-9999.ebuild
index 1c65c68094..f2912e9e58 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -16,12 +16,11 @@ if [[ ${KDE_BUILD_TYPE} == release ]]; then
        KEYWORDS="~amd64 ~x86"
 fi
 
-CAL_FTS=( karbon sheets words )
+CAL_FTS=( karbon sheets stage words )
 
 LICENSE="GPL-2"
 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
@@ -95,13 +94,11 @@ 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
                dev-libs/kdiagram:5
        )
+       calligra_features_stage? ( okular? ( $(add_kdeapps_dep okular) ) )
        calligra_features_words? (
                dev-libs/libxslt
                okular? ( $(add_kdeapps_dep okular) )
@@ -149,7 +146,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
@@ -163,8 +160,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 )
 
@@ -193,7 +188,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)
        )