Version bump to the latest. Make tests work. Per bug#417257. Patch done by Ian Delaney.

(Portage version: 2.2.0_alpha107/cvs/Linux x86_64)

3 files changed, 25 insertions, 62 deletions

diff --git a/dev-python/basemap/ChangeLog b/dev-python/basemap/ChangeLog
index e77687d8440d..ef92643048d4 100644
--- a/dev-python/basemap/ChangeLog
+++ b/dev-python/basemap/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/basemap
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/basemap/ChangeLog,v 1.24 2012/02/23 09:24:05 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/basemap/ChangeLog,v 1.25 2012/05/24 13:03:54 scarabeus Exp $
+
+*basemap-1.0.3 (24 May 2012)
+
+  24 May 2012; Tomáš Chvátal <scarabeus@gentoo.org> +basemap-1.0.3.ebuild,
+  -basemap-1.0.2-r1.ebuild, -basemap-1.0.2.ebuild:
+  Version bump to the latest. Make tests work. Per bug#417257. Patch done by Ian
+  Delaney.
 
   23 Feb 2012; Patrick Lauer <patrick@gentoo.org> basemap-1.0.2-r1.ebuild,
   basemap-1.0.2.ebuild:
diff --git a/dev-python/basemap/basemap-1.0.2.ebuild b/dev-python/basemap/basemap-1.0.2.ebuild
deleted file mode 100644
index 120833263914..000000000000
--- a/dev-python/basemap/basemap-1.0.2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/basemap/basemap-1.0.2.ebuild,v 1.2 2012/02/23 09:24:05 patrick Exp $
-
-EAPI=3
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
-
-inherit eutils distutils
-
-DESCRIPTION="matplotlib toolkit to plot map projections"
-HOMEPAGE="http://matplotlib.sourceforge.net/basemap/doc/html/ http://pypi.python.org/pypi/basemap"
-SRC_URI="mirror://sourceforge/matplotlib/${P}.tar.gz"
-
-IUSE="examples"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-LICENSE="MIT GPL-2"
-
-CDEPEND="sci-libs/shapelib
-	>=dev-python/matplotlib-0.98
-	>=sci-libs/geos-3.1.1"
-
-DEPEND="${CDEPEND}
-	dev-python/setuptools"
-
-RDEPEND="${CDEPEND}
-	>=dev-python/pupynere-1.0.8
-	dev-python/dap"
-
-DOCS="FAQ API_CHANGES"
-
-src_prepare() {
-	# use system libraries
-	rm -f lib/mpl_toolkits/basemap/pupynere.py || die
-}
-
-src_install() {
-	distutils_src_install --install-data="${EPREFIX}/usr/share/${PN}"
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples || die
-	fi
-
-	# respect FHS
-	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
-}
diff --git a/dev-python/basemap/basemap-1.0.2-r1.ebuild b/dev-python/basemap/basemap-1.0.3.ebuild
index 5300279db6de..21366c5fb009 100644
--- a/dev-python/basemap/basemap-1.0.2-r1.ebuild
+++ b/dev-python/basemap/basemap-1.0.3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/basemap/basemap-1.0.2-r1.ebuild,v 1.2 2012/02/23 09:24:05 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/basemap/basemap-1.0.3.ebuild,v 1.1 2012/05/24 13:03:54 scarabeus Exp $
 
-EAPI=3
+EAPI=4
 PYTHON_DEPEND="2"
 SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
@@ -13,14 +13,14 @@ DESCRIPTION="matplotlib toolkit to plot map projections"
 HOMEPAGE="http://matplotlib.sourceforge.net/basemap/doc/html/ http://pypi.python.org/pypi/basemap"
 SRC_URI="mirror://sourceforge/matplotlib/${P}.tar.gz"
 
-IUSE="examples"
+IUSE="examples test"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 LICENSE="MIT GPL-2"
 
 CDEPEND="sci-libs/shapelib
 	>=dev-python/matplotlib-0.98
-	>=sci-libs/geos-3.3.1"
+	>=sci-libs/geos-3.3.1[python]"
 
 DEPEND="${CDEPEND}
 	dev-python/setuptools"
@@ -32,11 +32,24 @@ RDEPEND="${CDEPEND}
 
 DOCS="FAQ API_CHANGES"
 
+REQUIRED_USE="test ( examples )"
+
 src_prepare() {
 	# use /usr/share/data
 	sed -i \
 		-e "/_datadir.*=.*join/s|\(.*datadir.*=\).*|\1'${EROOT}usr/share/${PN}'|g" \
 		"${S}"/lib/mpl_toolkits/basemap/*.py || die
+	distutils_src_prepare
+}
+
+# This one works. examples appear to be need be installed to run. 
+src_test() {
+	testing() {
+		pushd "$(find build-${PYTHON_ABI}/ -namelib.linux-*)/mpl_toolkits/basemap/"
+		PYTHONPATH=.:../../ "$(PYTHON)" test.py
+		popd
+	}
+	VIRTUALX_COMMAND=python_execute_function virtualmake testing
 }
 
 src_install() {