Updated to new version for new gpsdrive and boost support.

Package-Manager: portage-2.2_rc97/cvs/Linux x86_64

4 files changed, 178 insertions, 2 deletions

diff --git a/sci-geosciences/mapnik/ChangeLog b/sci-geosciences/mapnik/ChangeLog
index 6c9ea9f7ca05..3c9a50674368 100644
--- a/sci-geosciences/mapnik/ChangeLog
+++ b/sci-geosciences/mapnik/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-geosciences/mapnik
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/ChangeLog,v 1.17 2010/06/17 21:01:40 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/ChangeLog,v 1.18 2010/10/18 02:54:59 nerdboy Exp $
+
+*mapnik-0.7.1 (18 Oct 2010)
+
+  18 Oct 2010; Steve Arnold <nerdboy@gentoo.org> +mapnik-0.7.1.ebuild,
+  +files/mapnik-0.7.1-libagg.patch:
+  Updated to new version for new gpsdrive and boost support (among other 
+  things).  Tested with boost-1.42, gpsd-2.95, and gpsdrive-2.11 (and a 
+  USB gps device).
 
   17 Jun 2010; Patrick Lauer <patrick@gentoo.org> mapnik-0.5.1.ebuild,
   mapnik-0.6.0.ebuild, mapnik-0.6.1-r3.ebuild:
diff --git a/sci-geosciences/mapnik/Manifest b/sci-geosciences/mapnik/Manifest
index 598bec76e6d2..61fcb162adf1 100644
--- a/sci-geosciences/mapnik/Manifest
+++ b/sci-geosciences/mapnik/Manifest
@@ -1,11 +1,14 @@
 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
 AUX mapnik-0.6.1-libagg.patch 2246 RMD160 05fd5ab80165030ea1c98ac3a0eefcd73867d3ce SHA1 57522f67f291c39cfe9048106f3a87b785f358a1 SHA256 5b80027a0973678b30dcd74c6133592a9914d6f98432991ed9bc49f4ebcc0108
+AUX mapnik-0.7.1-libagg.patch 1961 RMD160 b2d7199280bdf032cd0a220e686d518a41239f8c SHA1 3adaf5c646ff2b72642bdc29d232489bfb573d17 SHA256 f7114127b1aae227d9ef854ec64c7ac5962a8428d687159604b7e6ff1146f4ff
 DIST mapnik-0.6.0.tar.bz2 7469100 RMD160 aa1cbe18a9d0ce96b5c826ea3c8546e1fdf0cc86 SHA1 4a092f27fe66b8a9f9800a3944a50c6f5b97473a SHA256 c5b04c75a21620882d50c8d7abe9ba86deea814b8a0ecc9efca69f15ad04f286
 DIST mapnik-0.6.1.tar.bz2 7466271 RMD160 fb9abdc2c1bded5b8789cae43b94ed52ea7b1373 SHA1 6451ad79574dd7620da370343ca45cac2ef125e1 SHA256 59b1c19817ed65ba8f0d3a2ac8f06ecf5c12f452d10170fa04f6824ea257437f
+DIST mapnik-0.7.1.tar.bz2 10021260 RMD160 9e4180e901dfaf255091843869e9441d7a08209f SHA1 a1961f6dfe5d591d5a892bef05d58e66537440c4 SHA256 0d04e8cbc2a060ce09ba13ccdcd7bf8bd02bed77a84a3dd1191e4d75fba95b8d
 DIST mapnik_src-0.5.1.tar.gz 6517825 RMD160 6ac8830863883c654fd5b3676efc4a0642997157 SHA1 cad0d33ee16c0abf4903a6693e871c9ace19be94 SHA256 7682bba5f578dbb5dd5103d72876e0745e3f2da2eba8fd268cd81f400625812d
 EBUILD mapnik-0.5.1.ebuild 2685 RMD160 44bcd19bcca6b32d7444edc512d1be9a73e0c803 SHA1 2b84cfeb1a7517b8ced0fe618624ea798599969b SHA256 ea24b0f73386c522bdc25e436e0998bfe5612612cdc11286973e767168c7dd07
 EBUILD mapnik-0.6.0.ebuild 2531 RMD160 3b845577038f02eda4d1e553634b48c26af381a2 SHA1 42ef56f433d06b0116dbc8f0bfbe0643826995f5 SHA256 2d6f39a7f02c891392350892e6c1e44c873e6656a4b4365ff64513cae76c6267
 EBUILD mapnik-0.6.1-r3.ebuild 3993 RMD160 cbf9a93e1556bf77cee4a33cbda2868e9ad87019 SHA1 2f3b1c2c0524150c6f5a4bcb863a6f474ffa419f SHA256 29a87ca7aea8f8c89b44aea6650571b2e52efcfdc57664995d021c1c1caaeb8d
