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

Package-Manager: portage-2.2.0_alpha108/cvs/Linux x86_64

7 files changed, 49 insertions, 81 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/Manifest b/sci-geosciences/viking/Manifest
index 3c1326349033..eef931bd70ba 100644
--- a/sci-geosciences/viking/Manifest
+++ b/sci-geosciences/viking/Manifest
@@ -1,7 +1,25 @@
-AUX 1.2.1-autoreconf.patch 454 RMD160 079004a3708f909304945dd324d973ef26885278 SHA1 8272b44044578ab39349ab23592877522b1f4a0f SHA256 4cb58f3d86dc10443f9a1cabd7a132797e5eab1d1072ba65fd034970b5d8a400
-AUX viking-curl-7.21.7.patch 279 RMD160 f721a8de9e1d656b764d6bd96c9fb54201d43300 SHA1 1b83fbd1a2e61532943936459157bc85f8b64f55 SHA256 97a473029b67b194607431171e36af1d834b79b5ea52856465558b196104f2c0
-AUX viking-gpsd-2.96.patch 2162 RMD160 39d74daddc7501db65c7208d0080d5cb82ac4462 SHA1 a7c469194ae04535549b7bac65365be0f66c5652 SHA256 7277a6f0bbe7b16440ca92a5975c6f0b38261f13bbbb6f04e4fc684b8965c902
-DIST viking-1.2.2.tar.gz 1050517 RMD160 7dcc257525ff9fa78d86f792fa70d3ab50243753 SHA1 91d53bbf3de6f286e3a0be062974f5b3bef863a7 SHA256 9f96f9bdfc9cae8c65d391f9e972a987ec7f3d9d662a0e4df8bd14282879b10c
-EBUILD viking-1.2.2.ebuild 1406 RMD160 212a1dddb33949f095838eeb853ee0c002046bb9 SHA1 cf2ec1de3c094dc0aa3c5cbde0dcba506e431fec SHA256 ad47562ffa92f43c4337aaccc1fbbe1df382a7775001c83ca41d354d43d98f0f
-MISC ChangeLog 3364 RMD160 8581ec487252178e129194af4e3c80fba97c48e8 SHA1 d77697717126d761120ad8f17e8bb8d35ba7cd09 SHA256 fb75df2aa67be748adee43a32394647f15d8056d09bbb05e2a719ab65291febe
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 1.3-autoreconf.patch 381 RMD160 84c46604a280625dd9f1dd044712fc2691d26f13 SHA1 6f4128e7f8b1b8904452da3ed18a2e953e189c66 SHA256 c92829c5674aa7e965a4a4d3d8fd9b6263e9abd25dc9a2d1c31ebd73f9fb5f35
+DIST viking-1.3.tar.gz 1116537 RMD160 5bc6fe8b8e017a7a2473fcb397cd4fc42129dad6 SHA1 fd591efd13763f84bb7cb34f7953819165dffa71 SHA256 54dc43b0136722118b8402d51ac8d78180ad59cc37e37ddf3fb6a7ee6bf04fdf
+EBUILD viking-1.3.ebuild 1348 RMD160 70a18338daa6f770c5061d1785c1ef44759eec0b SHA1 9d761be9bb9eed0a30138145bff04c88fb095db4 SHA256 ebffd345ea96828c13cf483c39791bc4f6639a8c6b44dcc5731c8264931fb548
+MISC ChangeLog 3710 RMD160 c9ecd4892bd38ea43b73ef6b6d98b6156ac6b51e SHA1 7f25732fe8781cb8370e0ad979291ada4adc88ee SHA256 3178db2f9f34aa5d6b7bbf0c15d30aab0b7a234a0037349784fe0512bb2d280c
 MISC metadata.xml 237 RMD160 20944f06e761a57587043f3ec7ec969a5ab9bdcc SHA1 33b0366a9efeb0caad5712fb7e628147dff924be SHA256 29eb01e164be9510d6a51d6477c169df641127a2a2df064c9d99c90c067ac3d7
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBAgAGBQJPx4dlAAoJEOSiRoyO7jvov2oQAJnsDBADahxxF9FmLCxTJlFa
+KpHdoUnH9Fpuh/VJge4WIxLoZIU5gPBXRJ47dlt2YrOvxlEVL8agVAtlkOn8JoBY
+K5sikYHvpQXXBVx+a5a57FR2VVtRh5rk4A/6pnbc2Yq3eaaDGUj6Qi08a6HeHd5d
+IHZqxOmF2+wOKuxE+LbvIiJD1gSPlZcMYl4B3CATs7l+ax8cpXg0iC2suj3iL1Yw
+MDpXUqv21sFKk0v8TbWw7E6MS5Ur51horgyf73LrAkhTe0AF0BY0p9v2qOukok3T
+cz9LvfzKTR4lNcvUUekJf744a+4dF+w1N5DHCD44iN5Uh44N/6/fKfIZv66WAQqG
+jqG4afTUBQqOg8tS2p38EqMTnGi5ijTM53NjRTUSh9/wMppgSfzk+iJxh+CSP0pC
+kUhWV2TJtL92uOiKcJdyNg2owidIrVf/yShft7YMgItJrSzdPC4CUPDwwRIgtmvj
+6NeNpQxtnqs6YqthNHEJ2yeq9EbQ0poOQGMHcgz0ZVFPW71NB4mI6AMilQBEyRhk
+nl4n0dPsuCjM38aWjQ4qtx4ENfVmLIkv9tzauEwoZltTbWJbJpJ/n/A+PjDK4RXM
+LxtYZ4DgGPuRHLP0qUJFXEuAHfLiry0YA4x6D1jRUVOgGEt+btEIiXrr7JizQM9V
+Nt32SKMoyHoxc90Cvsh9
+=k1ZB
+-----END PGP SIGNATURE-----
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() {