public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Andreas Hüttel" <dilfridge@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/kdepim/
Date: Mon, 23 May 2016 15:05:57 +0000 (UTC)	[thread overview]
Message-ID: <1464015822.859a7e6de76f5a1837522ed4f20b6098f5a45bc1.dilfridge@gentoo> (raw)

commit:     859a7e6de76f5a1837522ed4f20b6098f5a45bc1
Author:     Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Mon May 23 15:03:42 2016 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> 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


             reply	other threads:[~2016-05-23 15:06 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-05-23 15:05 Andreas Hüttel [this message]
  -- strict thread matches above, loose matches on Subject: below --
2016-05-25 20:39 [gentoo-commits] proj/kde:master commit in: kde-apps/kdepim/ Michael Palimaka
2016-04-23 17:51 Johannes Huber
2016-04-20 19:09 Johannes Huber
2016-04-08 15:45 Michael Palimaka
2016-04-06 12:39 Michael Palimaka
2016-03-07 15:13 Michael Palimaka
2016-03-07 15:13 Michael Palimaka
2016-02-23 14:20 Michael Palimaka
2016-02-18 14:44 Michael Palimaka
2016-02-14 15:28 Michael Palimaka
2016-02-14 15:28 Michael Palimaka
2016-02-09 10:55 Michael Palimaka
2016-02-09 10:53 Michael Palimaka
2015-12-10  6:41 Michael Palimaka
2015-11-29 15:29 Michael Palimaka
2015-11-29 15:29 Michael Palimaka
2015-11-19 12:36 Michael Palimaka
2015-10-22 10:13 Michael Palimaka
2015-08-10 20:51 Johannes Huber
2015-08-10 20:51 Johannes Huber
2015-08-07 20:43 Johannes Huber

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1464015822.859a7e6de76f5a1837522ed4f20b6098f5a45bc1.dilfridge@gentoo \
    --to=dilfridge@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox