Updated ebuild for more recent version (closes bug #97208)

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26.5 x86_64

5 files changed, 145 insertions, 14 deletions

diff --git a/app-misc/gpsdrive/ChangeLog b/app-misc/gpsdrive/ChangeLog
index 83579da4b65d..eb75aa8d9fc3 100644
--- a/app-misc/gpsdrive/ChangeLog
+++ b/app-misc/gpsdrive/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-misc/gpsdrive
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gpsdrive/ChangeLog,v 1.27 2008/07/31 16:16:33 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gpsdrive/ChangeLog,v 1.28 2008/09/27 03:46:55 nerdboy Exp $
+
+*gpsdrive-2.10_pre5 (26 Sep 2008)
+
+  26 Sep 2008; Steve Arnold <nerdboy@gentoo.org>
+  +files/gpsdrive-drawmarkers-remove.patch, +gpsdrive-2.10_pre5.ebuild:
+  Updated ebuild for more recent version (closes bug #97208) with new mapnik
+  support (also closes bug #94334).
 
   31 Jul 2008; Ulrich Mueller <ulm@gentoo.org> metadata.xml:
   Add USE flag description to metadata wrt GLEP 56.
diff --git a/app-misc/gpsdrive/Manifest b/app-misc/gpsdrive/Manifest
index 8d3c9c4164da..81d42704a64a 100644
--- a/app-misc/gpsdrive/Manifest
+++ b/app-misc/gpsdrive/Manifest
@@ -1,15 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX gpsdrive-2.09-configure.patch 980 RMD160 4b50d59e4c8e3cd1c481804c54b5b44316152d2e SHA1 2d9597784633e2d4e626544bbc86aee030df6223 SHA256 10f4d1615ff5abefcc4afedf5978657ea9876d36869303984f00cf9c84a8a114
+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.10pre5.tar.gz 4081884 RMD160 90675c178ce2a38acff10d690151e05dedd34082 SHA1 93b96e6db25f04a82b598d8fec57a21c1f4db255 SHA256 c5d470f84c6040d22b75b85d219c86d0c2e194d67523b062b4a5960a746f56c0
 EBUILD gpsdrive-2.09-r1.ebuild 1367 RMD160 9c293e9e696282fd3d6567dfe3cf19af8c6b327e SHA1 5a06e2ba85ce799645800fa7e1966267f8691453 SHA256 7f398d4b07099305b8eb018fd195cf5d5beb5ce6bb75ed67a811a15d335e14cb
-MISC ChangeLog 4102 RMD160 70b528b366fde3a16fc7778af201de035c599c68 SHA1 abcf9221dd32586d896ae3c31b335a3252be0f63 SHA256 5729ada82403bd8e300a7f4df03fbae5746b12d25c580477c4a52367cadeb4e9
-MISC metadata.xml 339 RMD160 371d57f46179cad9365901442568d7eb9ebf14af SHA1 3104f451e685301a606d42406e3c17a39a8fb21e SHA256 e78e9aa774449c7756b9eceb0e79f50177b77a1e43477b9d6d219154f9dd2bdd
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (GNU/Linux)
-
-iEYEARECAAYFAkiR5W8ACgkQOeoy/oIi7uy7ggCg54sUkI+3X/IGoKaRtoVbqRen
-mMAAnAqvtqG6nVQSrN4nWGfMaq3cmBFN
-=1IGV
------END PGP SIGNATURE-----
+EBUILD gpsdrive-2.10_pre5.ebuild 3006 RMD160 33daadcb7d8815a2cbeabdfd7ed9c3f4c3f0c50f SHA1 a353ba6e8904ded8b3701f028325d1b2b0c27723 SHA256 f514f2bc7da7f76628417fd0d36c8dd728e734dcb03183bf89f77cd1b281dd80
+MISC ChangeLog 4376 RMD160 acd684c8d24ddf5d74b572562b7711d591329b21 SHA1 b16b2163063c54c920d6ef2f4edbe13f47e8cbc4 SHA256 c6619a59893c1c34d5a4c70a5d4afe35117a37fa9db3ab4e9fe47ac1c835e6a3
+MISC metadata.xml 594 RMD160 adf73837387f331cb443f12b19340452ef44628e SHA1 33a26e1a991d2bf34858e1f03cb96d4e6854568d SHA256 7f3006dfd1d7be92091f3466b23078842776c6d3144ad18f686460dbe805bb9c
diff --git a/app-misc/gpsdrive/files/gpsdrive-drawmarkers-remove.patch b/app-misc/gpsdrive/files/gpsdrive-drawmarkers-remove.patch
new file mode 100644
index 000000000000..c831a36b4bc0
--- /dev/null
+++ b/app-misc/gpsdrive/files/gpsdrive-drawmarkers-remove.patch
@@ -0,0 +1,26 @@
+--- src/util/CMakeLists.txt.orig	2008-09-21 20:15:48.379309613 -0700
++++ src/util/CMakeLists.txt	2008-09-21 20:17:36.012310364 -0700
+@@ -25,13 +25,14 @@
+   install(TARGETS worldgen DESTINATION ${BIN_INSTALL_DIR})
+ endif (GDAL_FOUND)
+ 
+-if (GDAL_FOUND AND GTK2_FOUND)
+-  add_executable(gmapview ${gmapview_SRCS})
+-  target_link_libraries(gmapview
+-    ${MAP_LIBRARY}
+-    ${GDAL_LIBRARIES}
+-    ${GTK2_LIBRARIES}
+-  )
+-  install(TARGETS gmapview DESTINATION ${BIN_INSTALL_DIR})
+-endif (GDAL_FOUND AND GTK2_FOUND)
++## this bombs because there's no implementation of drawmarkers
++#if (GDAL_FOUND AND GTK2_FOUND)
++#  add_executable(gmapview ${gmapview_SRCS})
++#  target_link_libraries(gmapview
++#    ${MAP_LIBRARY}
++#    ${GDAL_LIBRARIES}
++#    ${GTK2_LIBRARIES}
++#  )
++#  install(TARGETS gmapview DESTINATION ${BIN_INSTALL_DIR})
++#endif (GDAL_FOUND AND GTK2_FOUND)
+ 
diff --git a/app-misc/gpsdrive/gpsdrive-2.10_pre5.ebuild b/app-misc/gpsdrive/gpsdrive-2.10_pre5.ebuild
new file mode 100644
index 000000000000..293ce489781f
--- /dev/null
+++ b/app-misc/gpsdrive/gpsdrive-2.10_pre5.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gpsdrive/gpsdrive-2.10_pre5.ebuild,v 1.1 2008/09/27 03:46:55 nerdboy Exp $
+
+inherit cmake-utils eutils fdo-mime
+
+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 doc gdal mapnik scripts"
+
+COMMON_DEP=">=x11-libs/gtk+-2.8.12
+	>=media-libs/libart_lgpl-2.3.17
+	>=media-libs/fontconfig-2.2.3
+	>=x11-libs/libXcursor-1.1.2
+	>=dev-libs/atk-1.10.3
+	>=dev-libs/libpcre-4.2
+	>=dev-libs/boost-1.33.1
+	>=gnome-extra/libgda-3.0.1
+	>=x11-libs/pango-1.10.1
+	>=dev-libs/glib-2.8.5
+	>=x11-libs/cairo-1.0.2
+	dbus? ( sys-apps/dbus )
+	mapnik? ( >=sci-geosciences/mapnik-0.5 )
+	gdal? ( sci-libs/gdal )"
+
+DEPEND="${COMMON_DEP}
+	>=dev-util/cmake-2.4.4
+	sys-devel/gettext
+	dev-util/pkgconfig"
+
+RDEPEND="${COMMON_DEP}
+	dev-perl/libwww-perl
+	dev-perl/DBI
+	sci-geosciences/gpsd
+	media-fonts/dejavu"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	# The utils won't build without some extra functions that
+	# aren't implemented yet AFAICT; temporarily disabled.
+	epatch "${FILESDIR}"/${PN}-drawmarkers-remove.patch
+	# Update mapnik font path...
+	use mapnik && sed -i -e "s:truetype/ttf-dejavu:dejavu:g" \
+	    tests/{gpsdriverc,gpsdriverc-in,gpsdriverc-pre} \
+	    src/gpsdrive_config.c || die "sed failed"
+	# Fix desktop file...
+	sed -i -e "s:gpsicon:/usr/share/gpsdrive/pixmaps/gpsicon.png:g" \
+	    -e "s:Graphics;Network;Geography:Application;Geography;GPS:g" \
+	    data/gpsdrive.desktop || die "sed failed"
+}
+
+src_compile() {
+	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 gdal GDAL)"
+	MAKEOPTS="-j1" cmake-utils_src_compile
+}
+
+src_install() {
+	cmake-utils_src_install
+	dodoc AUTHORS Changelog NEWS README
+	newdoc data/mysql/my.cnf my.cnf.example
+	use mapnik && dodoc Documentation/install-mapnik-osm.txt
+	use doc && dodoc \
+	    Documentation/{FAQ.gpsdrive,CREDITS,GPS-receivers,LEEME,NMEA.txt,TODO,README*}
+}
+
+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. The MySQL"
+	elog "config is installed as an example, but using it with"
+	elog "gpsdrive is up to you.  Additional scripts are still"
+	elog "shipped in the source package."
+	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 sometimes handy for downloading maps for another"
+	elog "location)."
+	elog
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
+
diff --git a/app-misc/gpsdrive/metadata.xml b/app-misc/gpsdrive/metadata.xml
index dd8cfa3701fc..a603871aa73c 100644
--- a/app-misc/gpsdrive/metadata.xml
+++ b/app-misc/gpsdrive/metadata.xml
@@ -7,6 +7,10 @@
   <name>Steve Arnold</name>
 </maintainer>
 <use>
-  <flag name='garmin'>Adds specific support for Garmin GPS receivers</flag>
+  <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='mapnik'>Include mapnik support for custom map creation.</flag>
+  <flag name='scripts'>Include some of the additional helper scripts.</flag>
 </use>
 </pkgmetadata>