From bf2314b101c1065be873c086131211246119b301 Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
Date: Mon, 16 May 2016 22:04:07 +0200
Subject: dev-util/kdevelop: Fix dependencies, add USE=gdbui,okteta

Package-Manager: portage-2.2.28
---
 dev-util/kdevelop/kdevelop-5.0.9999.ebuild | 21 ++++++++++++++++-----
 dev-util/kdevelop/kdevelop-9999.ebuild     | 21 ++++++++++++++++-----
 dev-util/kdevelop/metadata.xml             |  2 ++
 3 files changed, 34 insertions(+), 10 deletions(-)

(limited to 'dev-util/kdevelop')

diff --git a/dev-util/kdevelop/kdevelop-5.0.9999.ebuild b/dev-util/kdevelop/kdevelop-5.0.9999.ebuild
index 75a10146f13..7f88965a8f6 100644
--- a/dev-util/kdevelop/kdevelop-5.0.9999.ebuild
+++ b/dev-util/kdevelop/kdevelop-5.0.9999.ebuild
@@ -6,31 +6,36 @@ EAPI=6
 
 EGIT_BRANCH="5.0"
 KDE_HANDBOOK="forceoptional"
+KDE_TEST="true"
 VIRTUALX_REQUIRED="test"
 inherit kde5
 
 DESCRIPTION="Integrated Development Environment, supporting KDE/Qt, C/C++ and much more"
 LICENSE="GPL-2 LGPL-2"
-IUSE="+clang +cmake +cxx debug +ninja +plasma +qmake qthelp"
+IUSE="+clang +cmake +cxx +gdbui +ninja okteta +plasma +qmake qthelp"
 KEYWORDS=""
 
-# TODO: disabled upstream
-# okteta? ( $(add_kdeapps_dep okteta) )
 DEPEND="
+	$(add_frameworks_dep kcmutils)
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
 	$(add_frameworks_dep kdeclarative)
 	$(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 knewstuff)
+	$(add_frameworks_dep knotifyconfig)
 	$(add_frameworks_dep kparts)
 	$(add_frameworks_dep kservice)
 	$(add_frameworks_dep ktexteditor)
 	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
 	$(add_frameworks_dep kxmlgui)
 	$(add_frameworks_dep threadweaver)
 	$(add_qt_dep qtdbus)
@@ -40,7 +45,10 @@ DEPEND="
 	$(add_qt_dep qtwebkit)
 	$(add_qt_dep qtwidgets)
 	>=dev-util/kdevplatform-${PV}:5
+	x11-misc/shared-mime-info
 	cxx? ( clang? ( >=sys-devel/clang-3.5.0 ) )
