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

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

4 files changed, 54 insertions, 14 deletions

diff --git a/app-misc/gpsdrive/ChangeLog b/app-misc/gpsdrive/ChangeLog
index fc63c902766a..2af06d033fa1 100644
--- a/app-misc/gpsdrive/ChangeLog
+++ b/app-misc/gpsdrive/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-misc/gpsdrive
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gpsdrive/ChangeLog,v 1.36 2010/02/13 05:38:42 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gpsdrive/ChangeLog,v 1.37 2010/03/29 04:26:23 nerdboy Exp $
+
+*gpsdrive-2.10_pre7-r1 (29 Mar 2010)
+
+  29 Mar 2010; Steve Arnold <nerdboy@gentoo.org> -gpsdrive-2.10_pre7.ebuild,
+  +gpsdrive-2.10_pre7-r1.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 (other half of fix
+  is the 0.6.1-r3 rev of mapnik).
 
   13 Feb 2010; Steve Arnold <nerdboy@gentoo.org> gpsdrive-2.10_pre7.ebuild:
   Fixed OSM icon path (bug #304045) and libgda dep (bug #281705).  The boost
diff --git a/app-misc/gpsdrive/Manifest b/app-misc/gpsdrive/Manifest
index 0e40ad15c8ad..19c63df0cd46 100644
--- a/app-misc/gpsdrive/Manifest
+++ b/app-misc/gpsdrive/Manifest
@@ -3,6 +3,6 @@ AUX gpsdrive-drawmarkers-remove.patch 864 RMD160 ffdfdec8539c32aa32789d538c6d7c3
 DIST gpsdrive-2.09.tar.gz 1745509 RMD160 772dd76e7656a69e59a23f06a0d2fcb08607153a SHA1 cbf3db19b3b3fb496a1255ef67d7de5bdeffd70c SHA256 fe8ef35c86df9ab7c8dfb1a8b8155fbeeacd8693ae867f0f10f79f14b7dc6f98
 DIST gpsdrive-2.10pre7.tar.gz 3905031 RMD160 38c4b62f4ebcd5732a36475be934b6542a32dbfd SHA1 f8cfddfffa74378cb4a06a3014ae893ac90c3fd6 SHA256 aa85a4feb9ca0dbc9454a6c96f7c6f758a97f84aa8931904cdd9b6dea1f6d782
 EBUILD gpsdrive-2.09-r1.ebuild 1367 RMD160 9c293e9e696282fd3d6567dfe3cf19af8c6b327e SHA1 5a06e2ba85ce799645800fa7e1966267f8691453 SHA256 7f398d4b07099305b8eb018fd195cf5d5beb5ce6bb75ed67a811a15d335e14cb
-EBUILD gpsdrive-2.10_pre7.ebuild 3783 RMD160 75c0759778b2cfe86d7dbebbebb61ea0771796c3 SHA1 f2da212f4d1474de4d17c15567070ae9d9283dd9 SHA256 2433f81ac9fb04a5584afd51716b59a804db4f8306db80797ea5d7516d90e933
-MISC ChangeLog 5750 RMD160 562b127c5822d3bf340e71516db864dda9b83e25 SHA1 35751321a2718a5b8364fd0954d49ea7ccd849a0 SHA256 f97319736cd3be37b802e3275e3c5ef7ff5107fc405a88d64bd2bd929723094a
-MISC metadata.xml 647 RMD160 52634e7856479959de5f16368c91db76ca963331 SHA1 f4ea96961e7586e3445880e6e2344ec94f6ec242 SHA256 77143dded7900bc7bdc93721f4872d3b661c765879edaacf0361950055b995e0
+EBUILD gpsdrive-2.10_pre7-r1.ebuild 4910 RMD160 aed84bef78caa8eb0e61619af325714b77901a68 SHA1 32fb310e711513f174185ae20b804c4b73d30cb5 SHA256 fc8d0cd9727e99608a9b979f43d7511a103189e7420b7917dccd53766b81d156
+MISC ChangeLog 6158 RMD160 1db370bb863ab7de1d07f62f7bcbafa127aadeee SHA1 e6375971fc364c53c74f949fe0f49d091100e78b SHA256 72f6535d374fa4227a31334a03c1bfc94b6cc2d06288cbe47d45df2c76dab72f
+MISC metadata.xml 717 RMD160 428573be266eba45ec290ab9c69e6d050e638680 SHA1 63fda2b908d00aaa88684ea0d926b9d6ec87ce29 SHA256 13df384defa61d67cc52ebd0a9b6515ca48eb70d9e48812bd57f593a222cb45f
diff --git a/app-misc/gpsdrive/gpsdrive-2.10_pre7.ebuild b/app-misc/gpsdrive/gpsdrive-2.10_pre7-r1.ebuild
index 3e621e7a8a5c..73766ccec6de 100644
--- a/app-misc/gpsdrive/gpsdrive-2.10_pre7.ebuild
+++ b/app-misc/gpsdrive/gpsdrive-2.10_pre7-r1.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/app-misc/gpsdrive/gpsdrive-2.10_pre7.ebuild,v 1.5 2010/02/13 05:38:42 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gpsdrive/gpsdrive-2.10_pre7-r1.ebuild,v 1.1 2010/03/29 04:26:23 nerdboy Exp $
 
 EAPI=2
 
-inherit cmake-utils eutils fdo-mime
+inherit cmake-utils eutils fdo-mime versionator
 
 DESCRIPTION="GPS navigation system with NMEA and Garmin support, zoomable map display, waypoints, etc."
 HOMEPAGE="http://www.gpsdrive.de/"
@@ -18,7 +18,7 @@ S=${WORKDIR}/${P/_/}
 KEYWORDS="~amd64 ~ppc ~x86"
 # submit bug for ppc64
 
-IUSE="dbus debug libgda gdal mapnik scripts speech"
+IUSE="dbus -debug -kismet libgda gdal mapnik scripts -speech"
 
 COMMON_DEP="sci-geosciences/gpsd
 	net-misc/curl
@@ -27,11 +27,15 @@ COMMON_DEP="sci-geosciences/gpsd
 	x11-libs/gtk+:2
 	dbus? ( dev-libs/dbus-glib )
 	gdal? ( sci-libs/gdal )
-	mapnik? ( sci-geosciences/mapnik )
+	kismet? ( net-wireless/kismet )
+	mapnik? ( >=sci-geosciences/mapnik-0.6.1
+		=dev-libs/boost-1.39*
+		>=app-admin/eselect-boost-0.3 )
 	libgda? ( =gnome-extra/libgda-3.0*[postgres] )
 	speech? ( >=app-accessibility/speech-dispatcher-0.6.7 )"
 
 DEPEND="${COMMON_DEP}
+	>=dev-util/cmake-2.8.0
 	dev-util/pkgconfig"
 
 RDEPEND="${COMMON_DEP}
@@ -39,7 +43,22 @@ RDEPEND="${COMMON_DEP}
 	sci-geosciences/mapnik-world-boundaries
 	media-fonts/dejavu"
 
+pkg_setup() {
+	BOOST_PKG="$(best_version "<dev-libs/boost-1.40.0")"
+	BOOST_VER="$(get_version_component_range 1-2 "${BOOST_PKG/*boost-/}")"
+	export Boost_LIB_VERSION="$(replace_all_version_separators _ "${BOOST_VER}")"
+	elog "${P} Boost_LIB_VERSION is ${Boost_LIB_VERSION}"
+	export BOOST_INCLUDEDIR="/usr/include/boost-${Boost_LIB_VERSION}"
+	elog "${P} BOOST_INCLUDEDIR is ${BOOST_INCLUDEDIR}"
+	BOOST_LIBDIR_SCHEMA="$(get_libdir)/boost-${Boost_LIB_VERSION}"
+	export BOOST_LIBRARYDIR="/usr/${BOOST_LIBDIR_SCHEMA}"
+	elog "${P} BOOST_LIBRARYDIR is ${BOOST_LIBRARYDIR}"
+}
+
 src_prepare() {
+	# Get rid of the package's FindBoost (see bug #).
+	rm "${S}"/cmake/Modules/FindBoost.cmake
+
 	# Update mapnik font path...
 	sed -i \
 		-e "s:truetype/ttf-dejavu:dejavu:g" \
@@ -63,13 +82,20 @@ src_prepare() {
 }
 
 src_configure() {
+	cat >> cmake/Modules/DefineProjectDefaults.cmake <<- _EOF_
+		
+		# set policy for new linker paths
+		cmake_policy(SET CMP0003 NEW) # or cmake_policy(VERSION 2.6)
+	_EOF_
+
 	local mycmakeargs="${mycmakeargs}
-		$(cmake-utils_use_with scripts SCRIPTS)
-		$(cmake-utils_use_with mapnik MAPNIK)
-		$(cmake-utils_use_with dbus DBUS)
-		$(cmake-utils_use_with libgda GDA3)
-		$(cmake-utils_use_with speech SPEECH)
-		$(cmake-utils_use_with gdal GDAL)"
+		$(cmake-utils_use_no scripts SCRIPTS)
+		$(cmake-utils_use_no mapnik MAPNIK)
+		$(cmake-utils_use_no kismet KISMET)
+		$(cmake-utils_use_no dbus DBUS)
+		$(cmake-utils_use_no libgda GDA3)
+		$(cmake-utils_use_no speech SPEECH)
+		$(cmake-utils_use_no gdal GDAL)"
 	cmake-utils_src_configure
 }
 
@@ -96,6 +122,10 @@ src_install() {
 }
 
 pkg_postinst() {
+	elog
+	elog "Setting boost config back to latest..."
+	eselect boost update \
+		    || ewarn "eselect boost update failed."
 	fdo-mime_desktop_database_update
 	elog
 	elog "Be sure to see the README files in /usr/share/doc/${PF}"
diff --git a/app-misc/gpsdrive/metadata.xml b/app-misc/gpsdrive/metadata.xml
index 03941958e45e..6f62403f283b 100644
--- a/app-misc/gpsdrive/metadata.xml
+++ b/app-misc/gpsdrive/metadata.xml
@@ -10,6 +10,7 @@
   <flag name='garmin'>Adds specific support for Garmin GPS receivers (pre-2.10 
     only)</flag>
   <flag name='gdal'>Include gdal and ogr support for format conversions.</flag>
+  <flag name='kismet'>Include support for kismet wifi mapping.</flag>
   <flag name='mapnik'>Include mapnik support for custom map creation.</flag>
   <flag name='scripts'>Include some of the additional helper scripts.</flag>
   <flag name='speech'>Include speech support.</flag>