Fixed collision with matplotlib and matplotlib dependency for 0.9.9-r1

Package-Manager: portage-2.2_rc16/cvs/Linux 2.6.25-gentoo-r7 x86_64

6 files changed, 15 insertions, 104 deletions

diff --git a/dev-python/basemap/ChangeLog b/dev-python/basemap/ChangeLog
index 6a68dae23080..8de9419469fd 100644
--- a/dev-python/basemap/ChangeLog
+++ b/dev-python/basemap/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/basemap
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/basemap/ChangeLog,v 1.9 2008/09/26 14:47:01 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/basemap/ChangeLog,v 1.10 2008/12/05 12:06:46 bicatali Exp $
+
+  05 Dec 2008; Sébastien Fabbro <bicatali@gentoo.org>
+  basemap-0.9.9-r1.ebuild, -basemap-0.99.ebuild, basemap-0.99.1.ebuild:
+  Fixed collision with matplotlib and matplotlib dependency for 0.9.9-r1
 
   26 Sep 2008; Sébastien Fabbro <bicatali@gentoo.org>
   basemap-0.99.1.ebuild:
diff --git a/dev-python/basemap/Manifest b/dev-python/basemap/Manifest
index 26ab250d6493..19c16d425ef6 100644
--- a/dev-python/basemap/Manifest
+++ b/dev-python/basemap/Manifest
@@ -1,21 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX basemap-0.9.6-syslib.patch 2081 RMD160 528427c0fbc4fe71927f633b77e34d3658b940b6 SHA1 dca7cadf96cc94e9fd1a200b797c6bdbc2685d9d SHA256 65276e8877083034c30fe47d88b3b9f73df1358599a399d1b65c35ce5a5ec889
 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
 DIST basemap-0.9.9.tar.gz 31882415 RMD160 e1b3c3860ee7732efb836eff2156fb866b255cf6 SHA1 149624174e805a74d23544383ad7e72c066a780b SHA256 b811e9ab80fe38054a8fb471affe2e5367e8e052356d59e82e90416d4dd0c272
 DIST basemap-0.99.1.tar.gz 100922133 RMD160 6ee0bf074fe9c5b7b847628cd694d52ac2fe2e16 SHA1 3616b16532e8d0633a4c722ce004def9807542f0 SHA256 4621afacd1d0612f45bcdfc810a25914531843dac45866558f49d7334c25f39c
-DIST basemap-0.99.tar.gz 107986643 RMD160 18d5cc303efef8b7d9d20b5c4c3ceba26778a791 SHA1 1eb8cdeb605c59e2a7510ac4fae77633f15f0e1d SHA256 109762d29677f377f133c95f0b1af61d71bc7582f7e3e5546d99bf3bab2a00c0
-EBUILD basemap-0.9.9-r1.ebuild 1291 RMD160 16dce8af420c7e33cb64003c585cfe7b8490de68 SHA1 17e5a6cea6d57876f32d0dbfd0dbab16da0cc265 SHA256 1b9e737759e09f0586e95b927c674452546f300e026b858a3eda9653d4e770cb
-EBUILD basemap-0.99.1.ebuild 1070 RMD160 4dba0ea19088c729ca96138462e15977841e9d19 SHA1 5d71dc57a6eec24f4ad37af8c1167ec2cfcfd4a2 SHA256 c6e0381d27dbdd9dc48ff57869a5a7de1efff004ef5261620631ab3900e898d9
-EBUILD basemap-0.99.ebuild 1140 RMD160 62e8f93c1133f05c459f6dff618ef2de8411917e SHA1 02a06c404bf79086bb565fd384dd896942a7b7be SHA256 93097ca418925077781958f51e26cbfe4e87728a80eddf2e6df18cccf5f7fa93
-MISC ChangeLog 2036 RMD160 317bd9a62b357a36d79b728362c4c7424c755116 SHA1 43dfd268b8210b95079c829e85d9b48e5290c98b SHA256 3e7b285d133cff449d632e00e8576212189c9963c0c75861422432775a89d811
+EBUILD basemap-0.9.9-r1.ebuild 1291 RMD160 697f57a818a039b790f80f49dccc6e4a83f6b0e6 SHA1 299f1ac1fb44c0fe6496d769f2fce53c7f024139 SHA256 9ef6dfe7e95ae6b37576dcdb9fee931d9dd6067b4e953021e3421d28880993d7
+EBUILD basemap-0.99.1.ebuild 1140 RMD160 a1a5b96069abc9d806da45a907b641e157237224 SHA1 afc66002c7955b2f84dc6e6055e05a0d40a7065f SHA256 73ec4bb1eb52f478e3775e745e7cf240ef054289a21bee99eae244d28018c922
+MISC ChangeLog 2238 RMD160 a23810eed4f91cf5b86473768a0d3fa57a31eef5 SHA1 d02c8d0178e022972e916664bcc2eea11097e9b4 SHA256 dbe0831441f5a15e203e6ac43240ade48b84bec6b066a2995dc100181e982a56
 MISC metadata.xml 345 RMD160 9b474bcb23ff1a46d81359f0cd50000ae5f6e2e8 SHA1 aef929468d8ef9a1c5161279d0c0eb16a8841811 SHA256 6912d4e1753bb1e71bd921542f553906102957bac010e60a1c08a98063d24496
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkjc9fMACgkQ1ycZbhPLE2Dz7wCgrc5dN8hVv6E69PJhwJOYPcRF
-/4YAnjmQxiSYUyw6P7L8asv6h7xOJbw2
-=2lnX
+iEYEARECAAYFAkk5GW4ACgkQ1ycZbhPLE2CDjgCdHaYqQ12IHSdDw1aeI3kMIz64
+YJQAn0+EQLXfOo7YzZ0bqKbClS4bn3qZ
+=KybF
 -----END PGP SIGNATURE-----
