Version bump. Now ship data files in /usr/share/basemap

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

7 files changed, 121 insertions, 117 deletions

diff --git a/dev-python/basemap/ChangeLog b/dev-python/basemap/ChangeLog
index d529b8a78ad0..e14c304c501a 100644
--- a/dev-python/basemap/ChangeLog
+++ b/dev-python/basemap/ChangeLog
@@ -1,6 +1,14 @@
 # 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.12 2009/01/09 19:59:53 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/basemap/ChangeLog,v 1.13 2009/03/28 09:06:54 bicatali Exp $
+
+*basemap-0.99.3 (28 Mar 2009)
+
+  28 Mar 2009; Sébastien Fabbro <bicatali@gentoo.org>
+  -files/basemap-0.9.9-syslib.patch, +files/basemap-0.99.3-datadir.patch,
+  +files/basemap-0.99.3-syslib.patch, -files/basemap-0.99-syslib.patch,
+  +basemap-0.99.3.ebuild:
+  Version bump. Now ship data files in /usr/share/basemap
 
   09 Jan 2009; Patrick Lauer <patrick@gentoo.org> -basemap-0.9.9-r1.ebuild,
   -basemap-0.99.1.ebuild:
diff --git a/dev-python/basemap/basemap-0.99.3.ebuild b/dev-python/basemap/basemap-0.99.3.ebuild
new file mode 100644
index 000000000000..cdd6bce58132
--- /dev/null
+++ b/dev-python/basemap/basemap-0.99.3.ebuild
@@ -0,0 +1,52 @@
+# 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 $
+
+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
+	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.9.9-syslib.patch b/dev-python/basemap/files/basemap-0.9.9-syslib.patch
deleted file mode 100644
index 6cf17a12748c..000000000000
--- a/dev-python/basemap/files/basemap-0.9.9-syslib.patch
+++ /dev/null
@@ -1,69 +0,0 @@
---- setup.py.orig	2008-02-13 01:53:03.524223194 +0000
-+++ setup.py	2008-02-13 12:18:32.290150702 +0000
-@@ -24,7 +24,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:
-@@ -53,7 +53,7 @@
- 
- if GEOS_dir is None:
-     # if GEOS_dir not set, check a few standard locations.
--    GEOS_dirs = ['/usr/local','/sw','/opt','/opt/local',os.path.expanduser('~')]
-+    GEOS_dirs = ['/usr','/usr/local','/sw','/opt','/opt/local',os.path.expanduser('~')]
-     for direc in GEOS_dirs:
-         geos_version = check_geosversion(direc)
-         print 'checking for GEOS lib in %s ....' % direc
-@@ -102,41 +102,18 @@
- 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()) ]
- 
--# install dap and httplib2, if not already available.
--# only a subset of dap is installed (the client, not the server)
--__dapversion__ = None
--try:
--    from dap.lib import __version__ as __dapversion__
--except ImportError:
--    packages = packages + ['dap','dap.util','dap.parsers']
--    package_dirs['dap'] = os.path.join('lib','dap')
--# install dap client anyway if installed version is older than
--# version provided here.
--if __dapversion__ is not None:
--    __dapversion__ = [repr(v)+'.' for v in __dapversion__]
--    __dapversion__ = ''.join(__dapversion__)[:-1]
--    if __dapversion__ < '2.2.6.2':
--        packages = packages + ['dap','dap.util','dap.parsers']
--        package_dirs['dap'] = os.path.join('lib','dap')
--try:
--    import httplib2
--except ImportError:
--    packages = packages + ['httplib2']
--    package_dirs['httlib2'] = os.path.join('lib','httplib2')
--
- # Specify all the required mpl data
- pyproj_datafiles = ['data/epsg', 'data/esri', 'data/esri.extra', 'data/GL27', 'data/nad.lst', 'data/nad27', 'data/nad83', 'data/ntv2_out.dist', 'data/other.extra', 'data/pj_out27.dist', 'data/pj_out83.dist', 'data/proj_def.dat', 'data/README', 'data/td_out.dist', 'data/test27', 'data/test83', 'data/testntv2', 'data/testvarious', 'data/world']
- boundaryfiles = []
diff --git a/dev-python/basemap/files/basemap-0.99-syslib.patch b/dev-python/basemap/files/basemap-0.99-syslib.patch
deleted file mode 100644
index 33aa706a6c2d..000000000000
--- a/dev-python/basemap/files/basemap-0.99-syslib.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- setup.py.orig	2008-07-02 17:17:56.980035282 +0100
-+++ setup.py	2008-07-02 17:49:26.354807468 +0100
-@@ -26,7 +26,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:
-@@ -55,7 +55,7 @@
- 
- if GEOS_dir is None:
-     # if GEOS_dir not set, check a few standard locations.
--    GEOS_dirs = ['/usr/local','/sw','/opt','/opt/local',os.path.expanduser('~')]
-+    GEOS_dirs = ['/usr','/usr/local','/sw','/opt','/opt/local',os.path.expanduser('~')]
-     for direc in GEOS_dirs:
-         geos_version = checkversion(direc)
-         print 'checking for GEOS lib in %s ....' % direc
-@@ -104,17 +104,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.
diff --git a/dev-python/basemap/files/basemap-0.99.3-datadir.patch b/dev-python/basemap/files/basemap-0.99.3-datadir.patch
new file mode 100644
index 000000000000..702a2150cb05
--- /dev/null
+++ b/dev-python/basemap/files/basemap-0.99.3-datadir.patch
@@ -0,0 +1,11 @@
+--- 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
new file mode 100644
index 000000000000..f74a8937195c
--- /dev/null
+++ b/dev-python/basemap/files/basemap-0.99.3-syslib.patch
@@ -0,0 +1,47 @@
+--- 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
diff --git a/dev-python/basemap/metadata.xml b/dev-python/basemap/metadata.xml
index 27be8af27aaa..186fe76c1b90 100644
--- a/dev-python/basemap/metadata.xml
+++ b/dev-python/basemap/metadata.xml
@@ -4,7 +4,7 @@
 <herd>python</herd>
 <herd>sci-geosciences</herd>
 <longdescription>
-basemap is a matplotlib toolkit. It allows to plot data on map
-projections (with continental and political boundaries).
+  basemap is a matplotlib toolkit. It allows to plot data on map
+  projections (with continental and political boundaries).
 </longdescription>
 </pkgmetadata>