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

[Johannes Huber]

commit:     866997a0069033880290c2cc7e2e1ad4b192d12d
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 17 17:20:53 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Jan 17 17:20:53 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=866997a0

[kde-plasma/kio-extras] Fix file collisions with kde-base/kio-extras

Package-Manager: portage-2.2.15

---
 kde-plasma/kio-extras/kio-extras-5.1.2.ebuild  | 1 +
 kde-plasma/kio-extras/kio-extras-5.1.95.ebuild | 1 +
 kde-plasma/kio-extras/kio-extras-9999.ebuild   | 1 +
 3 files changed, 3 insertions(+)

diff --git a/kde-plasma/kio-extras/kio-extras-5.1.2.ebuild 
b/kde-plasma/kio-extras/kio-extras-5.1.2.ebuild
index 8af2af3..95522de 100644
--- a/kde-plasma/kio-extras/kio-extras-5.1.2.ebuild
+++ b/kde-plasma/kio-extras/kio-extras-5.1.2.ebuild
@@ -52,6 +52,7 @@ RDEPEND="${COMMON_DEPEND}
        !kde-apps/kdebase-kioslaves:4[-minimal(-)]
        !kde-base/kcontrol:4
        !kde-base/kdebase-kioslaves:4[-minimal(-)]
+       !kde-base/kio-extras
 "
 DEPEND="${COMMON_DEPEND}
        x11-misc/shared-mime-info

diff --git a/kde-plasma/kio-extras/kio-extras-5.1.95.ebuild 
b/kde-plasma/kio-extras/kio-extras-5.1.95.ebuild
index 8af2af3..95522de 100644
--- a/kde-plasma/kio-extras/kio-extras-5.1.95.ebuild
+++ b/kde-plasma/kio-extras/kio-extras-5.1.95.ebuild
@@ -52,6 +52,7 @@ RDEPEND="${COMMON_DEPEND}
        !kde-apps/kdebase-kioslaves:4[-minimal(-)]
        !kde-base/kcontrol:4
        !kde-base/kdebase-kioslaves:4[-minimal(-)]
+       !kde-base/kio-extras
 "
 DEPEND="${COMMON_DEPEND}
        x11-misc/shared-mime-info

diff --git a/kde-plasma/kio-extras/kio-extras-9999.ebuild 
b/kde-plasma/kio-extras/kio-extras-9999.ebuild
index 04ccedc..e749fe1 100644
--- a/kde-plasma/kio-extras/kio-extras-9999.ebuild
+++ b/kde-plasma/kio-extras/kio-extras-9999.ebuild
@@ -52,6 +52,7 @@ RDEPEND="${COMMON_DEPEND}
        !kde-apps/kdebase-kioslaves:4[-minimal(-)]
        !kde-base/kcontrol:4
        !kde-base/kdebase-kioslaves:4[-minimal(-)]
+       !kde-base/kio-extras
 "
 DEPEND="${COMMON_DEPEND}
        x11-misc/shared-mime-info