version bump, fix for bug #107147, and cleanup of old ebuilds

(Portage version: 2.0.51.22-r2)

7 files changed, 1 insertions, 155 deletions

diff --git a/sci-geosciences/gpsd/files/digest-gpsd-2.25-r1 b/sci-geosciences/gpsd/files/digest-gpsd-2.25-r1
deleted file mode 100644
index 7c015bc52257..000000000000
--- a/sci-geosciences/gpsd/files/digest-gpsd-2.25-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6341f5c804993513151b756846b685a9 gpsd-2.25.tar.gz 477056
diff --git a/sci-geosciences/gpsd/files/digest-gpsd-2.26 b/sci-geosciences/gpsd/files/digest-gpsd-2.26
deleted file mode 100644
index 9b0fd31c491e..000000000000
--- a/sci-geosciences/gpsd/files/digest-gpsd-2.26
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8db7dc0ff2f75a9d208bd3885abb25db gpsd-2.26.tar.gz 502740
diff --git a/sci-geosciences/gpsd/files/digest-gpsd-2.30 b/sci-geosciences/gpsd/files/digest-gpsd-2.30
new file mode 100644
index 000000000000..ecc5972fc2b2
--- /dev/null
+++ b/sci-geosciences/gpsd/files/digest-gpsd-2.30
@@ -0,0 +1 @@
+MD5 dde177174878e8ae6db15f8010da46dd gpsd-2.30.tar.gz 605997
diff --git a/sci-geosciences/gpsd/files/gpsd-2.25-SiRF.patch b/sci-geosciences/gpsd/files/gpsd-2.25-SiRF.patch
deleted file mode 100644
index 5f4bb5a4d9e0..000000000000
--- a/sci-geosciences/gpsd/files/gpsd-2.25-SiRF.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- libgpsd_core.c.orig	2005-05-30 20:17:49.000000000 -0700
-+++ libgpsd_core.c	2005-05-30 20:19:49.000000000 -0700
-@@ -407,7 +407,7 @@
-     gmtime_r(&intfixtime, &tm);
-     if (session->gpsdata.fix.mode > 1) {
- 	sprintf(bufp,
--		"$GPGGA,%02d%02d%02d,%07.4f,%c,%08.4f,%c,%d,%02d,%s,%.1f,%c,",
-+		"$GPGGA,%02d%02d%02d,%09.4f,%c,%010.4f,%c,%d,%02d,%s,%.1f,%c,",
- 		tm.tm_hour,
- 		tm.tm_min,
- 		tm.tm_sec,
-@@ -435,7 +435,7 @@
- 	bufp += strlen(bufp);
-     }
-     sprintf(bufp,
--	    "$GPRMC,%02d%02d%02d,%c,%07.4f,%c,%08.4f,%c,%.4f,%.3f,%02d%02d%02d,,",
-+	    "$GPRMC,%02d%02d%02d,%c,%09.4f,%c,%010.4f,%c,%.4f,%.3f,%02d%02d%02d,,",
- 	    tm.tm_hour, 
- 	    tm.tm_min, 
- 	    tm.tm_sec,
diff --git a/sci-geosciences/gpsd/files/gpsd-2.25-y-format.patch b/sci-geosciences/gpsd/files/gpsd-2.25-y-format.patch
deleted file mode 100644
index 0eb646cda6c0..000000000000
--- a/sci-geosciences/gpsd/files/gpsd-2.25-y-format.patch
+++ /dev/null
@@ -1,95 +0,0 @@
---- gps.py.orig	2005-05-16 18:27:07.000000000 -0700
-+++ gps.py	2005-05-28 11:56:33.000000000 -0700
-@@ -319,46 +319,47 @@
-                     if self.fix.epc:
-                         self.valid |= CLIMBERR_SET
- 	    elif cmd in ('P', 'p'):
--	      (self.fix.latitude, self.fix.longitude) = map(float, data.split())
--              self.valid |= LATLON_SET
-+                (self.fix.latitude, self.fix.longitude) = map(float, data.split())
-+                self.valid |= LATLON_SET
- 	    elif cmd in ('Q', 'q'):
--	      parts = data.split()
--	      self.satellites_used = int(parts[0])
--	      (self.pdop, self.hdop, self.vdop) = map(float, parts[1:])
--              self.valid |= HDOP_SET | VDOP_SET | PDOP_SET
-+                parts = data.split()
-+                self.satellites_used = int(parts[0])
-+                (self.pdop, self.hdop, self.vdop) = map(float, parts[1:])
-+                self.valid |= HDOP_SET | VDOP_SET | PDOP_SET
- 	    elif cmd in ('S', 's'):
--	      self.status = int(data)
--              self.valid |= STATUS_SET
-+                self.status = int(data)
-+                self.valid |= STATUS_SET
- 	    elif cmd in ('T', 't'):
--	      self.fix.track = float(data)
--              self.valid |= TRACK_SET
-+                self.fix.track = float(data)
-+                self.valid |= TRACK_SET
- 	    elif cmd in ('U', 'u'):
--	      self.fix.climb = float(data)
--              self.valid |= CLIMB_SET
-+                self.fix.climb = float(data)
-+                self.valid |= CLIMB_SET
- 	    elif cmd in ('V', 'v'):
--	      self.fix.speed = float(data)
--              self.valid |= SPEED_SET
-+                self.fix.speed = float(data)
-+                self.valid |= SPEED_SET
- 	    elif cmd in ('X', 'x'):
--              if data == '?':
--                  self.online = -1
--                  self.device = None
--              else:
--                  self.online = float(data)
--                  self.valid |= ONLINE_SET
-+                if data == '?':
-+                    self.online = -1
-+                    self.device = None
-+                else:
-+                    self.online = float(data)
-+                    self.valid |= ONLINE_SET
- 	    elif cmd in ('Y', 'y'):
- 	      satellites = data.split(":")
--              self.timings.sentence_tag = satellites.pop(0)
--	      self.timings.sentence_time = satellites.pop(0)
-+              prefix = satellites.pop(0).split()
-+              self.timings.sentence_tag = prefix.pop(0)
-+	      self.timings.sentence_time = prefix.pop(0)
-               if self.timings.sentence_time != "?":
--                  float(self.timings.sentence_time)
--	      d1 = int(satellites.pop(0))
-+                  self.timings.sentence_time = float(self.timings.sentence_time)
-+	      d1 = int(prefix.pop(0))
- 	      newsats = []
- 	      for i in range(d1):
- 		newsats.append(gps.satellite(*map(int, satellites[i].split())))
- 	      self.satellites = newsats
-               self.valid |= SATELLITE_SET
- 	    elif cmd in ('Z', 'z'):
--              self.profiling = (data[0] == '1')
-+                self.profiling = (data[0] == '1')
-             elif cmd == '$':
-                 self.timings.collect(*data.split())
- 	if self.raw_hook:
-@@ -373,12 +374,13 @@
-             sys.stderr.write("GPS DATA %s\n" % repr(data))
-         self.timings.c_recv_time = time.time()
- 	self.__unpack(data)
--        if self.timings.sentence_time:
--            basetime = self.timings.sentence_time
--        else:
--            basetime = self.timings.d_xmit_time
--        self.timings.c_decode_time = time.time() - basetime
--        self.timings.c_recv_time -= basetime
-+        if self.profiling:
-+            if self.timings.sentence_time != '?':
-+                basetime = self.timings.sentence_time
-+            else:
-+                basetime = self.timings.d_xmit_time
-+            self.timings.c_decode_time = time.time() - basetime
-+            self.timings.c_recv_time -= basetime
-         return 0
- 
-     def query(self, commands):
diff --git a/sci-geosciences/gpsd/files/gpsd-2.26-dbus.patch b/sci-geosciences/gpsd/files/gpsd-2.26-dbus.patch
deleted file mode 100644
index 503dda271439..000000000000
--- a/sci-geosciences/gpsd/files/gpsd-2.26-dbus.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Index: gpsd_dbus.c
-===================================================================
---- gpsd_dbus.c	(revision 223)
-+++ gpsd_dbus.c	(working copy)
-@@ -57,7 +57,6 @@
-     dbus_message_iter_append_double(&iter, gpsfix->eps);
-     dbus_message_iter_append_double(&iter, gpsfix->climb);
-     dbus_message_iter_append_double(&iter, gpsfix->epc);
--    dbus_message_iter_append_double(&iter, gpsfix->separation);
- 
-     dbus_message_set_no_reply(message, TRUE);
- 
-Index: gpsd_dbus.h
-===================================================================
---- gpsd_dbus.h	(revision 223)
-+++ gpsd_dbus.h	(working copy)
-@@ -8,7 +8,7 @@
- #include <dbus/dbus.h>
- #include <gpsd.h>
- 
--int initialize_dbus_conection (void);
-+int initialize_dbus_connection (void);
- void send_dbus_fix (struct gps_device_t* channel);
- 
- #endif /* _gpsd_dbus_h_ */
diff --git a/sci-geosciences/gpsd/files/gpsd-2.26-python.patch b/sci-geosciences/gpsd/files/gpsd-2.26-python.patch
deleted file mode 100644
index 55ce4dbcc6db..000000000000
--- a/sci-geosciences/gpsd/files/gpsd-2.26-python.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: gpsd.hotplug
-===================================================================
---- gpsd.hotplug        (revision 232)
-+++ gpsd.hotplug        (working copy)
-@@ -3,7 +3,7 @@
- # This script is part of the gpsd distribution: see http://gpsd.berlios.de
- # Can be called like "gpsd.hotplug [add|remove] /dev/ttyUSB0" for test
- # purposes.
--import sys, os, syslog, glob, socket, stat
-+import sys, os, syslog, glob, socket, stat, time
- 
- CONTROL_SOCKET =3D "/var/run/gpsd.sock"
- WHEREAMI =3D "/etc/hotplug/usb/gpsd.hotplug"
\ No newline at end of file