Updated with workaround for bug 132288

Package-Manager: portage-2.1_pre10-r2

6 files changed, 52 insertions, 33 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/Manifest b/sci-geosciences/gpsd/Manifest
index 547d3e044fac..734318833d9b 100644
--- a/sci-geosciences/gpsd/Manifest
+++ b/sci-geosciences/gpsd/Manifest
@@ -1,27 +1,36 @@
-MD5 9265dc56671d1462165bac4adfa2e9b2 ChangeLog 2901
-RMD160 ccb5486c619c891ee567d60b035e125434b88009 ChangeLog 2901
-SHA256 0dccf887572d4a8bf490ee21a72de61ffecbbcb592071597ff78f9db19625201 ChangeLog 2901
+AUX 40-usb-serial.rules 212 RMD160 373c62caf5048f360a13313fd7386a44452ee247 SHA1 d92ca954d8d8e259a1a7f70ec0502b68e1f842f2 SHA256 ed2436fa838c9bd2f74f8d0c56cb91ebd73a4b93377e7fbefe217f58d379ce70 size 212
 MD5 f6622a741ad185c494741151fac6f920 files/40-usb-serial.rules 212
 RMD160 373c62caf5048f360a13313fd7386a44452ee247 files/40-usb-serial.rules 212
 SHA256 ed2436fa838c9bd2f74f8d0c56cb91ebd73a4b93377e7fbefe217f58d379ce70 files/40-usb-serial.rules 212
+AUX gpsd.conf 872 RMD160 3eadbbc3b5d56bb3f8c32d3a8b2cb3697fae36c9 SHA1 e01cfa6365e297ad5446044bdba02d37c5b01a77 SHA256 dabf2ae12aabbdd10b7197f0f0e72d1f357cdd62a2a494ac0624db63e79ccf34 size 872
+MD5 5527d72eff2668d32cabb8ade57aa82e files/gpsd.conf 872
+RMD160 3eadbbc3b5d56bb3f8c32d3a8b2cb3697fae36c9 files/gpsd.conf 872
+SHA256 dabf2ae12aabbdd10b7197f0f0e72d1f357cdd62a2a494ac0624db63e79ccf34 files/gpsd.conf 872
+AUX gpsd.init 930 RMD160 2b0687df5c65dfaa61b52a9297df6144d86b7d6a SHA1 55d8ccb1043f9e01d5c26c95503b5dfa536256af SHA256 476ef384c15d0f2d15b46caf9179a34190236e8dc8120e8586f7388b9a35afc6 size 930
+MD5 b7038e914f47ccffce8257d32651f072 files/gpsd.init 930
+RMD160 2b0687df5c65dfaa61b52a9297df6144d86b7d6a files/gpsd.init 930
+SHA256 476ef384c15d0f2d15b46caf9179a34190236e8dc8120e8586f7388b9a35afc6 files/gpsd.init 930
+DIST gpsd-2.30.tar.gz 605997 RMD160 55805f09d1a33de96122e5ebd96cd6e1ae3bae4f SHA256 9ae74f2ed87a457b53ae1b0150ec44a82e8bd453b26653249f9cf95e622026e2 size 605997
+DIST gpsd-2.31.tar.gz 622857 RMD160 a197dc645a1988ec81a1d9dd3daa74193ba8aae8 SHA256 d1413255a7add1dc3f6a988d43ac1c890daeeb49417c6efc832220bcd3144381 size 622857
+EBUILD gpsd-2.30-r1.ebuild 3756 RMD160 b690b9a34301348a58af5aeb4d1826c44fef12e4 SHA1 19c372ca52da65548a5da4021e3eb246f6821d74 SHA256 4b11db54a17fda2f296041268c0f23917ee24b7c3032ae938f056bde3972a524 size 3756
+MD5 33b98cef88b7b51d48887a9945c9cb0a gpsd-2.30-r1.ebuild 3756
+RMD160 b690b9a34301348a58af5aeb4d1826c44fef12e4 gpsd-2.30-r1.ebuild 3756
+SHA256 4b11db54a17fda2f296041268c0f23917ee24b7c3032ae938f056bde3972a524 gpsd-2.30-r1.ebuild 3756
+EBUILD gpsd-2.31.ebuild 3751 RMD160 bb8f4d96f8723517a5ddfc6227fac2a9bc2e55cb SHA1 0bc813276015bc1ca8928487d21ab06439dc807e SHA256 63e869eb24d308d1a1c0f5205c6b07f9fcca0dc5087b74ecccf588133f77e2de size 3751
+MD5 f3f8531e00a002a912dd11f38da32d83 gpsd-2.31.ebuild 3751
+RMD160 bb8f4d96f8723517a5ddfc6227fac2a9bc2e55cb gpsd-2.31.ebuild 3751
+SHA256 63e869eb24d308d1a1c0f5205c6b07f9fcca0dc5087b74ecccf588133f77e2de gpsd-2.31.ebuild 3751
+MISC ChangeLog 3067 RMD160 8ac4fd333afa1dfba7b8500adc61f35297d1c91f SHA1 57428eec658a337e7209b96a0ecc43a38d7a2b62 SHA256 88fa11dec013182cba6aabea095650c3a614b8abb0da2dc68abfe284d3143806 size 3067
+MD5 dd40caee96510f29f1085030925a8544 ChangeLog 3067
+RMD160 8ac4fd333afa1dfba7b8500adc61f35297d1c91f ChangeLog 3067
+SHA256 88fa11dec013182cba6aabea095650c3a614b8abb0da2dc68abfe284d3143806 ChangeLog 3067
+MISC metadata.xml 420 RMD160 622357f000f6db7c03ae91821a849e4fcb8c45be SHA1 10e44b1ff8653aea70f834cb7a9e67dde40f9f4a SHA256 7eabf7b07513a6c1a83ae6e2fc3ac748ad3cefdde87b42d1a5a2149eab1383f8 size 420
+MD5 78ec9f0a49a5a89267a4b8953d904de9 metadata.xml 420
+RMD160 622357f000f6db7c03ae91821a849e4fcb8c45be metadata.xml 420
+SHA256 7eabf7b07513a6c1a83ae6e2fc3ac748ad3cefdde87b42d1a5a2149eab1383f8 metadata.xml 420
 MD5 160ad3c2d83b2b513cda1381caeb6648 files/digest-gpsd-2.30-r1 229
 RMD160 f27868d4d71617e6805e728bf5c6b61a81425f3b files/digest-gpsd-2.30-r1 229
 SHA256 10d1e32d4252b824221bdb9825a7d8aa36b5ced92bc56ac89c96cbb390f2bc92 files/digest-gpsd-2.30-r1 229
 MD5 a01ef15a6e65d35d1b1388c26c3ad333 files/digest-gpsd-2.31 229
 RMD160 2ffcbef3189d54d63c835a8c463f0def3f70cf45 files/digest-gpsd-2.31 229
 SHA256 9cd1f77406b88e4b8f02996bbe72492d208b13982d592aa0c9417957b426398f files/digest-gpsd-2.31 229
