commit: c9220ce92914ba3d7b5de3bfe437ec2e6c6d3036
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 7 10:51:17 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jan 7 10:51:42 2017 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=c9220ce9
app-office/calligra: Drop USE=eigen,marble,xml
Marble is currently not in use due to FEATURE_RDF disabled
Eigen is only used by sheets, so make it conditional on sheets
Drop no-op USE=xml
Package-Manager: portage-2.3.0
app-office/calligra/calligra-9999.ebuild | 26 ++++++++++++--------------
app-office/calligra/metadata.xml | 2 --
2 files changed, 12 insertions(+), 16 deletions(-)
diff --git a/app-office/calligra/calligra-9999.ebuild
b/app-office/calligra/calligra-9999.ebuild
index 1b17523..148bf75 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -21,15 +21,17 @@ KEYWORDS="~amd64 ~x86"
CAL_FTS=( karbon plan sheets words )
CAL_EXP_FTS=( braindump stage )
-IUSE="activities +crypt +eigen +fontconfig gsl import-filter jpeg2k +lcms
okular openexr +pdf
-phonon pim marble spacenav +truetype vc +xml X $(printf 'calligra_features_%s
' ${CAL_FTS[@]})
-$(printf 'calligra_experimental_features_%s ' ${CAL_EXP_FTS[@]})"
-
-REQUIRED_USE="calligra_features_sheets? ( eigen )"
+IUSE="activities +crypt +fontconfig gsl import-filter jpeg2k +lcms okular
openexr +pdf
+ phonon pim spacenav +truetype vc X $(printf 'calligra_features_%s '
${CAL_FTS[@]})
+ $(printf 'calligra_experimental_features_%s ' ${CAL_EXP_FTS[@]})"
# TODO: Not packaged: Cauchy (https://bitbucket.org/cyrille/cauchy)
# Required for the matlab/octave formula tool
# drop qtcore subslot operator when QT_MINIMAL >= 5.7.0
+# FIXME: Disabled by upstream for good reason
+# Crashes plan (https://bugs.kde.org/show_bug.cgi?id=311940)
+# $(add_kdeapps_dep akonadi)
+# $(add_kdeapps_dep akonadi-contacts)
COMMON_DEPEND="
$(add_frameworks_dep karchive)
$(add_frameworks_dep kcmutils)
@@ -73,7 +75,6 @@ COMMON_DEPEND="
virtual/libiconv
activities? ( $(add_frameworks_dep kactivities) )
crypt? ( app-crypt/qca:2[qt5] )
- eigen? ( dev-cpp/eigen:3 )
fontconfig? ( media-libs/fontconfig )
gsl? ( sci-libs/gsl )
import-filter? (
@@ -90,7 +91,6 @@ COMMON_DEPEND="
media-libs/ilmbase:=
media-libs/lcms:2
)
- marble? ( $(add_kdeapps_dep marble) )
openexr? ( media-libs/openexr )
pdf? ( app-text/poppler:=[qt5] )
phonon? ( media-libs/phonon[qt5] )
@@ -113,12 +113,11 @@ COMMON_DEPEND="
=dev-libs/kproperty-3.0*:5
=dev-libs/kreport-3.0*:5
pim? (
- $(add_kdeapps_dep akonadi)
- $(add_kdeapps_dep akonadi-contacts)
$(add_kdeapps_dep kcalcore)
$(add_kdeapps_dep kcontacts)
)
)
+ calligra_features_sheets? ( dev-cpp/eigen:3 )
calligra_features_words? (
dev-libs/libxslt
okular? ( $(add_kdeapps_dep okular) )
@@ -208,12 +207,14 @@ src_configure() {
)
fi
+ use calligra_features_karbon && \
+ mycmakeargs+=( $(cmake-utils_use_find_package jpeg2k OpenJPEG) )
+
mycmakeargs+=(
-DPACKAGERS_BUILD=OFF
-DWITH_Iconv=ON
$(cmake-utils_use_find_package activities KF5Activities)
-DWITH_Qca-qt5=$(usex crypt)
- -DWITH_Eigen3=$(usex eigen)
-DWITH_Fontconfig=$(usex fontconfig)
-DWITH_GSL=$(usex gsl)
-DWITH_LibEtonyek=$(usex import-filter)
@@ -223,17 +224,14 @@ src_configure() {
-DWITH_LibWpd=$(usex import-filter)
-DWITH_LibWpg=$(usex import-filter)
-DWITH_LibWps=$(usex import-filter)
- $(cmake-utils_use_find_package jpeg2k OpenJPEG)
$(cmake-utils_use_find_package phonon Phonon4Qt5)
- $(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)
- $(cmake-utils_use_find_package marble Marble)
-DWITH_Okular5=$(usex okular)
-DWITH_OpenEXR=$(usex openexr)
-DWITH_Poppler=$(usex pdf)
+ -DWITH_Eigen3=$(usex calligra_features_sheets)
-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 31b5858..5558990 100644
--- a/app-office/calligra/metadata.xml
+++ b/app-office/calligra/metadata.xml
@@ -11,11 +11,9 @@
</maintainer>
<use>
<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="pim">Enable support for KDE PIM resources
integration</flag>
<flag name="lcms">Build colorengine plugins using
<pkg>media-libs/lcms</pkg></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="phonon">Build stage/eventplugins and videoshape
plugin using <pkg>media-libs/phonon</pkg></flag>
<flag name="spacenav">Enable support for the 3Dconnexion
spacenav input device via <pkg>dev-libs/libspnav</pkg></flag>
