diff options
author | Tomas Chvatal <scarabeus@gentoo.org> | 2011-06-17 11:12:23 +0000 |
---|---|---|
committer | Tomas Chvatal <scarabeus@gentoo.org> | 2011-06-17 11:12:23 +0000 |
commit | 7da937710afc7e82926db079022371bef26fab01 (patch) | |
tree | 2cb7bd3042ffe856268632c100da40f780fdb433 /sci-geosciences | |
parent | Minimalise the patch so our cvs wont fck it up with the $ replaces. (diff) | |
download | gentoo-2-7da937710afc7e82926db079022371bef26fab01.tar.gz gentoo-2-7da937710afc7e82926db079022371bef26fab01.tar.bz2 gentoo-2-7da937710afc7e82926db079022371bef26fab01.zip |
Remove old finaly overshadowed gpsd.
(Portage version: 2.2.0_alpha38/cvs/Linux x86_64)
Diffstat (limited to 'sci-geosciences')
-rw-r--r-- | sci-geosciences/gpsd/ChangeLog | 7 | ||||
-rw-r--r-- | sci-geosciences/gpsd/files/40-usb-serial.rules | 4 | ||||
-rw-r--r-- | sci-geosciences/gpsd/files/99-gpsd-usb.rules | 20 | ||||
-rw-r--r-- | sci-geosciences/gpsd/files/gpsd.conf | 26 | ||||
-rwxr-xr-x | sci-geosciences/gpsd/files/gpsd.init | 35 | ||||
-rw-r--r-- | sci-geosciences/gpsd/gpsd-2.32.ebuild | 111 |
6 files changed, 6 insertions, 197 deletions
diff --git a/sci-geosciences/gpsd/ChangeLog b/sci-geosciences/gpsd/ChangeLog index f60430e145ce..d9463e4e0249 100644 --- a/sci-geosciences/gpsd/ChangeLog +++ b/sci-geosciences/gpsd/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sci-geosciences/gpsd # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/ChangeLog,v 1.71 2011/06/17 10:57:37 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/ChangeLog,v 1.72 2011/06/17 11:12:23 scarabeus Exp $ + + 17 Jun 2011; Tomáš Chvátal <scarabeus@gentoo.org> + -files/40-usb-serial.rules, -files/99-gpsd-usb.rules, -gpsd-2.32.ebuild, + -files/gpsd.conf, -files/gpsd.init: + Remove old finaly overshadowed gpsd. 17 Jun 2011; Kacper Kowalik <xarthisius@gentoo.org> gpsd-2.95-r1.ebuild: ppc64 stable wrt #362981 diff --git a/sci-geosciences/gpsd/files/40-usb-serial.rules b/sci-geosciences/gpsd/files/40-usb-serial.rules deleted file mode 100644 index 860019104054..000000000000 --- a/sci-geosciences/gpsd/files/40-usb-serial.rules +++ /dev/null @@ -1,4 +0,0 @@ -# Sample udev rule for ttyUSB devices used by cheap GPS hardware (for use with -# gpsd) such as a PL2303 USB-Serial adapter. - -KERNEL=="ttyUSB[0-9]*", NAME="tts/USB%n", SYMLINK="ttyUSB%n", GROUP="tty", MODE="0660" diff --git a/sci-geosciences/gpsd/files/99-gpsd-usb.rules b/sci-geosciences/gpsd/files/99-gpsd-usb.rules deleted file mode 100644 index 992a26cd0c8f..000000000000 --- a/sci-geosciences/gpsd/files/99-gpsd-usb.rules +++ /dev/null @@ -1,20 +0,0 @@ -# udev rules for the gpsd USB hotplugging - -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" -#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" -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" -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" -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" -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" -#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/files/gpsd.conf b/sci-geosciences/gpsd/files/gpsd.conf deleted file mode 100644 index baf9bb1695d0..000000000000 --- a/sci-geosciences/gpsd/files/gpsd.conf +++ /dev/null @@ -1,26 +0,0 @@ -# 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.7 2009/08/23 00:01:40 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, however, without hotplug, -# gpsd still needs to have the device set on the commandline. - -# A device may be a local serial device for GPS input, or a URL of -# the form: -# [{dgpsip|ntrip}://][user:passwd@]host[:port][/stream] -# in which case it specifies an input source for DGPS or ntrip data. -# Set GPS_DEV to the device to be used by the gpsd server (see the -# INSTALL file in the docs for more info). Run gpsd -h to see a list -# supported driver types (most are enabled by default). - -# 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. - -GPS_DEV="/dev/ttyUSB0" - -GPSD_OPTS="-b -n -P /var/run/gpsd.pid -F /var/run/gpsd.sock" - diff --git a/sci-geosciences/gpsd/files/gpsd.init b/sci-geosciences/gpsd/files/gpsd.init deleted file mode 100755 index 35219c2a46f6..000000000000 --- a/sci-geosciences/gpsd/files/gpsd.init +++ /dev/null @@ -1,35 +0,0 @@ -#!/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.7 2009/08/23 00:01:40 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, -# USB devices should use the hotplug script instead. - -depend() { - after serial hotplug dbus bluetooth - 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" - start-stop-daemon --start --quiet --exec /usr/sbin/gpsd \ - -- ${GPSD_OPTS} ${GPS_DEV} - eend $? "Failed to start gpsd" -} - -stop() { - ebegin "Stopping gpsd" - start-stop-daemon --stop --quiet --pidfile /var/run/gpsd.pid - eend $? "Failed to stop gpsd" - rm -f /var/run/gpsd.pid -} diff --git a/sci-geosciences/gpsd/gpsd-2.32.ebuild b/sci-geosciences/gpsd/gpsd-2.32.ebuild deleted file mode 100644 index 3164da7965a0..000000000000 --- a/sci-geosciences/gpsd/gpsd-2.32.ebuild +++ /dev/null @@ -1,111 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-2.32.ebuild,v 1.14 2011/04/10 22:00:13 arfrever Exp $ - -EAPI=1 - -inherit eutils libtool python - -DESCRIPTION="GPS daemon and library to support USB/serial GPS devices and various GPS/mapping clients." -HOMEPAGE="http://gpsd.berlios.de/" -SRC_URI="mirror://berlios/gpsd/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 arm ppc ppc64 x86" - -IUSE="X usb dbus" - -RDEPEND="X? ( - x11-libs/libXmu - x11-libs/libXext - x11-libs/libXp - x11-libs/libX11 - x11-libs/libXt - x11-libs/libSM - x11-libs/libICE - x11-libs/libXpm - x11-libs/libXaw - >=x11-libs/openmotif-2.3:0 - ) - usb? ( sys-apps/hotplug ) - dbus? ( >=sys-apps/dbus-0.6 ) - dev-lang/python - app-text/xmlto" - -DEPEND="${RDEPEND} - X? ( - x11-proto/xproto - x11-proto/xextproto - )" - -src_unpack() { - unpack ${A} - cd "${S}" - elibtoolize -} - -RESTRICT="test" - -src_compile() { - export MY_ECONF="--with-pic $(use_with X x) $(use_enable dbus)" - econf ${MY_ECONF} || die "econf failed" - emake || die "emake failed" -} - -src_install() { - - make DESTDIR="${D}" install - - if use usb ; then - sed -i -e "s/gpsd.hotplug/gpsd/g" gpsd.hotplug gpsd.usermap - insinto /etc/hotplug/usb - doins gpsd.usermap - exeinto /etc/hotplug/usb - newexe gpsd.hotplug gpsd - else - newconfd "${FILESDIR}"/gpsd.conf gpsd - newinitd "${FILESDIR}"/gpsd.init gpsd - fi - if use X ; then - insinto /etc/X11/app-defaults - newins xgps.ad Xgps - newins xgpsspeed.ad Xgpsspeed - fi - dobin logextract - diropts "-m0644" - exeinto $(python_get_sitedir) - doexe gps.py gpsfake.py - dodoc AUTHORS HACKING INSTALL README TODO "${FILESDIR}"/40-usb-serial.rules -} - -pkg_postinst() { - einfo "To use hotplugging (USB devices) your kernel has to be compiled" - einfo "with CONFIG_HOTPLUG enabled and sys-apps/hotplug must be emerged" - einfo "(both usb and dbus support are optional)." - einfo - einfo "Different GPS devices require the corresponding kernel options" - einfo "to be enabled, such as USB_SERIAL_GARMIN, or a USB serial driver" - einfo "for an adapter such as those that come with Deluo GPS units (eg," - einfo "USB_SERIAL_PL2303). Straight serial devices should always work," - einfo "even without hotplug support." - ewarn - ewarn "If your client connection shows no data when gpsd is started via" - ewarn "the normal hotplug action, then kill the existing gpsd process" - ewarn "and try starting it directly via something like:" - ewarn "sudo /usr/sbin/gpsd -p /dev/ttyUSB0" - ewarn "or whatever your device is. This will verify whether your device" - ewarn "is working or not." - ewarn - einfo "Read the INSTALL doc for more information on supported hardware," - einfo "and make sure udev has the right group permissions set on the tty" - einfo "devices if using USB (it should Do The Right Thing (TM))..." - 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 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" - einfo "start automatically when the GPS device is plugged in." -} |