projects / gentoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: faa504a)
dev-python/rtslib-fb: add conflict with rtslib for bug 580378
authorMatthew Thode <prometheanfire@gentoo.org>
Thu, 21 Apr 2016 05:31:27 +0000 (00:31 -0500)
committerMatthew Thode <prometheanfire@gentoo.org>
Thu, 21 Apr 2016 05:32:09 +0000 (00:32 -0500)
Package-Manager: portage-2.2.26

dev-python/rtslib-fb/rtslib-fb-2.1.47.ebuild patch | blob | history
dev-python/rtslib-fb/rtslib-fb-2.1.57.ebuild patch | blob | history

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 c660de9cb9f0b477cba6ee16cc30a16e336d60a1..1831cb564b8718b9d4748554fbd936e6474014ac 100644 (file)
--- 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 e3a86e37a8a939b0d85db8c63550e952caecd36b..cbf4288463cfe1d722cdcb9514378a1e45fdf507 100644 (file)
--- 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=""
Unnamed repository; edit this file 'description' to name the repository.