Various fixes including missing dependencies, and not including the system proj libra...

Package-Manager: portage-2.1.4.3

diff --git a/dev-python/basemap/ChangeLog b/dev-python/basemap/ChangeLog
index 19c4d9d1556a0045f38bd56d014060eec4018489..ad6660e2b144418228ee2f793b72fd50f9f31ac4 100644 (file)
--- a/dev-python/basemap/ChangeLog
+++ b/dev-python/basemap/ChangeLog
@@ -1,6 +1,15 @@
 # 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.5 2008/01/04 18:06:45 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/basemap/ChangeLog,v 1.6 2008/02/13 14:12:09 bicatali Exp $
+
+*basemap-0.9.9-r1 (13 Feb 2008)
+
+  13 Feb 2008; Sébastien Fabbro <bicatali@gentoo.org>
+  files/basemap-0.9.9-syslib.patch, -basemap-0.9.9.ebuild,
+  +basemap-0.9.9-r1.ebuild:
+  Various fixes including missing dependencies, and not including the system
+  proj library. Also adding a check for the conflict with geos python
+  bindings, see bug #209895
 
 *basemap-0.9.9 (04 Jan 2008)
 

diff --git a/dev-python/basemap/Manifest b/dev-python/basemap/Manifest
index bb7210a9d5bf2e79d8cd8a2289d799d2b337f1f1..01a35f6b1dcbabb657ccbdeedaa832104fe7183e 100644 (file)
--- a/dev-python/basemap/Manifest
+++ b/dev-python/basemap/Manifest
@@ -1,8 +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 2761 RMD160 050dc1a2f96efbcac0a70aecf537056f3ba4aef3 SHA1 c4746aa7940cdbb1f6e66d3acb9981c9bb198103 SHA256 8e5475cd191fd8073274c8f88883c2c1c6b1c93a213a400d5df4a622a2711464
+AUX basemap-0.9.9-syslib.patch 3266 RMD160 c2c1fcfbaf08bf68b9faad292017faccc793a3d3 SHA1 690ffd170fd5266ac8c63ffd6ddcfe729881b2f3 SHA256 1f0e69b8a977fc7b32a2d8f735de8602811d7cc0b653f6e90ef73628e72e3165
 DIST basemap-0.9.6.tar.gz 13429588 RMD160 89f4f384980d45e91037367947381753bf79163a SHA1 5f46906c1c53c3d597b83c275f2de8d6740663d6 SHA256 9512475009fc10361580f7bc577c806a1a465e7e79ac2d233c1ffae83e4683d0
 DIST basemap-0.9.9.tar.gz 31882415 RMD160 e1b3c3860ee7732efb836eff2156fb866b255cf6 SHA1 149624174e805a74d23544383ad7e72c066a780b SHA256 b811e9ab80fe38054a8fb471affe2e5367e8e052356d59e82e90416d4dd0c272
 EBUILD basemap-0.9.6.ebuild 929 RMD160 516844261fb8df4fbb0141c1fb7aa18e78adfc64 SHA1 6245a7fcfa34afd87044e76914905ccf7ab72c47 SHA256 5ec2b2e39a4996488ff5b3ea6a78e1543a5593207c423dd1eb71c2759d41fb8d
