revert 0.2.1-r1, revbump, corrected correction applied in revbumped -r2 wrt Bug 478326

(Portage version: 2.1.11.63/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D)

3 files changed, 44 insertions, 3 deletions

diff --git a/dev-python/natgrid/ChangeLog b/dev-python/natgrid/ChangeLog
index 577831ef5783..92a06eab380c 100644
--- a/dev-python/natgrid/ChangeLog
+++ b/dev-python/natgrid/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/natgrid
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/natgrid/ChangeLog,v 1.8 2013/07/29 15:50:16 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/natgrid/ChangeLog,v 1.9 2013/07/29 16:16:07 idella4 Exp $
+
+*natgrid-0.2.1-r2 (29 Jul 2013)
+
+  29 Jul 2013; Ian Delaney <idella4@gentoo.org> +natgrid-0.2.1-r2.ebuild,
+  natgrid-0.2.1-r1.ebuild:
+  revert 0.2.1-r1, revbump, corrected correction applied in revbumped -r2 wrt
+  Bug 478326
 
   29 Jul 2013; Ian Delaney <idella4@gentoo.org> natgrid-0.2.1-r1.ebuild:
   Reset order in python_install, fixes Bug #478326
diff --git a/dev-python/natgrid/natgrid-0.2.1-r1.ebuild b/dev-python/natgrid/natgrid-0.2.1-r1.ebuild
index 613083a2f803..b08124b50972 100644
--- a/dev-python/natgrid/natgrid-0.2.1-r1.ebuild
+++ b/dev-python/natgrid/natgrid-0.2.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/natgrid/natgrid-0.2.1-r1.ebuild,v 1.2 2013/07/29 15:50:16 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/natgrid/natgrid-0.2.1-r1.ebuild,v 1.3 2013/07/29 16:16:07 idella4 Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -28,7 +28,7 @@ python_install_all() {
 }
 
 python_install() {
-	distutils-r1_python_install
 	# Fix collision with dev-python/matplotlib.
 	rm -f "${D}$(python_get_sitedir)/mpl_toolkits/__init__.py" || die
+	distutils-r1_python_install
 }
diff --git a/dev-python/natgrid/natgrid-0.2.1-r2.ebuild b/dev-python/natgrid/natgrid-0.2.1-r2.ebuild
new file mode 100644
index 000000000000..7365bc398d23
--- /dev/null
+++ b/dev-python/natgrid/natgrid-0.2.1-r2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/natgrid/natgrid-0.2.1-r2.ebuild,v 1.1 2013/07/29 16:16:07 idella4 Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+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_MODNAME="mpl_toolkits/natgrid"
+
+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
+}