Updated sed handling and udev rules for syntax changes (see bug 301887).

(Portage version: 2.2_rc61/cvs/Linux x86_64)

3 files changed, 17 insertions, 10 deletions

diff --git a/sci-geosciences/gpsd/ChangeLog b/sci-geosciences/gpsd/ChangeLog
index f9c1cf6ea165..4334ed228c03 100644
--- a/sci-geosciences/gpsd/ChangeLog
+++ b/sci-geosciences/gpsd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-geosciences/gpsd
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/ChangeLog,v 1.47 2010/01/24 01:48:18 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/ChangeLog,v 1.48 2010/02/13 20:04:44 nerdboy Exp $
+
+  13 Feb 2010; Steve Arnold <nerdboy@gentoo.org> files/99-gpsd-usb.rules,
+  gpsd-2.39-r1.ebuild:
+  Updated udev rules for syntax changes (see bug 301887) and restricted 
+  sed to the first 7 lines of the rules file (when USE=pl2303 is enabled).
 
   24 Jan 2010; Steve Arnold <nerdboy@gentoo.org> gpsd-2.39-r1.ebuild:
   Updated sed target for new udev rule syntax (oops)...
diff --git a/sci-geosciences/gpsd/files/99-gpsd-usb.rules b/sci-geosciences/gpsd/files/99-gpsd-usb.rules
index 98d623274de9..992a26cd0c8f 100644
--- a/sci-geosciences/gpsd/files/99-gpsd-usb.rules
+++ b/sci-geosciences/gpsd/files/99-gpsd-usb.rules
@@ -3,17 +3,18 @@
 SUBSYSTEM!="tty", GOTO="gpsd-usb_rules_end"
 
 #ATTRS{idVendor}=="067b", ATTRS{idProduct}=="2303", SUBSYSTEM=="tty", ACTION=="add", KERNEL=="ttyUSB[0-9]*", SYMLINK="gps%n", RUN+="/etc/hotplug/usb/gpsd.hotplug add $root/%k"
-#ATTRS{idVendor}=="067b", ATTRS{idProduct}=="2303", SUBSYSTEM=="tty", ACTION=="remove", KERNEL=="ttyUSB[0-9]*", RUN+="/etc/hotplug/usb/gpsd.hotplug remove $root/%k"
+#ENV{ID_VENDOR_ID}=="067b", ENV{ID_MODEL_ID}=="2303", SUBSYSTEM=="tty", ACTION=="remove", KERNEL=="ttyUSB[0-9]*", RUN+="/etc/hotplug/usb/gpsd.hotplug remove $root/%k"
 ATTRS{idVendor}=="0403", ATTRS{idProduct}=="6001", SUBSYSTEM=="tty", ACTION=="add", KERNEL=="ttyUSB[0-9]*", SYMLINK="gps%n", RUN+="/etc/hotplug/usb/gpsd.hotplug add $root/%k"
-ATTRS{idVendor}=="0403", ATTRS{idProduct}=="6001", SUBSYSTEM=="tty", ACTION=="remove", KERNEL=="ttyUSB[0-9]*", RUN+="/etc/hotplug/usb/gpsd.hotplug remove $root/%k"
+ENV{ID_VENDOR_ID}=="067b", ENV{ID_MODEL_ID}=="6001", SUBSYSTEM=="tty", ACTION=="remove", KERNEL=="ttyUSB[0-9]*", RUN+="/etc/hotplug/usb/gpsd.hotplug remove $root/%k"
 ATTRS{idVendor}=="1163", ATTRS{idProduct}=="0100", SUBSYSTEM=="tty", ACTION=="add", KERNEL=="ttyUSB[0-9]*", SYMLINK="gps%n", RUN+="/etc/hotplug/usb/gpsd.hotplug add $root/%k"
