From 5855c234a8f75a790a4b4f6620f3c0f6e3b04240 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Fri, 10 Feb 2017 12:26:14 +0100 Subject: kde-apps/pimcommon: Add blocker against kde-apps/kdepim-common-libs:4 Gentoo-bug: 608794 Thanks-to: Jonathan Lovelace 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.2.ebuild | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'kde-apps/pimcommon') diff --git a/kde-apps/pimcommon/pimcommon-16.12.2.ebuild b/kde-apps/pimcommon/pimcommon-16.12.2.ebuild index 601da9a7ec3b..63286e4ea456 100644 --- a/kde-apps/pimcommon/pimcommon-16.12.2.ebuild +++ b/kde-apps/pimcommon/pimcommon-16.12.2.ebuild @@ -14,7 +14,7 @@ LICENSE="GPL-2+ LGPL-2.1+" KEYWORDS="~amd64 ~x86" 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 +" -- cgit v1.2.3-65-gdbad