Version bump and really apply datadir patch

Package-Manager: portage-2.2_rc38/cvs/Linux x86_64

5 files changed, 77 insertions, 41 deletions

diff --git a/dev-python/basemap/ChangeLog b/dev-python/basemap/ChangeLog
index a05280e0f158..918c0be52bf4 100644
--- a/dev-python/basemap/ChangeLog
+++ b/dev-python/basemap/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/basemap
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/basemap/ChangeLog,v 1.14 2009/04/30 17:55:25 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/basemap/ChangeLog,v 1.15 2009/08/12 17:13:20 bicatali Exp $
+
+*basemap-0.99.4 (12 Aug 2009)
+
+  12 Aug 2009; Sébastien Fabbro <bicatali@gentoo.org>
+  -files/basemap-0.99.2-syslib.patch, basemap-0.99.3.ebuild,
+  +basemap-0.99.4.ebuild:
+  Version bump and really apply datadir patch
 
   30 Apr 2009; Patrick Lauer <patrick@gentoo.org> -basemap-0.99.2.ebuild:
   Remove old
diff --git a/dev-python/basemap/Manifest b/dev-python/basemap/Manifest
index a33ad6fd0e52..eb73a0ce6ac0 100644
--- a/dev-python/basemap/Manifest
+++ b/dev-python/basemap/Manifest
@@ -1,7 +1,18 @@
-AUX basemap-0.99.2-syslib.patch 1640 RMD160 1d2c49081fbea694886fc369dc01f8c68ead0109 SHA1 568371a7a69d8e7bb45a1101da447dd54db5baa5 SHA256 413f1003d2146b7e60df5787a434286ccbac78d4f204869408bd7008a3910148
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX basemap-0.99.3-datadir.patch 451 RMD160 70683722b172491773c32021f13cc2fe835d7e7d SHA1 087eb8e7f426cb670620787d51e1ee511aa4aca4 SHA256 f41386b79e8f25001128ecde02b1dffc48842e16492f314586ff75483fcab83f
 AUX basemap-0.99.3-syslib.patch 2128 RMD160 d0243d3fdcbd208095039b24d5da4b35077bcb35 SHA1 fc7539938b2e9d65372e8c4100a96367073e3085 SHA256 709d5b49de0b1793d3b45ed4f5fe65f2aaea1b9659c3d0a94f959c7998faaeb4
 DIST basemap-0.99.3.tar.gz 101834180 RMD160 338c5cbcd4c10d999554cec7f5ff2ec4fc98558e SHA1 024db8bf6a848f900514f46364b2d0fd4f898e78 SHA256 2207c9a7d25c4de52b69d9d1a30461ad693f557f624388b37639b620ef968644
-EBUILD basemap-0.99.3.ebuild 1342 RMD160 97ef22324ee703e52fd9e330ce4cdb851d1abea1 SHA1 aadb78f632d58a0adbfbd30bf4a726fc874a5403 SHA256 43cd0f3c2933b37c2f80a92a428fa25b2fd64b807d81baf8b97b229015903a99
-MISC ChangeLog 2924 RMD160 c8e92cedb376d0899afd27dd31b9c7b56f43921f SHA1 8c55fcf15fcff0137383624d13a0fc6495bd007b SHA256 f3c2c5e2aca772de4d85d8ffa0c81b6f922c6c4dbd200ef78454357ecf6d8a30
+DIST basemap-0.99.4.tar.gz 101845634 RMD160 6741f41c2f933a0e0530f65e49b090f884d25e1e SHA1 e6eb626e3de3dbc1f17922c836ef431d6242dd9c SHA256 d436250339f029e2fe1500c1133ebcb71bfc4f1f93d4dde6ce53f8940927d605
+EBUILD basemap-0.99.3.ebuild 1383 RMD160 a3b4dcf78e0564b7310cabb5536138fa457aaae0 SHA1 ecedafcab887bc27065e4aa2b83f8ef9988c62cb SHA256 aa19a24fb2613980cb438b7f6b2932c701181a3495a9d40a96d3055a80102bb5
+EBUILD basemap-0.99.4.ebuild 1407 RMD160 15d6aed95db58c650de291951342902dd6cba8ca SHA1 26a3835c583a570a18b19af9ebcaab75c150c60b SHA256 9dba90643fe5d97ca97c2cd7e73f701e422e2647144b7f8a287a48d56b0557b8
+MISC ChangeLog 3145 RMD160 8af2d629a09c66b4b38ff8aeebce89dbb43bc6c4 SHA1 b378adbe10a36b616e073aec87818e5c599a8a77 SHA256 edb455ab5d0118b256a4248fc2bb958ddb3e728f362a97fb641256785af3f618
 MISC metadata.xml 349 RMD160 a67153a56272b17f0c69173613b9bc7f533e25c5 SHA1 bc4e8104d58c19aedcf4a26f200fa2ffccd6a582 SHA256 6d623559310d5abca79dc753b17a3ca5f5691fd0ff82a9fa074bad50c75db97d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkqC+J8ACgkQ1ycZbhPLE2AeYACfRNpwhyfVaHevDgsq7aJVRuqb
