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 775F41382C5 for ; Sat, 17 Feb 2018 13:41:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DF899E09D8; Sat, 17 Feb 2018 13:41:20 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BD682E09D8 for ; Sat, 17 Feb 2018 13:41:20 +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 9E50C335C06 for ; Sat, 17 Feb 2018 13:41:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2DADC206 for ; Sat, 17 Feb 2018 13:41:18 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1518874871.1fc9d2b69c7d60198c40cc868dfbe05e33dcfb28.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/sphinxcontrib-asyncio/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.2.0-r1.ebuild dev-python/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.2.0-r2.ebuild X-VCS-Directories: dev-python/sphinxcontrib-asyncio/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 1fc9d2b69c7d60198c40cc868dfbe05e33dcfb28 X-VCS-Branch: master Date: Sat, 17 Feb 2018 13:41:18 +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: c6e128a5-0f25-463c-b5b1-714fa0a63b42 X-Archives-Hash: 1968f050d03b2cff980cb6560e33e79c commit: 1fc9d2b69c7d60198c40cc868dfbe05e33dcfb28 Author: Michał Górny gentoo org> AuthorDate: Sat Feb 17 13:37:10 2018 +0000 Commit: Michał Górny gentoo org> CommitDate: Sat Feb 17 13:41:11 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1fc9d2b6 dev-python/sphinxcontrib-asyncio: Fix namespace cleanup Closes: https://bugs.gentoo.org/625872 ...0.2.0-r1.ebuild => sphinxcontrib-asyncio-0.2.0-r2.ebuild} | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dev-python/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.2.0-r1.ebuild b/dev-python/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.2.0-r2.ebuild similarity index 80% rename from dev-python/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.2.0-r1.ebuild rename to dev-python/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.2.0-r2.ebuild index fe969fc8bba..ef4858611d7 100644 --- a/dev-python/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.2.0-r1.ebuild +++ b/dev-python/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.2.0-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -26,14 +26,14 @@ python_compile_all() { use doc && emake -C docs html } +python_install() { + rm "${BUILD_DIR}"/lib/sphinxcontrib/__init__.py || die + distutils-r1_python_install --skip-build +} + python_install_all() { use doc && local HTML_DOCS=( docs/_build/html/. ) distutils-r1_python_install_all # clean up pth files bug #623852 find "${ED}" -name '*.pth' -delete || die - # collision bug #625872 - _namespace_cleanup() { - rm "${D%/}"$(python_get_sitedir)/sphinxcontrib/__init__.py || die - } - python_foreach_impl _namespace_cleanup }