Updated to improve failure messages, add einfo, and move the map icons

to a more appropriate place.
Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

2 files changed, 28 insertions, 6 deletions

diff --git a/sci-geosciences/openstreetmap-icons/ChangeLog b/sci-geosciences/openstreetmap-icons/ChangeLog
index 965d331ccbb9..c114942ab27c 100644
--- a/sci-geosciences/openstreetmap-icons/ChangeLog
+++ b/sci-geosciences/openstreetmap-icons/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-geosciences/openstreetmap-icons
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/openstreetmap-icons/ChangeLog,v 1.5 2009/07/31 06:53:55 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/openstreetmap-icons/ChangeLog,v 1.6 2009/08/22 23:22:34 nerdboy Exp $
+
+  22 Aug 2009; Steve Arnold <nerdboy@gentoo.org>
+  openstreetmap-icons-20090616.ebuild:
+  Updated to improve failure messages, add einfo, and move the map icons 
+  and geodata to a more appropriate place.
 
   31 Jul 2009; Steve Arnold <nerdboy@gentoo.org>
   openstreetmap-icons-20090616.ebuild:
diff --git a/sci-geosciences/openstreetmap-icons/openstreetmap-icons-20090616.ebuild b/sci-geosciences/openstreetmap-icons/openstreetmap-icons-20090616.ebuild
index 1ac714679dbd..d99db6d5ed3d 100644
--- a/sci-geosciences/openstreetmap-icons/openstreetmap-icons-20090616.ebuild
+++ b/sci-geosciences/openstreetmap-icons/openstreetmap-icons-20090616.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/openstreetmap-icons/openstreetmap-icons-20090616.ebuild,v 1.5 2009/07/31 06:53:55 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/openstreetmap-icons/openstreetmap-icons-20090616.ebuild,v 1.6 2009/08/22 23:22:34 nerdboy Exp $
 
 EAPI=2
 
@@ -29,14 +29,31 @@ src_compile() {
 	cmake-utils_src_compile
 	cp icons.* ${CMAKE_BUILD_DIR}
 	cd ${CMAKE_BUILD_DIR}
-	perl "${S}"/tools/create_geoinfo-db.pl --lang=en --source=icons.xml
-	perl "${S}"/tools/create_geoinfo-db.pl --lang=de --source=icons.xml
+	perl "${S}"/tools/create_geoinfo-db.pl --lang=en --source=icons.xml \
+	    || die "create en geoinfo-db failed"
+	perl "${S}"/tools/create_geoinfo-db.pl --lang=de --source=icons.xml \
+	    || die "create de geoinfo-db failed"
 }
 
 # tar.bz2 generated extracting files from
 # http://svn.openstreetmap.org/applications/share/map-icons
 src_install() {
-	insinto /usr/share/icons/map-icons
+	insinto /usr/share/osm
 	cd ../map-icons_build
-	doins -r icons.* geoinfo.* *.small *.big || die "Install failed"
+	doins -r icons.* *.small *.big || die "Install icons failed"
+	doins geoinfo.* || die "Install db failed"
+}
+
+pkg_postinst() {
+	elog
+	elog "Non-fatal errors are expected on a handful of .svg files,"
+	elog "and the cause is currently unknown.  File a bug only if"
+	elog "you have a runtime problem and/or more useful information."
+	elog
+	elog "This version also installs the icons in a more appropriate"
+	elog "location, so if you have an existing gpsdrive install, 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
 }