version bump.

(Portage version: 2.1.3.16)

6 files changed, 63 insertions, 70 deletions

diff --git a/dev-python/basemap/ChangeLog b/dev-python/basemap/ChangeLog
index 30d2d0ac7b9a..e99c8ab90aad 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.3 2007/05/03 14:21:13 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/basemap/ChangeLog,v 1.4 2007/11/03 19:06:53 bicatali Exp $
+
+*basemap-0.9.6 (03 Nov 2007)
+
+  03 Nov 2007; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/basemap-0.9.6-syslib.patch, -files/basemap-syslib.patch,
+  -basemap-0.9.4.ebuild, +basemap-0.9.6.ebuild:
+  Version bump
 
 *basemap-0.9.5 (03 May 2007)
 
diff --git a/dev-python/basemap/basemap-0.9.4.ebuild b/dev-python/basemap/basemap-0.9.6.ebuild
index a83141be1204..eeea675cf8f5 100644
--- a/dev-python/basemap/basemap-0.9.4.ebuild
+++ b/dev-python/basemap/basemap-0.9.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/basemap/basemap-0.9.4.ebuild,v 1.1 2007/02/24 01:02:33 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/basemap/basemap-0.9.6.ebuild,v 1.1 2007/11/03 19:06:53 bicatali Exp $
 
 inherit distutils
 
@@ -18,24 +18,22 @@ DEPEND="sci-libs/shapelib
 	sci-libs/proj"
 
 RDEPEND="${DEPEND}
-	>=dev-python/matplotlib-0.87.3
-	dev-python/basemap-data"
+	dev-python/numpy
+	>=dev-python/matplotlib-0.90"
 
-DOCS="FAQ"
+DOCS="FAQ API_CHANGES"
 
 src_unpack() {
 	unpack ${A}
-	# patch to use proj and shapelib system libraries
-	epatch "${FILESDIR}/${PN}-syslib.patch"
 	cd "${S}"
-	mv src/pyproj.* .
-	rm -rf src
+	# patch to use proj and shapelib 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.6-syslib.patch b/dev-python/basemap/files/basemap-0.9.6-syslib.patch
new file mode 100644
index 000000000000..e97bf046fb9a
--- /dev/null
+++ b/dev-python/basemap/files/basemap-0.9.6-syslib.patch
@@ -0,0 +1,45 @@
+--- setup.py.orig	2007-11-03 18:43:14.441250205 +0000
++++ setup.py	2007-11-03 18:46:59.423732183 +0000
+@@ -22,7 +22,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:
+@@ -36,7 +36,7 @@
+ 
+ packages          = ['matplotlib.toolkits.basemap']
+ package_dirs       = {'':'lib'}
+-extensions = [Extension("matplotlib.toolkits.basemap._proj",deps+['src/_proj.c'],include_dirs = ['src'],)]
++extensions = [Extension("matplotlib.toolkits.basemap._proj",['src/_proj.c'],include_dirs = ['src'],libraries=["proj"])]
+ extensions.append(Extension("matplotlib.toolkits.basemap._geod",deps+['src/_geod.c'],include_dirs = ['src'],))
+ 
+ # install shapelib and dbflib.
+@@ -45,17 +45,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()) ]
+ 
+ if 'setuptools' in sys.modules:
diff --git a/dev-python/basemap/files/basemap-syslib.patch b/dev-python/basemap/files/basemap-syslib.patch
deleted file mode 100644
index 7b559576f624..000000000000
--- a/dev-python/basemap/files/basemap-syslib.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- basemap-0.9.4/setup.py.orig	2006-06-07 11:36:02.000000000 -0600
-+++ basemap-0.9.4/setup.py	2006-07-03 11:54:16.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:
-@@ -21,36 +21,27 @@
- 
- deps = glob.glob('src/*.c')
- 
--extensions = [Extension("pyproj",deps,include_dirs = ['src'],)]
-+extensions = [Extension("pyproj",['pyproj.c'],libraries=["proj"])]
- packages          = ['matplotlib.toolkits.basemap']
- package_dirs       = {'':'lib'}
- 
--# only install shapelib and dbflib if user hasn't got them.
--#try: import shapelib
--#except ImportError: haveshapelib = False
--#else: haveshapelib = True
--#try: import dbflib
--#except ImportError: havedbflib = False
--#else: havedbflib = True
--#if not haveshapelib or not havedbflib:
--# always intall shapelib and dbflib.
-+# Always build pyshapelib for RPM consistency, uses system shapelib
- if 1:
-     packages = packages + ['shapelib','dbflib']
-     package_dirs['shapelib'] ='lib/shapelib'
-     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/digest-basemap-0.9.4 b/dev-python/basemap/files/digest-basemap-0.9.4
deleted file mode 100644
index d2bfffb1d8ef..000000000000
--- a/dev-python/basemap/files/digest-basemap-0.9.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 0bbe631db05dbb987bb0bf8e8422039c basemap-0.9.4.tar.gz 7490506
-RMD160 b6f6c9f4ff4505d40bc82811177678f3299b6af9 basemap-0.9.4.tar.gz 7490506
-SHA256 03823c3fc7fd6b516661df73f696c9dbbb46e5646d323f0a142059f7ea6db85e basemap-0.9.4.tar.gz 7490506
diff --git a/dev-python/basemap/files/digest-basemap-0.9.6 b/dev-python/basemap/files/digest-basemap-0.9.6
new file mode 100644
index 000000000000..ee321650e7c1
--- /dev/null
+++ b/dev-python/basemap/files/digest-basemap-0.9.6
@@ -0,0 +1,3 @@
+MD5 a7ffe5c790d56d3f1b5b366eb95fdde6 basemap-0.9.6.tar.gz 13429588
+RMD160 89f4f384980d45e91037367947381753bf79163a basemap-0.9.6.tar.gz 13429588
+SHA256 9512475009fc10361580f7bc577c806a1a465e7e79ac2d233c1ffae83e4683d0 basemap-0.9.6.tar.gz 13429588