commit: 97e585761ef4fcea2d5f50918e3abe7be213331a Author: Louis Sautier <sautier.louis <AT> gmail <DOT> com> AuthorDate: Fri Jun 9 15:48:01 2017 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Sat Jun 10 17:17:35 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97e58576
dev-python/backports-functools-lru-cache: remove conflicting bytecode files Package-Manager: Portage-2.3.6, Repoman-2.3.2 Gentoo-Bug: 621196 Closes: https://github.com/gentoo/gentoo/pull/4894 ...he-1.4.ebuild => backports-functools-lru-cache-1.4-r1.ebuild} | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dev-python/backports-functools-lru-cache/backports-functools-lru-cache-1.4.ebuild b/dev-python/backports-functools-lru-cache/backports-functools-lru-cache-1.4-r1.ebuild similarity index 90% rename from dev-python/backports-functools-lru-cache/backports-functools-lru-cache-1.4.ebuild rename to dev-python/backports-functools-lru-cache/backports-functools-lru-cache-1.4-r1.ebuild index a91b8b0f4d9..ec0e2e47b42 100644 --- a/dev-python/backports-functools-lru-cache/backports-functools-lru-cache-1.4.ebuild +++ b/dev-python/backports-functools-lru-cache/backports-functools-lru-cache-1.4-r1.ebuild @@ -24,8 +24,8 @@ DEPEND=" >=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}] doc? ( >=dev-python/jaraco-packaging-3.2[${PYTHON_USEDEP}] - dev-python/sphinx[${PYTHON_USEDEP}] dev-python/rst-linker[${PYTHON_USEDEP}] + dev-python/sphinx[${PYTHON_USEDEP}] ) test? ( >=dev-python/pytest-2.8[${PYTHON_USEDEP}] @@ -46,9 +46,8 @@ python_test() { PYTHONPATH=. py.test || die "tests failed with ${EPYTHON}" } -python_install_all() { - distutils-r1_python_install_all - +python_install() { # avoid a collision with dev-python/backports - find "${D}" -path '*/backports/__init__.py' -delete || die + rm "${BUILD_DIR}"/lib/backports/__init__.py || die + distutils-r1_python_install --skip-build }
