Updated to new version for new gpsd, mapnik, and boost support.

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

4 files changed, 161 insertions, 2 deletions

diff --git a/app-misc/gpsdrive/ChangeLog b/app-misc/gpsdrive/ChangeLog
index 6be05115e23c..66f4122eedd8 100644
--- a/app-misc/gpsdrive/ChangeLog
+++ b/app-misc/gpsdrive/ChangeLog
@@ -1,6 +1,13 @@
 # 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.39 2010/04/09 12:14:23 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gpsdrive/ChangeLog,v 1.40 2010/10/18 09:09:30 nerdboy Exp $
+
+*gpsdrive-2.11 (18 Oct 2010)
+
+  18 Oct 2010; Steve Arnold <nerdboy@gentoo.org> +gpsdrive-2.11.ebuild,
+  +files/gpsdrive-2.11_DefineOptions_gpsd.patch:
+  Updated to new version for new gpsd and boost support.  Tested with 
+  boost-1.42, gpsd-2.95, and mapnik-0.7.1 (and USB/PL2303 gps device).
 
   09 Apr 2010; Tupone Alfredo <tupone@gentoo.org>
   gpsdrive-2.10_pre7-r1.ebuild:
diff --git a/app-misc/gpsdrive/Manifest b/app-misc/gpsdrive/Manifest
index 77e421034d1a..7b50d7866d9e 100644
--- a/app-misc/gpsdrive/Manifest
+++ b/app-misc/gpsdrive/Manifest
@@ -1,8 +1,11 @@
 AUX gpsdrive-2.09-configure.patch 980 RMD160 4b50d59e4c8e3cd1c481804c54b5b44316152d2e SHA1 2d9597784633e2d4e626544bbc86aee030df6223 SHA256 10f4d1615ff5abefcc4afedf5978657ea9876d36869303984f00cf9c84a8a114
+AUX gpsdrive-2.11_DefineOptions_gpsd.patch 430 RMD160 d790fb0cb9faba0e4e8aa2201f7b494ea88ad78c SHA1 d9b81a0529259b2cb74d9da218242a7c64edf265 SHA256 4fc8e95d383eb9040e6301235226911c5aa4f735a715757aaf4ec900198f00d9
 AUX gpsdrive-drawmarkers-remove.patch 864 RMD160 ffdfdec8539c32aa32789d538c6d7c3522a179af SHA1 ed48d5e5a703a06e73db1b754aa5ea6cd834b09d SHA256 1c4f24f3a0ad2c9b0bcb4ce72caeee5e569036b61f16053e518c8b6bf4bd3b29
 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
+DIST gpsdrive-2.11.tar.gz 5709822 RMD160 c5821c65e319dd60126e4df6965ccdc5d0b74978 SHA1 5bdb85fbb538b3c678975c896b16afc368161367 SHA256 57bb96f1c037c6a28dc3834777a4ec73fb35c03115d85d465d13a1ec1b35ae56
 EBUILD gpsdrive-2.09-r1.ebuild 1367 RMD160 9c293e9e696282fd3d6567dfe3cf19af8c6b327e SHA1 5a06e2ba85ce799645800fa7e1966267f8691453 SHA256 7f398d4b07099305b8eb018fd195cf5d5beb5ce6bb75ed67a811a15d335e14cb
 EBUILD gpsdrive-2.10_pre7-r1.ebuild 4798 RMD160 9e9b64945e5d6ea10608231c39395d46f2011429 SHA1 9d8635bec7e44456faf52f9c9303c7720e570065 SHA256 bbd6333899d67fe7a2e709d082290203ca97b531b0e4b41d91cd0ab735a60fb8
-MISC ChangeLog 6441 RMD160 19e2777bcf3ce14e3d18aec73bf9908018b6ca6e SHA1 96cc3b85abf5b9308521d7febee79dec204f0f59 SHA256 024f5dbe179263337aad3ff125e4b41f736d8e184ab07ea9302a2c33d0279793
+EBUILD gpsdrive-2.11.ebuild 4190 RMD160 b3eecb18817aa61b8af4a2cd041cd80a96039f36 SHA1 05d73d34243b97d7ab40f9492707d3a0f0cb1b37 SHA256 3ed81af25d6b0d38e7b9f17a02c7620f0365cbb7194a262028ad84201dfe0865
+MISC ChangeLog 6736 RMD160 c97c282f6ab1112f8580ed25483412a694890ab2 SHA1 bd44aa0120bc2d4c8b35a721d793f1ab40e5046d SHA256 df7f7c70b77e3ff2e0e6b64f660a127f25c35cd5053828fe05f6f286e5b9c6a4
 MISC metadata.xml 717 RMD160 428573be266eba45ec290ab9c69e6d050e638680 SHA1 63fda2b908d00aaa88684ea0d926b9d6ec87ce29 SHA256 13df384defa61d67cc52ebd0a9b6515ca48eb70d9e48812bd57f593a222cb45f
