From: Justin Lecher <jlec@gentoo.org>
Date: Fri, 20 Nov 2015 11:00:44 +0000 (+0100)
Subject: dev-python/six: Break if SITEDIR/six is a dir
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=24f3b61dbd6db8a41c01dc5ea8bd5bf4b87704b2;p=gentoo.git

dev-python/six: Break if SITEDIR/six is a dir

Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=546730

Package-Manager: portage-2.2.25
Signed-off-by: Justin Lecher <jlec@gentoo.org>
---

diff --git a/dev-python/six/six-1.10.0.ebuild b/dev-python/six/six-1.10.0.ebuild
index 9faef64ea365..ed0c5b8e716b 100644
--- a/dev-python/six/six-1.10.0.ebuild
+++ b/dev-python/six/six-1.10.0.ebuild
@@ -26,6 +26,15 @@ PATCHES=(
 	"${FILESDIR}"/1.9.0-mapping.patch
 	)
 
+pkg_pretend() {
+	six_dir_check() {
+		local dir="${ROOT}"/$(python_get_sitedir)/six
+		[[ -d "${dir}" ]] \
+			&& die "${PN} doesn't work if ${dir} is a directory #546730"
+	}
+	python_foreach_impl six_dir_check
+}
+
 python_prepare_all() {
 	# https://bitbucket.org/gutworth/six/issues/139/
 	sed \