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

[Johannes Huber]

commit:     5057416b4657c988a4def75279816c453df5d957
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Tue May  3 08:17:23 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Tue May  3 08:17:23 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=5057416b

dev-util/kdevelop: Fix file collision

Raise blocker on kde-apps/kapptemplate.

Gentoo-bug: 579808

Package-Manager: portage-2.2.28

 dev-util/kdevelop/kdevelop-5.0.9999.ebuild | 7 +------
 dev-util/kdevelop/kdevelop-9999.ebuild     | 2 +-
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/dev-util/kdevelop/kdevelop-5.0.9999.ebuild b/dev-util/kdevelop/kdevelop-5.0.9999.ebuild
index ab71f8c..837a1a1 100644
--- a/dev-util/kdevelop/kdevelop-5.0.9999.ebuild
+++ b/dev-util/kdevelop/kdevelop-5.0.9999.ebuild
@@ -56,6 +56,7 @@ RDEPEND="${DEPEND}
 	!dev-util/kdevelop:4
 	!dev-util/kdevelop-qmake
 	!dev-util/kdevelop-qmljs
+	!<kde-apps/kapptemplate-16.04.0
 	cxx? ( clang? ( !dev-util/kdevelop-clang ) )
 "
 
@@ -79,9 +80,3 @@ src_configure() {
 
 	kde5_src_configure
 }
-
-src_install() {
-	kde5_src_install
-	# fix file collision with <kde-apps/kapptemplate-15.12.50
-	rm "${ED}"usr/share/kdevappwizard/templates/qmake_qt4guiapp.tar.bz2 || die
-}

diff --git a/dev-util/kdevelop/kdevelop-9999.ebuild b/dev-util/kdevelop/kdevelop-9999.ebuild
index 7f65e36..6fb0dd4 100644
--- a/dev-util/kdevelop/kdevelop-9999.ebuild
+++ b/dev-util/kdevelop/kdevelop-9999.ebuild
@@ -55,7 +55,7 @@ RDEPEND="${DEPEND}
 	!dev-util/kdevelop:4
 	!dev-util/kdevelop-qmake
 	!dev-util/kdevelop-qmljs
-	!<kde-apps/kapptemplate-15.12.50
+	!<kde-apps/kapptemplate-16.04.0
 	cxx? ( clang? ( !dev-util/kdevelop-clang ) )
 "