Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: dev-util/kdevelop/
Date: Sun, 11 Oct 2015 06:54:39
Message-Id: 1444546457.8ad8bc046ff8dddb75bca10551ee9a4807d563cf.kensington@gentoo
1 commit: 8ad8bc046ff8dddb75bca10551ee9a4807d563cf
2 Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
3 AuthorDate: Sat Oct 10 20:19:46 2015 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Sun Oct 11 06:54:17 2015 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=8ad8bc04
7
8 dev-util/kdevelop: Add USE=clang, default on
9
10 kdevelop-clang was merged into kdevelop and is the default C++ backend upstream.
11 USE=cxx decides to build with C++ support
12 USE=clang sets preference of clang over 'legacy' C++ backend
13
14 Package-Manager: portage-2.2.23
15
16 dev-util/kdevelop/kdevelop-9999.ebuild | 6 +++++-
17 dev-util/kdevelop/metadata.xml | 1 +
18 2 files changed, 6 insertions(+), 1 deletion(-)
19
20 diff --git a/dev-util/kdevelop/kdevelop-9999.ebuild b/dev-util/kdevelop/kdevelop-9999.ebuild
21 index 88b4e6e..4a667ea 100644
22 --- a/dev-util/kdevelop/kdevelop-9999.ebuild
23 +++ b/dev-util/kdevelop/kdevelop-9999.ebuild
24 @@ -9,7 +9,7 @@ inherit kde5
25
26 DESCRIPTION="Integrated Development Environment for Unix, supporting KDE/Qt, C/C++ and many other languages"
27 LICENSE="GPL-2 LGPL-2"
28 -IUSE="+cmake +cxx debug +ninja +plasma +qmake qthelp"
29 +IUSE="+clang +cmake +cxx debug +ninja +plasma +qmake qthelp"
30 KEYWORDS=""
31
32 # TODO: disabled upstream
33 @@ -38,6 +38,7 @@ DEPEND="
34 dev-qt/qtscript:5
35 dev-qt/qtwebkit:5
36 dev-qt/qtwidgets:5
37 + cxx? ( clang? ( >=sys-devel/clang-3.5.0 ) )
38 plasma? (
39 $(add_frameworks_dep krunner)
40 $(add_frameworks_dep plasma)
41 @@ -53,6 +54,7 @@ RDEPEND="${DEPEND}
42 !dev-util/kdevelop:4
43 !dev-util/kdevelop-qmake
44 !dev-util/kdevelop-qmljs
45 + cxx? ( clang? ( !dev-util/kdevelop-clang ) )
46 "
47
48 RESTRICT="test"
49 @@ -62,9 +64,11 @@ PATCHES=( "${FILESDIR}/${PN}-ninja-optional.patch" )
50
51 src_configure() {
52 local mycmakeargs=(
53 + -DLEGACY_CPP_SUPPORT=$(usex !clang)
54 $(cmake-utils_use_build cmake)
55 $(cmake-utils_use_build cmake cmakebuilder)
56 $(cmake-utils_use_build ninja ninjabuilder)
57 + $(cmake-utils_use_build cxx clang)
58 $(cmake-utils_use_build cxx cpp)
59 $(cmake-utils_use_build qthelp)
60 $(cmake-utils_use_find_package plasma KF5Plasma)
61
62 diff --git a/dev-util/kdevelop/metadata.xml b/dev-util/kdevelop/metadata.xml
63 index c47e35a..ba7c624 100644
64 --- a/dev-util/kdevelop/metadata.xml
65 +++ b/dev-util/kdevelop/metadata.xml
66 @@ -3,6 +3,7 @@
67 <pkgmetadata>
68 <herd>kde</herd>
69 <use>
70 + <flag name="clang">Prefer <pkg>sys-devel/clang</pkg> C++ backend over legacy</flag>
71 <flag name="cmake">Enable support for CMake build system</flag>
72 <flag name="ninja">Enable support for Ninja build system</flag>
73 <flag name="qmake">Enable support for QMake build system</flag>