reverted to strict config setup

Package-Manager: portage-2.1.2_rc4-r2

diff --git a/sci-geosciences/gpsd/ChangeLog b/sci-geosciences/gpsd/ChangeLog
index d604ba35141e611b6a4b5ea407b8e6b7600d1662..542b6465c3d7e1113f1918aca2ac2e7f87d7a13c 100644 (file)
--- a/sci-geosciences/gpsd/ChangeLog
+++ b/sci-geosciences/gpsd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-geosciences/gpsd
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/ChangeLog,v 1.24 2007/01/14 22:15:46 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/ChangeLog,v 1.25 2007/01/14 23:01:11 nerdboy Exp $
+
+  14 Jan 2007; Steve Arnold <nerdboy@gentoo.org> files/gpsd.conf,
+  files/gpsd.init:
+  reverted to strict config setup, since gpsd requires the device parameter
+  when using the init script to start gpsd with an existing device (even a
+  usb device).
 
 *gpsd-2.34 (14 Jan 2007)
 

diff --git a/sci-geosciences/gpsd/Manifest b/sci-geosciences/gpsd/Manifest
index f6d60b933d3ad8652bed134a6453bde3829fe9fa..fe1cc106a2dcd33b9b9ccf6f833ed99685a09af5 100644 (file)
--- a/sci-geosciences/gpsd/Manifest
+++ b/sci-geosciences/gpsd/Manifest
@@ -10,14 +10,14 @@ AUX gpsd-2.33-hotplug-background-fix.patch 2231 RMD160 1b5d0326501627ec99dd08fb1
 MD5 326ba3e84fdbb9707a7a9d281123feb0 files/gpsd-2.33-hotplug-background-fix.patch 2231
 RMD160 1b5d0326501627ec99dd08fb10a2b0eaed2f69e1 files/gpsd-2.33-hotplug-background-fix.patch 2231
 SHA256 acf258d1b15fda4aa303105a62807d28cde1173817a7e46ad719be479cf28a33 files/gpsd-2.33-hotplug-background-fix.patch 2231
-AUX gpsd.conf 606 RMD160 7741bab3d743e2d9c5bc8c06dcc49bdfffa42257 SHA1 12eedd665df90dc1a1f49ee3baa141a3c1efaa49 SHA256 0373e0f8008345f3088bd7e7a99d35105a6ca21f1db9ecbff2e9877898723bca
-MD5 7fffef2b1240dc90c29435f2999775df files/gpsd.conf 606
-RMD160 7741bab3d743e2d9c5bc8c06dcc49bdfffa42257 files/gpsd.conf 606
-SHA256 0373e0f8008345f3088bd7e7a99d35105a6ca21f1db9ecbff2e9877898723bca files/gpsd.conf 606
-AUX gpsd.init 717 RMD160 6c16b15fe98fc654438a1ef870942b62371415d5 SHA1 d67e0ed173afca3f3e7b5bc3a2082682bb607cc8 SHA256 684db56f3c0556183c3ca1f8aec2344d71f7067290f23712ce1d60e8858d63eb
-MD5 06eba1bdedff09c7531fd772846d4304 files/gpsd.init 717
-RMD160 6c16b15fe98fc654438a1ef870942b62371415d5 files/gpsd.init 717
-SHA256 684db56f3c0556183c3ca1f8aec2344d71f7067290f23712ce1d60e8858d63eb files/gpsd.init 717
+AUX gpsd.conf 970 RMD160 df2a14d63048e5854a046b775beb006c9232f906 SHA1 a4aebb7b4bbac15485ada0993e6942e6a4f6d244 SHA256 8d6ed6b5fa2042764300fe6b865034be2e6feec508bc58f920c4d789abd303ff
+MD5 23b4677a8bf468f4c1411f3cd2c8cb7c files/gpsd.conf 970
+RMD160 df2a14d63048e5854a046b775beb006c9232f906 files/gpsd.conf 970
+SHA256 8d6ed6b5fa2042764300fe6b865034be2e6feec508bc58f920c4d789abd303ff files/gpsd.conf 970
+AUX gpsd.init 879 RMD160 46d0fc3a1eaecb06734019d6493f59cde8b0e86f SHA1 50cb09c89fcfb04e1b302fce6101ebe9dd8ca022 SHA256 ee00fcfb7a2b8d956d7e37f91724a85509916d6a34583c8eb04a093e9066c4d3
+MD5 a65c62c0c11c67f135de7b9169b4e6ea files/gpsd.init 879
+RMD160 46d0fc3a1eaecb06734019d6493f59cde8b0e86f files/gpsd.init 879
+SHA256 ee00fcfb7a2b8d956d7e37f91724a85509916d6a34583c8eb04a093e9066c4d3 files/gpsd.init 879
 DIST gpsd-2.32.tar.gz 617947 RMD160 87cd19a4e8126ee98f8a6908829569a2a1dc5ccd SHA1 9fd6010834f1c56e755ea6515dba80431544a277 SHA256 95bee94daaf0168387152223fac186ba40d7b02657bfc0336c90edc5ea15bf10
 DIST gpsd-2.33.tar.gz 639348 RMD160 175b90cb8dda1d85964078a4f14cec84b0cc4885 SHA1 0dbb3dad459fc4a0ca7e4ba5884e67c93d4b679f SHA256 e6a055689ad05f6adba7dbb9490891a18a240d1a30e34424b3a034f4152f2c28
 DIST gpsd-2.34.tar.gz 668063 RMD160 cefe9f08c8164597bd04e51622d2175a40781bdb SHA1 96d8ab99445dc68136e4ee3622a58f4c464f7510 SHA256 39e8d629da469d2032ad3554ff502d270e1037490707d7ae0e8a2de7b06263d8
