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 4BAD7139694 for ; Fri, 10 Feb 2017 11:27:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7C81A21C03C; Fri, 10 Feb 2017 11:27:31 +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 5688021C03C for ; Fri, 10 Feb 2017 11:27:31 +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 61E363409C1 for ; Fri, 10 Feb 2017 11:27:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 29D203FAD for ; Fri, 10 Feb 2017 11:27:28 +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: <1486725974.eadb491a30edc919f9f846685613bfbb6107ec3f.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/pimcommon/ X-VCS-Repository: proj/kde X-VCS-Files: kde-apps/pimcommon/pimcommon-16.12.49.9999.ebuild kde-apps/pimcommon/pimcommon-9999.ebuild X-VCS-Directories: kde-apps/pimcommon/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: eadb491a30edc919f9f846685613bfbb6107ec3f X-VCS-Branch: master Date: Fri, 10 Feb 2017 11:27:28 +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: 60d650c1-5f7f-4102-afa3-ef1d62724a05 X-Archives-Hash: 788631cc32907e637f96106eb7019b2e commit: eadb491a30edc919f9f846685613bfbb6107ec3f Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Feb 10 11:26:14 2017 +0000 Commit: Andreas Sturmlechner gentoo 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 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 +"