-MISC ChangeLog 4151 RMD160 fc1403ef7cb0222ef21e6c8acc74ba82f25bdebb SHA1 ce2fcfd451c29d66dc8d7fac49c28076e3b5d7a0 SHA256 950be835a8a0c218d5e1ef92ecd6e57ab2ed2a533120a2ba84322f8ac4973e1c
+EBUILD mapnik-0.7.1.ebuild 4039 RMD160 c33779650a187a57090d0b804d77451bab5c4004 SHA1 04fa9c114a86424bccfe0efeba9ccbadaa5005f2 SHA256 e2563285b3d0d09560a0283fcd3cc2ee90f04057fd4f64d606021713c84aa3f7
+MISC ChangeLog 4454 RMD160 ad3609929d0ad3c000b3e9ac9f37bd13db72585d SHA1 669769f6ad37da75013d1e951cc063cc3298a0f1 SHA256 e90cb88c563ea6f5b5fb63ffdfb4938a31f423398e06ec17e10e345505584ae4
 MISC metadata.xml 540 RMD160 281eea708af7cea3c87c0ac1de1ccc3403b94a13 SHA1 8c0d5b1293cb5ede8254b883f474fe81e76522dc SHA256 18351b15256bb44b61ad8772d011928c37676497b7152468b3d32cec8fd7e6db
