version bump.

Package-Manager: portage-2.1.3.16

7 files changed, 83 insertions, 90 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/Manifest b/dev-python/basemap/Manifest
index a2560027a350..8d7496d62d3e 100644
--- a/dev-python/basemap/Manifest
+++ b/dev-python/basemap/Manifest
@@ -5,39 +5,39 @@ AUX basemap-0.9.5-syslib.patch 2110 RMD160 5f869498e3cdf6db0650d750bd3b8f53312d8
 MD5 24bfc8e8bceb01d70cbed54c1a77f4fb files/basemap-0.9.5-syslib.patch 2110
 RMD160 5f869498e3cdf6db0650d750bd3b8f53312d845a files/basemap-0.9.5-syslib.patch 2110
 SHA256 d8214643919bba4ba4168b3063802179c618992abfdc224c04a20ab59b1f50d2 files/basemap-0.9.5-syslib.patch 2110
-AUX basemap-syslib.patch 2448 RMD160 32894031a0f687c015dcc87bd3b96e2779bcd139 SHA1 8c277d2a1d4aa3dceea47deea613d31f80cc3c94 SHA256 56570c18c9bfba2c3287dcc72d5e7a7f0f56cf1008919c7c01f53e2dc5682d65
-MD5 29641c2eb0c937d665f8de4da471e1aa files/basemap-syslib.patch 2448
-RMD160 32894031a0f687c015dcc87bd3b96e2779bcd139 files/basemap-syslib.patch 2448
-SHA256 56570c18c9bfba2c3287dcc72d5e7a7f0f56cf1008919c7c01f53e2dc5682d65 files/basemap-syslib.patch 2448
-DIST basemap-0.9.4.tar.gz 7490506 RMD160 b6f6c9f4ff4505d40bc82811177678f3299b6af9 SHA1 3dc2b619aa6201afdb79d9765c7435029c8c1bfd SHA256 03823c3fc7fd6b516661df73f696c9dbbb46e5646d323f0a142059f7ea6db85e
+AUX basemap-0.9.6-syslib.patch 2081 RMD160 528427c0fbc4fe71927f633b77e34d3658b940b6 SHA1 dca7cadf96cc94e9fd1a200b797c6bdbc2685d9d SHA256 65276e8877083034c30fe47d88b3b9f73df1358599a399d1b65c35ce5a5ec889
+MD5 51ef6b0943174d7611d96974ad7081a7 files/basemap-0.9.6-syslib.patch 2081
+RMD160 528427c0fbc4fe71927f633b77e34d3658b940b6 files/basemap-0.9.6-syslib.patch 2081
+SHA256 65276e8877083034c30fe47d88b3b9f73df1358599a399d1b65c35ce5a5ec889 files/basemap-0.9.6-syslib.patch 2081
 DIST basemap-0.9.5.tgz 12746902 RMD160 ae24bfff210bef1a6c9d80fe29b8a49876f78845 SHA1 b1ccf66a3fc8c728fa7ca1c0f37d1be328a150fc SHA256 c7698745765da1476309bd01b93796e8521ed8ffe4a9dc21511d74c95ea211d6
+DIST basemap-0.9.6.tar.gz 13429588 RMD160 89f4f384980d45e91037367947381753bf79163a SHA1 5f46906c1c53c3d597b83c275f2de8d6740663d6 SHA256 9512475009fc10361580f7bc577c806a1a465e7e79ac2d233c1ffae83e4683d0
 DIST basemap-examples-0.9.5.tgz 5337800 RMD160 90d231eade7de6e3278fecf52396f03b2d40f635 SHA1 97284ea175054c00c7eeec2d5c3968dab52fcad5 SHA256 6674c8687f8928be53e70f228f8a1520625221be4c3470e44a8cb7419c9a6030
-EBUILD basemap-0.9.4.ebuild 951 RMD160 79a02e74b3ae8b80d0571505e5ba517187b61f2e SHA1 f524c3b41f3df90f8bd678c7ed567e07af4e7237 SHA256 f329ab88027526d5020b54b1c9997c17b9b0a2858d0a043c8c003d2cdfe4d9bd
-MD5 72308aec6dfd636ab249dae2617e6f2a basemap-0.9.4.ebuild 951
-RMD160 79a02e74b3ae8b80d0571505e5ba517187b61f2e basemap-0.9.4.ebuild 951
-SHA256 f329ab88027526d5020b54b1c9997c17b9b0a2858d0a043c8c003d2cdfe4d9bd basemap-0.9.4.ebuild 951
 EBUILD basemap-0.9.5.ebuild 964 RMD160 9858c847d3f4b12b869a3cd6d49e9252ce66d7ae SHA1 325749dea30237c29ff6c0a559c7b2df1a1b97da SHA256 9d756ede06dfeab6b14f92da34511bfa902fff6ecf38390e71b1ea58f6825108
 MD5 adaf464300baaba3a6e5363ff4cf256f basemap-0.9.5.ebuild 964
 RMD160 9858c847d3f4b12b869a3cd6d49e9252ce66d7ae basemap-0.9.5.ebuild 964
 SHA256 9d756ede06dfeab6b14f92da34511bfa902fff6ecf38390e71b1ea58f6825108 basemap-0.9.5.ebuild 964
