minor version bump

(Portage version: 2.0.51.22-r2)

7 files changed, 157 insertions, 6 deletions

diff --git a/sci-geosciences/gpsd/ChangeLog b/sci-geosciences/gpsd/ChangeLog
index 413ba92eaa90..d795f3fc43b1 100644
--- a/sci-geosciences/gpsd/ChangeLog
+++ b/sci-geosciences/gpsd/ChangeLog
@@ -1,6 +1,13 @@
 # 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.2 2005/06/02 15:37:22 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/ChangeLog,v 1.3 2005/08/08 01:14:31 nerdboy Exp $
+
+*gpsd-2.26 (08 Aug 2005)
+
+  08 Aug 2005; Steve Arnold <nerdboy@gentoo.org>
+  +files/gpsd-2.26-dbus.patch, +files/gpsd-2.26-python.patch,
+  +gpsd-2.26.ebuild:
+  slightly updated, but hotplug still doesn't quite work right
 
   02 Jun 2005; Olivier Fisette <ribosome@gentoo.org> gpsd-2.25.ebuild:
   Use "virtual/motif" instead of "x11-libs/openmotif".
diff --git a/sci-geosciences/gpsd/Manifest b/sci-geosciences/gpsd/Manifest
index 54bd3083b009..a657124740b9 100644
--- a/sci-geosciences/gpsd/Manifest
+++ b/sci-geosciences/gpsd/Manifest
@@ -1,8 +1,12 @@
-MD5 e63300a85803b7e41e944ff5a7fa2f0f gpsd-2.25.ebuild 3605
-MD5 1346399318b9871d14488f0b0f2d24b7 ChangeLog 900
+MD5 2b708570ff0f783eb00021bf437611e5 gpsd-2.25.ebuild 3604
 MD5 78ec9f0a49a5a89267a4b8953d904de9 metadata.xml 420
+MD5 dacdb239e22f2cfa47b51d7e828855a0 gpsd-2.26.ebuild 3624
+MD5 c1f1efb0bb4dfad264c2d62c4c265f2a ChangeLog 1122
 MD5 f6622a741ad185c494741151fac6f920 files/40-usb-serial.rules 212
-MD5 2760a88bc02861b5ff0f752758db08a3 files/digest-gpsd-2.25 61
 MD5 b84a0fec652fc8df8b533eb160055841 files/gpsd.conf 867
 MD5 56fd36d7f177ce4c229e2d61abcf7d15 files/gpsd.init 949
 MD5 7e6d1d3e16536b0ccd1ad7f0c0d92c58 files/gpsd-2.25-y-format.patch 3987
+MD5 2760a88bc02861b5ff0f752758db08a3 files/digest-gpsd-2.25 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
diff --git a/sci-geosciences/gpsd/files/digest-gpsd-2.26 b/sci-geosciences/gpsd/files/digest-gpsd-2.26
new file mode 100644
index 000000000000..9b0fd31c491e
--- /dev/null
+++ b/sci-geosciences/gpsd/files/digest-gpsd-2.26
@@ -0,0 +1 @@
+MD5 8db7dc0ff2f75a9d208bd3885abb25db gpsd-2.26.tar.gz 502740
diff --git a/sci-geosciences/gpsd/files/gpsd-2.26-dbus.patch b/sci-geosciences/gpsd/files/gpsd-2.26-dbus.patch
new file mode 100644
index 000000000000..503dda271439
--- /dev/null
+++ b/sci-geosciences/gpsd/files/gpsd-2.26-dbus.patch
@@ -0,0 +1,25 @@
+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
new file mode 100644
index 000000000000..55ce4dbcc6db
--- /dev/null
+++ b/sci-geosciences/gpsd/files/gpsd-2.26-python.patch
@@ -0,0 +1,13 @@
+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.ebuild b/sci-geosciences/gpsd/gpsd-2.25.ebuild
index e4ac7e65aacd..af737e1d78c6 100644
--- a/sci-geosciences/gpsd/gpsd-2.25.ebuild
+++ b/sci-geosciences/gpsd/gpsd-2.25.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.25.ebuild,v 1.2 2005/06/02 15:37:22 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-2.25.ebuild,v 1.3 2005/08/08 01:14:31 nerdboy Exp $
 
 inherit eutils libtool distutils
 
@@ -15,7 +15,7 @@ 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 )
diff --git a/sci-geosciences/gpsd/gpsd-2.26.ebuild b/sci-geosciences/gpsd/gpsd-2.26.ebuild
new file mode 100644
index 000000000000..dbf98491ce48
--- /dev/null
+++ b/sci-geosciences/gpsd/gpsd-2.26.ebuild
@@ -0,0 +1,101 @@
+# 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.1 2005/08/08 01:14:31 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 )
+	dev-lang/python
+	app-text/xmlto
+	virtual/libc
+	sys-devel/gcc"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	# remove patches for >=2.27
+	epatch ${FILESDIR}/${P}-python.patch
+	epatch ${FILESDIR}/${P}-dbus.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 || 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
+	    doexe gpsd.hotplug
+	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/lib/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."
+}