commit: 73d60d1284197e42e9634d73444246ca3628a496
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Wed Oct 26 15:56:35 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Nov 12 10:57:34 2016 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=73d60d12
app-office/calligra: Fix DEPENDs
Raise app-text/libwps DEPEND to >=0.4
Drop kde-apps/kdgantt2 (using KGantt from KDiagram).
Package-Manager: portage-2.3.0
app-office/calligra/calligra-9999.ebuild | 20 +++++++++-----------
app-office/calligra/metadata.xml | 2 +-
2 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/app-office/calligra/calligra-9999.ebuild
b/app-office/calligra/calligra-9999.ebuild
index 47c14b2..876a63b 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -26,7 +26,7 @@ LICENSE="GPL-2"
[[ ${KDE_BUILD_TYPE} == release ]] && \
KEYWORDS="~amd64 ~x86"
-IUSE="activities +crypt +eigen +fontconfig gsl import-filter +lcms kdepim
+IUSE="activities +crypt +eigen +fontconfig gsl import-filter +lcms pim
marble okular openexr +pdf spacenav +truetype vc +webkit +xml X"
CAL_FTS="braindump karbon plan sheets stage words"
@@ -98,7 +98,7 @@ COMMON_DEPEND="
app-text/libodfgen
app-text/libwpd:*
app-text/libwpg:*
- app-text/libwps
+ >=app-text/libwps-0.4
dev-libs/librevenge
media-libs/libvisio
)
@@ -118,12 +118,11 @@ COMMON_DEPEND="
dev-libs/kdiagram:5
dev-libs/kproperty:5
dev-libs/kreport:5
- kdepim? (
+ pim? (
$(add_kdeapps_dep akonadi)
$(add_kdeapps_dep akonadi-contacts)
$(add_kdeapps_dep kcalcore)
$(add_kdeapps_dep kcontacts)
- $(add_kdeapps_dep kdgantt2)
)
)
calligra_features_stage? (
@@ -210,17 +209,16 @@ src_configure() {
-DWITH_LibWpd=$(usex import-filter)
-DWITH_LibWpg=$(usex import-filter)
-DWITH_LibWps=$(usex import-filter)
- $(cmake-utils_use_find_package kdepim KF5Akonadi)
- $(cmake-utils_use_find_package kdepim KF5AkonadiContact)
- $(cmake-utils_use_find_package kdepim KF5CalendarCore)
- $(cmake-utils_use_find_package kdepim KF5Contacts)
- $(cmake-utils_use_find_package kdepim KGantt)
+ $(cmake-utils_use_find_package pim KF5Akonadi)
+ $(cmake-utils_use_find_package pim KF5AkonadiContact)
+ $(cmake-utils_use_find_package pim KF5CalendarCore)
+ $(cmake-utils_use_find_package pim KF5Contacts)
-DWITH_LCMS2=$(usex lcms)
- -DWITH_CalligraMarble=$(usex marble)
+ $(cmake-utils_use_find_package marble Marble)
-DWITH_Okular5=$(usex okular)
-DWITH_OpenEXR=$(usex openexr)
-DWITH_Poppler=$(usex pdf)
- -DWITH_Spnav=$(usex spacenav)
+ $(cmake-utils_use_find_package spacenav Spnav)
-ENABLE_CSTESTER_TESTING=$(usex test)
-DWITH_Freetype=$(usex truetype)
-DWITH_Vc=$(usex vc)
diff --git a/app-office/calligra/metadata.xml b/app-office/calligra/metadata.xml
index bf486c6..432740f 100644
--- a/app-office/calligra/metadata.xml
+++ b/app-office/calligra/metadata.xml
@@ -13,7 +13,7 @@
<flag name="activities">Enable kactivities support</flag>
<flag name="eigen">Enable <pkg>dev-cpp/eigen</pkg> mathematical
templates support</flag>
<flag name="import-filter">Enable support for various import
filter file formats like WordPerfect, Visio and Apple Keynote</flag>
- <flag name="kdepim">Enable support for KDEPIM resources
integration</flag>
+ <flag name="pim">Enable support for KDE PIM resources
integration</flag>
<flag name="marble">Enable displaying of maps using
Marble</flag>
<flag name="okular">Enable bindings for
<pkg>kde-apps/okular</pkg></flag>
<flag name="spacenav">Enable support for the 3Dconnexion
spacenav input device via <pkg>dev-libs/libspnav</pkg></flag>
