public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in app-misc/gpsdrive: ChangeLog gpsdrive-2.11-r3.ebuild gpsdrive-2.11-r2.ebuild
@ 2011-07-17 22:35 Tomas Chvatal (scarabeus)
  0 siblings, 0 replies; only message in thread
From: Tomas Chvatal (scarabeus) @ 2011-07-17 22:35 UTC (permalink / raw
  To: gentoo-commits

scarabeus    11/07/17 22:35:27

  Modified:             ChangeLog
  Added:                gpsdrive-2.11-r3.ebuild
  Removed:              gpsdrive-2.11-r2.ebuild
  Log:
  Revision bump to fix locating osm-icons. Should fix bug #375049.
  
  (Portage version: 2.2.0_alpha45/cvs/Linux x86_64)

Revision  Changes    Path
1.48                 app-misc/gpsdrive/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/gpsdrive/ChangeLog?rev=1.48&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/gpsdrive/ChangeLog?rev=1.48&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/gpsdrive/ChangeLog?r1=1.47&r2=1.48

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-misc/gpsdrive/ChangeLog,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- ChangeLog	14 Jul 2011 17:25:04 -0000	1.47
+++ ChangeLog	17 Jul 2011 22:35:26 -0000	1.48
@@ -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.47 2011/07/14 17:25:04 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gpsdrive/ChangeLog,v 1.48 2011/07/17 22:35:26 scarabeus Exp $
+
+*gpsdrive-2.11-r3 (17 Jul 2011)
+
+  17 Jul 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  -gpsdrive-2.11-r2.ebuild, +gpsdrive-2.11-r3.ebuild:
+  Revision bump to fix locating osm-icons. Should fix bug #375049.
 
 *gpsdrive-2.11-r2 (14 Jul 2011)
 



1.1                  app-misc/gpsdrive/gpsdrive-2.11-r3.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/gpsdrive/gpsdrive-2.11-r3.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/gpsdrive/gpsdrive-2.11-r3.ebuild?rev=1.1&content-type=text/plain

Index: gpsdrive-2.11-r3.ebuild
===================================================================
# 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-r3.ebuild,v 1.1 2011/07/17 22:35:26 scarabeus Exp $

EAPI=4

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"

KEYWORDS="~amd64 ~ppc ~x86"

IUSE="dbus -debug -kismet gdal mapnik scripts -speech"

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
	)
	speech? ( >=app-accessibility/speech-dispatcher-0.6.7 )
"

DEPEND="${COMMON_DEP}
	dev-util/pkgconfig
"

RDEPEND="${COMMON_DEP}
	media-fonts/dejavu
	sci-geosciences/openstreetmap-icons
	sci-geosciences/mapnik-world-boundaries
"

S=${WORKDIR}/${P/_/}

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/gpsdrive_config.c \
		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}"/${P}_DefineOptions_gpsd.patch \
		"${FILESDIR}"/${P}-add-gdk-pixbuf2.patch \
		"${FILESDIR}"/${P}-gpsd-2.96.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=(
		$(cmake-utils_use_with scripts SCRIPTS)
		$(cmake-utils_use_with mapnik MAPNIK)
		$(cmake-utils_use_with mapnik POSTGIS)
		$(cmake-utils_use_with kismet KISMET)
		$(cmake-utils_use_with dbus DBUS)
		$(cmake-utils_use_with speech SPEECH)
		$(cmake-utils_use_with gdal GDAL)
		-DWITH_GDA3=OFF
	)
	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 "${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
		use gdal || rm -f "${ED}"usr/bin/{gdal_slice,nasaconv}.sh
	else
		rm -f "${ED}"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
}






^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2011-07-17 22:35 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-07-17 22:35 [gentoo-commits] gentoo-x86 commit in app-misc/gpsdrive: ChangeLog gpsdrive-2.11-r3.ebuild gpsdrive-2.11-r2.ebuild Tomas Chvatal (scarabeus)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox