From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-875247-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 EF93C59CAF
for <garchives@archives.gentoo.org>; Thu, 7 Apr 2016 19:19:16 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 8AD7921C048;
Thu, 7 Apr 2016 19:19:05 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 129DC21C048
for <gentoo-commits@lists.gentoo.org>; Thu, 7 Apr 2016 19:19:05 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 3570E340D90
for <gentoo-commits@lists.gentoo.org>; Thu, 7 Apr 2016 19:19:04 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 84165201
for <gentoo-commits@lists.gentoo.org>; Thu, 7 Apr 2016 19:19:01 +0000 (UTC)
From: "Michael Palimaka" <kensington@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, "Michael Palimaka" <kensington@gentoo.org>
Message-ID: <1460056728.a7f934f63552689cd86302231abdb7f7ea0e1fa2.kensington@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-16.03.90.ebuild
X-VCS-Directories: kde-apps/kde-l10n/
X-VCS-Committer: kensington
X-VCS-Committer-Name: Michael Palimaka
X-VCS-Revision: a7f934f63552689cd86302231abdb7f7ea0e1fa2
X-VCS-Branch: master
Date: Thu, 7 Apr 2016 19:19:01 +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: 03ba6def-083f-459e-9810-4b20a017d76c
X-Archives-Hash: 2fd3fd619a82bb5eb3b216e324a21563
commit: a7f934f63552689cd86302231abdb7f7ea0e1fa2
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Thu Apr 7 18:43:45 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Apr 7 19:18:48 2016 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=a7f934f6
kde-apps/kde-l10n: Fix file collision w/ kde-plasma/khelpcenter
Package-Manager: portage-2.2.27
kde-apps/kde-l10n/kde-l10n-16.03.90.ebuild | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/kde-apps/kde-l10n/kde-l10n-16.03.90.ebuild b/kde-apps/kde-l10n/kde-l10n-16.03.90.ebuild
index 01cc600..afdddc9 100644
--- a/kde-apps/kde-l10n/kde-l10n-16.03.90.ebuild
+++ b/kde-apps/kde-l10n/kde-l10n-16.03.90.ebuild
@@ -113,4 +113,8 @@ src_test() {
src_install() {
[[ -n ${A} ]] && kde5_src_install
+
+ # FIXME: Temporary removal of file conflict with kde-plasma/khelpcenter
+ # Files should be removed in khelpcenter after pkgmove to kde-apps/
+ rm -rf "${ED}"usr/share/locale/*/LC_MESSAGES/khelpcenter.mo || die
}