[gentoo-commits] repo/gentoo:master commit in: dev-python/rtslib-fb/

[Matt Thode]

commit:     11204367fd2819bb10de0c05d319ff6bcb86c4ae
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 21 05:31:27 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=11204367

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

Package-Manager: portage-2.2.26

 dev-python/rtslib-fb/rtslib-fb-2.1.47.ebuild | 3 ++-
 dev-python/rtslib-fb/rtslib-fb-2.1.57.ebuild | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

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 c660de9..1831cb5 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 e3a86e3..cbf4288 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=""