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

(Portage version: 2.0.51.22-r2)

12 files changed, 33 insertions, 293 deletions

diff --git a/sci-geosciences/gpsd/ChangeLog b/sci-geosciences/gpsd/ChangeLog
index ef99e7331e22..2ed931539957 100644
--- a/sci-geosciences/gpsd/ChangeLog
+++ b/sci-geosciences/gpsd/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sci-geosciences/gpsd
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/ChangeLog,v 1.6 2005/09/20 05:35:39 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/ChangeLog,v 1.7 2005/10/01 05:51:09 nerdboy Exp $
+
+*gpsd-2.30 (01 Oct 2005)
+
+  01 Oct 2005; Steve Arnold <nerdboy@gentoo.org>
+  -files/gpsd-2.25-SiRF.patch, -files/gpsd-2.25-y-format.patch,
+  -files/gpsd-2.26-dbus.patch, -files/gpsd-2.26-python.patch,
+  -gpsd-2.25-r1.ebuild, -gpsd-2.26.ebuild, gpsd-2.29.ebuild,
+  +gpsd-2.30.ebuild:
+  version bump, fix for bug #107147, and cleanup of old ebuilds
 
   20 Sep 2005; Steve Arnold <nerdboy@gentoo.org> gpsd-2.25-r1.ebuild,
   gpsd-2.26.ebuild, gpsd-2.29.ebuild:
diff --git a/sci-geosciences/gpsd/Manifest b/sci-geosciences/gpsd/Manifest
index 0d785c6e36e3..75d23baaf565 100644
--- a/sci-geosciences/gpsd/Manifest
+++ b/sci-geosciences/gpsd/Manifest
@@ -1,15 +1,9 @@
+MD5 f9fe720c04ebcb02b147abf5481c0cb9 gpsd-2.30.ebuild 3288
 MD5 78ec9f0a49a5a89267a4b8953d904de9 metadata.xml 420
-MD5 c2148aa97b15111626100d742efb4b0e gpsd-2.26.ebuild 3663
-MD5 06abd64a37276166c347f448ae91db73 ChangeLog 1729
-MD5 8c98384492e348e733d35dc66fbd6ee8 gpsd-2.25-r1.ebuild 3684
-MD5 11ac700a898d9419828b53b6cf38dcba gpsd-2.29.ebuild 3258
+MD5 c87940db8d6f5d92a474802df06a70a2 ChangeLog 2077
+MD5 ed60d2000d1ea9b5b81443672925c695 gpsd-2.29.ebuild 3287
 MD5 f6622a741ad185c494741151fac6f920 files/40-usb-serial.rules 212
 MD5 b84a0fec652fc8df8b533eb160055841 files/gpsd.conf 867
 MD5 56fd36d7f177ce4c229e2d61abcf7d15 files/gpsd.init 949
-MD5 7e6d1d3e16536b0ccd1ad7f0c0d92c58 files/gpsd-2.25-y-format.patch 3987
+MD5 e8fb5fa1cab2ca71f1b1d0f3179f4370 files/digest-gpsd-2.30 61
 MD5 45dc7d436da7eb835597bd28d5f6d292 files/digest-gpsd-2.29 61