@@ -33,10 +33,10 @@ EBUILD gpsd-2.34.ebuild 3524 RMD160 c1eb77beb119169d9b7a56b930138ac4e10f15a4 SHA
 MD5 8594fdfac66472f20aa051adfee5a7e5 gpsd-2.34.ebuild 3524
 RMD160 c1eb77beb119169d9b7a56b930138ac4e10f15a4 gpsd-2.34.ebuild 3524
 SHA256 408accdd9c3d77bb2551eca2fb24f4a504d81ecb75c6c80016ae0f24767e69c7 gpsd-2.34.ebuild 3524
-MISC ChangeLog 4985 RMD160 84660c4c2cbad42a83676c76247b703ad92f4141 SHA1 2bf53bfa133b1461af6d6f05a374886aa0ea2ebc SHA256 50f60937b9a1af4dc25b9e1a5cf1d4fec95c1ca2a5d079e21b26cdd74945fada
-MD5 510c14345b5f7942623ec9b64c60cb39 ChangeLog 4985
-RMD160 84660c4c2cbad42a83676c76247b703ad92f4141 ChangeLog 4985
-SHA256 50f60937b9a1af4dc25b9e1a5cf1d4fec95c1ca2a5d079e21b26cdd74945fada ChangeLog 4985
+MISC ChangeLog 5237 RMD160 4b3d5477640c691c0b96a320a0ca9085eb7aadd0 SHA1 3533142d5dafe5e1b9ca8dca8902eb819bc47576 SHA256 4980e5cd229cac395b6e5075e61ccf842b5d6965ea947f71881b98bf08d1b8d4
+MD5 2cd49fc88443477ef9ae596be1a47758 ChangeLog 5237
+RMD160 4b3d5477640c691c0b96a320a0ca9085eb7aadd0 ChangeLog 5237
+SHA256 4980e5cd229cac395b6e5075e61ccf842b5d6965ea947f71881b98bf08d1b8d4 ChangeLog 5237
 MISC metadata.xml 432 RMD160 5af3627f9b65a58e04c58e031fcc8d911aa9d9e1 SHA1 548e9d03dacdcc4beac0d58deac74e40b9dc96e1 SHA256 5076d78647d5149ffa3fb8795e8736a785929ae0c218d80938df272a1a57b14b
 MD5 25f6cd5c06fe86c497e9e2b67a789d35 metadata.xml 432
 RMD160 5af3627f9b65a58e04c58e031fcc8d911aa9d9e1 metadata.xml 432

diff --git a/sci-geosciences/gpsd/files/gpsd.conf b/sci-geosciences/gpsd/files/gpsd.conf
index d2aa337a8e823788e97a65f98ac5fee780d37efa..b96b63aa10d87b2a4f7392aeb0a364a0d49afd02 100644 (file)
--- a/sci-geosciences/gpsd/files/gpsd.conf
+++ b/sci-geosciences/gpsd/files/gpsd.conf
@@ -1,15 +1,25 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/files/gpsd.conf,v 1.4 2007/01/14 22:15:46 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/files/gpsd.conf,v 1.5 2007/01/14 23:01:11 nerdboy Exp $
 
 # Config file for gpsd server
 
 # ATTENTION: most of the configuration is done in the kernel device
-# setup for USB/Serial, Garmin, or other.  gpsd should not need any
-# specific arguments, however, see the INSTALL file for trouble-
-# shooting steps and other hints.
+# setup for USB/Serial, Garmin, or other, however, without hotplug,
+# gpsd still needs to have the device set on the commandline.
 
-# try something like this for older gpsd
-#GPSD_OPTS="-P /var/run/gpsd.pid -f GPS0 -F /var/run/gpsd.sock"
+# Set GPS_DEV to the device to be used by the gpsd server.
+# This device must have the group tty and be writable (see
+# the INSTALL file in the docs).
+
+# This example is for a Deluo GPS Serial/USB converter dongle, really
+# a pl2303 chip - CONFIG_USB_SERIAL_PL2303 in modern 2.6 kernels.
+# The normal udev config provides the correct /dev/ttyUSB0 device.
+# The second example is just a normal serial port...
+
+#GPS_DEV="/dev/ttyUSB0"
+
+#GPS_DEV="/dev/ttyS0
+
+GPSD_OPTS="-P /var/run/gpsd.pid -f GPS0 -F /var/run/gpsd.sock"
 
-GPSD_OPTS=""

diff --git a/sci-geosciences/gpsd/files/gpsd.init b/sci-geosciences/gpsd/files/gpsd.init
index e2fb3b86a88a6baf3398e98663ccda14e5ab5fc9..05bdf97c58b6e534853e1c9f8d511eeb4d8fa207 100755 (executable)
--- a/sci-geosciences/gpsd/files/gpsd.init
+++ b/sci-geosciences/gpsd/files/gpsd.init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/files/gpsd.init,v 1.4 2007/01/14 22:15:46 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/files/gpsd.init,v 1.5 2007/01/14 23:01:11 nerdboy Exp $
 
 # You can use this init script to manage a serial port GPS or other
 # non-hotplug device (or any device for that matter).  By design,
@@ -12,10 +12,18 @@ depend() {
        before ntpd
 }
 
+checkconfig() {
+       if [ -z "${GPS_DEV}" ]; then
+           eerror "You must define GPS_DEV in /etc/conf.d/gpsd."
+           return 1
+       fi
+}
+
 start() {
+       checkconfig || return 1
        ebegin "Starting gpsd"
        touch /var/run/gpsd.pid
-       /usr/sbin/gpsd ${GPSD_OPTS}
+       /usr/sbin/gpsd ${GPSD_OPTS} ${GPS_DEV}
        eend $? "Failed to start gpsd"
 }