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

[Johannes Huber]

commit:     c5b405ae778b7872a01f9d489315b620e50995f7
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 23 23:58:30 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Fri Jan 23 23:58:30 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=c5b405ae

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

Package-Manager: portage-2.2.15

---
 kde-plasma/kio-extras/kio-extras-5.1.95.ebuild   | 1 +
 kde-plasma/kio-extras/kio-extras-5.2.0.ebuild    | 1 +
 kde-plasma/kio-extras/kio-extras-5.2.9999.ebuild | 1 +
 kde-plasma/kio-extras/kio-extras-9999.ebuild     | 1 +
 4 files changed, 4 insertions(+)

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 95522de..f7fbfa4 100644
--- a/kde-plasma/kio-extras/kio-extras-5.1.95.ebuild
+++ b/kde-plasma/kio-extras/kio-extras-5.1.95.ebuild
@@ -53,6 +53,7 @@ RDEPEND="${COMMON_DEPEND}
        !kde-base/kcontrol:4
        !kde-base/kdebase-kioslaves:4[-minimal(-)]
        !kde-base/kio-extras
+       !kde-misc/kio-mtp
 "
 DEPEND="${COMMON_DEPEND}
        x11-misc/shared-mime-info

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

diff --git a/kde-plasma/kio-extras/kio-extras-5.2.9999.ebuild 
b/kde-plasma/kio-extras/kio-extras-5.2.9999.ebuild
index e749fe1..eb13055 100644
--- a/kde-plasma/kio-extras/kio-extras-5.2.9999.ebuild
+++ b/kde-plasma/kio-extras/kio-extras-5.2.9999.ebuild
@@ -53,6 +53,7 @@ RDEPEND="${COMMON_DEPEND}
        !kde-base/kcontrol:4
        !kde-base/kdebase-kioslaves:4[-minimal(-)]
        !kde-base/kio-extras
+       !kde-misc/kio-mtp
 "
 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 e749fe1..eb13055 100644
--- a/kde-plasma/kio-extras/kio-extras-9999.ebuild
+++ b/kde-plasma/kio-extras/kio-extras-9999.ebuild
@@ -53,6 +53,7 @@ RDEPEND="${COMMON_DEPEND}
        !kde-base/kcontrol:4
        !kde-base/kdebase-kioslaves:4[-minimal(-)]
        !kde-base/kio-extras
+       !kde-misc/kio-mtp
 "
 DEPEND="${COMMON_DEPEND}
        x11-misc/shared-mime-info