Gentoo Archives: gentoo-commits

From: "Sebastien Fabbro (bicatali)" <bicatali@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-python/basemap/files: basemap-0.9.6-syslib.patch digest-basemap-0.9.6 digest-basemap-0.9.4 basemap-syslib.patch
Date: Sat, 03 Nov 2007 19:07:00
Message-Id: E1IoOKc-0000b2-T2@stork.gentoo.org
1 bicatali 07/11/03 19:06:54
2
3 Added: basemap-0.9.6-syslib.patch digest-basemap-0.9.6
4 Removed: digest-basemap-0.9.4 basemap-syslib.patch
5 Log:
6 version bump.
7 (Portage version: 2.1.3.16)
8
9 Revision Changes Path
10 1.1 dev-python/basemap/files/basemap-0.9.6-syslib.patch
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/basemap/files/basemap-0.9.6-syslib.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/basemap/files/basemap-0.9.6-syslib.patch?rev=1.1&content-type=text/plain
14
15 Index: basemap-0.9.6-syslib.patch
16 ===================================================================
17 --- setup.py.orig 2007-11-03 18:43:14.441250205 +0000
18 +++ setup.py 2007-11-03 18:46:59.423732183 +0000
19 @@ -22,7 +22,7 @@
20 DBFUpdateHeader is available, we scan shapefil.h for the string
21 'DBFUpdateHeader'.
22 """
23 - f = open(convert_path("pyshapelib/shapelib/shapefil.h"))
24 + f = open(convert_path("/usr/include/libshp/shapefil.h"))
25 contents = f.read()
26 f.close()
27 if contents.find("DBFUpdateHeader") >= 0:
28 @@ -36,7 +36,7 @@
29
30 packages = ['matplotlib.toolkits.basemap']
31 package_dirs = {'':'lib'}
32 -extensions = [Extension("matplotlib.toolkits.basemap._proj",deps+['src/_proj.c'],include_dirs = ['src'],)]
33 +extensions = [Extension("matplotlib.toolkits.basemap._proj",['src/_proj.c'],include_dirs = ['src'],libraries=["proj"])]
34 extensions.append(Extension("matplotlib.toolkits.basemap._geod",deps+['src/_geod.c'],include_dirs = ['src'],))
35
36 # install shapelib and dbflib.
37 @@ -45,17 +45,16 @@
38 package_dirs['dbflib'] = os.path.join('lib','dbflib')
39 extensions = extensions + \
40 [Extension("shapelibc",
41 - ["pyshapelib/shapelib_wrap.c",
42 - "pyshapelib/shapelib/shpopen.c",
43 - "pyshapelib/shapelib/shptree.c"],
44 - include_dirs = ["pyshapelib/shapelib"]),
45 + ["pyshapelib/shapelib_wrap.c"],
46 + include_dirs = ["/usr/include/libshp"],
47 + libraries=["shp"]),
48 Extension("shptree",
49 ["pyshapelib/shptreemodule.c"],
50 - include_dirs = ["pyshapelib/shapelib"]),
51 + include_dirs = ["/usr/include/libshp"]),
52 Extension("dbflibc",
53 - ["pyshapelib/dbflib_wrap.c",
54 - "pyshapelib/shapelib/dbfopen.c"],
55 - include_dirs = ["pyshapelib/shapelib"],
56 + ["pyshapelib/dbflib_wrap.c"],
57 + include_dirs = ["/usr/include/libshp"],
58 + libraries=["shp"],
59 define_macros = dbf_macros()) ]
60
61 if 'setuptools' in sys.modules:
62
63
64
65 1.1 dev-python/basemap/files/digest-basemap-0.9.6
66
67 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/basemap/files/digest-basemap-0.9.6?rev=1.1&view=markup
68 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/basemap/files/digest-basemap-0.9.6?rev=1.1&content-type=text/plain
69
70 Index: digest-basemap-0.9.6
71 ===================================================================
72 MD5 a7ffe5c790d56d3f1b5b366eb95fdde6 basemap-0.9.6.tar.gz 13429588
73 RMD160 89f4f384980d45e91037367947381753bf79163a basemap-0.9.6.tar.gz 13429588
74 SHA256 9512475009fc10361580f7bc577c806a1a465e7e79ac2d233c1ffae83e4683d0 basemap-0.9.6.tar.gz 13429588
75
76
77
78 --
79 gentoo-commits@g.o mailing list