Gentoo Archives: gentoo-commits

From: "Tomas Chvatal (scarabeus)" <scarabeus@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sci-geosciences/mapserver: metadata.xml ChangeLog mapserver-6.0.0_rc1.ebuild
Date: Mon, 02 May 2011 18:28:55
Message-Id: 20110502182844.9779620054@flycatcher.gentoo.org
1 scarabeus 11/05/02 18:28:44
2
3 Modified: metadata.xml ChangeLog mapserver-6.0.0_rc1.ebuild
4 Log:
5 Update the mapserver 6.0.1 php, ruby, tcl not ported as i didn't figure it out, open bugs with working patches only.
6
7 (Portage version: 2.2.0_alpha30/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.4 sci-geosciences/mapserver/metadata.xml
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapserver/metadata.xml?rev=1.4&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapserver/metadata.xml?rev=1.4&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapserver/metadata.xml?r1=1.3&r2=1.4
15
16 Index: metadata.xml
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/metadata.xml,v
19 retrieving revision 1.3
20 retrieving revision 1.4
21 diff -u -r1.3 -r1.4
22 --- metadata.xml 6 Aug 2008 18:08:02 -0000 1.3
23 +++ metadata.xml 2 May 2011 18:28:44 -0000 1.4
24 @@ -10,6 +10,7 @@
25 <flag name='geos'>Enable <pkg>sci-libs/geos</pkg> library support</flag>
26 <flag name='postgis'>Enable <pkg>dev-db/postgis</pkg> support</flag>
27 <flag name='proj'>Enable <pkg>sci-libs/proj</pkg> library support
28 - (geographic projections)</flag>
29 +(geographic projections)</flag>
30 + <flag name='xslt'>Enable xslt and exslt support xml-mapfile support</flag>
31 </use>
32 </pkgmetadata>
33
34
35
36 1.30 sci-geosciences/mapserver/ChangeLog
37
38 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapserver/ChangeLog?rev=1.30&view=markup
39 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapserver/ChangeLog?rev=1.30&content-type=text/plain
40 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapserver/ChangeLog?r1=1.29&r2=1.30
41
42 Index: ChangeLog
43 ===================================================================
44 RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/ChangeLog,v
45 retrieving revision 1.29
46 retrieving revision 1.30
47 diff -u -r1.29 -r1.30
48 --- ChangeLog 2 May 2011 10:20:58 -0000 1.29
49 +++ ChangeLog 2 May 2011 18:28:44 -0000 1.30
50 @@ -1,6 +1,11 @@
51 # ChangeLog for sci-geosciences/mapserver
52 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
53 -# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/ChangeLog,v 1.29 2011/05/02 10:20:58 scarabeus Exp $
54 +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/ChangeLog,v 1.30 2011/05/02 18:28:44 scarabeus Exp $
55 +
56 + 02 May 2011; Tomáš Chvátal <scarabeus@g.o>
57 + files/6.0.0_rc1-ldflags.patch, mapserver-6.0.0_rc1.ebuild, metadata.xml:
58 + Update the mapserver 6.0.1 php, ruby, tcl not ported as i didn't figure it
59 + out, open bugs with working patches only.
60
61 02 May 2011; Tomáš Chvátal <scarabeus@g.o>
62 mapserver-6.0.0_rc1.ebuild:
63
64
65
66 1.3 sci-geosciences/mapserver/mapserver-6.0.0_rc1.ebuild
67
68 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapserver/mapserver-6.0.0_rc1.ebuild?rev=1.3&view=markup
69 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapserver/mapserver-6.0.0_rc1.ebuild?rev=1.3&content-type=text/plain
70 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapserver/mapserver-6.0.0_rc1.ebuild?r1=1.2&r2=1.3
71
72 Index: mapserver-6.0.0_rc1.ebuild
73 ===================================================================
74 RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/mapserver-6.0.0_rc1.ebuild,v
75 retrieving revision 1.2
76 retrieving revision 1.3
77 diff -u -r1.2 -r1.3
78 --- mapserver-6.0.0_rc1.ebuild 2 May 2011 10:20:58 -0000 1.2
79 +++ mapserver-6.0.0_rc1.ebuild 2 May 2011 18:28:44 -0000 1.3
80 @@ -1,25 +1,22 @@
81 # Copyright 1999-2011 Gentoo Foundation
82 # Distributed under the terms of the GNU General Public License v2
83 -# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/mapserver-6.0.0_rc1.ebuild,v 1.2 2011/05/02 10:20:58 scarabeus Exp $
84 +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/mapserver-6.0.0_rc1.ebuild,v 1.3 2011/05/02 18:28:44 scarabeus Exp $
85
86 EAPI=3
87
88 -PHP_EXT_NAME="php_mapscript php_proj"
89 -
90 -USE_RUBY="ruby18 ruby19"
91 -RUBY_OPTIONAL="yes"
92 +MY_P="${PN}-${PV/_/-}"
93
94 -PYTHON_DEPEND="2"
95 +PYTHON_DEPEND="python? *"
96 SUPPORT_PYTHON_ABIS="1"
97 -RESTRICT_PYTHON_ABIS="3.*"
98 PYTHON_MODNAME="mapscript.py"
99
100 -inherit eutils autotools confutils multilib distutils depend.php perl-module php-ext-source-r1 depend.apache webapp ruby-ng java-pkg-opt-2
101 -
102 -MY_P="${PN}-${PV/_/-}"
103 +#USE_RUBY="ruby18 ruby19"
104 +#RUBY_OPTIONAL="yes"
105
106 WEBAPP_MANUAL_SLOT=yes
107
108 +inherit eutils autotools depend.apache webapp distutils perl-module # ruby-ng
109 +
110 DESCRIPTION="OpenSource development environment for constructing spatially enabled Internet-web applications."
111 HOMEPAGE="http://mapserver.org"
112 SRC_URI="http://download.osgeo.org/mapserver/${MY_P}.tar.gz"
113 @@ -28,190 +25,130 @@
114 KEYWORDS="~amd64 ~x86"
115
116 # I must check for mygis use flag availability
117 -IUSE="agg doc flash gdal geos java perl php postgis proj python ruby tcl threads tiff unicode xml xpm" # mono
118 +IUSE="bidi cairo gdal geos gif mysql opengl perl postgis proj python threads tiff xml xslt" # ruby php tcl
119
120 -# compilation fails with jdk > 1.4 on some native part probably
121 RDEPEND="
122 - media-libs/libpng
123 + dev-libs/expat
124 + dev-libs/fcgi
125 + >=media-libs/gd-2.0.12[truetype,jpeg,png,zlib]
126 + net-misc/curl
127 virtual/jpeg
128 - media-libs/freetype
129 - >=media-libs/gd-2.0.12[truetype,jpeg,png]
130 - sys-libs/zlib
131 - agg? ( x11-libs/agg )
132 - flash? ( media-libs/ming )
133 - gdal? ( >sci-libs/gdal-1.2.6 )
134 + virtual/libiconv
135 + x11-libs/agg
136 + bidi? ( dev-libs/fribidi )
137 + cairo? ( x11-libs/cairo )
138 + gdal? ( >=sci-libs/gdal-1.8.0 )
139 geos? ( sci-libs/geos )
140 - java? ( >=virtual/jdk-1.4 )
141 - perl? ( dev-perl/DBI )
142 - php? ( dev-lang/php )
143 + gif? ( media-libs/giflib )
144 + mysql? ( virtual/mysql )
145 + opengl? (
146 + media-libs/ftgl
147 + media-libs/mesa
148 + )
149 + perl? ( dev-lang/perl )
150 postgis? ( dev-db/postgis )
151 proj? ( sci-libs/proj net-misc/curl )
152 - tcl? ( dev-lang/tcl )
153 - tiff? ( media-libs/tiff sci-libs/libgeotiff )
154 - unicode? ( virtual/libiconv )
155 + tiff? (
156 + media-libs/tiff
157 + sci-libs/libgeotiff
158 + )
159 xml? ( dev-libs/libxml2:2 )
160 - xpm? ( x11-libs/libXpm )"
161 + xslt? ( dev-libs/libxslt[crypt] )
162 +"
163 +
164 +DEPEND="${RDEPEND}"
165 +need_apache2
166 +
167 +S=${WORKDIR}/${MY_P}
168 +
169 +_enter_build_dir() {
170 + [[ -z ${1} ]] && die "Missing path argument"
171 + local workdir=${1}
172 + shift
173 + [[ -z ${1} ]] && die "missing command argument"
174
175 -DEPEND="${RDEPEND}
176 - java? ( dev-lang/swig )
177 - perl? ( dev-lang/swig )
178 - ruby? ( dev-lang/swig )
179 - python? ( dev-lang/swig )
180 - php? ( dev-lang/swig )
181 - tcl? ( dev-lang/swig )"
182 -want_apache2
183 -
184 -S="${WORKDIR}/${MY_P}"
185 -
186 -cd_script() {
187 - einfo "$2 the mapserver $1-mapscript"
188 - cd "${S}"/mapscript/$1 || die "Unable to go into $1 mapscript dir"
189 + echo ">>> Running \"${@}\" in work directory \"${workdir}\""
190 + pushd "${workdir}" > /dev/null || die "Failed to enter directory"
191 + ${@} || die
192 + popd > /dev/null
193 }
194
195 +each_ruby_configure() { ${RUBY} extconf.rb || die ; }
196 +
197 pkg_setup() {
198 - #webapp_pkg_setup
199 - use java && java-pkg-opt-2_pkg_setup
200 + webapp_pkg_setup
201 use perl && perl-module_pkg_setup
202 - use php && has_php
203 use python && python_pkg_setup
204 - use ruby && ruby-ng_pkg_setup
205 + #use ruby && ruby-ng_pkg_setup
206 +}
207
208 - confutils_use_conflict gdal tiff
209 - confutils_use_depend_all java threads
210 +src_unpack() {
211 + default
212 }
213
214 src_prepare() {
215 epatch "${FILESDIR}/6.0.0_rc1-ldflags.patch"
216 - if use tcl ; then
217 - epatch "${FILESDIR}"/${PN}_tcl.patch-r1
218 - sed -i -e "s:@libdir@:$(get_libdir):g" mapscript/tcl/Makefile.in \
219 - || die "failed to fix libdir in Makefile.in"
220 - fi
221 - use ruby && ruby-ng_src_prepare
222 eautoreconf
223 }
224
225 src_configure() {
226 - local step="Configuration"
227 -
228 - local myconf="--with-png --with-jpeg --with-zlib --with-freetype"
229 - use apache2 && myconf="${myconf} --with-httpd=${APACHE_BIN}"
230 - use geos && myconf="${myconf} --with-geos=$(type -P geos-config)"
231 + local myopts
232
233 - local MYGPUSE="wfs wcs wfsclient"
234 if use gdal && use proj ; then
235 - myconf="--with-ogr ${myconf}";
236 - for i in ${MYGPUSE}; do
237 - myconf="${myconf} --with-${i}"
238 - done
239 - use xml && myconf="${myconf} --with-sos"
240 + myopts+="
241 + --with-wfs
242 + --with-wcs
243 + --with-wfsclient
244 + --with-wmsclient
245 + "
246 + use xml && myopts+=" --with-sos"
247 fi
248
249 - use proj && myconf="${myconf} --with-wmsclient"
250 - use php && myconf="${myconf} --with-php=${PHPPREFIX}/include/php"
251 -
252 - if use perl || use python || use ruby || use tcl || use php ; then
253 - myconf="${myconf} --with-mapscript"
254 - fi
255 -
256 - cd "${S}"
257 + # some scripts require configure time options so place it here
258 + #use php && myopts+=" --with-php=$(${PHPCONFIG} --include-dir)"
259 +
260 + # sde is ESRI package that you have to buy first
261 + # oraclespatial needs oracle server for testing/usage
262 + # note that some options accept just path, they are not on/off switches!
263 econf \
264 - --without-pdf \
265 - $(use_with gdal) \
266 - $(use_with agg) \
267 - $(use_with perl) \
268 - $(use_with python) \
269 - $(use_with ruby) \
270 - $(use_with tcl) \
271 + --without-oraclespatial \
272 + --without-sde \
273 + --with-libiconv \
274 + --with-jpeg \
275 + --with-gd \
276 + --with-wms \
277 + --with-kml \
278 + --with-curl-config \
279 + --with-agg-svg-symbols \
280 + --with-httpd="${APACHE_BIN}" \
281 + --with-fastcgi \
282 + $(use_with opengl ogl) \
283 + $(use_with opengl ftgl) \
284 + $(use_with gif gif "${EPREFIX}/usr/") \
285 $(use_with proj) \
286 - $(use_with postgis) \
287 - $(use_with tiff) \
288 - $(use_with flash ming) \
289 - $(use_with java) \
290 - $(use_with unicode iconv) \
291 $(use_with threads) \
292 - ${myconf}
293 -
294 - if use ruby; then
295 - cd_script ruby ${step}
296 - RUBY_ECONF="-I${D}"
297 - ruby-ng_econf
298 - cp ../mapscript.i . || die "Unable to find mapscript.i"
299 - sed -e "s:ruby.h defines.h::g" -i ./Makefile
300 - fi
301 + $(use_with geos) \
302 + $(use_with gdal) \
303 + $(use_with gdal ogr) \
304 + $(use_with postgis) \
305 + $(use_with mysql) \
306 + $(use_with xml xml2-config) \
307 + $(use_with xslt) \
308 + $(use_with xslt xml-mapfile) \
309 + $(use_with bidi fribidi-config) \
310 + $(use_with cairo) \
311 + ${myopts}
312
313 - if use tcl; then
314 - cd_script tcl ${step}
315 - sed "s:perlvars:mapscriptvars:" -i configure
316 - sed -e "s:tail -:tail -n :g" -e "s:head -:head -n :g" -i configure ||\
317 - die "Unable to modify the configure file"
318 - econf --with-tcl=/usr
319 - touch tclmodule.i
320 - # do not comment this sed out again because it will plain break build otherwise
321 - # thanks in advance
322 - sed -e "s:-DTCL_WIDE_INT_TYPE=long long:-DTCL_WIDE_INT_TYPE=long\\\ long:g" \
323 - -i Makefile || die "Unable to modify Makefile"
324 - fi
325 + #use ruby && _enter_build_dir "${S}/mapscript/ruby" "ln -s ../mapscript.i ./"
326 + #use ruby && _enter_build_dir "${S}/mapscript/ruby" "ruby-ng_src_configure"
327 }
328
329 src_compile() {
330 - local step="Building"
331 -
332 - # bug #279627
333 - emake -j1 || die "make failed"
334 -
335 - if use perl; then
336 - cd_script perl ${step}
337 - perl-module_src_compile
338 - fi
339 -
340 - if use php && use proj; then
341 - cd_script php3 ${step}
342 - emake php_proj.so || die "unable to built php_proj.so"
343 - fi
344 -
345 - if use python; then
346 - cd_script python ${step}
347 - distutils_src_compile
348 - fi
349 -
350 - if use ruby; then
351 - cd_script ruby ${step}
352 - ruby-ng_src_compile
353 - fi
354 -
355 - if use tcl; then
356 - cd_script tcl ${step}
357 - emake || die "Unable to build tcl mapscript"
358 - fi
359 -
360 - if use java; then
361 - cd_script java ${step}
362 - emake interface || die "Unable to build java mapscript"
363 - emake all || die "Unable to build java mapscript"
364 - fi
365 -
366 -}
367 -
368 -src_test(){
369 - local step="Testing"
370 -
371 - if use java ; then
372 - cd_script java test
373 - emake test || die "Test failed"
374 - # We need to fix the tests to make them pass
375 - sed -i -e "s:setTransparency:setOpacity:g" \
376 - "${S}"/mapscript/java/tests/threadtest/MapThread.java \
377 - || die "fixing of tests failed"
378 - emake threadtests || die "Threadtests failed"
379 - fi
380 -}
381 -
382 -mapscript_install_examples() {
383 - elog "$1-mapscript examples could be found in the following directory"
384 - elog "/usr/share/doc/${PF}/mapscript/examples/$1"
385 - insinto /usr/share/doc/${PF}/mapscript/examples/$1/
386 - doins examples/* || die "Unable to install specified sample data"
387 + default
388 + use python && _enter_build_dir "${S}/mapscript/python" "distutils_src_compile"
389 + use perl && _enter_build_dir "${S}/mapscript/perl" "perl-module_src_prep"
390 + use perl && _enter_build_dir "${S}/mapscript/perl" "perl-module_src_compile"
391 + #use ruby && _enter_build_dir "${S}/mapscript/ruby" "ruby-ng_src_compile"
392 }
393
394 src_install() {
395 @@ -219,88 +156,43 @@
396
397 local extra_dir="fonts tests tests/vera symbols"
398
399 - dodir /usr /usr/bin
400 -
401 - into /usr
402 -
403 - if use php ; then
404 - cd_script php3 ${step}
405 - for i in *.so ; do
406 - cp ${i} "${WORKDIR}"/${i/.so}-default.so || die "failed to copy php extension"
407 - PHP_EXT_NAME="${i/.so}"
408 - php-ext-source-r1_src_install
409 - done
410 -
411 - mapscript_install_examples php
412 - fi
413 -
414 - if use ruby ; then
415 - cd_script ruby ${step}
416 - ruby-ng_src_install
417 - mapscript_install_examples ruby
418 - fi
419 -
420 - if use perl ; then
421 - cd_script perl ${step}
422 - perl-module_src_install
423 - mapscript_install_examples perl
424 - fi
425 -
426 - if use tcl ; then
427 - cd_script tcl ${step}
428 - sed "s:\$(TCL_EXEC_PREFIX):\$(DESTDIR)\$(TCL_EXEC_PREFIX):g" -i Makefile
429 - emake -j1 DESTDIR="${D}" install || \
430 - die "Unable to setup tcl mapscript support"
431 - mapscript_install_examples tcl
432 - fi
433 -
434 - if use python ; then
435 - cd_script python ${step}
436 - distutils_src_install
437 - mapscript_install_examples python
438 - fi
439 -
440 - if use java ; then
441 - cd_script java ${step}
442 - java-pkg_dojar mapscript.jar
443 - java-pkg_doso libmapscript.so
444 - mapscript_install_examples java
445 - fi
446 -
447 - cd "${S}"
448 - into /usr
449 -
450 dobin shp2img legend shptree shptreevis shp2img legend shptreetst scalebar \
451 - sortshp tile4ms msencrypt mapserver-config \
452 - || die "Unable to setup mapserver tools"
453 + sortshp tile4ms msencrypt mapserver-config
454
455 - dodoc INSTALL README HISTORY.TXT || die "Unable to setup documentation"
456 + dodoc INSTALL README HISTORY.TXT
457
458 for i in ${extra_dir}; do
459 - insinto /usr/share/doc/${PF}/${i}
460 - doins ${i}/* || die "Unable to add extra_dir to document tree"
461 + docinto /usr/share/doc/${PF}/${i}
462 + dodoc ${i}/* || die
463 done
464
465 - if use doc; then
466 - insinto /usr/share/doc/${PF}/rfc
467 - doins rfc/*
468 - fi
469 + use python && _enter_build_dir "${S}/mapscript/python" "distutils_src_install"
470 + use perl && _enter_build_dir "${S}/mapscript/perl" "perl-module_src_install"
471 + use perl && _enter_build_dir "${S}/mapscript/perl" "fixlocalpod"
472 + #use ruby && _enter_build_dir "${S}/mapscript/ruby" "ruby-ng_src_install"
473
474 webapp_src_preinst
475 - chmod +x "${S}"/mapserv || die "Unable to find mapserv"
476 - cp "${S}"/mapserv "${D}"/${MY_CGIBINDIR} || die "Unable to install mapserv"
477 + exeinto "${MY_CGIBINDIR}"
478 + doexe "${S}/mapserv"
479 webapp_src_install
480 }
481
482 +pkg_preinst() {
483 + use perl && perl-module_pkg_preinst
484 +}
485 +
486 pkg_postinst() {
487 webapp_pkg_postinst
488 use python && distutils_pkg_postinst
489 + use perl && perl-module_pkg_postinst
490 }
491
492 pkg_prerm() {
493 webapp_pkg_prerm
494 + use perl && perl-module_pkg_prerm
495 }
496
497 pkg_postrm() {
498 use python && distutils_pkg_postrm
499 + use perl && perl-module_pkg_postrm
500 }