dev-util/kdevelop: Version bump to 5.0.0

Drop USE=cxx

Package-Manager: portage-2.2.28

5 files changed, 149 insertions, 12 deletions

diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
index 6ca08dd31a..5f47f8f238 100644
--- a/dev-util/kdevelop/Manifest
+++ b/dev-util/kdevelop/Manifest
@@ -1 +1,2 @@
 DIST kdevelop-4.90.91.tar.xz 4903332 SHA256 eb807fc6425ff5454c2e4c93a46b80394cf38055770aade50593dce22731d749 SHA512 3ee5fac3b9cb75946bdbc0c38492a181cb0cb20a51e4a36f691ef2559f872955412f6c517f75025368bd0fd2bd1cb15545382d97752aceb64e3ed6664b44c4c3 WHIRLPOOL 940b691961bf52fd6820a09b1b8d5d89123ccb392e62d405933795a27b9a9b9f6aece05a4c45c4363ad531e1263bb38957f070e684f8aebbfd5a54f1353ccded
+DIST kdevelop-5.0.tar.xz 4969604 SHA256 5e034b8670f4ba13ccb2948c28efa0b54df346e85b648078698cca8974ea811c SHA512 dc16785593ed11dcd6ff96a0fddd4f639abbcaaa3c139d703a1af267c8e0f75c45b866b9542c10c79eb4351e811edcc5e466a5ce7acbdecac60f4c28747e66b6 WHIRLPOOL e0e3f66b79b302d30fc006714a3d10b01bdd8d098e87aa3dc5f4e5556ce2214d9d5b1bee9fc189a12fab71e590134bdb9fc4e683c0c0263f7fbee899f7470f8d
diff --git a/dev-util/kdevelop/files/kdevelop-5.0.0-fix-cpp.patch b/dev-util/kdevelop/files/kdevelop-5.0.0-fix-cpp.patch
new file mode 100644
index 0000000000..9b15fe9548
--- /dev/null
+++ b/dev-util/kdevelop/files/kdevelop-5.0.0-fix-cpp.patch
@@ -0,0 +1,47 @@
+From: Milian Wolff <mail@milianw.de>
+Date: Mon, 22 Aug 2016 10:47:26 +0000
+Subject: Fix compile
+X-Git-Url: http://quickgit.kde.org/?p=kdevelop.git&a=commitdiff&h=f4b5b7538be64328cf8462ee438caaac6c0907aa
+---
+Fix compile
+
+BUG: 367659
+---
+
+
+--- a/languages/cpp/cppduchain/cppducontext.cpp
++++ b/languages/cpp/cppduchain/cppducontext.cpp
+@@ -39,7 +39,8 @@
+ REGISTER_DUCHAIN_ITEM_WITH_DATA(CppNormalDUContext, DUContextData);
+ 
+ template<>
+-QWidget* CppDUContext<TopDUContext>::createNavigationWidget( Declaration* decl, TopDUContext* topContext, const QString& htmlPrefix, const QString& htmlSuffix ) const {
++QWidget* CppDUContext<TopDUContext>::createNavigationWidget(Declaration* decl, TopDUContext* topContext, const QString& htmlPrefix, const QString& htmlSuffix,
++                                                            AbstractNavigationWidget::DisplayHints /*hints*/) const {
+   if( decl == 0 ) {
+     Path path( url().str() );
+     IncludeItem i;
+@@ -55,7 +56,8 @@
+ }
+ 
+ template<>
+-QWidget* CppDUContext<DUContext>::createNavigationWidget(Declaration* decl, TopDUContext* topContext, const QString& htmlPrefix, const QString& htmlSuffix) const {
++QWidget* CppDUContext<DUContext>::createNavigationWidget(Declaration* decl, TopDUContext* topContext, const QString& htmlPrefix, const QString& htmlSuffix,
++                                                         AbstractNavigationWidget::DisplayHints /*hints*/) const {
+   if( decl == 0 ) {
+     if( owner() )
+       return new NavigationWidget( DeclarationPointer(owner()), TopDUContextPointer(topContext ? topContext : this->topContext()), htmlPrefix, htmlSuffix );
+
+--- a/languages/cpp/cppduchain/cppducontext.h
++++ b/languages/cpp/cppduchain/cppducontext.h
+@@ -652,7 +652,8 @@
+       return instantiateDeclarationAndContext( surroundingContext, source, this, info, 0, 0 );
+     }
+ 
+-    virtual QWidget* createNavigationWidget(Declaration* decl, TopDUContext* topContext, const QString& htmlPrefix, const QString& htmlSuffix) const override;
++    virtual QWidget* createNavigationWidget(Declaration* decl, TopDUContext* topContext, const QString& htmlPrefix, const QString& htmlSuffix,
++                                            KDevelop::AbstractNavigationWidget::DisplayHints hints = KDevelop::AbstractNavigationWidget::NoHints) const override;
+ 
+     enum {
+       Identity = BaseContext::Identity + 50
+
diff --git a/dev-util/kdevelop/kdevelop-5.0.0.ebuild b/dev-util/kdevelop/kdevelop-5.0.0.ebuild
new file mode 100644
index 0000000000..bcafd59b67
--- /dev/null
+++ b/dev-util/kdevelop/kdevelop-5.0.0.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+EGIT_BRANCH="5.0"
+KDE_HANDBOOK="forceoptional"
+KDE_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="+clang +cmake +gdbui +ninja okteta +plasma +qmake qthelp"
+[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="~amd64 ~x86"
+
+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)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwebkit)
+	$(add_qt_dep qtwidgets)
+	>=dev-util/kdevplatform-${PV}:5
+	x11-misc/shared-mime-info
+	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)
+	)
+	qmake? ( dev-util/kdevelop-pg-qt:5 )
+	qthelp? ( $(add_qt_dep qthelp) )
+"
+RDEPEND="${DEPEND}
+	$(add_kdeapps_dep kapptemplate)
+	$(add_kdeapps_dep kio-extras)
+	>=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
+"
+
+RESTRICT+=" test"
+# see bug 366471
+
+PATCHES=(
+	"${FILESDIR}/${PN}-ninja-optional.patch"
+	"${FILESDIR}/${P}-fix-cpp.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DLEGACY_CPP_SUPPORT=$(usex !clang)
+		-DBUILD_cmake=$(usex cmake)
+		-DBUILD_cmakebuilder=$(usex cmake)
+		$(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)
+	)
+
+	kde5_src_configure
+}
diff --git a/dev-util/kdevelop/kdevelop-5.0.9999.ebuild b/dev-util/kdevelop/kdevelop-5.0.9999.ebuild
index 19a2cd70c5..b22e6e3238 100644
--- a/dev-util/kdevelop/kdevelop-5.0.9999.ebuild
+++ b/dev-util/kdevelop/kdevelop-5.0.9999.ebuild
@@ -12,8 +12,8 @@ inherit kde5
 
 DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and much more"
 LICENSE="GPL-2 LGPL-2"
-IUSE="+clang +cmake +cxx +gdbui +ninja okteta +plasma +qmake qthelp"
-KEYWORDS=""
+IUSE="+clang +cmake +gdbui +ninja okteta +plasma +qmake qthelp"
+[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="~amd64 ~x86"
 
 DEPEND="
 	$(add_frameworks_dep kcmutils)
@@ -45,7 +45,7 @@ DEPEND="
 	$(add_qt_dep qtwidgets)
 	>=dev-util/kdevplatform-${PV}:5
 	x11-misc/shared-mime-info
-	cxx? ( clang? ( >=sys-devel/clang-3.5.0 ) )
+	clang? ( >=sys-devel/clang-3.5.0 )
 	gdbui? ( $(add_plasma_dep ksysguard) )
 	okteta? ( $(add_kdeapps_dep okteta) )
 	plasma? (
@@ -58,7 +58,7 @@ DEPEND="
 RDEPEND="${DEPEND}
 	$(add_kdeapps_dep kapptemplate)
 	$(add_kdeapps_dep kio-extras)
-	cxx? ( >=sys-devel/gdb-7.0[python] )
+	>=sys-devel/gdb-7.0[python]
 	ninja? ( dev-util/ninja )
 	!dev-util/kdevelop:4
 	!dev-util/kdevelop-clang
@@ -77,8 +77,6 @@ src_configure() {
 		-DLEGACY_CPP_SUPPORT=$(usex !clang)
 		-DBUILD_cmake=$(usex cmake)
 		-DBUILD_cmakebuilder=$(usex cmake)
-		-DBUILD_clang=$(usex cxx)
-		-DBUILD_cpp=$(usex cxx)
 		$(cmake-utils_use_find_package gdbui KF5SysGuard)
 		-DBUILD_executeplasmoid=$(usex plasma)
 		$(cmake-utils_use_find_package plasma KF5Plasma)
diff --git a/dev-util/kdevelop/kdevelop-9999.ebuild b/dev-util/kdevelop/kdevelop-9999.ebuild
index b01f1adfeb..1e171d71b5 100644
--- a/dev-util/kdevelop/kdevelop-9999.ebuild
+++ b/dev-util/kdevelop/kdevelop-9999.ebuild
@@ -11,8 +11,8 @@ inherit kde5
 
 DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and much more"
 LICENSE="GPL-2 LGPL-2"
-IUSE="+clang +cmake +cxx +gdbui +ninja okteta +plasma +qmake qthelp"
-KEYWORDS=""
+IUSE="+clang +cmake +gdbui +ninja okteta +plasma +qmake qthelp"
+[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="~amd64 ~x86"
 
 DEPEND="
 	$(add_frameworks_dep kcmutils)
@@ -44,7 +44,7 @@ DEPEND="
 	$(add_qt_dep qtwidgets)
 	>=dev-util/kdevplatform-${PV}:5
 	x11-misc/shared-mime-info
-	cxx? ( clang? ( >=sys-devel/clang-3.5.0 ) )
+	clang? ( >=sys-devel/clang-3.5.0 )
 	gdbui? ( $(add_plasma_dep ksysguard) )
 	okteta? ( $(add_kdeapps_dep okteta) )
 	plasma? (
@@ -57,7 +57,7 @@ DEPEND="
 RDEPEND="${DEPEND}
 	$(add_kdeapps_dep kapptemplate)
 	$(add_kdeapps_dep kio-extras)
-	cxx? ( >=sys-devel/gdb-7.0[python] )
+	>=sys-devel/gdb-7.0[python]
 	ninja? ( dev-util/ninja )
 	!dev-util/kdevelop:4
 	!dev-util/kdevelop-clang
@@ -76,8 +76,6 @@ src_configure() {
 		-DLEGACY_CPP_SUPPORT=$(usex !clang)
 		-DBUILD_cmake=$(usex cmake)
 		-DBUILD_cmakebuilder=$(usex cmake)
-		-DBUILD_clang=$(usex cxx)
-		-DBUILD_cpp=$(usex cxx)
 		$(cmake-utils_use_find_package gdbui KF5SysGuard)
 		-DBUILD_executeplasmoid=$(usex plasma)
 		$(cmake-utils_use_find_package plasma KF5Plasma)