From mboxrd@z Thu Jan 1 00:00:00 1970
Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org)
by finch.gentoo.org with esmtp (Exim 4.60)
(envelope-from <gentoo-commits+bounces-436491-garchives=archives.gentoo.org@lists.gentoo.org>)
id 1S5BBt-0007Ar-S5
for garchives@archives.gentoo.org; Wed, 07 Mar 2012 07:21:42 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 867F4E075C;
Wed, 7 Mar 2012 07:21:34 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
by pigeon.gentoo.org (Postfix) with ESMTP id 566EFE075C
for <gentoo-commits@lists.gentoo.org>; Wed, 7 Mar 2012 07:21:34 +0000 (UTC)
Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163])
(using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id BC6301B4026
for <gentoo-commits@lists.gentoo.org>; Wed, 7 Mar 2012 07:21:33 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by hornbill.gentoo.org (Postfix) with ESMTP id 7D962E5428
for <gentoo-commits@lists.gentoo.org>; Wed, 7 Mar 2012 07:21:32 +0000 (UTC)
From: "Patrick Lauer" <patrick@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Patrick Lauer" <patrick@gentoo.org>
Message-ID: <1331104874.e8fc22f8ff391dced29dc04c40561e87100ec460.patrick@gentoo>
Subject: [gentoo-commits] proj/kde:master commit in: kde-base/kdeplasma-addons/
X-VCS-Repository: proj/kde
X-VCS-Files: kde-base/kdeplasma-addons/kdeplasma-addons-9999.ebuild
X-VCS-Directories: kde-base/kdeplasma-addons/
X-VCS-Committer: patrick
X-VCS-Committer-Name: Patrick Lauer
X-VCS-Revision: e8fc22f8ff391dced29dc04c40561e87100ec460
X-VCS-Branch: master
Date: Wed, 7 Mar 2012 07:21:32 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt: 0debc2c9-281b-441b-94bc-c576aafc98f3
X-Archives-Hash: d23870b7154309f0e74b41a99d8d621d
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=3Dproj/kde.git;a=3Dc=
ommit;h=3De8fc22f8
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() {
=20
kde4-base_src_configure
}
+
+src_install () {
+ kde4-base_src_install
+ rm ${D}/usr/share/apps/cmake/modules/FindQJSON.cmake || die "Couldn't f=
ix file collision"
+}