Fix building with gpsd-2.96. Fixes bug #369005

Package-Manager: portage-2.2.0_alpha38/cvs/Linux x86_64

7 files changed, 88 insertions, 274 deletions

diff --git a/app-misc/gpsdrive/ChangeLog b/app-misc/gpsdrive/ChangeLog
index cd4829241195..3aecf4a83ecb 100644
--- a/app-misc/gpsdrive/ChangeLog
+++ b/app-misc/gpsdrive/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/gpsdrive
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gpsdrive/ChangeLog,v 1.45 2011/03/30 11:08:48 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gpsdrive/ChangeLog,v 1.46 2011/06/17 09:22:22 scarabeus Exp $
+
+  17 Jun 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  -gpsdrive-2.09-r1.ebuild, -files/gpsdrive-2.09-configure.patch,
+  -gpsdrive-2.10_pre7-r1.ebuild, gpsdrive-2.11-r1.ebuild,
+  +files/gpsdrive-2.11-gpsd-2.96.patch:
+  Fix building with gpsd-2.96. Fixes bug #369005
 
   30 Mar 2011; Christoph Mende <angelos@gentoo.org> gpsdrive-2.09-r1.ebuild:
   Fix gtk+ slot deps
diff --git a/app-misc/gpsdrive/Manifest b/app-misc/gpsdrive/Manifest
index 7fc2ab25d891..6019b7f23ea4 100644
--- a/app-misc/gpsdrive/Manifest
+++ b/app-misc/gpsdrive/Manifest
@@ -1,21 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
-AUX gpsdrive-2.09-configure.patch 980 RMD160 4b50d59e4c8e3cd1c481804c54b5b44316152d2e SHA1 2d9597784633e2d4e626544bbc86aee030df6223 SHA256 10f4d1615ff5abefcc4afedf5978657ea9876d36869303984f00cf9c84a8a114
 AUX gpsdrive-2.11-add-gdk-pixbuf2.patch 1420 RMD160 4a39c4b3bac467b4750f24509c5191422168c27a SHA1 f2634985a24267918dd7903146618ffdb60ecd48 SHA256 b5fe834f172052765e20e232d9b37e44694f833e808a3493873201d274dc5b80
+AUX gpsdrive-2.11-gpsd-2.96.patch 1317 RMD160 96a0acbe6989ff3396cea7db260f1e2085cd62b4 SHA1 125542297378aee9c565ba722d33323444c590e7 SHA256 436eeb21a309c986dc35ea5e3ea23c349e92b104c41ffa69005dd3b5ff69df31
 AUX gpsdrive-2.11_DefineOptions_gpsd.patch 430 RMD160 d790fb0cb9faba0e4e8aa2201f7b494ea88ad78c SHA1 d9b81a0529259b2cb74d9da218242a7c64edf265 SHA256 4fc8e95d383eb9040e6301235226911c5aa4f735a715757aaf4ec900198f00d9
-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 1379 RMD160 be524488608b09db11af830514a517380b253fd5 SHA1 db11b8ed9b723e486d11d5bfd125447fd0299723 SHA256 5aa014becfc0b663b09a17531fec2d30e5dccb5b5a8a18d4cbbce3e49e098995
-EBUILD gpsdrive-2.10_pre7-r1.ebuild 4804 RMD160 21ec86d25243f0f70363d3ce5f48eba8c99521ca SHA1 b7a9df2401758d791df743b8fd19fa1fa2f6345e SHA256 762d9b556cb32e7a77577b9f081b551e6f5c09dec02e863d77b0c1ff686cbcd2
-EBUILD gpsdrive-2.11-r1.ebuild 4337 RMD160 92fa079284543df6fffc37c765f0cd93103fff3c SHA1 3befd6c491bbf5df2e574e4bc4e1269f09e351da SHA256 e7d218fb6095b2c8aa7bafbb8eb2a9154b1d48478369835bf0f1af3d1e8dfc43
-MISC ChangeLog 7484 RMD160 9e9f3949fea697475b6061fb7821d8caf25f49a8 SHA1 29d44e0e87af5dbf7d252ea6e42953f07db9c660 SHA256 3ba41448e7a079d816dbf11b9387f1d904ee64f0d341ee3a4c967d04ef6838dc
+EBUILD gpsdrive-2.11-r1.ebuild 4312 RMD160 56f8931dc4dfb36736e8841d650685771161204f SHA1 79c753b7a8d63836dd298dfc038b7377f36f3dc5 SHA256 42ef49056bac5c76fa3ac6c8b333fa5bd7f3c75920b858fee881eef9cd451b1f
+MISC ChangeLog 7755 RMD160 86bd053c08ab56efd0cdb526831d30499f6d010e SHA1 98f80fadeaa1c48bc512762c44a6b22008e18e77 SHA256 b3a3510bbf56a5c7f0481068112ca0bfef0cedf6f75d9010aaba6b3fd79dddcd
 MISC metadata.xml 717 RMD160 428573be266eba45ec290ab9c69e6d050e638680 SHA1 63fda2b908d00aaa88684ea0d926b9d6ec87ce29 SHA256 13df384defa61d67cc52ebd0a9b6515ca48eb70d9e48812bd57f593a222cb45f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk2TD0UACgkQmWq1bYTyC0M06QEAuNMuyOuu7MCp4ieYaNdl9Nby