-ATTRS{idVendor}=="1163", ATTRS{idProduct}=="0100", SUBSYSTEM=="tty", ACTION=="remove", KERNEL=="ttyUSB[0-9]*", RUN+="/etc/hotplug/usb/gpsd.hotplug remove $root/%k"
+ENV{ID_VENDOR_ID}=="067b", ENV{ID_MODEL_ID}=="0100", SUBSYSTEM=="tty", ACTION=="remove", KERNEL=="ttyUSB[0-9]*", RUN+="/etc/hotplug/usb/gpsd.hotplug remove $root/%k"
 ATTRS{idVendor}=="067b", ATTRS{idProduct}=="aaa0", SUBSYSTEM=="tty", ACTION=="add", KERNEL=="ttyUSB[0-9]*", SYMLINK="gps%n", RUN+="/etc/hotplug/usb/gpsd.hotplug add $root/%k"
-ATTRS{idVendor}=="067b", ATTRS{idProduct}=="aaa0", SUBSYSTEM=="tty", ACTION=="remove", KERNEL=="ttyUSB[0-9]*", RUN+="/etc/hotplug/usb/gpsd.hotplug remove $root/%k"
+ENV{ID_VENDOR_ID}=="067b", ENV{ID_MODEL_ID}=="aaa0", SUBSYSTEM=="tty", ACTION=="remove", KERNEL=="ttyUSB[0-9]*", RUN+="/etc/hotplug/usb/gpsd.hotplug remove $root/%k"
 ATTRS{idVendor}=="091e", ATTRS{idProduct}=="0003", SUBSYSTEM=="tty", ACTION=="add", KERNEL=="ttyUSB[0-9]*", SYMLINK="gps%n", RUN+="/etc/hotplug/usb/gpsd.hotplug add $root/%k"
-ATTRS{idVendor}=="091e", ATTRS{idProduct}=="0003", SUBSYSTEM=="tty", ACTION=="remove", KERNEL=="ttyUSB[0-9]*", RUN+="/etc/hotplug/usb/gpsd.hotplug remove $root/%k"
+ENV{ID_VENDOR_ID}=="067b", ENV{ID_MODEL_ID}=="0003", SUBSYSTEM=="tty", ACTION=="remove", KERNEL=="ttyUSB[0-9]*", RUN+="/etc/hotplug/usb/gpsd.hotplug remove $root/%k"
+## If your device is not found above, add it here (and please file a bug).
 #ATTRS{idVendor}=="", ATTRS{idProduct}=="", SUBSYSTEM=="tty", ACTION=="add", KERNEL=="ttyUSB[0-9]*", SYMLINK="gps%n", RUN+="/etc/hotplug/usb/gpsd.hotplug add $root/%k"
-#ATTRS{idVendor}=="", ATTRS{idProduct}=="", SUBSYSTEM=="tty", ACTION=="remove", KERNEL=="ttyUSB[0-9]*", RUN+="/etc/hotplug/usb/gpsd.hotplug remove $root/%k"
+#ENV{ID_VENDOR_ID}=="", ENV{ID_MODEL_ID}=="", 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.39-r1.ebuild b/sci-geosciences/gpsd/gpsd-2.39-r1.ebuild
index 6f44c2a1e8ff..1b0a62567779 100644
--- a/sci-geosciences/gpsd/gpsd-2.39-r1.ebuild
+++ b/sci-geosciences/gpsd/gpsd-2.39-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-2.39-r1.ebuild,v 1.2 2010/01/24 01:48:18 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-2.39-r1.ebuild,v 1.3 2010/02/13 20:04:44 nerdboy Exp $
 
 EAPI="2"
 
@@ -127,8 +127,9 @@ src_install() {
 		insinto /etc/udev/rules.d
 		doins "${FILESDIR}"/99-gpsd-usb.rules
 		if use pl2303; then
-			dosed "s:#ATTRS:ATTRS:g" \
-			    /etc/udev/rules.d/99-gpsd-usb.rules
+			sed -i -e "1,7s:#ATTRS:ATTRS:" \
+				-e "1,7s:#ENV:ENV:" \
+				"${D}"/etc/udev/rules.d/99-gpsd-usb.rules
 		fi
 		keepdir /var/run/usb # needed for REMOVER
 	else