From: Matthew Thode <prometheanfire@gentoo.org>
Date: Thu, 21 Apr 2016 05:31:27 +0000 (-0500)
Subject: dev-python/rtslib-fb: add conflict with rtslib for bug 580378
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=11204367fd2819bb10de0c05d319ff6bcb86c4ae;p=gentoo.git

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

Package-Manager: portage-2.2.26
---

diff --git a/dev-python/rtslib-fb/rtslib-fb-2.1.47.ebuild b/dev-python/rtslib-fb/rtslib-fb-2.1.47.ebuild
index c660de9cb9f0..1831cb564b87 100644
--- a/dev-python/rtslib-fb/rtslib-fb-2.1.47.ebuild
+++ b/dev-python/rtslib-fb/rtslib-fb-2.1.47.ebuild
@@ -16,5 +16,6 @@ SLOT="0"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	!dev-python/rtslib[${PYTHON_USEDEP}]"
 RDEPEND=""
diff --git a/dev-python/rtslib-fb/rtslib-fb-2.1.57.ebuild b/dev-python/rtslib-fb/rtslib-fb-2.1.57.ebuild
index e3a86e37a8a9..cbf4288463cf 100644
--- a/dev-python/rtslib-fb/rtslib-fb-2.1.57.ebuild
+++ b/dev-python/rtslib-fb/rtslib-fb-2.1.57.ebuild
@@ -16,5 +16,6 @@ SLOT="0"
 KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	!dev-python/rtslib[${PYTHON_USEDEP}]"
 RDEPEND=""