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

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     481dbec79e4946838b38ec1ba3f3252e0003d788
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 16 11:44:11 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Aug 16 12:16:50 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=481dbec7

app-office/calligra: Add USE +charts

Fixes unhandled automagic dependency on dev-libs/kdiagram.

Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 app-office/calligra/calligra-9999.ebuild | 11 +++++------
 app-office/calligra/metadata.xml         |  1 +
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index 28a6f55d9d..e816c68638 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -19,8 +19,8 @@ fi
 CAL_FTS=( flow karbon sheets stage words )
 
 LICENSE="GPL-2"
-IUSE="activities +crypt +fontconfig gemini gsl import-filter +lcms okular openexr +pdf
-	phonon spacenav +truetype X $(printf 'calligra_features_%s ' ${CAL_FTS[@]})"
+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)
 # Required for the matlab/octave formula tool
@@ -69,6 +69,7 @@ COMMON_DEPEND="
 	sys-libs/zlib
 	virtual/libiconv
 	activities? ( $(add_frameworks_dep kactivities) )
+	charts? ( dev-libs/kdiagram:5 )
 	crypt? ( app-crypt/qca:2[qt5(+)] )
 	fontconfig? ( media-libs/fontconfig )
 	gemini? ( $(add_qt_dep qtdeclarative 'widgets') )
@@ -96,10 +97,7 @@ COMMON_DEPEND="
 		$(add_qt_dep qtx11extras)
 		x11-libs/libX11
 	)
-	calligra_features_sheets? (
-		dev-cpp/eigen:3
-		dev-libs/kdiagram:5
-	)
+	calligra_features_sheets? ( dev-cpp/eigen:3 )
 	calligra_features_stage? ( okular? ( $(add_kdeapps_dep okular) ) )
 	calligra_features_words? (
 		dev-libs/libxslt
@@ -169,6 +167,7 @@ src_configure() {
 		-DWITH_Iconv=ON
 		-DPRODUCTSET="${myproducts[*]}"
 		$(cmake-utils_use_find_package activities KF5Activities)
+		$(cmake-utils_use_find_package charts KChart)
 		-DWITH_Qca-qt5=$(usex crypt)
 		-DWITH_Fontconfig=$(usex fontconfig)
 		$(cmake-utils_use_find_package gemini Libgit2)

diff --git a/app-office/calligra/metadata.xml b/app-office/calligra/metadata.xml
index 7e51f93936..a26eb5e811 100644
--- a/app-office/calligra/metadata.xml
+++ b/app-office/calligra/metadata.xml
@@ -11,6 +11,7 @@
 	</maintainer>
 	<use>
 		<flag name="activities">Enable kactivities support</flag>
+		<flag name="charts">Build chartshape plugin for creating business charts with <pkg>dev-libs/kdiagram</pkg></flag>
 		<flag name="calligra_features_flow">Build Calligra flowchart and diagram tool</flag>
 		<flag name="gemini">Enable tablet and 2:1 devices support</flag>
 		<flag name="import-filter">Enable support for various import filter file formats like WordPerfect, Visio and Apple Keynote</flag>