[gentoo-commits] proj/kde:master commit in: dev-util/kdevelop/

[Michael Palimaka]

commit:     b008a506372b86224d781f66c2430aebc673d85b
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Mon Dec 14 23:10:29 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Dec 14 23:54:31 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=b008a506

dev-util/kdevelop: Force handbook optional, block colliding kapptemplate

Reason: /usr/share/kdevappwizard/templates/qmake_qt4guiapp.tar.bz2

 dev-util/kdevelop/kdevelop-9999.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dev-util/kdevelop/kdevelop-9999.ebuild 
b/dev-util/kdevelop/kdevelop-9999.ebuild
index 228c72e..1f91fee 100644
--- a/dev-util/kdevelop/kdevelop-9999.ebuild
+++ b/dev-util/kdevelop/kdevelop-9999.ebuild
@@ -4,6 +4,7 @@
 
 EAPI=5
 
+KDE_HANDBOOK="forceoptional"
 VIRTUALX_REQUIRED="test"
 inherit kde5
 
@@ -31,13 +32,13 @@ DEPEND="
        $(add_frameworks_dep kwidgetsaddons)
        $(add_frameworks_dep kxmlgui)
        $(add_frameworks_dep threadweaver)
-       dev-util/kdevplatform:5
        dev-qt/qtdbus:5
        dev-qt/qtgui:5
        dev-qt/qtnetwork:5
        dev-qt/qtscript:5
        dev-qt/qtwebkit:5
        dev-qt/qtwidgets:5
+       >=dev-util/kdevplatform-${PV}:5
        cxx? ( clang? ( >=sys-devel/clang-3.5.0 ) )
        plasma? (
                $(add_frameworks_dep krunner)
@@ -54,6 +55,7 @@ RDEPEND="${DEPEND}
        !dev-util/kdevelop:4
        !dev-util/kdevelop-qmake
        !dev-util/kdevelop-qmljs
+       !<kde-apps/kapptemplate-15.12.50
        cxx? ( clang? ( !dev-util/kdevelop-clang ) )
 "