Version bump

(Portage version: 2.1.4_rc14)

6 files changed, 81 insertions, 62 deletions

diff --git a/dev-python/basemap/ChangeLog b/dev-python/basemap/ChangeLog
index e99c8ab90aad..19c4d9d1556a 100644
--- a/dev-python/basemap/ChangeLog
+++ b/dev-python/basemap/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/basemap
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/basemap/ChangeLog,v 1.4 2007/11/03 19:06:53 bicatali Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/basemap/ChangeLog,v 1.5 2008/01/04 18:06:45 bicatali Exp $
+
+*basemap-0.9.9 (04 Jan 2008)
+
+  04 Jan 2008; Sébastien Fabbro <bicatali@gentoo.org>
+  -files/basemap-0.9.5-syslib.patch, +files/basemap-0.9.9-syslib.patch,
+  -basemap-0.9.5.ebuild, +basemap-0.9.9.ebuild:
+  Version bump
 
 *basemap-0.9.6 (03 Nov 2007)
 
diff --git a/dev-python/basemap/basemap-0.9.5.ebuild b/dev-python/basemap/basemap-0.9.9.ebuild
index f1808c555ca6..2313f8f3e13c 100644
--- a/dev-python/basemap/basemap-0.9.5.ebuild
+++ b/dev-python/basemap/basemap-0.9.9.ebuild
@@ -1,38 +1,42 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/basemap/basemap-0.9.5.ebuild,v 1.1 2007/05/03 14:21:13 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/basemap/basemap-0.9.9.ebuild,v 1.1 2008/01/04 18:06:45 bicatali Exp $
 
 inherit distutils
 
 DESCRIPTION="matplotlib toolkit to plot map projections"
 HOMEPAGE="http://matplotlib.sourceforge.net/matplotlib.toolkits.basemap.basemap.html"
