New revision for boost-1.48 compatibility. Thanks to Arfrever. Fixes bug #401395

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

5 files changed, 207 insertions, 9 deletions

diff --git a/sci-geosciences/mapnik/ChangeLog b/sci-geosciences/mapnik/ChangeLog
index 8057162095e3..da4aa146f793 100644
--- a/sci-geosciences/mapnik/ChangeLog
+++ b/sci-geosciences/mapnik/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-geosciences/mapnik
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/ChangeLog,v 1.30 2012/01/30 04:46:52 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/ChangeLog,v 1.31 2012/01/30 21:59:14 hwoarang Exp $
+
+*mapnik-0.7.1-r2 (30 Jan 2012)
+
+  30 Jan 2012; Markos Chandras <hwoarang@gentoo.org> +mapnik-0.7.1-r2.ebuild,
+  mapnik-0.7.1-r1.ebuild, mapnik-2.0.0.ebuild:
+  New revision for boost-1.48 compatibility. Thanks to Arfrever. Fixes bug
+  #401395
 
   30 Jan 2012; Steve Arnold <nerdboy@gentoo.org> mapnik-2.0.0.ebuild:
   Updated python and boost deps.
diff --git a/sci-geosciences/mapnik/Manifest b/sci-geosciences/mapnik/Manifest
index 674cddd07022..a3a38431e799 100644
--- a/sci-geosciences/mapnik/Manifest
+++ b/sci-geosciences/mapnik/Manifest
@@ -1,9 +1,30 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX mapnik-0.7.1-libagg.patch 1961 RMD160 b2d7199280bdf032cd0a220e686d518a41239f8c SHA1 3adaf5c646ff2b72642bdc29d232489bfb573d17 SHA256 f7114127b1aae227d9ef854ec64c7ac5962a8428d687159604b7e6ff1146f4ff
 AUX mapnik-0.7.1-libpng1.5.4.patch 412 RMD160 82ad05f96b30e0e1c1af1a0740120a7cf9b4420a SHA1 38399f536929320bd3fc5807e35da90a147a9514 SHA256 9a79debf5624adea141428a1d359f47d843e72ec9820ff4d8b3ba892553dd425
 AUX mapnik-2.0.0-gentoo.patch 3611 RMD160 ee914209a60f8340a45be4a28ac545e3b0efd3ef SHA1 350c2a93eb31222ba68bbe70b9f62f06b252de6a SHA256 0681e078ef0854c470f3f1393ff20d1fb31666cb8a6ba9a1c74e016632b4afa4
 DIST mapnik-0.7.1.tar.bz2 10021260 RMD160 9e4180e901dfaf255091843869e9441d7a08209f SHA1 a1961f6dfe5d591d5a892bef05d58e66537440c4 SHA256 0d04e8cbc2a060ce09ba13ccdcd7bf8bd02bed77a84a3dd1191e4d75fba95b8d
 DIST mapnik-2.0.0.tar.bz2 12302295 RMD160 73cf94c7fb417567ee43bc9215db6e5b752a0528 SHA1 afa49fc80ea38c7d58c940ae5b9a549ce20f5685 SHA256 036477761e56a4e0ccad58d9426bbde39566aecdb9cb845469c1221292fab6bc