-k+CLpUe3s36MHLUk7+wBALdG2a8XrxJBLfdNYJ/qzy+CjOo7Ku2Bz9xF1Y4WklRN
-=kO8u
+iEYEARECAAYFAk37HNQACgkQHB6c3gNBRYfmIQCcD8ZduE9dFQvLTpACHluJUMXc
+ERUAnjNoyOqTIvgZCXe4vjEu4XSgvqVm
+=7eo6
 -----END PGP SIGNATURE-----
diff --git a/app-misc/gpsdrive/files/gpsdrive-2.09-configure.patch b/app-misc/gpsdrive/files/gpsdrive-2.09-configure.patch
deleted file mode 100644
index d39455873f28..000000000000
--- a/app-misc/gpsdrive/files/gpsdrive-2.09-configure.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -Naur gpsdrive-2.09-orig/configure.ac gpsdrive-2.09/configure.ac
---- gpsdrive-2.09-orig/configure.ac	2006-10-16 16:00:44.000000000 -0600
-+++ gpsdrive-2.09/configure.ac	2006-10-16 16:01:35.000000000 -0600
-@@ -128,7 +128,7 @@
- 
- AC_PROG_INSTALL
- 
--CFLAGS="$CFLAGS -g -Wall -Wno-format-y2k -pipe $OPT_CFLAGS"
-+CFLAGS="$CFLAGS -fno-strict-aliasing -Wall -Wno-format-y2k -pipe $OPT_CFLAGS"
- 
- dnl ************************
- dnl Check for standard headers
-@@ -153,6 +153,14 @@
- 	CFLAGS="$CFLAGS `$PCRE_CONFIG --cflags`"
- fi
- 
-+dnl --------------------------
-+dnl Check for package libglib2.0-0
-+dnl 26/03/2006 DP  Added
-+dnl 06/06/2006 DP  Reduced from version 2.8.6 to 2.8.5
-+dnl --------------------------
-+dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
-+dnl MODULES  gmodule, gobject or gthread
-+AM_PATH_GLIB_2_0(2.8.5, , AC_ERROR(need libglib2.0 at least version 2.8.5))
- 
- localedir='${prefix}/share/locale'
- AC_SUBST(localedir)
diff --git a/app-misc/gpsdrive/files/gpsdrive-2.11-gpsd-2.96.patch b/app-misc/gpsdrive/files/gpsdrive-2.11-gpsd-2.96.patch
new file mode 100644
index 000000000000..bc6c7475f8a8
--- /dev/null
+++ b/app-misc/gpsdrive/files/gpsdrive-2.11-gpsd-2.96.patch
@@ -0,0 +1,44 @@
+diff -wbBur gpsdrive-2.11/src/gps_handler.c gpsdrive-2.11.my/src/gps_handler.c
+--- gpsdrive-2.11/src/gps_handler.c	2010-06-24 19:53:32.000000000 +0000
++++ gpsdrive-2.11.my/src/gps_handler.c	2011-04-18 13:21:33.000000000 +0000
+@@ -264,7 +264,8 @@
+ #define GPS_TIMER 500
+ 
+ static gint gps_timeout_source = 0;
+-static struct gps_data_t *gpsdata;
++static struct gps_data_t __gd;
++static struct gps_data_t *gpsdata = &__gd;
+ 
+ /* SYMBOLS USED IN LIBGPS:
+  * 
+@@ -410,9 +411,10 @@
+ 	 */
+ 	gps_query (gpsdata, "oys\n");
+ #else
+-	if (gps_waiting(gpsdata))
++	if (gps_waiting(gpsdata, 1000000))
+ 	{
+-		gps_poll (gpsdata);
++		gps_read (gpsdata);
++		gps_hook_cb(gpsdata, NULL);
+ 	}
+ #endif
+ 
+@@ -447,7 +449,7 @@
+ 	}
+ 
+ 	/* try to open connection */
+-	gpsdata =  gps_open (local_config.gpsd_server, local_config.gpsd_port);
++	gpsdata = gps_open (local_config.gpsd_server, local_config.gpsd_port, gpsdata) ? NULL : &__gd;
+ 	if (!gpsdata)
+ 	{
+ 		g_print ("Can't connect to gps daemon on %s:%s, disabling GPS support!\n",
+@@ -466,7 +468,7 @@
+ 	gps_sats = g_new (gps_satellite_struct, MAXCHANNELS);
+ 
+ 	/* set hook function to handle gps data */
+-	gps_set_raw_hook (gpsdata, (gpointer) gps_hook_cb);
++//	gps_set_raw_hook (gpsdata, (gpointer) gps_hook_cb);
+ 
+ #ifndef LIBGPS_OLD
+ 	/* enable watch mode to get data stream from gpsd */
diff --git a/app-misc/gpsdrive/gpsdrive-2.09-r1.ebuild b/app-misc/gpsdrive/gpsdrive-2.09-r1.ebuild
deleted file mode 100644
index 8457efe7e2c1..000000000000
--- a/app-misc/gpsdrive/gpsdrive-2.09-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gpsdrive/gpsdrive-2.09-r1.ebuild,v 1.4 2011/03/30 11:08:48 angelos Exp $
-
-WANT_AUTOMAKE=1.7
-WANT_AUTOCONF=2.5
-
-EAPI=1
-inherit autotools
-
-DESCRIPTION="GPS navigation system with NMEA and Garmin support, zoomable map display, waypoints, etc."
-HOMEPAGE="http://www.gpsdrive.de/"
-SRC_URI="${HOMEPAGE}/gpsdrive.tar/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="garmin mysql"
-
-RDEPEND=">=x11-libs/gtk+-2.8.12:2
-	>=dev-libs/libpcre-4.2
-	mysql? ( dev-db/mysql )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	sys-devel/gettext"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-configure.patch
-	sed -i -e "s:^EXTRA_DIST.*$::" Makefile.am \
-		-e "s:^pkgdata_DATA.*$::" Makefile.am
-
-	eautoreconf
-}
-
-src_compile() {
-	econf \
-	    --enable-shared --enable-static $(use_enable garmin) \
-		|| die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS create.sql CREDITS Changelog FAQ* GPS-receivers NMEA.txt \
-		README* TODO wp2sql
-}
-
-pkg_postinst() {
-	if use mysql; then
-		echo -e "\n"
-		elog "Be sure to see the README.SQL file in /usr/share/doc/${PF}"
-		elog "for information on using MySQL with gpsdrive.\n"
-	fi
-}
diff --git a/app-misc/gpsdrive/gpsdrive-2.10_pre7-r1.ebuild b/app-misc/gpsdrive/gpsdrive-2.10_pre7-r1.ebuild
deleted file mode 100644
index 46d589616b00..000000000000
--- a/app-misc/gpsdrive/gpsdrive-2.10_pre7-r1.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2011 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-r1.ebuild,v 1.5 2011/03/21 21:04:05 nirbheek 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
-	net-misc/curl
-	dev-libs/libxml2:2
-	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.6.1
-		=dev-libs/boost-1.39*
-		>=app-admin/eselect-boost-0.3 )
-	libgda? ( =gnome-extra/libgda-3.0*:3[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"
-
-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" \
-		-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"
-}
-
-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
-}
diff --git a/app-misc/gpsdrive/gpsdrive-2.11-r1.ebuild b/app-misc/gpsdrive/gpsdrive-2.11-r1.ebuild
index 9e0508b99310..7f05e7479747 100644
--- a/app-misc/gpsdrive/gpsdrive-2.11-r1.ebuild
+++ b/app-misc/gpsdrive/gpsdrive-2.11-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gpsdrive/gpsdrive-2.11-r1.ebuild,v 1.3 2011/03/21 21:04:05 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gpsdrive/gpsdrive-2.11-r1.ebuild,v 1.4 2011/06/17 09:22:22 scarabeus Exp $
 
