Version bump and really apply datadir patch

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

4 files changed, 63 insertions, 38 deletions

diff --git a/dev-python/basemap/ChangeLog b/dev-python/basemap/ChangeLog
index a05280e0f158..918c0be52bf4 100644
--- a/dev-python/basemap/ChangeLog
+++ b/dev-python/basemap/ChangeLog
@@ -1,6 +1,13 @@
 # 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.14 2009/04/30 17:55:25 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/basemap/ChangeLog,v 1.15 2009/08/12 17:13:20 bicatali Exp $
+
+*basemap-0.99.4 (12 Aug 2009)
+
+  12 Aug 2009; Sébastien Fabbro <bicatali@gentoo.org>
+  -files/basemap-0.99.2-syslib.patch, basemap-0.99.3.ebuild,
+  +basemap-0.99.4.ebuild:
+  Version bump and really apply datadir patch
 
   30 Apr 2009; Patrick Lauer <patrick@gentoo.org> -basemap-0.99.2.ebuild:
   Remove old
diff --git a/dev-python/basemap/basemap-0.99.3.ebuild b/dev-python/basemap/basemap-0.99.3.ebuild
index cdd6bce58132..2a5c5706cec6 100644
--- a/dev-python/basemap/basemap-0.99.3.ebuild
+++ b/dev-python/basemap/basemap-0.99.3.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.3.ebuild,v 1.1 2009/03/28 09:06:54 bicatali Exp $
+# $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
@@ -30,6 +30,7 @@ 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
 }
 
diff --git a/dev-python/basemap/basemap-0.99.4.ebuild b/dev-python/basemap/basemap-0.99.4.ebuild
new file mode 100644
index 000000000000..bb32189d271e
--- /dev/null
+++ b/dev-python/basemap/basemap-0.99.4.ebuild
@@ -0,0 +1,53 @@
+# 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 $
+
+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-1.0.8
+	dev-python/dap"
+
+DOCS="FAQ API_CHANGES"
+
+src_prepare() {
+	# use system libraries
+	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"
+}
+
+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/files/basemap-0.99.2-syslib.patch b/dev-python/basemap/files/basemap-0.99.2-syslib.patch
deleted file mode 100644
index a56e6cb070aa..000000000000
--- a/dev-python/basemap/files/basemap-0.99.2-syslib.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- setup.py.orig	2008-12-11 17:11:01.000000000 +0000
-+++ setup.py	2008-12-11 17:15:58.000000000 +0000
-@@ -16,7 +16,7 @@
-     DBFUpdateHeader is available, we scan shapefil.h for the string
-     'DBFUpdateHeader'.
-     """
--    f = open(convert_path("pyshapelib/shapelib/shapefil.h"))
-+    f = open(convert_path("/usr/include/libshp/shapefil.h"))
-     contents = f.read()
-     f.close()
-     if contents.find("DBFUpdateHeader") >= 0:
-@@ -105,17 +105,16 @@
- package_dirs['dbflib'] = os.path.join('lib','dbflib')
- extensions = extensions + \
-          [Extension("shapelibc",
--                    ["pyshapelib/shapelib_wrap.c",
--                     "pyshapelib/shapelib/shpopen.c",
--                     "pyshapelib/shapelib/shptree.c"],
--                    include_dirs = ["pyshapelib/shapelib"]),
-+                    ["pyshapelib/shapelib_wrap.c"],
-+                    include_dirs = ["/usr/include/libshp"],
-+                    libraries = ["shp"]),
-           Extension("shptree",
-                     ["pyshapelib/shptreemodule.c"],
--                    include_dirs = ["pyshapelib/shapelib"]),
-+                    include_dirs = ["/usr/include/libshp"]),
-           Extension("dbflibc",
--                    ["pyshapelib/dbflib_wrap.c",
--                     "pyshapelib/shapelib/dbfopen.c"],
--                    include_dirs = ["pyshapelib/shapelib"],
-+                    ["pyshapelib/dbflib_wrap.c"],
-+                    include_dirs = ["/usr/include/libshp"],
-+                    libraries = ["shp"],
-                     define_macros = dbf_macros()) ]
- 
- # check setup.cfg file to see how to install auxilliary packages.