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 AFE661382C5 for ; Sat, 17 Feb 2018 13:07:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D0DDFE0996; Sat, 17 Feb 2018 13:07:37 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 AC88FE0996 for ; Sat, 17 Feb 2018 13:07:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 6DB44335C2E for ; Sat, 17 Feb 2018 13:07:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E25341D4 for ; Sat, 17 Feb 2018 13:07:33 +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: <1518872846.66f834609b1e29620d09fdc91f9388e52ddae0ef.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/natgrid/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/natgrid/natgrid-0.2.1-r2.ebuild dev-python/natgrid/natgrid-0.2.1-r3.ebuild X-VCS-Directories: dev-python/natgrid/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 66f834609b1e29620d09fdc91f9388e52ddae0ef X-VCS-Branch: master Date: Sat, 17 Feb 2018 13:07:33 +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: beb0df69-941b-4589-90b0-7b9aa5844b38 X-Archives-Hash: 1b793254f2612b643575143e3f86f649 commit: 66f834609b1e29620d09fdc91f9388e52ddae0ef Author: Michał Górny gentoo org> AuthorDate: Sat Feb 17 12:45:30 2018 +0000 Commit: Michał Górny gentoo org> CommitDate: Sat Feb 17 13:07:26 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66f83460 dev-python/natgrid: Strip mpltoolkits/__init__.py correctly Closes: https://bugs.gentoo.org/647850 .../natgrid/{natgrid-0.2.1-r2.ebuild => natgrid-0.2.1-r3.ebuild} | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dev-python/natgrid/natgrid-0.2.1-r2.ebuild b/dev-python/natgrid/natgrid-0.2.1-r3.ebuild similarity index 77% rename from dev-python/natgrid/natgrid-0.2.1-r2.ebuild rename to dev-python/natgrid/natgrid-0.2.1-r3.ebuild index 52464d9027d..692c19f46d7 100644 --- a/dev-python/natgrid/natgrid-0.2.1-r2.ebuild +++ b/dev-python/natgrid/natgrid-0.2.1-r3.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=5 @@ -26,7 +26,7 @@ python_install_all() { } python_install() { - distutils-r1_python_install - # Fix collision with dev-python/matplotlib. - rm "${D}$(python_get_sitedir)/mpl_toolkits/__init__.py" || die + # namespace installed by dev-python/matplotlib + rm "${BUILD_DIR}/lib/mpl_toolkits/__init__.py" || die + distutils-r1_python_install --skip-build }