app-office/calligra: Fix patch new DEPENDs, add USE=gemini

Package-Manager: Portage-2.3.19, Repoman-2.3.6

4 files changed, 36 insertions, 45 deletions

diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index db53b6af33c..8c55ddf1844 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -18,11 +18,10 @@ LICENSE="GPL-2"
 KEYWORDS="~amd64 ~x86"
 
 CAL_FTS=( karbon plan sheets words )
-CAL_EXP_FTS=( braindump stage )
 
-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[@]})"
+IUSE="activities +crypt +fontconfig gemini gsl import-filter +lcms okular openexr +pdf
+	phonon pim spacenav +truetype X $(printf 'calligra_features_%s ' ${CAL_FTS[@]})
+	calligra_experimental_features_stage"
 
 # TODO: Not packaged: Cauchy (https://bitbucket.org/cyrille/cauchy)
 # Required for the matlab/octave formula tool
@@ -30,6 +29,9 @@ IUSE="activities +crypt +fontconfig gsl import-filter jpeg2k +lcms okular openex
 # Crashes plan (https://bugs.kde.org/show_bug.cgi?id=311940)
 # $(add_kdeapps_dep akonadi)
 # $(add_kdeapps_dep akonadi-contacts)
+# Currently upstream-disabled in plan
+# =dev-libs/kproperty-3.0*:5
+# =dev-libs/kreport-3.0*:5
 COMMON_DEPEND="
 	$(add_frameworks_dep karchive)
 	$(add_frameworks_dep kcmutils)
@@ -74,6 +76,7 @@ COMMON_DEPEND="
 	activities? ( $(add_frameworks_dep kactivities) )
 	crypt? ( app-crypt/qca:2[qt5] )
 	fontconfig? ( media-libs/fontconfig )
+	gemini? ( $(add_qt_dep qtdeclarative 'widgets') )
 	gsl? ( sci-libs/gsl )
 	import-filter? (
 		$(add_frameworks_dep khtml)
@@ -98,17 +101,14 @@ COMMON_DEPEND="
 		$(add_qt_dep qtx11extras)
 		x11-libs/libX11
 	)
-	calligra_experimental_features_braindump? ( $(add_qt_dep qtwebkit) )
 	calligra_experimental_features_stage? (
 		$(add_qt_dep qtwebkit)
 		okular? ( $(add_kdeapps_dep okular) )
 	)