-MD5 20476e3f2208bbe360308b3d159b7d47 files/gpsd-2.26-dbus.patch 830
-MD5 99f9af655eb3229584632db5cc25d3a5 files/gpsd-2.26-python.patch 525
-MD5 516c464c491b74356c0583f15bbf754e files/digest-gpsd-2.26 61
-MD5 355d862d9200d39a11a276b18109254f files/gpsd-2.25-SiRF.patch 681
-MD5 2760a88bc02861b5ff0f752758db08a3 files/digest-gpsd-2.25-r1 61
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
diff --git a/sci-geosciences/gpsd/gpsd-2.25-r1.ebuild b/sci-geosciences/gpsd/gpsd-2.25-r1.ebuild
deleted file mode 100644
index 40327c5cfa6b..000000000000
--- a/sci-geosciences/gpsd/gpsd-2.25-r1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-2.25-r1.ebuild,v 1.2 2005/09/20 05:35:39 nerdboy Exp $
-
-inherit eutils libtool distutils
-
-DESCRIPTION="GPS daemon and library to support USB/serial GPS devices and various GPS/mapping clients."
-HOMEPAGE="http://gpsd.berlios.de/"
-SRC_URI="http://download.berlios.de/gpsd/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64 ~ppc64 ~sparc ~arm"
-
-IUSE="X usb dbus"
-
-DEPEND="X? ( virtual/motif
-		virtual/x11
-	)
-	usb? ( sys-apps/hotplug )
-	dbus? ( =sys-apps/dbus-0.23.4* )
-	dev-lang/python
-	app-text/xmlto
-	virtual/libc
-	sys-devel/gcc"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	# remove patch for >=2.27
-	epatch ${FILESDIR}/${P}-y-format.patch
-	epatch ${FILESDIR}/${P}-SiRF.patch
-	elibtoolize
-}
-
-src_compile() {
-	distutils_python_version
-	export MY_ECONF="--with-gnu-ld --with-pic $(use_with X x) \
-	    $(use_enable dbus)"
-	econf ${MY_ECONF} || die "econf failed"
-	emake LDFLAGS="${LDFLAGS} -lm" || die "emake failed"
-}
-
-src_install() {
-	cd ${S}
-	make DESTDIR=${D} install
-
-	if use usb ; then
-	    sed -i -e "s/gpsd.hotplug/gpsd/g" gpsd.hotplug gpsd.usermap
-	    insinto /etc/hotplug/usb
-	    doins gpsd.usermap
-	    exeinto /etc/hotplug/usb
-	    newexe gpsd.hotplug gpsd
-	else
-	    newconfd ${FILESDIR}/gpsd.conf gpsd
-	    newinitd ${FILESDIR}/gpsd.init gpsd
-	fi
-	if use X ; then
-	    insinto /usr/lib/X11/app-defaults
-	    newins xgps.ad xgps
-	    newins xgpsspeed.ad xgpsspeed
-	fi
-	dobin logextract
-	diropts "-m0644"
-	exeinto /usr/$(get_libdir)/python${PYVER}/site-packages
-	doexe gps.py
-	dodoc AUTHORS HACKING INSTALL README TODO ${FILESDIR}/40-usb-serial.rules
-}
-
-pkg_postinst() {
-	einfo "To use hotplugging (USB devices) your kernel has to be compiled"
-	einfo "with CONFIG_HOTPLUG enabled and sys-apps/hotplug must be emerged"
-	einfo "(both usb and dbus support are optional)."
-	einfo
-	einfo "Different GPS devices require the corresponding kernel options"
-	einfo "to be enabled, such as USB_SERIAL_GARMIN, or a USB serial driver"
-	einfo "for an adapter, such as those that come with Deluo GPS units (eg,"
-	einfo "USB_SERIAL_PL2303). Straight serial devices should always work,"
-	einfo "even without hotplug support."
-	ewarn
-	ewarn "The current gpsd may not start correctly except when run manually"
-	ewarn "via sudo with wheel permissions (or directly as root using the"
-	ewarn "supplied init script).  Depending on system configuration, hotplug"
-	ewarn "doesn't always get the right device permissions (we're working on"
-	ewarn "it). If your client connection shows no data when gpsd is started"
-	ewarn "via the normal hotplug action, then kill the existing gpsd process"
-	ewarn "and try starting it directly via something like:"
-	ewarn "sudo /usr/sbin/gpsd -p /dev/ttyUSB0"
-	ewarn "or whatever your device is. This will verify whether your device"
-	ewarn "is working or not."
-	ewarn
-	einfo "Read the INSTALL doc for more information on supported hardware,"
-	einfo "and make sure udev has the right group permissions set on the tty"
-	einfo "devices if using USB (it should Do The Right Thing (TM))..."
-	einfo
-	einfo "Finally, the default gpsd setup looks for /dev/ttyUSB0, in the"
-	einfo "case of the USB-serial adapter mentioned above.  Depending on"
-	einfo "your default device scheme (ie, udev, devfs, static), you will"
-	einfo "need to create a device alias if the default name is different."
-	einfo "A udev rule file has been provided with an example rule in the"
-	einfo "docs directory.  If the device names are correct, gpsd will"
-	einfo "start automatically when the GPS device is plugged in."
-}
diff --git a/sci-geosciences/gpsd/gpsd-2.29.ebuild b/sci-geosciences/gpsd/gpsd-2.29.ebuild
index 885a789ce9a0..07b4b9b1a838 100644
--- a/sci-geosciences/gpsd/gpsd-2.29.ebuild
+++ b/sci-geosciences/gpsd/gpsd-2.29.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-2.29.ebuild,v 1.2 2005/09/20 05:35:39 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-2.29.ebuild,v 1.3 2005/10/01 05:51:09 nerdboy Exp $
 
 inherit eutils libtool distutils
 
