commit: 1c81b6921e00cd424d677419a42b50858fbb6dd7 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Wed Jan 31 17:49:38 2018 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Wed Jan 31 17:49:38 2018 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=1c81b692
app-office/calligra: Fix CALLIGRA_EXPERIMENTAL_FEATURES_STAGE Package-Manager: Portage-2.3.21, Repoman-2.3.6 app-office/calligra/calligra-9999.ebuild | 24 +++++++--------------- ...atch => calligra-3.1.0-no-arch-detection.patch} | 0 2 files changed, 7 insertions(+), 17 deletions(-) diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild index 5a1cab4cd2..834247c72f 100644 --- a/app-office/calligra/calligra-9999.ebuild +++ b/app-office/calligra/calligra-9999.ebuild @@ -137,7 +137,7 @@ RDEPEND="${COMMON_DEPEND} " RESTRICT+=" test" -PATCHES=( "${FILESDIR}/${PN}"-3.0.90-no-arch-detection.patch ) +PATCHES=( "${FILESDIR}/${PN}"-3.1.0-no-arch-detection.patch ) pkg_pretend() { check-reqs_pkg_pretend @@ -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) ) diff --git a/app-office/calligra/files/calligra-3.0.90-no-arch-detection.patch b/app-office/calligra/files/calligra-3.1.0-no-arch-detection.patch similarity index 100% rename from app-office/calligra/files/calligra-3.0.90-no-arch-detection.patch rename to app-office/calligra/files/calligra-3.1.0-no-arch-detection.patch