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

[Justin Lecher]

commit:     051dbce592efbbe452528d2572e85806e89b8529
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 30 07:24:40 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Nov 30 07:24:40 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=051dbce5

dev-python/six: Run six dir QA check twice

Using pkg_pretend to catch as early as possible but don't break when python
impl is not installed. Use pkg_Setup to catch them all

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

 dev-python/six/six-1.10.0.ebuild | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/dev-python/six/six-1.10.0.ebuild b/dev-python/six/six-1.10.0.ebuild
index 6161e0a..ffbb168 100644
--- a/dev-python/six/six-1.10.0.ebuild
+++ b/dev-python/six/six-1.10.0.ebuild
@@ -26,9 +26,23 @@ 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() {
                local dir="${ROOT}"/$(python_get_sitedir)/six
+               type -p "${PYTHON}" > /dev/null || return 0
+               [[ -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"
        }