@@ -18,7 +18,7 @@ DEPEND="X? ( virtual/motif
 		virtual/x11
 	)
 	usb? ( sys-apps/hotplug )
-	dbus? ( =sys-apps/dbus-0.23.4* )
+	dbus? ( ~sys-apps/dbus-0.23.4 )
 	dev-lang/python
 	app-text/xmlto
 	virtual/libc
@@ -52,14 +52,14 @@ src_install() {
 	    newinitd ${FILESDIR}/gpsd.init gpsd
 	fi
 	if use X ; then
-	    insinto /usr/lib/X11/app-defaults
-	    newins xgps.ad xgps
-	    newins xgpsspeed.ad xgpsspeed
+	    insinto /usr/$(get_libdir)/X11/app-defaults
+	    newins xgps.ad Xgps
+	    newins xgpsspeed.ad Xgpsspeed
 	fi
 	dobin logextract
 	diropts "-m0644"
-	exeinto /usr/lib/python${PYVER}/site-packages
-	doexe gps.py
+	exeinto /usr/$(get_libdir)/python${PYVER}/site-packages
+	doexe gps.py gpsfake.py
 	dodoc AUTHORS HACKING INSTALL README TODO ${FILESDIR}/40-usb-serial.rules
 }
 
diff --git a/sci-geosciences/gpsd/gpsd-2.26.ebuild b/sci-geosciences/gpsd/gpsd-2.30.ebuild
index 01201dbdfe9b..5f6a6503eaf8 100644
--- a/sci-geosciences/gpsd/gpsd-2.26.ebuild
+++ b/sci-geosciences/gpsd/gpsd-2.30.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-2.26.ebuild,v 1.4 2005/09/20 05:35:39 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-2.30.ebuild,v 1.1 2005/10/01 05:51:09 nerdboy Exp $
 
 inherit eutils libtool distutils
 
@@ -15,9 +15,10 @@ KEYWORDS="~x86 ~ppc ~amd64 ~ppc64 ~sparc ~arm"
 IUSE="X usb dbus"
 
 DEPEND="X? ( virtual/motif
-		virtual/x11 )
+		virtual/x11
+	)
 	usb? ( sys-apps/hotplug )
-	dbus? ( =sys-apps/dbus-0.23.4* )
+	dbus? ( ~sys-apps/dbus-0.23.4 )
 	dev-lang/python
 	app-text/xmlto
 	virtual/libc
@@ -26,9 +27,6 @@ DEPEND="X? ( virtual/motif
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	# remove patches for >=2.27
-	epatch ${FILESDIR}/${P}-python.patch
-	epatch ${FILESDIR}/${P}-dbus.patch
 	elibtoolize
 }
 
@@ -54,14 +52,14 @@ src_install() {
 	    newinitd ${FILESDIR}/gpsd.init gpsd
 	fi
 	if use X ; then
-	    insinto /usr/lib/X11/app-defaults
-	    newins xgps.ad xgps
-	    newins xgpsspeed.ad xgpsspeed
+	    insinto /usr/$(get_libdir)/X11/app-defaults
+	    newins xgps.ad Xgps
+	    newins xgpsspeed.ad Xgpsspeed
 	fi
 	dobin logextract
 	diropts "-m0644"
-	exeinto /usr/lib/python${PYVER}/site-packages
-	doexe gps.py
+	exeinto /usr/$(get_libdir)/python${PYVER}/site-packages
+	doexe gps.py gpsfake.py
 	dodoc AUTHORS HACKING INSTALL README TODO ${FILESDIR}/40-usb-serial.rules
 }
 
@@ -76,12 +74,8 @@ pkg_postinst() {
 	einfo "USB_SERIAL_PL2303). Straight serial devices should always work,"
 	einfo "even without hotplug support."
 	ewarn
-	ewarn "The current gpsd may not start correctly except when run manually"
-	ewarn "via sudo with wheel permissions (or directly as root using the"
-	ewarn "supplied init script).  Depending on system configuration, hotplug"
-	ewarn "doesn't always get the right device permissions (we're working on"
-	ewarn "it). If your client connection shows no data when gpsd is started"
-	ewarn "via the normal hotplug action, then kill the existing gpsd process"
+	ewarn "If your client connection shows no data when gpsd is started via"
+	ewarn "the normal hotplug action, then kill the existing gpsd process"
 	ewarn "and try starting it directly via something like:"
 	ewarn "sudo /usr/sbin/gpsd -p /dev/ttyUSB0"
 	ewarn "or whatever your device is. This will verify whether your device"