Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Steve Arnold (nerdboy)" <nerdboy@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sci-libs/gdal: metadata.xml ChangeLog gdal-1.7.2-r2.ebuild gdal-1.6.3-r1.ebuild gdal-1.7.2-r1.ebuild
Date: Tue, 30 Nov 2010 03:04:27
Message-Id: 20101130030415.3AA7C20054@flycatcher.gentoo.org
1 nerdboy 10/11/30 03:04:15
2
3 Modified: metadata.xml ChangeLog gdal-1.6.3-r1.ebuild
4 Added: gdal-1.7.2-r2.ebuild
5 Removed: gdal-1.7.2-r1.ebuild
6 Log:
7 Updated USE flag and config for bug 343531; converted to ruby-ng.
8
9 (Portage version: 2.1.9.24/cvs/Linux x86_64)
10
11 Revision Changes Path
12 1.7 sci-libs/gdal/metadata.xml
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/gdal/metadata.xml?rev=1.7&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/gdal/metadata.xml?rev=1.7&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/gdal/metadata.xml?r1=1.6&r2=1.7
17
18 Index: metadata.xml
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/sci-libs/gdal/metadata.xml,v
21 retrieving revision 1.6
22 retrieving revision 1.7
23 diff -u -r1.6 -r1.7
24 --- metadata.xml 18 Sep 2010 23:25:59 -0000 1.6
25 +++ metadata.xml 30 Nov 2010 03:04:14 -0000 1.7
26 @@ -10,6 +10,7 @@
27 <longdescription>GDAL is the Geospatial Data Abstraction Library, a set of tools for
28 converting between geospatial raster data formats (includes OGR for vector data).</longdescription>
29 <use>
30 + <flag name='aux_xml'>Enable Portable Auxilliary Metadata generation</flag>
31 <flag name='ecwj2k'>Enable support for alternate jpeg2k library
32 <pkg>sci-libs/libecwj2</pkg></flag>
33 <flag name='fits'>Enable support for NASA's <pkg>sci-libs/cfitsio</pkg>
34
35
36
37 1.102 sci-libs/gdal/ChangeLog
38
39 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/gdal/ChangeLog?rev=1.102&view=markup
40 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/gdal/ChangeLog?rev=1.102&content-type=text/plain
41 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/gdal/ChangeLog?r1=1.101&r2=1.102
42
43 Index: ChangeLog
44 ===================================================================
45 RCS file: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v
46 retrieving revision 1.101
47 retrieving revision 1.102
48 diff -u -r1.101 -r1.102
49 --- ChangeLog 8 Nov 2010 17:37:06 -0000 1.101
50 +++ ChangeLog 30 Nov 2010 03:04:14 -0000 1.102
51 @@ -1,6 +1,13 @@
52 # ChangeLog for sci-libs/gdal
53 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
54 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.101 2010/11/08 17:37:06 xarthisius Exp $
55 +# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.102 2010/11/30 03:04:14 nerdboy Exp $
56 +
57 +*gdal-1.7.2-r2 (29 Nov 2010)
58 +
59 + 29 Nov 2010; Steve Arnold <nerdboy@g.o> -gdal-1.7.2-r1.ebuild,
60 + +gdal-1.7.2-r2.ebuild:
61 + Updated USE flag handling and config for bug #343531. Now fixed...
62 + Also corrected some QA issues and updated to the ruby-ng eclass.
63
64 08 Nov 2010; Kacper Kowalik <xarthisius@g.o> gdal-1.6.3-r1.ebuild,
65 -gdal-1.7.1-r1.ebuild, -files/gdal-1.7.1-warp_fix.patch,
66
67
68
69 1.14 sci-libs/gdal/gdal-1.6.3-r1.ebuild
70
71 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/gdal/gdal-1.6.3-r1.ebuild?rev=1.14&view=markup
72 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/gdal/gdal-1.6.3-r1.ebuild?rev=1.14&content-type=text/plain
73 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/gdal/gdal-1.6.3-r1.ebuild?r1=1.13&r2=1.14
74
75 Index: gdal-1.6.3-r1.ebuild
76 ===================================================================
77 RCS file: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.6.3-r1.ebuild,v
78 retrieving revision 1.13
79 retrieving revision 1.14
80 diff -u -r1.13 -r1.14
81 --- gdal-1.6.3-r1.ebuild 8 Nov 2010 17:37:06 -0000 1.13
82 +++ gdal-1.6.3-r1.ebuild 30 Nov 2010 03:04:15 -0000 1.14
83 @@ -1,6 +1,6 @@
84 # Copyright 1999-2010 Gentoo Foundation
85 # Distributed under the terms of the GNU General Public License v2
86 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.6.3-r1.ebuild,v 1.13 2010/11/08 17:37:06 xarthisius Exp $
87 +# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.6.3-r1.ebuild,v 1.14 2010/11/30 03:04:15 nerdboy Exp $
88
89 EAPI="3"
90 WANT_AUTOCONF="2.5"
91 @@ -8,7 +8,7 @@
92 USE_RUBY="ruby18"
93 PYTHON_DEPEND="2"
94
95 -inherit autotools distutils eutils perl-module ruby toolchain-funcs
96 +inherit autotools distutils eutils perl-module ruby-ng toolchain-funcs
97
98 DESCRIPTION="GDAL is a translator library for raster geospatial data formats (includes OGR support)"
99 HOMEPAGE="http://www.gdal.org/"
100 @@ -108,7 +108,7 @@
101 $(use_with gml xerces) $(use_with hdf5) $(use_with curl) \
102 $(use_with postgres pg) $(use_with python) $(use_with ruby) \
103 $(use_with threads) $(use_with fits cfitsio) $(use_with perl) \
104 - $(use_with sqlite sqlite3 =${EPREFIX}/usr) $(use_with geos) \
105 + $(use_with sqlite sqlite3 ="${EPREFIX}"/usr) $(use_with geos) \
106 $(use_with jpeg2k jasper) $(use_with odbc) $(use_enable debug)"
107
108 # It can't find this
109
110
111
112 1.1 sci-libs/gdal/gdal-1.7.2-r2.ebuild
113
114 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/gdal/gdal-1.7.2-r2.ebuild?rev=1.1&view=markup
115 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/gdal/gdal-1.7.2-r2.ebuild?rev=1.1&content-type=text/plain
116
117 Index: gdal-1.7.2-r2.ebuild
118 ===================================================================
119 # Copyright 1999-2010 Gentoo Foundation
120 # Distributed under the terms of the GNU General Public License v2
121 # $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.7.2-r2.ebuild,v 1.1 2010/11/30 03:04:15 nerdboy Exp $
122
123 EAPI="2"
124
125 WANT_AUTOCONF="2.5"
126 RUBY_OPTIONAL="yes"
127 USE_RUBY="ruby18"
128 PYTHON_DEPEND="python? 2"
129
130 inherit autotools eutils perl-module python ruby-ng toolchain-funcs
131
132 DESCRIPTION="GDAL is a translator library for raster geospatial data formats (includes OGR support)"
133 HOMEPAGE="http://www.gdal.org/"
134 SRC_URI="http://download.osgeo.org/gdal/${P}.tar.gz"
135
136 SLOT="0"
137 LICENSE="MIT"
138 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x86-linux ~x86-macos"
139
140 IUSE="+aux_xml curl debug doc ecwj2k fits geos gif gml hdf5 jpeg jpeg2k mysql netcdf odbc ogdi perl png postgres python ruby sqlite threads"
141
142 RDEPEND="
143 dev-libs/expat
144 >=media-libs/tiff-4.0.0_beta6
145 sci-libs/libgeotiff
146 sys-libs/zlib
147 curl? ( net-misc/curl )
148 ecwj2k? ( sci-libs/libecwj2 )
149 fits? ( sci-libs/cfitsio )
150 geos? ( >=sci-libs/geos-2.2.1 )
151 gif? ( media-libs/giflib )
152 gml? ( >=dev-libs/xerces-c-3 )
153 hdf5? ( >=sci-libs/hdf5-1.6.4[szip] )
154 jpeg? ( media-libs/jpeg )
155 jpeg2k? ( media-libs/jasper )
156 mysql? ( virtual/mysql )
157 netcdf? ( sci-libs/netcdf )
158 odbc? ( dev-db/unixODBC )
159 ogdi? ( sci-libs/ogdi )
160 perl? ( dev-lang/perl )
161 png? ( media-libs/libpng )
162 postgres? (
163 || (
164 >=dev-db/postgresql-base-8.4
165 >=dev-db/postgresql-server-8.4
166 )
167 )
168 python? ( dev-python/numpy )
169 ruby? ( $(ruby_implementation_depend ruby18) )
170 sqlite? ( >=dev-db/sqlite-3 )
171 "
172
173 DEPEND="${RDEPEND}
174 doc? ( app-doc/doxygen )
175 perl? ( >=dev-lang/swig-1.3.32 )
176 python? ( >=dev-lang/swig-1.3.32 )
177 ruby? ( >=dev-lang/swig-1.3.32 )
178 "
179
180 AT_M4DIR="${S}/m4"
181 MAKEOPTS+=" -j1"
182
183 pkg_setup() {
184 # only py2 is supported
185 python_set_active_version 2
186 }
187
188 src_unpack() {
189 # prevent ruby-ng.eclass from messing with the src path
190 default
191 }
192
193 src_prepare() {
194 # fix datadir and docdir placement
195 sed -i \
196 -e "s:@datadir@:@datadir@/gdal:" \
197 -e "s:@exec_prefix@/doc:@exec_prefix@/share/doc/${PF}/html:g" \
198 GDALmake.opt.in || die
199
200 sed -i \
201 -e "s:setup.py install:setup.py install --root=\$(DESTDIR):" \
202 swig/python/GNUmakefile || die
203
204 epatch "${FILESDIR}"/${PV}-ruby_cflags.patch
205
206 # -soname is only accepted by GNU ld/ELF
207 [[ ${CHOST} == *-darwin* ]] \
208 && epatch "${FILESDIR}"/${PN}-1.5.0-install_name.patch \
209 || epatch "${FILESDIR}"/${PN}-1.5.0-soname.patch
210
211 eautoreconf
212 }
213
214 src_configure() {
215 if use ruby; then
216 RUBY_MOD_DIR="$(ruby18 -r rbconfig -e 'print Config::CONFIG["sitearchdir"]')"
217 echo "Ruby module dir is: $RUBY_MOD_DIR"
218 fi
219
220 # pcidsk is internal, because there is no such library yet released
221 # also that thing is developed by the gdal people
222 # kakadu, mrsid jp2mrsid - another jpeg2k stuff, ignore
223 # bsb - legal issues
224 # oracle - disabled, i dont have and can't test
225 # ingres - same story as oracle oci
226 # tiff is a hard dep
227 econf \
228 --enable-shared \
229 --disable-static \
230 --with-expat \
231 --without-grass \
232 --without-hdf4 \
233 --without-fme \
234 --without-pcraster \
235 --without-kakadu \
236 --without-mrsid \
237 --without-jp2mrsid \
238 --without-msg \
239 --without-bsb \
240 --without-dods-root \
241 --without-oci \
242 --without-ingres \
243 --without-spatialite \
244 --without-dwgdirect \
245 --without-epsilon \
246 --without-idb \
247 --without-sde \
248 --without-libtool \
249 --with-libz="${EPREFIX}/usr/" \
250 --with-ogr \
251 --with-grib \
252 --with-vfk \
253 --with-libtiff \
254 --with-geotiff \
255 $(use_enable debug) \
256 $(use_with postgres pg) \
257 $(use_with fits cfitsio) \
258 $(use_with netcdf) \
259 $(use_with png) \
260 $(use_with jpeg) \
261 $(use_with jpeg pcidsk) \
262 $(use_with gif) \
263 $(use_with ogdi ogdi "${EPREFIX}"/usr) \
264 $(use_with hdf5) \
265 $(use_with jpeg2k jasper) \
266 $(use_with ecwj2k ecw) \
267 $(use_with gml xerces) \
268 $(use_with odbc) \
269 $(use_with curl) \
270 $(use_with sqlite sqlite3 "${EPREFIX}"/usr) \
271 $(use_with mysql mysql "${EPREFIX}"/usr/bin/mysql_config) \
272 $(use_with geos) \
273 $(use_with aux_xml pam) \
274 $(use_with perl) \
275 $(use_with ruby) \
276 $(use_with python) \
277 $(use_with threads) \
278 --with-pymoddir="${EPREFIX}"/$(python_get_sitedir)
279
280 # mysql-config puts this in (and boy is it a PITA to get it out)
281 if use mysql; then
282 sed -i \
283 -e "s: -rdynamic : :" \
284 GDALmake.opt || die "sed LIBS failed"
285 fi
286
287 # updated for newer swig (must specify the path to input files)
288 if use python; then
289 sed -i \
290 -e "s: gdal_array.i: ../include/gdal_array.i:" \
291 -e "s:\$(DESTDIR)\$(prefix):\$(DESTDIR)\$(INST_PREFIX):g" \
292 swig/python/GNUmakefile || die "sed python makefile failed"
293 sed -i \
294 -e "s:library_dirs = :library_dirs = /usr/$(get_libdir):g" \
295 swig/python/setup.cfg || die "sed python setup.cfg failed"
296 fi
297 }
298
299 src_compile() {
300 local i
301 for i in perl ruby python; do
302 if use $i; then
303 rm "${S}"/swig/$i/*_wrap.cpp
304 emake -C "${S}"/swig/$i generate || \
305 die "make generate failed for swig/$i"
306 fi
307 done
308
309 # parallel makes fail
310 emake || die "emake failed"
311
312 if use perl ; then
313 cd "${S}"/swig/perl
314 perl-module_src_prep
315 perl-module_src_compile
316 cd "${S}"
317 fi
318
319 if use doc ; then
320 make docs || die "make docs failed"
321 fi
322 }
323
324 src_install() {
325 if use perl ; then
326 pushd "${S}"/swig/perl > /dev/null
327 perl-module_src_install
328 popd > /dev/null
329 sed -i \
330 -e "s:BINDINGS = python ruby perl:BINDINGS = python ruby:g" \
331 GDALmake.opt || die
332 fi
333
334 emake DESTDIR="${D}" install || die "make install failed"
335
336 if use ruby ; then
337 # weird reinstall collision; needs manual intervention...
338 pushd "${S}"/swig/ruby > /dev/null
339 rm -rf "${D}"${RUBY_MOD_DIR}/gdal
340 exeinto ${RUBY_MOD_DIR}/gdal
341 doexe *.so || die "doins ruby modules failed"
342 popd > /dev/null
343 fi
344
345 use perl && fixlocalpod
346
347 dodoc Doxyfile HOWTO-RELEASE NEWS || die
348
349 if use doc ; then
350 dohtml html/* || die "install html failed"
351 docinto ogr
352 dohtml ogr/html/* || die "install ogr html failed"
353 fi
354
355 if use python; then
356 newdoc swig/python/README.txt README-python.txt || die
357 insinto /usr/share/${PN}/samples
358 doins swig/python/samples/* || die
359 fi
360 }
361
362 pkg_postinst() {
363 echo
364 elog "Check available image and data formats after building with"
365 elog "gdalinfo and ogrinfo (using the --formats switch)."
366 }
Report Message
Find on MARC Find on Google Groups