Version bump to latest. Drop older. Wrt bug#418289. Thanks to jannis for the patch.

(Portage version: 2.2.0_alpha108/cvs/Linux x86_64)

6 files changed, 25 insertions, 75 deletions

diff --git a/sci-geosciences/viking/ChangeLog b/sci-geosciences/viking/ChangeLog
index 47c60345bd2d..b70e2296cf15 100644
--- a/sci-geosciences/viking/ChangeLog
+++ b/sci-geosciences/viking/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sci-geosciences/viking
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/viking/ChangeLog,v 1.21 2012/05/04 07:14:06 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/viking/ChangeLog,v 1.22 2012/05/31 14:59:43 scarabeus Exp $
+
+*viking-1.3 (31 May 2012)
+
+  31 May 2012; Tomáš Chvátal <scarabeus@gentoo.org> +files/1.3-autoreconf.patch,
+  +viking-1.3.ebuild, -files/1.2.1-autoreconf.patch,
+  -files/viking-curl-7.21.7.patch, -files/viking-gpsd-2.96.patch,
+  -viking-1.2.2.ebuild:
+  Version bump to latest. Drop older. Wrt bug#418289. Thanks to jannis for the
+  patch.
 
   04 May 2012; Jeff Horelick <jdhore@gentoo.org> viking-1.2.2.ebuild:
   dev-util/pkgconfig -> virtual/pkgconfig
