version bump with new devices and use flags

(Portage version: 2.1.2_rc4-r2)

5 files changed, 153 insertions, 27 deletions

diff --git a/sci-geosciences/gpsd/ChangeLog b/sci-geosciences/gpsd/ChangeLog
index f00083768674..d604ba35141e 100644
--- a/sci-geosciences/gpsd/ChangeLog
+++ b/sci-geosciences/gpsd/ChangeLog
@@ -1,6 +1,13 @@
 # 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.23 2007/01/08 00:47:02 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/ChangeLog,v 1.24 2007/01/14 22:15:46 nerdboy Exp $
+
+*gpsd-2.34 (14 Jan 2007)
+
+  14 Jan 2007; Steve Arnold <nerdboy@gentoo.org> files/gpsd.conf,
+  files/gpsd.init, +gpsd-2.34.ebuild:
+  version bump with new devices and use flags, plus streamlined config and
+  minimal install option (disable other use flags and enable minimal).
 
   08 Jan 2007; Danny van Dyk <kugelfang@gentoo.org> -gpsd-2.33.ebuild:
   QA: Removed unused versions.
diff --git a/sci-geosciences/gpsd/files/digest-gpsd-2.34 b/sci-geosciences/gpsd/files/digest-gpsd-2.34
new file mode 100644
index 000000000000..2526bdb7e8f0
--- /dev/null
+++ b/sci-geosciences/gpsd/files/digest-gpsd-2.34
@@ -0,0 +1,3 @@
+MD5 1ad07e10f34e46ffdaf10688743f2f43 gpsd-2.34.tar.gz 668063
+RMD160 cefe9f08c8164597bd04e51622d2175a40781bdb gpsd-2.34.tar.gz 668063
+SHA256 39e8d629da469d2032ad3554ff502d270e1037490707d7ae0e8a2de7b06263d8 gpsd-2.34.tar.gz 668063
diff --git a/sci-geosciences/gpsd/files/gpsd.conf b/sci-geosciences/gpsd/files/gpsd.conf
index 7dda70d2501c..d2aa337a8e82 100644
--- a/sci-geosciences/gpsd/files/gpsd.conf
+++ b/sci-geosciences/gpsd/files/gpsd.conf
@@ -1,23 +1,15 @@
 # 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.3 2006/11/05 02:47:38 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/files/gpsd.conf,v 1.4 2007/01/14 22:15:46 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.
+# 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.
 
-# 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 udev rule in the docs).
+# try something like this for older gpsd
+#GPSD_OPTS="-P /var/run/gpsd.pid -f GPS0 -F /var/run/gpsd.sock"
 
-# 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 udev rule provides the symlink below to /dev/tts/USB0
-# The second one 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 26ae9152be92..e2fb3b86a88a 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.3 2006/10/24 00:43:07 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/files/gpsd.init,v 1.4 2007/01/14 22:15:46 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,19 +12,10 @@ 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
-	# comment the device parameter to use with a hot-pluggable device
-	/usr/sbin/gpsd ${GPSD_OPTS} -p ${GPS_DEV}
+	/usr/sbin/gpsd ${GPSD_OPTS}
 	eend $? "Failed to start gpsd"
 }
 
diff --git a/sci-geosciences/gpsd/gpsd-2.34.ebuild b/sci-geosciences/gpsd/gpsd-2.34.ebuild
new file mode 100644
index 000000000000..5eb19ec65ea6
--- /dev/null
+++ b/sci-geosciences/gpsd/gpsd-2.34.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-2.34.ebuild,v 1.1 2007/01/14 22:15:46 nerdboy Exp $
+
+inherit eutils autotools 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"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~arm ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="dbus italk itrax minimal ntp python static tntc usb X"
+
+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/lesstif
+		    x11-libs/openmotif
+		)
+		( virtual/motif
+			virtual/x11 )
+		)
+	)
+	python? ( dev-lang/python )
+	app-text/xmlto
+	dbus? ( >=sys-apps/dbus-0.6 )
+	ntp? ( net-misc/ntp )
+	usb? ( virtual/dev-manager )"
+
+DEPEND="${RDEPEND}
+	X? ( || (
+	    ( x11-proto/xproto x11-proto/xextproto )
+		virtual/x11
+	    )
+	)"
+
+RESTRICT="test"
+
+WANT_AUTOMAKE="latest"
+WANT_AUTOCONF=2.5
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	eautoreconf
+}
+
+src_compile() {
+	use python && distutils_python_version
+
+	local my_conf="--enable-shared"
+
+	if ! use static; then
+	    my_conf="${my_conf} --with-pic --disable-static"
+	else
+	    my_conf="${my_conf} --enable-static"
+	fi
+
+	if ! use ntp; then
+	    my_conf="${my_conf} --disable-ntpshm"
+	fi
+
+	if use minimal; then
+	    local max_clients="5"
+	    local max_devices="1"
+	    my_conf="${my_conf} --enable-squelch --disable-pps"
+	    my_conf="${my_conf} --enable-max-clients=${max_clients} --enable-max-devices=${max_devices}"
+	fi
+
+	econf ${my_conf} $(use_enable dbus) $(use_enable tntc tnt) \
+	    $(use_with X x) $(use_enable italk) $(use_enable itrax) \
+	    $(use_enable python) || die "econf failed"
+
+	emake LDFLAGS="${LDFLAGS} -lm" || die "emake failed"
+}
+
+src_install() {
+	cd ${S}
+	make DESTDIR=${D} install
+
+	if use usb ; then
+	    insinto /etc/hotplug/usb
+	    doins gpsd.usermap
+	    exeinto /etc/hotplug/usb
+	    doexe gpsd.hotplug
+	    keepdir /var/run/usb # needed for REMOVER
+	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"
+	if use python ; then
+	    exeinto /usr/$(get_libdir)/python${PYVER}/site-packages
+	    doexe gps.py gpsfake.py gpspacket.so
+	fi
+	dodoc AUTHORS COPYING INSTALL README TODO
+}
+
+pkg_postinst() {
+	einfo ""
+	einfo "This version of gpsd no longer requires updates many devices and"
+	einfo "should no longer require any specific arguments.  The gpsd daemon"
+	einfo "should now start first.  You should probably have >=udev-096-r1"
+	einfo "for hotplug and general usb device detection to work correctly."
+	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 udev/hotplug support."
+	einfo ""
+	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 ""
+}