viking version bump

Package-Manager: portage-2.2_rc4/cvs/Linux 2.6.26 i686

4 files changed, 103 insertions, 5 deletions

diff --git a/sci-geosciences/viking/ChangeLog b/sci-geosciences/viking/ChangeLog
index f32a40cd185b..01c2b8435844 100644
--- a/sci-geosciences/viking/ChangeLog
+++ b/sci-geosciences/viking/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-geosciences/viking
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/viking/ChangeLog,v 1.1 2008/06/24 12:46:28 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/viking/ChangeLog,v 1.2 2008/07/30 00:45:59 hanno Exp $
+
+*viking-0.9.5 (30 Jul 2008)
+
+  30 Jul 2008; Hanno Boeck <hanno@gentoo.org>
+  +files/viking-0.9.5-newgoogle.diff, +viking-0.9.5.ebuild:
+  Version bump.
 
 *viking-0.9.4.20080614 (24 Jun 2008)
 
diff --git a/sci-geosciences/viking/Manifest b/sci-geosciences/viking/Manifest
index 789de09127be..e33d83c1d4b6 100644
--- a/sci-geosciences/viking/Manifest
+++ b/sci-geosciences/viking/Manifest
@@ -1,14 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX viking-0.9.5-newgoogle.diff 1666 RMD160 5bde00efe704d9db49b64dd4158db40266f4adda SHA1 fac533a9de4a441e24a0c421e9cb5c916580a464 SHA256 603cf2f5ed4663efe3d8117a7892750dc9a6824f88ad7501daa7d8385d83e8ac
 DIST viking-0.9.4.20080614.tar.gz 622384 RMD160 e04d74b67c982b326ccfc10bbd5521c61892fc17 SHA1 bfa54fde89d143c911130432a8bf71b553843225 SHA256 3a20883cd2f1408fec1a6c0485d351329c9c5952e037ea2b3869093083a5ca70
+DIST viking-0.9.5.tar.gz 688643 RMD160 268f3022f55e5d8a0ca46522f5ec748fa6c3dd19 SHA1 a05217506898ee98a7d56ec9c62523f5a47ac2c8 SHA256 413b5968317e88df104e5a5b7d69d242c13eafe09d467122a4967f62f1bc4b7c
 EBUILD viking-0.9.4.20080614.ebuild 997 RMD160 eaa360648257a241dee6cb077823f001257b7cb1 SHA1 01cde43688f511dbe4315fa31a9a1fdf43e94b55 SHA256 e140b2c658e59d6dfad4a1bde5e170c0058d601b723ba2508721dc22e9f85dec
-MISC ChangeLog 409 RMD160 a9b20679d8f67767e6770459ad36c1b002049ab0 SHA1 1a1df374eab703245e3a97c70438cfe17fdda5fb SHA256 40959ca495ce55e054319402a7325f3c6480c24745c4f52e781362f6ddabda7d
+EBUILD viking-0.9.5.ebuild 1103 RMD160 47222f83ee66858fdd2af9b9bdfc0b2fde6b0ad6 SHA1 fa655dab0761b3b9b7a33a7c16770530910c38c5 SHA256 1ad00277684ff19206b37a2e679cc787dc1b74acf5ea915678475188811f4f2d
+MISC ChangeLog 561 RMD160 acf708eb8e3813a9b2fa087e6ec8904c91721e7b SHA1 131e694ad10dabb7b8e5f8c736c7d9b0ff31fd6c SHA256 7f9fc23789f7700f7f57bf3db9ade33147b24a3ef1ebff0deced80ae3fc10c34
 MISC metadata.xml 237 RMD160 20944f06e761a57587043f3ec7ec969a5ab9bdcc SHA1 33b0366a9efeb0caad5712fb7e628147dff924be SHA256 29eb01e164be9510d6a51d6477c169df641127a2a2df064c9d99c90c067ac3d7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkhg7K0ACgkQr2QksT29OyDQGACfbH0Or3mMHdbFsoSIj/7hzKem
-6+AAn22rfnQ7V+rtNClymB3sHbnr79xa
-=b1h7
+iEYEARECAAYFAkiPucAACgkQr2QksT29OyDBGQCeKlot//K8wvRnVUFDE/+XRqVV
+hKYAn29RttTSXkm/m3TGnSxNmGqTaQiZ
+=vO6E
 -----END PGP SIGNATURE-----
