From: Sebastien Fabbro Date: Wed, 4 Jan 2012 20:24:42 +0000 (+0000) Subject: Fix for datadir, bug #396493. Added httplib2 required run dependency X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4f17ac267d675e3f54b6b101c0c9ed51784732cc;p=gentoo.git Fix for datadir, bug #396493. Added httplib2 required run dependency Package-Manager: portage-2.1.10.41/cvs/Linux x86_64 --- diff --git a/dev-python/basemap/ChangeLog b/dev-python/basemap/ChangeLog index 9a71261733ea..cf5f3348a178 100644 --- a/dev-python/basemap/ChangeLog +++ b/dev-python/basemap/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-python/basemap -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/basemap/ChangeLog,v 1.22 2011/12/25 14:19:47 patrick Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/basemap/ChangeLog,v 1.23 2012/01/04 20:24:41 bicatali Exp $ + +*basemap-1.0.2-r1 (04 Jan 2012) + + 04 Jan 2012; Sébastien Fabbro + -files/basemap-0.99.3-datadir.patch, -files/basemap-0.99.3-syslib.patch, + -basemap-1.0.1.ebuild, +basemap-1.0.2-r1.ebuild: + Fix for datadir, bug #396493. Added httplib2 required run dependency *basemap-1.0.2 (25 Dec 2011) diff --git a/dev-python/basemap/Manifest b/dev-python/basemap/Manifest index 6b887e6d2651..a0a0b799dc36 100644 --- a/dev-python/basemap/Manifest +++ b/dev-python/basemap/Manifest @@ -1,8 +1,15 @@ -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-1.0.1.tar.gz 103490425 RMD160 0f4d666856726bfe290311610a5bbf569a4d25d5 SHA1 bd278580c004ec597020e313cc2c568593a018eb SHA256 77cc6bdb49ba95cafa9eb26976f4f1d32a7744b63a937fab7fea8facfe0a4b05 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + DIST basemap-1.0.2.tar.gz 115651208 RMD160 bd19478bcd478d2bff637f30a9ea7762ad7c8982 SHA1 234cdf591e6217de78452d7be2500781c85f5fb4 SHA256 86c85fdc89a4ab73c215a55eb1e4b905de7f68e419afbfef40ba6a1959b2d97a -EBUILD basemap-1.0.1.ebuild 1525 RMD160 c6c4419468202864f746ad64bb0a264015cbad37 SHA1 b34ca2a9512f39131549df26809a3c1fd406a02d SHA256 ea20cbc477d37dc39e0f4fee269aabc7d20fbe6a062161e4f9b189d5cc739235 +EBUILD basemap-1.0.2-r1.ebuild 1535 RMD160 e80db74b0f4d50673ee73081edbd5e52a2b6e065 SHA1 a4ebe07ef5f303e607f8d088eff584be2311d118 SHA256 3659ce254c756f79e1300e688bae32e3665e971ec9ca126e53b8bc67c4cbc7b5 EBUILD basemap-1.0.2.ebuild 1427 RMD160 65db374ab10202e8cb216bde661f1f9078d5918d SHA1 e118c94cfe6d5bbf9085238fa664fc35be860e49 SHA256 26f88cc356206a447f90b7d69c1a311a32a7537ff72b9b3286af71a455c6cd15 -MISC ChangeLog 4106 RMD160 bde7ad1c89a8e1705e205f10d689d33914727ea6 SHA1 58cd43d98586e27a7243bb85ee4cc4e28b507968 SHA256 ccacd617e586a5b639ba78341bfa1723e3932c9159bf18bfcdb89f97c5798371 +MISC ChangeLog 4393 RMD160 ba114f79f71763e1b3b9f3a4313a78cd3056f05e SHA1 439bc9f5d5733322fc5c6ccbc534292abd87da81 SHA256 9b37467a568e21fe95648ed61aac7b1ac42340c7420925155148746c0b29597e MISC metadata.xml 349 RMD160 a67153a56272b17f0c69173613b9bc7f533e25c5 SHA1 bc4e8104d58c19aedcf4a26f200fa2ffccd6a582 SHA256 6d623559310d5abca79dc753b17a3ca5f5691fd0ff82a9fa074bad50c75db97d +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.18 (GNU/Linux) + +iEYEARECAAYFAk8EtZMACgkQ1ycZbhPLE2CVEACghuEpzr/1VyjY4+bgbrYTHJkL +r18An2glHYzuY1ka4Hehz7Xin39zs3FX +=i4qv +-----END PGP SIGNATURE----- diff --git a/dev-python/basemap/basemap-1.0.1.ebuild b/dev-python/basemap/basemap-1.0.2-r1.ebuild similarity index 80% rename from dev-python/basemap/basemap-1.0.1.ebuild rename to dev-python/basemap/basemap-1.0.2-r1.ebuild index 641aae34504d..0f3392f7434f 100644 --- a/dev-python/basemap/basemap-1.0.1.ebuild +++ b/dev-python/basemap/basemap-1.0.2-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/basemap/basemap-1.0.1.ebuild,v 1.1 2011/02/24 00:56:30 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/basemap/basemap-1.0.2-r1.ebuild,v 1.1 2012/01/04 20:24:42 bicatali Exp $ EAPI=3 PYTHON_DEPEND="2" @@ -20,22 +20,23 @@ LICENSE="MIT GPL-2" CDEPEND="sci-libs/shapelib >=dev-python/matplotlib-0.98 - >=sci-libs/geos-3.1.1" + >=sci-libs/geos-3.3.1" DEPEND="${CDEPEND} dev-python/setuptools" RDEPEND="${CDEPEND} >=dev-python/pupynere-1.0.8 + dev-python/httplib2 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 + # use /usr/share/data + sed -i \ + -e "/_datadir.*=.*join/s|\(.*datadir.*=\).*|\1'${EROOT}usr/share/${PN}'|g" \ + "${S}"/lib/mpl_toolkits/basemap/*.py || die } src_install() { diff --git a/dev-python/basemap/files/basemap-0.99.3-datadir.patch b/dev-python/basemap/files/basemap-0.99.3-datadir.patch deleted file mode 100644 index 702a2150cb05..000000000000 --- a/dev-python/basemap/files/basemap-0.99.3-datadir.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/mpl_toolkits/basemap/__init__.py.orig 2009-03-28 08:43:21.505631067 +0000 -+++ lib/mpl_toolkits/basemap/__init__.py 2009-03-28 08:52:04.355026615 +0000 -@@ -46,7 +46,7 @@ - if not os.path.isdir(basemap_datadir): - raise RuntimeError('Path in environment BASEMAPDATA not a directory') - else: -- basemap_datadir = os.sep.join([os.path.dirname(__file__), 'data']) -+ basemap_datadir = '/usr/share/basemap' - - __version__ = '0.99.3' - diff --git a/dev-python/basemap/files/basemap-0.99.3-syslib.patch b/dev-python/basemap/files/basemap-0.99.3-syslib.patch deleted file mode 100644 index f74a8937195c..000000000000 --- a/dev-python/basemap/files/basemap-0.99.3-syslib.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- setup.py.orig 2009-03-27 12:17:30.647508131 +0000 -+++ setup.py 2009-03-27 17:19:46.586103736 +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: -@@ -179,17 +179,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()) ] - else: - print 'pyshapelib installed' ---- setup.cfg.orig 2009-03-27 17:21:47.740287840 +0000 -+++ setup.cfg 2009-03-27 17:21:19.118756900 +0000 -@@ -6,6 +6,6 @@ - # False: do not install - # auto: install only if the package is unavailable. This - # is the default behavior --pydap = auto --httplib2 = auto -+pydap = False -+httplib2 = False - pyshapelib = auto