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-plasma/kgamma/
Date: Wed, 26 Aug 2015 18:40:21 +0000 (UTC)	[thread overview]
Message-ID: <1440614409.35f01dfde26ec0d361d4adbdc9af0e18ecbf4334.johu@gentoo> (raw)

commit:     35f01dfde26ec0d361d4adbdc9af0e18ecbf4334
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 26 18:40:09 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Aug 26 18:40:09 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=35f01dfd

kde-plasma/kgamma: Block old kde-apps/kde4-l10n

Due to file collision.

Gentoo-Bug: 558806
Reported-by: Mario Kicherer <dev <AT> kicherer.org>

Package-Manager: portage-2.2.20.1

 kde-plasma/kgamma/kgamma-5.4.49.9999.ebuild | 1 +
 kde-plasma/kgamma/kgamma-9999.ebuild        | 1 +
 2 files changed, 2 insertions(+)

diff --git a/kde-plasma/kgamma/kgamma-5.4.49.9999.ebuild b/kde-plasma/kgamma/kgamma-5.4.49.9999.ebuild
index e16bc0f..2c3f37f 100644
--- a/kde-plasma/kgamma/kgamma-5.4.49.9999.ebuild
+++ b/kde-plasma/kgamma/kgamma-5.4.49.9999.ebuild
@@ -26,5 +26,6 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	x11-proto/xf86vidmodeproto
+	!<kde-apps/kde4-l10n-15.08.0
 	!kde-apps/kgamma:5
 "

diff --git a/kde-plasma/kgamma/kgamma-9999.ebuild b/kde-plasma/kgamma/kgamma-9999.ebuild
index e16bc0f..2c3f37f 100644
--- a/kde-plasma/kgamma/kgamma-9999.ebuild
+++ b/kde-plasma/kgamma/kgamma-9999.ebuild
@@ -26,5 +26,6 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	x11-proto/xf86vidmodeproto
+	!<kde-apps/kde4-l10n-15.08.0
 	!kde-apps/kgamma:5
 "


             reply	other threads:[~2015-08-26 18:40 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-08-26 18:40 Johannes Huber [this message]
  -- strict thread matches above, loose matches on Subject: below --
2023-12-16 12:34 [gentoo-commits] proj/kde:master commit in: kde-plasma/kgamma/ Andreas Sturmlechner
2023-11-28 20:53 Andreas Sturmlechner
2016-11-27 11:30 Michael Palimaka
2016-06-26 16:50 Michael Palimaka
2016-03-09 17:22 Michael Palimaka
2016-01-25 16:01 Michael Palimaka
2016-01-22 18:04 Michael Palimaka
2015-08-24  7:47 Johannes Huber
2015-08-11 20:32 Johannes Huber
2015-07-31 21:24 Johannes Huber
2015-07-30 19:22 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=1440614409.35f01dfde26ec0d361d4adbdc9af0e18ecbf4334.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