[gentoo-commits] gentoo-x86 commit in sci-geosciences/mapserver: mapserver-5.4.2-r1.ebuild mapserver-5.4.2.ebuild ChangeLog

[Tomas Chvatal (scarabeus)]

scarabeus    11/02/22 16:28:31

  Modified:             mapserver-5.4.2-r1.ebuild mapserver-5.4.2.ebuild
                        ChangeLog
  Log:
  Bye bye pdflib. Remove the pdf support as it is broken and non-free.
  
  (Portage version: 2.2.0_alpha24/cvs/Linux x86_64)

Revision  Changes    Path
1.5                  sci-geosciences/mapserver/mapserver-5.4.2-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapserver/mapserver-5.4.2-r1.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapserver/mapserver-5.4.2-r1.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapserver/mapserver-5.4.2-r1.ebuild?r1=1.4&r2=1.5

Index: mapserver-5.4.2-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/mapserver-5.4.2-r1.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mapserver-5.4.2-r1.ebuild	25 Dec 2010 14:30:31 -0000	1.4
+++ mapserver-5.4.2-r1.ebuild	22 Feb 2011 16:28:31 -0000	1.5
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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-5.4.2-r1.ebuild,v 1.4 2010/12/25 14:30:31 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/mapserver-5.4.2-r1.ebuild,v 1.5 2011/02/22 16:28:31 scarabeus Exp $
 
 EAPI="2"
 
@@ -24,7 +24,7 @@
 KEYWORDS="~amd64 ~x86"
 
 # I must check for mygis use flag availability
-IUSE="agg doc flash gdal geos java pdf perl php postgis proj python ruby tcl threads tiff unicode xml xpm" # mono
+IUSE="agg doc flash gdal geos java perl php postgis proj python ruby tcl threads tiff unicode xml xpm" # mono
 
 # compilation fails with jdk > 1.4 on some native part probably
 RDEPEND="
@@ -38,7 +38,6 @@
 	gdal? ( >sci-libs/gdal-1.2.6 )
 	geos? ( sci-libs/geos )
 	java? ( >=virtual/jdk-1.4 )
-	pdf? ( media-libs/pdflib )
 	perl? ( dev-perl/DBI )
 	php? ( dev-lang/php )
 	postgis? ( dev-db/postgis )
@@ -109,7 +108,9 @@
 	fi
 
 	cd "${S}"
-	econf $(use_with gdal) \
+	econf \
+		--without-pdf \
+		$(use_with gdal) \
 		$(use_with agg) \
 		$(use_with perl) \
 		$(use_with python) \
@@ -118,7 +119,6 @@
 		$(use_with proj) \
 		$(use_with postgis) \
 		$(use_with tiff) \
-		$(use_with pdf) \
 		$(use_with flash ming) \
 		$(use_with java) \
 		$(use_with unicode iconv) \
@@ -263,10 +263,6 @@
 	cd "${S}"
 	into /usr
 
-	if use pdf ; then
-		dobin shp2pdf || die "Unable to setup shp2pdf"
-	fi
-
 	dobin shp2img legend shptree shptreevis shp2img legend shptreetst scalebar \
 		sortshp tile4ms msencrypt mapserver-config \
 		|| die "Unable to setup mapserver tools"



1.5                  sci-geosciences/mapserver/mapserver-5.4.2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapserver/mapserver-5.4.2.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapserver/mapserver-5.4.2.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapserver/mapserver-5.4.2.ebuild?r1=1.4&r2=1.5

Index: mapserver-5.4.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/mapserver-5.4.2.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mapserver-5.4.2.ebuild	8 Nov 2010 17:31:45 -0000	1.4
+++ mapserver-5.4.2.ebuild	22 Feb 2011 16:28:31 -0000	1.5
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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-5.4.2.ebuild,v 1.4 2010/11/08 17:31:45 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/mapserver-5.4.2.ebuild,v 1.5 2011/02/22 16:28:31 scarabeus Exp $
 
 PHP_EXT_NAME="php_mapscript php_proj"
 RUBY_OPTIONAL="yes"
@@ -17,7 +17,7 @@
 KEYWORDS="~amd64 ~x86"
 
 # I must check for mygis use flag availability
-IUSE="agg doc flash gdal geos java pdf perl php postgis proj python ruby tcl threads tiff unicode xml xpm" # mono
+IUSE="agg doc flash gdal geos java perl php postgis proj python ruby tcl threads tiff unicode xml xpm" # mono
 
 # compilation fails with jdk > 1.4 on some native part probably
 RDEPEND="media-libs/libpng
@@ -30,7 +30,6 @@
 	gdal? ( >sci-libs/gdal-1.2.6 )
 	geos? ( sci-libs/geos )
 	java? ( >=virtual/jdk-1.4 )
-	pdf? ( media-libs/pdflib )
 	perl? ( dev-perl/DBI )
 	php? ( dev-lang/php )
 	postgis? ( dev-db/postgis )
@@ -113,7 +112,9 @@
 	fi
 
 	cd "${S}"
-	econf $(use_with gdal) \
+	econf \
+		--without-pdf \
+		$(use_with gdal) \
 		$(use_with agg) \
 		$(use_with perl) \
 		$(use_with python) \
@@ -122,7 +123,6 @@
 		$(use_with proj) \
 		$(use_with postgis) \
 		$(use_with tiff) \
-		$(use_with pdf) \
 		$(use_with flash ming) \
 		$(use_with java) \
 		$(use_with unicode iconv) \
@@ -253,10 +253,6 @@
 	cd "${S}"
 	into /usr
 
-	if use pdf ; then
-		dobin shp2pdf || die "Unable to setup shp2pdf"
-	fi
-
 	dobin shp2img legend shptree shptreevis shp2img legend shptreetst scalebar \
 			sortshp tile4ms msencrypt mapserver-config \
 			|| die "Unable to setup mapserver tools"



1.26                 sci-geosciences/mapserver/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapserver/ChangeLog?rev=1.26&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapserver/ChangeLog?rev=1.26&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapserver/ChangeLog?r1=1.25&r2=1.26

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/ChangeLog,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- ChangeLog	25 Dec 2010 14:30:31 -0000	1.25
+++ ChangeLog	22 Feb 2011 16:28:31 -0000	1.26
@@ -1,6 +1,10 @@
 # ChangeLog for sci-geosciences/mapserver
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/ChangeLog,v 1.25 2010/12/25 14:30:31 jlec Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/ChangeLog,v 1.26 2011/02/22 16:28:31 scarabeus Exp $
+
+  22 Feb 2011; Tomáš Chvátal <scarabeus@g.o> mapserver-5.4.2.ebuild,
+  mapserver-5.4.2-r1.ebuild:
+  Bye bye pdflib. Remove the pdf support as it is broken and non-free.
 
   25 Dec 2010; Justin Lecher <jlec@g.o> mapserver-5.4.2-r1.ebuild:
   Removed definition of src_unpack again, as it is not necessary, noticed by