version bump with new devices and use flags

Package-Manager: portage-2.1.2_rc4-r2

6 files changed, 173 insertions, 49 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/Manifest b/sci-geosciences/gpsd/Manifest
index 92d61834ff76..f6d60b933d3a 100644
--- a/sci-geosciences/gpsd/Manifest
+++ b/sci-geosciences/gpsd/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 40-usb-serial.rules 212 RMD160 373c62caf5048f360a13313fd7386a44452ee247 SHA1 d92ca954d8d8e259a1a7f70ec0502b68e1f842f2 SHA256 ed2436fa838c9bd2f74f8d0c56cb91ebd73a4b93377e7fbefe217f58d379ce70
 MD5 f6622a741ad185c494741151fac6f920 files/40-usb-serial.rules 212
 RMD160 373c62caf5048f360a13313fd7386a44452ee247 files/40-usb-serial.rules 212
@@ -13,16 +10,17 @@ AUX gpsd-2.33-hotplug-background-fix.patch 2231 RMD160 1b5d0326501627ec99dd08fb1
 MD5 326ba3e84fdbb9707a7a9d281123feb0 files/gpsd-2.33-hotplug-background-fix.patch 2231
 RMD160 1b5d0326501627ec99dd08fb10a2b0eaed2f69e1 files/gpsd-2.33-hotplug-background-fix.patch 2231
 SHA256 acf258d1b15fda4aa303105a62807d28cde1173817a7e46ad719be479cf28a33 files/gpsd-2.33-hotplug-background-fix.patch 2231
-AUX gpsd.conf 867 RMD160 25b75f0b7c001440ccf87f511c8d5e964a94f137 SHA1 3b691ee9a07e2a2443bf43652b944140546966ca SHA256 7373c3251950bcc9f5b739da59f736468ae75b2f888599f4ac5b0f2e3610d886
-MD5 dbd1554f035ccbf3cc0eeda8d73d364c files/gpsd.conf 867
-RMD160 25b75f0b7c001440ccf87f511c8d5e964a94f137 files/gpsd.conf 867
-SHA256 7373c3251950bcc9f5b739da59f736468ae75b2f888599f4ac5b0f2e3610d886 files/gpsd.conf 867
-AUX gpsd.init 943 RMD160 838ca0dbbe45a408054f80c832a81cbc7075b13c SHA1 95335ecdb9cc98e8b4570b00a4d06a5b4ade2232 SHA256 b919e9fd22b749fd268372ab1583bcb9ceca54b01497bf06563c0dce8d8cee8f
-MD5 03ecb0d6ce727a9d67bd4cfeb5dcc963 files/gpsd.init 943
-RMD160 838ca0dbbe45a408054f80c832a81cbc7075b13c files/gpsd.init 943
-SHA256 b919e9fd22b749fd268372ab1583bcb9ceca54b01497bf06563c0dce8d8cee8f files/gpsd.init 943
+AUX gpsd.conf 606 RMD160 7741bab3d743e2d9c5bc8c06dcc49bdfffa42257 SHA1 12eedd665df90dc1a1f49ee3baa141a3c1efaa49 SHA256 0373e0f8008345f3088bd7e7a99d35105a6ca21f1db9ecbff2e9877898723bca
+MD5 7fffef2b1240dc90c29435f2999775df files/gpsd.conf 606
+RMD160 7741bab3d743e2d9c5bc8c06dcc49bdfffa42257 files/gpsd.conf 606
+SHA256 0373e0f8008345f3088bd7e7a99d35105a6ca21f1db9ecbff2e9877898723bca files/gpsd.conf 606
+AUX gpsd.init 717 RMD160 6c16b15fe98fc654438a1ef870942b62371415d5 SHA1 d67e0ed173afca3f3e7b5bc3a2082682bb607cc8 SHA256 684db56f3c0556183c3ca1f8aec2344d71f7067290f23712ce1d60e8858d63eb
+MD5 06eba1bdedff09c7531fd772846d4304 files/gpsd.init 717
+RMD160 6c16b15fe98fc654438a1ef870942b62371415d5 files/gpsd.init 717
+SHA256 684db56f3c0556183c3ca1f8aec2344d71f7067290f23712ce1d60e8858d63eb files/gpsd.init 717
 DIST gpsd-2.32.tar.gz 617947 RMD160 87cd19a4e8126ee98f8a6908829569a2a1dc5ccd SHA1 9fd6010834f1c56e755ea6515dba80431544a277 SHA256 95bee94daaf0168387152223fac186ba40d7b02657bfc0336c90edc5ea15bf10
 DIST gpsd-2.33.tar.gz 639348 RMD160 175b90cb8dda1d85964078a4f14cec84b0cc4885 SHA1 0dbb3dad459fc4a0ca7e4ba5884e67c93d4b679f SHA256 e6a055689ad05f6adba7dbb9490891a18a240d1a30e34424b3a034f4152f2c28
