diff options
author | Tomas Chvatal <scarabeus@gentoo.org> | 2011-06-11 15:08:55 +0000 |
---|---|---|
committer | Tomas Chvatal <scarabeus@gentoo.org> | 2011-06-11 15:08:55 +0000 |
commit | 2b094db634a612e07b55738eaf9e837ba181eb62 (patch) | |
tree | 30a3d3104ce3d317048ff4dd85dbcb75fe843f17 /sci-geosciences | |
parent | Remove old. (diff) | |
download | gentoo-2-2b094db634a612e07b55738eaf9e837ba181eb62.tar.gz gentoo-2-2b094db634a612e07b55738eaf9e837ba181eb62.tar.bz2 gentoo-2-2b094db634a612e07b55738eaf9e837ba181eb62.zip |
Gif ain't exactly optional. Fixes bug #371159.
(Portage version: 2.2.0_alpha39/cvs/Linux x86_64)
Diffstat (limited to 'sci-geosciences')
-rw-r--r-- | sci-geosciences/mapserver/ChangeLog | 5 | ||||
-rw-r--r-- | sci-geosciences/mapserver/mapserver-6.0.0.ebuild | 8 |
2 files changed, 8 insertions, 5 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/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) \ |