From: Michał Górny <mgorny@gentoo.org>
Date: Sat, 3 Nov 2018 08:32:46 +0000 (+0100)
Subject: dev-python/memory_profiler: Add blocker on dev-lang/mercury
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=f6a3c514c0fa07d69ecec70304f9b9144f68d261;p=gentoo.git

dev-python/memory_profiler: Add blocker on dev-lang/mercury

Closes: https://bugs.gentoo.org/571176
Signed-off-by: Michał Górny <mgorny@gentoo.org>
---

diff --git a/dev-python/memory_profiler/memory_profiler-0.54.0.ebuild b/dev-python/memory_profiler/memory_profiler-0.54.0.ebuild
index 905633999611..c04c067d81f3 100644
--- a/dev-python/memory_profiler/memory_profiler-0.54.0.ebuild
+++ b/dev-python/memory_profiler/memory_profiler-0.54.0.ebuild
@@ -15,8 +15,11 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 
+# dev-lang/mercury: collision on 'mprof'
+# https://bugs.gentoo.org/571176
 RDEPEND="
 	dev-python/psutil[${PYTHON_USEDEP}]
+	!dev-lang/mercury
 "
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]"