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

["Michael Palimaka" <kensington@gentoo.org>]

commit:     557e32dbb088b2ecc890c077cc5a6a089fc2d29c
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat Aug  6 15:21:32 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Aug  7 16:30:45 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=557e32db

app-office/kexi: Add kcrash DEPEND, rename USE=webform->webkit

Fix configure with USE=-webkit at the same time.

Package-Manager: portage-2.2.28

 app-office/kexi/kexi-9999.ebuild | 20 +++++++++++++++++---
 app-office/kexi/metadata.xml     |  2 +-
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/app-office/kexi/kexi-9999.ebuild b/app-office/kexi/kexi-9999.ebuild
index 854f698..effa296 100644
--- a/app-office/kexi/kexi-9999.ebuild
+++ b/app-office/kexi/kexi-9999.ebuild
@@ -11,7 +11,7 @@ inherit kde5
 DESCRIPTION="Visual database applications creator"
 HOMEPAGE="https://www.kde.org/applications/office/kexi/ http://www.kexi-project.org/"
 KEYWORDS=""
-IUSE="activities marble mdb mysql postgres sqlite sybase webform xbase"
+IUSE="activities marble mdb mysql postgres sqlite sybase webkit xbase"
 
 COMMON_DEPEND="
 	$(add_frameworks_dep karchive)
@@ -20,6 +20,7 @@ COMMON_DEPEND="
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
 	$(add_frameworks_dep kguiaddons)
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kiconthemes)
@@ -47,7 +48,7 @@ COMMON_DEPEND="
 		dev-libs/libpqxx
 	)
 	sybase? ( dev-db/freetds )
-	webform? ( $(add_qt_dep qtwebkit) )
+	webkit? ( $(add_qt_dep qtwebkit) )
 	xbase? ( dev-db/xbase )
 "
 DEPEND="${COMMON_DEPEND}
@@ -57,6 +58,20 @@ RDEPEND="${COMMON_DEPEND}
 	!app-office/calligra:4[calligra_features_kexi]
 "
 
+src_prepare() {
+	if ! use webkit; then
+		punt_bogus_dep Qt5 WebKit
+		punt_bogus_dep Qt5 WebKitWidgets
+	fi
+
+	# otherwise requires breeze-icons w/ -DBINARY_ICONS_RESOURCE=ON
+	sed -i CMakeLists.txt \
+		-e "/include(CheckIfQtGuiCanBeExecuted)/ s/^/#DONT/" \
+		-e "/include(CheckGlobalBreezeIcons)/ s/^/#DONT/" || die
+
+	kde5_src_prepare
+}
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package activities KF5Activities)
@@ -65,7 +80,6 @@ src_configure() {
 		$(cmake-utils_use_find_package mysql MySQL)
 		$(cmake-utils_use_find_package postgres KexiPostgreSQL)
 		$(cmake-utils_use_find_package sybase FreeTDS)
-		$(cmake-utils_use_find_package webform Qt5WebKitWidgets)
 		$(cmake-utils_use_find_package xbase XBase)
 	)
 

diff --git a/app-office/kexi/metadata.xml b/app-office/kexi/metadata.xml
index 621a30d..05577d3 100644
--- a/app-office/kexi/metadata.xml
+++ b/app-office/kexi/metadata.xml
@@ -9,7 +9,7 @@
 		<flag name="activities">Enable kactivities support</flag>
 		<flag name="marble">Enable displaying of maps using <pkg>kde-apps/marble</pkg></flag>
 		<flag name="mdb">Enable support for Microsoft Access database</flag>
-		<flag name="webform">Enable web form designer widget using <pkg>dev-qt/qtwebkit</pkg></flag>
+		<flag name="webkit">Enable web form designer widget using <pkg>dev-qt/qtwebkit</pkg></flag>
 		<flag name="xbase">Enable support for xbase compatible database formats</flag>
 	</use>
 </pkgmetadata>