Version bump for bug #168960 by Andrew Cremins. Note that maps will have to

be recompiled after the upgrade.
Package-Manager: portage-2.1.3.12

6 files changed, 92 insertions, 87 deletions

diff --git a/app-misc/roadnav/ChangeLog b/app-misc/roadnav/ChangeLog
index 4402e1d3a462..9aca0b8b9905 100644
--- a/app-misc/roadnav/ChangeLog
+++ b/app-misc/roadnav/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-misc/roadnav
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/roadnav/ChangeLog,v 1.5 2007/06/16 00:57:46 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/roadnav/ChangeLog,v 1.6 2007/10/08 06:23:58 dirtyepic Exp $
+
+*roadnav-0.18 (08 Oct 2007)
+
+  08 Oct 2007; Ryan Hill <dirtyepic@gentoo.org> -roadnav-0.14.ebuild,
+  -roadnav-0.15.ebuild, +roadnav-0.18.ebuild:
+  Version bump for bug #168960 by Andrew Cremins. Note that maps will have to
+  be recompiled after the upgrade.
 
   16 Jun 2007; Ryan Hill <dirtyepic@gentoo.org> roadnav-0.16.ebuild:
   Use wxwidgets.eclass, bug #175632.
diff --git a/app-misc/roadnav/Manifest b/app-misc/roadnav/Manifest
index 2bb05d6107c7..a63e2a1558f4 100644
--- a/app-misc/roadnav/Manifest
+++ b/app-misc/roadnav/Manifest
@@ -1,32 +1,34 @@
-DIST roadnav-0.14.tar.gz 1083939 RMD160 0241374d6b45e364bfc873d8b4d6f890e6afe762 SHA1 b5d446b44dcfe19241d9d0c429991ce65d358371 SHA256 992756a2ce565367f5dff233f19eeaea29165e55d23cc9e1cabafd13cc9864de
-DIST roadnav-0.15.tar.gz 1090750 RMD160 c37b8b8dea9b0828d615835cedad9852d4c3bc62 SHA1 4e1caf0e9ec7a1fcabfc7523812735388023359a SHA256 3bd915385e43cc7aa32b9632ab79ccbe58b3a8fa15ebb1d9c7e070af4c5fcb45
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST roadnav-0.16.tar.gz 1167236 RMD160 2ed1e2ae8d9b8e700e66d523d16dc54a089f52c0 SHA1 95013c0643d1c5320cd4e9bb3029dc82164d13cf SHA256 9230d646fb23103e19721f76ebbe802a5e87e26eba79057de61cbf4c178ae300
-EBUILD roadnav-0.14.ebuild 952 RMD160 1574d33e834171beadd6fb12722b571aa2ff9231 SHA1 a17f10051746e64748e8781b16a27822e5fbe8ad SHA256 045ab15a4369c5c9e480fbe1d7b4d88a5dcc37554c0aac6cea6241df226f12fc
-MD5 346328c883199806eb06f87fe5168e3e roadnav-0.14.ebuild 952
-RMD160 1574d33e834171beadd6fb12722b571aa2ff9231 roadnav-0.14.ebuild 952
-SHA256 045ab15a4369c5c9e480fbe1d7b4d88a5dcc37554c0aac6cea6241df226f12fc roadnav-0.14.ebuild 952
-EBUILD roadnav-0.15.ebuild 952 RMD160 456a568d4e8c480036ba4cc13aa8eacfa6bbeb24 SHA1 f6ef9822cbe43774daf7f8087bd86eaf5ee48006 SHA256 8dbaa09b20d9a6dcce37fc4642b9f3fd51a0683895976f74aa7b27e62edba143
-MD5 434903bd0ad8efc4fa03c1937aa77134 roadnav-0.15.ebuild 952
-RMD160 456a568d4e8c480036ba4cc13aa8eacfa6bbeb24 roadnav-0.15.ebuild 952
-SHA256 8dbaa09b20d9a6dcce37fc4642b9f3fd51a0683895976f74aa7b27e62edba143 roadnav-0.15.ebuild 952
+DIST roadnav-0.18.tar.gz 1289211 RMD160 2093f02ac0ecf76bdddf0c4b64c03eafc9566ecb SHA1 4b6c661c463557dd9b27ada13006418657c5bc2d SHA256 25e82c4a24012a4f646d682fee5baf3502abd369de6b833eae865d2f437921de
 EBUILD roadnav-0.16.ebuild 1049 RMD160 ec831b1bc016c48c3834b21da718783407753812 SHA1 71081e5f6e7df77cf708143e9f2c04f9aa35b154 SHA256 db94f64768b39dfc3bda131876414cfa3bd0f8b20a0a78931c6b217ba0cfabfd
 MD5 2024b2b8c7509367fbd9b393d4837105 roadnav-0.16.ebuild 1049
 RMD160 ec831b1bc016c48c3834b21da718783407753812 roadnav-0.16.ebuild 1049
 SHA256 db94f64768b39dfc3bda131876414cfa3bd0f8b20a0a78931c6b217ba0cfabfd roadnav-0.16.ebuild 1049
