summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Huber <johu@gentoo.org>2015-01-17 18:20:53 +0100
committerJohannes Huber <johu@gentoo.org>2015-01-17 18:20:53 +0100
commit866997a0069033880290c2cc7e2e1ad4b192d12d (patch)
tree8300247fe11d25b529e65f4d659119080cda7971
parent0845c75db1ce926ef7e07af47f9b05099e09baa3 (diff)
downloadkde-866997a0069033880290c2cc7e2e1ad4b192d12d.tar.gz
kde-866997a0069033880290c2cc7e2e1ad4b192d12d.tar.bz2
kde-866997a0069033880290c2cc7e2e1ad4b192d12d.zip
[kde-plasma/kio-extras] Fix file collisions with kde-base/kio-extras
Package-Manager: portage-2.2.15
-rw-r--r--kde-plasma/kio-extras/kio-extras-5.1.2.ebuild1
-rw-r--r--kde-plasma/kio-extras/kio-extras-5.1.95.ebuild1
-rw-r--r--kde-plasma/kio-extras/kio-extras-9999.ebuild1
3 files changed, 3 insertions, 0 deletions
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 8af2af31c07..95522de9120 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 8af2af31c07..95522de9120 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 04ccedc0583..e749fe18a65 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