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

[Andreas Sturmlechner]

commit:     eadb491a30edc919f9f846685613bfbb6107ec3f
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 10 11:26:14 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Feb 10 11:26:14 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=eadb491a

kde-apps/pimcommon: Add blocker against kde-apps/kdepim-common-libs:4

Gentoo-bug: 608794
Thanks-to: Jonathan Lovelace <kingjon3377 <AT> gmail.com>

Files collide:

/usr/share/icons/hicolor/16x16/apps/kdepim-dropbox.png
/usr/share/icons/hicolor/48x48/apps/kdepim-dropbox.png
/usr/share/icons/hicolor/22x22/apps/kdepim-dropbox.png
/usr/share/icons/hicolor/32x32/apps/kdepim-dropbox.png

Package-Manager: portage-2.3.3

 kde-apps/pimcommon/pimcommon-16.12.49.9999.ebuild | 7 +++++--
 kde-apps/pimcommon/pimcommon-9999.ebuild          | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/kde-apps/pimcommon/pimcommon-16.12.49.9999.ebuild 
b/kde-apps/pimcommon/pimcommon-16.12.49.9999.ebuild
index 18e8055267..a2ef97162e 100644
--- a/kde-apps/pimcommon/pimcommon-16.12.49.9999.ebuild
+++ b/kde-apps/pimcommon/pimcommon-16.12.49.9999.ebuild
@@ -14,7 +14,7 @@ LICENSE="GPL-2+ LGPL-2.1+"
 KEYWORDS=""
 IUSE=""
 
-RDEPEND="
+COMMON_DEPEND="
        $(add_frameworks_dep karchive)
        $(add_frameworks_dep kcodecs)
        $(add_frameworks_dep kcompletion)
@@ -51,6 +51,9 @@ RDEPEND="
        $(add_qt_dep qtxml)
        dev-libs/grantlee:5
 "
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEPEND}
        dev-libs/libxslt
 "
+RDEPEND="${COMMON_DEPEND}
+       !kde-apps/kdepim-common-libs:4
+"

diff --git a/kde-apps/pimcommon/pimcommon-9999.ebuild 
b/kde-apps/pimcommon/pimcommon-9999.ebuild
index 18e8055267..a2ef97162e 100644
--- a/kde-apps/pimcommon/pimcommon-9999.ebuild
+++ b/kde-apps/pimcommon/pimcommon-9999.ebuild
@@ -14,7 +14,7 @@ LICENSE="GPL-2+ LGPL-2.1+"
 KEYWORDS=""
 IUSE=""
 
-RDEPEND="
+COMMON_DEPEND="
        $(add_frameworks_dep karchive)
        $(add_frameworks_dep kcodecs)
        $(add_frameworks_dep kcompletion)
@@ -51,6 +51,9 @@ RDEPEND="
        $(add_qt_dep qtxml)
        dev-libs/grantlee:5
 "
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEPEND}
        dev-libs/libxslt
 "
+RDEPEND="${COMMON_DEPEND}
+       !kde-apps/kdepim-common-libs:4
+"