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

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

commit:     0547ce7a6ddce8c17cb3036f69bbe84f9604ca8c
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 29 02:35:38 2016 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Dec 30 00:42:44 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=0547ce7a

app-office/calligra: Fix configure, remove file collisions

Gentoo-bug: 603584, 603772

Package-Manager: portage-2.3.0

 app-office/calligra/calligra-9999.ebuild | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index 11d1221..a89e5bd 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -114,6 +114,7 @@ COMMON_DEPEND="
 		okular? ( $(add_kdeapps_dep okular) )
 	)
 	calligra_features_plan? (
+		$(add_frameworks_dep khtml)
 		$(add_qt_dep qtcore '' '' '5=')
 		dev-libs/kdiagram:5
 		dev-libs/kproperty:5
@@ -196,10 +197,17 @@ src_configure() {
 
 	local mycmakeargs=( -DPRODUCTSET="${myproducts[*]}" )
 
+	if [[ ${KDE_BUILD_TYPE} == release ]] ; then
+		mycmakeargs+=(
+			-DRELEASE_BUILD=ON
+			-DBUILD_UNMAINTAINED=${experimental}
+		)
+	fi
+
 	mycmakeargs+=(
 		-DPACKAGERS_BUILD=OFF
-		-DBUILD_UNMAINTAINED=${experimental}
 		-DWITH_Iconv=ON
+		$(cmake-utils_use_find_package activities KF5Activities)
 		-DWITH_Qca-qt5=$(usex crypt)
 		-DWITH_Eigen3=$(usex eigen)
 		-DWITH_Fontconfig=$(usex fontconfig)