+DIST gpsd-2.34.tar.gz 668063 RMD160 cefe9f08c8164597bd04e51622d2175a40781bdb SHA1 96d8ab99445dc68136e4ee3622a58f4c464f7510 SHA256 39e8d629da469d2032ad3554ff502d270e1037490707d7ae0e8a2de7b06263d8
 EBUILD gpsd-2.32.ebuild 3611 RMD160 d443c93e0fe5c01740ea28b4b6145683dafad5e9 SHA1 bdab2e426259bddc3fe5f5baf27a9e5dd0df1e45 SHA256 790b0524f1a1f490fa21bac1f51d3d21ac6045cce8442d062ec0c60ca8033351
 MD5 247472a10c7c968fe83871025c8fa760 gpsd-2.32.ebuild 3611
 RMD160 d443c93e0fe5c01740ea28b4b6145683dafad5e9 gpsd-2.32.ebuild 3611
@@ -31,10 +29,14 @@ EBUILD gpsd-2.33-r1.ebuild 4016 RMD160 666cc110956f1ed83e78355c578aecbb41f02b9b
 MD5 77df33d3e7dcbaa839956f8c14d83ced gpsd-2.33-r1.ebuild 4016
 RMD160 666cc110956f1ed83e78355c578aecbb41f02b9b gpsd-2.33-r1.ebuild 4016
 SHA256 49658dddfbfca446351cdd8d5a889026e54755f4bfbef927f0074f94d20d4073 gpsd-2.33-r1.ebuild 4016
-MISC ChangeLog 4710 RMD160 093a3c26a9d45c811f2af08cb836b552bd621d26 SHA1 845e9d5c7940d1265909c7bc48af11500bbfa01d SHA256 f9b40105f897a86aea6b1527b0b26c28eb0ea394a2bacb537e87f1f1ff00e52a
-MD5 30bf9de871a05be0fdbe6512ccb84014 ChangeLog 4710
-RMD160 093a3c26a9d45c811f2af08cb836b552bd621d26 ChangeLog 4710
-SHA256 f9b40105f897a86aea6b1527b0b26c28eb0ea394a2bacb537e87f1f1ff00e52a ChangeLog 4710
+EBUILD gpsd-2.34.ebuild 3524 RMD160 c1eb77beb119169d9b7a56b930138ac4e10f15a4 SHA1 a2138bf7ff7f3bb6d50a50080cde96b2aa7a60d0 SHA256 408accdd9c3d77bb2551eca2fb24f4a504d81ecb75c6c80016ae0f24767e69c7
+MD5 8594fdfac66472f20aa051adfee5a7e5 gpsd-2.34.ebuild 3524
+RMD160 c1eb77beb119169d9b7a56b930138ac4e10f15a4 gpsd-2.34.ebuild 3524
+SHA256 408accdd9c3d77bb2551eca2fb24f4a504d81ecb75c6c80016ae0f24767e69c7 gpsd-2.34.ebuild 3524
+MISC ChangeLog 4985 RMD160 84660c4c2cbad42a83676c76247b703ad92f4141 SHA1 2bf53bfa133b1461af6d6f05a374886aa0ea2ebc SHA256 50f60937b9a1af4dc25b9e1a5cf1d4fec95c1ca2a5d079e21b26cdd74945fada
+MD5 510c14345b5f7942623ec9b64c60cb39 ChangeLog 4985
+RMD160 84660c4c2cbad42a83676c76247b703ad92f4141 ChangeLog 4985
+SHA256 50f60937b9a1af4dc25b9e1a5cf1d4fec95c1ca2a5d079e21b26cdd74945fada ChangeLog 4985
 MISC metadata.xml 432 RMD160 5af3627f9b65a58e04c58e031fcc8d911aa9d9e1 SHA1 548e9d03dacdcc4beac0d58deac74e40b9dc96e1 SHA256 5076d78647d5149ffa3fb8795e8736a785929ae0c218d80938df272a1a57b14b
 MD5 25f6cd5c06fe86c497e9e2b67a789d35 metadata.xml 432
 RMD160 5af3627f9b65a58e04c58e031fcc8d911aa9d9e1 metadata.xml 432
@@ -45,10 +47,6 @@ SHA256 b5c690c88f52aa25b5d4016b1f33bee3cbaf94e90649904ddb06da522d4c75da files/di
 MD5 e367888dd99ccfe208a546788c6be6ab files/digest-gpsd-2.33-r1 229
 RMD160 186ab51d05adbaa95f4a54dac7448c20b16b4826 files/digest-gpsd-2.33-r1 229
 SHA256 8c4b6783e1831f6e01d46afe9f41e18b71a14167638c0243314a9419ed7b39a3 files/digest-gpsd-2.33-r1 229
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
-
-iD8DBQFFoZSP5mJXAu5GbtIRAic3AJ9w03JNwwXFaXbPYoLt0O8YIrXxBwCfYwKC
-MTaq6dZrDIX0ugi1ZN4AMv4=
-=N2eM
------END PGP SIGNATURE-----
+MD5 316fac828cfbf41818ad9fee71b8bc81 files/digest-gpsd-2.34 229
+RMD160 2a74bdbcfb09cb946aefb4dbd5d89c5e3de0770c files/digest-gpsd-2.34 229
+SHA256 fb49a5fb237de51e408bbcdacfdc2ab8a802dc658b5e7960fd4f9ff80224c044 files/digest-gpsd-2.34 229
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 ""
+}