From 216353527b8831158893a5ff0e46f6d89c10632b Mon Sep 17 00:00:00 2001
From: Michael Palimaka <kensington@gentoo.org>
Date: Thu, 1 Sep 2016 00:28:28 +1000
Subject: dev-util/kdevelop: rename clang USE flag to cxx

The legacy CPP plugin no longer builds.

Package-Manager: portage-2.3.0
---
 dev-util/kdevelop/kdevelop-5.0.0.ebuild    | 7 ++++---
 dev-util/kdevelop/kdevelop-5.0.9999.ebuild | 7 ++++---
 dev-util/kdevelop/kdevelop-9999.ebuild     | 7 ++++---
 dev-util/kdevelop/metadata.xml             | 1 -
 4 files changed, 12 insertions(+), 10 deletions(-)

(limited to 'dev-util')

diff --git a/dev-util/kdevelop/kdevelop-5.0.0.ebuild b/dev-util/kdevelop/kdevelop-5.0.0.ebuild
index 2d06c48329f..c5338246cab 100644
--- a/dev-util/kdevelop/kdevelop-5.0.0.ebuild
+++ b/dev-util/kdevelop/kdevelop-5.0.0.ebuild
@@ -12,7 +12,7 @@ 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"
+IUSE="+cxx +cmake +gdbui +ninja okteta +plasma +qmake qthelp"
 [[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="~amd64 ~x86"
 
 COMMON_DEPEND="
@@ -47,7 +47,7 @@ COMMON_DEPEND="
 	$(add_qt_dep qtxml)
 	>=dev-util/kdevplatform-${PV}:5
 	x11-misc/shared-mime-info
-	clang? ( >=sys-devel/clang-3.5.0 )
+	cxx? ( >=sys-devel/clang-3.5.0 )
 	gdbui? ( $(add_plasma_dep libksysguard) )
 	okteta? ( $(add_kdeapps_dep okteta) )
 	plasma? (
@@ -82,7 +82,8 @@ PATCHES=(
 
 src_configure() {
 	local mycmakeargs=(
-		-DLEGACY_CPP_SUPPORT=$(usex !clang)
+		-DLEGACY_CPP_SUPPORT=$(usex !cxx)
+		-DBUILD_cpp=OFF
 		-DBUILD_cmake=$(usex cmake)
 		-DBUILD_cmakebuilder=$(usex cmake)
 		$(cmake-utils_use_find_package gdbui KF5SysGuard)
diff --git a/dev-util/kdevelop/kdevelop-5.0.9999.ebuild b/dev-util/kdevelop/kdevelop-5.0.9999.ebuild
index 008027e877b..f72922d0a7c 100644
--- a/dev-util/kdevelop/kdevelop-5.0.9999.ebuild
+++ b/dev-util/kdevelop/kdevelop-5.0.9999.ebuild
@@ -12,7 +12,7 @@ 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"
+IUSE="+cxx +cmake +gdbui +ninja okteta +plasma +qmake qthelp"
 [[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="~amd64 ~x86"
 
 COMMON_DEPEND="
@@ -47,7 +47,7 @@ COMMON_DEPEND="
 	$(add_qt_dep qtxml)
 	>=dev-util/kdevplatform-${PV}:5
 	x11-misc/shared-mime-info
-	clang? ( >=sys-devel/clang-3.5.0 )
+	cxx? ( >=sys-devel/clang-3.5.0 )
 	gdbui? ( $(add_plasma_dep libksysguard) )
 	okteta? ( $(add_kdeapps_dep okteta) )
 	plasma? (
@@ -79,7 +79,8 @@ PATCHES=( "${FILESDIR}/${PN}-ninja-optional.patch" )
 
 src_configure() {
 	local mycmakeargs=(
-		-DLEGACY_CPP_SUPPORT=$(usex !clang)
+		-DLEGACY_CPP_SUPPORT=$(usex !cxx)
+		-DBUILD_cpp=OFF
 		-DBUILD_cmake=$(usex cmake)
 		-DBUILD_cmakebuilder=$(usex cmake)
 		$(cmake-utils_use_find_package gdbui KF5SysGuard)
diff --git a/dev-util/kdevelop/kdevelop-9999.ebuild b/dev-util/kdevelop/kdevelop-9999.ebuild
index 5838535b978..d94430d7057 100644
--- a/dev-util/kdevelop/kdevelop-9999.ebuild
+++ b/dev-util/kdevelop/kdevelop-9999.ebuild
@@ -11,7 +11,7 @@ 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"
+IUSE="+cxx +cmake +gdbui +ninja okteta +plasma +qmake qthelp"
 [[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="~amd64 ~x86"
 
 COMMON_DEPEND="
@@ -46,7 +46,7 @@ COMMON_DEPEND="
 	$(add_qt_dep qtxml)
 	>=dev-util/kdevplatform-${PV}:5
 	x11-misc/shared-mime-info
-	clang? ( >=sys-devel/clang-3.5.0 )
+	cxx? ( >=sys-devel/clang-3.5.0 )
 	gdbui? ( $(add_plasma_dep libksysguard) )
 	okteta? ( $(add_kdeapps_dep okteta) )
 	plasma? (
@@ -78,7 +78,8 @@ PATCHES=( "${FILESDIR}/${PN}-ninja-optional.patch" )
 
 src_configure() {
 	local mycmakeargs=(
-		-DLEGACY_CPP_SUPPORT=$(usex !clang)
+		-DLEGACY_CPP_SUPPORT=$(usex !cxx)
+		-DBUILD_cpp=OFF
 		-DBUILD_cmake=$(usex cmake)
 		-DBUILD_cmakebuilder=$(usex cmake)
 		$(cmake-utils_use_find_package gdbui KF5SysGuard)
diff --git a/dev-util/kdevelop/metadata.xml b/dev-util/kdevelop/metadata.xml
index b1a1a86d70e..461c3ffd031 100644
--- a/dev-util/kdevelop/metadata.xml
+++ b/dev-util/kdevelop/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Gentoo KDE Project</name>
 	</maintainer>
 	<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>
-- 
cgit v1.2.3