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

be recompiled after the upgrade.
(Portage version: 2.1.3.12)

5 files changed, 70 insertions, 67 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/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
+}