From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-765204-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 6ABE2138A1A
	for <garchives@archives.gentoo.org>; Sun, 18 Jan 2015 14:57:28 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 05A53E08D2;
	Sun, 18 Jan 2015 14:57:28 +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 9A3A5E08D2
	for <gentoo-commits@lists.gentoo.org>; Sun, 18 Jan 2015 14:57:27 +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 E128B33FEDE
	for <gentoo-commits@lists.gentoo.org>; Sun, 18 Jan 2015 14:57:26 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 3A504FD97
	for <gentoo-commits@lists.gentoo.org>; Sun, 18 Jan 2015 14:57:23 +0000 (UTC)
From: "Johannes Huber" <johu@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, "Johannes Huber" <johu@gentoo.org>
Message-ID: <1421593013.7a36c07883683dd53e210b04726bcdac868d0f35.johu@gentoo>
Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/lokalize/
X-VCS-Repository: proj/kde
X-VCS-Files: kde-apps/lokalize/lokalize-9999.ebuild
X-VCS-Directories: kde-apps/lokalize/
X-VCS-Committer: johu
X-VCS-Committer-Name: Johannes Huber
X-VCS-Revision: 7a36c07883683dd53e210b04726bcdac868d0f35
X-VCS-Branch: master
Date: Sun, 18 Jan 2015 14:57:23 +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: 143a1d3f-aa4d-4164-8d8f-2ea0c5d1319c
X-Archives-Hash: 29ea87934f2823800f2551269ead919c

commit:     7a36c07883683dd53e210b04726bcdac868d0f35
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 18 14:56:53 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun Jan 18 14:56:53 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=7a36c078

[kde-apps/lokalize] Fix file collisions

Package-Manager: portage-2.2.15

---
 kde-apps/lokalize/lokalize-9999.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/kde-apps/lokalize/lokalize-9999.ebuild b/kde-apps/lokalize/lokalize-9999.ebuild
index 92c0b67..74e44f8 100644
--- a/kde-apps/lokalize/lokalize-9999.ebuild
+++ b/kde-apps/lokalize/lokalize-9999.ebuild
@@ -34,6 +34,8 @@ DEPEND="${PYTHON_DEPS}
 "
 RDEPEND="${DEPEND}
 	$(add_kdeapps_dep pykde5 "${PYTHON_USEDEP}")
+	!kde-apps/lokalize:4
+	!kde-base/lokalize
 "
 
 pkg_setup() {