-EBUILD mapnik-0.7.1-r1.ebuild 4604 RMD160 6f88f1eeb4db596a5f5b3fcf03efc3a55f4a3b9e SHA1 74f3a50d662c14913e1af163228f696e6a87a1de SHA256 04381566ac5244f78b05155874f50fd0186ad24a531f3fd00ba2b6e3b7bc13e4
-EBUILD mapnik-2.0.0.ebuild 3058 RMD160 f58377f3cf00a89a5d9a14ffe1c97fcb6945eac7 SHA1 29cbfec24b4056974589564e42e94576b734d107 SHA256 ca50c0baba2c19f5df7a5a8a936fa18f702ab80f6da642f71cfd1cce12d46ad7
-MISC ChangeLog 6748 RMD160 cf5fba812d980afa1821e5739e785067a767824e SHA1 74b893cf6d5fd20960c174794c660fe056c19213 SHA256 6d97eca8e8a5df0f1011b3b9c4dd39add1abb71d32746bbb9b50be1eff51f0b5
+EBUILD mapnik-0.7.1-r1.ebuild 4702 RMD160 5f02737f6b1e2a251389f4124735ea38a27bbebe SHA1 f4065680c301f8110fa31161d5a9e11589bacea1 SHA256 0dd795b756a7aeaa96bcac42fc5c9ac4f6732f8af79f94860d110088390354c2
+EBUILD mapnik-0.7.1-r2.ebuild 4786 RMD160 6514f980f803bc477ee86d81e7e49e7eaaa0dfe8 SHA1 9208f080cda56c721f2e66d543b6b3dd4194ac77 SHA256 b9318603dd1646485e54c1b0fb8d0c55d6895569509c466f555bb1b2a4560013
+EBUILD mapnik-2.0.0.ebuild 3223 RMD160 fa32c51e06fc402ced67681bb1085295c6c3dd5c SHA1 278f6cdc0d9bbeea643476ae61ac3de315c68c9e SHA256 1fa35795c3008008efef4e43c56377b9c470a54798e1e6550c5f77a83d438c38
+MISC ChangeLog 6992 RMD160 db9de9bacaa9776cfab3c8bedb2d2b9ad7bc7511 SHA1 16eb1286339b04a8f686f6d6d2512106c5bf3cc7 SHA256 f211301cf26acb6aa72038b1475373ca2b7123d9c51082e5ed79e505746df720
 MISC metadata.xml 692 RMD160 db02f65a9a58b396ba8e1b020e882a6135b400b1 SHA1 289ca86f6cb506d9e910e37973c4639c6505b918 SHA256 ff1c44d692e6a6e0d79c1bbf1e797ab247dc04a34624b5bcd283c7720b5cd68e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQIcBAEBCgAGBQJPJxKzAAoJEPqDWhW0r/LCuWEP/R2M2DGKUBgMkPQa8wcGpSF0
+2qDEvZzesOoHDKuSEEtGpu2gDs6deoctXCXrqdf7oMSVLJtH9l0XhdCkCfRVojA/
+dGUZBm2gtzlSNz1abDYosdwOeoGoTIm3QBSzZrdKZGCvqO4QxDt1VpVQIdb3DMEz
+CC2URlWkSID87ufDlegNSZX+bZ7y56BcLMNiaUx1jPoZXWQ2MAivt4pAaJOXCpnr
+Na7jR44gs2QZWgxaYYedPZmXuEOXrXi6FjdV16JWje/LZQJmXvJl6SDZiUIbSqpX
+A+lmNdPNckapX6Sz+3Zm66oP6dSh1wVK193uOIzkTWQV9Pdv0wpUvjbqubqdySXu
+sOFaZkpVR+SRu5O0iCHDuv8nDuA1rNYXgLXAZnhXgvqNHoatNAZBm8vJrYiF3r0g
+qIEdtw9fIRkVm8SUVfGXi5G/zAxlA6sSrgua0uSPYioig1RCLfe71Gcb65hzgPLF
+WXZZ3gBfFJM8uVqV8t2AQceXCUwVwJXkKqGWwdYztFh7RNau+ZF8jxjTAlA5GCKL
+BHZEVoH5pi52QKcJjVeZYJ72SCZZKK0dHdkyoVSutQzEMXMZ2s4D/M2am35qBzWk
+Gc/nW7bA4sX9Vfwl3mCtKkNANzS3RTsi6Mk6GMIoewGhsZgEif3EVtcefzOoNTF8
+RZPgB1W/XQ07bqapFlmJ
+=rti8
+-----END PGP SIGNATURE-----
diff --git a/sci-geosciences/mapnik/mapnik-0.7.1-r1.ebuild b/sci-geosciences/mapnik/mapnik-0.7.1-r1.ebuild
index 2d737f8809aa..bf53c5e85a82 100644
--- a/sci-geosciences/mapnik/mapnik-0.7.1-r1.ebuild
+++ b/sci-geosciences/mapnik/mapnik-0.7.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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.9 2011/11/27 16:05:08 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/mapnik-0.7.1-r1.ebuild,v 1.10 2012/01/30 21:59:14 hwoarang Exp $
 
 EAPI=3
 
@@ -36,13 +36,20 @@ RDEPEND="dev-libs/boost
 	postgres? (
 		>=dev-db/postgresql-base-8.3
 	)
-	python? ( dev-libs/boost[python] )
+	python? ( <dev-libs/boost-1.48[python] )
 	sqlite? ( dev-db/sqlite:3 )"
 
 DEPEND="${RDEPEND}
 	doc? ( dev-python/epydoc )
 	dev-util/scons"
 
+pkg_setup() {
+	if use python; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
 src_prepare() {
 	sed -i \
 		-e "s|/usr/local|/usr|g" \
diff --git a/sci-geosciences/mapnik/mapnik-0.7.1-r2.ebuild b/sci-geosciences/mapnik/mapnik-0.7.1-r2.ebuild
new file mode 100644
index 000000000000..3578e5954611
--- /dev/null
+++ b/sci-geosciences/mapnik/mapnik-0.7.1-r2.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2012 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-r2.ebuild,v 1.1 2012/01/30 21:59:14 hwoarang Exp $
+
+EAPI=3
+
+PYTHON_DEPEND="python? 2"
+inherit eutils flag-o-matic python toolchain-funcs versionator
+
+DESCRIPTION="A Free Toolkit for developing mapping applications."
+HOMEPAGE="http://www.mapnik.org/"
+SRC_URI="mirror://berlios/${PN}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="-doc cairo curl debug +gdal postgres python sqlite"
+
+RDEPEND="dev-libs/boost
+	dev-libs/icu
+	dev-libs/libxml2:2
+	media-fonts/dejavu
+	media-libs/freetype:2
+	virtual/jpeg
+	media-libs/libpng
+	media-libs/tiff
+	sci-libs/proj
+	x11-libs/agg[truetype]
+	cairo? (
+		x11-libs/cairo
+		dev-cpp/cairomm
+		python? ( dev-python/pycairo )
+	)
+	curl? ( net-misc/curl )
+	gdal? ( sci-libs/gdal )
+	postgres? (
+		>=dev-db/postgresql-base-8.3
+	)
+	python? ( >=dev-libs/boost-1.48[python] )
+	sqlite? ( dev-db/sqlite:3 )"
+
+DEPEND="${RDEPEND}
+	doc? ( dev-python/epydoc )
+	dev-util/scons"
+
+pkg_setup() {
+	if use python; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
+src_prepare() {
+	sed -i \
+		-e "s|/usr/local|/usr|g" \
+		-e "s|Action(env\[config\]|Action('%s --help' % env\[config\]|" \
+		SConstruct || die "sed 1 failed"
+
+	sed -i \
+		-e "s:mapniklibpath + '/fonts':'/usr/share/fonts/dejavu/':g" \
+	    bindings/python/SConscript || die "sed 2 failed"
+	rm -rf agg || die
+	epatch "${FILESDIR}"/${P}-libagg.patch
+
+	# update for libpng 1.5 changes (see bug #)
+	epatch "${FILESDIR}"/${P}-libpng1.5.4.patch
+}
+
+src_configure() {
+	EMAKEOPTS="SYSTEM_FONTS=/usr/share/fonts/dejavu"
+
+	EMAKEOPTS="${EMAKEOPTS} INPUT_PLUGINS="
+	use postgres && EMAKEOPTS="${EMAKEOPTS}postgis,"
+	use gdal     && EMAKEOPTS="${EMAKEOPTS}gdal,ogr,"
+	use sqlite   && EMAKEOPTS="${EMAKEOPTS}sqlite,"
+	use curl     && EMAKEOPTS="${EMAKEOPTS}osm,"
+	EMAKEOPTS="${EMAKEOPTS}shape,raster"
+
+	use cairo  || EMAKEOPTS="${EMAKEOPTS} CAIRO=false"
+	use python || EMAKEOPTS="${EMAKEOPTS} BINDINGS=none"
+	use python && EMAKEOPTS="${EMAKEOPTS} BOOST_PYTHON_LIB=boost_python-${PYTHON_ABI}"
+	use debug  && EMAKEOPTS="${EMAKEOPTS} DEBUG=yes"
+	EMAKEOPTS="${EMAKEOPTS} DESTDIR=${D}"
+
+	use postgres && use sqlite && EMAKEOPTS="${EMAKEOPTS} PGSQL2SQLITE=yes"
+
+	BOOST_PKG="$(best_version "dev-libs/boost")"
+	BOOST_VER="$(get_version_component_range 1-2 "${BOOST_PKG/*boost-/}")"
+	export BOOST_VERSION="$(replace_all_version_separators _ "${BOOST_VER}")"
+	elog "${P} BOOST_VERSION is ${BOOST_VERSION}"
+	export BOOST_INC="/usr/include/boost-${BOOST_VERSION}"
+	elog "${P} BOOST_INC is ${BOOST_INC}"
+	BOOST_LIBDIR_SCHEMA="$(get_libdir)/boost-${BOOST_VERSION}"
+	export BOOST_LIB="/usr/${BOOST_LIBDIR_SCHEMA}"
+	elog "${P} BOOST_LIB is ${BOOST_LIB}"
+
+	# force older boost filesystem version until upstream migrates
+	if version_is_at_least "1.46" "${BOOST_VER}"; then
+		append-flags -DBOOST_FILESYSTEM_VERSION=2
+	fi
+
+	# Passing things doesn't seem to hit all the right paths; another
+	# poster-child for just a bit too much complexity for its own good.
+	# See bug #301674 for more info.
+	sed -i -e "s|searchDir, LIBDIR_SCHEMA|searchDir, \'${BOOST_LIBDIR_SCHEMA}\'|" \
+		-i -e "s|include/boost*|include/boost-${BOOST_VERSION}|" \
+		"${S}"/SConstruct || die "sed boost paths failed..."
+
+	# this seems to be the only way to force user-flags, since nothing
+	# gets through the scons configure except the nuclear sed option.
+	sed -i -e "s:\-O%s:${CXXFLAGS}:" \
+		-i -e "s:env\['OPTIMIZATION'\]\,::" \
+		SConstruct || die "sed 3 failed"
+	sed -i -e "s:LINKFLAGS=linkflags:LINKFLAGS=linkflags + \" ${LDFLAGS}\":" \
+		src/SConscript || die "sed 4 failed"
+
+	scons CC="$(tc-getCC)" CXX="$(tc-getCXX)" ${EMAKEOPTS} configure \
+		|| die "scons configure failed"
+}
+
+src_compile() {
+	# note passing CXXFLAGS to scons does *not* work
+	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
+		cd -
+	fi
+}
+
+src_install() {
+	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/*
+	fi
+
+	dodoc AUTHORS CHANGELOG README || die
+	use doc && { dohtml -r docs/api_docs/python/* || die "API doc install failed"; }
+}
+
+pkg_postinst() {
+	elog ""
+	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 ""
+}
diff --git a/sci-geosciences/mapnik/mapnik-2.0.0.ebuild b/sci-geosciences/mapnik/mapnik-2.0.0.ebuild
index cbdfdea7a08f..ea315c09e306 100644
--- a/sci-geosciences/mapnik/mapnik-2.0.0.ebuild
+++ b/sci-geosciences/mapnik/mapnik-2.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/mapnik-2.0.0.ebuild,v 1.3 2012/01/30 04:46:52 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/mapnik-2.0.0.ebuild,v 1.4 2012/01/30 21:59:14 hwoarang Exp $
 
 EAPI=3
 
@@ -27,7 +27,7 @@ RDEPEND="net-misc/curl
 	dev-libs/libxml2
 	dev-libs/icu
 	x11-libs/agg[truetype]
-	dev-libs/boost[python?]
+	>=dev-libs/boost-1.48[python?]
 	postgres? ( >=dev-db/postgresql-base-8.3 )
 	gdal? ( sci-libs/gdal )
 	geos? ( sci-libs/geos )
@@ -46,6 +46,13 @@ DEPEND="${RDEPEND}
 
 #EPATCH_OPTS="-F 3"
 
+pkg_setup() {
+	if use python; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-gentoo.patch
 }
@@ -66,6 +73,7 @@ src_configure() {
 		PROJ_LIBS=/usr/lib
 		$(use_scons nobfonts SYSTEM_FONTS /usr/share/fonts '')
 		$(use_scons python BINDINGS all none)
+		$(use_scons python BOOST_PYTHON_LIB boost_python-${PYTHON_ABI})
 		$(use_scons bidi BIDI)
 		$(use_scons cairo CAIRO)
 		$(use_scons debug DEBUG)