+	gdbui? ( $(add_plasma_dep ksysguard) )
+	okteta? ( $(add_kdeapps_dep okteta) )
 	plasma? (
 		$(add_frameworks_dep krunner)
 		$(add_frameworks_dep plasma)
@@ -54,10 +62,10 @@ RDEPEND="${DEPEND}
 	cxx? ( >=sys-devel/gdb-7.0[python] )
 	ninja? ( dev-util/ninja )
 	!dev-util/kdevelop:4
+	!dev-util/kdevelop-clang
 	!dev-util/kdevelop-qmake
 	!dev-util/kdevelop-qmljs
 	!<kde-apps/kapptemplate-16.04.0
-	cxx? ( clang? ( !dev-util/kdevelop-clang ) )
 "
 
 RESTRICT+=" test"
@@ -72,8 +80,11 @@ src_configure() {
 		-DBUILD_cmakebuilder=$(usex cmake)
 		-DBUILD_clang=$(usex cxx)
 		-DBUILD_cpp=$(usex cxx)
-		-DBUILD_ninjabuilder=$(usex ninja)
+		$(cmake-utils_use_find_package gdbui KF5SysGuard)
+		-DBUILD_executeplasmoid=$(usex plasma)
 		$(cmake-utils_use_find_package plasma KF5Plasma)
+		-DBUILD_ninjabuilder=$(usex ninja)
+		$(cmake-utils_use_find_package okteta OktetaKastenControllers)
 		$(cmake-utils_use_find_package qmake KDevelop-PG-Qt)
 		-DBUILD_qthelp=$(usex qthelp)
 	)
diff --git a/dev-util/kdevelop/kdevelop-9999.ebuild b/dev-util/kdevelop/kdevelop-9999.ebuild
index e3507fcb2d5..69f9b4ad7a3 100644
--- a/dev-util/kdevelop/kdevelop-9999.ebuild
+++ b/dev-util/kdevelop/kdevelop-9999.ebuild
@@ -5,31 +5,36 @@
 EAPI=6
 
 KDE_HANDBOOK="forceoptional"
+KDE_TEST="true"
 VIRTUALX_REQUIRED="test"
 inherit kde5
 
 DESCRIPTION="Integrated Development Environment, supporting KDE/Qt, C/C++ and much more"
 LICENSE="GPL-2 LGPL-2"
-IUSE="+clang +cmake +cxx debug +ninja +plasma +qmake qthelp"
+IUSE="+clang +cmake +cxx +gdbui +ninja okteta +plasma +qmake qthelp"
 KEYWORDS=""
 
-# TODO: disabled upstream
-# okteta? ( $(add_kdeapps_dep okteta) )
 DEPEND="
+	$(add_frameworks_dep kcmutils)
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
 	$(add_frameworks_dep kdeclarative)
 	$(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 knewstuff)
+	$(add_frameworks_dep knotifyconfig)
 	$(add_frameworks_dep kparts)
 	$(add_frameworks_dep kservice)
 	$(add_frameworks_dep ktexteditor)
 	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
 	$(add_frameworks_dep kxmlgui)
 	$(add_frameworks_dep threadweaver)
 	$(add_qt_dep qtdbus)
@@ -39,7 +44,10 @@ DEPEND="
 	$(add_qt_dep qtwebkit)
 	$(add_qt_dep qtwidgets)
 	>=dev-util/kdevplatform-${PV}:5
+	x11-misc/shared-mime-info
 	cxx? ( clang? ( >=sys-devel/clang-3.5.0 ) )
+	gdbui? ( $(add_plasma_dep ksysguard) )
+	okteta? ( $(add_kdeapps_dep okteta) )
 	plasma? (
 		$(add_frameworks_dep krunner)
 		$(add_frameworks_dep plasma)
@@ -53,10 +61,10 @@ RDEPEND="${DEPEND}
 	cxx? ( >=sys-devel/gdb-7.0[python] )
 	ninja? ( dev-util/ninja )
 	!dev-util/kdevelop:4
+	!dev-util/kdevelop-clang
 	!dev-util/kdevelop-qmake
 	!dev-util/kdevelop-qmljs
 	!<kde-apps/kapptemplate-16.04.0
-	cxx? ( clang? ( !dev-util/kdevelop-clang ) )
 "
 
 RESTRICT+=" test"
@@ -71,8 +79,11 @@ src_configure() {
 		-DBUILD_cmakebuilder=$(usex cmake)
 		-DBUILD_clang=$(usex cxx)
 		-DBUILD_cpp=$(usex cxx)
-		-DBUILD_ninjabuilder=$(usex ninja)
+		$(cmake-utils_use_find_package gdbui KF5SysGuard)
+		-DBUILD_executeplasmoid=$(usex plasma)
 		$(cmake-utils_use_find_package plasma KF5Plasma)
+		-DBUILD_ninjabuilder=$(usex ninja)
+		$(cmake-utils_use_find_package okteta OktetaKastenControllers)
 		$(cmake-utils_use_find_package qmake KDevelop-PG-Qt)
 		-DBUILD_qthelp=$(usex qthelp)
 	)
diff --git a/dev-util/kdevelop/metadata.xml b/dev-util/kdevelop/metadata.xml
index 3b9a2b19b40..b1a1a86d70e 100644
--- a/dev-util/kdevelop/metadata.xml
+++ b/dev-util/kdevelop/metadata.xml
@@ -8,7 +8,9 @@
 	<use>
 		<flag name="clang">Prefer <pkg>sys-devel/clang</pkg> C++ backend over legacy</flag>
 		<flag name="cmake">Enable support for CMake build system</flag>
+		<flag name="gdbui">Enable GUI for attaching GDB to a running process</flag>
 		<flag name="ninja">Enable support for Ninja build system</flag>
+		<flag name="okteta">Enable hex editor plugin via <pkg>kde-apps/okteta</pkg></flag>
 		<flag name="qmake">Enable support for QMake build system</flag>
 		<flag name="qthelp">Enable support for QtHelp documentation browsing</flag>
 	</use>
-- 
cgit v1.2.3