diff --git a/sci-geosciences/viking/files/1.2.1-autoreconf.patch b/sci-geosciences/viking/files/1.2.1-autoreconf.patch
deleted file mode 100644
index 3e66afa4e934..000000000000
--- a/sci-geosciences/viking/files/1.2.1-autoreconf.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -urN viking-1.2.1.old/configure.ac viking-1.2.1/configure.ac
---- viking-1.2.1.old/configure.ac	2011-06-17 21:44:31.920086938 +0200
-+++ viking-1.2.1/configure.ac	2011-06-17 21:44:43.574941232 +0200
-@@ -344,9 +344,6 @@
-                  doc/Makefile
-                  doc/examples/Makefile
-                  doc/dev/Makefile])
--if test x$enable_gtk_doc = xyes; then
--AC_CONFIG_FILES([doc/reference/Makefile])
--fi
- AC_OUTPUT([
- 	   viking.spec
- 	   ])
diff --git a/sci-geosciences/viking/files/1.3-autoreconf.patch b/sci-geosciences/viking/files/1.3-autoreconf.patch
new file mode 100644
index 000000000000..c8ddd6f6873a
--- /dev/null
+++ b/sci-geosciences/viking/files/1.3-autoreconf.patch
@@ -0,0 +1,12 @@
+--- configure.ac.orig   2012-05-31 09:40:33.543090992 +0200
++++ configure.ac        2012-05-31 09:40:44.372640811 +0200
+@@ -350,9 +350,6 @@
+                  help/Makefile
+                  doc/Makefile
+                  doc/examples/Makefile])
+-if test x$enable_gtk_doc = xyes; then
+-AC_CONFIG_FILES([doc/reference/Makefile])
+-fi
+ AC_OUTPUT([
+           viking.spec
+           ])
diff --git a/sci-geosciences/viking/files/viking-curl-7.21.7.patch b/sci-geosciences/viking/files/viking-curl-7.21.7.patch
deleted file mode 100644
index 5c79f9dc9401..000000000000
--- a/sci-geosciences/viking/files/viking-curl-7.21.7.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- viking-1.2.1-orig/src/osm-traces.c	2011-07-24 12:00:31.556958069 +0200
-+++ viking-1.2.1/src/osm-traces.c	2011-07-24 12:00:44.180631910 +0200
-@@ -27,7 +27,6 @@
- #include <errno.h>
- 
- #include <curl/curl.h>
--#include <curl/types.h>
- #include <curl/easy.h>
- 
- #include <glib.h>
diff --git a/sci-geosciences/viking/files/viking-gpsd-2.96.patch b/sci-geosciences/viking/files/viking-gpsd-2.96.patch
deleted file mode 100644
index 01b117312a21..000000000000
--- a/sci-geosciences/viking/files/viking-gpsd-2.96.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff -wbBur viking-1.1/configure.ac viking-1.1.my/configure.ac
---- viking-1.1/configure.ac	2011-02-08 21:29:01.000000000 +0000
-+++ viking-1.1.my/configure.ac	2011-04-18 13:31:07.000000000 +0000
-@@ -244,7 +244,7 @@
-                [ac_cv_enable_realtimegpstracking], [ac_cv_enable_realtimegpstracking=yes])
- case $ac_cv_enable_realtimegpstracking in
-   yes)
--    AC_CHECK_LIB(gps,gps_poll,,AC_MSG_ERROR([libgps is needed for Realtime GPS Tracking feature[,] but not found. The feature can be disable with --disable-realtime-gps-tracking]))
-+    AC_CHECK_LIB(gps,gps_read,,AC_MSG_ERROR([libgps is needed for Realtime GPS Tracking feature[,] but not found. The feature can be disable with --disable-realtime-gps-tracking]))
-     AC_DEFINE(VIK_CONFIG_REALTIME_GPS_TRACKING, [], [REALTIME GPS TRACKING STUFF])
-     ;;
- esac
-diff -wbBur viking-1.1/src/vikgpslayer.c viking-1.1.my/src/vikgpslayer.c
---- viking-1.1/src/vikgpslayer.c	2011-02-08 21:09:00.000000000 +0000
-+++ viking-1.1.my/src/vikgpslayer.c	2011-04-18 13:35:48.000000000 +0000
-@@ -1377,8 +1377,11 @@
- {
-   VikGpsLayer *vgl = data;
-   if (condition == G_IO_IN) {
--    if (!gps_poll(&vgl->vgpsd->gpsd))
-+    if (!gps_read(&vgl->vgpsd->gpsd))
-+    {
-+      gpsd_raw_hook(&vgl->vgpsd->gpsd, NULL);
-       return TRUE;
-+    }
-     else {
-       g_warning("Disconnected from gpsd. Trying to reconnect");
-       rt_gpsd_disconnect(vgl);
-@@ -1408,7 +1411,8 @@
- {
-   VikGpsLayer *vgl = (VikGpsLayer *)data;
- #ifndef HAVE_GPS_OPEN_R
--  struct gps_data_t *gpsd = gps_open(vgl->gpsd_host, vgl->gpsd_port);
-+  static struct gps_data_t __gd;
-+  struct gps_data_t *gpsd = gps_open(vgl->gpsd_host, vgl->gpsd_port, &__gd) ? NULL : &__gd;
- 
-   if (gpsd == NULL) {
- #else
-@@ -1439,7 +1443,7 @@
-     vik_trw_layer_add_track(vtl, vgl->realtime_track_name, vgl->realtime_track);
-   }
- 
--  gps_set_raw_hook(&vgl->vgpsd->gpsd, gpsd_raw_hook);
-+//  gps_set_raw_hook(&vgl->vgpsd->gpsd, gpsd_raw_hook);
-   vgl->realtime_io_channel = g_io_channel_unix_new(vgl->vgpsd->gpsd.gps_fd);
-   vgl->realtime_io_watch_id = g_io_add_watch( vgl->realtime_io_channel,
-                     G_IO_IN | G_IO_ERR | G_IO_HUP, gpsd_data_available, vgl);
diff --git a/sci-geosciences/viking/viking-1.2.2.ebuild b/sci-geosciences/viking/viking-1.3.ebuild
index 7959414789d0..5ae6a8aaa9b5 100644
--- a/sci-geosciences/viking/viking-1.2.2.ebuild
+++ b/sci-geosciences/viking/viking-1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/viking/viking-1.2.2.ebuild,v 1.4 2012/05/04 07:14:06 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/viking/viking-1.3.ebuild,v 1.1 2012/05/31 14:59:43 scarabeus Exp $
 
 EAPI=4
 
@@ -36,11 +36,10 @@ DEPEND="${COMMONDEPEND}
 	sys-devel/gettext
 "
 
-DOCS=( README doc/GEOCODED-PHOTOS doc/GETTING-STARTED doc/GPSMAPPER )
+DOCS=( README doc/GETTING-STARTED doc/GPSMAPPER )
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-gpsd-2.96.patch
-	"${FILESDIR}"/1.2.1-autoreconf.patch
+	"${FILESDIR}"/1.3-autoreconf.patch
 )
 
 src_prepare() {