From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-832619-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 308971384C3
	for <garchives@archives.gentoo.org>; Sat,  5 Sep 2015 16:20:37 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id F1464143C9;
	Sat,  5 Sep 2015 16:20:31 +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 C0B69143C8
	for <gentoo-commits@lists.gentoo.org>; Sat,  5 Sep 2015 16:20:30 +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 0F41E3408A6
	for <gentoo-commits@lists.gentoo.org>; Sat,  5 Sep 2015 16:20:30 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 8CC1718E
	for <gentoo-commits@lists.gentoo.org>; Sat,  5 Sep 2015 16:20:26 +0000 (UTC)
From: "Andreas Hüttel" <dilfridge@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, "Andreas Hüttel" <dilfridge@gentoo.org>
Message-ID: <1441141567.e83f2381f773c385f905b755911ffd2b09db6814.dilfridge@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: kde-apps/kde-l10n/
X-VCS-Repository: repo/gentoo
X-VCS-Files: kde-apps/kde-l10n/kde-l10n-15.08.0-r1.ebuild
X-VCS-Directories: kde-apps/kde-l10n/
X-VCS-Committer: dilfridge
X-VCS-Committer-Name: Andreas Hüttel
X-VCS-Revision: e83f2381f773c385f905b755911ffd2b09db6814
X-VCS-Branch: master
Date: Sat,  5 Sep 2015 16:20:26 +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: 791ed46c-24be-4416-9262-234bd4aed04c
X-Archives-Hash: ef02c87f882ffa5360f3e2fbc15f0f75

commit:     e83f2381f773c385f905b755911ffd2b09db6814
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Mon Aug 31 20:23:50 2015 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Sep  1 21:06:07 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e83f2381

kde-apps/kde-l10n: Drop ktp translations

Before move to kde applications, translations were kept internal -
that makes old ktp:4 packages collide with kde-apps/kde-l10n

Package-Manager: portage-2.2.20.1

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

diff --git a/kde-apps/kde-l10n/kde-l10n-15.08.0-r1.ebuild b/kde-apps/kde-l10n/kde-l10n-15.08.0-r1.ebuild
index 2e5e8a5..4c2dbb9 100644
--- a/kde-apps/kde-l10n/kde-l10n-15.08.0-r1.ebuild
+++ b/kde-apps/kde-l10n/kde-l10n-15.08.0-r1.ebuild
@@ -17,6 +17,7 @@ RDEPEND="
 	!<kde-apps/kde4-l10n-${PV}
 	!kde-apps/kde4-l10n[-minimal]
 	!<kde-apps/kdepim-l10n-${PV}
+	!<kde-apps/ktp-l10n-${PV}
 "
 
 KEYWORDS=" ~amd64 ~x86"
@@ -71,6 +72,13 @@ src_prepare() {
 						-exec sed -i -e "/add_subdirectory( *${subdir} *)/ s/^/#/" {} +
 				done
 
+				# Remove ktp translations (part of kde-apps/ktp-l10n)
+				# Drop that hack (and kde-apps/ktp-l10n) after ktp:4 removal
+				find "${S}"/${DIR}/5/${LNG}/messages/kdenetwork -type f \
+					\( -name kaccounts*po -o -name kcm_ktp*po -o -name kcmtelepathy*po \
+					-o -name kded_ktp*po -o -name ktp*po -o -name plasma*ktp*po \) \
+					-delete
+
 				# Handbook optional
 				sed -e '/KF5DocTools/ s/ REQUIRED//'\
 					-i "${S}"/${DIR}/5/${LNG}/CMakeLists.txt || die