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: x11-libs/libkscreen2/
Date: Fri, 23 May 2014 12:02:12 +0000 (UTC)	[thread overview]
Message-ID: <1400846473.d2296ff9940b6a67986dcba4f343f9802693b500.johu@gentoo> (raw)

commit:     d2296ff9940b6a67986dcba4f343f9802693b500
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Fri May 23 12:01:13 2014 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Fri May 23 12:01:13 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=d2296ff9

[x11-libs/libkscreen2] Block x11-libs/libkscreen

Fixes file collisions.

Package-Manager: portage-2.2.10

---
 x11-libs/libkscreen2/libkscreen2-1.71.ebuild | 4 +++-
 x11-libs/libkscreen2/libkscreen2-9999.ebuild | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/x11-libs/libkscreen2/libkscreen2-1.71.ebuild b/x11-libs/libkscreen2/libkscreen2-1.71.ebuild
index 212b325..4b92a5d 100644
--- a/x11-libs/libkscreen2/libkscreen2-1.71.ebuild
+++ b/x11-libs/libkscreen2/libkscreen2-1.71.ebuild
@@ -31,4 +31,6 @@ DEPEND="
 	x11-libs/libxcb
 	x11-libs/libXrandr
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	!x11-libs/libkscreen:5
+"

diff --git a/x11-libs/libkscreen2/libkscreen2-9999.ebuild b/x11-libs/libkscreen2/libkscreen2-9999.ebuild
index 212b325..4b92a5d 100644
--- a/x11-libs/libkscreen2/libkscreen2-9999.ebuild
+++ b/x11-libs/libkscreen2/libkscreen2-9999.ebuild
@@ -31,4 +31,6 @@ DEPEND="
 	x11-libs/libxcb
 	x11-libs/libXrandr
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	!x11-libs/libkscreen:5
+"


             reply	other threads:[~2014-05-23 12:02 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-05-23 12:02 Johannes Huber [this message]
  -- strict thread matches above, loose matches on Subject: below --
2014-06-20 16:35 [gentoo-commits] proj/kde:master commit in: x11-libs/libkscreen2/ Michael Palimaka
2014-06-09 17:16 Michael Palimaka
2014-05-18 17:09 Michael Palimaka
2014-05-16 16:41 Michael Palimaka
2014-05-16 16:33 Michael Palimaka

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=1400846473.d2296ff9940b6a67986dcba4f343f9802693b500.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