Updated with sed hacks to force scons to use specified C,CXX,LDFLAGS.

Package-Manager: portage-2.1.9.35/cvs/Linux x86_64

3 files changed, 41 insertions, 43 deletions

diff --git a/sci-geosciences/mapnik/ChangeLog b/sci-geosciences/mapnik/ChangeLog
index dd3abe70e89a..b286e88c735d 100644
--- a/sci-geosciences/mapnik/ChangeLog
+++ b/sci-geosciences/mapnik/ChangeLog
@@ -1,6 +1,10 @@
 # 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.21 2010/11/08 17:30:15 xarthisius Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/ChangeLog,v 1.22 2011/02/07 06:54:11 nerdboy Exp $
+
+  07 Feb 2011; Steve Arnold <nerdboy@gentoo.org> mapnik-0.7.1-r1.ebuild:
+  Updated with sed hacks to force scons to use specified C,CXX,LDFLAGS.
+  (closes bug #343809)  Please report any issues on a new bug.
 
   08 Nov 2010; Kacper Kowalik <xarthisius@gentoo.org>
   mapnik-0.6.1-r3.ebuild, mapnik-0.7.1-r1.ebuild:
diff --git a/sci-geosciences/mapnik/Manifest b/sci-geosciences/mapnik/Manifest
index 2f4e1bfa0104..7d39ec3b7269 100644
--- a/sci-geosciences/mapnik/Manifest
+++ b/sci-geosciences/mapnik/Manifest
@@ -1,20 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX mapnik-0.6.1-libagg.patch 2246 RMD160 05fd5ab80165030ea1c98ac3a0eefcd73867d3ce SHA1 57522f67f291c39cfe9048106f3a87b785f358a1 SHA256 5b80027a0973678b30dcd74c6133592a9914d6f98432991ed9bc49f4ebcc0108
 AUX mapnik-0.7.1-libagg.patch 1961 RMD160 b2d7199280bdf032cd0a220e686d518a41239f8c SHA1 3adaf5c646ff2b72642bdc29d232489bfb573d17 SHA256 f7114127b1aae227d9ef854ec64c7ac5962a8428d687159604b7e6ff1146f4ff
 DIST mapnik-0.6.1.tar.bz2 7466271 RMD160 fb9abdc2c1bded5b8789cae43b94ed52ea7b1373 SHA1 6451ad79574dd7620da370343ca45cac2ef125e1 SHA256 59b1c19817ed65ba8f0d3a2ac8f06ecf5c12f452d10170fa04f6824ea257437f
 DIST mapnik-0.7.1.tar.bz2 10021260 RMD160 9e4180e901dfaf255091843869e9441d7a08209f SHA1 a1961f6dfe5d591d5a892bef05d58e66537440c4 SHA256 0d04e8cbc2a060ce09ba13ccdcd7bf8bd02bed77a84a3dd1191e4d75fba95b8d
 EBUILD mapnik-0.6.1-r3.ebuild 3993 RMD160 a4ea62c64cf29d167400122a27fb2a5f25319bae SHA1 f2ec07e5c2e8dea2a867bd0920ecef1f00536099 SHA256 2291f5c8ef3a4ba6f7f7195bdc18b2a293c403dd3090d75b2414ddb9954d539d
-EBUILD mapnik-0.7.1-r1.ebuild 4042 RMD160 881a13a76ac1aebc6391a5551278dd4601a3d597 SHA1 ec390004706109affc496dfaf9834d79ab188d73 SHA256 1025b201968d64d71f2480f4c117aa53b73eff66614f6ba64ef54ee615965aac
-MISC ChangeLog 5023 RMD160 77378070722db7adfa33c228753639ab3cc1b64f SHA1 d2c684023c0829e7255922193457ac9aefbf500b SHA256 64bb0366fc562c79e7505c4e4800a893754627081d9ed96014d6a56d5f4df24e
+EBUILD mapnik-0.7.1-r1.ebuild 4234 RMD160 eb8eb9b0b3098558f8d75daa9bb6356a907fb547 SHA1 571b7781b71089eb90bef1e143d8237d02c9a0d6 SHA256 0f93b03a694aa89c60604fc6f5565c669c67c2349da7ad4d6963bb4a01753646
+MISC ChangeLog 5229 RMD160 1b903d4d0bc512f5ed47e1c796ec053d39df6604 SHA1 c531967e356d5fc206d002866fb8b2e3a268291f SHA256 faa7762c0b94c24a7baee8da120846239d656c326b74de0ff6791dec8747f2b9
 MISC metadata.xml 540 RMD160 281eea708af7cea3c87c0ac1de1ccc3403b94a13 SHA1 8c0d5b1293cb5ede8254b883f474fe81e76522dc SHA256 18351b15256bb44b61ad8772d011928c37676497b7152468b3d32cec8fd7e6db
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iJwEAQECAAYFAkzYM7AACgkQIiMqcbOVdxT73gP/Vs9ltD1cfkyg//iQY6dRpddS
-uy5Yqg9vCNxTPAXS1OmhzrG6AVCKcqt197hbSGnJok3o2a0yangDJ0SvUUXo71Dj
-4Fkfv8NRJz1yYsMa9ifXOxs0KYn8mtQc4D6HhHkmFTxz4FP43Kv6p3pRpTKJEMEc
-6tdYY6dcftL/VsNRnME=
-=yNR1
------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 631122508738..cc79f0b7b5ef 100644
--- a/sci-geosciences/mapnik/mapnik-0.7.1-r1.ebuild
+++ b/sci-geosciences/mapnik/mapnik-0.7.1-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 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.2 2010/11/08 17:30:15 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/mapnik-0.7.1-r1.ebuild,v 1.3 2011/02/07 06:54:11 nerdboy Exp $
 
 EAPI=2
 
 PYTHON_DEPEND="python? 2"
-inherit eutils python distutils toolchain-funcs versionator
+inherit eutils flag-o-matic python distutils toolchain-funcs versionator
 
 DESCRIPTION="A Free Toolkit for developing mapping applications."
 HOMEPAGE="http://www.mapnik.org/"
@@ -37,41 +37,40 @@ RDEPEND="dev-libs/boost
 		>=dev-db/postgis-1.5.2
 	)
 	python? ( dev-libs/boost[python] )
