summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dev-util/kdevelop/kdevelop-5.0.9999.ebuild7
-rw-r--r--dev-util/kdevelop/kdevelop-9999.ebuild2
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 ab71f8c572c..837a1a155c9 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 7f65e367bea..6fb0dd48882 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 ) )
"