-MISC ChangeLog 884 RMD160 ca7beafdabfc71ee0a24491867eaf3e7b1b6f189 SHA1 5692a8081af9057dc97b411afaee16664b6bb9c4 SHA256 ae8e49c22d790685db7179695fea84caf4ae4d87743b13108d55538a9e845ccf
-MD5 c70773503747fb5dfa7dab72e3e41ed8 ChangeLog 884
-RMD160 ca7beafdabfc71ee0a24491867eaf3e7b1b6f189 ChangeLog 884
-SHA256 ae8e49c22d790685db7179695fea84caf4ae4d87743b13108d55538a9e845ccf ChangeLog 884
+EBUILD roadnav-0.18.ebuild 1432 RMD160 b21eb68fe50b1ff6d29f2277cc34e06a3f0a846e SHA1 6ced19bc6ba1ca0826cabaef4f185317053f611a SHA256 0e1170d79e249acbbcd0ee43a0a336afb47f7cd6eb94867b51373e233fb2a402
+MD5 345c4fd0dcca40b870796b67f3203b2d roadnav-0.18.ebuild 1432
+RMD160 b21eb68fe50b1ff6d29f2277cc34e06a3f0a846e roadnav-0.18.ebuild 1432
+SHA256 0e1170d79e249acbbcd0ee43a0a336afb47f7cd6eb94867b51373e233fb2a402 roadnav-0.18.ebuild 1432
+MISC ChangeLog 1143 RMD160 554a264bda5f27dca13b4f54f157c859518552b8 SHA1 1484ef2ba3f9547c50abb54780c7f5c859a2a350 SHA256 ba3103c72132fb1f1d9b2d94698c3d28146267014ac14451b075667441ff575f
+MD5 49664ab01a3fd60fc9a9ba5f8a19cc21 ChangeLog 1143
+RMD160 554a264bda5f27dca13b4f54f157c859518552b8 ChangeLog 1143
+SHA256 ba3103c72132fb1f1d9b2d94698c3d28146267014ac14451b075667441ff575f ChangeLog 1143
 MISC metadata.xml 228 RMD160 4d98466332f8b8f1b924334b405c48e6353d722c SHA1 5eb4dfaef94401bfb9522d599b1d024e202b3ae8 SHA256 6007b393ee3bbf798ffe8903beca73d81482cf967dc638bf1503511c11870733
 MD5 215afba5c89fbdc188a79e29dafe5a88 metadata.xml 228
 RMD160 4d98466332f8b8f1b924334b405c48e6353d722c metadata.xml 228
 SHA256 6007b393ee3bbf798ffe8903beca73d81482cf967dc638bf1503511c11870733 metadata.xml 228
-MD5 73428cac0cb0a7ca11582112db07f0e9 files/digest-roadnav-0.14 241
-RMD160 5966289b9d11266af6eebed14b1ad6797eae2ddd files/digest-roadnav-0.14 241
-SHA256 6af172e5631a1ca9cf5b37ffe670dfc3c0c7639f82867d7095327b28fac35e32 files/digest-roadnav-0.14 241
-MD5 9bcd5f9e6923b68b69641928be07567e files/digest-roadnav-0.15 241
-RMD160 f7d9b623fff4a8803441cd961be5d537d3ed9bca files/digest-roadnav-0.15 241
-SHA256 926b889c18073780f6a0a8c4fb4a7a35bca6f5779d5a381e014072a3e24232ca files/digest-roadnav-0.15 241
 MD5 21e43a669c9859b71bc66df05c8cb568 files/digest-roadnav-0.16 241
 RMD160 24112d2c323e8af8e7b918042dd1f06f969221ee files/digest-roadnav-0.16 241
 SHA256 f1916b9c51b98bb3d3f6dba19fc135a7614b06a0e39cc676a058fa82b15b82ae files/digest-roadnav-0.16 241
