From: Louis Sautier <sautier.louis@gmail.com>
Date: Fri, 9 Jun 2017 15:48:01 +0000 (+0200)
Subject: dev-python/backports-functools-lru-cache: remove conflicting bytecode files
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=97e585761ef4fcea2d5f50918e3abe7be213331a;p=gentoo.git

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

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 a91b8b0f4d9b..ec0e2e47b428 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
 }