From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-879556-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	by finch.gentoo.org (Postfix) with ESMTP id 61764138222
	for <garchives@archives.gentoo.org>; Tue,  3 May 2016 08:18:32 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 04193E07FE;
	Tue,  3 May 2016 08:18:30 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 95EF8E07FE
	for <gentoo-commits@lists.gentoo.org>; Tue,  3 May 2016 08:18:29 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 58F56340845
	for <gentoo-commits@lists.gentoo.org>; Tue,  3 May 2016 08:18:28 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id A941615F
	for <gentoo-commits@lists.gentoo.org>; Tue,  3 May 2016 08:18:25 +0000 (UTC)
From: "Johannes Huber" <johu@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Johannes Huber" <johu@gentoo.org>
Message-ID: <1462263443.5057416b4657c988a4def75279816c453df5d957.johu@gentoo>
Subject: [gentoo-commits] proj/kde:master commit in: dev-util/kdevelop/
X-VCS-Repository: proj/kde
X-VCS-Files: dev-util/kdevelop/kdevelop-5.0.9999.ebuild dev-util/kdevelop/kdevelop-9999.ebuild
X-VCS-Directories: dev-util/kdevelop/
X-VCS-Committer: johu
X-VCS-Committer-Name: Johannes Huber
X-VCS-Revision: 5057416b4657c988a4def75279816c453df5d957
X-VCS-Branch: master
Date: Tue,  3 May 2016 08:18:25 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: c94ddbf6-5074-494e-812c-90bdfa639896
X-Archives-Hash: b323a030effa5bf00addef91cb5ac282

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 ) )
 "