public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Patrick Lauer" <patrick@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/kde:master commit in: kde-base/kdeplasma-addons/
Date: Wed,  7 Mar 2012 07:21:32 +0000 (UTC)	[thread overview]
Message-ID: <1331104874.e8fc22f8ff391dced29dc04c40561e87100ec460.patrick@gentoo> (raw)

commit:     e8fc22f8ff391dced29dc04c40561e87100ec460
Author:     Patrick Lauer <patrick.lauer <AT> star-group <DOT> net>
AuthorDate: Wed Mar  7 07:21:14 2012 +0000
Commit:     Patrick Lauer <patrick <AT> gentoo <DOT> org>
CommitDate: Wed Mar  7 07:21:14 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=e8fc22f8

Fixing file collision #407209

---
 .../kdeplasma-addons/kdeplasma-addons-9999.ebuild  |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/kde-base/kdeplasma-addons/kdeplasma-addons-9999.ebuild b/kde-base/kdeplasma-addons/kdeplasma-addons-9999.ebuild
index 8b1c705..bb979ae 100644
--- a/kde-base/kdeplasma-addons/kdeplasma-addons-9999.ebuild
+++ b/kde-base/kdeplasma-addons/kdeplasma-addons-9999.ebuild
@@ -59,3 +59,8 @@ src_configure() {
 
 	kde4-base_src_configure
 }
+
+src_install () {
+	kde4-base_src_install
+	rm ${D}/usr/share/apps/cmake/modules/FindQJSON.cmake || die "Couldn't fix file collision"
+}



             reply	other threads:[~2012-03-07  7:21 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-03-07  7:21 Patrick Lauer [this message]
  -- strict thread matches above, loose matches on Subject: below --
2014-11-29 17:14 [gentoo-commits] proj/kde:master commit in: kde-base/kdeplasma-addons/ Michael Palimaka
2014-10-02 15:38 Michael Palimaka
2014-05-04 23:35 Johannes Huber
2014-01-20 10:41 Michael Palimaka
2013-10-14 17:28 Johannes Huber
2013-10-06 19:57 Chris Reffett
2013-08-01 10:28 Michael Palimaka
2012-12-09  4:12 Andreas Hüttel
2012-10-13 22:10 Johannes Huber
2012-09-07 12:05 Johannes Huber
2012-06-17 21:08 Andreas Hüttel
2012-06-16 16:00 Michael Palimaka
2012-04-19 21:32 Johannes Huber
2012-04-16 10:18 Johannes Huber
2012-04-02 11:35 Johannes Huber
2012-03-25  9:18 Andreas Hüttel
2011-11-25 18:33 Johannes Huber
2011-09-07 21:43 Alexey Shvetsov
2011-06-26  0:11 Jorge Manuel B. S. Vicetto
2011-06-09 22:03 Andreas Hüttel
2011-06-09 22:03 Andreas Hüttel
2011-05-30 20:01 Alexey Shvetsov
2011-05-07  8:35 Tomas Chvatal
2011-04-12  1:54 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=1331104874.e8fc22f8ff391dced29dc04c40561e87100ec460.patrick@gentoo \
    --to=patrick@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