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/plasma-desktop/
Date: Sat, 12 Jul 2014 20:11:20 +0000 (UTC)	[thread overview]
Message-ID: <1405195840.e2267167eea6d9bda2c1cd3bbaa1b81bb633dbf1.johu@gentoo> (raw)

commit:     e2267167eea6d9bda2c1cd3bbaa1b81bb633dbf1
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 12 20:10:40 2014 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Jul 12 20:10:40 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=e2267167

[kde-base/plasma-desktop] Block kde-base/kdepasswd:4

Prevents file collisions.

Package-Manager: portage-2.2.10

---
 kde-base/plasma-desktop/plasma-desktop-9999.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kde-base/plasma-desktop/plasma-desktop-9999.ebuild b/kde-base/plasma-desktop/plasma-desktop-9999.ebuild
index a4c045e..c477631 100644
--- a/kde-base/plasma-desktop/plasma-desktop-9999.ebuild
+++ b/kde-base/plasma-desktop/plasma-desktop-9999.ebuild
@@ -83,6 +83,7 @@ RDEPEND="
 	)
 	!kde-base/attica:4
 	!kde-base/knetattach:4
+	!kde-base/kdepasswd:4
 "
 DEPEND="${RDEPEND}
 	dev-qt/qtconcurrent:5


             reply	other threads:[~2014-07-12 20:11 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-07-12 20:11 Johannes Huber [this message]
  -- strict thread matches above, loose matches on Subject: below --
2014-12-03  7:02 [gentoo-commits] proj/kde:master commit in: kde-base/plasma-desktop/ Michael Palimaka
2014-09-24 17:42 Michael Palimaka
2014-09-18 15:23 Michael Palimaka
2014-09-15 16:36 Michael Palimaka
2014-08-11 21:15 Johannes Huber
2014-08-07 21:11 Johannes Huber
2014-07-27 19:12 Michael Palimaka
2014-07-26 18:17 Marc Schiffbauer
2014-07-24 16:31 Michael Palimaka
2014-07-21 18:52 Michael Palimaka
2014-06-16 13:06 Michael Palimaka
2014-05-29 13:43 Johannes Huber
2014-05-26 18:28 Johannes Huber
2014-05-18 15:26 Michael Palimaka
2014-04-24 18:44 Michael Palimaka
2014-04-24 18:00 Michael Palimaka
2014-04-10 11:50 Elias Probst

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=1405195840.e2267167eea6d9bda2c1cd3bbaa1b81bb633dbf1.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