From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-893065-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id D793113832E
	for <garchives@archives.gentoo.org>; Fri, 22 Jul 2016 17:30:12 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 1EF9DE0A5F;
	Fri, 22 Jul 2016 17:30:10 +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 C0E43E0A5F
	for <gentoo-commits@lists.gentoo.org>; Fri, 22 Jul 2016 17:30:09 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
	(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 2E7CA33D3C5
	for <gentoo-commits@lists.gentoo.org>; Fri, 22 Jul 2016 17:30:08 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 482BB7D8
	for <gentoo-commits@lists.gentoo.org>; Fri, 22 Jul 2016 17:30:05 +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: <1469208595.c00eea2aca667fa353992fbf47c887be694ce89d.kensington@gentoo>
Subject: [gentoo-commits] proj/kde:master commit in: kde-frameworks/kdelibs4support/
X-VCS-Repository: proj/kde
X-VCS-Files: kde-frameworks/kdelibs4support/kdelibs4support-9999.ebuild
X-VCS-Directories: kde-frameworks/kdelibs4support/
X-VCS-Committer: kensington
X-VCS-Committer-Name: Michael Palimaka
X-VCS-Revision: c00eea2aca667fa353992fbf47c887be694ce89d
X-VCS-Branch: master
Date: Fri, 22 Jul 2016 17:30:05 +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: 2b3b2e27-892e-4196-af9f-b8f164bf69c8
X-Archives-Hash: 3dad3d1810d6b287f76789318d65c8ba

commit:     c00eea2aca667fa353992fbf47c887be694ce89d
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 20 13:05:41 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Jul 22 17:29:55 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=c00eea2a

kde-frameworks/kdelibs4support: introduce blocker to avoid file collision due to incorrect build order

Gentoo-bug: 588436

Package-Manager: portage-2.3.0

 kde-frameworks/kdelibs4support/kdelibs4support-9999.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kde-frameworks/kdelibs4support/kdelibs4support-9999.ebuild b/kde-frameworks/kdelibs4support/kdelibs4support-9999.ebuild
index 0b7620d..bef91e7 100644
--- a/kde-frameworks/kdelibs4support/kdelibs4support-9999.ebuild
+++ b/kde-frameworks/kdelibs4support/kdelibs4support-9999.ebuild
@@ -65,6 +65,7 @@ RDEPEND="${COMMON_DEPEND}
 	$(add_frameworks_dep kitemmodels)
 	$(add_qt_dep qtxml)
 	!<kde-apps/kcontrol-15.08.0[handbook]
+	!<kde-apps/kde4-l10n-16.04.3
 "
 DEPEND="${COMMON_DEPEND}
 	$(add_frameworks_dep kdoctools)