updated motif depend and added udev rule enhancements (see bug 235855)

(Portage version: 2.2_rc8/cvs/Linux 2.6.26.1 x86_64)

5 files changed, 52 insertions, 33 deletions

diff --git a/sci-geosciences/gpsd/ChangeLog b/sci-geosciences/gpsd/ChangeLog
index c3d58fc21dda..d6e59ea9a83b 100644
--- a/sci-geosciences/gpsd/ChangeLog
+++ b/sci-geosciences/gpsd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-geosciences/gpsd
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/ChangeLog,v 1.34 2008/08/06 17:56:52 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/ChangeLog,v 1.35 2008/09/08 03:46:33 nerdboy Exp $
+
+  07 Sep 2008; Steve Arnold <nerdboy@gentoo.org> files/99-gpsd-usb.rules,
+  gpsd-2.37.ebuild:
+  Updated motif depend and added udev rule enhancements (see bug 235855).
+  Also fixed some minor QA issues.
 
   06 Aug 2008; Ulrich Mueller <ulm@gentoo.org> metadata.xml:
   Add USE flag description to metadata wrt GLEP 56.
diff --git a/sci-geosciences/gpsd/files/99-gpsd-usb.rules b/sci-geosciences/gpsd/files/99-gpsd-usb.rules
index 592b509314b8..f4ad08fa40e4 100644
--- a/sci-geosciences/gpsd/files/99-gpsd-usb.rules
+++ b/sci-geosciences/gpsd/files/99-gpsd-usb.rules
@@ -1,9 +1,19 @@
-# udev rules for the gpsd USB hotplugging (without hotplug)
+# udev rules for the gpsd USB hotplugging
 
 SUBSYSTEM!="tty", GOTO="gpsd-usb_rules_end"
-ACTION!="add", GOTO="gpsd-usb_rules_end"
 
-KERNEL=="ttyUSB[0-9]*", SYMLINK="gps%n", RUN+="/etc/hotplug/usb/gpsd.hotplug add $root/%k"
+SYSFS{idVendor}=="067b", SYSFS{idProduct}=="2303", SUBSYSTEM=="tty", ACTION=="add", KERNEL=="ttyUSB[0-9]*", SYMLINK="gps%n", RUN+="/etc/hotplug/usb/gpsd.hotplug add $root/%k"
+SYSFS{idVendor}=="067b", SYSFS{idProduct}=="2303", SUBSYSTEM=="tty", ACTION=="remove", KERNEL=="ttyUSB[0-9]*", RUN+="/etc/hotplug/usb/gpsd.hotplug remove $root/%k"
+SYSFS{idVendor}=="0403", SYSFS{idProduct}=="6001", SUBSYSTEM=="tty", ACTION=="add", KERNEL=="ttyUSB[0-9]*", SYMLINK="gps%n", RUN+="/etc/hotplug/usb/gpsd.hotplug add $root/%k"
+SYSFS{idVendor}=="0403", SYSFS{idProduct}=="6001", SUBSYSTEM=="tty", ACTION=="remove", KERNEL=="ttyUSB[0-9]*", RUN+="/etc/hotplug/usb/gpsd.hotplug remove $root/%k"
+SYSFS{idVendor}=="1163", SYSFS{idProduct}=="0100", SUBSYSTEM=="tty", ACTION=="add", KERNEL=="ttyUSB[0-9]*", SYMLINK="gps%n", RUN+="/etc/hotplug/usb/gpsd.hotplug add $root/%k"
+SYSFS{idVendor}=="1163", SYSFS{idProduct}=="0100", SUBSYSTEM=="tty", ACTION=="remove", KERNEL=="ttyUSB[0-9]*", RUN+="/etc/hotplug/usb/gpsd.hotplug remove $root/%k"
+SYSFS{idVendor}=="067b", SYSFS{idProduct}=="aaa0", SUBSYSTEM=="tty", ACTION=="add", KERNEL=="ttyUSB[0-9]*", SYMLINK="gps%n", RUN+="/etc/hotplug/usb/gpsd.hotplug add $root/%k"
+SYSFS{idVendor}=="067b", SYSFS{idProduct}=="aaa0", SUBSYSTEM=="tty", ACTION=="remove", KERNEL=="ttyUSB[0-9]*", RUN+="/etc/hotplug/usb/gpsd.hotplug remove $root/%k"
+SYSFS{idVendor}=="091e", SYSFS{idProduct}=="0003", SUBSYSTEM=="tty", ACTION=="add", KERNEL=="ttyUSB[0-9]*", SYMLINK="gps%n", RUN+="/etc/hotplug/usb/gpsd.hotplug add $root/%k"
+SYSFS{idVendor}=="091e", SYSFS{idProduct}=="0003", SUBSYSTEM=="tty", ACTION=="remove", KERNEL=="ttyUSB[0-9]*", RUN+="/etc/hotplug/usb/gpsd.hotplug remove $root/%k"
+#SYSFS{idVendor}=="", SYSFS{idProduct}=="", SUBSYSTEM=="tty", ACTION=="add", KERNEL=="ttyUSB[0-9]*", SYMLINK="gps%n", RUN+="/etc/hotplug/usb/gpsd.hotplug add $root/%k"
+#SYSFS{idVendor}=="", SYSFS{idProduct}=="", SUBSYSTEM=="tty", ACTION=="remove", KERNEL=="ttyUSB[0-9]*", RUN+="/etc/hotplug/usb/gpsd.hotplug remove $root/%k"
 
 LABEL="gpsd-usb_rules_end"
 