-MISC ChangeLog 718 RMD160 7e8a184d0a8cdc8971b91472205085f7a3465054 SHA1 2ae9a55bde3402469de565e44d47bffe236a6bce SHA256 d6e024ac5789172bf5fc3789b6ad80bf7378c553eaf421721fc3c91505e4f4fd
-MD5 60ef7b2de601e84f5dfdfd798fe7aa2b ChangeLog 718
-RMD160 7e8a184d0a8cdc8971b91472205085f7a3465054 ChangeLog 718
-SHA256 d6e024ac5789172bf5fc3789b6ad80bf7378c553eaf421721fc3c91505e4f4fd ChangeLog 718
+EBUILD basemap-0.9.6.ebuild 929 RMD160 516844261fb8df4fbb0141c1fb7aa18e78adfc64 SHA1 6245a7fcfa34afd87044e76914905ccf7ab72c47 SHA256 5ec2b2e39a4996488ff5b3ea6a78e1543a5593207c423dd1eb71c2759d41fb8d
+MD5 877476292c101d3ffb3560096931f913 basemap-0.9.6.ebuild 929
+RMD160 516844261fb8df4fbb0141c1fb7aa18e78adfc64 basemap-0.9.6.ebuild 929
+SHA256 5ec2b2e39a4996488ff5b3ea6a78e1543a5593207c423dd1eb71c2759d41fb8d basemap-0.9.6.ebuild 929
+MISC ChangeLog 933 RMD160 a88243aa1646099e54008b0ea035cb5fc95ae4f5 SHA1 77ec1367e7656899ef503754b64d6bc8fb863cbd SHA256 5c7fe5999bc672e521a8a31561809f3a41852a6873acc17ef62ba873bf4bbf7c
+MD5 d1fc725ff949f4403a8415eeb702f951 ChangeLog 933
+RMD160 a88243aa1646099e54008b0ea035cb5fc95ae4f5 ChangeLog 933
+SHA256 5c7fe5999bc672e521a8a31561809f3a41852a6873acc17ef62ba873bf4bbf7c ChangeLog 933
 MISC metadata.xml 345 RMD160 9b474bcb23ff1a46d81359f0cd50000ae5f6e2e8 SHA1 aef929468d8ef9a1c5161279d0c0eb16a8841811 SHA256 6912d4e1753bb1e71bd921542f553906102957bac010e60a1c08a98063d24496
 MD5 e0ff99ac22d52ced9880130ac19664f4 metadata.xml 345
 RMD160 9b474bcb23ff1a46d81359f0cd50000ae5f6e2e8 metadata.xml 345
 SHA256 6912d4e1753bb1e71bd921542f553906102957bac010e60a1c08a98063d24496 metadata.xml 345
-MD5 100c090e782f1435825114792a11f0f3 files/digest-basemap-0.9.4 244
-RMD160 612bebf42e397c58c3de6ac10013a20f14391d28 files/digest-basemap-0.9.4 244
-SHA256 e1e6f938b510fa71ed209bbd456c375a165d7fada0d7651da1c6c97a6bc91bae files/digest-basemap-0.9.4 244
 MD5 701173a33a9a9f8aeb0bb92104cf56c9 files/digest-basemap-0.9.5 500
 RMD160 b7a7e8459f8b272d0c156ae52265d55a9ec96b55 files/digest-basemap-0.9.5 500
 SHA256 7700c7d7956c31df192a00962b184eed6678f82191390c0a490480fb1570d00e files/digest-basemap-0.9.5 500
+MD5 5f98cc827c2e4fe403a0857179eb8185 files/digest-basemap-0.9.6 247
+RMD160 50afaaebfc3c0d767437b04f7f41e4fbad7639f7 files/digest-basemap-0.9.6 247
+SHA256 2a10447b11859d891fd8f20f93adc0feab0fb1df7cb352c41fa3e2d963a3ca32 files/digest-basemap-0.9.6 247
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
+Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFGOe/71ycZbhPLE2ARAoorAJ0aift4FCSWGciR/ECinG/DJRYjpgCeNb5a
-KCplIPFoxhCthvF41eE+p3E=
-=n88Z
+iD8DBQFHLMbU1ycZbhPLE2ARAuwSAKCBP3mGkV5pUpmG2CApOVrvH30ROgCfc3Lp
+lpb+CGhQqKdVDl7BXuZrVJE=
+=woUe
 -----END PGP SIGNATURE-----
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