commit: 11221b8974932885eb93bbc77911326af6551ec5 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun Jun 28 16:04:49 2020 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun Jun 28 16:13:30 2020 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=11221b89
app-office/calligra: Add okular to myproducts to build the feature Bug: https://bugs.gentoo.org/722416 Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> app-office/calligra/calligra-9999.ebuild | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild index abbe914de8..240ca9b02e 100644 --- a/app-office/calligra/calligra-9999.ebuild +++ b/app-office/calligra/calligra-9999.ebuild @@ -14,7 +14,7 @@ DESCRIPTION="KDE Office Suite" HOMEPAGE="https://calligra.org/"; if [[ ${KDE_BUILD_TYPE} == release ]]; then - SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz" + SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" KEYWORDS="~amd64 ~x86" fi @@ -22,7 +22,7 @@ CAL_FTS=( karbon sheets stage words ) LICENSE="GPL-2" SLOT="5" -IUSE="activities +charts +crypt +fontconfig gemini gsl import-filter +lcms okular openexr +IUSE="activities +charts +crypt +fontconfig gemini gsl +import-filter +lcms okular openexr +pdf phonon spacenav +truetype X $(printf 'calligra_features_%s ' ${CAL_FTS[@]})" # TODO: Not packaged: Cauchy (https://bitbucket.org/cyrille/cauchy) @@ -91,6 +91,7 @@ COMMON_DEPEND=" media-libs/ilmbase:= media-libs/lcms:2 ) + okular? ( kde-apps/okular:5 ) openexr? ( media-libs/openexr ) pdf? ( app-text/poppler:=[qt5] ) phonon? ( media-libs/phonon[qt5(+)] ) @@ -101,11 +102,7 @@ COMMON_DEPEND=" x11-libs/libX11 ) calligra_features_sheets? ( dev-cpp/eigen:3 ) - calligra_features_stage? ( okular? ( kde-apps/okular:5 ) ) - calligra_features_words? ( - dev-libs/libxslt - okular? ( kde-apps/okular:5 ) - ) + calligra_features_words? ( dev-libs/libxslt ) " DEPEND="${COMMON_DEPEND} dev-libs/boost @@ -118,6 +115,7 @@ RDEPEND="${COMMON_DEPEND} >=kde-frameworks/kirigami-${KFMIN}:5 ) " + RESTRICT+=" test" PATCHES=( "${FILESDIR}"/${PN}-3.1.89-no-arch-detection.patch ) @@ -142,17 +140,6 @@ src_prepare() { # Unconditionally disable deprecated deps (required by QtQuick1) ecm_punt_bogus_dep Qt5 Declarative ecm_punt_bogus_dep Qt5 OpenGL - - # Hack around the excessive use of CMake macros - if use okular && ! use calligra_features_words; then - sed -i -e "/add_subdirectory( *okularodtgenerator *)/ s/^/#DONT/" \ - extras/CMakeLists.txt || die "Failed to disable OKULAR_GENERATOR_ODT" - fi - - 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 } src_configure() { @@ -164,6 +151,7 @@ src_configure() { done use lcms && myproducts+=( PLUGIN_COLORENGINES ) + use okular && myproducts+=( OKULAR ) use spacenav && myproducts+=( PLUGIN_SPACENAVIGATOR ) local mycmakeargs=(