diff --git a/sci-geosciences/mapnik/files/mapnik-0.7.1-libagg.patch b/sci-geosciences/mapnik/files/mapnik-0.7.1-libagg.patch
new file mode 100644
index 000000000000..a0294edb031f
--- /dev/null
+++ b/sci-geosciences/mapnik/files/mapnik-0.7.1-libagg.patch
@@ -0,0 +1,35 @@
+--- SConstruct	2010-03-24 13:47:52.000000000 +0100
++++ SConstruct	2010-03-24 13:50:29.000000000 +0100
+@@ -260,10 +260,12 @@
+     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/include', PathVariable.PathAccept),
+     PathVariable('PROJ_LIBS', 'Search path for PROJ.4 library files', '/usr/' + LIBDIR_SCHEMA, PathVariable.PathAccept),
++    PathVariable('AGG_INCLUDES', 'Search path for AGG include files', '/usr/include/agg2', PathVariable.PathAccept),
++    PathVariable('AGG_LIBS', 'Search path for AGG library files', '/usr/' + LIBDIR_SCHEMA, PathVariable.PathAccept),
+     ('PKG_CONFIG_PATH', 'Use this path to point pkg-config to .pc files instead of the PKG_CONFIG_PATH environment setting',''),
+     
+     # Variables affecting rendering back-ends
+-    BoolVariable('INTERNAL_LIBAGG', 'Use provided libagg', 'True'),
++    BoolVariable('INTERNAL_LIBAGG', 'Use provided libagg', 'False'),
+     
+     # Variables for optional dependencies
+     # Note: cairo, cairomm, and pycairo all optional but configured automatically through pkg-config
+@@ -799,6 +801,7 @@
+         ['jpeg', ['stdio.h', 'jpeglib.h'], True,'C'],
+         ['proj', 'proj_api.h', True,'C'],
+         [env['ICU_LIB_NAME'],'unicode/unistr.h',True,'C++'],
++        ['agg','agg2/agg_config.h' , True,'C++'],
+     ]
+ 
+ 
+--- src/SConscript	2010-03-24 13:51:08.000000000 +0100
++++ src/SConscript	2010-03-24 13:52:17.000000000 +0100
+@@ -36,7 +36,7 @@
+ filesystem = 'boost_filesystem%s' % env['BOOST_APPEND']
+ regex = 'boost_regex%s' % env['BOOST_APPEND']
+ 
+-libraries = ['freetype','ltdl','png','tiff','z','jpeg','proj',env['ICU_LIB_NAME'],filesystem,regex]
++libraries = ['freetype','ltdl','png','tiff','z','jpeg','proj',env['ICU_LIB_NAME'],'agg',filesystem,regex]
+ 
+ if '-DHAVE_CAIRO' in env['CXXFLAGS']:
+     # add cairo and cairomm-1.0 to libs
diff --git a/sci-geosciences/mapnik/mapnik-0.7.1.ebuild b/sci-geosciences/mapnik/mapnik-0.7.1.ebuild
new file mode 100644
index 000000000000..9d8922266288
--- /dev/null
+++ b/sci-geosciences/mapnik/mapnik-0.7.1.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/mapnik-0.7.1.ebuild,v 1.1 2010/10/18 02:54:59 nerdboy Exp $
+
+EAPI=2
+
+PYTHON_DEPEND="python? 2"
+inherit eutils python distutils toolchain-funcs versionator
+
+DESCRIPTION="A Free Toolkit for developing mapping applications."
+HOMEPAGE="http://www.mapnik.org/"
+SRC_URI="mirror://berlios/${PN}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="cairo curl debug doc +gdal postgres python sqlite"
+
+RDEPEND="dev-libs/boost
+	dev-libs/icu
+	dev-libs/libxml2
+	media-fonts/dejavu
+	media-libs/freetype:2
+	media-libs/jpeg
+	media-libs/libpng
+	media-libs/tiff
+	sci-libs/proj
+	x11-libs/agg[truetype]
+	cairo? (
+		x11-libs/cairo
+		dev-cpp/cairomm
+	)
+	curl? ( net-misc/curl )
+	gdal? ( sci-libs/gdal )
+	postgres? (
+		>=dev-db/postgresql-base-8.0
+		>=dev-db/postgis-1.1.2
+	)
+	python? ( dev-libs/boost[python] )
+	sqlite? ( dev-db/sqlite:3 )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/scons-1.0.0
+	doc? ( dev-python/epydoc )
+"
+
+src_prepare() {
+	sed -i \
+		-e "s|/usr/local|/usr|g" \
+		-e "s|Action(env\[config\]|Action('%s --help' % env\[config\]|" \
+		SConstruct || die
+
+	sed -i \
+		-e "s:mapniklibpath + '/fonts':'/usr/share/fonts/dejavu/':g" \
+	    bindings/python/SConscript || die "sed 1 failed"
+	rm -rf agg || die
+	epatch "${FILESDIR}"/${P}-libagg.patch
+}
+
+src_configure() {
+	MAKEOPTS="SYSTEM_FONTS=/usr/share/fonts/dejavu"
+
+	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"
+
+	BOOST_PKG="$(best_version "dev-libs/boost")"
+	BOOST_VER="$(get_version_component_range 1-2 "${BOOST_PKG/*boost-/}")"
+	export BOOST_VERSION="$(replace_all_version_separators _ "${BOOST_VER}")"
+	elog "${P} BOOST_VERSION is ${BOOST_VERSION}"
+	export BOOST_INC="/usr/include/boost-${BOOST_VERSION}"
+	elog "${P} BOOST_INC is ${BOOST_INC}"
+	BOOST_LIBDIR_SCHEMA="$(get_libdir)/boost-${BOOST_VERSION}"
+	export BOOST_LIB="/usr/${BOOST_LIBDIR_SCHEMA}"
+	elog "${P} BOOST_LIB is ${BOOST_LIB}"
+
+	# Passing things doesn't seem to hit all the right paths; another
+	# poster-child for just a bit too much complexity for its own good.
+	# See bug #301674 for more info.
+#	sed -i -e "s|BOOST_INCLUDE_DIR = None|BOOST_INCLUDE_DIR = \'${BOOST_INC}\'|" \
+#		-i -e "s|BOOST_LIB_DIR = None|BOOST_LIB_DIR = \'${BOOST_LIB}\'|" \
+	sed -i -e "s|searchDir, LIBDIR_SCHEMA|searchDir, \'${BOOST_LIBDIR_SCHEMA}\'|" \
+		-i -e "s|include/boost*|include/boost-${BOOST_VERSION}|" \
+		"${S}"/SConstruct || die "sed boost paths failed..."
+
+	scons CXX="$(tc-getCXX)" ${MAKEOPTS} DESTDIR="${D}" configure \
+		|| die "scons configure failed"
+}
+
+src_compile() {
+	scons BOOST_INCLUDES=${BOOST_INC} BOOST_LIBS=${BOOST_LIB} \
+		BOOST_VERSION=${BOOST_VERSION} || die "scons make failed"
+	if use doc; then
+		export PYTHONPATH="${S}/bindings/python:$(python_get_sitedir)"
+		cd docs/epydoc_config
+		./build_epydoc.sh || die "API doc generation failed"
+		cd -
+	fi
+}
+
+src_install() {
+	scons BOOST_INCLUDES=${BOOST_INC} BOOST_LIBS=${BOOST_LIB} \
+		BOOST_VERSION=${BOOST_VERSION} install || die "scons install failed"
+
+	if use python ; then
+	    fperms 0755 "$(python_get_sitedir)"/mapnik/paths.py
+	    dobin utils/stats/mapdef_stats.py
+	    insinto /usr/share/doc/${PF}/examples
+	    doins utils/ogcserver/*
+	fi
+
+	dodoc AUTHORS CHANGELOG README || die
+	use doc && { dohtml -r docs/api_docs/python/* || die "API doc install failed"; }
+}
+
+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 ""
+}