Added workarounds to address bugs #263645, #263880, and #267936.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 20 insertions, 8 deletions

diff --git a/sci-geosciences/gpsd/ChangeLog b/sci-geosciences/gpsd/ChangeLog
index f783f11586ae..b2666c99a5aa 100644
--- a/sci-geosciences/gpsd/ChangeLog
+++ b/sci-geosciences/gpsd/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-geosciences/gpsd
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/ChangeLog,v 1.38 2009/04/18 02:15:28 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/ChangeLog,v 1.39 2009/06/05 02:34:37 nerdboy Exp $
+
+  05 Jun 2009; Steve Arnold <nerdboy@gentoo.org> files/99-gpsd-usb.rules,
+  gpsd-2.38.ebuild:
+  Updated to address several bugs: disabled PL2303 devices, added -j1, and 
+  added warning to rebuild if gpsd link error occurs.  Users of USB GPS
+  devices based on PL2303 serial adapters will need to uncomment the top
+  2 lines in the 99-gpsd-usb.rules file.
+  Bugs addressed: #263645, #263880, and #267936.
 
   18 Apr 2009; Jeroen Roovers <jer@gentoo.org> gpsd-2.38:
   Marked ~hppa (bug #260777).
diff --git a/sci-geosciences/gpsd/Manifest b/sci-geosciences/gpsd/Manifest
index a00ef6c786a2..c40f3a73779f 100644
--- a/sci-geosciences/gpsd/Manifest
+++ b/sci-geosciences/gpsd/Manifest
@@ -1,5 +1,5 @@
 AUX 40-usb-serial.rules 213 RMD160 f29e28c0ea6e349811d26676da9d9eea56dfb167 SHA1 7afbf73c4deda1f247cc4256bfd0a1cf08ec8a1c SHA256 39e131d15c59fcf23e946309a5aef91b5cbe515d2902d74aac87eeea2802c74a
-AUX 99-gpsd-usb.rules 2137 RMD160 5eea91ce46d5a2e13821eaf35976a30b32cb4556 SHA1 42c557df4e4ef18860df93d3cd96f5e04728d093 SHA256 f83eb7a74f945e48f0fc8b38358d2347ac1f2a82b903a2d165127369bd9dcca5
+AUX 99-gpsd-usb.rules 2139 RMD160 eb3bba2a845debfbf0a740bfec636a708a5dd9ea SHA1 375b1b8b2b92cb35e4893f3f3832e8d6b9cdba5e SHA256 78d048d3925c2c6ac591e0639bb219ed258405ce3bbbd8ae7ace396454c8bf75
 AUX gpsd-2.33-duplicate-device-add-hang.patch 1094 RMD160 651375eacec543581266b3bfbf996ee31f4bbc03 SHA1 b00cd23f00bdd24280664c8a38efa752838909fe SHA256 504784c891073fa8825704c9e94598fceb1c95c0750566e230ace19e7c777b83
 AUX gpsd-2.33-hotplug-background-fix.patch 2231 RMD160 1b5d0326501627ec99dd08fb10a2b0eaed2f69e1 SHA1 9ba7b5a3f802d12527ad6937121027a41ecccbce SHA256 acf258d1b15fda4aa303105a62807d28cde1173817a7e46ad719be479cf28a33
 AUX gpsd.conf 1067 RMD160 8447ea231556079586993b51836da40618b8b185 SHA1 e25bc5aa7acd239dc28fc850ab8debcdd55e8f59 SHA256 ac7e21d444926fe37377b8a6ed61773d17bf4c1faafe1474dee3e6b8d578e833
@@ -15,6 +15,6 @@ EBUILD gpsd-2.33-r1.ebuild 3849 RMD160 4ffd2c45b44a64c5025aae8cf0e74cf524d3512d
 EBUILD gpsd-2.34-r1.ebuild 4277 RMD160 765e2b3ad3a6df30feb9df6a1ff3d85466a0b6bc SHA1 154c6e0dbd8ff71ff48bbf114aa526a7a9bc3157 SHA256 703374a10fda8ba895d7888ea51a66401b69ccbeb579b31bde938bff19f4808b
 EBUILD gpsd-2.36.ebuild 4761 RMD160 df761f6ad9ff0b57079991626adf4dcb3ae48c9e SHA1 2584cbed277f0b7a2b4f100055ccf4c6f9b6ce04 SHA256 c55e0ab46e50e30bcc98e82f96965d9ef8b29bea63bf09b99a52b632c65971ec
 EBUILD gpsd-2.37.ebuild 5027 RMD160 2a55e57847c0282f8d7bc188b2b684360b442f4c SHA1 446ca40cb1c38630251119a66088d7cec64a0c7d SHA256 f943fe1ae272d65ab3f0babb44e3256766d0e8245c073347f782b1ace56ae6cb
-EBUILD gpsd-2.38.ebuild 5290 RMD160 2fdb93163a1b4726dfd52d0754d203605e84e6b0 SHA1 ccb5f3dcb76f94d3f0948fad9fe7d1a49060e462 SHA256 378da26bfcb15387a3d24a0ee12e233047deef72bb2bf68ddb7fae449f1808a4
-MISC ChangeLog 7870 RMD160 fa3fd32b88cae65778d2dd3cd2db643b5645cf4e SHA1 4736ed2caaafc070eb030dfe14357b4e6b99e47d SHA256 56d0e4404d4045260b1e26790d6bfb54cdd6e32af3eca924996fe47f38bceab0
+EBUILD gpsd-2.38.ebuild 5405 RMD160 216ee67f760bb433a3673cca9ccc49e915c549c4 SHA1 38f378f09c974ecdc1f0fc270520dbe982921981 SHA256 d0a47f98f21703d0f05059e39c5214540236101d93d58271d8dd655c4f7f3987
+MISC ChangeLog 8280 RMD160 1df6bc66dba5b718def0534e8a5a5c75e71c30ea SHA1 dd700ec63bf284d4473d219525cfee9c8aced4c4 SHA256 b26a1c9f954882b6e8d998799db01d3248f19c2dfd463c5d751f6f8380cad6f5
 MISC metadata.xml 901 RMD160 521474a3c5487fe41e33ed3067516043efab25cf SHA1 c0860dfce0113f7bf862a2e8bc02bd3dabc90c36 SHA256 66c670f114b0962ceb8df44f0132f382889cae675f97e3f8ec72423ac9fb2c5b
diff --git a/sci-geosciences/gpsd/files/99-gpsd-usb.rules b/sci-geosciences/gpsd/files/99-gpsd-usb.rules
index f4ad08fa40e4..ad7b9fe421a5 100644
--- a/sci-geosciences/gpsd/files/99-gpsd-usb.rules
+++ b/sci-geosciences/gpsd/files/99-gpsd-usb.rules
@@ -2,8 +2,8 @@
 
 SUBSYSTEM!="tty", GOTO="gpsd-usb_rules_end"
 
-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}=="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"
diff --git a/sci-geosciences/gpsd/gpsd-2.38.ebuild b/sci-geosciences/gpsd/gpsd-2.38.ebuild
index c1b63d12e548..7cb06580c54a 100644
--- a/sci-geosciences/gpsd/gpsd-2.38.ebuild
+++ b/sci-geosciences/gpsd/gpsd-2.38.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-2.38.ebuild,v 1.2 2009/04/18 02:15:28 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-2.38.ebuild,v 1.3 2009/06/05 02:34:37 nerdboy Exp $
 
 inherit autotools eutils distutils flag-o-matic
 
@@ -99,13 +99,17 @@ src_compile() {
 	# still needs an explicit linkage with the math lib (bug #250757)
 	append-ldflags -Wl,-z,-defs -Wl,--no-undefined
 
-	emake || die "emake failed"
+	emake -j1 || die "emake failed"
 }
 
 src_install() {
 
 	make DESTDIR="${D}" install || die "make install failed"
 
+	if ! test -x "${D}"usr/sbin/gpsd; then
+	    ewarn "gpsd link error detected; please re-emerge gpsd."
+	fi
+
 	if use usb ; then
 		insinto /etc/hotplug/usb
 		doins gpsd.usermap