[gentoo-commits] proj/kde:master commit in: kde-apps/kate/

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

commit:     9db4453edcbe1ba5e84f46f9b88b4472d8e5e954
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 22 14:01:08 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Aug 22 14:14:28 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=9db4453e

kde-apps/kate: Replace USE addons with more fine-grained options

Add USE: activities, filebrowser, lspclient, plasma, projects, snippets, sql
Update DESCRIPTION.

Package-Manager: Portage-2.3.72, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-apps/kate/kate-19.08.49.9999.ebuild |  7 ++++---
 kde-apps/kate/kate-9999.ebuild          | 30 ++++++++++++++++++++----------
 kde-apps/kate/metadata.xml              |  7 +++++++
 3 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/kde-apps/kate/kate-19.08.49.9999.ebuild b/kde-apps/kate/kate-19.08.49.9999.ebuild
index 1e6a9e0f89..45800a68fa 100644
--- a/kde-apps/kate/kate-19.08.49.9999.ebuild
+++ b/kde-apps/kate/kate-19.08.49.9999.ebuild
@@ -8,13 +8,12 @@ KDE_TEST="true"
 VIRTUALX_REQUIRED="test"
 inherit kde5
 
-DESCRIPTION="Kate is an advanced text editor"
+DESCRIPTION="Multi-document editor with network transparency, Plasma integration and more"
 HOMEPAGE="https://kde.org/applications/utilities/kate https://kate-editor.org/"
 KEYWORDS=""
-IUSE="+addons"
+IUSE="activities +addons"
 
 DEPEND="
-	$(add_frameworks_dep kactivities)
 	$(add_frameworks_dep kcodecs)
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
@@ -40,6 +39,7 @@ DEPEND="
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
 	$(add_qt_dep qtxml)
+	activities? ( $(add_frameworks_dep kactivities) )
 	addons? (
 		$(add_frameworks_dep kbookmarks)
 		$(add_frameworks_dep knewstuff)
@@ -65,6 +65,7 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
+		$(cmake-utils_use_find_package activities KF5Activities)
 		-DBUILD_addons=$(usex addons)
 		-DBUILD_kwrite=FALSE
 	)

diff --git a/kde-apps/kate/kate-9999.ebuild b/kde-apps/kate/kate-9999.ebuild
index 1e6a9e0f89..2ec3dd1e90 100644
--- a/kde-apps/kate/kate-9999.ebuild
+++ b/kde-apps/kate/kate-9999.ebuild
@@ -8,13 +8,13 @@ KDE_TEST="true"
 VIRTUALX_REQUIRED="test"
 inherit kde5
 
-DESCRIPTION="Kate is an advanced text editor"
+DESCRIPTION="Multi-document editor with network transparency, Plasma integration and more"
 HOMEPAGE="https://kde.org/applications/utilities/kate https://kate-editor.org/"
+
 KEYWORDS=""
-IUSE="+addons"
+IUSE="activities +filebrowser lspclient +projects plasma +snippets sql"
 
 DEPEND="
-	$(add_frameworks_dep kactivities)
 	$(add_frameworks_dep kcodecs)
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
@@ -26,7 +26,6 @@ DEPEND="
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kiconthemes)
 	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
 	$(add_frameworks_dep kitemviews)
 	$(add_frameworks_dep kjobwidgets)
 	$(add_frameworks_dep kparts)
@@ -40,12 +39,17 @@ DEPEND="
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
 	$(add_qt_dep qtxml)
-	addons? (
-		$(add_frameworks_dep kbookmarks)
+	activities? ( $(add_frameworks_dep kactivities) )
+	filebrowser? ( $(add_frameworks_dep kbookmarks) )
+	lspclient? ( $(add_frameworks_dep kitemmodels) )
+	plasma? ( $(add_frameworks_dep plasma) )
+	projects? (
 		$(add_frameworks_dep knewstuff)
-		$(add_frameworks_dep kwallet)
-		$(add_frameworks_dep plasma)
 		$(add_frameworks_dep threadweaver)
+	)
+	snippets? ( $(add_frameworks_dep knewstuff) )
+	sql? (
+		$(add_frameworks_dep kwallet)
 		$(add_qt_dep qtsql)
 	)
 "
@@ -65,7 +69,13 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		-DBUILD_addons=$(usex addons)
+		$(cmake-utils_use_find_package activities KF5Activities)
+		-DBUILD_filebrowser=$(usex filebrowser)
+		-DBUILD_lspclient=$(usex lspclient)
+		-DBUILD_sessionapplet=$(usex plasma)
+		-DBUILD_project=$(usex projects)
+		-DBUILD_snippets=$(usex snippets)
+		-DBUILD_katesql=$(usex sql)
 		-DBUILD_kwrite=FALSE
 	)
 
@@ -84,7 +94,7 @@ src_test() {
 pkg_postinst() {
 	kde5_pkg_postinst
 
-	if [[ -z "${REPLACING_VERSIONS}" ]] && use addons; then
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
 		elog "The functionality of ktexteditorpreview plugin can be extended with:"
 		elog "  kde-misc/kmarkdownwebview"
 		elog "  media-gfx/kgraphviewer"

diff --git a/kde-apps/kate/metadata.xml b/kde-apps/kate/metadata.xml
index 83921a6e4e..0a6b46015b 100644
--- a/kde-apps/kate/metadata.xml
+++ b/kde-apps/kate/metadata.xml
@@ -6,6 +6,13 @@
 		<name>Gentoo KDE Project</name>
 	</maintainer>
 	<use>
+		<flag name="activities">Enable Plasma Activities support via <pkg>kde-frameworks/kactivities</pkg></flag>
 		<flag name="addons">Build and install additional plugins</flag>
+		<flag name="filebrowser">Enable File System browser tool view</flag>
+		<flag name="lspclient">Enable LSP (Language Server Protocol) client plugin</flag>
+		<flag name="plasma">Enable Session Applet addon for KDE Plasma</flag>
+		<flag name="projects">Enable Project plugin for executing queries on SQL DBs</flag>
+		<flag name="snippets">Enable Snippets Tool View plugin to manage or download code snippets</flag>
+		<flag name="sql">Enable SQL plugin for executing queries on SQL DBs</flag>
 	</use>
 </pkgmetadata>