From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-877536-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 668FA1381F3
	for <garchives@archives.gentoo.org>; Thu, 21 Apr 2016 05:32:57 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id E2FAB21C058;
	Thu, 21 Apr 2016 05:32:54 +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 88E9B21C058
	for <gentoo-commits@lists.gentoo.org>; Thu, 21 Apr 2016 05:32:54 +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 644D1340B30
	for <gentoo-commits@lists.gentoo.org>; Thu, 21 Apr 2016 05:32:53 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 5A0AB256
	for <gentoo-commits@lists.gentoo.org>; Thu, 21 Apr 2016 05:32:49 +0000 (UTC)
From: "Matt Thode" <prometheanfire@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, "Matt Thode" <prometheanfire@gentoo.org>
Message-ID: <1461216729.faa504a9e6162eb921a99942c2986ce012cb467f.prometheanfire@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/rtslib/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-python/rtslib/rtslib-9999.ebuild
X-VCS-Directories: dev-python/rtslib/
X-VCS-Committer: prometheanfire
X-VCS-Committer-Name: Matt Thode
X-VCS-Revision: faa504a9e6162eb921a99942c2986ce012cb467f
X-VCS-Branch: master
Date: Thu, 21 Apr 2016 05:32:49 +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: 295578ca-e019-45a4-973f-f4e98c72d8e2
X-Archives-Hash: dfdf10c68676da773cd624c0d6b5a44f

commit:     faa504a9e6162eb921a99942c2986ce012cb467f
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 21 05:29:00 2016 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Thu Apr 21 05:32:09 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=faa504a9

dev-python/rtslib: add conflict with rtslib-fb for bug 580378

Package-Manager: portage-2.2.26

 dev-python/rtslib/rtslib-9999.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev-python/rtslib/rtslib-9999.ebuild b/dev-python/rtslib/rtslib-9999.ebuild
index 4902bf6..361b601 100644
--- a/dev-python/rtslib/rtslib-9999.ebuild
+++ b/dev-python/rtslib/rtslib-9999.ebuild
@@ -22,6 +22,7 @@ DEPEND="
 	dev-python/configobj[${PYTHON_USEDEP}]
 	dev-python/ipaddr[${PYTHON_USEDEP}]
 	dev-python/netifaces[${PYTHON_USEDEP}]
+	!dev-python/rtslib-fb[${PYTHON_USEDEP}]
 	"
 RDEPEND="${DEPEND}"