[gentoo-commits] proj/kde:master commit in: dev-util/kdevelop/

[Andreas Sturmlechner]

commit:     cf66ea4c5236097805d5afcf9df9c7a1caa52983
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  8 17:48:45 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Aug  8 18:11:33 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=cf66ea4c

dev-util/kdevelop: dev-util/kdevplatform was absorbed

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 dev-util/kdevelop/kdevelop-9999.ebuild | 42 ++++++++++++++++++++++++++++++++--
 dev-util/kdevelop/metadata.xml         |  3 +++
 2 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/dev-util/kdevelop/kdevelop-9999.ebuild b/dev-util/kdevelop/kdevelop-9999.ebuild
index 02d495b04f..a2e611bc0d 100644
--- a/dev-util/kdevelop/kdevelop-9999.ebuild
+++ b/dev-util/kdevelop/kdevelop-9999.ebuild
@@ -5,22 +5,29 @@ EAPI=6
 
 KDE_HANDBOOK="forceoptional"
 KDE_TEST="true"
+VIRTUALDBUS_TEST="true"
 VIRTUALX_REQUIRED="test"
 inherit kde5
 
 DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and much more"
 LICENSE="GPL-2 LGPL-2"
-IUSE="+gdbui okteta +plasma +qmake qthelp"
+IUSE="cvs +gdbui okteta +plasma +qmake qthelp reviewboard subversion webkit +welcomepage"
 [[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="~amd64 ~x86"
 
+REQUIRED_USE="test? ( welcomepage )"
+
 COMMON_DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kbookmarks)
 	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcodecs)
 	$(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 kguiaddons)
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kiconthemes)
 	$(add_frameworks_dep kio)
@@ -28,21 +35,26 @@ COMMON_DEPEND="
 	$(add_frameworks_dep kitemviews)
 	$(add_frameworks_dep kjobwidgets)
 	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
 	$(add_frameworks_dep knotifyconfig)
 	$(add_frameworks_dep kparts)
 	$(add_frameworks_dep kservice)
 	$(add_frameworks_dep ktexteditor)
+	$(add_frameworks_dep ktextwidgets)
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kwindowsystem)
 	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep sonnet)
 	$(add_frameworks_dep threadweaver)
+	$(add_kdeapps_dep libkomparediff2)
 	$(add_qt_dep qtdbus)
 	$(add_qt_dep qtdeclarative)
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qttest)
 	$(add_qt_dep qtwidgets)
 	$(add_qt_dep qtxml)
-	>=dev-util/kdevplatform-${PV}:5
+	dev-libs/grantlee:5
 	>=sys-devel/clang-3.5.0:*
 	x11-misc/shared-mime-info
 	gdbui? ( $(add_plasma_dep libksysguard) )
@@ -53,8 +65,18 @@ COMMON_DEPEND="
 	)
 	qmake? ( dev-util/kdevelop-pg-qt:5 )
 	qthelp? ( $(add_qt_dep qthelp) )
+	reviewboard? ( dev-libs/purpose )
+	subversion? (
+		dev-libs/apr:1
+		dev-libs/apr-util:1
+		dev-vcs/subversion
+	)
+	webkit? ( $(add_qt_dep qtwebkit) )
+	!webkit? ( $(add_qt_dep qtwebengine 'widgets') )
+	welcomepage? ( $(add_qt_dep qtdeclarative 'widgets') )
 "
 DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
 	$(add_qt_dep qtconcurrent)
 "
 RDEPEND="${COMMON_DEPEND}
@@ -62,11 +84,14 @@ RDEPEND="${COMMON_DEPEND}
 	$(add_kdeapps_dep kio-extras)
 	dev-util/ninja
 	>=sys-devel/gdb-7.0[python]
+	cvs? ( dev-vcs/cvs )
+	reviewboard? ( $(add_kdeapps_dep ktp-accounts-kcm) )
 	!dev-util/kdevelop:4
 	!dev-util/kdevelop-clang
 	!dev-util/kdevelop-cppcheck
 	!dev-util/kdevelop-qmake
 	!dev-util/kdevelop-qmljs
+	!dev-util/kdevplatform
 	!<kde-apps/kapptemplate-16.04.0
 "
 
@@ -75,13 +100,26 @@ RESTRICT+=" test"
 
 src_configure() {
 	local mycmakeargs=(
+		-DBUILD_cvs=$(usex cvs)
 		$(cmake-utils_use_find_package gdbui KF5SysGuard)
 		-DBUILD_executeplasmoid=$(usex plasma)
 		$(cmake-utils_use_find_package plasma KF5Plasma)
 		$(cmake-utils_use_find_package okteta OktetaKastenControllers)
 		$(cmake-utils_use_find_package qmake KDevelop-PG-Qt)
 		-DBUILD_qthelp=$(usex qthelp)
+		$(cmake-utils_use_find_package reviewboard KDEExperimentalPurpose)
+		$(cmake-utils_use_find_package subversion SubversionLibrary)
+		$(cmake-utils_use_find_package !webkit Qt5WebEngineWidgets)
+		$(cmake-utils_use_find_package welcomepage Qt5QuickWidgets)
 	)
 
 	kde5_src_configure
 }
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	if ! has_version "kde-apps/konsole" ; then
+		elog "For konsole view, please install kde-apps/konsole"
+	fi
+}

diff --git a/dev-util/kdevelop/metadata.xml b/dev-util/kdevelop/metadata.xml
index 1aa0399b05..6d10f19d58 100644
--- a/dev-util/kdevelop/metadata.xml
+++ b/dev-util/kdevelop/metadata.xml
@@ -10,5 +10,8 @@
 		<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>
+		<flag name="reviewboard">Enable reviewboard support</flag>
+		<flag name="webkit">Enable deprecated <pkg>dev-qt/qtwebkit</pkg> instead of <pkg>dev-qt/qtwebengine</pkg> for integrated documentation</flag>
+		<flag name="welcomepage">Enable welcome page, requires <pkg>dev-qt/qtdeclarative</pkg></flag>
 	</use>
 </pkgmetadata>