-EAPI=2
+EAPI=4
 
 inherit cmake-utils eutils fdo-mime versionator
 
@@ -13,35 +13,39 @@ 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:2
+COMMON_DEP="
 	dev-db/sqlite:3
+	dev-libs/libxml2:2
+	net-misc/curl
+	>=sci-geosciences/gpsd-2.96
 	x11-libs/gtk+:2
 	x11-libs/gdk-pixbuf:2
 	dbus? ( dev-libs/dbus-glib )
 	gdal? ( sci-libs/gdal )
 	kismet? ( net-wireless/kismet )
-	mapnik? ( >=sci-geosciences/mapnik-0.7.0[postgres]
-		>=dev-db/postgis-1.5.2 )
 	libgda? ( =gnome-extra/libgda-3.0*:3[postgres] )
-	speech? ( >=app-accessibility/speech-dispatcher-0.6.7 )"
+	mapnik? (
+		>=sci-geosciences/mapnik-0.7.0[postgres]
+		>=dev-db/postgis-1.5.2
+	)
+	speech? ( >=app-accessibility/speech-dispatcher-0.6.7 )
+"
 
 DEPEND="${COMMON_DEP}
-	>=dev-util/cmake-2.8.0
-	dev-util/pkgconfig"
+	dev-util/pkgconfig
+"
 
 RDEPEND="${COMMON_DEP}
