From 66f834609b1e29620d09fdc91f9388e52ddae0ef Mon Sep 17 00:00:00 2001
From: Michał Górny <mgorny@gentoo.org>
Date: Sat, 17 Feb 2018 13:45:30 +0100
Subject: dev-python/natgrid: Strip mpltoolkits/__init__.py correctly

Closes: https://bugs.gentoo.org/647850
---
 dev-python/natgrid/natgrid-0.2.1-r2.ebuild | 32 ------------------------------
 dev-python/natgrid/natgrid-0.2.1-r3.ebuild | 32 ++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 32 deletions(-)
 delete mode 100644 dev-python/natgrid/natgrid-0.2.1-r2.ebuild
 create mode 100644 dev-python/natgrid/natgrid-0.2.1-r3.ebuild

(limited to 'dev-python/natgrid')

diff --git a/dev-python/natgrid/natgrid-0.2.1-r2.ebuild b/dev-python/natgrid/natgrid-0.2.1-r2.ebuild
deleted file mode 100644
index 52464d9027dd..000000000000
--- a/dev-python/natgrid/natgrid-0.2.1-r2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Matplotlib toolkit for gridding irreguraly spaced data"
-HOMEPAGE="http://matplotlib.sourceforge.net/users/toolkits.html"
-SRC_URI="mirror://sourceforge/matplotlib/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND=">=dev-python/matplotlib-0.98[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-python_install_all() {
-	insinto /usr/share/doc/${PF}
-	doins test.py || die "doins failed"
-	distutils-r1_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
-}
diff --git a/dev-python/natgrid/natgrid-0.2.1-r3.ebuild b/dev-python/natgrid/natgrid-0.2.1-r3.ebuild
new file mode 100644
index 000000000000..692c19f46d7d
--- /dev/null
+++ b/dev-python/natgrid/natgrid-0.2.1-r3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Matplotlib toolkit for gridding irreguraly spaced data"
+HOMEPAGE="http://matplotlib.sourceforge.net/users/toolkits.html"
+SRC_URI="mirror://sourceforge/matplotlib/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND=">=dev-python/matplotlib-0.98[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+python_install_all() {
+	insinto /usr/share/doc/${PF}
+	doins test.py || die "doins failed"
+	distutils-r1_python_install_all
+}
+
+python_install() {
+	# namespace installed by dev-python/matplotlib
+	rm "${BUILD_DIR}/lib/mpl_toolkits/__init__.py" || die
+	distutils-r1_python_install --skip-build
+}
-- 
cgit v1.2.3-65-gdbad