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

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

4 files changed, 64 insertions, 8 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/Manifest b/sci-geosciences/mapnik/Manifest
index 85312a7f9927..c6007e5c0436 100644
--- a/sci-geosciences/mapnik/Manifest
+++ b/sci-geosciences/mapnik/Manifest
@@ -1,10 +1,11 @@
 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
 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
-EBUILD mapnik-0.6.1.ebuild 2482 RMD160 23abb916b5ced0628b9f24a87c319fcf3ae2e4ce SHA1 e8cdba34301051212531837ec1d8a91ce844ec04 SHA256 233758dc02bd97fa0e71483d4a1d973343b4c118998374bdf942037d4020620a
-MISC ChangeLog 2693 RMD160 616bbf9fb7b6d59f47b4292899c8ed780195938a SHA1 4274a3d24c997fb5606f9893d2ac1c7384f4f82b SHA256 7f97b7e2d984fbb9f3f3e6d549fcbba2fad2eacfca5d9dbd87ecbdb4b233610e
+EBUILD mapnik-0.6.1-r1.ebuild 2630 RMD160 c5187c438ce59c3535b4fbdcf6a6d8c8d9394768 SHA1 78e0335714726e30897a38e362f50296c39edd46 SHA256 5d8f8dca298849d903e7fedf576025fee73a39de8462bdfd1798dedcbfdd0341
+MISC ChangeLog 2967 RMD160 463d3806b1704a2194570bdd640b6fa7f7d5bc58 SHA1 d39c11376de2589922f32466c9108aba0d046af5 SHA256 db4ed9c2a1cd1bade5b74d54b97143d44a8f81dab302b8570638f6f422f49ddf
 MISC metadata.xml 540 RMD160 281eea708af7cea3c87c0ac1de1ccc3403b94a13 SHA1 8c0d5b1293cb5ede8254b883f474fe81e76522dc SHA256 18351b15256bb44b61ad8772d011928c37676497b7152468b3d32cec8fd7e6db
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/*