Version bump to 0.6.0 Bug #264609

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

5 files changed, 154 insertions, 3 deletions

diff --git a/sci-geosciences/mapnik/ChangeLog b/sci-geosciences/mapnik/ChangeLog
index bcc78c0ba16a..064cc02bcac7 100644
--- a/sci-geosciences/mapnik/ChangeLog
+++ b/sci-geosciences/mapnik/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-geosciences/mapnik
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/ChangeLog,v 1.6 2009/01/04 19:48:41 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/ChangeLog,v 1.7 2009/06/12 08:18:37 tupone Exp $
+
+*mapnik-0.6.0 (12 Jun 2009)
+
+  12 Jun 2009; Alfredo Tupone <tupone@gentoo.org>
+  +files/mapnik-0.6.0-gentoo.patch, metadata.xml, +mapnik-0.6.0.ebuild:
+  Version bump to 0.6.0 Bug #264609 by jannis
 
   04 Jan 2009; Michael Sterrett <mr_bones_@gentoo.org> mapnik-0.5.1.ebuild:
   add missing xml to IUSE
diff --git a/sci-geosciences/mapnik/Manifest b/sci-geosciences/mapnik/Manifest
index e6cdc35fa7c0..97c71e80f725 100644
--- a/sci-geosciences/mapnik/Manifest
+++ b/sci-geosciences/mapnik/Manifest
@@ -1,5 +1,8 @@
 AUX mapnik-0.5.1-include-fix.patch 328 RMD160 2396fdfe4dd7630e0a8866a3676c42e4c684e53c SHA1 c1fca803a293443241f200039a7355cbce78c3d1 SHA256 e76fcd9328c3207c56a083361d5bb4a4e356262989e85a7c280460dc8d30e05b
+AUX mapnik-0.6.0-gentoo.patch 3075 RMD160 4d3c38ecbed33880d0b90cdd15bcd3cec140abff SHA1 44f173dfdf37c530cf41e52a2afe23a3f9544a24 SHA256 759ec1e6a5fa59c9c80b549a6449c3e292220e41256a6a341acab48e14266026
+DIST mapnik-0.6.0.tar.bz2 7469100 RMD160 aa1cbe18a9d0ce96b5c826ea3c8546e1fdf0cc86 SHA1 4a092f27fe66b8a9f9800a3944a50c6f5b97473a SHA256 c5b04c75a21620882d50c8d7abe9ba86deea814b8a0ecc9efca69f15ad04f286
 DIST mapnik_src-0.5.1.tar.gz 6517825 RMD160 6ac8830863883c654fd5b3676efc4a0642997157 SHA1 cad0d33ee16c0abf4903a6693e871c9ace19be94 SHA256 7682bba5f578dbb5dd5103d72876e0745e3f2da2eba8fd268cd81f400625812d
 EBUILD mapnik-0.5.1.ebuild 2683 RMD160 ad1d7e1fe929199a7f871636a68fc2ee2a521554 SHA1 466393f1b32212b92c58e6aa56541cacd3059759 SHA256 215f0a03a7f36be2b36dd7b0aa0f404d45116352764b0876d15697080cb8ded2
