From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-964884-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 B526F139694
	for <garchives@archives.gentoo.org>; Tue,  1 Aug 2017 16:39:15 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 02EB21FC0DD;
	Tue,  1 Aug 2017 16:39:15 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id DA5881FC0DD
	for <gentoo-commits@lists.gentoo.org>; Tue,  1 Aug 2017 16:39:14 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 16B6D341824
	for <gentoo-commits@lists.gentoo.org>; Tue,  1 Aug 2017 16:39:14 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id B209F7593
	for <gentoo-commits@lists.gentoo.org>; Tue,  1 Aug 2017 16:39:12 +0000 (UTC)
From: "Keri Harris" <keri@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, "Keri Harris" <keri@gentoo.org>
Message-ID: <1501605536.7af091fee0fe97f41d4309edf3fe2c1c6143f792.keri@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/qu-prolog/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-lang/qu-prolog/qu-prolog-10.0.ebuild
X-VCS-Directories: dev-lang/qu-prolog/
X-VCS-Committer: keri
X-VCS-Committer-Name: Keri Harris
X-VCS-Revision: 7af091fee0fe97f41d4309edf3fe2c1c6143f792
X-VCS-Branch: master
Date: Tue,  1 Aug 2017 16:39:12 +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: f0c70ab4-7e0f-403f-b961-04dc212be8d4
X-Archives-Hash: 1657363625b03c8ceb2b9932c19370c4

commit:     7af091fee0fe97f41d4309edf3fe2c1c6143f792
Author:     Keri Harris <keri <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  1 16:38:56 2017 +0000
Commit:     Keri Harris <keri <AT> gentoo <DOT> org>
CommitDate: Tue Aug  1 16:38:56 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7af091fe

dev-lang/qu-prolog: block games-rpg/kqlives due to file collision. See bug #597790

Package-Manager: Portage-2.3.0, Repoman-2.3.1

 dev-lang/qu-prolog/qu-prolog-10.0.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dev-lang/qu-prolog/qu-prolog-10.0.ebuild b/dev-lang/qu-prolog/qu-prolog-10.0.ebuild
index 15d7adb69ed..0e221616b1e 100644
--- a/dev-lang/qu-prolog/qu-prolog-10.0.ebuild
+++ b/dev-lang/qu-prolog/qu-prolog-10.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -19,6 +19,7 @@ IUSE="debug doc examples pedro qt4 readline threads"
 RDEPEND="
 	!dev-util/mpatch
 	!dev-util/rej
+	!games-rpg/kqlives
 	qt4? ( dev-qt/qtgui:4 )
 	pedro? ( net-misc/pedro )
 	readline? ( app-misc/rlwrap )"