-EBUILD basemap-0.9.9.ebuild 998 RMD160 c945375c19a2ce02a97328e7ab6ff904feaf3f34 SHA1 30a154bce920b0a96b586cba13ffa66a681e91ac SHA256 f565b8c3f01049c4d83374c71b8e7107b94b31d7f14c5b0853c40a98d3795c72
-MISC ChangeLog 1154 RMD160 ed059e6e6198864f9c7a85c53919adcedada3a91 SHA1 c19c95f9167d4f730a58da5cf9db903b3e3f7c13 SHA256 399e07acabbc52f11cc6643ac386da9a9858740c573a3a453e4154e3b28371c8
+EBUILD basemap-0.9.9-r1.ebuild 1291 RMD160 16dce8af420c7e33cb64003c585cfe7b8490de68 SHA1 17e5a6cea6d57876f32d0dbfd0dbab16da0cc265 SHA256 1b9e737759e09f0586e95b927c674452546f300e026b858a3eda9653d4e770cb
+MISC ChangeLog 1505 RMD160 cc49b20c1018073ec45d05e03a8879141dcc8fb7 SHA1 117c1eabb5e597e8323b7bef54f13d94f242f129 SHA256 c65ee2763f68b5ebf25a0624809f7b58e8537d5555466f5568d032736186271c
 MISC metadata.xml 345 RMD160 9b474bcb23ff1a46d81359f0cd50000ae5f6e2e8 SHA1 aef929468d8ef9a1c5161279d0c0eb16a8841811 SHA256 6912d4e1753bb1e71bd921542f553906102957bac010e60a1c08a98063d24496
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHsvrD1ycZbhPLE2ARAgH6AJ9VT1VmGckFUF6i0ZHRKTUV6E+zDQCgkVRC
+YauwlZ+AXC3KdNRL+BCcRgw=
+=hmAY
+-----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
new file mode 100644 (file)
index 0000000..0569492
--- /dev/null
+++ b/dev-python/basemap/basemap-0.9.9-r1.ebuild
@@ -0,0 +1,51 @@
+# 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 $
+
+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="examples"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+LICENSE="MIT GPL-2"
+
+CDEPEND="sci-libs/shapelib
+       dev-python/numpy
+       >=dev-python/matplotlib-0.90
+       =sci-libs/geos-2.2.3*"
+
+DEPEND="${CDEPEND}
+       dev-python/setuptools"
+
+RDEPEND="${CDEPEND}
+       dev-python/dap"
+
+DOCS="FAQ API_CHANGES"
+
+pkg_setup() {
+       if built_with_use sci-libs/geos python; then
+               eerror "${P} conflicts with geos python bindings"
+               eerror "Re-install geos without the python flag"
+               die "geos python use check failed"
+       fi
+}
+
+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
+}

