From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B6D4C139694 for ; Sat, 10 Jun 2017 17:18:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 981E521C1E8; Sat, 10 Jun 2017 17:18:00 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7511F21C1E8 for ; Sat, 10 Jun 2017 17:18:00 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8E05E3418FD for ; Sat, 10 Jun 2017 17:17:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9B9D0745D for ; Sat, 10 Jun 2017 17:17:57 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1497115055.97e585761ef4fcea2d5f50918e3abe7be213331a.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/backports-functools-lru-cache/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/backports-functools-lru-cache/backports-functools-lru-cache-1.4-r1.ebuild dev-python/backports-functools-lru-cache/backports-functools-lru-cache-1.4.ebuild X-VCS-Directories: dev-python/backports-functools-lru-cache/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 97e585761ef4fcea2d5f50918e3abe7be213331a X-VCS-Branch: master Date: Sat, 10 Jun 2017 17:17:57 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 155e85e6-8c19-4f15-85a9-361289083df7 X-Archives-Hash: 007947abfdabe4d1ac243b94c9559c3b commit: 97e585761ef4fcea2d5f50918e3abe7be213331a Author: Louis Sautier gmail com> AuthorDate: Fri Jun 9 15:48:01 2017 +0000 Commit: Mike Gilbert gentoo 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 }