Updated with API doc workaround (see bug #370575) and a missing dep.

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

3 files changed, 21 insertions, 12 deletions

diff --git a/sci-geosciences/mapnik/ChangeLog b/sci-geosciences/mapnik/ChangeLog
index 12dd6bd2eaa7..96c499698f34 100644
--- a/sci-geosciences/mapnik/ChangeLog
+++ b/sci-geosciences/mapnik/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-geosciences/mapnik
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/ChangeLog,v 1.25 2011/04/11 07:05:31 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/ChangeLog,v 1.26 2011/07/29 02:33:46 nerdboy Exp $
+
+  29 Jul 2011; Steve Arnold <nerdboy@gentoo.org> mapnik-0.7.1-r1.ebuild:
+  Updated with API doc workaround (see bug #370575) and a missing dep
+  (nothing to do with the former bug).  The API doc build has a bogus
+  dep on mod_python that's only triggered on certain boxes.  Ugh...
 
   11 Apr 2011; Steve Arnold <nerdboy@gentoo.org> mapnik-0.7.1-r1.ebuild:
   Updated for new boost 1.46 to force the older filesystem interface until
diff --git a/sci-geosciences/mapnik/Manifest b/sci-geosciences/mapnik/Manifest
index b4d67dafebc2..5df65de227dc 100644
--- a/sci-geosciences/mapnik/Manifest
+++ b/sci-geosciences/mapnik/Manifest
@@ -1,5 +1,5 @@
 AUX mapnik-0.7.1-libagg.patch 1961 RMD160 b2d7199280bdf032cd0a220e686d518a41239f8c SHA1 3adaf5c646ff2b72642bdc29d232489bfb573d17 SHA256 f7114127b1aae227d9ef854ec64c7ac5962a8428d687159604b7e6ff1146f4ff
 DIST mapnik-0.7.1.tar.bz2 10021260 RMD160 9e4180e901dfaf255091843869e9441d7a08209f SHA1 a1961f6dfe5d591d5a892bef05d58e66537440c4 SHA256 0d04e8cbc2a060ce09ba13ccdcd7bf8bd02bed77a84a3dd1191e4d75fba95b8d
-EBUILD mapnik-0.7.1-r1.ebuild 4391 RMD160 2edbaccc3e653c9b516c5a3941d41a9f339bc411 SHA1 f16054b8b88824c3e567f05c595dfd2db178ab75 SHA256 38a6687ae7fd5465fcb5328edae4690e5588a54d9919b9aec354cd6b92f2d284
-MISC ChangeLog 5702 RMD160 9bf7809c1a63f7ad0228703a1d7ccb20ce6ffb49 SHA1 f8fa3391068271479367a5a64adddf5b68e9a2c6 SHA256 e926d9b0a1a623efb89ec44fe014b6d1203927b395fc4fcb84cc27a98de19d44
+EBUILD mapnik-0.7.1-r1.ebuild 4537 RMD160 8db2f5c8432331c0db066e029f7f7c064cdc7fbc SHA1 f7c88c93a96b4cdab60b9e45f783e1b0cbfc3d8b SHA256 2c4cfbd675ce619bc7c2aaac5d6e396f410335d4bc653017ecd81824f9327ace
+MISC ChangeLog 5984 RMD160 dbba9bdc75d6f3f87c6c018ec506d834cb755c5f SHA1 ef8f62f073d7c446953c157d3a92775e65cd8aea SHA256 8fc9978c0bd98cea3a923e633123e30020bffa693bd88850b83b53f77bf56e1e
 MISC metadata.xml 540 RMD160 281eea708af7cea3c87c0ac1de1ccc3403b94a13 SHA1 8c0d5b1293cb5ede8254b883f474fe81e76522dc SHA256 18351b15256bb44b61ad8772d011928c37676497b7152468b3d32cec8fd7e6db
diff --git a/sci-geosciences/mapnik/mapnik-0.7.1-r1.ebuild b/sci-geosciences/mapnik/mapnik-0.7.1-r1.ebuild
index 7ec68dc7496e..f83bdda56c49 100644
--- a/sci-geosciences/mapnik/mapnik-0.7.1-r1.ebuild
+++ b/sci-geosciences/mapnik/mapnik-0.7.1-r1.ebuild
@@ -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/mapnik/mapnik-0.7.1-r1.ebuild,v 1.6 2011/04/11 07:05:31 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/mapnik-0.7.1-r1.ebuild,v 1.7 2011/07/29 02:33:46 nerdboy Exp $
 
 EAPI=3
 
@@ -14,7 +14,7 @@ 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"
+IUSE="-doc cairo curl debug +gdal postgres python sqlite"
 
 RDEPEND="dev-libs/boost
 	dev-libs/icu
@@ -29,6 +29,7 @@ RDEPEND="dev-libs/boost
 	cairo? (
 		x11-libs/cairo
 		dev-cpp/cairomm
+		python? ( dev-python/pycairo )
 	)
 	curl? ( net-misc/curl )
 	gdal? ( sci-libs/gdal )
@@ -69,6 +70,7 @@ src_configure() {
 	use cairo  || EMAKEOPTS="${EMAKEOPTS} CAIRO=false"
 	use python || EMAKEOPTS="${EMAKEOPTS} BINDINGS=none"
 	use debug  && EMAKEOPTS="${EMAKEOPTS} DEBUG=yes"
+	EMAKEOPTS="${EMAKEOPTS} DESTDIR=${D}"
 
 	use postgres && use sqlite && EMAKEOPTS="${EMAKEOPTS} PGSQL2SQLITE=yes"
 
@@ -111,10 +113,12 @@ src_compile() {
 	scons CC="$(tc-getCC)" CXX="$(tc-getCXX)" \
 		shared=1 || die "scons make failed"
 
+	# this is known to depend on mod_python and should not have a
+	# "die" after the epydoc script (see bug #370575)
 	if use doc; then
 		export PYTHONPATH="${S}/bindings/python:$(python_get_sitedir)"
 		cd docs/epydoc_config
-		./build_epydoc.sh || die "API doc generation failed"
+		./build_epydoc.sh
 		cd -
 	fi
 }
@@ -123,10 +127,10 @@ src_install() {
 	scons DESTDIR="${D}" 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/*
+		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
@@ -135,7 +139,7 @@ src_install() {
 
 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 "See the home page or wiki (http://trac.mapnik.org/) for more info"
+	elog "or the installed examples for the default mapnik ogcserver config."
 	elog ""
 }