| 1 |
commit: 02424df329a2b0b378e32f88700eaa95b0f0d34c |
| 2 |
Author: Johannes Huber <johu <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Mar 29 19:29:02 2016 +0000 |
| 4 |
Commit: Johannes Huber <johu <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Mar 29 19:29:12 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=02424df3 |
| 7 |
|
| 8 |
kde-plasma/kactivitymanagerd: Re-work file collision |
| 9 |
|
| 10 |
Blocker on old kde-plasma/plasma-desktop installs seems sufficient. |
| 11 |
|
| 12 |
Package-Manager: portage-2.2.28 |
| 13 |
|
| 14 |
...vitymanagerd-5.6.1.ebuild => kactivitymanagerd-5.6.1-r1.ebuild} | 7 +------ |
| 15 |
kde-plasma/kactivitymanagerd/kactivitymanagerd-5.6.49.9999.ebuild | 1 + |
| 16 |
kde-plasma/kactivitymanagerd/kactivitymanagerd-9999.ebuild | 1 + |
| 17 |
3 files changed, 3 insertions(+), 6 deletions(-) |
| 18 |
|
| 19 |
diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.6.1.ebuild b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.6.1-r1.ebuild |
| 20 |
similarity index 87% |
| 21 |
rename from kde-plasma/kactivitymanagerd/kactivitymanagerd-5.6.1.ebuild |
| 22 |
rename to kde-plasma/kactivitymanagerd/kactivitymanagerd-5.6.1-r1.ebuild |
| 23 |
index 5be6b8c..cd12f12 100644 |
| 24 |
--- a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.6.1.ebuild |
| 25 |
+++ b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.6.1-r1.ebuild |
| 26 |
@@ -28,13 +28,8 @@ RDEPEND=" |
| 27 |
$(add_qt_dep qtwidgets) |
| 28 |
!<kde-base/kactivities-4.13.3-r1:4[-minimal(-)] |
| 29 |
!kde-base/kactivitymanagerd |
| 30 |
+ !<kde-plasma/plasma-desktop-5.6.1 |
| 31 |
" |
| 32 |
DEPEND="${RDEPEND} |
| 33 |
>=dev-libs/boost-1.54 |
| 34 |
" |
| 35 |
- |
| 36 |
-src_install() { |
| 37 |
- kde5_src_install |
| 38 |
- # File collisions with kde-plasma/plasma-desktop... |
| 39 |
- rm -r "${ED}"usr/share/locale |
| 40 |
-} |
| 41 |
|
| 42 |
diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.6.49.9999.ebuild b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.6.49.9999.ebuild |
| 43 |
index 216e658..58e647c 100644 |
| 44 |
--- a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.6.49.9999.ebuild |
| 45 |
+++ b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.6.49.9999.ebuild |
| 46 |
@@ -28,6 +28,7 @@ RDEPEND=" |
| 47 |
$(add_qt_dep qtwidgets) |
| 48 |
!<kde-base/kactivities-4.13.3-r1:4[-minimal(-)] |
| 49 |
!kde-base/kactivitymanagerd |
| 50 |
+ !<kde-plasma/plasma-desktop-5.6.1 |
| 51 |
" |
| 52 |
DEPEND="${RDEPEND} |
| 53 |
>=dev-libs/boost-1.54 |
| 54 |
|
| 55 |
diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-9999.ebuild b/kde-plasma/kactivitymanagerd/kactivitymanagerd-9999.ebuild |
| 56 |
index 216e658..58e647c 100644 |
| 57 |
--- a/kde-plasma/kactivitymanagerd/kactivitymanagerd-9999.ebuild |
| 58 |
+++ b/kde-plasma/kactivitymanagerd/kactivitymanagerd-9999.ebuild |
| 59 |
@@ -28,6 +28,7 @@ RDEPEND=" |
| 60 |
$(add_qt_dep qtwidgets) |
| 61 |
!<kde-base/kactivities-4.13.3-r1:4[-minimal(-)] |
| 62 |
!kde-base/kactivitymanagerd |
| 63 |
+ !<kde-plasma/plasma-desktop-5.6.1 |
| 64 |
" |
| 65 |
DEPEND="${RDEPEND} |
| 66 |
>=dev-libs/boost-1.54 |
Archives