-SRC_URI="mirror://sourceforge/matplotlib/${P}.tgz
-	examples? ( mirror://sourceforge/matplotlib/${PN}-examples-${PV}.tgz )"
+SRC_URI="mirror://sourceforge/matplotlib/${P}.tar.gz"
 
 IUSE="examples"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 LICENSE="MIT GPL-2"
+
+# test as GUI (with USE=examples)
 RESTRICT="test"
 
 DEPEND="sci-libs/shapelib
-	sci-libs/proj"
+	>=sci-libs/proj-4.6
+	=sci-libs/geos-2.2.3"
 
 RDEPEND="${DEPEND}
-	>=dev-python/matplotlib-0.87.3"
+	dev-python/numpy
+	>=dev-python/matplotlib-0.90"
 
 DOCS="FAQ API_CHANGES"
 
 src_unpack() {
 	unpack ${A}
-	# patch to use proj and shapelib system libraries
-	epatch "${FILESDIR}/${P}-syslib.patch"
+	cd "${S}"
+	# patch to use proj, shapelib and geos system libraries
+	epatch "${FILESDIR}"/${P}-syslib.patch
 }
 
 src_install() {
 	distutils_src_install
 	if use examples; then
 		insinto /usr/share/doc/${PF}/examples
-		doins examples/*
+		doins examples/* || die
 	fi
 }
diff --git a/dev-python/basemap/files/basemap-0.9.5-syslib.patch b/dev-python/basemap/files/basemap-0.9.5-syslib.patch
deleted file mode 100644
index b712a4743620..000000000000
--- a/dev-python/basemap/files/basemap-0.9.5-syslib.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- basemap-0.9.5/setup.py.orig	2007-03-15 07:26:43.000000000 -0600
-+++ basemap-0.9.5/setup.py	2007-03-23 15:36:02.000000000 -0600
-@@ -11,7 +11,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:
-@@ -23,7 +23,7 @@
- 
- packages          = ['matplotlib.toolkits.basemap']
- package_dirs       = {'':'lib'}
--extensions = [Extension("matplotlib.toolkits.basemap._pyproj",deps,include_dirs = ['src'],)]
-+extensions = [Extension("matplotlib.toolkits.basemap._pyproj",['src/_pyproj.c'],include_dirs = ['src'],libraries=["proj"])]
- 
- # only install shapelib and dbflib if user hasn't got them.
- #try: import shapelib
-@@ -40,17 +40,16 @@
-     package_dirs['dbflib'] ='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()) ]
- 
- if 'setuptools' in sys.modules:
diff --git a/dev-python/basemap/files/basemap-0.9.9-syslib.patch b/dev-python/basemap/files/basemap-0.9.9-syslib.patch
new file mode 100644
index 000000000000..34a3a61bcbdf
--- /dev/null
+++ b/dev-python/basemap/files/basemap-0.9.9-syslib.patch
@@ -0,0 +1,56 @@
+--- setup.py.orig	2008-01-04 14:56:33.980098124 +0000
++++ setup.py	2008-01-04 18:00:54.978320866 +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','/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
+@@ -86,8 +86,8 @@
+ 
+ packages          = ['matplotlib.toolkits.basemap']
+ package_dirs       = {'':'lib'}
+-extensions = [Extension("matplotlib.toolkits.basemap._proj",deps+['src/_proj.c'],include_dirs = ['src'],)]
+-extensions.append(Extension("matplotlib.toolkits.basemap._geod",deps+['src/_geod.c'],include_dirs = ['src'],))
++extensions = [Extension("matplotlib.toolkits.basemap._proj",['src/_proj.c'],libraries = ["proj"])]
++extensions.append(Extension("matplotlib.toolkits.basemap._geod",['src/_geod.c'],include_dirs = geos_include_dirs,libraries=['geos_c','geos']))
+ # for some reason, pickling won't work if this extension is installed
+ # as "matplotlib.toolkits.basemap._geos"
+ extensions.append(Extension("_geos",['src/_geos.c'],
+@@ -102,17 +102,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()) ]
+ 
+ # install dap and httplib2, if not already available.
diff --git a/dev-python/basemap/files/digest-basemap-0.9.5 b/dev-python/basemap/files/digest-basemap-0.9.5
deleted file mode 100644
index a4979eb2590b..000000000000
--- a/dev-python/basemap/files/digest-basemap-0.9.5
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 d214dc6a7201080a8e7419f2a5c8306b basemap-0.9.5.tgz 12746902
-RMD160 ae24bfff210bef1a6c9d80fe29b8a49876f78845 basemap-0.9.5.tgz 12746902
-SHA256 c7698745765da1476309bd01b93796e8521ed8ffe4a9dc21511d74c95ea211d6 basemap-0.9.5.tgz 12746902
-MD5 3184e9ae9009d189f0026dee9d2db5ae basemap-examples-0.9.5.tgz 5337800
-RMD160 90d231eade7de6e3278fecf52396f03b2d40f635 basemap-examples-0.9.5.tgz 5337800
-SHA256 6674c8687f8928be53e70f228f8a1520625221be4c3470e44a8cb7419c9a6030 basemap-examples-0.9.5.tgz 5337800
diff --git a/dev-python/basemap/files/digest-basemap-0.9.9 b/dev-python/basemap/files/digest-basemap-0.9.9
new file mode 100644
index 000000000000..a5811180c47c
--- /dev/null
+++ b/dev-python/basemap/files/digest-basemap-0.9.9
@@ -0,0 +1,3 @@
+MD5 381602caf79e3e38ec8b9659cee0eaf5 basemap-0.9.9.tar.gz 31882415
+RMD160 e1b3c3860ee7732efb836eff2156fb866b255cf6 basemap-0.9.9.tar.gz 31882415
+SHA256 b811e9ab80fe38054a8fb471affe2e5367e8e052356d59e82e90416d4dd0c272 basemap-0.9.9.tar.gz 31882415