From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id B8DDD138262 for ; Mon, 23 May 2016 15:06:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0E14321C028; Mon, 23 May 2016 15:06:01 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 A60D121C028 for ; Mon, 23 May 2016 15:06:00 +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 83972340B37 for ; Mon, 23 May 2016 15:05:59 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EAC08336 for ; Mon, 23 May 2016 15:05:57 +0000 (UTC) From: "Andreas Hüttel" 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 Hüttel" Message-ID: <1464015822.859a7e6de76f5a1837522ed4f20b6098f5a45bc1.dilfridge@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/kdepim/ X-VCS-Repository: proj/kde X-VCS-Files: kde-apps/kdepim/kdepim-16.04.1.ebuild kde-apps/kdepim/kdepim-16.04.49.9999.ebuild X-VCS-Directories: kde-apps/kdepim/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas Hüttel X-VCS-Revision: 859a7e6de76f5a1837522ed4f20b6098f5a45bc1 X-VCS-Branch: master Date: Mon, 23 May 2016 15:05:57 +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: 35d7dc3b-ad92-4cc9-b997-e961b7533d3c X-Archives-Hash: 4fe60298fe3ab8a65c7278e9bff60434 commit: 859a7e6de76f5a1837522ed4f20b6098f5a45bc1 Author: Andreas K. Huettel gentoo org> AuthorDate: Mon May 23 15:03:42 2016 +0000 Commit: Andreas Hüttel gentoo org> CommitDate: Mon May 23 15:03:42 2016 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=859a7e6d kde-apps/kdepim: Add blocker due to file collisions Package-Manager: portage-2.3.0_rc1 kde-apps/kdepim/kdepim-16.04.1.ebuild | 1 + kde-apps/kdepim/kdepim-16.04.49.9999.ebuild | 1 + 2 files changed, 2 insertions(+) diff --git a/kde-apps/kdepim/kdepim-16.04.1.ebuild b/kde-apps/kdepim/kdepim-16.04.1.ebuild index 3299a52..e636e12 100644 --- a/kde-apps/kdepim/kdepim-16.04.1.ebuild +++ b/kde-apps/kdepim/kdepim-16.04.1.ebuild @@ -111,6 +111,7 @@ DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND} !kde-apps/kabcclient:4 + !kde-apps/kaddressbook:4 !kde-apps/kalarm:4 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-runtime:4 diff --git a/kde-apps/kdepim/kdepim-16.04.49.9999.ebuild b/kde-apps/kdepim/kdepim-16.04.49.9999.ebuild index 2ea10ce..99b411c 100644 --- a/kde-apps/kdepim/kdepim-16.04.49.9999.ebuild +++ b/kde-apps/kdepim/kdepim-16.04.49.9999.ebuild @@ -111,6 +111,7 @@ DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND} !kde-apps/kabcclient:4 + !kde-apps/kaddressbook:4 !kde-apps/kalarm:4 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-runtime:4