From 66f834609b1e29620d09fdc91f9388e52ddae0ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Sat, 17 Feb 2018 13:45:30 +0100 Subject: [PATCH] dev-python/natgrid: Strip mpltoolkits/__init__.py correctly Closes: https://bugs.gentoo.org/647850 --- .../{natgrid-0.2.1-r2.ebuild => natgrid-0.2.1-r3.ebuild} | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) rename dev-python/natgrid/{natgrid-0.2.1-r2.ebuild => natgrid-0.2.1-r3.ebuild} (77%) 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 52464d9027dd0..692c19f46d7d9 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 }