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
This commit is contained in:
Mike Gilbert
2015-12-08 11:33:08 -05:00
parent 2808e2bee3
commit 660b793b6b

View File

@@ -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
}