Removed src_test. Now test it after installation with the simpletest.py in examples

(Portage version: 2.2_rc52/cvs/Linux x86_64)

3 files changed, 11 insertions, 60 deletions

diff --git a/dev-python/basemap/ChangeLog b/dev-python/basemap/ChangeLog
index 918c0be52bf4..4178a8b1aa8f 100644
--- a/dev-python/basemap/ChangeLog
+++ b/dev-python/basemap/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/basemap
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/basemap/ChangeLog,v 1.15 2009/08/12 17:13:20 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/basemap/ChangeLog,v 1.16 2009/12/01 06:03:45 bicatali Exp $
+
+  01 Dec 2009; Sébastien Fabbro <bicatali@gentoo.org>
+  -basemap-0.99.3.ebuild, basemap-0.99.4.ebuild:
+  Removed src_test. Now test it after installation with the simpletest.py in
+  examples
 
 *basemap-0.99.4 (12 Aug 2009)
 
diff --git a/dev-python/basemap/basemap-0.99.3.ebuild b/dev-python/basemap/basemap-0.99.3.ebuild
deleted file mode 100644
index 2a5c5706cec6..000000000000
--- a/dev-python/basemap/basemap-0.99.3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/basemap/basemap-0.99.3.ebuild,v 1.2 2009/08/12 17:13:20 bicatali Exp $
-
-EAPI=2
-inherit eutils distutils
-
-DESCRIPTION="matplotlib toolkit to plot map projections"
-HOMEPAGE="http://matplotlib.sourceforge.net/basemap/doc/html/"
-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-2.2.3"
-
-DEPEND="${CDEPEND}
-	dev-python/setuptools"
-
-RDEPEND="${CDEPEND}
-	dev-python/pupynere
-	dev-python/dap"
-
-DOCS="FAQ API_CHANGES"
-
-src_prepare() {
-	# use system libraries
-	epatch "${FILESDIR}"/${P}-syslib.patch
-	epatch "${FILESDIR}"/${P}-datadir.patch
-	rm -f lib/mpl_toolkits/basemap/pupynere.py || die
-}
-
-src_test() {
-	cd build/lib*
-	PYTHONPATH=. "${python}" mpl_toolkits/basemap/test.py || die "tests failed"
-}
-
-src_install() {
-	distutils_src_install --install-data=/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
-}
diff --git a/dev-python/basemap/basemap-0.99.4.ebuild b/dev-python/basemap/basemap-0.99.4.ebuild
index bb32189d271e..851230c57d9a 100644
--- a/dev-python/basemap/basemap-0.99.4.ebuild
+++ b/dev-python/basemap/basemap-0.99.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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.1 2009/08/12 17:13:20 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/basemap/basemap-0.99.4.ebuild,v 1.2 2009/12/01 06:03:45 bicatali Exp $
 
 EAPI=2
 inherit eutils distutils
@@ -32,11 +32,10 @@ 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
-}
-
-src_test() {
-	cd build/lib*
-	PYTHONPATH=. "${python}" mpl_toolkits/basemap/test.py || die "tests failed"
+	# quick sed to match upstream
+	sed -i \
+		-e 's/NumpyTestCase/TestCase/g' \
+		lib/mpl_toolkits/basemap/test.py || die
 }
 
 src_install() {