* [gentoo-commits] gentoo-x86 commit in sci-geosciences/mapserver: ChangeLog mapserver-6.0.0.ebuild
@ 2011-06-11 15:08 Tomas Chvatal (scarabeus)
0 siblings, 0 replies; 2+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2011-06-11 15:08 UTC (permalink / raw
To: gentoo-commits
scarabeus 11/06/11 15:08:55
Modified: ChangeLog mapserver-6.0.0.ebuild
Log:
Gif ain't exactly optional. Fixes bug #371159.
(Portage version: 2.2.0_alpha39/cvs/Linux x86_64)
Revision Changes Path
1.40 sci-geosciences/mapserver/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapserver/ChangeLog?rev=1.40&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapserver/ChangeLog?rev=1.40&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapserver/ChangeLog?r1=1.39&r2=1.40
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/ChangeLog,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- ChangeLog 1 Jun 2011 13:18:07 -0000 1.39
+++ ChangeLog 11 Jun 2011 15:08:55 -0000 1.40
@@ -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)
1.2 sci-geosciences/mapserver/mapserver-6.0.0.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapserver/mapserver-6.0.0.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapserver/mapserver-6.0.0.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapserver/mapserver-6.0.0.ebuild?r1=1.1&r2=1.2
Index: mapserver-6.0.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/mapserver-6.0.0.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mapserver-6.0.0.ebuild 1 Jun 2011 13:18:08 -0000 1.1
+++ mapserver-6.0.0.ebuild 11 Jun 2011 15:08:55 -0000 1.2
@@ -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 @@
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 @@
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 @@
--with-libiconv \
--with-jpeg \
--with-gd \
+ --with-gif="${EPREFIX}/usr/" \
--with-wms \
--with-kml \
--with-curl-config \
@@ -154,7 +155,6 @@
--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) \
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sci-geosciences/mapserver: ChangeLog mapserver-6.0.0.ebuild
@ 2011-07-12 12:31 Fabio Erculiani (lxnay)
0 siblings, 0 replies; 2+ messages in thread
From: Fabio Erculiani (lxnay) @ 2011-07-12 12:31 UTC (permalink / raw
To: gentoo-commits
lxnay 11/07/12 12:31:33
Modified: ChangeLog mapserver-6.0.0.ebuild
Log:
backport patch from trunk, fixing macro definition (compile issue), see http://trac.osgeo.org/mapserver/ticket/3877
(Portage version: 2.2.0_alpha37/cvs/Linux x86_64)
Revision Changes Path
1.42 sci-geosciences/mapserver/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapserver/ChangeLog?rev=1.42&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapserver/ChangeLog?rev=1.42&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapserver/ChangeLog?r1=1.41&r2=1.42
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/ChangeLog,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- ChangeLog 28 Jun 2011 15:22:38 -0000 1.41
+++ ChangeLog 12 Jul 2011 12:31:33 -0000 1.42
@@ -1,6 +1,11 @@
# 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.41 2011/06/28 15:22:38 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/ChangeLog,v 1.42 2011/07/12 12:31:33 lxnay Exp $
+
+ 12 Jul 2011; Fabio Erculiani <lxnay@gentoo.org>
+ +files/6.0.0-fix-mapunion-macro.patch, mapserver-6.0.0.ebuild:
+ backport patch from trunk, fixing macro definition (compile issue), see
+ http://trac.osgeo.org/mapserver/ticket/3877
28 Jun 2011; Ole Markus With <olemarkus@gentoo.org> -mapserver-5.6.6.ebuild:
Non-maintainer commit: Removing ebuild depending on older PHP versions. Bug
1.3 sci-geosciences/mapserver/mapserver-6.0.0.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapserver/mapserver-6.0.0.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapserver/mapserver-6.0.0.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapserver/mapserver-6.0.0.ebuild?r1=1.2&r2=1.3
Index: mapserver-6.0.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/mapserver-6.0.0.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mapserver-6.0.0.ebuild 11 Jun 2011 15:08:55 -0000 1.2
+++ mapserver-6.0.0.ebuild 12 Jul 2011 12:31:33 -0000 1.3
@@ -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.2 2011/06/11 15:08:55 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/mapserver-6.0.0.ebuild,v 1.3 2011/07/12 12:31:33 lxnay Exp $
EAPI=3
@@ -117,7 +117,8 @@
src_prepare() {
epatch "${FILESDIR}/6.0.0_rc1-ldflags.patch" \
"${FILESDIR}/6.0.0_rc1-bool.patch" \
- "${FILESDIR}/6.0.0_rc1-php_ldflags.patch"
+ "${FILESDIR}/6.0.0_rc1-php_ldflags.patch" \
+ "${FILESDIR}/6.0.0-fix-mapunion-macro.patch"
eautoreconf
}
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-07-12 12:31 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-07-12 12:31 [gentoo-commits] gentoo-x86 commit in sci-geosciences/mapserver: ChangeLog mapserver-6.0.0.ebuild Fabio Erculiani (lxnay)
-- strict thread matches above, loose matches on Subject: below --
2011-06-11 15:08 Tomas Chvatal (scarabeus)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox