public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Alexey Shvetsov" <alexxy@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/kde:master commit in: kde-base/kdepim-common-libs/
Date: Mon, 15 Jul 2013 20:44:10 +0000 (UTC)	[thread overview]
Message-ID: <1373920974.30bd986b23986dfa64581633f2f1e72d000a4bd7.alexxy@gentoo> (raw)

commit:     30bd986b23986dfa64581633f2f1e72d000a4bd7
Author:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 15 20:42:54 2013 +0000
Commit:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Mon Jul 15 20:42:54 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=30bd986b

[kde-base/kdepim-common-libs] Fix collisions

Package-Manager: portage-2.2.0_alpha188

---
 kde-base/kdepim-common-libs/kdepim-common-libs-4.10.95.ebuild      | 1 +
 kde-base/kdepim-common-libs/kdepim-common-libs-4.11.49.9999.ebuild | 1 +
 2 files changed, 2 insertions(+)

diff --git a/kde-base/kdepim-common-libs/kdepim-common-libs-4.10.95.ebuild b/kde-base/kdepim-common-libs/kdepim-common-libs-4.10.95.ebuild
index ec25322..e1249b5 100644
--- a/kde-base/kdepim-common-libs/kdepim-common-libs-4.10.95.ebuild
+++ b/kde-base/kdepim-common-libs/kdepim-common-libs-4.10.95.ebuild
@@ -28,6 +28,7 @@ RDEPEND="${DEPEND}
 	!kde-base/kdepim-wizards:4
 	!<kde-base/kmail-4.4.80:4
 	!<kde-base/korganizer-4.5.67:4
+	!<kde-base/kmail-4.10.95:4
 	app-crypt/gnupg
 	$(add_kdebase_dep kdepim-runtime)
 "

diff --git a/kde-base/kdepim-common-libs/kdepim-common-libs-4.11.49.9999.ebuild b/kde-base/kdepim-common-libs/kdepim-common-libs-4.11.49.9999.ebuild
index 0cab0c6..fe0d6ed 100644
--- a/kde-base/kdepim-common-libs/kdepim-common-libs-4.11.49.9999.ebuild
+++ b/kde-base/kdepim-common-libs/kdepim-common-libs-4.11.49.9999.ebuild
@@ -28,6 +28,7 @@ RDEPEND="${DEPEND}
 	!kde-base/kdepim-wizards:4
 	!<kde-base/kmail-4.4.80:4
 	!<kde-base/korganizer-4.5.67:4
+	!<kde-base/kmail-4.10.95:4
 	app-crypt/gnupg
 	$(add_kdebase_dep kdepim-runtime)
 "


             reply	other threads:[~2013-07-15 20:44 UTC|newest]

Thread overview: 53+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-07-15 20:44 Alexey Shvetsov [this message]
  -- strict thread matches above, loose matches on Subject: below --
2015-06-06 18:18 [gentoo-commits] proj/kde:master commit in: kde-base/kdepim-common-libs/ Michael Palimaka
2015-02-21 15:42 Michael Palimaka
2015-02-14 23:49 Jonathan Callen
2015-01-29  9:19 Michael Palimaka
2014-07-18 15:01 Johannes Huber
2014-04-24 13:28 Johannes Huber
2014-04-22 22:15 Johannes Huber
2014-04-21 12:47 Johannes Huber
2014-04-14 14:47 Johannes Huber
2014-04-01 12:46 Michael Palimaka
2014-03-31 16:27 Alexey Shvetsov
2014-03-31 16:26 Alexey Shvetsov
2014-03-31 16:17 Alexey Shvetsov
2014-03-31 16:17 Alexey Shvetsov
2014-03-31  9:48 Alexey Shvetsov
2014-03-30  9:47 Johannes Huber
2014-03-23 11:15 Dennis Schridde
2014-02-21 15:42 Michael Palimaka
2014-02-09 14:43 Johannes Huber
2014-01-31 13:12 Andreas Hüttel
2014-01-25 21:35 Andreas Hüttel
2014-01-25 19:27 Andreas Hüttel
2013-12-15 15:22 Johannes Huber
2013-12-14 11:47 Alexey Shvetsov
2013-12-14 11:30 Alexey Shvetsov
2013-12-12 23:28 Marc Schiffbauer
2013-11-18 20:24 Johannes Huber
2013-10-14 20:34 Johannes Huber
2013-08-09 14:49 Michael Palimaka
2013-08-08 12:28 Michael Palimaka
2013-08-01 23:31 Johannes Huber
2013-07-25 22:21 Johannes Huber
2013-07-15 20:31 Alexey Shvetsov
2013-07-15 20:20 Alexey Shvetsov
2013-07-15 19:36 Alexey Shvetsov
2013-07-11 11:25 Michael Palimaka
2013-07-03 19:17 Johannes Huber
2013-06-13 18:45 Johannes Huber
2013-06-02 11:43 Johannes Huber
2013-02-25  3:34 Patrick Lauer
2012-11-16 21:23 Johannes Huber
2012-11-11 10:58 Johannes Huber
2012-10-21 11:37 Manuel Nickschas
2012-07-25 21:15 Johannes Huber
2012-07-09 10:24 Johannes Huber
2012-07-09 10:24 Johannes Huber
2012-01-26 17:20 Johannes Huber
2011-12-04 17:55 Andreas Hüttel
2011-09-07 21:23 Alexey Shvetsov
2011-06-15  4:28 Jonathan Callen
2011-05-16 22:54 Jonathan Callen
2011-03-03 23:18 Theo Chatzimichos

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=1373920974.30bd986b23986dfa64581633f2f1e72d000a4bd7.alexxy@gentoo \
    --to=alexxy@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