summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2011-06-11 15:08:55 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2011-06-11 15:08:55 +0000
commita9fa2921d900614778153a8357c1afdde36df219 (patch)
tree50f7948ac21caba26b256ca7900af064d1e28061 /sci-geosciences
parentRemove old. (diff)
downloadhistorical-a9fa2921d900614778153a8357c1afdde36df219.tar.gz
historical-a9fa2921d900614778153a8357c1afdde36df219.tar.bz2
historical-a9fa2921d900614778153a8357c1afdde36df219.zip
Gif ain't exactly optional. Fixes bug #371159.
Package-Manager: portage-2.2.0_alpha39/cvs/Linux x86_64
Diffstat (limited to 'sci-geosciences')
-rw-r--r--sci-geosciences/mapserver/ChangeLog5
-rw-r--r--sci-geosciences/mapserver/Manifest10
-rw-r--r--sci-geosciences/mapserver/mapserver-6.0.0.ebuild8
3 files changed, 13 insertions, 10 deletions
diff --git a/sci-geosciences/mapserver/ChangeLog b/sci-geosciences/mapserver/ChangeLog
index 5cf9eb0ac9e8..0a72d40ed8c1 100644
--- a/sci-geosciences/mapserver/ChangeLog
+++ b/sci-geosciences/mapserver/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sci-geosciences/mapserver
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/ChangeLog,v 1.39 2011/06/01 13:18:07 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/ChangeLog,v 1.40 2011/06/11 15:08:55 scarabeus Exp $
+
+ 11 Jun 2011; Tomáš Chvátal <scarabeus@gentoo.org> mapserver-6.0.0.ebuild:
+ Gif ain't exactly optional. Fixes bug #371159.
*mapserver-6.0.0 (01 Jun 2011)
diff --git a/sci-geosciences/mapserver/Manifest b/sci-geosciences/mapserver/Manifest
index 923a9d8cc379..fc2a181f1bbb 100644
--- a/sci-geosciences/mapserver/Manifest
+++ b/sci-geosciences/mapserver/Manifest
@@ -9,13 +9,13 @@ AUX mapserver_tcl.patch-r1 1985 RMD160 bb4d766526f7c29535915bb87c0c5199251a2c3a
DIST mapserver-5.6.6.tar.gz 2326652 RMD160 251d3448fbdc2f0a14351389fc85d6b014a22d99 SHA1 e0fa6455737ca2cd14357775adda92a47b4e53ff SHA256 e5d00321456791cebcbf0b0cb3fa1b69c5cd8bfa8d6003ad05480682465684f6
DIST mapserver-6.0.0.tar.gz 2435310 RMD160 b324df0181e23cf5af46f768af59f65acc13ff9e SHA1 4bbd8ef56aa1389de4c80b4776e00db538529367 SHA256 92709333665c4784f69b18d1a8e78dd80f87a66b5d490fd0e49ef2ba616bd9af
EBUILD mapserver-5.6.6.ebuild 7312 RMD160 c5ae1310ac90c28ea6e0910a18b8616dc1d8ab55 SHA1 d43b123ee7a61bf64e42d3bcc48397cd11947911 SHA256 bbfe04300654d2aa8531af13bebeb07ccec3f1388b26d4b4f6a55a0a181c13db
-EBUILD mapserver-6.0.0.ebuild 5898 RMD160 e95f3a804365e327924a0e3553995f39991083dc SHA1 e3207b72b31d67ff7e9c29bfbf718ef7bd280ca8 SHA256 1db4979e5bc3c4cfffb1e71bdd8951d3b6df26f52bf23039e3160102a22b9d7d
-MISC ChangeLog 7461 RMD160 595dd32e670c326a0b77a083497588c66d08d9e5 SHA1 6e552bc0a5b9acde6edecbe1eb2a36eb88edf784 SHA256 a7a5bd70b98b5d48dde30f5ae340054a4865fabbcedce48720baae3d195cf3e9
+EBUILD mapserver-6.0.0.ebuild 5876 RMD160 8051fea683fc4856854452b55bbb4a026916864c SHA1 82b8b44702d8eae19f858ac1f9d2c98630e4bee9 SHA256 b303d67d3d8573229afd9027a1a933f9ca4a9cecd6acff57f60ec7dcd8594742
+MISC ChangeLog 7590 RMD160 d194818514def359935cd3c8d2f9af0d2616e058 SHA1 ae0e7080ae33ad7d29d5e0e4683866975f818157 SHA256 9f60c75bd3bf208e00e1b65e24eebf7361dd68b9ce04d5b2e316874da7c4a572
MISC metadata.xml 752 RMD160 336d701cfcb45e8d38e7d7be62910a3b92ef4e6b SHA1 268cb1d2aad5143713b52a2be77b44fb73d29553 SHA256 0e50fb47de44ad1fe80ff9473bc5f37927cfeeaa536809782fc17d5b3a7667a1
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iEYEARECAAYFAk3mO/4ACgkQHB6c3gNBRYfIbwCgj1W9rghwunnHo8wUU6AATHNl
-o5oAniNNFF4wqij1WhotF62vOFIpeD49
-=VZ8y
+iEYEARECAAYFAk3zhN8ACgkQHB6c3gNBRYeC0gCgqiSUTmdP/DEqk/h7FrNeHfzF
+dVAAoLRqDg/3qMAiOtsJhmk3xdwNzcRC
+=TP3R
-----END PGP SIGNATURE-----
diff --git a/sci-geosciences/mapserver/mapserver-6.0.0.ebuild b/sci-geosciences/mapserver/mapserver-6.0.0.ebuild
index bdfc17659a71..bc5c818f6c1d 100644
--- a/sci-geosciences/mapserver/mapserver-6.0.0.ebuild
+++ b/sci-geosciences/mapserver/mapserver-6.0.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/mapserver-6.0.0.ebuild,v 1.1 2011/06/01 13:18:08 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/mapserver-6.0.0.ebuild,v 1.2 2011/06/11 15:08:55 scarabeus Exp $
EAPI=3
@@ -31,13 +31,14 @@ SRC_URI="http://download.osgeo.org/mapserver/${MY_P}.tar.gz"
LICENSE="MIT"
KEYWORDS="~amd64 ~x86"
SLOT="0"
-IUSE="bidi cairo gdal geos gif mysql opengl perl php postgis proj python threads tiff xml xslt" # ruby php tcl
+IUSE="bidi cairo gdal geos mysql opengl perl php postgis proj python threads tiff xml xslt" # ruby php tcl
RDEPEND="
!${CATEGORY}/${PN}:${PV}
dev-libs/expat
dev-libs/fcgi
>=media-libs/gd-2.0.12[truetype,jpeg,png,zlib]
+ media-libs/giflib
net-misc/curl
virtual/jpeg
virtual/libiconv
@@ -46,7 +47,6 @@ RDEPEND="
cairo? ( x11-libs/cairo )
gdal? ( >=sci-libs/gdal-1.8.0 )
geos? ( sci-libs/geos )
- gif? ( media-libs/giflib )
mysql? ( virtual/mysql )
opengl? (
media-libs/ftgl
@@ -146,6 +146,7 @@ src_configure() {
--with-libiconv \
--with-jpeg \
--with-gd \
+ --with-gif="${EPREFIX}/usr/" \
--with-wms \
--with-kml \
--with-curl-config \
@@ -154,7 +155,6 @@ src_configure() {
--with-fastcgi \
$(use_with opengl ogl) \
$(use_with opengl ftgl) \
- $(use_with gif gif "${EPREFIX}/usr/") \
$(use_with proj) \
$(use_with threads) \
$(use_with geos) \