commit: 9cb36112ae4e50d81844f62d8c043cc75963f7e4 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Fri Jan 22 17:41:48 2016 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Fri Jan 22 17:41:58 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cb36112
dev-python/backports-ssl-match-hostname: Fix file collison Bug: https://bugs.gentoo.org/572610 Package-Manager: portage-2.2.27_p47 ....0.1.ebuild => backports-ssl-match-hostname-3.5.0.1-r1.ebuild} | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dev-python/backports-ssl-match-hostname/backports-ssl-match-hostname-3.5.0.1.ebuild b/dev-python/backports-ssl-match-hostname/backports-ssl-match-hostname-3.5.0.1-r1.ebuild similarity index 86% rename from dev-python/backports-ssl-match-hostname/backports-ssl-match-hostname-3.5.0.1.ebuild rename to dev-python/backports-ssl-match-hostname/backports-ssl-match-hostname-3.5.0.1-r1.ebuild index 14196a4..89628b3 100644 --- a/dev-python/backports-ssl-match-hostname/backports-ssl-match-hostname-3.5.0.1.ebuild +++ b/dev-python/backports-ssl-match-hostname/backports-ssl-match-hostname-3.5.0.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -30,8 +30,8 @@ python_install_all() { } python_install() { - distutils-r1_python_install - # main namespace provided by dev-python/backports - rm "${ED}$(python_get_sitedir)"/backports/__init__.py* || die + rm "${BUILD_DIR}"/lib/backports/__init__.py || die + rm -f backports/__init__.py || die + distutils-r1_python_install }
