Version bump. Drop old.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 19 insertions, 37 deletions

diff --git a/sci-geosciences/osm2mp/ChangeLog b/sci-geosciences/osm2mp/ChangeLog
index 18fb8199f7c8..0ae775e4ee0a 100644
--- a/sci-geosciences/osm2mp/ChangeLog
+++ b/sci-geosciences/osm2mp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-geosciences/osm2mp
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/osm2mp/ChangeLog,v 1.2 2009/02/22 14:44:24 hanno Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/osm2mp/ChangeLog,v 1.3 2010/04/27 10:35:56 scarabeus Exp $
+
+*osm2mp-0.80 (27 Apr 2010)
+
+  27 Apr 2010; Tomáš Chvátal <scarabeus@gentoo.org> -osm2mp-0.60.ebuild,
+  -osm2mp-0.65.ebuild, +osm2mp-0.80.ebuild:
+  Version bump. Drop old.
 
 *osm2mp-0.65 (22 Feb 2009)
 
diff --git a/sci-geosciences/osm2mp/osm2mp-0.60.ebuild b/sci-geosciences/osm2mp/osm2mp-0.60.ebuild
deleted file mode 100644
index 42c689bf0459..000000000000
--- a/sci-geosciences/osm2mp/osm2mp-0.60.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/osm2mp/osm2mp-0.60.ebuild,v 1.1 2008/12/27 16:55:57 hanno Exp $
-
-DESCRIPTION="Converts openstreetmap data to mp format (used e. g. by mkgmap)"
-HOMEPAGE="http://forum.openstreetmap.org/viewtopic.php?id=1162"
-SRC_URI="http://garminmapsearch.com/osm/${PN}_v${PV/./}.zip"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-DEPEND="dev-perl/Template-Toolkit
-	virtual/perl-Getopt-Long"
-S="${WORKDIR}"
-
-src_compile() {
-	sed -i -e 's:poi.cfg:/usr/share/osm2mp/poi.cfg:g' \
-		-e 's:poly.cfg:/usr/share/osm2mp/poly.cfg:g' \
-		-e 's:header.tpl:/usr/share/osm2mp/header.tpl:g' \
-		osm2mp.pl
-}
-
-src_install() {
-	dobin osm2mp.pl
-	insinto /usr/share/osm2mp
-	doins poi.cfg poly.cfg header.tpl
-	dodoc todo
-}
diff --git a/sci-geosciences/osm2mp/osm2mp-0.65.ebuild b/sci-geosciences/osm2mp/osm2mp-0.80.ebuild
index 0a5c782d6f8c..c1a484c34ba8 100644
--- a/sci-geosciences/osm2mp/osm2mp-0.65.ebuild
+++ b/sci-geosciences/osm2mp/osm2mp-0.80.ebuild
@@ -1,29 +1,33 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/osm2mp/osm2mp-0.65.ebuild,v 1.1 2009/02/22 14:44:24 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/osm2mp/osm2mp-0.80.ebuild,v 1.1 2010/04/27 10:35:56 scarabeus Exp $
 
 DESCRIPTION="Converts openstreetmap data to mp format (used e. g. by mkgmap)"
 HOMEPAGE="http://forum.openstreetmap.org/viewtopic.php?id=1162"
 SRC_URI="http://garminmapsearch.com/osm/${PN}_v${PV/./}.zip"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
+
 DEPEND="dev-perl/Template-Toolkit
 	virtual/perl-Getopt-Long"
 RDEPEND="${DEPEND}"
+
 S="${WORKDIR}"
 
 src_compile() {
-	sed -i -e 's:poi.cfg:/usr/share/osm2mp/poi.cfg:g' \
+	sed -i \
+		-e 's:poi.cfg:/usr/share/osm2mp/poi.cfg:g' \
 		-e 's:poly.cfg:/usr/share/osm2mp/poly.cfg:g' \
 		-e 's:header.tpl:/usr/share/osm2mp/header.tpl:g' \
-		osm2mp.pl
+		osm2mp.pl || die "sed failed"
 }
 
 src_install() {
-	dobin osm2mp.pl
+	newbin osm2mp osm2mp.pl || die
 	insinto /usr/share/osm2mp
-	doins poi.cfg poly.cfg header.tpl
-	dodoc todo
+	doins poi.cfg poly.cfg header.tpl || die
+	dodoc todo || die
 }