+	media-fonts/dejavu
 	sci-geosciences/openstreetmap-icons
 	sci-geosciences/mapnik-world-boundaries
-	media-fonts/dejavu"
+"
+
+S=${WORKDIR}/${P/_/}
 
 src_prepare() {
 	# Get rid of the package's FindBoost.
@@ -68,8 +72,10 @@ src_prepare() {
 		-e "s:Graphics;Network;Geography:Education;Science;Geography;GPS:g" \
 		data/gpsdrive.desktop || die "sed failed"
 
-	epatch "${FILESDIR}"/${P}_DefineOptions_gpsd.patch
-	epatch "${FILESDIR}"/${P}-add-gdk-pixbuf2.patch
+	epatch \
+		"${FILESDIR}"/${P}_DefineOptions_gpsd.patch \
+		"${FILESDIR}"/${P}-add-gdk-pixbuf2.patch \
+		"${FILESDIR}"/${P}-gpsd-2.96.patch
 }
 
 src_configure() {
@@ -77,9 +83,9 @@ src_configure() {
 
 		# set policy for new linker paths
 		cmake_policy(SET CMP0003 NEW) # or cmake_policy(VERSION 2.6)
-	_EOF_
+_EOF_
 
-	local mycmakeargs="${mycmakeargs}
+	local mycmakeargs=(
 		$(cmake-utils_use_with scripts SCRIPTS)
 		$(cmake-utils_use_with mapnik MAPNIK)
 		$(cmake-utils_use_with mapnik POSTGIS)
@@ -87,7 +93,8 @@ src_configure() {
 		$(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_with gdal GDAL)
+	)
 	cmake-utils_src_configure
 }
 
@@ -100,16 +107,14 @@ src_install() {
 	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
+		rm -f "${ED}"usr/bin/gpsdrive_mapnik_gentiles.py
+		rm -f "${ED}"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
+		use gdal || rm -f "${ED}"usr/bin/{gdal_slice,nasaconv}.sh
 	else
-		rm -f "${D}"usr/share/man/man1/gpsd_nmea.sh.1
+		rm -f "${ED}"usr/share/man/man1/gpsd_nmea.sh.1
 	fi
 }