-MD5 b84a0fec652fc8df8b533eb160055841 files/gpsd.conf 867
-RMD160 2a6a7f5436ef5769c1518004c2b94da05894020a files/gpsd.conf 867
-SHA256 8b126b24bcbbe4505f2c059bd249a8b764f5065ff7dc1c7ea2a0a2d3ffcafd92 files/gpsd.conf 867
-MD5 56fd36d7f177ce4c229e2d61abcf7d15 files/gpsd.init 949
-RMD160 4378554d1f9f18b0427b7b3dc63e6db1d3c2a338 files/gpsd.init 949
-SHA256 1ec90f55af83dca5ef07cd927920f3350e41b9d1ebd31b39bc3f956abf076689 files/gpsd.init 949
-MD5 25d764c1fa62da00e3613c8e5ee11f2d gpsd-2.30-r1.ebuild 3661
-RMD160 8fc1444b1350a5f6cb7fac377bd30579dfc680ab gpsd-2.30-r1.ebuild 3661
-SHA256 4ce5f0f8a660b8d00b9d87b50e46d18d0f264734fde335fe9d2d15b7a827749b gpsd-2.30-r1.ebuild 3661
-MD5 abc5da08103034530b08a9e3b9106ede gpsd-2.31.ebuild 3656
-RMD160 173c001b604329d69b7c3e76c58994b2911992cd gpsd-2.31.ebuild 3656
-SHA256 1588539e3c6e6eef0eb5f15962590d256ee8be0f52233234e1f8ef46e84d1eed gpsd-2.31.ebuild 3656
-MD5 78ec9f0a49a5a89267a4b8953d904de9 metadata.xml 420
-RMD160 622357f000f6db7c03ae91821a849e4fcb8c45be metadata.xml 420
-SHA256 7eabf7b07513a6c1a83ae6e2fc3ac748ad3cefdde87b42d1a5a2149eab1383f8 metadata.xml 420
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"