diff options
| author | Johannes Huber <johu@gentoo.org> | 2016-03-29 21:29:02 +0200 |
|---|---|---|
| committer | Johannes Huber <johu@gentoo.org> | 2016-03-29 21:29:12 +0200 |
| commit | 02424df329a2b0b378e32f88700eaa95b0f0d34c (patch) | |
| tree | 6f4213024d4220bf948419593a22042e816ca24d | |
| parent | d685f9aa9f63725bb3a5cba54c885bfc3064b0e7 (diff) | |
| download | kde-02424df329a2b0b378e32f88700eaa95b0f0d34c.tar.gz kde-02424df329a2b0b378e32f88700eaa95b0f0d34c.tar.bz2 kde-02424df329a2b0b378e32f88700eaa95b0f0d34c.zip | |
kde-plasma/kactivitymanagerd: Re-work file collision
Blocker on old kde-plasma/plasma-desktop installs seems sufficient.
Package-Manager: portage-2.2.28
| -rw-r--r-- | kde-plasma/kactivitymanagerd/kactivitymanagerd-5.6.1-r1.ebuild (renamed from kde-plasma/kactivitymanagerd/kactivitymanagerd-5.6.1.ebuild) | 7 | ||||
| -rw-r--r-- | kde-plasma/kactivitymanagerd/kactivitymanagerd-5.6.49.9999.ebuild | 1 | ||||
| -rw-r--r-- | kde-plasma/kactivitymanagerd/kactivitymanagerd-9999.ebuild | 1 |
3 files changed, 3 insertions, 6 deletions
diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.6.1.ebuild b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.6.1-r1.ebuild index 5be6b8cb904..cd12f123509 100644 --- a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.6.1.ebuild +++ b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.6.1-r1.ebuild @@ -28,13 +28,8 @@ RDEPEND=" $(add_qt_dep qtwidgets) !<kde-base/kactivities-4.13.3-r1:4[-minimal(-)] !kde-base/kactivitymanagerd + !<kde-plasma/plasma-desktop-5.6.1 " DEPEND="${RDEPEND} >=dev-libs/boost-1.54 " - -src_install() { - kde5_src_install - # File collisions with kde-plasma/plasma-desktop... - rm -r "${ED}"usr/share/locale -} diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.6.49.9999.ebuild b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.6.49.9999.ebuild index 216e658b872..58e647ccbca 100644 --- a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.6.49.9999.ebuild +++ b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.6.49.9999.ebuild @@ -28,6 +28,7 @@ RDEPEND=" $(add_qt_dep qtwidgets) !<kde-base/kactivities-4.13.3-r1:4[-minimal(-)] !kde-base/kactivitymanagerd + !<kde-plasma/plasma-desktop-5.6.1 " DEPEND="${RDEPEND} >=dev-libs/boost-1.54 diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-9999.ebuild b/kde-plasma/kactivitymanagerd/kactivitymanagerd-9999.ebuild index 216e658b872..58e647ccbca 100644 --- a/kde-plasma/kactivitymanagerd/kactivitymanagerd-9999.ebuild +++ b/kde-plasma/kactivitymanagerd/kactivitymanagerd-9999.ebuild @@ -28,6 +28,7 @@ RDEPEND=" $(add_qt_dep qtwidgets) !<kde-base/kactivities-4.13.3-r1:4[-minimal(-)] !kde-base/kactivitymanagerd + !<kde-plasma/plasma-desktop-5.6.1 " DEPEND="${RDEPEND} >=dev-libs/boost-1.54 |