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

[Mike Gilbert]

commit:     660b793b6b704b2e3a9b3bc6e4257fb61e60bd0b
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  8 16:33:08 2015 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Tue Dec  8 16:33:08 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=660b793b

dev-python/six: Drop pkg_pretend check for six directory

Calling python_foreach_impl from pkg_pretend currently fails if the relevent
versions of dev-lang/python are not installed. pkg_pretend runs before
dependencies are installed, so we can't rely on them.

Package-Manager: portage-2.2.26_p10

 dev-python/six/six-1.10.0.ebuild | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

diff --git a/dev-python/six/six-1.10.0.ebuild b/dev-python/six/six-1.10.0.ebuild
index 2774a62..b00b76c 100644
--- a/dev-python/six/six-1.10.0.ebuild
+++ b/dev-python/six/six-1.10.0.ebuild
@@ -26,25 +26,12 @@ PATCHES=(
 	"${FILESDIR}"/1.9.0-mapping.patch
 	)
 
-# Run twice.
-# pkg_pretend to catch as early as possible, but be forgiving if 
-# python impl is not installed allready.
-# pkg_setup to catch them all
-pkg_pretend() {
-	six_dir_check() {
-		type -p "${PYTHON}" > /dev/null || return 0
-		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
-}
-
 pkg_setup() {
 	six_dir_check() {
 		local dir="${ROOT%/}$(python_get_sitedir)"/six
-		[[ -d "${dir}" ]] \
-			&& die "${PN} doesn't work if ${dir} is a directory #546730"
+		if [[ -d "${dir}" ]]; then
+			die "${PN} doesn't work if ${dir} is a directory #546730"
+		fi
 	}
 	python_foreach_impl six_dir_check
 }