Fix for datadir, bug #396493. Added httplib2 required run dependency

(Portage version: 2.1.10.41/cvs/Linux x86_64)

4 files changed, 17 insertions, 67 deletions

diff --git a/dev-python/basemap/ChangeLog b/dev-python/basemap/ChangeLog
index 9a71261733ea..cf5f3348a178 100644
--- a/dev-python/basemap/ChangeLog
+++ b/dev-python/basemap/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/basemap
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/basemap/ChangeLog,v 1.22 2011/12/25 14:19:47 patrick Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/basemap/ChangeLog,v 1.23 2012/01/04 20:24:41 bicatali Exp $
+
+*basemap-1.0.2-r1 (04 Jan 2012)
+
+  04 Jan 2012; Sébastien Fabbro <bicatali@gentoo.org>
+  -files/basemap-0.99.3-datadir.patch, -files/basemap-0.99.3-syslib.patch,
+  -basemap-1.0.1.ebuild, +basemap-1.0.2-r1.ebuild:
+  Fix for datadir, bug #396493. Added httplib2 required run dependency
 
 *basemap-1.0.2 (25 Dec 2011)
 
diff --git a/dev-python/basemap/basemap-1.0.1.ebuild b/dev-python/basemap/basemap-1.0.2-r1.ebuild
index 641aae34504d..0f3392f7434f 100644
--- a/dev-python/basemap/basemap-1.0.1.ebuild
+++ b/dev-python/basemap/basemap-1.0.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.1.ebuild,v 1.1 2011/02/24 00:56:30 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/basemap/basemap-1.0.2-r1.ebuild,v 1.1 2012/01/04 20:24:42 bicatali Exp $
 
 EAPI=3
 PYTHON_DEPEND="2"
@@ -20,22 +20,23 @@ LICENSE="MIT GPL-2"
 
 CDEPEND="sci-libs/shapelib
 	>=dev-python/matplotlib-0.98
-	>=sci-libs/geos-3.1.1"
+	>=sci-libs/geos-3.3.1"
 
 DEPEND="${CDEPEND}
 	dev-python/setuptools"
 
 RDEPEND="${CDEPEND}
 	>=dev-python/pupynere-1.0.8
+	dev-python/httplib2
 	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
+	# use /usr/share/data
+	sed -i \
+		-e "/_datadir.*=.*join/s|\(.*datadir.*=\).*|\1'${EROOT}usr/share/${PN}'|g" \
+		"${S}"/lib/mpl_toolkits/basemap/*.py || die
 }
 
 src_install() {
diff --git a/dev-python/basemap/files/basemap-0.99.3-datadir.patch b/dev-python/basemap/files/basemap-0.99.3-datadir.patch
deleted file mode 100644
index 702a2150cb05..000000000000
--- a/dev-python/basemap/files/basemap-0.99.3-datadir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/mpl_toolkits/basemap/__init__.py.orig	2009-03-28 08:43:21.505631067 +0000
-+++ lib/mpl_toolkits/basemap/__init__.py	2009-03-28 08:52:04.355026615 +0000
-@@ -46,7 +46,7 @@
-     if not os.path.isdir(basemap_datadir):
-         raise RuntimeError('Path in environment BASEMAPDATA not a directory')
- else:
--    basemap_datadir = os.sep.join([os.path.dirname(__file__), 'data'])
-+    basemap_datadir = '/usr/share/basemap'
- 
- __version__ = '0.99.3'
- 
diff --git a/dev-python/basemap/files/basemap-0.99.3-syslib.patch b/dev-python/basemap/files/basemap-0.99.3-syslib.patch
deleted file mode 100644
index f74a8937195c..000000000000
--- a/dev-python/basemap/files/basemap-0.99.3-syslib.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- setup.py.orig	2009-03-27 12:17:30.647508131 +0000
-+++ setup.py	2009-03-27 17:19:46.586103736 +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:
-@@ -179,17 +179,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()) ]
-     else:
-         print 'pyshapelib installed'
---- setup.cfg.orig	2009-03-27 17:21:47.740287840 +0000
-+++ setup.cfg	2009-03-27 17:21:19.118756900 +0000
-@@ -6,6 +6,6 @@
- #     False: do not install
- #     auto: install only if the package is unavailable. This
- #           is the default behavior
--pydap = auto
--httplib2 = auto
-+pydap = False
-+httplib2 = False
- pyshapelib = auto