Version bump. Drop old.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 26 insertions, 46 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/Manifest b/sci-geosciences/osm2mp/Manifest
index e0f6ce01ca5c..3545094eca22 100644
--- a/sci-geosciences/osm2mp/Manifest
+++ b/sci-geosciences/osm2mp/Manifest
@@ -1,16 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST osm2mp_v060.zip 13579 RMD160 c8df35cf65b5edc95daa878b48436b195b0c6259 SHA1 3f65e6f9bd3dba992b7004313eca5d5eb4dc1bf9 SHA256 205e5a26a6eeb9be4411fca5dae58fee05252c257aedfd5b67e299bd82e0fed3
-DIST osm2mp_v065.zip 13265 RMD160 7f7803b5ec8a0404c96a278c696521413693e807 SHA1 5ea3f8d41ee500cf9a1ada38d420edbdcea149ab SHA256 0bb8830959e26b89506a678048c9bcad3857e693710e8ec49f99fd57376dad5b
-EBUILD osm2mp-0.60.ebuild 854 RMD160 e2eb69811bd74a508ad93f668d141aa156a025de SHA1 cfaf3fe61ce848046f4931a6210da641a426e3e1 SHA256 db7496f0a8416754c0319778e48ee03ad03406a7d04f3c0cd89481e520e45acb
-EBUILD osm2mp-0.65.ebuild 874 RMD160 2eefec7a6b43a6f826e4891027cd081b1d13e50c SHA1 beb6cd392cf640a5516bb5c48fbf8fd1910f9d2f SHA256 9d3e00ea8e5661451aa0a0ef911719fd3f557fce1798937a6e4df197808b2fec
-MISC ChangeLog 510 RMD160 a4c3e7e755696dfd725006a453e90063e7bb1f57 SHA1 c7a1c5b2e325b75a32d02dec4c7fdbb9e0321c67 SHA256 6a1a8fdaf736940cbe455627a4ab04e2d9bf76587ed9e20df8cac38c43b40a27
+DIST osm2mp_v080.zip 31372 RMD160 cff4978d29dfb5bc27c10aa449e9fe3b1cb156a0 SHA1 4c6890d706deb901ba842ce192ce113de403674e SHA256 9c76785a3bf4b7bcb327fbc641c7ece2084c0e28ebcb3dcb614512c1124ce855
+EBUILD osm2mp-0.80.ebuild 934 RMD160 a447d3caa9097952523d14eeaf0e2e1949f6feda SHA1 9845baaef3cadeaa777d2a9bff400885751b11db SHA256 3bb54abb59688276267b47cb440d7014e9fc152816150624cc721222a9d8c14a
+MISC ChangeLog 689 RMD160 c0d40123efd4176e32d303b8679ea480f6d80fe5 SHA1 5248cd64807e01fc9cdd2251b0623894ac672bf8 SHA256 f07c7e333990a3800691c96650797987ffcc416062b1459f0d356506b76eb37d
 MISC metadata.xml 237 RMD160 20944f06e761a57587043f3ec7ec969a5ab9bdcc SHA1 33b0366a9efeb0caad5712fb7e628147dff924be SHA256 29eb01e164be9510d6a51d6477c169df641127a2a2df064c9d99c90c067ac3d7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.10 (GNU/Linux)
+Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkmhZM0ACgkQr2QksT29OyAwQgCgiJYYNF5C2w8TtwJdo1DDuVI2
-698An2J9UWN+x/OHEHgVsb82adEYnrom
-=491p
+iEYEARECAAYFAkvWvgUACgkQHB6c3gNBRYfUjwCdEGEPZ3elFB2BGLxZOs6X/bU6
+1J4AoKLva/qiTYJyLq1Pp+/NnXZw9l4Q
+=NQtz
 -----END PGP SIGNATURE-----
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
 }