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

[Steve Arnold (nerdboy)]

nerdboy     11/07/29 02:33:46

  Modified:             ChangeLog mapnik-0.7.1-r1.ebuild
  Log:
  Updated with API doc workaround (see bug #370575) and a missing dep.
  
  (Portage version: 2.1.10.7/cvs/Linux x86_64)

Revision  Changes    Path
1.26                 sci-geosciences/mapnik/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/ChangeLog,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- ChangeLog	11 Apr 2011 07:05:31 -0000	1.25
+++ ChangeLog	29 Jul 2011 02:33:46 -0000	1.26
@@ -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@g.o> 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@g.o> mapnik-0.7.1-r1.ebuild:
   Updated for new boost 1.46 to force the older filesystem interface until



1.7                  sci-geosciences/mapnik/mapnik-0.7.1-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapnik/mapnik-0.7.1-r1.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapnik/mapnik-0.7.1-r1.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapnik/mapnik-0.7.1-r1.ebuild?r1=1.6&r2=1.7

Index: mapnik-0.7.1-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/mapnik-0.7.1-r1.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mapnik-0.7.1-r1.ebuild	11 Apr 2011 07:05:31 -0000	1.6
+++ mapnik-0.7.1-r1.ebuild	29 Jul 2011 02:33:46 -0000	1.7
@@ -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 @@
 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 @@
 	cairo? (
 		x11-libs/cairo
 		dev-cpp/cairomm
+		python? ( dev-python/pycairo )
 	)
 	curl? ( net-misc/curl )
 	gdal? ( sci-libs/gdal )
@@ -69,6 +70,7 @@
 	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 @@
 	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 @@
 	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 @@
 
 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 ""
 }