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

["Johannes Huber" <johu@gentoo.org>]

commit:     a672d48a300733363cab7121d088ad9fc5744ea2
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed Nov  2 18:38:34 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Nov  2 18:38:57 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a672d48a

app-office/calligra: Drop deprecated Plasma 4 support

Package-Manager: portage-2.3.2

 app-office/calligra/calligra-2.9.11.ebuild | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app-office/calligra/calligra-2.9.11.ebuild b/app-office/calligra/calligra-2.9.11.ebuild
index 89311ab..da995b5 100644
--- a/app-office/calligra/calligra-2.9.11.ebuild
+++ b/app-office/calligra/calligra-2.9.11.ebuild
@@ -41,7 +41,7 @@ if [[ ${KDE_BUILD_TYPE} == release ]] ; then
 fi
 
 IUSE="attica color-management +crypt +eigen +exif fftw +fontconfig freetds
-+glew +glib +gsf gsl import-filter +jpeg jpeg2k +kdcraw kde +kdepim +lcms
++glew +glib +gsf gsl import-filter +jpeg jpeg2k +kdcraw +kdepim +lcms
 marble mysql +okular openexr +pdf postgres spacenav sybase test tiff +threads
 +truetype vc xbase +xml"
 
@@ -93,7 +93,6 @@ RDEPEND="
 	jpeg? ( virtual/jpeg:0 )
 	jpeg2k? ( media-libs/openjpeg:0 )
 	kdcraw? ( $(add_kdeapps_dep libkdcraw) )
-	kde? ( $(add_kdebase_dep kactivities) )
 	kdepim? ( $(add_kdeapps_dep kdepimlibs) )
 	lcms? (
 		media-libs/lcms:2
@@ -182,6 +181,7 @@ src_configure() {
 		"-DCREATIVEONLY=OFF"
 		"-DPACKAGERS_BUILD=OFF"
 		"-DWITH_Soprano=OFF"
+		"-DWITH_KActivities=OFF"	# deprecated Plasma 4 activities integration
 	)
 
 	# regular options
@@ -206,7 +206,6 @@ src_configure() {
 		$(cmake-utils_use_with jpeg JPEG)
 		$(cmake-utils_use_with jpeg2k OpenJPEG)
 		$(cmake-utils_use_with kdcraw Kdcraw)
-		$(cmake-utils_use_with kde KActivities)
 		$(cmake-utils_use_with kdepim KdepimLibs)
 		$(cmake-utils_use_with lcms LCMS2)
 		$(cmake-utils_use_with marble CalligraMarble)