diff options
| author | Michael Palimaka <kensington@gentoo.org> | 2016-04-06 23:49:30 +1000 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2016-04-06 23:49:30 +1000 |
| commit | c750571d1c9505aae42d555685ef65fa6618e3d2 (patch) | |
| tree | 0e887e714baf04dcf26fe86fa66d08fa820db844 | |
| parent | 53f015197ecc257be6c0a26c4dd711e128845ce7 (diff) | |
| download | kde-c750571d1c9505aae42d555685ef65fa6618e3d2.tar.gz kde-c750571d1c9505aae42d555685ef65fa6618e3d2.tar.bz2 kde-c750571d1c9505aae42d555685ef65fa6618e3d2.zip | |
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
| -rw-r--r-- | kde-frameworks/krunner/krunner-5.21.0.ebuild | 6 | ||||
| -rw-r--r-- | 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 c8bf7ccbdda..6ba3c5dfa13 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 1dcb20d9e9b..a9cef5622d7 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 +" |