diff options
| author |   Steve Arnold <nerdboy@gentoo.org> | 2010-02-13 20:04:45 +0000 |
|---|---|---|
| committer | Steve Arnold <nerdboy@gentoo.org> | 2010-02-13 20:04:45 +0000 |
| commit | 154090a2d4b63518abe7c81bc69d42ffd9a7c6d5 (patch) | |
| tree | 84a2da15c3d1db0c449b7040a6c7ffcff59719c9 /sci-geosciences | |
| parent | Fix bug 294691 using virtualx (diff) | |
| download | historical-154090a2d4b63518abe7c81bc69d42ffd9a7c6d5.tar.gz historical-154090a2d4b63518abe7c81bc69d42ffd9a7c6d5.tar.bz2 historical-154090a2d4b63518abe7c81bc69d42ffd9a7c6d5.zip | |
Updated sed handling and udev rules for syntax changes (see bug 301887).
Package-Manager: portage-2.2_rc61/cvs/Linux x86_64
Diffstat (limited to 'sci-geosciences')
| -rw-r--r-- | sci-geosciences/gpsd/ChangeLog | 7 | ||||
| -rw-r--r-- | sci-geosciences/gpsd/Manifest | 6 | ||||
| -rw-r--r-- | sci-geosciences/gpsd/files/99-gpsd-usb.rules | 13 | ||||
| -rw-r--r-- | sci-geosciences/gpsd/gpsd-2.39-r1.ebuild | 7 |
4 files changed, 20 insertions, 13 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/Manifest b/sci-geosciences/gpsd/Manifest index 608317df8971..c7fb0d98a864 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 2139 RMD160 785fe6d2c48c4a9fb914ea6058ce8adc2990c7e7 SHA1 92ce8a1fead85408579ab766ddb071456ce1e3de SHA256 4edb57d92ec81a498c8878a3847f937c00668be8cc7c5ba6779ebe10f1228c45 +AUX 99-gpsd-usb.rules 2226 RMD160 2e8762cd3537800a030d7726ae827e17903bf0a4 SHA1 350158248f20fb22f52228fe0231a190c6b0d511 SHA256 a903a57382015394d638a0d6a13e796e5f0a8613ce4633f1b42182948d135b9f 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 1144 RMD160 13e4290aefa0dacc4cdb3de90d372e5d46cc1def SHA1 73657f8f0b14d803e0bf2b0575a464178ac3d734 SHA256 d41db7375281d881495f7cf9630c3b5e8c0ac1352e0dcf01e07a760066a05068 @@ -9,6 +9,6 @@ DIST gpsd-2.38.tar.gz 776598 RMD160 e5c8a05170286fd7aac87c9d182cfdf5a8f6c6b0 SHA DIST gpsd-2.39.tar.gz 834649 RMD160 9e643156a71433a02d64284130dff200eb276527 SHA1 d3f33da9f8e789119366ec4781957eed118aa08f SHA256 ee3b2fb403112c3871e7e4fdb915cdc25b020f3208318ba61e9ac37692832a21 EBUILD gpsd-2.32.ebuild 3401 RMD160 f13804b204afd6e4ef0fadaabc70601721b9f7c5 SHA1 851d86a9eaf1b80777dc171ae61332833d5c29af SHA256 ae1e659d5f9eee39c325e55ca66156d3a8678e022f30b1d0e059d2b1624763ba EBUILD gpsd-2.38.ebuild 5400 RMD160 4c17e4ebb990a723577b858bdaa62a6777b304d8 SHA1 90d9baad91bb9b64b00ccc3e18431cdb81703053 SHA256 1827d4e3d1a653df8f5246907a2e9ac7fbdf8a978591ef0dd3805eb73ef1161c -EBUILD gpsd-2.39-r1.ebuild 5526 RMD160 655131efc7446d1defa3d85c579a77fb12395111 SHA1 a9fce08959c9ca477e297d6e0bd51a6e21a7ec21 SHA256 ae61009e19372e29d9567b7c2294be4b3ca0a0c36bcbaa9facbba62e2c59683b -MISC ChangeLog 9717 RMD160 a94efc0306f9fd76c37a416384d68515620ef9ac SHA1 a4881512f5e8bb4ee61b5685133ed1d933edb741 SHA256 16b4b5fabb0af2fe715632e94b60fa3976ab8b333b5e6e935629d0ea9646e818 +EBUILD gpsd-2.39-r1.ebuild 5561 RMD160 3933de391030702427bb812257b3000a0835a73a SHA1 d560c2b5aeddfdf187afda79d6962dbc32be2599 SHA256 9efc9b8ed3552b06c239a5800c1b4f47da216166bd520e7942005f1ddc1c2578 +MISC ChangeLog 9963 RMD160 2e82d45352e91c75f284b593b8ca9d4a3bd7b952 SHA1 e65412cc064967437739bdad87081b97e0a98bcd SHA256 7510f89d3227c980749cf28d6c39bf92c50d173cf4433cff9e6fae181a669844 MISC metadata.xml 1036 RMD160 a8eb31ca3ab1bce798c241acd2978facb680d4d6 SHA1 e59e389ad669d2ec8d7bb6b51eccdc4d39adf778 SHA256 0a99a5aee08d78d720fa0b07712660cba2ea9c229ed99ca6e488f3dea5e1116e 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 |