-	sqlite? ( dev-db/sqlite:3 )
-"
+	sqlite? ( dev-db/sqlite:3 )"
+
 DEPEND="${RDEPEND}
-	>=dev-util/scons-1.0.0
 	doc? ( dev-python/epydoc )
-"
+	dev-util/scons"
 
 src_prepare() {
 	sed -i \
 		-e "s|/usr/local|/usr|g" \
 		-e "s|Action(env\[config\]|Action('%s --help' % env\[config\]|" \
-		SConstruct || die
+		SConstruct || die "sed 1 failed"
 
 	sed -i \
 		-e "s:mapniklibpath + '/fonts':'/usr/share/fonts/dejavu/':g" \
-	    bindings/python/SConscript || die "sed 1 failed"
+	    bindings/python/SConscript || die "sed 2 failed"
 	rm -rf agg || die
 	epatch "${FILESDIR}"/${P}-libagg.patch
 }
 
 src_configure() {
-	MAKEOPTS="SYSTEM_FONTS=/usr/share/fonts/dejavu"
+	EMAKEOPTS="SYSTEM_FONTS=/usr/share/fonts/dejavu"
 
-	MAKEOPTS="${MAKEOPTS} INPUT_PLUGINS="
-	use postgres && MAKEOPTS="${MAKEOPTS}postgis,"
-	use gdal     && MAKEOPTS="${MAKEOPTS}gdal,ogr,"
-	use sqlite   && MAKEOPTS="${MAKEOPTS}sqlite,"
-	use curl     && MAKEOPTS="${MAKEOPTS}osm,"
-	MAKEOPTS="${MAKEOPTS}shape,raster"
+	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  || MAKEOPTS="${MAKEOPTS} CAIRO=false"
-	use python || MAKEOPTS="${MAKEOPTS} BINDINGS=none"
-	use debug  && MAKEOPTS="${MAKEOPTS} DEBUG=yes"
+	use cairo  || EMAKEOPTS="${EMAKEOPTS} CAIRO=false"
+	use python || EMAKEOPTS="${EMAKEOPTS} BINDINGS=none"
+	use debug  && EMAKEOPTS="${EMAKEOPTS} DEBUG=yes"
 
-	use postgres && use sqlite && MAKEOPTS="${MAKEOPTS} PGSQL2SQLITE=yes"
+	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-/}")"
@@ -86,19 +85,27 @@ src_configure() {
 	# 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 \
+	# 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() {
-	scons BOOST_INCLUDES=${BOOST_INC} BOOST_LIBS=${BOOST_LIB} \
-		BOOST_VERSION=${BOOST_VERSION} || die "scons make failed"
+	# note passing CXXFLAGS to scons does *not* work
+	scons CC="$(tc-getCC)" CXX="$(tc-getCXX)" \
+		shared=1 || die "scons make failed"
+
 	if use doc; then
 		export PYTHONPATH="${S}/bindings/python:$(python_get_sitedir)"
 		cd docs/epydoc_config
@@ -108,8 +115,7 @@ src_compile() {
 }
 
 src_install() {
-	scons BOOST_INCLUDES=${BOOST_INC} BOOST_LIBS=${BOOST_LIB} \
-		BOOST_VERSION=${BOOST_VERSION} install || die "scons install failed"
+	scons DESTDIR="${D}" install || die "scons install failed"
 
 	if use python ; then
 	    fperms 0755 "$(python_get_sitedir)"/mapnik/paths.py