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

Package-Manager: portage-2.2_rc27/cvs/Linux x86_64

8 files changed, 137 insertions, 121 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/Manifest b/dev-python/basemap/Manifest
index 43dc53178756..501379278e1b 100644
--- a/dev-python/basemap/Manifest
+++ b/dev-python/basemap/Manifest
@@ -1,7 +1,19 @@
-AUX basemap-0.9.9-syslib.patch 3266 RMD160 c2c1fcfbaf08bf68b9faad292017faccc793a3d3 SHA1 690ffd170fd5266ac8c63ffd6ddcfe729881b2f3 SHA256 1f0e69b8a977fc7b32a2d8f735de8602811d7cc0b653f6e90ef73628e72e3165
-AUX basemap-0.99-syslib.patch 2044 RMD160 de1729e56143674b2c367f95da6e0f72b5ac8ecd SHA1 1fcb2130beb886759008f715ba2fb5cab08e0c5b SHA256 b7b94680a4ec1e18ff833af6566f5c040b48942b1112df5ebb7d8b87d6586645
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX basemap-0.99.2-syslib.patch 1640 RMD160 1d2c49081fbea694886fc369dc01f8c68ead0109 SHA1 568371a7a69d8e7bb45a1101da447dd54db5baa5 SHA256 413f1003d2146b7e60df5787a434286ccbac78d4f204869408bd7008a3910148
+AUX basemap-0.99.3-datadir.patch 451 RMD160 70683722b172491773c32021f13cc2fe835d7e7d SHA1 087eb8e7f426cb670620787d51e1ee511aa4aca4 SHA256 f41386b79e8f25001128ecde02b1dffc48842e16492f314586ff75483fcab83f
+AUX basemap-0.99.3-syslib.patch 2128 RMD160 d0243d3fdcbd208095039b24d5da4b35077bcb35 SHA1 fc7539938b2e9d65372e8c4100a96367073e3085 SHA256 709d5b49de0b1793d3b45ed4f5fe65f2aaea1b9659c3d0a94f959c7998faaeb4
 DIST basemap-0.99.2.tar.gz 101823685 RMD160 8f9e986d41a92c6cb0db17ba682943312d200f44 SHA1 dff2196bd9c2057b960b6552441111e81a7e3821 SHA256 264b0b973bcce80efaeda9e483369cae99945846e179af5c204c765d39a3b7e7
+DIST basemap-0.99.3.tar.gz 101834180 RMD160 338c5cbcd4c10d999554cec7f5ff2ec4fc98558e SHA1 024db8bf6a848f900514f46364b2d0fd4f898e78 SHA256 2207c9a7d25c4de52b69d9d1a30461ad693f557f624388b37639b620ef968644
 EBUILD basemap-0.99.2.ebuild 1302 RMD160 3a83b96038f0f770aa538bf9303380c26f04d18e SHA1 9187298fc1327d60a4ff0436c46eeb60354b1d91 SHA256 394bbdbe4db8476be96b5e885147fdbbb9db08d7cee6714dab5e7f0a8be6511b
-MISC ChangeLog 2519 RMD160 dfda3c723ce482942f54459e09e41dd9c16efee9 SHA1 edee3b6479a4367d77c85200ebf15d5d332b507c SHA256 0de5a10151f41bc09599466dc949afbe4bd80e3abd35188c7d8d8e204d153010
-MISC metadata.xml 345 RMD160 9b474bcb23ff1a46d81359f0cd50000ae5f6e2e8 SHA1 aef929468d8ef9a1c5161279d0c0eb16a8841811 SHA256 6912d4e1753bb1e71bd921542f553906102957bac010e60a1c08a98063d24496
+EBUILD basemap-0.99.3.ebuild 1342 RMD160 97ef22324ee703e52fd9e330ce4cdb851d1abea1 SHA1 aadb78f632d58a0adbfbd30bf4a726fc874a5403 SHA256 43cd0f3c2933b37c2f80a92a428fa25b2fd64b807d81baf8b97b229015903a99
+MISC ChangeLog 2837 RMD160 0e370a7d5fe90d3cb8df873febcae715eadad3ca SHA1 15e936889933072fa3d29985d491a97a3e55d876 SHA256 67d4b8f8f411db47f60a10c2d1c9be08c8593accf717102091241f9e37d16edb
+MISC metadata.xml 349 RMD160 a67153a56272b17f0c69173613b9bc7f533e25c5 SHA1 bc4e8104d58c19aedcf4a26f200fa2ffccd6a582 SHA256 6d623559310d5abca79dc753b17a3ca5f5691fd0ff82a9fa074bad50c75db97d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAknN6LwACgkQ1ycZbhPLE2DZdQCgsS0VSs/vCRDrMAchtL9YrOhy
+JlIAn3uvwyWz4wkgLL8f+kOY535CviJJ
+=QTQ2
+-----END PGP SIGNATURE-----
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>