[gentoo-commits] proj/kde:master commit in: kde-plasma/khelpcenter/

[Johannes Huber]

commit:     1ae21b818cd182c7f875be091185fac3b8611512
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 17 17:24:14 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Jan 17 17:24:14 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=1ae21b81

[kde-plasma/khelpcenter] Fix file collisions with kde-base/khelpcenter

Package-Manager: portage-2.2.15

---
 kde-plasma/khelpcenter/khelpcenter-5.1.2.ebuild  | 5 +++--
 kde-plasma/khelpcenter/khelpcenter-5.1.95.ebuild | 5 +++--
 kde-plasma/khelpcenter/khelpcenter-9999.ebuild   | 5 +++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/kde-plasma/khelpcenter/khelpcenter-5.1.2.ebuild 
b/kde-plasma/khelpcenter/khelpcenter-5.1.2.ebuild
index 758697e..f1ec958 100644
--- a/kde-plasma/khelpcenter/khelpcenter-5.1.2.ebuild
+++ b/kde-plasma/khelpcenter/khelpcenter-5.1.2.ebuild
@@ -35,9 +35,10 @@ DEPEND="
        dev-qt/qtgui:5
        dev-qt/qtwidgets:5
        dev-qt/qtxml:5
-       !kde-base/khelpcenter:4
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+       !kde-base/khelpcenter
+"
 
 src_install() {
        kde5_src_install

diff --git a/kde-plasma/khelpcenter/khelpcenter-5.1.95.ebuild 
b/kde-plasma/khelpcenter/khelpcenter-5.1.95.ebuild
index 66fb97d..ac9e0ea 100644
--- a/kde-plasma/khelpcenter/khelpcenter-5.1.95.ebuild
+++ b/kde-plasma/khelpcenter/khelpcenter-5.1.95.ebuild
@@ -35,6 +35,7 @@ DEPEND="
        dev-qt/qtgui:5
        dev-qt/qtwidgets:5
        dev-qt/qtxml:5
-       !kde-base/khelpcenter:4
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+       !kde-base/khelpcenter
+"

diff --git a/kde-plasma/khelpcenter/khelpcenter-9999.ebuild 
b/kde-plasma/khelpcenter/khelpcenter-9999.ebuild
index 71f1f52..a8c9333 100644
--- a/kde-plasma/khelpcenter/khelpcenter-9999.ebuild
+++ b/kde-plasma/khelpcenter/khelpcenter-9999.ebuild
@@ -35,6 +35,7 @@ DEPEND="
        dev-qt/qtgui:5
        dev-qt/qtwidgets:5
        dev-qt/qtxml:5
-       !kde-base/khelpcenter:4
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+       !kde-base/khelpcenter
+"