diff --git a/dev-python/basemap/basemap-0.9.9.ebuild b/dev-python/basemap/basemap-0.9.9.ebuild
deleted file mode 100644 (file)
index 2313f8f..0000000
--- a/dev-python/basemap/basemap-0.9.9.ebuild
+++ /dev/null
@@ -1,42 +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.9.9.ebuild,v 1.1 2008/01/04 18:06:45 bicatali Exp $
-
-inherit 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="examples"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-LICENSE="MIT GPL-2"
-
-# test as GUI (with USE=examples)
-RESTRICT="test"
-
-DEPEND="sci-libs/shapelib
-       >=sci-libs/proj-4.6
-       =sci-libs/geos-2.2.3"
-
-RDEPEND="${DEPEND}
-       dev-python/numpy
-       >=dev-python/matplotlib-0.90"
-
-DOCS="FAQ API_CHANGES"
-
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
-       # patch to use proj, shapelib and geos system libraries
-       epatch "${FILESDIR}"/${P}-syslib.patch
-}
-
-src_install() {
-       distutils_src_install
-       if use examples; then
-               insinto /usr/share/doc/${PF}/examples
-               doins examples/* || die
-       fi
-}

diff --git a/dev-python/basemap/files/basemap-0.9.9-syslib.patch b/dev-python/basemap/files/basemap-0.9.9-syslib.patch
index 34a3a61bcbdfda34f92c9f86abe21427d5cb4ac5..6cf17a12748c6b730e6d6328fe24d88162dda30f 100644 (file)
--- a/dev-python/basemap/files/basemap-0.9.9-syslib.patch
+++ b/dev-python/basemap/files/basemap-0.9.9-syslib.patch
@@ -1,5 +1,5 @@
---- setup.py.orig      2008-01-04 14:56:33.980098124 +0000
-+++ setup.py   2008-01-04 18:00:54.978320866 +0000
+--- setup.py.orig      2008-02-13 01:53:03.524223194 +0000
++++ setup.py   2008-02-13 12:18:32.290150702 +0000
 @@ -24,7 +24,7 @@
      DBFUpdateHeader is available, we scan shapefil.h for the string
      'DBFUpdateHeader'.
@@ -14,22 +14,11 @@
  if GEOS_dir is None:
      # if GEOS_dir not set, check a few standard locations.
 -    GEOS_dirs = ['/usr/local','/sw','/opt','/opt/local',os.path.expanduser('~')]
-+    GEOS_dirs = ['/usr','/sw','/opt','/opt/local',os.path.expanduser('~')]
++    GEOS_dirs = ['/usr','/usr/local','/sw','/opt','/opt/local',os.path.expanduser('~')]
      for direc in GEOS_dirs:
          geos_version = check_geosversion(direc)
          print 'checking for GEOS lib in %s ....' % direc
-@@ -86,8 +86,8 @@
- 
- packages          = ['matplotlib.toolkits.basemap']
- package_dirs       = {'':'lib'}
--extensions = [Extension("matplotlib.toolkits.basemap._proj",deps+['src/_proj.c'],include_dirs = ['src'],)]
--extensions.append(Extension("matplotlib.toolkits.basemap._geod",deps+['src/_geod.c'],include_dirs = ['src'],))
-+extensions = [Extension("matplotlib.toolkits.basemap._proj",['src/_proj.c'],libraries = ["proj"])]
-+extensions.append(Extension("matplotlib.toolkits.basemap._geod",['src/_geod.c'],include_dirs = geos_include_dirs,libraries=['geos_c','geos']))
- # for some reason, pickling won't work if this extension is installed
- # as "matplotlib.toolkits.basemap._geos"
- extensions.append(Extension("_geos",['src/_geos.c'],
-@@ -102,17 +102,16 @@
+@@ -102,41 +102,18 @@
  package_dirs['dbflib'] = os.path.join('lib','dbflib')
  extensions = extensions + \
           [Extension("shapelibc",
@@ -53,4 +42,28 @@
 +                    libraries = ["shp"],
                      define_macros = dbf_macros()) ]
  
- # install dap and httplib2, if not already available.
+-# install dap and httplib2, if not already available.
+-# only a subset of dap is installed (the client, not the server)
+-__dapversion__ = None
+-try:
+-    from dap.lib import __version__ as __dapversion__
+-except ImportError:
+-    packages = packages + ['dap','dap.util','dap.parsers']
+-    package_dirs['dap'] = os.path.join('lib','dap')
+-# install dap client anyway if installed version is older than
+-# version provided here.
+-if __dapversion__ is not None:
+-    __dapversion__ = [repr(v)+'.' for v in __dapversion__]
+-    __dapversion__ = ''.join(__dapversion__)[:-1]
+-    if __dapversion__ < '2.2.6.2':
+-        packages = packages + ['dap','dap.util','dap.parsers']
+-        package_dirs['dap'] = os.path.join('lib','dap')
+-try:
+-    import httplib2
+-except ImportError:
+-    packages = packages + ['httplib2']
+-    package_dirs['httlib2'] = os.path.join('lib','httplib2')
+-
+ # Specify all the required mpl data
+ pyproj_datafiles = ['data/epsg', 'data/esri', 'data/esri.extra', 'data/GL27', 'data/nad.lst', 'data/nad27', 'data/nad83', 'data/ntv2_out.dist', 'data/other.extra', 'data/pj_out27.dist', 'data/pj_out83.dist', 'data/proj_def.dat', 'data/README', 'data/td_out.dist', 'data/test27', 'data/test83', 'data/testntv2', 'data/testvarious', 'data/world']
+ boundaryfiles = []