1 |
titanofold 14/01/27 00:10:34 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: gdal-1.10.1.ebuild |
5 |
Log: |
6 |
Fix bug 493236: Depend on Perl conditionally. Thanks Nikoli. |
7 |
Fix bug 492338: Version bump. Thanks Stephan Litterst. |
8 |
Fix bug 483074: Convert to python-r1 to support multiple Pythons. Thanks |
9 |
Ian Stakenvicius. |
10 |
Fix bug 466114: Append -lisqlite3 to LIBS. Thanks cmuelle8. |
11 |
Fix bug 482888: Modify poppler dependency to have a minimum |
12 |
version (>=0.24.3). |
13 |
Fix bug 490048: Add dev-libs/libpcre and dev-libs/libxml2 to RDEPEND |
14 |
Fix bug 489224: Add sub-slot operator to trigger rebuild when poppler or |
15 |
Perl is updated. Thanks Nikoli. |
16 |
Fix bug 490046: Resolved by sci-libs/gdal version bump. |
17 |
Fix bug 474678: Really include the patch this time. |
18 |
|
19 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key D1BBFDA0) |
20 |
|
21 |
Revision Changes Path |
22 |
1.141 sci-libs/gdal/ChangeLog |
23 |
|
24 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/gdal/ChangeLog?rev=1.141&view=markup |
25 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/gdal/ChangeLog?rev=1.141&content-type=text/plain |
26 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/gdal/ChangeLog?r1=1.140&r2=1.141 |
27 |
|
28 |
Index: ChangeLog |
29 |
=================================================================== |
30 |
RCS file: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v |
31 |
retrieving revision 1.140 |
32 |
retrieving revision 1.141 |
33 |
diff -u -r1.140 -r1.141 |
34 |
--- ChangeLog 24 Jun 2013 23:48:21 -0000 1.140 |
35 |
+++ ChangeLog 27 Jan 2014 00:10:33 -0000 1.141 |
36 |
@@ -1,6 +1,23 @@ |
37 |
# ChangeLog for sci-libs/gdal |
38 |
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
39 |
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.140 2013/06/24 23:48:21 titanofold Exp $ |
40 |
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
41 |
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.141 2014/01/27 00:10:33 titanofold Exp $ |
42 |
+ |
43 |
+*gdal-1.10.1 (26 Jan 2014) |
44 |
+ |
45 |
+ 26 Jan 2014; Aaron W. Swenson <titanofold@g.o> |
46 |
+ +files/gdal-1.10.0-ruby-makefile.patch, +gdal-1.10.1.ebuild: |
47 |
+ Fix bug 493236: Depend on Perl conditionally. Thanks Nikoli. |
48 |
+ Fix bug 492338: Version bump. Thanks Stephan Litterst. |
49 |
+ Fix bug 483074: Convert to python-r1 to support multiple Pythons. Thanks |
50 |
+ Ian Stakenvicius. |
51 |
+ Fix bug 466114: Append -lisqlite3 to LIBS. Thanks cmuelle8. |
52 |
+ Fix bug 482888: Modify poppler dependency to have a minimum |
53 |
+ version (>=0.24.3). |
54 |
+ Fix bug 490048: Add dev-libs/libpcre and dev-libs/libxml2 to RDEPEND |
55 |
+ Fix bug 489224: Add sub-slot operator to trigger rebuild when poppler or |
56 |
+ Perl is updated. Thanks Nikoli. |
57 |
+ Fix bug 490046: Resolved by sci-libs/gdal version bump. |
58 |
+ Fix bug 474678: Really include the patch this time. |
59 |
|
60 |
*gdal-1.10.0-r1 (24 Jun 2013) |
61 |
|
62 |
|
63 |
|
64 |
|
65 |
1.1 sci-libs/gdal/gdal-1.10.1.ebuild |
66 |
|
67 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/gdal/gdal-1.10.1.ebuild?rev=1.1&view=markup |
68 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/gdal/gdal-1.10.1.ebuild?rev=1.1&content-type=text/plain |
69 |
|
70 |
Index: gdal-1.10.1.ebuild |
71 |
=================================================================== |
72 |
# Copyright 1999-2014 Gentoo Foundation |
73 |
# Distributed under the terms of the GNU General Public License v2 |
74 |
# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.10.1.ebuild,v 1.1 2014/01/27 00:10:33 titanofold Exp $ |
75 |
|
76 |
EAPI=5 |
77 |
|
78 |
WANT_AUTOCONF="2.5" |
79 |
|
80 |
GENTOO_DEPEND_ON_PERL="no" |
81 |
PYTHON_COMPAT=( python2_{5..7} python3_{1..3} ) |
82 |
DISTUTILS_OPTIONAL=1 |
83 |
|
84 |
inherit autotools eutils libtool perl-module distutils-r1 python-r1 toolchain-funcs java-pkg-opt-2 |
85 |
|
86 |
DESCRIPTION="Translator library for raster geospatial data formats (includes OGR support)" |
87 |
HOMEPAGE="http://www.gdal.org/" |
88 |
SRC_URI="http://download.osgeo.org/${PN}/${PV}/${P}.tar.gz" |
89 |
|
90 |
SLOT="0" |
91 |
LICENSE="MIT" |
92 |
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" |
93 |
IUSE="armadillo +aux_xml curl debug doc ecwj2k fits geos gif gml hdf5 java jpeg jpeg2k mdb mysql netcdf odbc opencl ogdi pdf perl png postgres python ruby spatialite sqlite threads xls" |
94 |
|
95 |
RDEPEND=" |
96 |
dev-libs/expat |
97 |
dev-libs/libpcre |
98 |
dev-libs/libxml2 |
99 |
media-libs/tiff |
100 |
sci-libs/libgeotiff |
101 |
sys-libs/zlib[minizip(+)] |
102 |
armadillo? ( sci-libs/armadillo[lapack] ) |
103 |
curl? ( net-misc/curl ) |
104 |
ecwj2k? ( sci-libs/libecwj2 ) |
105 |
fits? ( sci-libs/cfitsio ) |
106 |
geos? ( >=sci-libs/geos-2.2.1 ) |
107 |
gif? ( media-libs/giflib ) |
108 |
gml? ( >=dev-libs/xerces-c-3 ) |
109 |
hdf5? ( >=sci-libs/hdf5-1.6.4[szip] ) |
110 |
java? ( >=virtual/jre-1.6 ) |
111 |
jpeg? ( virtual/jpeg ) |
112 |
jpeg2k? ( media-libs/jasper ) |
113 |
mysql? ( virtual/mysql ) |
114 |
netcdf? ( sci-libs/netcdf ) |
115 |
odbc? ( dev-db/unixODBC ) |
116 |
ogdi? ( sci-libs/ogdi ) |
117 |
opencl? ( virtual/opencl ) |
118 |
pdf? ( >=app-text/poppler-0.24.3:= ) |
119 |
perl? ( dev-lang/perl:= ) |
120 |
png? ( media-libs/libpng ) |
121 |
postgres? ( >=dev-db/postgresql-base-8.4 ) |
122 |
python? ( |
123 |
${PYTHON_DEPS} |
124 |
dev-python/setuptools[${PYTHON_USEDEP}] |
125 |
dev-python/numpy[${PYTHON_USEDEP}] |
126 |
) |
127 |
ruby? ( dev-lang/ruby:1.9 ) |
128 |
sqlite? ( dev-db/sqlite:3 ) |
129 |
spatialite? ( dev-db/spatialite ) |
130 |
xls? ( dev-libs/freexl ) |
131 |
" |
132 |
|
133 |
SWIG_DEP=">=dev-lang/swig-2.0.2" |
134 |
DEPEND="${RDEPEND} |
135 |
doc? ( app-doc/doxygen ) |
136 |
java? ( >=virtual/jdk-1.6 ) |
137 |
perl? ( ${SWIG_DEP} ) |
138 |
python? ( ${SWIG_DEP} ) |
139 |
ruby? ( ${SWIG_DEP} )" |
140 |
|
141 |
AT_M4DIR="${S}/m4" |
142 |
|
143 |
REQUIRED_USE=" |
144 |
spatialite? ( sqlite ) |
145 |
mdb? ( java ) |
146 |
" |
147 |
|
148 |
pkg_setup() { |
149 |
java-pkg-opt-2_pkg_setup |
150 |
} |
151 |
|
152 |
src_prepare() { |
153 |
java-pkg-opt-2_src_prepare |
154 |
|
155 |
# fix datadir and docdir placement |
156 |
sed -i \ |
157 |
-e "s:@datadir@:@datadir@/gdal:" \ |
158 |
-e "s:@exec_prefix@/doc:@exec_prefix@/share/doc/${PF}/html:g" \ |
159 |
"${S}"/GDALmake.opt.in || die |
160 |
|
161 |
# the second sed expression should fix bug 371075 |
162 |
sed -i \ |
163 |
-e "s:setup.py install:setup.py install --root=\$(DESTDIR):" \ |
164 |
-e "s:--prefix=\$(DESTDIR):--prefix=:" \ |
165 |
"${S}"/swig/python/GNUmakefile || die |
166 |
|
167 |
epatch "${FILESDIR}"/${PN}-1.10.0-ruby-makefile.patch |
168 |
|
169 |
# -soname is only accepted by GNU ld/ELF |
170 |
[[ ${CHOST} == *-darwin* ]] \ |
171 |
&& epatch "${FILESDIR}"/${PN}-1.5.0-install_name.patch \ |
172 |
|| epatch "${FILESDIR}"/${PN}-1.5.0-soname.patch |
173 |
|
174 |
# Fix spatialite/sqlite include issue |
175 |
sed -i \ |
176 |
-e 's:spatialite/sqlite3.h:sqlite3.h:g' \ |
177 |
ogr/ogrsf_frmts/sqlite/ogr_sqlite.h || die |
178 |
|
179 |
# Fix freexl configure check |
180 |
sed -i \ |
181 |
-e 's:FREEXL_LIBS=missing):FREEXL_LIBS=missing,-lm):g' \ |
182 |
configure.in || die |
183 |
|
184 |
sed \ |
185 |
-e "s: /usr/: \"${EPREFIX}\"/usr/:g" \ |
186 |
-i configure.in || die |
187 |
|
188 |
sed \ |
189 |
-e 's:^ar:$(AR):g' \ |
190 |
-i ogr/ogrsf_frmts/sdts/install-libs.sh || die |
191 |
|
192 |
tc-export AR RANLIB |
193 |
|
194 |
eautoreconf |
195 |
|
196 |
prepare_python() { |
197 |
mkdir -p "${BUILD_DIR}" || die |
198 |
find "${S}" -type d -maxdepth 1 -exec ln -s {} "${BUILD_DIR}"/ \; ||die |
199 |
find "${S}" -type f -maxdepth 1 -exec cp --target="${BUILD_DIR}"/ {} + ||die |
200 |
# mkdir -p "${BUILD_DIR}"/swig/python || die |
201 |
# mkdir -p "${BUILD_DIR}"/apps || die |
202 |
# cp -dpR --target="${BUILD_DIR}"/swig/ \ |
203 |
# "${S}"/swig/{python,SWIGmake.base,GNUmakefile} || die |
204 |
# ln -s "${S}"/swig/include "${BUILD_DIR}"/swig/ || die |
205 |
# ln -s "${S}"/apps/gdal-config "${BUILD_DIR}"/apps/ || die |
206 |
# ln -s "${S}"/port "${BUILD_DIR}"/ || die |
207 |
} |
208 |
if use python; then |
209 |
python_foreach_impl prepare_python |
210 |
fi |
211 |
} |
212 |
|
213 |
gdal_src_configure() { |
214 |
local myopts="" |
215 |
|
216 |
if use ruby; then |
217 |
RUBY_MOD_DIR="$(ruby19 -r rbconfig -e 'print RbConfig::CONFIG["sitearchdir"]')" |
218 |
echo "Ruby module dir is: $RUBY_MOD_DIR" |
219 |
fi |
220 |
|
221 |
if use java; then |
222 |
myopts+=" |
223 |
--with-java=$(java-config --jdk-home 2>/dev/null) |
224 |
$(use_with mdb)" |
225 |
else |
226 |
myopts+=" --without-java --without-mdb" |
227 |
use mdb && ewarn "mdb requires java use enabled. disabling" |
228 |
fi |
229 |
|
230 |
if use sqlite; then |
231 |
myopts+=" LIBS=-lsqlite3" |
232 |
fi |
233 |
|
234 |
# pcidsk is internal, because there is no such library yet released |
235 |
# also that thing is developed by the gdal people |
236 |
# kakadu, mrsid jp2mrsid - another jpeg2k stuff, ignore |
237 |
# bsb - legal issues |
238 |
# oracle - disabled, i dont have and can't test |
239 |
# ingres - same story as oracle oci |
240 |
# podofo - we use poppler instead they are exclusive for each other |
241 |
# tiff is a hard dep |
242 |
ECONF_SOURCE="${S}" econf \ |
243 |
--disable-static \ |
244 |
--enable-shared \ |
245 |
--with-expat \ |
246 |
--with-geotiff \ |
247 |
--with-grib \ |
248 |
--with-libtiff \ |
249 |
--with-libz="${EPREFIX}/usr/" \ |
250 |
--with-ogr \ |
251 |
--without-bsb \ |
252 |
--without-dods-root \ |
253 |
--without-dwgdirect \ |
254 |
--without-epsilon \ |
255 |
--without-fme \ |
256 |
--without-grass \ |
257 |
--without-hdf4 \ |
258 |
--without-idb \ |
259 |
--without-ingres \ |
260 |
--without-jp2mrsid \ |
261 |
--without-kakadu \ |
262 |
--without-libtool \ |
263 |
--without-mrsid \ |
264 |
--without-msg \ |
265 |
--without-oci \ |
266 |
--without-pcraster \ |
267 |
--without-podofo \ |
268 |
--without-sde \ |
269 |
$(use_enable debug) \ |
270 |
$(use_with armadillo) \ |
271 |
$(use_with aux_xml pam) \ |
272 |
$(use_with curl) \ |
273 |
$(use_with ecwj2k ecw) \ |
274 |
$(use_with fits cfitsio) \ |
275 |
$(use_with geos) \ |
276 |
$(use_with gif) \ |
277 |
$(use_with gml xerces) \ |
278 |
$(use_with hdf5) \ |
279 |
$(use_with jpeg pcidsk) \ |
280 |
$(use_with jpeg) \ |
281 |
$(use_with jpeg2k jasper) \ |
282 |
$(use_with mysql mysql "${EPREFIX}"/usr/bin/mysql_config) \ |
283 |
$(use_with netcdf) \ |
284 |
$(use_with odbc) \ |
285 |
$(use_with ogdi ogdi "${EPREFIX}"/usr) \ |
286 |
$(use_with opencl) \ |
287 |
$(use_with pdf poppler) \ |
288 |
$(use_with perl) \ |
289 |
$(use_with png) \ |
290 |
$(use_with postgres pg) \ |
291 |
$(use_with python) \ |
292 |
$(use_with ruby) \ |
293 |
$(use_with spatialite) \ |
294 |
$(use_with sqlite sqlite3 "${EPREFIX}"/usr) \ |
295 |
$(use_with threads) \ |
296 |
$(use_with xls freexl) \ |
297 |
${myopts} |
298 |
|
299 |
# mysql-config puts this in (and boy is it a PITA to get it out) |
300 |
if use mysql; then |
301 |
sed -i \ |
302 |
-e "s: -rdynamic : :" \ |
303 |
GDALmake.opt || die "sed LIBS failed" |
304 |
fi |
305 |
|
306 |
if [[ -n $use_python ]]; then |
307 |
# updated for newer swig (must specify the path to input files) |
308 |
sed -i \ |
309 |
-e "s: gdal_array.i: ../include/gdal_array.i:" \ |
310 |
-e "s:\$(DESTDIR)\$(prefix):\$(DESTDIR)\$(INST_PREFIX):g" \ |
311 |
swig/python/GNUmakefile || die "sed python makefile failed" |
312 |
sed -i \ |
313 |
-e "s:library_dirs = :library_dirs = /usr/$(get_libdir):g" \ |
314 |
swig/python/setup.cfg || die "sed python setup.cfg failed" |
315 |
# -e "s:gdal_config=.*$:gdal_config=../../../apps/gdal-config:g" \ |
316 |
fi |
317 |
} |
318 |
|
319 |
src_configure() { |
320 |
local use_python="" |
321 |
|
322 |
gdal_src_configure |
323 |
|
324 |
if use python; then |
325 |
use_python="yes" |
326 |
python_foreach_impl run_in_build_dir gdal_src_configure |
327 |
fi |
328 |
} |
329 |
|
330 |
src_compile() { |
331 |
local i |
332 |
for i in perl ruby; do |
333 |
if use $i; then |
334 |
rm "${S}"/swig/$i/*_wrap.cpp |
335 |
emake -C "${S}"/swig/$i generate |
336 |
fi |
337 |
done |
338 |
|
339 |
default |
340 |
|
341 |
if use perl ; then |
342 |
pushd "${S}"/swig/perl > /dev/null |
343 |
perl-module_src_prep |
344 |
perl-module_src_compile |
345 |
popd > /dev/null |
346 |
fi |
347 |
|
348 |
use doc && emake docs |
349 |
|
350 |
compile_python() { |
351 |
rm -f swig/python/*_wrap.cpp |
352 |
emake -C swig/python generate |
353 |
emake -C swig/python build |
354 |
} |
355 |
if use python; then |
356 |
python_foreach_impl run_in_build_dir compile_python |
357 |
fi |
358 |
} |
359 |
|
360 |
src_install() { |
361 |
if use perl ; then |
362 |
pushd "${S}"/swig/perl > /dev/null |
363 |
perl-module_src_install |
364 |
popd > /dev/null |
365 |
sed -i \ |
366 |
-e "s:BINDINGS = python ruby perl:BINDINGS = python ruby:g" \ |
367 |
GDALmake.opt || die |
368 |
fi |
369 |
|
370 |
default |
371 |
|
372 |
if use ruby ; then |
373 |
# weird reinstall collision; needs manual intervention... |
374 |
pushd "${S}"/swig/ruby > /dev/null |
375 |
rm -rf "${D}"${RUBY_MOD_DIR}/gdal |
376 |
exeinto ${RUBY_MOD_DIR}/gdal |
377 |
doexe *.so || die "doins ruby modules failed" |
378 |
popd > /dev/null |
379 |
fi |
380 |
|
381 |
use perl && fixlocalpod |
382 |
|
383 |
dodoc Doxyfile HOWTO-RELEASE NEWS |
384 |
|
385 |
if use doc ; then |
386 |
dohtml html/* |
387 |
docinto ogr |
388 |
dohtml ogr/html/* |
389 |
fi |
390 |
|
391 |
install_python() { |
392 |
emake -C swig/python DESTDIR="${D}" install |
393 |
} |
394 |
if use python; then |
395 |
python_foreach_impl run_in_build_dir install_python |
396 |
newdoc swig/python/README.txt README-python.txt |
397 |
insinto /usr/share/${PN}/samples |
398 |
doins swig/python/samples/* |
399 |
fi |
400 |
|
401 |
pushd man/man1 > /dev/null |
402 |
for i in * ; do |
403 |
newman ${i} ${i} |
404 |
done |
405 |
popd > /dev/null |
406 |
} |
407 |
|
408 |
pkg_postinst() { |
409 |
elog "Check available image and data formats after building with" |
410 |
elog "gdalinfo and ogrinfo (using the --formats switch)." |
411 |
} |