Updated with workaround for bug 132288

(Portage version: 2.1_pre10-r2)

5 files changed, 25 insertions, 15 deletions

diff --git a/sci-geosciences/gpsd/ChangeLog b/sci-geosciences/gpsd/ChangeLog
index 36fb0513e5d4..9ef5931121fb 100644
--- a/sci-geosciences/gpsd/ChangeLog
+++ b/sci-geosciences/gpsd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-geosciences/gpsd
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/ChangeLog,v 1.12 2006/02/24 06:50:00 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/ChangeLog,v 1.13 2006/05/08 05:30:35 nerdboy Exp $
+
+  08 May 2006; Steve Arnold <nerdboy@gentoo.org> files/gpsd.conf,
+  files/gpsd.init, gpsd-2.30-r1.ebuild, gpsd-2.31.ebuild:
+  Updated with workaround for bug 132288
 
   24 Feb 2006; Steve Arnold <nerdboy@gentoo.org> gpsd-2.31.ebuild:
   updated dbus depend atom
diff --git a/sci-geosciences/gpsd/files/gpsd.conf b/sci-geosciences/gpsd/files/gpsd.conf
index ab7a81f5cf44..cfba811f65ba 100644
--- a/sci-geosciences/gpsd/files/gpsd.conf
+++ b/sci-geosciences/gpsd/files/gpsd.conf
@@ -1,6 +1,6 @@
 # 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.1 2005/05/29 00:53:30 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/files/gpsd.conf,v 1.2 2006/05/08 05:30:35 nerdboy Exp $
 
 # Config file for gpsd server
 
@@ -20,4 +20,4 @@
 
 #GPS_DEV="/dev/ttyS0
 
-GPSD_OPTS="-P /var/run/gpsd.pid -f GPS0 -F /var/run/gpsd.sock"
+GPSD_OPTS="-P /var/run/gpsd.pid -f GPS0 -F /var/run/gpsd/gpsd.sock"
diff --git a/sci-geosciences/gpsd/files/gpsd.init b/sci-geosciences/gpsd/files/gpsd.init
index d770dd5ae599..994145ac2e0b 100755
--- 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.1 2005/05/29 00:53:30 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/files/gpsd.init,v 1.2 2006/05/08 05:30:35 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,
@@ -31,5 +31,5 @@ stop() {
 	ebegin "Stopping gpsd"
 	killall -q gpsd >/dev/null
 	eend $? "Failed to stop gpsd"
-	rm -f /var/run/gpsd.pid /var/run/gpsd.sock
+	rm -f /var/run/gpsd.pid
 }
diff --git a/sci-geosciences/gpsd/gpsd-2.30-r1.ebuild b/sci-geosciences/gpsd/gpsd-2.30-r1.ebuild
index 03e7aa61482d..4e0efb6452b0 100644
--- a/sci-geosciences/gpsd/gpsd-2.30-r1.ebuild
+++ b/sci-geosciences/gpsd/gpsd-2.30-r1.ebuild
@@ -1,17 +1,16 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-2.30-r1.ebuild,v 1.2 2006/02/20 06:00:39 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-2.30-r1.ebuild,v 1.3 2006/05/08 05:30:35 nerdboy Exp $
 
 inherit eutils libtool 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://gentoo/${P}.tar.gz"
+SRC_URI="http://download.berlios.de/gpsd/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS=" ~arm ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~arm ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 IUSE="X usb dbus"
 
@@ -68,6 +67,7 @@ src_install() {
 
 	if use usb ; then
 	    sed -i -e "s/gpsd.hotplug/gpsd/g" gpsd.hotplug gpsd.usermap
+	    sed -i -e "s:run/gpsd.sock:run/gpsd/gpsd.sock:g" gpsd.hotplug
 	    insinto /etc/hotplug/usb
 	    doins gpsd.usermap
 	    exeinto /etc/hotplug/usb
@@ -86,6 +86,9 @@ src_install() {
 	exeinto /usr/$(get_libdir)/python${PYVER}/site-packages
 	doexe gps.py gpsfake.py
 	dodoc AUTHORS HACKING INSTALL README TODO ${FILESDIR}/40-usb-serial.rules
+	diropts "-m1755"
+	dodir /var/run/gpsd
+	fowners nobody /var/run/gpsd
 }
 
 pkg_postinst() {
@@ -112,7 +115,7 @@ pkg_postinst() {
 	einfo
 	einfo "Finally, the default gpsd setup looks for /dev/ttyUSB0, in the"
 	einfo "case of the USB-serial adapter mentioned above.  Depending on"
-	einfo "your default device scheme (ie, udev, devfs, static), you will"
+	einfo "your default device scheme (ie, udev, devfs, static), you may"
 	einfo "need to create a device alias if the default name is different."
 	einfo "A udev rule file has been provided with an example rule in the"
 	einfo "docs directory.  If the device names are correct, gpsd will"
diff --git a/sci-geosciences/gpsd/gpsd-2.31.ebuild b/sci-geosciences/gpsd/gpsd-2.31.ebuild
index 1f8952d2115f..9bea5262af3a 100644
--- a/sci-geosciences/gpsd/gpsd-2.31.ebuild
+++ b/sci-geosciences/gpsd/gpsd-2.31.ebuild
@@ -1,17 +1,16 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-2.31.ebuild,v 1.3 2006/02/24 06:50:00 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-2.31.ebuild,v 1.4 2006/05/08 05:30:35 nerdboy Exp $
 
 inherit eutils libtool 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://gentoo/${P}.tar.gz"
+SRC_URI="http://download.berlios.de/gpsd/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS=" ~arm ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~arm ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 IUSE="X usb dbus"
 
@@ -68,6 +67,7 @@ src_install() {
 
 	if use usb ; then
 	    sed -i -e "s/gpsd.hotplug/gpsd/g" gpsd.hotplug gpsd.usermap
+	    sed -i -e "s:run/gpsd.sock:run/gpsd/gpsd.sock:g" gpsd.hotplug
 	    insinto /etc/hotplug/usb
 	    doins gpsd.usermap
 	    exeinto /etc/hotplug/usb
@@ -86,6 +86,9 @@ src_install() {
 	exeinto /usr/$(get_libdir)/python${PYVER}/site-packages
 	doexe gps.py gpsfake.py
 	dodoc AUTHORS HACKING INSTALL README TODO ${FILESDIR}/40-usb-serial.rules
+	diropts "-m1755"
+	dodir /var/run/gpsd
+	fowners nobody /var/run/gpsd
 }
 
 pkg_postinst() {
@@ -112,7 +115,7 @@ pkg_postinst() {
 	einfo
 	einfo "Finally, the default gpsd setup looks for /dev/ttyUSB0, in the"
 	einfo "case of the USB-serial adapter mentioned above.  Depending on"
-	einfo "your default device scheme (ie, udev, devfs, static), you will"
+	einfo "your default device scheme (ie, udev, devfs, static), you may"
 	einfo "need to create a device alias if the default name is different."
 	einfo "A udev rule file has been provided with an example rule in the"
 	einfo "docs directory.  If the device names are correct, gpsd will"