-	calligra_features_karbon? ( jpeg2k? ( media-libs/openjpeg:= ) )
 	calligra_features_plan? (
 		$(add_frameworks_dep khtml)
+		$(add_kdeapps_dep kholidays)
 		dev-libs/kdiagram:5
-		=dev-libs/kproperty-3.0*:5
-		=dev-libs/kreport-3.0*:5
 		pim? (
 			$(add_kdeapps_dep kcalcore)
 			$(add_kdeapps_dep kcontacts)
@@ -125,7 +125,6 @@ DEPEND="${COMMON_DEPEND}
 	sys-devel/gettext
 	x11-misc/shared-mime-info
 	test? ( $(add_frameworks_dep threadweaver) )
-	vc? ( >=dev-libs/vc-1.1.0 )
 "
 RDEPEND="${COMMON_DEPEND}
 	calligra_features_karbon? ( media-gfx/pstoedit[plotutils] )
@@ -134,7 +133,7 @@ RDEPEND="${COMMON_DEPEND}
 "
 RESTRICT+=" test"
 
-PATCHES=( "${FILESDIR}/${PN}"-3.0.0-no-arch-detection.patch )
+PATCHES=( "${FILESDIR}/${PN}"-3.0.90-no-arch-detection.patch )
 
 pkg_pretend() {
 	check-reqs_pkg_pretend
@@ -157,8 +156,7 @@ src_prepare() {
 	punt_bogus_dep Qt5 Declarative
 	punt_bogus_dep Qt5 OpenGL
 
-	if ! use calligra_experimental_features_stage && \
-			! use calligra_experimental_features_braindump; then
+	if ! use calligra_experimental_features_stage; then
 		punt_bogus_dep Qt5 WebKitWidgets
 		punt_bogus_dep Qt5 WebKit
 	fi
@@ -176,7 +174,7 @@ src_prepare() {
 }
 
 src_configure() {
-	local cal_ft myproducts experimental=OFF
+	local cal_ft myproducts
 
 	# applications
 	for cal_ft in ${CAL_FTS[@]}; do
@@ -184,13 +182,10 @@ src_configure() {
 			myproducts+=( "${cal_ft^^}" )
 		fi
 	done
-	# experimental/unmaintained applications
-	for cal_ft in ${CAL_EXP_FTS[@]}; do
-		if use calligra_experimental_features_${cal_ft} ; then
-			experimental=ON
-			myproducts+=( "${cal_ft^^}" )
-		fi
-	done
+
+	[[ ${KDE_BUILD_TYPE} == release ]] && \
+		use calligra_experimental_features_stage && \
+			myproducts+=( CALLIGRA_FEATURES_STAGE )
 
 	use lcms && myproducts+=( PLUGIN_COLORENGINES )
 	use spacenav && myproducts+=( PLUGIN_SPACENAVIGATOR )
@@ -200,19 +195,18 @@ src_configure() {
 	if [[ ${KDE_BUILD_TYPE} == release ]] ; then
 		mycmakeargs+=(
 			-DRELEASE_BUILD=ON
-			-DBUILD_UNMAINTAINED=${experimental}
+			-DBUILD_UNMAINTAINED=$(usex calligra_experimental_features_stage)
 		)
 	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_Fontconfig=$(usex fontconfig)
+		$(cmake-utils_use_find_package gemini Libgit2)
+		$(cmake-utils_use_find_package gemini Qt5QuickWidgets)
 		-DWITH_GSL=$(usex gsl)
 		-DWITH_LibEtonyek=$(usex import-filter)
 		-DWITH_LibOdfGen=$(usex import-filter)
@@ -231,9 +225,6 @@ src_configure() {
 		-DWITH_Eigen3=$(usex calligra_features_sheets)
 		-ENABLE_CSTESTER_TESTING=$(usex test)
 		-DWITH_Freetype=$(usex truetype)
-		-DWITH_Vc=$(usex vc)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Libgit2=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_Libqgit2=ON
 	)
 
 	kde5_src_configure
diff --git a/app-office/calligra/files/calligra-3.0.0-no-arch-detection.patch b/app-office/calligra/files/calligra-3.0.0-no-arch-detection.patch
deleted file mode 100644
index 1c544e9277d..00000000000
--- a/app-office/calligra/files/calligra-3.0.0-no-arch-detection.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Avoid automagic CXXFLAG detection courtesy of dev-libs/vc.
-
-Gentoo-bug: 584118
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -617,10 +617,6 @@
-     endif()
-     endmacro()
- 
--    if (NOT PACKAGERS_BUILD)
--      # Optimize the whole Calligra for current architecture
--      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Vc_DEFINITIONS}")
--    endif ()
- endif()
- set(CMAKE_MODULE_PATH ${OLD_CMAKE_MODULE_PATH} )
- 
diff --git a/app-office/calligra/files/calligra-3.0.90-no-arch-detection.patch b/app-office/calligra/files/calligra-3.0.90-no-arch-detection.patch
new file mode 100644
index 00000000000..aa83ba1a301
--- /dev/null
+++ b/app-office/calligra/files/calligra-3.0.90-no-arch-detection.patch
@@ -0,0 +1,17 @@
+Avoid automagic CXXFLAG detection courtesy of dev-libs/vc.
+
+Gentoo-bug: 584118
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -617,10 +617,6 @@
+         endif()
+         endmacro()
+ 
+-        if (NOT PACKAGERS_BUILD)
+-        # Optimize the whole Calligra for current architecture
+-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Vc_DEFINITIONS}")
+-        endif ()
+     endif()
+     set(CMAKE_MODULE_PATH ${OLD_CMAKE_MODULE_PATH} )
+ 
diff --git a/app-office/calligra/metadata.xml b/app-office/calligra/metadata.xml
index 5558990fe60..d7ebffccf0a 100644
--- a/app-office/calligra/metadata.xml
+++ b/app-office/calligra/metadata.xml
@@ -11,12 +11,12 @@
 	</maintainer>
 	<use>
 		<flag name="activities">Enable kactivities support</flag>
+		<flag name="gemini">Enable tablet and 2:1 devices 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="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>
-		<flag name="vc">Build with <pkg>dev-libs/vc</pkg>, could be a significant speed boost</flag>
 	</use>
 </pkgmetadata>