diff --git a/sci-geosciences/gpsd/gpsd-2.32.ebuild b/sci-geosciences/gpsd/gpsd-2.32.ebuild
index 5904a5217720..2dd70ab07c67 100644
--- a/sci-geosciences/gpsd/gpsd-2.32.ebuild
+++ b/sci-geosciences/gpsd/gpsd-2.32.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-2.32.ebuild,v 1.7 2008/06/27 10:31:15 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-2.32.ebuild,v 1.8 2008/09/08 03:46:33 nerdboy Exp $
 
 inherit eutils libtool distutils
 
@@ -29,9 +29,7 @@ RDEPEND="X? (
 	usb? ( sys-apps/hotplug )
 	dbus? ( >=sys-apps/dbus-0.6 )
 	dev-lang/python
-	app-text/xmlto
-	virtual/libc
-	sys-devel/gcc"
+	app-text/xmlto"
 
 DEPEND="${RDEPEND}
 	X? (
diff --git a/sci-geosciences/gpsd/gpsd-2.34-r1.ebuild b/sci-geosciences/gpsd/gpsd-2.34-r1.ebuild
index bc00ebd91155..ba0da377607e 100644
--- a/sci-geosciences/gpsd/gpsd-2.34-r1.ebuild
+++ b/sci-geosciences/gpsd/gpsd-2.34-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-2.34-r1.ebuild,v 1.6 2008/06/27 10:31:15 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-2.34-r1.ebuild,v 1.7 2008/09/08 03:46:33 nerdboy Exp $
 
 WANT_AUTOMAKE="latest"
 WANT_AUTOCONF=2.5
@@ -9,7 +9,7 @@ inherit eutils autotools 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"
+SRC_URI="mirror://berlios/gpsd/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/sci-geosciences/gpsd/gpsd-2.37.ebuild b/sci-geosciences/gpsd/gpsd-2.37.ebuild
index da0ff55f5161..62f50577b8e6 100644
--- a/sci-geosciences/gpsd/gpsd-2.37.ebuild
+++ b/sci-geosciences/gpsd/gpsd-2.37.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-2.37.ebuild,v 1.2 2008/06/27 10:31:15 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-2.37.ebuild,v 1.3 2008/09/08 03:46:33 nerdboy Exp $
 
 inherit eutils distutils
 
@@ -86,7 +86,7 @@ src_compile() {
 
 src_install() {
 
-	make DESTDIR="${D}" install
+	make DESTDIR="${D}" install || die "make install failed"
 
 	if use usb ; then
 		insinto /etc/hotplug/usb
@@ -131,25 +131,31 @@ src_install() {
 }
 
 pkg_postinst() {
-	einfo ""
-	einfo "This version of gpsd has broken the support for the TNT compass"
-	einfo "and Garmin so they are disabled.  If you need it, stay with the"
-	einfo "previous version for now.  The minimal flag now removes X and"
-	einfo "enables the embedded device (ie, small footprint) support, but"
-	einfo "you'll need to modify the ebuild if you need to change either"
-	einfo "the number of clients or the number of devices.  Although pps"
-	einfo "is enabled, it still needs the correct kernel patches.  All"
-	einfo "recent versions of udev (>=udev-115 or so) should have correct"
-	einfo "usb device detection and startup of gpsd (ie, without hotplug)."
-	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 udev/hotplug support."
-	einfo ""
-	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 ""
+	elog ""
+	elog "This version of gpsd has broken the support for the TNT compass"
+	elog "and Garmin so they are disabled.  If you need it, stay with the"
+	elog "previous version for now.  The minimal flag now removes X and"
+	elog "enables the embedded device (ie, small footprint) support, but"
+	elog "you'll need to modify the ebuild if you need to change either"
+	elog "the number of clients or the number of devices.  Although pps"
+	elog "is enabled, it still needs the correct kernel patches.  All"
+	elog "recent versions of udev (>=udev-115 or so) should have correct"
+	elog "usb device detection and startup of gpsd (ie, without hotplug)."
+	elog ""
+	elog "Different GPS devices require the corresponding kernel options"
+	elog "to be enabled, such as USB_SERIAL_GARMIN, or a USB serial driver"
+	elog "for an adapter such as those that come with Deluo GPS units (eg,"
+	elog "USB_SERIAL_PL2303). Straight serial devices should always work,"
+	elog "even without udev/hotplug support."
+	elog ""
+	elog "Note: the supplied gpsd udev rules are now device-specific, so"
+	elog "if your device isn't detected correctly, please use lsusb or"
+	elog "another suitable tool to determine the proper device IDs and"
+	elog "use the commented rules to fill in the blanks for your device."
+	elog "Please file a bug to get your device added to the list."
+	elog ""
+	elog "Read the INSTALL doc for more information on supported hardware,"
+	elog "and make sure udev has the right group permissions set on the tty"
+	elog "devices if using USB (it should Do The Right Thing (TM))..."
+	elog ""
 }