[gentoo-commits] proj/kde:master commit in: kde-frameworks/krunner/

[Michael Palimaka]

commit:     c750571d1c9505aae42d555685ef65fa6618e3d2
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Apr  6 13:49:30 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Apr  6 13:49:30 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=c750571d

kde-frameworks/krunner: solve file collision with kde-apps/kapptemplate

* kde-apps/kapptemplate-15.12.2:5::kde
*      /usr/share/kdevappwizard/templates/runner.tar.bz2

This file was imported from kapptemplate.

Upstream-commit: 3aed2212ccc417b9c15fc91ea0dabb482cd85c32

Package-Manager: portage-2.2.28

 kde-frameworks/krunner/krunner-5.21.0.ebuild | 6 ++++--
 kde-frameworks/krunner/krunner-9999.ebuild   | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/kde-frameworks/krunner/krunner-5.21.0.ebuild 
b/kde-frameworks/krunner/krunner-5.21.0.ebuild
index c8bf7cc..6ba3c5d 100644
--- a/kde-frameworks/krunner/krunner-5.21.0.ebuild
+++ b/kde-frameworks/krunner/krunner-5.21.0.ebuild
@@ -12,7 +12,7 @@ LICENSE="LGPL-2+"
 KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""
 
-RDEPEND="
+DEPEND="
        $(add_frameworks_dep kconfig)
        $(add_frameworks_dep kcoreaddons)
        $(add_frameworks_dep ki18n)
@@ -25,4 +25,6 @@ RDEPEND="
        $(add_qt_dep qtgui)
        $(add_qt_dep qtwidgets)
 "
-DEPEND="${RDEPEND}"
+RDEPEND="${DEPEND}
+       !<kde-apps/kapptemplate-16.03.90
+"

diff --git a/kde-frameworks/krunner/krunner-9999.ebuild 
b/kde-frameworks/krunner/krunner-9999.ebuild
index 1dcb20d..a9cef56 100644
--- a/kde-frameworks/krunner/krunner-9999.ebuild
+++ b/kde-frameworks/krunner/krunner-9999.ebuild
@@ -12,7 +12,7 @@ LICENSE="LGPL-2+"
 KEYWORDS=""
 IUSE=""
 
-RDEPEND="
+DEPEND="
        $(add_frameworks_dep kconfig)
        $(add_frameworks_dep kcoreaddons)
        $(add_frameworks_dep ki18n)
@@ -25,4 +25,6 @@ RDEPEND="
        $(add_qt_dep qtgui)
        $(add_qt_dep qtwidgets)
 "
-DEPEND="${RDEPEND}"
+RDEPEND="${DEPEND}
+       !<kde-apps/kapptemplate-16.03.90
+"