fixed PGSQL linkage issues and other whacked build stuff

Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.26.5 x86_64

3 files changed, 58 insertions, 19 deletions

diff --git a/sci-geosciences/mapnik/ChangeLog b/sci-geosciences/mapnik/ChangeLog
index 1508709facef..35ef98ee64f6 100644
--- a/sci-geosciences/mapnik/ChangeLog
+++ b/sci-geosciences/mapnik/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-geosciences/mapnik
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/ChangeLog,v 1.3 2008/09/25 06:01:47 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/ChangeLog,v 1.4 2008/11/02 02:33:49 nerdboy Exp $
+
+  02 Nov 2008; Steve Arnold <nerdboy@gentoo.org> mapnik-0.5.1.ebuild:
+  Fixed PGSQL linkage issues and other whacked build stuff; added 
+  ogcserver example config.  All input plugins build now.  Postgres
+  dep should be changed to a virtual when ready (postgresql plugin
+  won't build against libpq package).
 
   25 Sep 2008; Steve Arnold <nerdboy@gentoo.org> mapnik-0.5.1.ebuild:
   just forestalling Mr_Bones with a QA fix...
diff --git a/sci-geosciences/mapnik/Manifest b/sci-geosciences/mapnik/Manifest
index 8ca21c78fb7e..f22f57f65d9b 100644
--- a/sci-geosciences/mapnik/Manifest
+++ b/sci-geosciences/mapnik/Manifest
@@ -1,5 +1,5 @@
 AUX mapnik-0.5.1-include-fix.patch 328 RMD160 2396fdfe4dd7630e0a8866a3676c42e4c684e53c SHA1 c1fca803a293443241f200039a7355cbce78c3d1 SHA256 e76fcd9328c3207c56a083361d5bb4a4e356262989e85a7c280460dc8d30e05b
 DIST mapnik_src-0.5.1.tar.gz 6517825 RMD160 6ac8830863883c654fd5b3676efc4a0642997157 SHA1 cad0d33ee16c0abf4903a6693e871c9ace19be94 SHA256 7682bba5f578dbb5dd5103d72876e0745e3f2da2eba8fd268cd81f400625812d
-EBUILD mapnik-0.5.1.ebuild 1746 RMD160 11159af473f3f551be666920e76ecdeeaeeef2d5 SHA1 28546e4af6085b81ace9e678600bc02cd0b7b796 SHA256 c1f421df8355db8c46339d669a5bf7aac0df945da748e569149590d7d8ae8084
-MISC ChangeLog 790 RMD160 22908600aeb0ee0097274eeba8104697c8419d13 SHA1 cdd5d75fa593e1c9c2a7dac4de93e885493a94fe SHA256 8ce0e54d36cdd4838c455b5ecda5096b62d2c1eb9caa76c9e69a84820c7b06da
+EBUILD mapnik-0.5.1.ebuild 2674 RMD160 6899098f144131155d07c950de28fb4566faaab0 SHA1 2d7ab3ba3831f51bc8479457430ab982609b7041 SHA256 9638ba40a76ca0e7152b0a012e2b3e95284515d235f08817b2d8bda7cfda76f4
+MISC ChangeLog 1101 RMD160 bd8a0be2445aeffeeeebe0dc6c61c40042746434 SHA1 b053554b1e12f6545a491be1e7cfe9fa5fb27c15 SHA256 87819345be0bdb8f842fa19203bcc121beca9bfd6c3456fb3c6d1e5d41e4f0b5
 MISC metadata.xml 452 RMD160 42cbdc0a8e6f4765223a077aee49908d3b0d4f13 SHA1 458c74853a786212e86c9df1235fe5d91d6af6a3 SHA256 378416475e220baa723fcb7def765294257d4881ef51ba127f5b39c6fe0970c8
diff --git a/sci-geosciences/mapnik/mapnik-0.5.1.ebuild b/sci-geosciences/mapnik/mapnik-0.5.1.ebuild
index a79fa129c275..7f7dc87f610c 100644
--- a/sci-geosciences/mapnik/mapnik-0.5.1.ebuild
+++ b/sci-geosciences/mapnik/mapnik-0.5.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/mapnik-0.5.1.ebuild,v 1.3 2008/09/25 06:01:47 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/mapnik-0.5.1.ebuild,v 1.4 2008/11/02 02:33:49 nerdboy Exp $
 
-inherit eutils autotools
+inherit eutils toolchain-funcs
 
 DESCRIPTION="A Free Toolkit for developing mapping applications."
 HOMEPAGE="http://www.mapnik.org/"
@@ -10,7 +10,7 @@ SRC_URI="mirror://berlios/mapnik/mapnik_src-${PV}.tar.gz"
 LICENSE="LGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug doc postgres python bidi"
+IUSE="bidi debug doc postgres python"
 
 RDEPEND=">=dev-libs/boost-1.33.0
 	>=media-libs/libpng-1.2.12
@@ -18,10 +18,12 @@ RDEPEND=">=dev-libs/boost-1.33.0
 	>=media-libs/tiff-3.8.2
 	>=sys-libs/zlib-1.2.3
 	>=media-libs/freetype-2.1.10
+	media-fonts/dejavu
 	>=sci-libs/proj-4.4.9
-	dev-libs/libxml2
 	sci-libs/gdal
-	postgres? ( >=dev-db/postgis-1.1.2 )
+	xml? ( dev-libs/libxml2 )
+	postgres? ( >=dev-db/postgresql-base-8.3
+		>=dev-db/postgis-1.1.2 )
 	python? ( >=dev-lang/python-2.4 )
 	bidi? ( dev-libs/fribidi )"
 
@@ -32,36 +34,67 @@ DEPEND="${RDEPEND}
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
+
 	epatch "${FILESDIR}"/${P}-include-fix.patch
-	sed -i -e "s:/usr/local:/usr:g" SConstruct || die "sed failed"
-	eautoreconf
+
+	sed -i -e "s:mapniklibpath + '/fonts':/usr/share/fonts/dejavu/:g" \
+	    bindings/python/SConscript || die "sed 1 failed"
+	sed -i -e "s:/usr/local:/usr:g" SConstruct \
+	    || die "sed 2 failed"
+	sed -i -e "s:SConscript('fonts/SConscript')::g" SConstruct \
+	    || die "sed 3 failed"
+	rm -rf fonts
+	find . -type d -perm /g+s -exec chmod -s '{}' \;
+
+	sed -i -e "s:libraries \= \[:libraries \= \[\'mapnik\',:g" \
+	    plugins/input/{gdal,postgis,shape,raster}/SConscript \
+	    || die "sed 4 failed"
 }
 
 src_compile() {
-	MAKEOPTS="${MAKEOPTS} INPUT_PLUGINS=shape,raster,postgis"
+	MAKEOPTS="INPUT_PLUGINS=all"
 	MAKEOPTS="${MAKEOPTS} PROJ_INCLUDES=/usr/include"
 	MAKEOPTS="${MAKEOPTS} PROJ_LIBS=/usr/$(get_libdir)"
-	MAKEOPTS="${MAKEOPTS} XMLPARSER=libxml2"
+	MAKEOPTS="${MAKEOPTS} XML2_CONFIG=/usr/bin/xml2-config \
+	    XMLPARSER=libxml2"
 
 	if ! use python ; then
-		MAKEOPTS="${MAKEOPTS} BINDINGS=none"
+	    MAKEOPTS="${MAKEOPTS} BINDINGS=none"
 	fi
 	if use debug ; then
-		MAKEOPTS="${MAKEOPTS} DEBUG=1"
+	    MAKEOPTS="${MAKEOPTS} DEBUG=yes"
 	fi
 	if use bidi ; then
-		MAKEOPTS="${MAKEOPTS} BIDI=1"
+	    MAKEOPTS="${MAKEOPTS} BIDI=yes"
 	fi
 	if use postgres ; then
-		MAKEOPTS="${MAKEOPTS} PGSQL_INCLUDES=/usr/include/postgresql"
+	    MAKEOPTS="${MAKEOPTS} \
+		PGSQL_INCLUDES=$(pg_config --includedir)
+	        PGSQL_LIBS=$(pg_config --libdir)"
 	fi
 
-	scons ${MAKEOPTS} || die "scons make failed"
+	scons CXX="$(tc-getCXX)" ${MAKEOPTS} \
+	    || die "scons make failed"
 }
 
 src_install() {
-	scons ${MAKEOPTS} DESTDIR="${D}" install || die "Unable to install Mapnik"
+	scons DESTDIR="${D}" install \
+	    || die "scons install failed"
+
+	if use python ; then
+	    dobin utils/stats/mapdef_stats.py
+	    insinto /usr/share/doc/${P}/examples
+	    doins utils/ogcserver/{ogcserver,ogcserver.conf}
+	fi
+
 	if use doc ; then
-		dohtml -r docs/epydocs/*
+	    dohtml -r docs/epydocs/*
 	fi
 }
+
+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 ""
+}
\ No newline at end of file