commit: 112bba7d49bd74ac92582361ed5747e404435d94 Author: Johannes Huber <johu <AT> gentoo <DOT> org> AuthorDate: Tue Apr 26 05:37:00 2016 +0000 Commit: Johannes Huber <johu <AT> gentoo <DOT> org> CommitDate: Tue Apr 26 05:37:00 2016 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=112bba7d
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 kde-apps/kio-extras/kio-extras-16.04.0.ebuild | 1 + kde-apps/kio-extras/kio-extras-16.04.49.9999.ebuild | 1 + kde-apps/kio-extras/kio-extras-9999.ebuild | 1 + 3 files changed, 3 insertions(+) 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 68900f8..562edf0 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 dcc759f..2088160 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 dcc759f..2088160 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