diff --git a/dev-python/basemap/basemap-0.9.9-r1.ebuild b/dev-python/basemap/basemap-0.9.9-r1.ebuild
index 0569492eb520..c48685f7f781 100644
--- a/dev-python/basemap/basemap-0.9.9-r1.ebuild
+++ b/dev-python/basemap/basemap-0.9.9-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.9-r1.ebuild,v 1.1 2008/02/13 14:12:09 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/basemap/basemap-0.9.9-r1.ebuild,v 1.2 2008/12/05 12:06:46 bicatali Exp $
 
 inherit eutils distutils
 
@@ -15,7 +15,7 @@ LICENSE="MIT GPL-2"
 
 CDEPEND="sci-libs/shapelib
 	dev-python/numpy
-	>=dev-python/matplotlib-0.90
+	=dev-python/matplotlib-0.91*
 	=sci-libs/geos-2.2.3*"
 
 DEPEND="${CDEPEND}
diff --git a/dev-python/basemap/basemap-0.99.1.ebuild b/dev-python/basemap/basemap-0.99.1.ebuild
index b88fac6fcc68..f18d86345743 100644
--- a/dev-python/basemap/basemap-0.99.1.ebuild
+++ b/dev-python/basemap/basemap-0.99.1.ebuild
@@ -1,6 +1,6 @@
 # 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.99.1.ebuild,v 1.2 2008/09/26 14:47:01 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/basemap/basemap-0.99.1.ebuild,v 1.3 2008/12/05 12:06:46 bicatali Exp $
 
 inherit eutils distutils
 
@@ -35,6 +35,7 @@ src_unpack() {
 
 src_install() {
 	distutils_src_install --install-data=/usr/share/${PN}
+	rm -f "${D}"/usr/lib*/python*/site-packages/mpl_toolkits/__init__.py
 	if use examples; then
 		insinto /usr/share/doc/${PF}
 		doins -r examples || die
diff --git a/dev-python/basemap/basemap-0.99.ebuild b/dev-python/basemap/basemap-0.99.ebuild
deleted file mode 100644
index 4ff57c54425b..000000000000
--- a/dev-python/basemap/basemap-0.99.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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.99.ebuild,v 1.1 2008/07/02 17:00:05 bicatali Exp $
-
-inherit eutils distutils
-
-DESCRIPTION="matplotlib toolkit to plot map projections"
-HOMEPAGE="http://matplotlib.sourceforge.net/matplotlib.toolkits.basemap.basemap.html"
-SRC_URI="mirror://sourceforge/matplotlib/${P}.tar.gz"
-
-IUSE="doc 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/dap"
-
-DOCS="FAQ API_CHANGES"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# patch to use shapelib and geos system libraries
-	# proj is unfortunately an internal patched version (bug #209895)
-	epatch "${FILESDIR}"/${P}-syslib.patch
-}
-
-src_install() {
-	distutils_src_install --install-data=/usr/share/${PN}
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples || die
-	fi
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins *.pdf || 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
deleted file mode 100644
index e97bf046fb9a..000000000000
--- a/dev-python/basemap/files/basemap-0.9.6-syslib.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- 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: