Patch for building properly against external libagg (fixes bug 292078).

(Portage version: 2.2_rc47/cvs/Linux x86_64)

3 files changed, 61 insertions, 6 deletions

diff --git a/sci-geosciences/mapnik/ChangeLog b/sci-geosciences/mapnik/ChangeLog
index 8b62db910115..7affc205825a 100644
--- a/sci-geosciences/mapnik/ChangeLog
+++ b/sci-geosciences/mapnik/ChangeLog
@@ -1,6 +1,13 @@
 # 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.12 2009/11/02 01:52:04 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/ChangeLog,v 1.13 2009/11/12 05:06:32 nerdboy Exp $
+
+*mapnik-0.6.1-r1 (12 Nov 2009)
+
+  12 Nov 2009; Steve Arnold <nerdboy@gentoo.org> -mapnik-0.6.1.ebuild,
+  +mapnik-0.6.1-r1.ebuild, +files/mapnik-0.6.1-libagg.patch:
+  Patch for building properly against external libagg (fixes bug #292078) 
+  and removal of redundant fonts.
 
 *mapnik-0.6.1 (02 Nov 2009)
 
diff --git a/sci-geosciences/mapnik/files/mapnik-0.6.1-libagg.patch b/sci-geosciences/mapnik/files/mapnik-0.6.1-libagg.patch
new file mode 100644
index 000000000000..e99a7598040d
--- /dev/null
+++ b/sci-geosciences/mapnik/files/mapnik-0.6.1-libagg.patch
@@ -0,0 +1,45 @@
+--- SConstruct.orig	2009-11-11 16:28:33.738781120 -0800
++++ SConstruct	2009-11-11 16:43:40.272245603 -0800
+@@ -152,10 +152,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
+@@ -657,6 +659,7 @@
+         ['proj', 'proj_api.h', True,'C'],
+         ['icuuc','unicode/unistr.h',True,'C++'],
+         ['icudata','unicode/utypes.h' , True,'C++'],
++        ['agg','agg2/agg_config.h' , True,'C++'],
+     ]
+     
+     
+--- src/SConscript.orig	2009-11-11 16:57:07.660782538 -0800
++++ src/SConscript	2009-11-11 17:00:50.337532240 -0800
+@@ -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','icuuc',filesystem,regex]
++libraries = ['freetype','ltdl','png','tiff','z','jpeg','proj','icuuc','agg',filesystem,regex]
+ 
+ if '-DHAVE_CAIRO' in env['CXXFLAGS']:
+     # add cairo and cairomm-1.0 to libs
+@@ -53,9 +53,6 @@
+     if env['BOOST_SYSTEM_REQUIRED']:
+         libraries.append('boost_system%s' % env['BOOST_APPEND'])
+     
+-if env['INTERNAL_LIBAGG']:
+-    libraries.insert(0, 'agg')
+-
+ if env['PLATFORM'] == 'Darwin':
+     if env['FULL_LIB_PATH']:
+         lib_path = '%s/libmapnik.dylib' % lib_dir
diff --git a/sci-geosciences/mapnik/mapnik-0.6.1.ebuild b/sci-geosciences/mapnik/mapnik-0.6.1-r1.ebuild
index 99cf43c0e964..62e5a832d5ca 100644
--- a/sci-geosciences/mapnik/mapnik-0.6.1.ebuild
+++ b/sci-geosciences/mapnik/mapnik-0.6.1-r1.ebuild
@@ -1,10 +1,10 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/mapnik-0.6.1-r1.ebuild,v 1.1 2009/11/12 05:06:32 nerdboy Exp $
 
 EAPI=2
 
-inherit eutils toolchain-funcs
+inherit eutils distutils toolchain-funcs
 
 DESCRIPTION="A Free Toolkit for developing mapping applications."
 HOMEPAGE="http://www.mapnik.org/"
@@ -23,7 +23,7 @@ RDEPEND="dev-libs/boost
 	media-libs/tiff
 	media-libs/freetype:2
 	sci-libs/proj
-	x11-libs/agg
+	x11-libs/agg[gpc,truetype]
 	media-fonts/dejavu
 	python? ( >=dev-libs/boost-1.35.0-r5[python] )
 	cairo? ( x11-libs/cairo
@@ -46,10 +46,12 @@ src_prepare() {
 
 	sed -i -e "s:mapniklibpath + '/fonts':'/usr/share/fonts/dejavu/':g" \
 	    bindings/python/SConscript || die "sed 1 failed"
+	rm -rf agg
+	epatch "${FILESDIR}"/${P}-libagg.patch
 }
 
 src_configure() {
-	MAKEOPTS="INTERNAL_LIBAGG=no"
+	MAKEOPTS="SYSTEM_FONTS=/usr/share/fonts/dejavu"
 
 	MAKEOPTS="${MAKEOPTS} INPUT_PLUGINS="
 	use postgres && MAKEOPTS="${MAKEOPTS}postgis,"
@@ -76,7 +78,8 @@ src_install() {
 	scons install || die "scons install failed"
 
 	if use python ; then
-		fperms o-w /usr/lib/python*/site-packages/mapnik/paths.py
+	    distutils_python_version
+	    fperms 0755 /usr/$(get_libdir)/python${PYVER}/site-packages/mapnik/paths.py
 	    dobin utils/stats/mapdef_stats.py
 	    insinto /usr/share/doc/${P}/examples
 	    doins utils/ogcserver/*