diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2018-01-31 17:51:26 +0100 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2018-01-31 18:51:23 +0100 |
| commit | 0b6583ee076c90cf3e14081cafc081a94e7e0aa1 (patch) | |
| tree | 51c2585fd46b1acd9e5e7a9ff3ccc24d80973bb1 /app-office | |
| parent | media-tv/kodi: Trigger rebuilds when the dev-cpp/waylandpp slot changes (diff) | |
| download | gentoo-0b6583ee076c90cf3e14081cafc081a94e7e0aa1.tar.gz gentoo-0b6583ee076c90cf3e14081cafc081a94e7e0aa1.tar.bz2 gentoo-0b6583ee076c90cf3e14081cafc081a94e7e0aa1.zip | |
app-office/calligra: Fix CALLIGRA_EXPERIMENTAL_FEATURES_STAGE
Reported-by: Dennis Schridde <devurandom@gmx.net>
Closes: https://bugs.gentoo.org/646164
Package-Manager: Portage-2.3.21, Repoman-2.3.6
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/calligra/calligra-3.1.0.ebuild | 22 |
1 files 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 b053f117b3ad..e74f8c930b4d 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) ) |