diff --git a/sci-geosciences/viking/files/viking-0.9.5-newgoogle.diff b/sci-geosciences/viking/files/viking-0.9.5-newgoogle.diff
new file mode 100644
index 000000000000..9ba0722a48ae
--- /dev/null
+++ b/sci-geosciences/viking/files/viking-0.9.5-newgoogle.diff
@@ -0,0 +1,45 @@
+From: qtonthat <qtonthat@02d69b8e-d120-0410-893f-fe71a3b6e39e>
+Date: Tue, 22 Jul 2008 14:21:44 +0000 (+0000)
+Subject: Google maps no longer worked due to changes by Google. Problems now fixed.
+X-Git-Url: http://repo.or.cz/w/viking.git?a=commitdiff_plain;h=47d2edf771db3a0c040e5fb042ca87ab68cc0e10
+
+Google maps no longer worked due to changes by Google. Problems now fixed.
+
+Signed-off-by: Quy Tonthat <qtonthat@gmail.com>
+
+Conflicts:
+
+Signed-off-by: Quy Tonthat <qtonthat@gmail.com>
+
+
+git-svn-id: https://viking.svn.sourceforge.net/svnroot/viking/trunk@733 02d69b8e-d120-0410-893f-fe71a3b6e39e
+---
+
+diff --git a/ChangeLog b/ChangeLog
+index 34164fe..119ed06 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,8 @@
++2008-07-22
++Quy Tonthat <qtonthat@gmail.com>:
++	* Google maps no longer worked due to changes made by Google.
++	  The Problems now fixed.
++
+ 2008-07-21:
+ Guilhem Bonnefille <guilhem.bonnefille@gmail.com>:
+ 	* Release Viking 0.9.5
+diff --git a/src/google.c b/src/google.c
+index c56b7d9..bb5d370 100644
+--- a/src/google.c
++++ b/src/google.c
+@@ -117,8 +117,8 @@ static const gchar *google_version_number(MapCoord *mapcoord, GoogleType google_
+   gsize len;
+   gchar *gvers, *tvers, *kvers, *terrvers, *tmpvers;
+   static DownloadOptions dl_options = { "http://maps.google.com/", 0, a_check_map_file };
+-  static const char *gvers_pat = "http://mt0.google.com/mt?n\\x3d404\\x26v\\x3d";
+-  static const char *kvers_pat = "http://khm0.google.com/kh?n\\x3d404\\x26v\\x3d";
++  static const char *gvers_pat = "http://mt0.google.com/mt?v\\x3d";
++  static const char *kvers_pat = "http://khm0.google.com/kh?v\\x3d";
+ 
+   g_assert(google_type < TYPE_GOOGLE_NUM);
+ 
diff --git a/sci-geosciences/viking/viking-0.9.5.ebuild b/sci-geosciences/viking/viking-0.9.5.ebuild
new file mode 100644
index 000000000000..3730d918dbda
--- /dev/null
+++ b/sci-geosciences/viking/viking-0.9.5.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/viking/viking-0.9.5.ebuild,v 1.1 2008/07/30 00:45:59 hanno Exp $
+
+inherit eutils
+
+DESCRIPTION="Viking is a program to manage GPS data."
+HOMEPAGE="http://viking.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="gps"
+KEYWORDS="~amd64 ~x86"
+MAKEOPTS="${MAKEOPTS} -j1"
+
+RDEPEND=">=x11-libs/gtk+-2.2.0
+	net-misc/curl
+	gps? ( sci-geosciences/gpsd )"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	dev-util/pkgconfig"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/viking-0.9.5-newgoogle.diff" || die
+}
+
+src_compile() {
+	econf --enable-openstreetmap \
+		--enable-expedia \
+		--enable-terraserver \
+		--enable-google \
+		$(use_enable gps realtime-gps-tracking) \
+		|| die "configure failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "Install failed"
+	dodoc README doc/GEOCODED-PHOTOS doc/GETTING-STARTED doc/GPSMAPPER \
+		|| die "Unable to install docs"
+}