1 |
commit: d5e16e90c83bdafb4ffa72a749887b1a99ce349a |
2 |
Author: Chris Reffett <creffett <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Dec 27 15:20:37 2013 +0000 |
4 |
Commit: Chris Reffett <creffett <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Dec 27 15:20:37 2013 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=d5e16e90 |
7 |
|
8 |
[dev-util/kdevelop] Bump to 4.6.0 |
9 |
|
10 |
Package-Manager: portage-2.2.7 |
11 |
|
12 |
--- |
13 |
...kdevelop-4.5.2-kdevplatform-without-qjson.patch | 32 +++++++++++++ |
14 |
dev-util/kdevelop/kdevelop-4.6.0.ebuild | 52 ++++++++++++++++++++++ |
15 |
dev-util/kdevelop/metadata.xml | 1 + |
16 |
3 files changed, 85 insertions(+) |
17 |
|
18 |
diff --git a/dev-util/kdevelop/files/kdevelop-4.5.2-kdevplatform-without-qjson.patch b/dev-util/kdevelop/files/kdevelop-4.5.2-kdevplatform-without-qjson.patch |
19 |
new file mode 100644 |
20 |
index 0000000..b456236 |
21 |
--- /dev/null |
22 |
+++ b/dev-util/kdevelop/files/kdevelop-4.5.2-kdevplatform-without-qjson.patch |
23 |
@@ -0,0 +1,32 @@ |
24 |
+commit fb4234cd72ceebb200bef13234ea9c36c9a62046 |
25 |
+Author: Kevin Funk <kevin@×××××.org> |
26 |
+Date: Sun Nov 3 22:09:56 2013 +0100 |
27 |
+ |
28 |
+ Check if kdevplatform has JSON support |
29 |
+ |
30 |
+ BUG: 327095 |
31 |
+ |
32 |
+diff --git a/languages/cpp/tests/CMakeLists.txt b/languages/cpp/tests/CMakeLists.txt |
33 |
+index 84ce3ee..fbdd4db 100644 |
34 |
+--- a/languages/cpp/tests/CMakeLists.txt |
35 |
++++ b/languages/cpp/tests/CMakeLists.txt |
36 |
+@@ -55,7 +55,9 @@ target_link_libraries(buddiestest |
37 |
+ ########### next target ############### |
38 |
+ |
39 |
+ find_package(QJSON) |
40 |
+-if(QJSON_FOUND) |
41 |
++# Also check that kdevplatform is built with JSON support |
42 |
++# see: https://bugs.kde.org/show_bug.cgi?id=327095 |
43 |
++if(QJSON_FOUND AND KDEVPLATFORM_JSONTESTS_LIBRARIES) |
44 |
+ set(cppfilestest_SRCS test_cppfiles.cpp) |
45 |
+ kde4_add_unit_test(cppfilestest ${cppfilestest_SRCS}) |
46 |
+ configure_file("testfilepaths.h.cmake" "testfilepaths.h" ESCAPE_QUOTES) |
47 |
+@@ -67,7 +69,7 @@ if(QJSON_FOUND) |
48 |
+ ${KDEVPLATFORM_JSONTESTS_LIBRARIES} |
49 |
+ kdev4cppduchain |
50 |
+ ) |
51 |
+-endif(QJSON_FOUND) |
52 |
++endif() |
53 |
+ |
54 |
+ ########### next target ############### |
55 |
+ |
56 |
|
57 |
diff --git a/dev-util/kdevelop/kdevelop-4.6.0.ebuild b/dev-util/kdevelop/kdevelop-4.6.0.ebuild |
58 |
new file mode 100644 |
59 |
index 0000000..1841d14 |
60 |
--- /dev/null |
61 |
+++ b/dev-util/kdevelop/kdevelop-4.6.0.ebuild |
62 |
@@ -0,0 +1,52 @@ |
63 |
+# Copyright 1999-2013 Gentoo Foundation |
64 |
+# Distributed under the terms of the GNU General Public License v2 |
65 |
+# $Header: $ |
66 |
+ |
67 |
+EAPI=5 |
68 |
+ |
69 |
+KDE_LINGUAS="bs ca ca@valencia da de el en_GB es et fi fr gl hu it kk nb nds nl |
70 |
+pl pt pt_BR ru sk sl sv th tr uk zh_CN zh_TW" |
71 |
+VIRTUALX_REQUIRED=test |
72 |
+inherit kde4-base |
73 |
+ |
74 |
+DESCRIPTION="Integrated Development Environment for Unix, supporting KDE/Qt, C/C++ and many other languages." |
75 |
+LICENSE="GPL-2 LGPL-2" |
76 |
+IUSE="+cmake +cxx debug okteta qthelp reviewboard" |
77 |
+SRC_URI="mirror://kde/stable/kdevelop/${KDEVELOP_VERSION}/src/${P}.tar.xz" |
78 |
+ |
79 |
+if [[ $PV == *9999* ]]; then |
80 |
+ KEYWORDS="" |
81 |
+else |
82 |
+ KEYWORDS="~amd64 ~ppc ~x86" |
83 |
+fi |
84 |
+ |
85 |
+DEPEND=" |
86 |
+ >=dev-util/kdevplatform-${KDEVPLATFORM_VERSION}[reviewboard?] |
87 |
+ $(add_kdebase_dep ksysguard) |
88 |
+ $(add_kdebase_dep libkworkspace) |
89 |
+ okteta? ( $(add_kdebase_dep okteta) ) |
90 |
+ qthelp? ( dev-qt/qthelp:4 ) |
91 |
+ reviewboard? ( dev-libs/qjson ) |
92 |
+" |
93 |
+RDEPEND="${DEPEND} |
94 |
+ $(add_kdebase_dep kapptemplate) |
95 |
+ dev-qt/qtdeclarative:4[webkit] |
96 |
+ cxx? ( >=sys-devel/gdb-7.0[python] ) |
97 |
+" |
98 |
+RESTRICT="test" |
99 |
+# see bug 366471 |
100 |
+ |
101 |
+src_configure() { |
102 |
+ mycmakeargs=( |
103 |
+ $(cmake-utils_use_build cmake) |
104 |
+ $(cmake-utils_use_build cmake cmakebuilder) |
105 |
+ $(cmake-utils_use_build cxx cpp) |
106 |
+ $(cmake-utils_use_with okteta LibKasten) |
107 |
+ $(cmake-utils_use_with okteta LibOkteta) |
108 |
+ $(cmake-utils_use_with okteta LibOktetaKasten) |
109 |
+ $(cmake-utils_use_build qthelp) |
110 |
+ $(cmake-utils_use_find_package reviewboard QJSON) |
111 |
+ ) |
112 |
+ |
113 |
+ kde4-base_src_configure |
114 |
+} |
115 |
|
116 |
diff --git a/dev-util/kdevelop/metadata.xml b/dev-util/kdevelop/metadata.xml |
117 |
index d2b28f6..2316b9a 100644 |
118 |
--- a/dev-util/kdevelop/metadata.xml |
119 |
+++ b/dev-util/kdevelop/metadata.xml |
120 |
@@ -6,5 +6,6 @@ |
121 |
<flag name="cmake">Enable support for CMake build system</flag> |
122 |
<flag name="okteta">Enable hex editor plugin</flag> |
123 |
<flag name="qthelp">Enable support for QtHelp documentation browsing</flag> |
124 |
+ <flag name="reviewboard">Enable reviewboard support</flag> |
125 |
</use> |
126 |
</pkgmetadata> |