1 |
commit: 216353527b8831158893a5ff0e46f6d89c10632b |
2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Aug 31 14:28:28 2016 +0000 |
4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Aug 31 14:30:07 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=21635352 |
7 |
|
8 |
dev-util/kdevelop: rename clang USE flag to cxx |
9 |
|
10 |
The legacy CPP plugin no longer builds. |
11 |
|
12 |
Package-Manager: portage-2.3.0 |
13 |
|
14 |
dev-util/kdevelop/kdevelop-5.0.0.ebuild | 7 ++++--- |
15 |
dev-util/kdevelop/kdevelop-5.0.9999.ebuild | 7 ++++--- |
16 |
dev-util/kdevelop/kdevelop-9999.ebuild | 7 ++++--- |
17 |
dev-util/kdevelop/metadata.xml | 1 - |
18 |
4 files changed, 12 insertions(+), 10 deletions(-) |
19 |
|
20 |
diff --git a/dev-util/kdevelop/kdevelop-5.0.0.ebuild b/dev-util/kdevelop/kdevelop-5.0.0.ebuild |
21 |
index 2d06c48..c533824 100644 |
22 |
--- a/dev-util/kdevelop/kdevelop-5.0.0.ebuild |
23 |
+++ b/dev-util/kdevelop/kdevelop-5.0.0.ebuild |
24 |
@@ -12,7 +12,7 @@ inherit kde5 |
25 |
|
26 |
DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and much more" |
27 |
LICENSE="GPL-2 LGPL-2" |
28 |
-IUSE="+clang +cmake +gdbui +ninja okteta +plasma +qmake qthelp" |
29 |
+IUSE="+cxx +cmake +gdbui +ninja okteta +plasma +qmake qthelp" |
30 |
[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="~amd64 ~x86" |
31 |
|
32 |
COMMON_DEPEND=" |
33 |
@@ -47,7 +47,7 @@ COMMON_DEPEND=" |
34 |
$(add_qt_dep qtxml) |
35 |
>=dev-util/kdevplatform-${PV}:5 |
36 |
x11-misc/shared-mime-info |
37 |
- clang? ( >=sys-devel/clang-3.5.0 ) |
38 |
+ cxx? ( >=sys-devel/clang-3.5.0 ) |
39 |
gdbui? ( $(add_plasma_dep libksysguard) ) |
40 |
okteta? ( $(add_kdeapps_dep okteta) ) |
41 |
plasma? ( |
42 |
@@ -82,7 +82,8 @@ PATCHES=( |
43 |
|
44 |
src_configure() { |
45 |
local mycmakeargs=( |
46 |
- -DLEGACY_CPP_SUPPORT=$(usex !clang) |
47 |
+ -DLEGACY_CPP_SUPPORT=$(usex !cxx) |
48 |
+ -DBUILD_cpp=OFF |
49 |
-DBUILD_cmake=$(usex cmake) |
50 |
-DBUILD_cmakebuilder=$(usex cmake) |
51 |
$(cmake-utils_use_find_package gdbui KF5SysGuard) |
52 |
|
53 |
diff --git a/dev-util/kdevelop/kdevelop-5.0.9999.ebuild b/dev-util/kdevelop/kdevelop-5.0.9999.ebuild |
54 |
index 008027e..f72922d 100644 |
55 |
--- a/dev-util/kdevelop/kdevelop-5.0.9999.ebuild |
56 |
+++ b/dev-util/kdevelop/kdevelop-5.0.9999.ebuild |
57 |
@@ -12,7 +12,7 @@ inherit kde5 |
58 |
|
59 |
DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and much more" |
60 |
LICENSE="GPL-2 LGPL-2" |
61 |
-IUSE="+clang +cmake +gdbui +ninja okteta +plasma +qmake qthelp" |
62 |
+IUSE="+cxx +cmake +gdbui +ninja okteta +plasma +qmake qthelp" |
63 |
[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="~amd64 ~x86" |
64 |
|
65 |
COMMON_DEPEND=" |
66 |
@@ -47,7 +47,7 @@ COMMON_DEPEND=" |
67 |
$(add_qt_dep qtxml) |
68 |
>=dev-util/kdevplatform-${PV}:5 |
69 |
x11-misc/shared-mime-info |
70 |
- clang? ( >=sys-devel/clang-3.5.0 ) |
71 |
+ cxx? ( >=sys-devel/clang-3.5.0 ) |
72 |
gdbui? ( $(add_plasma_dep libksysguard) ) |
73 |
okteta? ( $(add_kdeapps_dep okteta) ) |
74 |
plasma? ( |
75 |
@@ -79,7 +79,8 @@ PATCHES=( "${FILESDIR}/${PN}-ninja-optional.patch" ) |
76 |
|
77 |
src_configure() { |
78 |
local mycmakeargs=( |
79 |
- -DLEGACY_CPP_SUPPORT=$(usex !clang) |
80 |
+ -DLEGACY_CPP_SUPPORT=$(usex !cxx) |
81 |
+ -DBUILD_cpp=OFF |
82 |
-DBUILD_cmake=$(usex cmake) |
83 |
-DBUILD_cmakebuilder=$(usex cmake) |
84 |
$(cmake-utils_use_find_package gdbui KF5SysGuard) |
85 |
|
86 |
diff --git a/dev-util/kdevelop/kdevelop-9999.ebuild b/dev-util/kdevelop/kdevelop-9999.ebuild |
87 |
index 5838535..d94430d 100644 |
88 |
--- a/dev-util/kdevelop/kdevelop-9999.ebuild |
89 |
+++ b/dev-util/kdevelop/kdevelop-9999.ebuild |
90 |
@@ -11,7 +11,7 @@ inherit kde5 |
91 |
|
92 |
DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and much more" |
93 |
LICENSE="GPL-2 LGPL-2" |
94 |
-IUSE="+clang +cmake +gdbui +ninja okteta +plasma +qmake qthelp" |
95 |
+IUSE="+cxx +cmake +gdbui +ninja okteta +plasma +qmake qthelp" |
96 |
[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="~amd64 ~x86" |
97 |
|
98 |
COMMON_DEPEND=" |
99 |
@@ -46,7 +46,7 @@ COMMON_DEPEND=" |
100 |
$(add_qt_dep qtxml) |
101 |
>=dev-util/kdevplatform-${PV}:5 |
102 |
x11-misc/shared-mime-info |
103 |
- clang? ( >=sys-devel/clang-3.5.0 ) |
104 |
+ cxx? ( >=sys-devel/clang-3.5.0 ) |
105 |
gdbui? ( $(add_plasma_dep libksysguard) ) |
106 |
okteta? ( $(add_kdeapps_dep okteta) ) |
107 |
plasma? ( |
108 |
@@ -78,7 +78,8 @@ PATCHES=( "${FILESDIR}/${PN}-ninja-optional.patch" ) |
109 |
|
110 |
src_configure() { |
111 |
local mycmakeargs=( |
112 |
- -DLEGACY_CPP_SUPPORT=$(usex !clang) |
113 |
+ -DLEGACY_CPP_SUPPORT=$(usex !cxx) |
114 |
+ -DBUILD_cpp=OFF |
115 |
-DBUILD_cmake=$(usex cmake) |
116 |
-DBUILD_cmakebuilder=$(usex cmake) |
117 |
$(cmake-utils_use_find_package gdbui KF5SysGuard) |
118 |
|
119 |
diff --git a/dev-util/kdevelop/metadata.xml b/dev-util/kdevelop/metadata.xml |
120 |
index b1a1a86..461c3ff 100644 |
121 |
--- a/dev-util/kdevelop/metadata.xml |
122 |
+++ b/dev-util/kdevelop/metadata.xml |
123 |
@@ -6,7 +6,6 @@ |
124 |
<name>Gentoo KDE Project</name> |
125 |
</maintainer> |
126 |
<use> |
127 |
- <flag name="clang">Prefer <pkg>sys-devel/clang</pkg> C++ backend over legacy</flag> |
128 |
<flag name="cmake">Enable support for CMake build system</flag> |
129 |
<flag name="gdbui">Enable GUI for attaching GDB to a running process</flag> |
130 |
<flag name="ninja">Enable support for Ninja build system</flag> |