| 1 |
commit: 481dbec79e4946838b38ec1ba3f3252e0003d788 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Aug 16 11:44:11 2019 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Aug 16 12:16:50 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=481dbec7 |
| 7 |
|
| 8 |
app-office/calligra: Add USE +charts |
| 9 |
|
| 10 |
Fixes unhandled automagic dependency on dev-libs/kdiagram. |
| 11 |
|
| 12 |
Package-Manager: Portage-2.3.71, Repoman-2.3.17 |
| 13 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 14 |
|
| 15 |
app-office/calligra/calligra-9999.ebuild | 11 +++++------ |
| 16 |
app-office/calligra/metadata.xml | 1 + |
| 17 |
2 files changed, 6 insertions(+), 6 deletions(-) |
| 18 |
|
| 19 |
diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild |
| 20 |
index 28a6f55d9d..e816c68638 100644 |
| 21 |
--- a/app-office/calligra/calligra-9999.ebuild |
| 22 |
+++ b/app-office/calligra/calligra-9999.ebuild |
| 23 |
@@ -19,8 +19,8 @@ fi |
| 24 |
CAL_FTS=( flow karbon sheets stage words ) |
| 25 |
|
| 26 |
LICENSE="GPL-2" |
| 27 |
-IUSE="activities +crypt +fontconfig gemini gsl import-filter +lcms okular openexr +pdf |
| 28 |
- phonon spacenav +truetype X $(printf 'calligra_features_%s ' ${CAL_FTS[@]})" |
| 29 |
+IUSE="activities +charts +crypt +fontconfig gemini gsl import-filter +lcms okular openexr |
| 30 |
+ +pdf phonon spacenav +truetype X $(printf 'calligra_features_%s ' ${CAL_FTS[@]})" |
| 31 |
|
| 32 |
# TODO: Not packaged: Cauchy (https://bitbucket.org/cyrille/cauchy) |
| 33 |
# Required for the matlab/octave formula tool |
| 34 |
@@ -69,6 +69,7 @@ COMMON_DEPEND=" |
| 35 |
sys-libs/zlib |
| 36 |
virtual/libiconv |
| 37 |
activities? ( $(add_frameworks_dep kactivities) ) |
| 38 |
+ charts? ( dev-libs/kdiagram:5 ) |
| 39 |
crypt? ( app-crypt/qca:2[qt5(+)] ) |
| 40 |
fontconfig? ( media-libs/fontconfig ) |
| 41 |
gemini? ( $(add_qt_dep qtdeclarative 'widgets') ) |
| 42 |
@@ -96,10 +97,7 @@ COMMON_DEPEND=" |
| 43 |
$(add_qt_dep qtx11extras) |
| 44 |
x11-libs/libX11 |
| 45 |
) |
| 46 |
- calligra_features_sheets? ( |
| 47 |
- dev-cpp/eigen:3 |
| 48 |
- dev-libs/kdiagram:5 |
| 49 |
- ) |
| 50 |
+ calligra_features_sheets? ( dev-cpp/eigen:3 ) |
| 51 |
calligra_features_stage? ( okular? ( $(add_kdeapps_dep okular) ) ) |
| 52 |
calligra_features_words? ( |
| 53 |
dev-libs/libxslt |
| 54 |
@@ -169,6 +167,7 @@ src_configure() { |
| 55 |
-DWITH_Iconv=ON |
| 56 |
-DPRODUCTSET="${myproducts[*]}" |
| 57 |
$(cmake-utils_use_find_package activities KF5Activities) |
| 58 |
+ $(cmake-utils_use_find_package charts KChart) |
| 59 |
-DWITH_Qca-qt5=$(usex crypt) |
| 60 |
-DWITH_Fontconfig=$(usex fontconfig) |
| 61 |
$(cmake-utils_use_find_package gemini Libgit2) |
| 62 |
|
| 63 |
diff --git a/app-office/calligra/metadata.xml b/app-office/calligra/metadata.xml |
| 64 |
index 7e51f93936..a26eb5e811 100644 |
| 65 |
--- a/app-office/calligra/metadata.xml |
| 66 |
+++ b/app-office/calligra/metadata.xml |
| 67 |
@@ -11,6 +11,7 @@ |
| 68 |
</maintainer> |
| 69 |
<use> |
| 70 |
<flag name="activities">Enable kactivities support</flag> |
| 71 |
+ <flag name="charts">Build chartshape plugin for creating business charts with <pkg>dev-libs/kdiagram</pkg></flag> |
| 72 |
<flag name="calligra_features_flow">Build Calligra flowchart and diagram tool</flag> |
| 73 |
<flag name="gemini">Enable tablet and 2:1 devices support</flag> |
| 74 |
<flag name="import-filter">Enable support for various import filter file formats like WordPerfect, Visio and Apple Keynote</flag> |
Archives