From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-796039-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 3734A138C9D
	for <garchives@archives.gentoo.org>; Sun, 26 Apr 2015 02:06:43 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 42E93E080A;
	Sun, 26 Apr 2015 02:06:42 +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 92C2CE0821
	for <gentoo-commits@lists.gentoo.org>; Sun, 26 Apr 2015 02:06: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 C9782340E98
	for <gentoo-commits@lists.gentoo.org>; Sun, 26 Apr 2015 02:06:40 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 87E6D985
	for <gentoo-commits@lists.gentoo.org>; Sun, 26 Apr 2015 02:06:35 +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: <1429485719.10e76ae53f1d52c6de054f37cc33390e9ca0100f.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-r1.ebuild
X-VCS-Directories: kde-apps/kde-l10n/
X-VCS-Committer: mrueg
X-VCS-Committer-Name: Manuel Rüger
X-VCS-Revision: 10e76ae53f1d52c6de054f37cc33390e9ca0100f
X-VCS-Branch: master
Date: Sun, 26 Apr 2015 02:06:35 +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: 35a7be2d-abc6-4c68-9101-1181d3feeadb
X-Archives-Hash: 550ea870744f8f3f819c8d09f171bd4d

commit:     10e76ae53f1d52c6de054f37cc33390e9ca0100f
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun Apr 19 23:21:59 2015 +0000
Commit:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Sun Apr 19 23:21:59 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=10e76ae5

[kde-apps/kde-l10n] Drop klipper handbook

File collision with plasma-workspace-5.3

Package-Manager: portage-2.2.14

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

diff --git a/kde-apps/kde-l10n/kde-l10n-14.12.3-r1.ebuild b/kde-apps/kde-l10n/kde-l10n-14.12.3-r1.ebuild
index ba76461..26eaed8 100644
--- a/kde-apps/kde-l10n/kde-l10n-14.12.3-r1.ebuild
+++ b/kde-apps/kde-l10n/kde-l10n-14.12.3-r1.ebuild
@@ -147,6 +147,9 @@ kio_baloosearch,kio_tags,kio_timeline,plasma_runner_baloosearchrunner}.po
 						-e '/desktopthemedetails/ s/^/#/'\
 						"${S}"/${DIR}/4/${LNG}/docs/kde-workspace/kcontrol/CMakeLists.txt
 
+					sed -i -e '/docbook/ s/^/#/'\
+						"${S}"/${DIR}/4/${LNG}/docs/kde-workspace/klipper/CMakeLists.txt
+
 				fi
 			fi
 		done