From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 654CA139694 for ; Fri, 10 Feb 2017 11:32:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7678A21C03E; Fri, 10 Feb 2017 11:32:11 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5605821C03E for ; Fri, 10 Feb 2017 11:32:11 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E178B3409C1 for ; Fri, 10 Feb 2017 11:32:09 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2992B3FAD for ; Fri, 10 Feb 2017 11:32:07 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1486726220.5855c234a8f75a790a4b4f6620f3c0f6e3b04240.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-apps/pimcommon/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-apps/pimcommon/pimcommon-16.12.2.ebuild X-VCS-Directories: kde-apps/pimcommon/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 5855c234a8f75a790a4b4f6620f3c0f6e3b04240 X-VCS-Branch: master Date: Fri, 10 Feb 2017 11:32:07 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: ccfd3598-1126-4e9b-912f-ece9971529ec X-Archives-Hash: e89689edb96eec9df6879eb2d60be8d8 commit: 5855c234a8f75a790a4b4f6620f3c0f6e3b04240 Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Feb 10 11:26:14 2017 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Feb 10 11:30:20 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5855c234 kde-apps/pimcommon: Add blocker against kde-apps/kdepim-common-libs:4 Gentoo-bug: 608794 Thanks-to: Jonathan Lovelace 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.2.ebuild | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/kde-apps/pimcommon/pimcommon-16.12.2.ebuild b/kde-apps/pimcommon/pimcommon-16.12.2.ebuild index 601da9a7ec..63286e4ea4 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 +"