| 1 |
commit: eddba44d228d65a166ff102018a63d10507082a2 |
| 2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Feb 12 03:47:46 2017 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Feb 12 03:47:52 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=eddba44d |
| 7 |
|
| 8 |
kde-apps/incidenceeditor: add blocker due to file collisions |
| 9 |
|
| 10 |
* Detected file collision(s): |
| 11 |
* |
| 12 |
* /usr/bin/kincidenceeditor |
| 13 |
|
| 14 |
Gentoo-bug: 609028 |
| 15 |
|
| 16 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
| 17 |
|
| 18 |
kde-apps/incidenceeditor/incidenceeditor-16.12.49.9999.ebuild | 4 +++- |
| 19 |
kde-apps/incidenceeditor/incidenceeditor-9999.ebuild | 4 +++- |
| 20 |
2 files changed, 6 insertions(+), 2 deletions(-) |
| 21 |
|
| 22 |
diff --git a/kde-apps/incidenceeditor/incidenceeditor-16.12.49.9999.ebuild b/kde-apps/incidenceeditor/incidenceeditor-16.12.49.9999.ebuild |
| 23 |
index 311cae1b11..7e8a77f21f 100644 |
| 24 |
--- a/kde-apps/incidenceeditor/incidenceeditor-16.12.49.9999.ebuild |
| 25 |
+++ b/kde-apps/incidenceeditor/incidenceeditor-16.12.49.9999.ebuild |
| 26 |
@@ -49,4 +49,6 @@ DEPEND=" |
| 27 |
$(add_qt_dep qtwidgets) |
| 28 |
dev-libs/kdiagram:5 |
| 29 |
" |
| 30 |
-RDEPEND="${DEPEND}" |
| 31 |
+RDEPEND="${DEPEND} |
| 32 |
+ !kde-apps/kdepim-common-libs:4 |
| 33 |
+" |
| 34 |
|
| 35 |
diff --git a/kde-apps/incidenceeditor/incidenceeditor-9999.ebuild b/kde-apps/incidenceeditor/incidenceeditor-9999.ebuild |
| 36 |
index 311cae1b11..7e8a77f21f 100644 |
| 37 |
--- a/kde-apps/incidenceeditor/incidenceeditor-9999.ebuild |
| 38 |
+++ b/kde-apps/incidenceeditor/incidenceeditor-9999.ebuild |
| 39 |
@@ -49,4 +49,6 @@ DEPEND=" |
| 40 |
$(add_qt_dep qtwidgets) |
| 41 |
dev-libs/kdiagram:5 |
| 42 |
" |
| 43 |
-RDEPEND="${DEPEND}" |
| 44 |
+RDEPEND="${DEPEND} |
| 45 |
+ !kde-apps/kdepim-common-libs:4 |
| 46 |
+" |
Archives