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

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

commit:     cc278ee6bf2616ecc6efd0950df7c442fcf29fb9
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Thu Aug 11 13:04:01 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Oct 21 19:39:50 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=cc278ee6

app-office/kexi: RDEPEND on breeze-icons-rcc, drop unused build options

Package-Manager: portage-2.3.0

 app-office/kexi/kexi-9999.ebuild | 19 ++++++++-----------
 app-office/kexi/metadata.xml     |  2 --
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/app-office/kexi/kexi-9999.ebuild b/app-office/kexi/kexi-9999.ebuild
index 4aef736..74f56b3 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 webkit xbase"
+IUSE="marble mdb mysql postgres sqlite webkit"
 
 COMMON_DEPEND="
 	$(add_frameworks_dep karchive)
@@ -39,7 +39,6 @@ COMMON_DEPEND="
 	dev-db/kdb[mysql?,postgres?,sqlite?]
 	dev-libs/kproperty
 	dev-libs/kreport
-	activities? ( $(add_frameworks_dep kactivities) )
 	marble? ( $(add_kdeapps_dep marble) )
 	mdb? ( dev-libs/glib:2 )
 	mysql? ( virtual/libmysqlclient )
@@ -47,14 +46,16 @@ COMMON_DEPEND="
 		dev-db/postgresql:*
 		dev-libs/libpqxx
 	)
-	sybase? ( dev-db/freetds )
 	webkit? ( $(add_qt_dep qtwebkit) )
-	xbase? ( dev-db/xbase )
 "
+# Not yet ported:
+# 	sybase? ( dev-db/freetds )
+# 	xbase? ( dev-db/xbase )
 DEPEND="${COMMON_DEPEND}
 	sys-devel/gettext
 "
 RDEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep breeze-icons-rcc)
 	!app-office/calligra:4[calligra_features_kexi]
 	!app-office/calligra-l10n:4[calligra_features_kexi(+)]
 "
@@ -65,11 +66,6 @@ src_prepare() {
 		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
 }
 
@@ -80,9 +76,10 @@ src_configure() {
 		$(cmake-utils_use_find_package mdb GLIB2)
 		$(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 xbase XBase)
 	)
+	# Not yet ported:
+# 	$(cmake-utils_use_find_package sybase FreeTDS)
+# 	$(cmake-utils_use_find_package xbase XBase)
 
 	kde5_src_configure
 }

diff --git a/app-office/kexi/metadata.xml b/app-office/kexi/metadata.xml
index 05577d3..a7106e6 100644
--- a/app-office/kexi/metadata.xml
+++ b/app-office/kexi/metadata.xml
@@ -6,10 +6,8 @@
 		<name>Gentoo KDE Project</name>
 	</maintainer>
 	<use>
-		<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="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>