From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-792744-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	by finch.gentoo.org (Postfix) with ESMTP id 4AA59138C48
	for <garchives@archives.gentoo.org>; Mon, 13 Apr 2015 13:23:47 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id C9E27E08E8;
	Mon, 13 Apr 2015 13:23:41 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 78627E08E8
	for <gentoo-commits@lists.gentoo.org>; Mon, 13 Apr 2015 13:23:41 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 826D7340983
	for <gentoo-commits@lists.gentoo.org>; Mon, 13 Apr 2015 13:23:40 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 21A0D15D5B
	for <gentoo-commits@lists.gentoo.org>; Mon, 13 Apr 2015 13:23:37 +0000 (UTC)
From: "Manuel Rüger" <mrueg@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Manuel Rüger" <mrueg@gentoo.org>
Message-ID: <1428931401.457f9132a30f13cda6f25160f1c84e284de7298c.mrueg@gentoo>
Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/kde-l10n/
X-VCS-Repository: proj/kde
X-VCS-Files: kde-apps/kde-l10n/kde-l10n-14.12.3.ebuild
X-VCS-Directories: kde-apps/kde-l10n/
X-VCS-Committer: mrueg
X-VCS-Committer-Name: Manuel Rüger
X-VCS-Revision: 457f9132a30f13cda6f25160f1c84e284de7298c
X-VCS-Branch: master
Date: Mon, 13 Apr 2015 13:23:37 +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
X-Archives-Salt: 1bf44d82-d9b7-4258-bbeb-e1c34274c739
X-Archives-Hash: 9f65d0adcc917ac921e1f661a2d934ca

commit:     457f9132a30f13cda6f25160f1c84e284de7298c
Author:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 13 13:23:21 2015 +0000
Commit:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Mon Apr 13 13:23:21 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=457f9132

[kde-apps/kde-l10n] Drop files due to collisions with plasma-5.3

Package-Manager: portage-2.2.18

 kde-apps/kde-l10n/kde-l10n-14.12.3.ebuild | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/kde-apps/kde-l10n/kde-l10n-14.12.3.ebuild b/kde-apps/kde-l10n/kde-l10n-14.12.3.ebuild
index 408ec15..bab7cae 100644
--- a/kde-apps/kde-l10n/kde-l10n-14.12.3.ebuild
+++ b/kde-apps/kde-l10n/kde-l10n-14.12.3.ebuild
@@ -122,6 +122,11 @@ kio_baloosearch,kio_tags,kio_timeline,plasma_runner_baloosearchrunner}.po
 
 					# KDE Applications 4
 					rm -f "${S}"/${DIR}/4/${LNG}/messages/applications/useraccount.po
+
+					# Plasma 5.3 - kdesu
+					sed -i -e '/kdesu/ s/^/#/' "${S}"/${DIR}/4/${LNG}/docs/kde-runtime/CMakeLists.txt
+					sed -i -e '/ksysguard/ s/^/#/' "${S}"/${DIR}/4/${LNG}/docs/kde-workspace/CMakeLists.txt
+
 				fi
 			fi
 		done