commit: 0b6583ee076c90cf3e14081cafc081a94e7e0aa1 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Wed Jan 31 16:51:26 2018 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Wed Jan 31 17:51:23 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b6583ee
app-office/calligra: Fix CALLIGRA_EXPERIMENTAL_FEATURES_STAGE Reported-by: Dennis Schridde <devurandom <AT> gmx.net> Closes: https://bugs.gentoo.org/646164 Package-Manager: Portage-2.3.21, Repoman-2.3.6 app-office/calligra/calligra-3.1.0.ebuild | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/app-office/calligra/calligra-3.1.0.ebuild b/app-office/calligra/calligra-3.1.0.ebuild index b053f117b3a..e74f8c930b4 100644 --- a/app-office/calligra/calligra-3.1.0.ebuild +++ b/app-office/calligra/calligra-3.1.0.ebuild @@ -188,30 +188,19 @@ src_configure() { # applications for cal_ft in ${CAL_FTS[@]}; do - if use calligra_features_${cal_ft} ; then - myproducts+=( "${cal_ft^^}" ) - fi + use calligra_features_${cal_ft} && myproducts+=( "${cal_ft^^}" ) done - [[ ${KDE_BUILD_TYPE} == release ]] && \ - use calligra_experimental_features_stage && \ - myproducts+=( CALLIGRA_FEATURES_STAGE ) + use calligra_experimental_features_stage && myproducts+=( STAGE ) use lcms && myproducts+=( PLUGIN_COLORENGINES ) use spacenav && myproducts+=( PLUGIN_SPACENAVIGATOR ) - local mycmakeargs=( -DPRODUCTSET="${myproducts[*]}" ) - - if [[ ${KDE_BUILD_TYPE} == release ]] ; then - mycmakeargs+=( - -DRELEASE_BUILD=ON - -DBUILD_UNMAINTAINED=$(usex calligra_experimental_features_stage) - ) - fi - - mycmakeargs+=( + local mycmakeargs=( -DPACKAGERS_BUILD=OFF + -DRELEASE_BUILD=ON -DWITH_Iconv=ON + -DPRODUCTSET="${myproducts[*]}" $(cmake-utils_use_find_package activities KF5Activities) -DWITH_Qca-qt5=$(usex crypt) -DWITH_Fontconfig=$(usex fontconfig) @@ -233,6 +222,7 @@ src_configure() { -DWITH_OpenEXR=$(usex openexr) -DWITH_Poppler=$(usex pdf) -DWITH_Eigen3=$(usex calligra_features_sheets) + -DBUILD_UNMAINTAINED=$(usex calligra_experimental_features_stage) -ENABLE_CSTESTER_TESTING=$(usex test) -DWITH_Freetype=$(usex truetype) )