diff --git a/app-misc/gpsdrive/files/gpsdrive-2.11_DefineOptions_gpsd.patch b/app-misc/gpsdrive/files/gpsdrive-2.11_DefineOptions_gpsd.patch
new file mode 100644
index 000000000000..e5da5c0ac53b
--- /dev/null
+++ b/app-misc/gpsdrive/files/gpsdrive-2.11_DefineOptions_gpsd.patch
@@ -0,0 +1,9 @@
+--- DefineOptions.cmake_orig	2010-06-24 21:53:32.000000000 +0200
++++ DefineOptions.cmake	2010-10-10 18:23:33.000000000 +0200
+@@ -10,5 +10,5 @@
+ option(WITH_KISMET "Build with kismet support" ON)
+ option(DEBUG "Build with debug -D support" ON)
+ option(WITH_NAVIGATION "Build with routing support" OFF)
+-option(LIBGPS_OLD "Build with old libgps version (<2.90)" ON)
++option(LIBGPS_OLD "Build with old libgps version (<2.90)" OFF)
+ 
diff --git a/app-misc/gpsdrive/gpsdrive-2.11.ebuild b/app-misc/gpsdrive/gpsdrive-2.11.ebuild
new file mode 100644
index 000000000000..f94477111c62
--- /dev/null
+++ b/app-misc/gpsdrive/gpsdrive-2.11.ebuild
@@ -0,0 +1,140 @@
+# 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.11.ebuild,v 1.1 2010/10/18 09:09:30 nerdboy Exp $
+
+EAPI=2
+
+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/"
+SRC_URI="${HOMEPAGE}/packages/${P/_/}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+S=${WORKDIR}/${P/_/}
+
+KEYWORDS="~amd64 ~ppc ~x86"
+# submit bug for ppc64
+
+IUSE="dbus -debug -kismet libgda gdal mapnik scripts -speech"
+
+COMMON_DEP=">=sci-geosciences/gpsd-2.94
+	net-misc/curl
+	dev-libs/libxml2
+	dev-db/sqlite:3
+	x11-libs/gtk+:2
+	dbus? ( dev-libs/dbus-glib )
+	gdal? ( sci-libs/gdal )
+	kismet? ( net-wireless/kismet )
+	mapnik? ( >=sci-geosciences/mapnik-0.7.0 )
+	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}
+	sci-geosciences/openstreetmap-icons
+	sci-geosciences/mapnik-world-boundaries
+	media-fonts/dejavu"
+
+src_prepare() {
+	# Get rid of the package's FindBoost.
+	rm "${S}"/cmake/Modules/FindBoost.cmake
+
+	# Update mapnik font path...
+	sed -i \
+		-e "s:truetype/ttf-dejavu:dejavu:g" \
+		-e "s:mapnik/0.5:mapnik:g" \
+		tests/gpsdriverc-in \
+		src/gpsdrive_config.c || die "sed failed"
+
+	# update OSM icon paths
+	sed -i \
+		-e "s|icons/map-icons|osm|g" \
+		cmake/Modules/DefineInstallationPaths.cmake \
+		scripts/osm/perl_lib/Geo/Gpsdrive/DB_Defaults.pm \
+		scripts/osm/perl_lib/Geo/Gpsdrive/OSM.pm \
+		src/icons.c \
+		|| die "sed failed"
+
+	# Fix desktop file...
+	sed -i -e "s:gpsicon:/usr/share/icons/gpsdrive.png:g" \
+		-e "s:Graphics;Network;Geography:Education;Science;Geography;GPS:g" \
+		data/gpsdrive.desktop || die "sed failed"
+
+	epatch "${FILESDIR}"/gpsdrive-2.11_DefineOptions_gpsd.patch
+}
+
+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 kismet KISMET)
+		$(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_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	dodoc AUTHORS ChangeLog README \
+		Documentation/{CREDITS.i18n,FAQ.gpsdrive,FAQ.gpsdrive.fr,LEEME} \
+		Documentation/{LISEZMOI,NMEA.txt,LISEZMOI.kismet,TODO} \
+		Documentation/README.{Bluetooth,lib_map,nasamaps,tracks,kismet}
+	if use mapnik ; then
+		dodoc Documentation/install-mapnik-osm.txt
+	else
+		rm -f "${D}"usr/bin/gpsdrive_mapnik_gentiles.py
+		rm -f "${D}"usr/share/gpsdrive/osm-template.xml
+	fi
+	if use scripts ; then
+		dodoc Documentation/README.gpspoint2gspdrive
+		if ! use gdal ; then
+			rm -f "${D}"usr/bin/{gdal_slice,nasaconv}.sh
+		fi
+	else
+		rm -f "${D}"usr/share/man/man1/gpsd_nmea.sh.1
+	fi
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	elog
+	elog "Be sure to see the README files in /usr/share/doc/${PF}"
+	elog "for information on using Kismet with gpsdrive."
+	elog
+	if use mapnik ; then
+		elog "Using mapnik to render online maps requires you to load"
+		elog "data into the postgis database. Follow the instructions"
+		elog "on http://wiki.openstreetmap.org/index.php/Mapnik"
+	fi
+	elog
+	elog "This version also now depends on the gpsd package, and"
+	elog "specific devices are supported there.  Start gpsd first,"
+	elog "otherwise gpsdrive will only run in simulation mode (which"
+	elog "is handy for downloading maps for another location, but"
+	elog "not much else)."
+	elog
+	elog "openstreetmap-icons now installs to a more appropriate"
+	elog "location, so if you have trouble starting gpsdrive, you"
+	elog "should probably update your ~/.gpsdrive/gpsdriverc file"
+	elog "and change the path to the geoinfofile to reflect this:"
+	elog "   geoinfofile = /usr/share/osm/geoinfo.db"
+	elog
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}