[gentoo-commits] proj/kde:master commit in: kde-apps/incidenceeditor/

[Michael Palimaka]

commit:     eddba44d228d65a166ff102018a63d10507082a2
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 12 03:47:46 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Feb 12 03:47:52 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=eddba44d

kde-apps/incidenceeditor: add blocker due to file collisions

* Detected file collision(s):
*
*       /usr/bin/kincidenceeditor

Gentoo-bug: 609028

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 kde-apps/incidenceeditor/incidenceeditor-16.12.49.9999.ebuild | 4 +++-
 kde-apps/incidenceeditor/incidenceeditor-9999.ebuild          | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/kde-apps/incidenceeditor/incidenceeditor-16.12.49.9999.ebuild 
b/kde-apps/incidenceeditor/incidenceeditor-16.12.49.9999.ebuild
index 311cae1b11..7e8a77f21f 100644
--- a/kde-apps/incidenceeditor/incidenceeditor-16.12.49.9999.ebuild
+++ b/kde-apps/incidenceeditor/incidenceeditor-16.12.49.9999.ebuild
@@ -49,4 +49,6 @@ DEPEND="
        $(add_qt_dep qtwidgets)
        dev-libs/kdiagram:5
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+       !kde-apps/kdepim-common-libs:4
+"

diff --git a/kde-apps/incidenceeditor/incidenceeditor-9999.ebuild 
b/kde-apps/incidenceeditor/incidenceeditor-9999.ebuild
index 311cae1b11..7e8a77f21f 100644
--- a/kde-apps/incidenceeditor/incidenceeditor-9999.ebuild
+++ b/kde-apps/incidenceeditor/incidenceeditor-9999.ebuild
@@ -49,4 +49,6 @@ DEPEND="
        $(add_qt_dep qtwidgets)
        dev-libs/kdiagram:5
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+       !kde-apps/kdepim-common-libs:4
+"