summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Huber <johu@gentoo.org>2016-04-26 07:37:00 +0200
committerJohannes Huber <johu@gentoo.org>2016-04-26 07:37:00 +0200
commit112bba7d49bd74ac92582361ed5747e404435d94 (patch)
treeb0c577f721c2740de0c8d464da8f865acfcd2c7b
parent62a5e67b708df1d2929916e7f7d045e312b56a39 (diff)
downloadkde-112bba7d49bd74ac92582361ed5747e404435d94.tar.gz
kde-112bba7d49bd74ac92582361ed5747e404435d94.tar.bz2
kde-112bba7d49bd74ac92582361ed5747e404435d94.zip
kde-apps/kio-extras: Fix file collision
File collision fixed in newer kde-frameworks/kactivities version. Gentoo-bug: 581202 Package-Manager: portage-2.2.28
-rw-r--r--kde-apps/kio-extras/kio-extras-16.04.0.ebuild1
-rw-r--r--kde-apps/kio-extras/kio-extras-16.04.49.9999.ebuild1
-rw-r--r--kde-apps/kio-extras/kio-extras-9999.ebuild1
3 files changed, 3 insertions, 0 deletions
diff --git a/kde-apps/kio-extras/kio-extras-16.04.0.ebuild b/kde-apps/kio-extras/kio-extras-16.04.0.ebuild
index 68900f896d5..562edf0490f 100644
--- a/kde-apps/kio-extras/kio-extras-16.04.0.ebuild
+++ b/kde-apps/kio-extras/kio-extras-16.04.0.ebuild
@@ -54,6 +54,7 @@ COMMON_DEPEND="
RDEPEND="${COMMON_DEPEND}
$(add_frameworks_dep kded)
!<kde-apps/kcontrol-15.08.0-r1:4
+ !<kde-frameworks/kactivities-5.20.0
"
DEPEND="${COMMON_DEPEND}
x11-misc/shared-mime-info
diff --git a/kde-apps/kio-extras/kio-extras-16.04.49.9999.ebuild b/kde-apps/kio-extras/kio-extras-16.04.49.9999.ebuild
index dcc759f74ca..2088160cc48 100644
--- a/kde-apps/kio-extras/kio-extras-16.04.49.9999.ebuild
+++ b/kde-apps/kio-extras/kio-extras-16.04.49.9999.ebuild
@@ -54,6 +54,7 @@ COMMON_DEPEND="
RDEPEND="${COMMON_DEPEND}
$(add_frameworks_dep kded)
!<kde-apps/kcontrol-15.08.0-r1:4
+ !<kde-frameworks/kactivities-5.20.0
"
DEPEND="${COMMON_DEPEND}
x11-misc/shared-mime-info
diff --git a/kde-apps/kio-extras/kio-extras-9999.ebuild b/kde-apps/kio-extras/kio-extras-9999.ebuild
index dcc759f74ca..2088160cc48 100644
--- a/kde-apps/kio-extras/kio-extras-9999.ebuild
+++ b/kde-apps/kio-extras/kio-extras-9999.ebuild
@@ -54,6 +54,7 @@ COMMON_DEPEND="
RDEPEND="${COMMON_DEPEND}
$(add_frameworks_dep kded)
!<kde-apps/kcontrol-15.08.0-r1:4
+ !<kde-frameworks/kactivities-5.20.0
"
DEPEND="${COMMON_DEPEND}
x11-misc/shared-mime-info