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

[Steve Arnold (nerdboy)]

nerdboy     08/11/02 02:33:49

  Modified:             mapnik-0.5.1.ebuild ChangeLog
  Log:
  fixed PGSQL linkage issues and other whacked build stuff
  (Portage version: 2.2_rc12/cvs/Linux 2.6.26.5 x86_64)

Revision  Changes    Path
1.4                  sci-geosciences/mapnik/mapnik-0.5.1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/mapnik/mapnik-0.5.1.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/mapnik/mapnik-0.5.1.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/mapnik/mapnik-0.5.1.ebuild?r1=1.3&r2=1.4

Index: mapnik-0.5.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/mapnik-0.5.1.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mapnik-0.5.1.ebuild	25 Sep 2008 06:01:47 -0000	1.3
+++ mapnik-0.5.1.ebuild	2 Nov 2008 02:33:49 -0000	1.4
@@ -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 @@
 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 @@
 	>=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 @@
 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



1.4                  sci-geosciences/mapnik/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/mapnik/ChangeLog?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/mapnik/ChangeLog?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/mapnik/ChangeLog?r1=1.3&r2=1.4

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/ChangeLog,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ChangeLog	25 Sep 2008 06:01:47 -0000	1.3
+++ ChangeLog	2 Nov 2008 02:33:49 -0000	1.4
@@ -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@g.o> 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@g.o> mapnik-0.5.1.ebuild:
   just forestalling Mr_Bones with a QA fix...