summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2011-06-17 11:12:23 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2011-06-17 11:12:23 +0000
commitb9ea38759958a47ce0c5a263572029710625bef9 (patch)
treef9a8b8bb2c72d7c3419f20d886419ec08a9e7f02
parentMinimalise the patch so our cvs wont fck it up with the $ replaces. (diff)
downloadhistorical-b9ea38759958a47ce0c5a263572029710625bef9.tar.gz
historical-b9ea38759958a47ce0c5a263572029710625bef9.tar.bz2
historical-b9ea38759958a47ce0c5a263572029710625bef9.zip
Remove old finaly overshadowed gpsd.
Package-Manager: portage-2.2.0_alpha38/cvs/Linux x86_64
-rw-r--r--sci-geosciences/gpsd/ChangeLog7
-rw-r--r--sci-geosciences/gpsd/Manifest16
-rw-r--r--sci-geosciences/gpsd/files/40-usb-serial.rules4
-rw-r--r--sci-geosciences/gpsd/files/99-gpsd-usb.rules20
-rw-r--r--sci-geosciences/gpsd/files/gpsd.conf26
-rwxr-xr-xsci-geosciences/gpsd/files/gpsd.init35
-rw-r--r--sci-geosciences/gpsd/gpsd-2.32.ebuild111
7 files changed, 10 insertions, 209 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/Manifest b/sci-geosciences/gpsd/Manifest
index 938c19ed9ca7..72684168dcaf 100644
--- a/sci-geosciences/gpsd/Manifest
+++ b/sci-geosciences/gpsd/Manifest
@@ -6,26 +6,18 @@ AUX 2.95-fix-ldflags.patch 721 RMD160 4be1b2ea581d8aef35896acd9098bc298b3199ad S
AUX 2.96-fix-ldflags.patch 1000 RMD160 a1d4fa399bf9dee71b7adebd2ed2f01d39e7c4f7 SHA1 05530775b53cd5f60f619af8d95499822b42c779 SHA256 a83e03fa5b7b4286724339f44d4933427b7e80cea82887a89a0a7b9cd665a8df
AUX 2.96-fix-tests.patch 944 RMD160 c04e257c4aec8147f24d5c8f1850718f3756f128 SHA1 bcba7823b35a8bb487d93ce875bae32131ae9e10 SHA256 2dced865a8a8951855b9ee8fc5586aa9be3f0c7513c8299c4632ca32a31d2074
AUX 2.96-pkgconfig.patch 1377 RMD160 20ff8e65763981f4f7075dc0a86764bd02017d75 SHA1 203172648b7b1e16e3b28a5815238adf4649a1fc SHA256 8b20899afd3e0e391664461ef359eef1ed6bfc49ba633c90e683178637359e15
-AUX 40-usb-serial.rules 213 RMD160 f29e28c0ea6e349811d26676da9d9eea56dfb167 SHA1 7afbf73c4deda1f247cc4256bfd0a1cf08ec8a1c SHA256 39e131d15c59fcf23e946309a5aef91b5cbe515d2902d74aac87eeea2802c74a
-AUX 99-gpsd-usb.rules 2226 RMD160 2e8762cd3537800a030d7726ae827e17903bf0a4 SHA1 350158248f20fb22f52228fe0231a190c6b0d511 SHA256 a903a57382015394d638a0d6a13e796e5f0a8613ce4633f1b42182948d135b9f
-AUX gpsd.conf 1144 RMD160 13e4290aefa0dacc4cdb3de90d372e5d46cc1def SHA1 73657f8f0b14d803e0bf2b0575a464178ac3d734 SHA256 d41db7375281d881495f7cf9630c3b5e8c0ac1352e0dcf01e07a760066a05068
AUX gpsd.conf-2 314 RMD160 e345c8504b020da4b4a0310b59112ba6eb178dce SHA1 d0499491a762e46e7d76854109266b36c1f22c0b SHA256 2d9ab242319f24dac14d53b57b222b288dfbac10cbdf31c9aecbb65cf03c72dc
-AUX gpsd.init 951 RMD160 b23f4e3192b3a24bc8f6083c1ab88c09fd973245 SHA1 4efd39d33752125f8e69b6d8fa0dae8cbf5a2463 SHA256 53955992324f9db039e68ba8df8ff9c868bfd55d09984f10fdf57082bba5d877
AUX gpsd.init-2 861 RMD160 c1d5a0fd107e3f4bc36a936cbae133c39b8828f7 SHA1 cf08caee2826e7b35d00762c475755bd0ae84d12 SHA256 6b6e3b23d95acd7326e3982509302dbef005e143bb46557c573aca1c0e2cb672
-DIST gpsd-2.32.tar.gz 617947 RMD160 87cd19a4e8126ee98f8a6908829569a2a1dc5ccd SHA1 9fd6010834f1c56e755ea6515dba80431544a277 SHA256 95bee94daaf0168387152223fac186ba40d7b02657bfc0336c90edc5ea15bf10
DIST gpsd-2.95.tar.gz 1385681 RMD160 c9e8d3b7ff73c655d65f0f6e329ca7ff241b10f6 SHA1 af1f575c8ec3a2db7a71c35f2296fd339a4a1ff3 SHA256 832343a53921a8371efa540ba57c91dadedda445e571c1beb97c06539ef450ae
DIST gpsd-2.96bis.tar.gz 1554605 RMD160 ea09b73709627f95470dbd023e5ffc48209fde6a SHA1 cf123255f9ec54d018642cf230cd05826e507a9e SHA256 c6d72565bc06b802c749e69808eb7c6ee165962dc17383971c9001b5e1763690
-EBUILD gpsd-2.32.ebuild 3357 RMD160 076c34ec80022d6689126570c46726a77d01f074 SHA1 f53680c7ed77a3fa2005577bde87e8c6b292538c SHA256 bdc939ee8950b3ad9155930be5cefb2eaef0ba74c601cc8bafb1bce8659b8784
EBUILD gpsd-2.95-r1.ebuild 2674 RMD160 3cfe82ffac9f57d771b6728420d106debd49c22e SHA1 86ba4ecde7158a24c535675036f638c9f6683ecc SHA256 d8e81c1b8b9531fc59ea1c9da7710c76c23802faec8e6d404732ed557058ed7b
EBUILD gpsd-2.96-r1.ebuild 2811 RMD160 485eb1f56d91aeb085b976fd55a978f69872f225 SHA1 61da19e6e8f25e85d04b8d45a39522aca73404a8 SHA256 a2f8010b1af4842a6b15d0864d5d956a9bf52086d00a63da9990cd68d9729ae7
-MISC ChangeLog 13266 RMD160 916dccc0c0cae281196a727b903a98b179815fc8 SHA1 1afd2b56a9d7679d64f998d4b474c308b5ef8310 SHA256 a101510e71eb8762a72a58f433aac0f0c6ee460e7d9921b1d69f01ebe7afbe5e
+MISC ChangeLog 13473 RMD160 2a5b2fa496562ede2067a3bdc430731a3989026c SHA1 cc9cc8a5828a9cbe264fbbf3739747ea36aaa66c SHA256 1c37b72485534431188549eae15a62811284ac5c21513120a3b4b2b048827526
MISC metadata.xml 572 RMD160 405fe380fe1257019ea02155b4f3c5316cb38380 SHA1 3a4945cdf750d48c8468650c1218c22f77872ccd SHA256 602da5f9768c2f0866c924db204baff61765479af03c71cfe3ae99ed8df7d436
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iJwEAQECAAYFAk37MywACgkQIiMqcbOVdxROTwP/futAAfK8UDt2+JkuOTr2UCEv
-faOmPC3WmY7u1h/kbCf9qbcgDzuyl/h7iB49/Nvn0fpUyghV0T6GVy89NxIMF2q/
-vw1i3zjiaUjxR2E6IiY1EtZ9v62RN4UIIyzBI2Q1uyOSVXpM6mnJUwGVYuDRRMRT
-UnONYCyAP4aC07we2Dg=
-=CdgO
+iEYEARECAAYFAk37NpwACgkQHB6c3gNBRYdneQCbBR9ZXQUxzrGTOElcyn1t+FC4
+O1oAoKEmrfxVbb/yT+i0It5cCxdgtmaS
+=H2iP
-----END PGP SIGNATURE-----
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."
-}