Gentoo Archives: gentoo-commits

From: Amy Winston <amynka@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/mapserver/
Date: Sat, 27 Feb 2016 12:22:59
Message-Id: 1456575601.64b32d1e88e7adfb309a96cc940300fb08ecd66c.amynka@gentoo
1 commit: 64b32d1e88e7adfb309a96cc940300fb08ecd66c
2 Author: Amy Winston <amynka <AT> gentoo <DOT> org>
3 AuthorDate: Sat Feb 27 12:20:01 2016 +0000
4 Commit: Amy Winston <amynka <AT> gentoo <DOT> org>
5 CommitDate: Sat Feb 27 12:20:01 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64b32d1e
7
8 sci-geosciences/mapserver: drop old security bug #497302
9
10 Package-Manager: portage-2.2.26
11
12 sci-geosciences/mapserver/Manifest | 1 -
13 .../mapserver/mapserver-6.0.1-r2.ebuild | 234 ---------------------
14 .../mapserver/mapserver-6.0.1-r3.ebuild | 221 -------------------
15 3 files changed, 456 deletions(-)
16
17 diff --git a/sci-geosciences/mapserver/Manifest b/sci-geosciences/mapserver/Manifest
18 index c981436..735318a 100644
19 --- a/sci-geosciences/mapserver/Manifest
20 +++ b/sci-geosciences/mapserver/Manifest
21 @@ -1,2 +1 @@
22 -DIST mapserver-6.0.1.tar.gz 2430064 SHA256 dd6821917aa7030381442f5e092e4f46f44b9deb9425ec92729e5819e9b61d65 SHA512 0fd9da9d6452fbfbaf0c815e6d15309e185119a4ab33cab2f1c6839bfb8c3a75ce6e7e7779b0eb2aa6e80d1a623ca6e0e58a02049b0db0bfa3f7b0f29117d5dc WHIRLPOOL e4846d40b93c22f7b5dcce1c242b4d88db253be9185194b45c4acddf9066d10c2ec2fbe667941dfe15702838690517a0e57719b1937169e55517e43ed1c225b8
23 DIST mapserver-7.0.0.tar.gz 2495028 SHA256 b306b8111e0718a577ce595640c2d3224f913745af732a1b75f6f5cb3dddce45 SHA512 1e4d15f6c42cdf0b00533e2aa26c1b65f84bdbb3a91538d6addde3aa0e8874deed4969146cf7045858bcab2880e4d7429965660c5985d175bd19ce018ae90652 WHIRLPOOL f18f0679b70da795d0585df2dbcc07fda0f8533c9ef7972280301446e5d521d9f24f0ff482d8e5497954e3b67436f2f9f2576516f6f088dc388046314817a46b
24
25 diff --git a/sci-geosciences/mapserver/mapserver-6.0.1-r2.ebuild b/sci-geosciences/mapserver/mapserver-6.0.1-r2.ebuild
26 deleted file mode 100644
27 index 6766c1d..0000000
28 --- a/sci-geosciences/mapserver/mapserver-6.0.1-r2.ebuild
29 +++ /dev/null
30 @@ -1,234 +0,0 @@
31 -# Copyright 1999-2015 Gentoo Foundation
32 -# Distributed under the terms of the GNU General Public License v2
33 -# $Id$
34 -
35 -EAPI=5
36 -
37 -MY_P="${PN}-${PV/_/-}"
38 -
39 -PHP_EXT_OPTIONAL_USE="php"
40 -PHP_EXT_NAME="php_mapscript"
41 -PHP_EXT_S="${WORKDIR}/${MY_P}/mapscript/php/"
42 -PHP_EXT_SKIP_PHPIZE="no"
43 -USE_PHP="php5-4 php5-5"
44 -
45 -PYTHON_DEPEND="python? 2"
46 -SUPPORT_PYTHON_ABIS="1"
47 -RESTRICT_PYTHON_ABIS="3.* *-jython"
48 -PYTHON_MODNAME="mapscript.py"
49 -
50 -#USE_RUBY="ruby18 ruby19"
51 -#RUBY_OPTIONAL="yes"
52 -
53 -WEBAPP_MANUAL_SLOT=yes
54 -
55 -inherit eutils autotools depend.apache webapp distutils perl-module php-ext-source-r2 multilib # ruby-ng
56 -
57 -DESCRIPTION="OpenSource development environment for constructing spatially enabled Internet-web applications"
58 -HOMEPAGE="http://mapserver.org/"
59 -SRC_URI="http://download.osgeo.org/mapserver/${MY_P}.tar.gz"
60 -
61 -LICENSE="MIT"
62 -KEYWORDS="~amd64 ~x86"
63 -SLOT="0"
64 -IUSE="bidi cairo gdal geos mysql opengl perl php postgis proj python threads tiff xml xslt" # ruby php tcl
65 -
66 -REQUIRED_USE="php? ( ^^ ( php_targets_php5-4 php_targets_php5-5 ) )"
67 -
68 -RDEPEND="
69 - !${CATEGORY}/${PN}:${PV}
70 - dev-libs/expat
71 - dev-libs/fcgi
72 - >=media-libs/gd-2.0.12[truetype,jpeg,png,zlib]
73 - media-libs/giflib
74 - net-misc/curl
75 - virtual/jpeg
76 - virtual/libiconv
77 - x11-libs/agg
78 - bidi? ( dev-libs/fribidi )
79 - cairo? ( x11-libs/cairo )
80 - gdal? ( >=sci-libs/gdal-1.8.0 )
81 - geos? ( sci-libs/geos )
82 - mysql? ( virtual/mysql )
83 - opengl? (
84 - media-libs/ftgl
85 - media-libs/mesa
86 - )
87 - perl? ( dev-lang/perl:= )
88 - postgis? ( dev-db/postgis )
89 - proj? ( sci-libs/proj net-misc/curl )
90 - tiff? (
91 - media-libs/tiff
92 - sci-libs/libgeotiff
93 - )
94 - xml? ( dev-libs/libxml2:2 )
95 - xslt? ( dev-libs/libxslt[crypt] )
96 -"
97 -for i in perl python; do
98 - SWIG_DEPEND+=" ${i}? ( >=dev-lang/swig-2.0 )"
99 -done
100 -DEPEND="${RDEPEND} ${SWIG_DEPEND}"
101 -unset SWIG_DEPEND
102 -unset i
103 -
104 -need_apache2
105 -
106 -S=${WORKDIR}/${MY_P}
107 -
108 -_enter_build_dir() {
109 - [[ -z ${1} ]] && die "Missing path argument"
110 - local workdir=${1}
111 - shift
112 - [[ -z ${1} ]] && die "missing command argument"
113 -
114 - echo ">>> Running \"${@}\" in work directory \"${workdir}\""
115 - pushd "${workdir}" > /dev/null || die "Failed to enter directory"
116 - ${@} || die
117 - popd > /dev/null
118 -}
119 -
120 -each_ruby_configure() { ${RUBY} extconf.rb || die ; }
121 -
122 -ext-source-r2_src_install() {
123 - local slot
124 - for slot in $(php_get_slots); do
125 - php_init_slot_env ${slot}
126 - insinto "${EXT_DIR}"
127 - newins "${PHP_EXT_NAME}.so" "${PHP_EXT_NAME}.so" || die "Unable to install extension"
128 - done
129 - php-ext-source-r2_createinifiles
130 -}
131 -
132 -pkg_setup() {
133 - webapp_pkg_setup
134 - use perl && perl_set_version
135 - use python && python_pkg_setup
136 - #use ruby && ruby-ng_pkg_setup
137 -}
138 -
139 -src_unpack() {
140 - # unpack A and then copy the php thingies into workdir/php-slot
141 - php-ext-source-r2_src_unpack
142 - # HACK: and then remove it and replace by symlink
143 - for slot in $(php_get_slots); do
144 - rm -rf "${WORKDIR}/${slot}" || die
145 - ln -s "${PHP_EXT_S}" "${WORKDIR}/${slot}" || die
146 - done
147 -}
148 -
149 -src_prepare() {
150 - epatch "${FILESDIR}/6.0.0_rc1-ldflags.patch" \
151 - "${FILESDIR}/6.0.0_rc1-bool.patch" \
152 - "${FILESDIR}/6.0.0_rc1-php_ldflags.patch" \
153 - "${FILESDIR}/6.1.0-php-5.4.patch"
154 -
155 - eautoreconf
156 -}
157 -
158 -src_configure() {
159 - local myopts
160 -
161 - if use gdal && use proj ; then
162 - myopts+="
163 - --with-wfs
164 - --with-wcs
165 - --with-wfsclient
166 - --with-wmsclient
167 - "
168 - use xml && myopts+=" --with-sos"
169 - fi
170 -
171 - # some scripts require configure time options so place it here
172 - if use php ; then
173 - use php_targets_php5-4 && myopts+=" --with-php=${EPREFIX}/usr/$(get_libdir)/php5.4/include/php/"
174 - use php_targets_php5-5 && myopts+=" --with-php=${EPREFIX}/usr/$(get_libdir)/php5.5/include/php/"
175 - fi
176 -
177 - # sde is ESRI package that you have to buy first
178 - # oraclespatial needs oracle server for testing/usage
179 - # note that some options accept just path, they are not on/off switches!
180 - econf \
181 - --without-oraclespatial \
182 - --without-sde \
183 - --with-libiconv \
184 - --with-jpeg \
185 - --with-gd \
186 - --with-gif="${EPREFIX}/usr/" \
187 - --with-wms \
188 - --with-kml \
189 - --with-curl-config \
190 - --with-agg-svg-symbols \
191 - --with-httpd="${APACHE_BIN}" \
192 - --with-fastcgi \
193 - $(use_with opengl ogl) \
194 - $(use_with opengl ftgl) \
195 - $(use_with proj) \
196 - $(use_with threads) \
197 - $(use_with geos) \
198 - $(use_with gdal) \
199 - $(use_with gdal ogr) \
200 - $(use_with postgis) \
201 - $(use_with mysql) \
202 - $(use_with xml xml2-config) \
203 - $(use_with xslt) \
204 - $(use_with xslt xml-mapfile) \
205 - $(use_with bidi fribidi-config) \
206 - $(use_with cairo) \
207 - ${myopts}
208 -
209 - #use ruby && _enter_build_dir "${S}/mapscript/ruby" "ln -s ../mapscript.i ./"
210 - #use ruby && _enter_build_dir "${S}/mapscript/ruby" "ruby-ng_src_configure"
211 -}
212 -
213 -src_compile() {
214 - default
215 - use python && _enter_build_dir "${S}/mapscript/python" "distutils_src_compile"
216 - use perl && _enter_build_dir "${S}/mapscript/perl" "perl-module_src_prep"
217 - use perl && _enter_build_dir "${S}/mapscript/perl" "perl-module_src_compile"
218 - #use php && php-ext-source-r2_src_compile # already compiled by the emake all
219 - #use ruby && _enter_build_dir "${S}/mapscript/ruby" "ruby-ng_src_compile"
220 -}
221 -
222 -src_install() {
223 - local step="Installing"
224 - local extra_dir="fonts tests tests/vera symbols"
225 - local i
226 -
227 - dobin shp2img legend shptree shptreevis shp2img legend shptreetst scalebar \
228 - sortshp tile4ms msencrypt mapserver-config
229 -
230 - dodoc INSTALL README HISTORY.TXT
231 -
232 - for i in ${extra_dir}; do
233 - docinto /usr/share/doc/${PF}/${i}
234 - dodoc -r ${i}/* || die
235 - done
236 -
237 - use python && _enter_build_dir "${S}/mapscript/python" "distutils_src_install"
238 - use perl && _enter_build_dir "${S}/mapscript/perl" "perl-module_src_install"
239 - use perl && _enter_build_dir "${S}/mapscript/perl" "perl_delete_localpod"
240 - use php && ext-source-r2_src_install
241 - #use ruby && _enter_build_dir "${S}/mapscript/ruby" "ruby-ng_src_install"
242 -
243 - webapp_src_preinst
244 - exeinto "${MY_CGIBINDIR}"
245 - doexe "${S}/mapserv"
246 - webapp_src_install
247 -}
248 -
249 -pkg_preinst() {
250 - use perl && perl_set_version
251 -}
252 -
253 -pkg_postinst() {
254 - webapp_pkg_postinst
255 - use python && distutils_pkg_postinst
256 -}
257 -
258 -pkg_prerm() {
259 - webapp_pkg_prerm
260 -}
261 -
262 -pkg_postrm() {
263 - use python && distutils_pkg_postrm
264 -}
265
266 diff --git a/sci-geosciences/mapserver/mapserver-6.0.1-r3.ebuild b/sci-geosciences/mapserver/mapserver-6.0.1-r3.ebuild
267 deleted file mode 100644
268 index 5e981d3..0000000
269 --- a/sci-geosciences/mapserver/mapserver-6.0.1-r3.ebuild
270 +++ /dev/null
271 @@ -1,221 +0,0 @@
272 -# Copyright 1999-2015 Gentoo Foundation
273 -# Distributed under the terms of the GNU General Public License v2
274 -# $Id$
275 -
276 -EAPI=5
277 -
278 -MY_P="${PN}-${PV/_/-}"
279 -
280 -PHP_EXT_OPTIONAL_USE="php"
281 -PHP_EXT_NAME="php_mapscript"
282 -PHP_EXT_S="${WORKDIR}/${MY_P}/mapscript/php/"
283 -PHP_EXT_SKIP_PHPIZE="no"
284 -USE_PHP="php5-4 php5-5"
285 -
286 -PYTHON_COMPAT=( python2_7 )
287 -
288 -#USE_RUBY="ruby18 ruby19"
289 -#RUBY_OPTIONAL="yes"
290 -
291 -WEBAPP_MANUAL_SLOT=yes
292 -
293 -inherit eutils autotools depend.apache webapp distutils-r1 perl-module php-ext-source-r2 multilib # ruby-ng
294 -
295 -DESCRIPTION="OpenSource development environment for constructing spatially enabled Internet-web applications"
296 -HOMEPAGE="http://mapserver.org/"
297 -SRC_URI="http://download.osgeo.org/mapserver/${MY_P}.tar.gz"
298 -
299 -LICENSE="MIT"
300 -KEYWORDS="~amd64 ~x86"
301 -SLOT="0"
302 -IUSE="bidi cairo gdal geos mysql opengl perl php postgis proj python threads tiff xml xslt" # ruby php tcl
303 -
304 -REQUIRED_USE="php? ( ^^ ( php_targets_php5-4 php_targets_php5-5 ) )"
305 -
306 -RDEPEND="
307 - !${CATEGORY}/${PN}:${PV}
308 - dev-libs/expat
309 - dev-libs/fcgi
310 - >=media-libs/gd-2.0.12[truetype,jpeg,png,zlib]
311 - media-libs/giflib
312 - net-misc/curl
313 - virtual/jpeg:=
314 - virtual/libiconv
315 - x11-libs/agg
316 - bidi? ( dev-libs/fribidi )
317 - cairo? ( x11-libs/cairo )
318 - gdal? ( >=sci-libs/gdal-1.8.0 )
319 - geos? ( sci-libs/geos )
320 - mysql? ( virtual/mysql )
321 - opengl? (
322 - media-libs/ftgl
323 - media-libs/mesa
324 - )
325 - perl? ( dev-lang/perl:= )
326 - postgis? ( dev-db/postgis )
327 - proj? ( sci-libs/proj net-misc/curl )
328 - tiff? (
329 - media-libs/tiff:=
330 - sci-libs/libgeotiff
331 - )
332 - xml? ( dev-libs/libxml2:2 )
333 - xslt? ( dev-libs/libxslt[crypt] )
334 -"
335 -for i in perl python; do
336 - SWIG_DEPEND+=" ${i}? ( >=dev-lang/swig-2.0 )"
337 -done
338 -DEPEND="${RDEPEND} ${SWIG_DEPEND}"
339 -unset SWIG_DEPEND
340 -unset i
341 -
342 -need_apache2
343 -
344 -S=${WORKDIR}/${MY_P}
345 -
346 -_enter_build_dir() {
347 - [[ -z ${1} ]] && die "Missing path argument"
348 - local workdir=${1}
349 - shift
350 - [[ -z ${1} ]] && die "missing command argument"
351 -
352 - echo ">>> Running \"${@}\" in work directory \"${workdir}\""
353 - pushd "${workdir}" > /dev/null || die "Failed to enter directory"
354 - ${@} || die
355 - popd > /dev/null
356 -}
357 -
358 -each_ruby_configure() { ${RUBY} extconf.rb || die ; }
359 -
360 -ext-source-r2_src_install() {
361 - local slot
362 - for slot in $(php_get_slots); do
363 - php_init_slot_env ${slot}
364 - insinto "${EXT_DIR}"
365 - newins "${PHP_EXT_NAME}.so" "${PHP_EXT_NAME}.so" || die "Unable to install extension"
366 - done
367 - php-ext-source-r2_createinifiles
368 -}
369 -
370 -pkg_setup() {
371 - webapp_pkg_setup
372 - use perl && perl_set_version
373 - #use ruby && ruby-ng_pkg_setup
374 -}
375 -
376 -src_unpack() {
377 - # unpack A and then copy the php thingies into workdir/php-slot
378 - php-ext-source-r2_src_unpack
379 - # HACK: and then remove it and replace by symlink
380 - for slot in $(php_get_slots); do
381 - rm -rf "${WORKDIR}/${slot}" || die
382 - ln -s "${PHP_EXT_S}" "${WORKDIR}/${slot}" || die
383 - done
384 -}
385 -
386 -src_prepare() {
387 - epatch "${FILESDIR}/6.0.0_rc1-ldflags.patch" \
388 - "${FILESDIR}/6.0.0_rc1-bool.patch" \
389 - "${FILESDIR}/6.0.0_rc1-php_ldflags.patch" \
390 - "${FILESDIR}/6.1.0-php-5.4.patch"
391 -
392 - eautoreconf
393 -}
394 -
395 -src_configure() {
396 - local myopts
397 -
398 - if use gdal && use proj ; then
399 - myopts+="
400 - --with-wfs
401 - --with-wcs
402 - --with-wfsclient
403 - --with-wmsclient
404 - "
405 - use xml && myopts+=" --with-sos"
406 - fi
407 -
408 - # some scripts require configure time options so place it here
409 - if use php ; then
410 - use php_targets_php5-4 && myopts+=" --with-php=${EPREFIX}/usr/$(get_libdir)/php5.4/include/php/"
411 - use php_targets_php5-5 && myopts+=" --with-php=${EPREFIX}/usr/$(get_libdir)/php5.5/include/php/"
412 - fi
413 -
414 - # sde is ESRI package that you have to buy first
415 - # oraclespatial needs oracle server for testing/usage
416 - # note that some options accept just path, they are not on/off switches!
417 - econf \
418 - --without-oraclespatial \
419 - --without-sde \
420 - --with-libiconv \
421 - --with-jpeg \
422 - --with-gd \
423 - --with-gif="${EPREFIX}/usr/" \
424 - --with-wms \
425 - --with-kml \
426 - --with-curl-config \
427 - --with-agg-svg-symbols \
428 - --with-httpd="${APACHE_BIN}" \
429 - --with-fastcgi \
430 - $(use_with opengl ogl) \
431 - $(use_with opengl ftgl) \
432 - $(use_with proj) \
433 - $(use_with threads) \
434 - $(use_with geos) \
435 - $(use_with gdal) \
436 - $(use_with gdal ogr) \
437 - $(use_with postgis) \
438 - $(use_with mysql) \
439 - $(use_with xml xml2-config) \
440 - $(use_with xslt) \
441 - $(use_with xslt xml-mapfile) \
442 - $(use_with bidi fribidi-config) \
443 - $(use_with cairo) \
444 - ${myopts}
445 -
446 - #use ruby && _enter_build_dir "${S}/mapscript/ruby" "ln -s ../mapscript.i ./"
447 - #use ruby && _enter_build_dir "${S}/mapscript/ruby" "ruby-ng_src_configure"
448 -}
449 -
450 -src_compile() {
451 - default
452 - use python && _enter_build_dir "${S}/mapscript/python" "distutils-r1_src_compile"
453 - use perl && _enter_build_dir "${S}/mapscript/perl" "perl-module_src_prep"
454 - use perl && _enter_build_dir "${S}/mapscript/perl" "perl-module_src_compile"
455 - #use php && php-ext-source-r2_src_compile # already compiled by the emake all
456 - #use ruby && _enter_build_dir "${S}/mapscript/ruby" "ruby-ng_src_compile"
457 -}
458 -
459 -src_install() {
460 - local step="Installing"
461 - local extra_dir="fonts tests tests/vera symbols"
462 - local i
463 -
464 - dobin shp2img legend shptree shptreevis shp2img legend shptreetst scalebar \
465 - sortshp tile4ms msencrypt mapserver-config
466 -
467 - dodoc INSTALL README HISTORY.TXT
468 -
469 - for i in ${extra_dir}; do
470 - docinto /usr/share/doc/${PF}/${i}
471 - dodoc -r ${i}/* || die
472 - done
473 -
474 - use python && _enter_build_dir "${S}/mapscript/python" "distutils-r1_src_install"
475 - use perl && _enter_build_dir "${S}/mapscript/perl" "perl-module_src_install"
476 - use perl && _enter_build_dir "${S}/mapscript/perl" "perl_delete_localpod"
477 - use php && ext-source-r2_src_install
478 - #use ruby && _enter_build_dir "${S}/mapscript/ruby" "ruby-ng_src_install"
479 -
480 - webapp_src_preinst
481 - exeinto "${MY_CGIBINDIR}"
482 - doexe "${S}/mapserv"
483 - webapp_src_install
484 -}
485 -
486 -pkg_preinst() {
487 - use perl && perl_set_version
488 -}
489 -
490 -pkg_prerm() {
491 - webapp_pkg_prerm
492 -}