Added group-hack to work around broken scons boost detection; fixes bug

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

3 files changed, 38 insertions, 9 deletions

diff --git a/sci-geosciences/mapnik/ChangeLog b/sci-geosciences/mapnik/ChangeLog
index 2b969f8bfb7f..7a57cc151666 100644
--- a/sci-geosciences/mapnik/ChangeLog
+++ b/sci-geosciences/mapnik/ChangeLog
@@ -1,6 +1,15 @@
 # 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.14 2010/02/13 05:37:07 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/ChangeLog,v 1.15 2010/03/07 21:15:50 nerdboy Exp $
+
+*mapnik-0.6.1-r2 (07 Mar 2010)
+
+  07 Mar 2010; Steve Arnold <nerdboy@gentoo.org> -mapnik-0.6.1-r1.ebuild,
+  +mapnik-0.6.1-r2.ebuild:
+  Had to hack around broken scons build script in order to force a given 
+  boost version (see bug #301674).  Many thanks to Sebastian Luther 
+  <SebastianLuther@gmx.de> and Juergen Rose <rose@rz.uni-potsdam.de> for 
+  providing the initial basis for the complete hack.
 
   13 Feb 2010; Steve Arnold <nerdboy@gentoo.org> mapnik-0.6.1-r1.ebuild:
   Updated boost depend for gpsdrive; can cause subtle breakage if built
diff --git a/sci-geosciences/mapnik/Manifest b/sci-geosciences/mapnik/Manifest
index 2a847b198249..64baab138bbb 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-r1.ebuild 2632 RMD160 bf69108984f693f6bc9c9d45bb4cfde6fcbb1281 SHA1 cda0d272a0ee9897cc4190dc4848d73777d60fd8 SHA256 2cd0d1e0cb9f30c9bd30d9905de4c6da30df154add01b69dc5fabf7479865a58
-MISC ChangeLog 3223 RMD160 b15581f5426aa814c68319a9d22d7f0b34f1faaf SHA1 53decb9354068a7a71702875588a9e00f5a53b36 SHA256 a99c4f85ebe37d856b756585f861311478d976be634b485501c1f2d671a6d6e2
+EBUILD mapnik-0.6.1-r2.ebuild 3747 RMD160 c445aa3fd5057b2de7b78dd787d63b96536746c4 SHA1 32743a30d670bf6b3f55729dc9fd8e0337e9d092 SHA256 134bb80ddfacbea70f7815490897e464469dabe3eb2e82d80c6942e9923279c1
+MISC ChangeLog 3627 RMD160 91add7065069750f0bf35ff1da1b0f23e1d3a24c SHA1 81242d68c66c4f0abe579847ed8243543f18b8e6 SHA256 024b036ad4b3324eec387649b0db44d6cab77f5daf36f45dcaf72116fe805f6d
 MISC metadata.xml 540 RMD160 281eea708af7cea3c87c0ac1de1ccc3403b94a13 SHA1 8c0d5b1293cb5ede8254b883f474fe81e76522dc SHA256 18351b15256bb44b61ad8772d011928c37676497b7152468b3d32cec8fd7e6db
diff --git a/sci-geosciences/mapnik/mapnik-0.6.1-r1.ebuild b/sci-geosciences/mapnik/mapnik-0.6.1-r2.ebuild
index 6415b4e349a7..160dfb78cff0 100644
--- a/sci-geosciences/mapnik/mapnik-0.6.1-r1.ebuild
+++ b/sci-geosciences/mapnik/mapnik-0.6.1-r2.ebuild
@@ -1,10 +1,10 @@
 # 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-r1.ebuild,v 1.2 2010/02/13 05:37:07 nerdboy Exp $
+# $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 $
 
 EAPI=2
 
-inherit eutils distutils toolchain-funcs
+inherit eutils python distutils toolchain-funcs versionator
 
 DESCRIPTION="A Free Toolkit for developing mapping applications."
 HOMEPAGE="http://www.mapnik.org/"
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="cairo curl debug doc +gdal postgres python sqlite"
 
-RDEPEND="=dev-libs/boost-1.39*
+RDEPEND="<dev-libs/boost-1.41.0
 	dev-libs/libxml2
 	dev-libs/icu
 	media-libs/libpng
@@ -25,7 +25,7 @@ RDEPEND="=dev-libs/boost-1.39*
 	sci-libs/proj
 	x11-libs/agg[gpc,truetype]
 	media-fonts/dejavu
-	python? ( =dev-libs/boost-1.39*[python] )
+	python? ( <dev-libs/boost-1.41.0[python] )
 	cairo? ( x11-libs/cairo
 		dev-cpp/cairomm )
 	postgres? (
@@ -66,12 +66,32 @@ 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"
+		|| die "scons configure failed"
 }
 
 src_compile() {
-	scons || die "scons make failed"
+	scons BOOST_INCLUDES=${BOOST_INC} BOOST_LIBS=${BOOST_LIB} \
+		BOOST_VERSION=${BOOST_VERSION} || die "scons make failed"
 }
 
 src_install() {