+MD5 3f2a6e2fb780f06ad47bcd3613c759d9 files/digest-roadnav-0.18 241
+RMD160 2eb162e2f692b6b3af261b1f3a196d9c5744fec8 files/digest-roadnav-0.18 241
+SHA256 61df38817e38d43d47ef636abde571f34f85fdb0c469170eaa6b6bb663513cb9 files/digest-roadnav-0.18 241
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHCc0DiqiDRvmkBmIRAs1+AKCyySldKnv4HXSQXwNQT7nmvqBibACeOZ4B
+6+/lycmn1aJxJINP0ReT+YI=
+=QUuZ
+-----END PGP SIGNATURE-----
diff --git a/app-misc/roadnav/files/digest-roadnav-0.18 b/app-misc/roadnav/files/digest-roadnav-0.18
new file mode 100644
index 000000000000..483127339cd6
--- /dev/null
+++ b/app-misc/roadnav/files/digest-roadnav-0.18
@@ -0,0 +1,3 @@
+MD5 62e42e26982749774a0d21f78287b52e roadnav-0.18.tar.gz 1289211
+RMD160 2093f02ac0ecf76bdddf0c4b64c03eafc9566ecb roadnav-0.18.tar.gz 1289211
+SHA256 25e82c4a24012a4f646d682fee5baf3502abd369de6b833eae865d2f437921de roadnav-0.18.tar.gz 1289211
diff --git a/app-misc/roadnav/roadnav-0.14.ebuild b/app-misc/roadnav/roadnav-0.14.ebuild
deleted file mode 100644
index 828cc4225491..000000000000
--- a/app-misc/roadnav/roadnav-0.14.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/roadnav/roadnav-0.14.ebuild,v 1.1 2006/07/23 13:32:59 kloeri Exp $
-
-DESCRIPTION="Roadnav is a street map application with routing and GPS support"
-HOMEPAGE="http://roadnav.sourceforge.net"
-SRC_URI="mirror://sourceforge/roadnav/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="gps festival"
-
-DEPEND=">=x11-libs/wxGTK-2.6.2-r1
-	=dev-libs/libroadnav-${PV}
-	gps? ( sci-geosciences/gpsd )
-	festival? ( app-accessibility/festival )"
-RDEPEND=">=x11-libs/wxGTK-2.6.2-r1
-	gps? ( sci-geosciences/gpsd )
-	festival? ( app-accessibility/festival )"
-
-src_compile() {
-	econf \
-	--with-wx-config=wx-config-2.6 \
-	--with-wx-config-path=/usr/bin \
-	$(use_enable gps gpsd) \
-	|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "install failed"
-}
diff --git a/app-misc/roadnav/roadnav-0.15.ebuild b/app-misc/roadnav/roadnav-0.15.ebuild
deleted file mode 100644
index e8aa5f2eee47..000000000000
--- a/app-misc/roadnav/roadnav-0.15.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/roadnav/roadnav-0.15.ebuild,v 1.1 2006/09/05 18:54:15 kloeri Exp $
-
-DESCRIPTION="Roadnav is a street map application with routing and GPS support"
-HOMEPAGE="http://roadnav.sourceforge.net"
-SRC_URI="mirror://sourceforge/roadnav/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="gps festival"
-
-DEPEND=">=x11-libs/wxGTK-2.6.2-r1
-	=dev-libs/libroadnav-${PV}
-	gps? ( sci-geosciences/gpsd )
-	festival? ( app-accessibility/festival )"
-RDEPEND=">=x11-libs/wxGTK-2.6.2-r1
-	gps? ( sci-geosciences/gpsd )
-	festival? ( app-accessibility/festival )"
-
-src_compile() {
-	econf \
-	--with-wx-config=wx-config-2.6 \
-	--with-wx-config-path=/usr/bin \
-	$(use_enable gps gpsd) \
-	|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "install failed"
-}
diff --git a/app-misc/roadnav/roadnav-0.18.ebuild b/app-misc/roadnav/roadnav-0.18.ebuild
new file mode 100644
index 000000000000..65d117ee1067
--- /dev/null
+++ b/app-misc/roadnav/roadnav-0.18.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/roadnav/roadnav-0.18.ebuild,v 1.1 2007/10/08 06:23:58 dirtyepic Exp $
+
+inherit wxwidgets
+
+DESCRIPTION="Roadnav is a street map application with routing and GPS support"
+HOMEPAGE="http://roadnav.sourceforge.net"
+SRC_URI="mirror://sourceforge/roadnav/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="gps festival flite openstreetmap scripting"
+
+DEPEND="=x11-libs/wxGTK-2.6*
+	~dev-libs/libroadnav-${PV}
+	festival?	( app-accessibility/festival )
+	flite?		( app-accessibility/flite )
+	gps?		( sci-geosciences/gpsd )"
+
+RDEPEND="${DEPEND}"
+
+src_compile() {
+	WX_GTK_VER=2.6
+	need-wxwidgets gtk2
+
+	econf \
+	$(use_enable festival) \
+	$(use_enable flite) \
+	$(use_enable gps gpsd) \
+	$(use_enable openstreetmap) \
+	$(use_enable scripting) \
+	--with-wx-config=${WX_CONFIG} \
+	|| die "econf failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "install failed"
+
+	# generic or empty
+	for f in NEWS COPYING INSTALL; do
+		rm -f "${D}"/usr/share/doc/${PN}/${f}
+	done
+
+	# --docdir is broken and hardcoded to ${PN}
+	mv "${D}"/usr/share/doc/${PN} "${D}"/usr/share/doc/${P}
+
+	insinto /usr/share/applications
+	doins "${S}"/roadnav.desktop
+}
+
+pkg_postinst() {
+	echo
+	elog "After upgrading to ${P} you will need to recompile your maps."
+	echo
+}