public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Johannes Huber" <johu@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/kde:master commit in: kde-base/kdepimlibs/
Date: Mon, 14 Oct 2013 20:34:22 +0000 (UTC)	[thread overview]
Message-ID: <1381787729.98ca15b873b65331212fa6a370107f94dd6117ca.johu@gentoo> (raw)

commit:     98ca15b873b65331212fa6a370107f94dd6117ca
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 14 21:55:29 2013 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon Oct 14 21:55:29 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=98ca15b8

[kde-base/kdepimlibs] Fix file collision with kde-base/kdepim-runtime in KDE 4.12.

Package-Manager: portage-2.2.7

---
 kde-base/kdepimlibs/kdepimlibs-9999.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/kde-base/kdepimlibs/kdepimlibs-9999.ebuild b/kde-base/kdepimlibs/kdepimlibs-9999.ebuild
index 7ca7819..e06d1c4 100644
--- a/kde-base/kdepimlibs/kdepimlibs-9999.ebuild
+++ b/kde-base/kdepimlibs/kdepimlibs-9999.ebuild
@@ -34,7 +34,9 @@ DEPEND="
 "
 # boost is not linked to, but headers which include it are installed
 # bug #418071
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	!<kde-base/kdepim-runtime-4.11.50
+"
 
 PATCHES=( "${FILESDIR}/${PN}-4.9.1-boostincludes.patch" )
 


             reply	other threads:[~2013-10-14 20:34 UTC|newest]

Thread overview: 51+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-10-14 20:34 Johannes Huber [this message]
  -- strict thread matches above, loose matches on Subject: below --
2015-07-03 17:45 [gentoo-commits] proj/kde:master commit in: kde-base/kdepimlibs/ Michael Palimaka
2015-04-29 15:49 Michael Palimaka
2015-02-04 16:14 Michael Palimaka
2014-12-01 12:38 Michael Palimaka
2014-08-17  9:37 Michael Palimaka
2014-08-06 17:37 Johannes Huber
2014-07-18 15:01 Johannes Huber
2014-07-18 14:07 Manuel Rüger
2014-05-25 15:20 Johannes Huber
2014-04-22 22:15 Johannes Huber
2014-04-21 12:47 Johannes Huber
2014-04-14 15:22 Johannes Huber
2014-03-30  9:47 Johannes Huber
2014-03-09 16:11 Johannes Huber
2014-02-05 19:31 Michael Palimaka
2013-12-20 23:21 Andreas Hüttel
2013-12-15 14:14 Andreas Hüttel
2013-10-06 19:57 Chris Reffett
2013-08-19 16:25 Michael Palimaka
2013-07-25 22:21 Johannes Huber
2013-06-12  8:09 Michael Palimaka
2013-06-02 11:43 Johannes Huber
2013-03-03 15:57 Michael Palimaka
2013-02-08 15:18 Michael Palimaka
2013-02-01 16:39 Michael Palimaka
2013-01-05 15:59 Chris Reffett
2012-11-23  4:41 Chris Reffett
2012-11-23  4:37 Chris Reffett
2012-11-16 21:23 Johannes Huber
2012-11-11 10:58 Johannes Huber
2012-11-06 11:13 Michael Palimaka
2012-10-13 22:08 Johannes Huber
2012-10-09  7:29 Patrick Lauer
2012-07-25 21:15 Johannes Huber
2012-06-28 13:16 Andreas Hüttel
2012-05-30  8:57 Michael Palimaka
2012-05-25 18:12 Johannes Huber
2012-04-02 15:57 Johannes Huber
2012-03-07 21:39 Andreas Hüttel
2012-01-24 23:02 Andreas Hüttel
2011-09-07 21:23 Alexey Shvetsov
2011-09-04 15:10 Alexey Shvetsov
2011-09-04 15:05 Alexey Shvetsov
2011-09-04 12:36 Alexey Shvetsov
2011-07-31 20:39 Andreas Hüttel
2011-07-13 21:52 Andreas Hüttel
2011-07-09 22:48 Theo Chatzimichos
2011-05-29 23:48 David Heidelberger
2011-05-24  5:57 Jorge Manuel B. S. Vicetto
2011-05-16 22:54 Jonathan Callen

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=1381787729.98ca15b873b65331212fa6a370107f94dd6117ca.johu@gentoo \
    --to=johu@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