Fixed collision with matplotlib and matplotlib dependency for 0.9.9-r1

(Portage version: 2.2_rc16/cvs/Linux 2.6.25-gentoo-r7 x86_64)

5 files changed, 9 insertions, 95 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/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: