Updated to force the specified version of Boost (fixes bug 308487).

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

3 files changed, 46 insertions, 30 deletions

diff --git a/sci-geosciences/mapnik/ChangeLog b/sci-geosciences/mapnik/ChangeLog
index 7a57cc151666..88343b80c3cd 100644
--- a/sci-geosciences/mapnik/ChangeLog
+++ b/sci-geosciences/mapnik/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-geosciences/mapnik
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/ChangeLog,v 1.15 2010/03/07 21:15:50 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/ChangeLog,v 1.16 2010/03/29 04:16:46 nerdboy Exp $
+
+*mapnik-0.6.1-r3 (29 Mar 2010)
+
+  29 Mar 2010; Steve Arnold <nerdboy@gentoo.org> -mapnik-0.6.1-r2.ebuild,
+  +mapnik-0.6.1-r3.ebuild:
+  Updated to force the specified version of Boost (really fixes bug 308487).
+  Ensures that it configures, builds, and links against one and only one
+  version, no matter which other versions are installed.  So there...
 
 *mapnik-0.6.1-r2 (07 Mar 2010)
 
diff --git a/sci-geosciences/mapnik/Manifest b/sci-geosciences/mapnik/Manifest
index 64baab138bbb..b31c0d88566f 100644
--- a/sci-geosciences/mapnik/Manifest
+++ b/sci-geosciences/mapnik/Manifest
@@ -6,6 +6,6 @@ DIST mapnik-0.6.1.tar.bz2 7466271 RMD160 fb9abdc2c1bded5b8789cae43b94ed52ea7b137
 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-r2.ebuild 3747 RMD160 c445aa3fd5057b2de7b78dd787d63b96536746c4 SHA1 32743a30d670bf6b3f55729dc9fd8e0337e9d092 SHA256 134bb80ddfacbea70f7815490897e464469dabe3eb2e82d80c6942e9923279c1
-MISC ChangeLog 3627 RMD160 91add7065069750f0bf35ff1da1b0f23e1d3a24c SHA1 81242d68c66c4f0abe579847ed8243543f18b8e6 SHA256 024b036ad4b3324eec387649b0db44d6cab77f5daf36f45dcaf72116fe805f6d
+EBUILD mapnik-0.6.1-r3.ebuild 3994 RMD160 8e4afe221bdedcb16b7bdbc95f970481e222cd77 SHA1 0c8b639e6b2cadb058022e9eab121debfc6c943c SHA256 f93aaf446a5621230c259cec83013c2fb32b61788501a92d172feb2244f5f4b3
+MISC ChangeLog 3981 RMD160 b4d77b3aafb0a39902fb0412b65a8abb9fce6254 SHA1 963122009b037984a51b0d107f116622b7b75d33 SHA256 6464347dc7038856426052af054273e4ccec37558c0c5589343eca195b3feba7
 MISC metadata.xml 540 RMD160 281eea708af7cea3c87c0ac1de1ccc3403b94a13 SHA1 8c0d5b1293cb5ede8254b883f474fe81e76522dc SHA256 18351b15256bb44b61ad8772d011928c37676497b7152468b3d32cec8fd7e6db
diff --git a/sci-geosciences/mapnik/mapnik-0.6.1-r2.ebuild b/sci-geosciences/mapnik/mapnik-0.6.1-r3.ebuild
index 160dfb78cff0..f1c674f9f948 100644
--- a/sci-geosciences/mapnik/mapnik-0.6.1-r2.ebuild
+++ b/sci-geosciences/mapnik/mapnik-0.6.1-r3.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2010 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-r2.ebuild,v 1.1 2010/03/07 21:15:50 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/mapnik-0.6.1-r3.ebuild,v 1.1 2010/03/29 04:16:46 nerdboy Exp $
 
 EAPI=2
+PYTHON_DEPEND="2:2.6"
 
 inherit eutils python distutils toolchain-funcs versionator
 
@@ -15,7 +16,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="cairo curl debug doc +gdal postgres python sqlite"
 
-RDEPEND="<dev-libs/boost-1.41.0
+RDEPEND="=dev-libs/boost-1.39*
 	dev-libs/libxml2
 	dev-libs/icu
 	media-libs/libpng
@@ -25,7 +26,7 @@ RDEPEND="<dev-libs/boost-1.41.0
 	sci-libs/proj
 	x11-libs/agg[gpc,truetype]
 	media-fonts/dejavu
-	python? ( <dev-libs/boost-1.41.0[python] )
+	python? ( =dev-libs/boost-1.39*[python] )
 	cairo? ( x11-libs/cairo
 		dev-cpp/cairomm )
 	postgres? (
@@ -48,6 +49,30 @@ src_prepare() {
 	    bindings/python/SConscript || die "sed 1 failed"
 	rm -rf agg
 	epatch "${FILESDIR}"/${P}-libagg.patch
+
+	BOOST_PKG="$(best_version "<dev-libs/boost-1.40.0")"
+	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}"
+
+	# 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 is only for 1.37
+#	sed -i -e "s|libboost_filesystem-|libboost_filesystem-mt|" \
+#		"${S}"/SConstruct || die "sed boost 1.37 failed..."
+	# this is only for boost greater than 1.39
+#	sed -i -e "s|boost/property|boost/property_map/property|" \
+#		"${S}"/include/mapnik/feature.hpp
 }
 
 src_configure() {
@@ -66,27 +91,9 @@ src_configure() {
 
 	use postgres && use sqlite && MAKEOPTS="${MAKEOPTS} PGSQL2SQLITE=yes"
 
-	BOOST_PKG="$(best_version "<dev-libs/boost-1.41.0")"
-	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}"
-
-	# 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|BOOST_INCLUDE_DIR = None|BOOST_INCLUDE_DIR = \'${BOOST_INC}\'|" \
-#		-i -e "s|BOOST_LIB_DIR = None|BOOST_LIB_DIR = \'${BOOST_LIB}\'|" \
-	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..."
-
-	scons CXX="$(tc-getCXX)" ${MAKEOPTS} DESTDIR="${D}" configure \
-		|| die "scons configure failed"
+	scons CXX="$(tc-getCXX)" ${MAKEOPTS} DESTDIR="${D}" \
+		BOOST_INCLUDES=${BOOST_INC} BOOST_LIBS=${BOOST_LIB} \
+		configure || die "scons configure failed"
 }
 
 src_compile() {
@@ -95,11 +102,12 @@ src_compile() {
 }
 
 src_install() {
-	scons install || die "scons install failed"
+	scons BOOST_INCLUDES=${BOOST_INC} BOOST_LIBS=${BOOST_LIB} \
+		BOOST_VERSION=${BOOST_VERSION} install \
+		|| die "scons install failed"
 
 	if use python ; then
-	    distutils_python_version
-	    fperms 0755 /usr/$(get_libdir)/python${PYVER}/site-packages/mapnik/paths.py
+	    fperms 0755 $(python_get_sitedir)/mapnik/paths.py
 	    dobin utils/stats/mapdef_stats.py
 	    insinto /usr/share/doc/${P}/examples
 	    doins utils/ogcserver/*