Updated to latest upstream release and shed some patches (closes bug

291376).
Package-Manager: portage-2.2_rc47/cvs/Linux x86_64

3 files changed, 104 insertions, 2 deletions

diff --git a/sci-geosciences/mapnik/ChangeLog b/sci-geosciences/mapnik/ChangeLog
index a2d3927b686b..8b62db910115 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.11 2009/08/22 23:18:09 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/ChangeLog,v 1.12 2009/11/02 01:52:04 nerdboy Exp $
+
+*mapnik-0.6.1 (02 Nov 2009)
+
+  02 Nov 2009; Steve Arnold <nerdboy@gentoo.org> +mapnik-0.6.1.ebuild:
+  Updated to latest upstream release and shed some patches.  Seems to work
+  fine both with and without use=python.  Closes bug #291376.
 
   22 Aug 2009; Steve Arnold <nerdboy@gentoo.org> mapnik-0.5.1.ebuild,
   mapnik-0.6.0.ebuild:
diff --git a/sci-geosciences/mapnik/Manifest b/sci-geosciences/mapnik/Manifest
index 335c23c91ff7..85312a7f9927 100644
--- a/sci-geosciences/mapnik/Manifest
+++ b/sci-geosciences/mapnik/Manifest
@@ -1,8 +1,10 @@
 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-0.6.1.tar.bz2 7466271 RMD160 fb9abdc2c1bded5b8789cae43b94ed52ea7b1373 SHA1 6451ad79574dd7620da370343ca45cac2ef125e1 SHA256 59b1c19817ed65ba8f0d3a2ac8f06ecf5c12f452d10170fa04f6824ea257437f
 DIST mapnik_src-0.5.1.tar.gz 6517825 RMD160 6ac8830863883c654fd5b3676efc4a0642997157 SHA1 cad0d33ee16c0abf4903a6693e871c9ace19be94 SHA256 7682bba5f578dbb5dd5103d72876e0745e3f2da2eba8fd268cd81f400625812d
 EBUILD mapnik-0.5.1.ebuild 2685 RMD160 0e6e24e1c1b63e2ecfdc7c244fac6aaa97fe814e SHA1 a918075360effc558b35373738a5d610f06b70ce SHA256 2a33e52b42138f8ff7fe4a9e9fff507e0480c6d7014a0755a4506067b8a5d51f
 EBUILD mapnik-0.6.0.ebuild 2532 RMD160 23d6c30515a6ad35724b437df143ca9281d5be1c SHA1 94d9a50011e458d37caa8616e41c56dad010eec7 SHA256 6d4bb6ed2f223dc54286fb5b7bbfd8b91d345e7bd79f54c5c6a46d02674be937
-MISC ChangeLog 2455 RMD160 9322ca7c78027a61d0de86292bd5692b85d3c915 SHA1 6cf2482a04f3520557704a761098db0e0fe1acda SHA256 ca94021b004efcd2394142524fd1d60fd468602110203fe5247160bceacedcc9
+EBUILD mapnik-0.6.1.ebuild 2482 RMD160 23abb916b5ced0628b9f24a87c319fcf3ae2e4ce SHA1 e8cdba34301051212531837ec1d8a91ce844ec04 SHA256 233758dc02bd97fa0e71483d4a1d973343b4c118998374bdf942037d4020620a
+MISC ChangeLog 2693 RMD160 616bbf9fb7b6d59f47b4292899c8ed780195938a SHA1 4274a3d24c997fb5606f9893d2ac1c7384f4f82b SHA256 7f97b7e2d984fbb9f3f3e6d549fcbba2fad2eacfca5d9dbd87ecbdb4b233610e
 MISC metadata.xml 540 RMD160 281eea708af7cea3c87c0ac1de1ccc3403b94a13 SHA1 8c0d5b1293cb5ede8254b883f474fe81e76522dc SHA256 18351b15256bb44b61ad8772d011928c37676497b7152468b3d32cec8fd7e6db
diff --git a/sci-geosciences/mapnik/mapnik-0.6.1.ebuild b/sci-geosciences/mapnik/mapnik-0.6.1.ebuild
new file mode 100644
index 000000000000..99cf43c0e964
--- /dev/null
+++ b/sci-geosciences/mapnik/mapnik-0.6.1.ebuild
@@ -0,0 +1,94 @@
+# 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.1.ebuild,v 1.1 2009/11/02 01:52:04 nerdboy 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-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="cairo curl debug doc +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-1.35.0-r5[python] )
+	cairo? ( x11-libs/cairo
+		dev-cpp/cairomm )
+	postgres? (
+		>=virtual/postgresql-base-8.0
+		>=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() {
+	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"
+}
+
+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
+
+	dodoc AUTHORS CHANGELOG README
+	use doc && 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 ""
+}