Version bump

(Portage version: 2.1.9.40/cvs/Linux x86_64)

2 files changed, 29 insertions, 16 deletions

diff --git a/dev-python/basemap/ChangeLog b/dev-python/basemap/ChangeLog
index 3de55c0d2d5a..8c8e703812fa 100644
--- a/dev-python/basemap/ChangeLog
+++ b/dev-python/basemap/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/basemap
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/basemap/ChangeLog,v 1.19 2010/07/12 10:17:17 arfrever Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/basemap/ChangeLog,v 1.20 2011/02/24 00:56:30 bicatali Exp $
+
+*basemap-1.0.1 (24 Feb 2011)
+
+  24 Feb 2011; Sébastien Fabbro <bicatali@gentoo.org> -basemap-0.99.4.ebuild,
+  +basemap-1.0.1.ebuild:
+  Version bump
 
   12 Jul 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   basemap-1.0.ebuild:
diff --git a/dev-python/basemap/basemap-0.99.4.ebuild b/dev-python/basemap/basemap-1.0.1.ebuild
index 851230c57d9a..641aae34504d 100644
--- a/dev-python/basemap/basemap-0.99.4.ebuild
+++ b/dev-python/basemap/basemap-1.0.1.ebuild
@@ -1,12 +1,16 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/basemap/basemap-0.99.4.ebuild,v 1.2 2009/12/01 06:03:45 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/basemap/basemap-1.0.1.ebuild,v 1.1 2011/02/24 00:56:30 bicatali Exp $
+
+EAPI=3
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
 
-EAPI=2
 inherit eutils distutils
 
 DESCRIPTION="matplotlib toolkit to plot map projections"
-HOMEPAGE="http://matplotlib.sourceforge.net/basemap/doc/html/"
+HOMEPAGE="http://matplotlib.sourceforge.net/basemap/doc/html/ http://pypi.python.org/pypi/basemap"
 SRC_URI="mirror://sourceforge/matplotlib/${P}.tar.gz"
 
 IUSE="examples"
@@ -16,7 +20,7 @@ LICENSE="MIT GPL-2"
 
 CDEPEND="sci-libs/shapelib
 	>=dev-python/matplotlib-0.98
-	>=sci-libs/geos-2.2.3"
+	>=sci-libs/geos-3.1.1"
 
 DEPEND="${CDEPEND}
 	dev-python/setuptools"
@@ -32,21 +36,24 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-0.99.3-syslib.patch
 	epatch "${FILESDIR}"/${PN}-0.99.3-datadir.patch
 	rm -f lib/mpl_toolkits/basemap/pupynere.py || die
-	# quick sed to match upstream
-	sed -i \
-		-e 's/NumpyTestCase/TestCase/g' \
-		lib/mpl_toolkits/basemap/test.py || die
 }
 
 src_install() {
-	distutils_src_install --install-data=/usr/share/${PN}
+	distutils_src_install --install-data="${EPREFIX}/usr/share/${PN}"
+
 	if use examples; then
 		insinto /usr/share/doc/${PF}
 		doins -r examples || die
 	fi
-	# clean up collision with matplotlib
-	rm "${D}"/usr/lib*/python*/site-packages/mpl_toolkits/__init__.py || die
+
 	# respect FHS
-	mv "${D}"/usr/lib*/python*/site-packages/mpl_toolkits/basemap/data \
-		"${D}"/usr/share/basemap || die
+	mv "${ED}$(python_get_sitedir -f)/mpl_toolkits/basemap/data" "${ED}usr/share/basemap"
+
+	cleaning() {
+		# clean up collision with matplotlib
+		rm -f "${ED}$(python_get_sitedir)/mpl_toolkits/__init__.py"
+		# respect FHS
+		rm -fr "${ED}$(python_get_sitedir)/mpl_toolkits/basemap/data"
+	}
+	python_execute_function -q cleaning
 }