-MISC ChangeLog 1419 RMD160 33d994ed7cf673ce2823f6d9cc5b840b3ef787c8 SHA1 d0d7946f08ac9c059b04532b9c3dc196d1197aa8 SHA256 03ab4fc0c281099dd576c5461b5a3d1138335d3e21efe9f9b41b28e716581827
-MISC metadata.xml 452 RMD160 42cbdc0a8e6f4765223a077aee49908d3b0d4f13 SHA1 458c74853a786212e86c9df1235fe5d91d6af6a3 SHA256 378416475e220baa723fcb7def765294257d4881ef51ba127f5b39c6fe0970c8
+EBUILD mapnik-0.6.0.ebuild 2481 RMD160 7e623859aca5350fd8678370bf8a19e63c71ac3a SHA1 0a8a8a578226261c1b639946ba2988cb03c756e8 SHA256 ece4a5209310248d13c153a799eceefc0ced6fd96c5e0f23aa3b34df694948a5
+MISC ChangeLog 1614 RMD160 895d16905f4e108b549b82c6f55fc4c5c597b81b SHA1 fc14c00809d48e9b7ff440fe8588258ec6db48b2 SHA256 dc98c1daf25c8a043901ac9f8a3b9cfdacacdbf441bf6c784e1e6fadd564f705
+MISC metadata.xml 540 RMD160 281eea708af7cea3c87c0ac1de1ccc3403b94a13 SHA1 8c0d5b1293cb5ede8254b883f474fe81e76522dc SHA256 18351b15256bb44b61ad8772d011928c37676497b7152468b3d32cec8fd7e6db
diff --git a/sci-geosciences/mapnik/files/mapnik-0.6.0-gentoo.patch b/sci-geosciences/mapnik/files/mapnik-0.6.0-gentoo.patch
new file mode 100644
index 000000000000..5976a5a4ed27
--- /dev/null
+++ b/sci-geosciences/mapnik/files/mapnik-0.6.0-gentoo.patch
@@ -0,0 +1,48 @@
+--- SConstruct.old	2009-06-11 10:45:29.000000000 +0200
++++ SConstruct	2009-06-11 10:47:03.000000000 +0200
+@@ -110,7 +110,7 @@
+     BoolVariable('FAST', "Make scons faster at the cost of less precise dependency tracking", 'False'),
+     
+     # Install Variables
+-    ('PREFIX', 'The install path "prefix"', '/usr/local'),
++    ('PREFIX', 'The install path "prefix"', '/usr'),
+     ('PYTHON_PREFIX','Custom install path "prefix" for python bindings (default of no prefix)',''),
+     ('DESTDIR', 'The root directory to install into. Useful mainly for binary package building', '/'),
+     
+@@ -132,8 +132,8 @@
+     PathVariable('JPEG_LIBS', 'Search path for libjpeg library files', '/usr/' + LIBDIR_SCHEMA, PathVariable.PathAccept),
+     PathVariable('TIFF_INCLUDES', 'Search path for libtiff include files', '/usr/include', PathVariable.PathAccept),
+     PathVariable('TIFF_LIBS', 'Search path for libtiff library files', '/usr/' + LIBDIR_SCHEMA, PathVariable.PathAccept),
+-    PathVariable('PROJ_INCLUDES', 'Search path for PROJ.4 include files', '/usr/local/include', PathVariable.PathAccept),
+-    PathVariable('PROJ_LIBS', 'Search path for PROJ.4 library files', '/usr/local/' + LIBDIR_SCHEMA, PathVariable.PathAccept),
++    PathVariable('PROJ_INCLUDES', 'Search path for PROJ.4 include files', '/usr/include', PathVariable.PathAccept),
++    PathVariable('PROJ_LIBS', 'Search path for PROJ.4 library files', '/usr/' + LIBDIR_SCHEMA, PathVariable.PathAccept),
+     
+     # Variables affecting rendering back-ends
+     BoolVariable('INTERNAL_LIBAGG', 'Use provided libagg', 'True'),
+@@ -301,7 +301,7 @@
+     env = context.env
+     tool = config.lower()
+     context.Message( 'Checking for %s... ' % tool)
+-    ret = context.TryAction(env[config])[0]
++    ret = context.TryAction('%s --help' % env[config])[0]
+     if ret:
+         lib_path = call('%s --libdir' % env[config])
+         inc_path = call('%s --includedir' % env[config])
+@@ -686,7 +686,7 @@
+         if env['SKIPPED_DEPS']:
+             color_print(4,'\nAlso, these optional dependencies were not found:\n   - %s' % '\n   - '.join(env['SKIPPED_DEPS']))
+         color_print(4,"\nSet custom paths to these libraries and header files on the command-line or in a file called '%s'" % SCONS_LOCAL_CONFIG)
+-        color_print(4,"    ie. $ python scons/scons.py BOOST_INCLUDES=/usr/local/include/boost-1_37 BOOST_LIBS=/usr/local/lib")
++        color_print(4,"    ie. $ python scons/scons.py BOOST_INCLUDES=/usr/include/boost-1_37 BOOST_LIBS=/usr/lib")
+         color_print(4, "\nOnce all required dependencies are found a local '%s' will be saved and then install:" % SCONS_LOCAL_CONFIG)
+         color_print(4,"    $ sudo python scons/scons.py install")
+         color_print(4,"\nTo view available path variables:\n    $ python scons/scons.py --help or -h")
+@@ -883,6 +883,3 @@
+ # Build the Python bindings
+ if 'python' in env['BINDINGS']:
+     SConscript('bindings/python/SConscript')
+-
+-# Configure fonts and if requested install the bundled DejaVu fonts
+-SConscript('fonts/SConscript')
+\ No newline at end of file
diff --git a/sci-geosciences/mapnik/mapnik-0.6.0.ebuild b/sci-geosciences/mapnik/mapnik-0.6.0.ebuild
new file mode 100644
index 000000000000..18c06458d1f9
--- /dev/null
+++ b/sci-geosciences/mapnik/mapnik-0.6.0.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/mapnik-0.6.0.ebuild,v 1.1 2009/06/12 08:18:37 tupone Exp $
+EAPI=2
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A Free Toolkit for developing mapping applications."
+HOMEPAGE="http://www.mapnik.org/"
+SRC_URI="mirror://berlios/${PN}/${P}.tar.bz2"
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="cairo curl debug +gdal postgres python sqlite"
+
+RDEPEND="dev-libs/boost
+	dev-libs/libxml2
+	dev-libs/icu
+	media-libs/libpng
+	media-libs/jpeg
+	media-libs/tiff
+	media-libs/freetype:2
+	sci-libs/proj
+	x11-libs/agg
+	media-fonts/dejavu
+	python? ( dev-libs/boost[python] )
+	cairo? ( x11-libs/cairo
+		dev-cpp/cairomm )
+	postgres? ( >=dev-db/postgresql-base-8.3
+		>=dev-db/postgis-1.1.2 )
+	gdal? ( sci-libs/gdal )
+	sqlite? ( dev-db/sqlite:3 )
+	curl? ( net-misc/curl )"
+
+DEPEND="${RDEPEND}
+	>=dev-util/scons-1.0.0"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+
+	sed -i -e "s:mapniklibpath + '/fonts':'/usr/share/fonts/dejavu/':g" \
+	    bindings/python/SConscript || die "sed 1 failed"
+
+	sed -i -e "s:libraries \= \[:libraries \= \[\'mapnik\',:g" \
+	    plugins/input/{gdal,postgis,shape,raster}/SConscript \
+	    || die "sed 4 failed"
+}
+
+src_configure() {
+	MAKEOPTS="INTERNAL_LIBAGG=no"
+
+	MAKEOPTS="${MAKEOPTS} INPUT_PLUGINS="
+	use postgres && MAKEOPTS="${MAKEOPTS}postgis,"
+	use gdal     && MAKEOPTS="${MAKEOPTS}gdal,ogr,"
+	use sqlite   && MAKEOPTS="${MAKEOPTS}sqlite,"
+	use curl     && MAKEOPTS="${MAKEOPTS}osm,"
+	MAKEOPTS="${MAKEOPTS}shape,raster"
+
+	use cairo  || MAKEOPTS="${MAKEOPTS} CAIRO=false"
+	use python || MAKEOPTS="${MAKEOPTS} BINDINGS=none"
+	use debug  && MAKEOPTS="${MAKEOPTS} DEBUG=yes"
+
+	use postgres && use sqlite && MAKEOPTS="${MAKEOPTS} PGSQL2SQLITE=yes"
+
+	scons CXX="$(tc-getCXX)" ${MAKEOPTS} DESTDIR="${D}" configure \
+	    || die "scons configure failed"
+}
+
+src_compile() {
+	scons || die "scons make failed"
+}
+
+src_install() {
+	scons install || die "scons install failed"
+
+	if use python ; then
+		fperms o-w /usr/lib/python*/site-packages/mapnik/paths.py
+	    dobin utils/stats/mapdef_stats.py
+	    insinto /usr/share/doc/${P}/examples
+	    doins utils/ogcserver/*
+	fi
+
+	dohtml -r docs/api_docs/python/*
+}
+
+pkg_postinst() {
+	elog ""
+	elog "See the home page or the OpenStreetMap wiki for more info, and"
+	elog "the installed examples for the default mapnik ogcserver config."
+	elog ""
+}
diff --git a/sci-geosciences/mapnik/metadata.xml b/sci-geosciences/mapnik/metadata.xml
index 5d28222ffe04..8bc5a12828ed 100644
--- a/sci-geosciences/mapnik/metadata.xml
+++ b/sci-geosciences/mapnik/metadata.xml
@@ -10,4 +10,7 @@
     mapping applications.  The core libraries are written in C++, with
     optional Python bindings.
 </longdescription>
+<use>
+  <flag name='gdal'>Enable <pkg>sci-libs/gdal</pkg> library support</flag>
+</use>
 </pkgmetadata>