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

[Mike Gilbert]

commit:     016c65498fd675d39b641087a178094c88b81cb2
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Mon Oct  3 15:31:37 2016 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Oct  3 15:32:49 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=016c6549

dev-python/six: cd "${HOME}" in pkg_preinst

Package-Manager: portage-2.3.1_p4_p808957

 dev-python/six/six-1.10.0.ebuild | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/dev-python/six/six-1.10.0.ebuild b/dev-python/six/six-1.10.0.ebuild
index 29971c2..41801a1 100644
--- a/dev-python/six/six-1.10.0.ebuild
+++ b/dev-python/six/six-1.10.0.ebuild
@@ -58,8 +58,11 @@ python_install_all() {
        distutils-r1_python_install_all
 }
 
+# Remove pkg_preinst in the next version bump
 pkg_preinst() {
-       # Remove this in the next version bump
+       # https://bugs.gentoo.org/585146
+       cd "${HOME}" || die
+
        _cleanup() {
                local pyver=$("${PYTHON}" -c "from distutils.sysconfig import 
get_python_version; print(get_python_version())")
                local 
egginfo="${ROOT%/}$(python_get_sitedir)/${P}-py${pyver}.egg-info"
@@ -68,10 +71,5 @@ pkg_preinst() {
                        rm -r "${egginfo}" || die "Failed to remove egg-info 
directory"
                fi
        }
-       # https://bugs.gentoo.org/585146
-       local tmpdir="$(mktemp -d)"
-       [[ -n ${tmpdir} ]] || die
-       cd "${tmpdir}" || die
        python_foreach_impl _cleanup
-       rmdir "${tmpdir}"
 }