+wsoAoJL66kGw7dkCLmp5Xt7Wj4hKrkMG
+=h8Oi
+-----END PGP SIGNATURE-----
diff --git a/dev-python/basemap/basemap-0.99.3.ebuild b/dev-python/basemap/basemap-0.99.3.ebuild
index cdd6bce58132..2a5c5706cec6 100644
--- a/dev-python/basemap/basemap-0.99.3.ebuild
+++ b/dev-python/basemap/basemap-0.99.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/basemap/basemap-0.99.3.ebuild,v 1.1 2009/03/28 09:06:54 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/basemap/basemap-0.99.3.ebuild,v 1.2 2009/08/12 17:13:20 bicatali Exp $
 
 EAPI=2
 inherit eutils distutils
@@ -30,6 +30,7 @@ DOCS="FAQ API_CHANGES"
 src_prepare() {
 	# use system libraries
 	epatch "${FILESDIR}"/${P}-syslib.patch
+	epatch "${FILESDIR}"/${P}-datadir.patch
 	rm -f lib/mpl_toolkits/basemap/pupynere.py || die
 }
 
diff --git a/dev-python/basemap/basemap-0.99.4.ebuild b/dev-python/basemap/basemap-0.99.4.ebuild
new file mode 100644
index 000000000000..bb32189d271e
--- /dev/null
+++ b/dev-python/basemap/basemap-0.99.4.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/basemap/basemap-0.99.4.ebuild,v 1.1 2009/08/12 17:13:20 bicatali Exp $
+
+EAPI=2
+inherit eutils distutils
+
+DESCRIPTION="matplotlib toolkit to plot map projections"
+HOMEPAGE="http://matplotlib.sourceforge.net/basemap/doc/html/"
+SRC_URI="mirror://sourceforge/matplotlib/${P}.tar.gz"
+
+IUSE="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/pupynere-1.0.8
+	dev-python/dap"
+
+DOCS="FAQ API_CHANGES"
+
+src_prepare() {
+	# use system libraries
+	epatch "${FILESDIR}"/${PN}-0.99.3-syslib.patch
+	epatch "${FILESDIR}"/${PN}-0.99.3-datadir.patch
+	rm -f lib/mpl_toolkits/basemap/pupynere.py || die
+}
+
+src_test() {
+	cd build/lib*
+	PYTHONPATH=. "${python}" mpl_toolkits/basemap/test.py || die "tests failed"
+}
+
+src_install() {
+	distutils_src_install --install-data=/usr/share/${PN}
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples || die
+	fi
+	# clean up collision with matplotlib
+	rm "${D}"/usr/lib*/python*/site-packages/mpl_toolkits/__init__.py || die
+	# respect FHS
+	mv "${D}"/usr/lib*/python*/site-packages/mpl_toolkits/basemap/data \
+		"${D}"/usr/share/basemap || die
+}
diff --git a/dev-python/basemap/files/basemap-0.99.2-syslib.patch b/dev-python/basemap/files/basemap-0.99.2-syslib.patch
deleted file mode 100644
index a56e6cb070aa..000000000000
--- a/dev-python/basemap/files/basemap-0.99.2-syslib.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- setup.py.orig	2008-12-11 17:11:01.000000000 +0000
-+++ setup.py	2008-12-11 17:15:58.000000000 +0000
-@@ -16,7 +16,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:
-@@ -105,17 +105,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()) ]
- 
- # check setup.cfg file to see how to install auxilliary packages.