1 |
commit: b008a506372b86224d781f66c2430aebc673d85b |
2 |
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> |
3 |
AuthorDate: Mon Dec 14 23:10:29 2015 +0000 |
4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Dec 14 23:54:31 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=b008a506 |
7 |
|
8 |
dev-util/kdevelop: Force handbook optional, block colliding kapptemplate |
9 |
|
10 |
Reason: /usr/share/kdevappwizard/templates/qmake_qt4guiapp.tar.bz2 |
11 |
|
12 |
dev-util/kdevelop/kdevelop-9999.ebuild | 4 +++- |
13 |
1 file changed, 3 insertions(+), 1 deletion(-) |
14 |
|
15 |
diff --git a/dev-util/kdevelop/kdevelop-9999.ebuild b/dev-util/kdevelop/kdevelop-9999.ebuild |
16 |
index 228c72e..1f91fee 100644 |
17 |
--- a/dev-util/kdevelop/kdevelop-9999.ebuild |
18 |
+++ b/dev-util/kdevelop/kdevelop-9999.ebuild |
19 |
@@ -4,6 +4,7 @@ |
20 |
|
21 |
EAPI=5 |
22 |
|
23 |
+KDE_HANDBOOK="forceoptional" |
24 |
VIRTUALX_REQUIRED="test" |
25 |
inherit kde5 |
26 |
|
27 |
@@ -31,13 +32,13 @@ DEPEND=" |
28 |
$(add_frameworks_dep kwidgetsaddons) |
29 |
$(add_frameworks_dep kxmlgui) |
30 |
$(add_frameworks_dep threadweaver) |
31 |
- dev-util/kdevplatform:5 |
32 |
dev-qt/qtdbus:5 |
33 |
dev-qt/qtgui:5 |
34 |
dev-qt/qtnetwork:5 |
35 |
dev-qt/qtscript:5 |
36 |
dev-qt/qtwebkit:5 |
37 |
dev-qt/qtwidgets:5 |
38 |
+ >=dev-util/kdevplatform-${PV}:5 |
39 |
cxx? ( clang? ( >=sys-devel/clang-3.5.0 ) ) |
40 |
plasma? ( |
41 |
$(add_frameworks_dep krunner) |
42 |
@@ -54,6 +55,7 @@ RDEPEND="${DEPEND} |
43 |
!dev-util/kdevelop:4 |
44 |
!dev-util/kdevelop-qmake |
45 |
!dev-util/kdevelop-qmljs |
46 |
+ !<kde-apps/kapptemplate-15.12.50 |
47 |
cxx? ( clang? ( !dev-util/kdevelop-clang ) ) |
48 |
" |