Updated to latest stable upstream, cleaned up older unstable versions.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

8 files changed, 80 insertions, 523 deletions

diff --git a/sci-geosciences/gpsd/ChangeLog b/sci-geosciences/gpsd/ChangeLog
index b2666c99a5aa..0a8c2fccea01 100644
--- a/sci-geosciences/gpsd/ChangeLog
+++ b/sci-geosciences/gpsd/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-geosciences/gpsd
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/ChangeLog,v 1.39 2009/06/05 02:34:37 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/ChangeLog,v 1.40 2009/07/18 17:47:15 nerdboy Exp $
+
+*gpsd-2.39 (18 Jul 2009)
+
+  18 Jul 2009; Steve Arnold <nerdboy@gentoo.org> metadata.xml,
+  gpsd-2.32.ebuild, -gpsd-2.33-r1.ebuild, -gpsd-2.34-r1.ebuild,
+  -gpsd-2.36.ebuild, -gpsd-2.37.ebuild, +gpsd-2.39.ebuild:
+  Updated to latest stable upstream, cleaned up older unstable versions 
+  (see bug # 276309).
 
   05 Jun 2009; Steve Arnold <nerdboy@gentoo.org> files/99-gpsd-usb.rules,
   gpsd-2.38.ebuild:
diff --git a/sci-geosciences/gpsd/Manifest b/sci-geosciences/gpsd/Manifest
index c40f3a73779f..49a3dfa05ede 100644
--- a/sci-geosciences/gpsd/Manifest
+++ b/sci-geosciences/gpsd/Manifest
@@ -5,16 +5,10 @@ AUX gpsd-2.33-hotplug-background-fix.patch 2231 RMD160 1b5d0326501627ec99dd08fb1
 AUX gpsd.conf 1067 RMD160 8447ea231556079586993b51836da40618b8b185 SHA1 e25bc5aa7acd239dc28fc850ab8debcdd55e8f59 SHA256 ac7e21d444926fe37377b8a6ed61773d17bf4c1faafe1474dee3e6b8d578e833
 AUX gpsd.init 894 RMD160 44c6eba4d7e81fb7226e0432a2eba2ab30988d8a SHA1 3bc473dcca4ab4695ca68e679df63b949d974197 SHA256 7c5ade04f6ea215fcdb7cbe36fce2570568a7eb3795e874520983afe58193c82
 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
-DIST gpsd-2.36.tar.gz 736220 RMD160 aa3c4741dba4c07f145f62fb027e2ba303d16284 SHA1 4faee0e3e1e5422702f354a85849fd4e8c3a98c2 SHA256 0c9bf796b932dab2baab70829780eccde4113c08ce649768facd5010d6da640a
-DIST gpsd-2.37.tar.gz 712943 RMD160 72387ef3c8da39ed1a1dffa9aecfff1622023fcc SHA1 5bf4e1db9e570cc14b70bd0cf902926f96131ace SHA256 8860e61edc26f0665ad6ea0b34be4e3fd2cc7c51c5fd63b25c857a1870e8e137
 DIST gpsd-2.38.tar.gz 776598 RMD160 e5c8a05170286fd7aac87c9d182cfdf5a8f6c6b0 SHA1 310cad336e06faed34a7bd3503b169b502520925 SHA256 ae828da850ac0590fd47768856c4ec29021332204182abe4ad94098d72168474
-EBUILD gpsd-2.32.ebuild 3426 RMD160 5b2336887f2a931f48da7fa73fec9c321bc388a0 SHA1 33ec49407e6c50311dd2de18d31d50d11c491d3b SHA256 f77cfc0e8068c25efd979ef078d6c1d99242b5d94b8ba85e3a87d4d56708bbfb
-EBUILD gpsd-2.33-r1.ebuild 3849 RMD160 4ffd2c45b44a64c5025aae8cf0e74cf524d3512d SHA1 6098cf056cf8a32af2adc6a6334f4ab3a6487828 SHA256 058aef0e76c9e4108ec53840d70de2636e91cae018297fbfa454addb6cc5fc6a
-EBUILD gpsd-2.34-r1.ebuild 4277 RMD160 765e2b3ad3a6df30feb9df6a1ff3d85466a0b6bc SHA1 154c6e0dbd8ff71ff48bbf114aa526a7a9bc3157 SHA256 703374a10fda8ba895d7888ea51a66401b69ccbeb579b31bde938bff19f4808b
-EBUILD gpsd-2.36.ebuild 4761 RMD160 df761f6ad9ff0b57079991626adf4dcb3ae48c9e SHA1 2584cbed277f0b7a2b4f100055ccf4c6f9b6ce04 SHA256 c55e0ab46e50e30bcc98e82f96965d9ef8b29bea63bf09b99a52b632c65971ec
-EBUILD gpsd-2.37.ebuild 5027 RMD160 2a55e57847c0282f8d7bc188b2b684360b442f4c SHA1 446ca40cb1c38630251119a66088d7cec64a0c7d SHA256 f943fe1ae272d65ab3f0babb44e3256766d0e8245c073347f782b1ace56ae6cb
+DIST gpsd-2.39.tar.gz 834649 RMD160 9e643156a71433a02d64284130dff200eb276527 SHA1 d3f33da9f8e789119366ec4781957eed118aa08f SHA256 ee3b2fb403112c3871e7e4fdb915cdc25b020f3208318ba61e9ac37692832a21
+EBUILD gpsd-2.32.ebuild 3401 RMD160 f13804b204afd6e4ef0fadaabc70601721b9f7c5 SHA1 851d86a9eaf1b80777dc171ae61332833d5c29af SHA256 ae1e659d5f9eee39c325e55ca66156d3a8678e022f30b1d0e059d2b1624763ba
 EBUILD gpsd-2.38.ebuild 5405 RMD160 216ee67f760bb433a3673cca9ccc49e915c549c4 SHA1 38f378f09c974ecdc1f0fc270520dbe982921981 SHA256 d0a47f98f21703d0f05059e39c5214540236101d93d58271d8dd655c4f7f3987
-MISC ChangeLog 8280 RMD160 1df6bc66dba5b718def0534e8a5a5c75e71c30ea SHA1 dd700ec63bf284d4473d219525cfee9c8aced4c4 SHA256 b26a1c9f954882b6e8d998799db01d3248f19c2dfd463c5d751f6f8380cad6f5
-MISC metadata.xml 901 RMD160 521474a3c5487fe41e33ed3067516043efab25cf SHA1 c0860dfce0113f7bf862a2e8bc02bd3dabc90c36 SHA256 66c670f114b0962ceb8df44f0132f382889cae675f97e3f8ec72423ac9fb2c5b
+EBUILD gpsd-2.39.ebuild 5378 RMD160 907af87eaaf905cc8163ef035cb2a65f7262291d SHA1 55e88990f4daf46b0bdb1f8fc2232ceb802ef7c6 SHA256 96173bf622fd4a33cc6c55c3b42b7c23fe1ccca5d05b39946caedf719b754233
+MISC ChangeLog 8588 RMD160 43c60299668e3986f450234ee2363abf72680932 SHA1 cea81ae9699673ee45d89721620792a5443d9d91 SHA256 637cba7e5a6065fb129eba8316d5e476e5cf7dd457c050076b7d1f6b77ffa01c
+MISC metadata.xml 888 RMD160 0eba5567425a4a4f782558810e5c993debc9a4cd SHA1 5698bec7ea6f864fa3cc1c7347445bf1e2490131 SHA256 687e6f5954c47a4c4940f6ef6cdf3f1870207f200bd07c2bd1487dca5ee0ffb9
diff --git a/sci-geosciences/gpsd/gpsd-2.32.ebuild b/sci-geosciences/gpsd/gpsd-2.32.ebuild
index 2dd70ab07c67..7383ae527981 100644
--- a/sci-geosciences/gpsd/gpsd-2.32.ebuild
+++ b/sci-geosciences/gpsd/gpsd-2.32.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 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.8 2008/09/08 03:46:33 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-2.32.ebuild,v 1.9 2009/07/18 17:47:15 nerdboy Exp $
 
 inherit eutils libtool distutils
 
@@ -49,7 +49,7 @@ src_compile() {
 	distutils_python_version
 	export MY_ECONF="--with-pic $(use_with X x) $(use_enable dbus)"
 	econf ${MY_ECONF} || die "econf failed"
-	emake LDFLAGS="${LDFLAGS} -lm" || die "emake failed"
+	emake || die "emake failed"
 }
 
 src_install() {
diff --git a/sci-geosciences/gpsd/gpsd-2.33-r1.ebuild b/sci-geosciences/gpsd/gpsd-2.33-r1.ebuild
deleted file mode 100644
index fd072cf2fa17..000000000000
--- a/sci-geosciences/gpsd/gpsd-2.33-r1.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-2.33-r1.ebuild,v 1.6 2008/06/27 10:31:15 ulm 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="mirror://berlios/gpsd/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~arm ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-
-IUSE="dbus ntp 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/openmotif
-	)
-	dev-lang/python
-	app-text/xmlto
-	dbus? ( >=sys-apps/dbus-0.6 )
-	ntp? ( net-misc/ntp )
-	usb? ( sys-apps/hotplug )"
-
-DEPEND="${RDEPEND}
-	X? (
-		x11-proto/xproto
-		x11-proto/xextproto
-	)"
-
-RESTRICT="test"
-
-src_unpack() {
-
-	unpack ${A}
-	epatch "${FILESDIR}"/${P}-duplicate-device-add-hang.patch
-	epatch "${FILESDIR}"/${P}-hotplug-background-fix.patch
-	cd "${S}"
-	elibtoolize
-}
-
-src_compile() {
-	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
-
-	econf ${my_conf} $(use_enable dbus) $(use_enable tntc tnt) \
-		$(use_with X x) || die "econf failed"
-
-	emake LDFLAGS="${LDFLAGS} -lm" || 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
-		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"
-	exeinto /usr/$(get_libdir)/python${PYVER}/site-packages
-	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."
-}
diff --git a/sci-geosciences/gpsd/gpsd-2.34-r1.ebuild b/sci-geosciences/gpsd/gpsd-2.34-r1.ebuild
deleted file mode 100644
index ba0da377607e..000000000000
--- a/sci-geosciences/gpsd/gpsd-2.34-r1.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-2.34-r1.ebuild,v 1.7 2008/09/08 03:46:33 nerdboy Exp $
-
-WANT_AUTOMAKE="latest"
-WANT_AUTOCONF=2.5
-
-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="mirror://berlios/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/openmotif
-	)
-	python? ( dev-lang/python )
-	dbus? ( >=sys-apps/dbus-0.94
-		>=dev-libs/glib-2.6
-		dev-libs/dbus-glib )
-	ntp? ( net-misc/ntp )
-	usb? ( virtual/dev-manager )"
-
-DEPEND="${RDEPEND}
-	X? (
-		x11-proto/xproto
-		x11-proto/xextproto
-	)
-	!minimal? ( dev-libs/libxslt )"
-
-RESTRICT="test"
-
-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}"
-
-		WITH_XSLTPROC=no WITH_XMLTO=no econf ${my_conf} \
-		$(use_enable dbus) $(use_with X x) \
-		$(use_enable tntc tnt) $(use_enable italk) \
-		$(use_enable itrax) $(use_enable python) \
-		|| die "econf failed"
-	else
-		econf ${my_conf} $(use_enable dbus) $(use_with X x) \
-		$(use_enable tntc tnt) $(use_enable italk) \
-		$(use_enable itrax) $(use_enable python) \
-		|| die "econf failed"
-	fi
-
-	emake LDFLAGS="${LDFLAGS} -lm" || die "emake failed"
-}
-
-src_install() {
-
-	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
-	else
-		rm "${D}usr/share/man/man1/xgpsspeed.1.bz2" \
-		"${D}usr/share/man/man1/xgps.1.bz2"
-	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
-
-	if use minimal; then
-		doman gpsctl.1 gpsflash.1 gpspipe.1 gps.1 gpsd.8
-		use python && doman gpsprof.1 gpsfake.1 gpscat.1
-	fi
-
-	dodoc AUTHORS INSTALL README TODO
-
-	# add missing include file (see bug #162361)
-	insinto /usr/include
-	doins gpsd_config.h
-}
-
-pkg_postinst() {
-	einfo ""
-	einfo "This version of gpsd adds additional GPS device support, almost"
-	einfo "all of which is enabled by default, except those controlled by"
-	einfo "the USE flags for TNT and iTrax/iTalk support.  The minimal flag"
-	einfo "enables the embedded device (ie, small footprint) support, but"
-	einfo "you'll need to modify the ebuild if you need to change either"
-	einfo "the number of clients or the number of devices.  Although pps"
-	einfo "is enabled, it still needs the correct kernel patches.  You"
-	einfo "should probably have >=udev-096-r1 for hotplugging and general"
-	einfo "usb device detection to work correctly (ie, without hotplug)."
-	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 ""
-}
diff --git a/sci-geosciences/gpsd/gpsd-2.36.ebuild b/sci-geosciences/gpsd/gpsd-2.36.ebuild
deleted file mode 100644
index d8329cf7964f..000000000000
--- a/sci-geosciences/gpsd/gpsd-2.36.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-2.36.ebuild,v 1.5 2008/12/21 17:56:11 nerdboy Exp $
-
-WANT_AUTOMAKE="latest"
-WANT_AUTOCONF=2.5
-
-inherit eutils autotools distutils flag-o-matic
-
-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="~arm ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-
-IUSE="dbus italk itrax minimal ntp python usb X"
-# tnt support is broken in this version - add tntc back when fixed
-
-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
-	)
-	python? ( dev-lang/python )
-
-	dbus? ( >=sys-apps/dbus-0.94
-		>=dev-libs/glib-2.6
-		dev-libs/dbus-glib )
-	ntp? ( net-misc/ntp )
-	usb? ( virtual/dev-manager )"
-
-DEPEND="${RDEPEND}
-	X? (
-		x11-proto/xproto
-		x11-proto/xextproto
-	)
-	!minimal? (
-		dev-libs/libxslt
-		sys-libs/ncurses
-	)"
-
-RESTRICT="test"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	eautoreconf
-	sed -i -e \
-	    "s:gpspacket\", extension_source)]:gpspacket\", extension_source, libraries=['m'])]:g" \
-	    setup.py || die "sed failed"
-}
-
-src_compile() {
-
-	local my_conf="--enable-shared --with-pic --enable-static \
-		--disable-garmin --disable-garmintxt"
-	# Garmin support is broken in this version
-
-	use python && distutils_python_version
-
-	if use ntp; then
-		my_conf="${my_conf} --enable-ntpshm --enable-pps"
-	else
-		my_conf="${my_conf} --disable-ntpshm --disable-pps"
-	fi
-
-	if use minimal; then
-		local max_clients="5"
-		local max_devices="2"
-		if ! use ntp; then
-		my_conf="${my_conf} --disable-pps"
-		fi
-		my_conf="${my_conf} --enable-squelch --without-x \
-		--enable-max-devices=${max_devices} \
-		--enable-max-clients=${max_clients}"
-
-		WITH_XSLTPROC=no WITH_XMLTO=no econf ${my_conf} \
-		$(use_enable dbus) $(use_enable italk) \
-		$(use_enable itrax) $(use_enable python) \
-		|| die "econf failed"
-	else
-		econf ${my_conf} $(use_enable dbus) $(use_enable italk) \
-		$(use_enable itrax) $(use_enable python) $(use_with X x) \
-		|| die "econf failed"
-	fi
-	# Support for the TNT digital compass is currently broken
-	# $(use_enable tntc tnt)
-
-	# still needs an explicit linkage with the math lib (bug #250757)
-	append-ldflags -lm
-
-	emake || die "emake failed"
-}
-
-src_install() {
-
-	make DESTDIR="${D}" install
-
-	if use usb ; then
-		insinto /etc/hotplug/usb
-		doins gpsd.usermap
-		exeinto /etc/hotplug/usb
-		doexe gpsd.hotplug
-		insinto /etc/udev/rules.d
-		doins "${FILESDIR}"/99-gpsd-usb.rules
-		keepdir /var/run/usb # needed for REMOVER
-	else
-		newconfd "${FILESDIR}"/gpsd.conf gpsd
-		newinitd "${FILESDIR}"/gpsd.init gpsd
-	fi
-
-	if use X && ! use minimal ; then
-		insinto /etc/X11/app-defaults
-		newins xgps.ad Xgps
-		newins xgpsspeed.ad Xgpsspeed
-	else
-		rm "${D}usr/share/man/man1/xgpsspeed.1.bz2" \
-		"${D}usr/share/man/man1/xgps.1.bz2"
-	fi
-
-	diropts "-m0644"
-	dobin logextract
-
-	if use python ; then
-		exeinto /usr/$(get_libdir)/python${PYVER}/site-packages
-		doexe gps.py gpsfake.py gpspacket.so
-	fi
-
-	if use minimal; then
-		doman gpsctl.1 gpsflash.1 gpspipe.1 gpsd.8 gps.1
-		use python && doman gpsprof.1 gpsfake.1 gpscat.1
-	fi
-
-	dodoc INSTALL README TODO
-
-	# add missing include file (see bug #162361)
-	insinto /usr/include
-	doins gpsd_config.h
-}
-
-pkg_postinst() {
-	einfo ""
-	einfo "This version of gpsd has broken the support for the TNT compass"
-	einfo "and Garmin so they are disabled.  If you need it, stay with the"
-	einfo "previous version for now.  The minimal flag now removes X and"
-	einfo "enables the embedded device (ie, small footprint) support, but"
-	einfo "you'll need to modify the ebuild if you need to change either"
-	einfo "the number of clients or the number of devices.  Although pps"
-	einfo "is enabled, it still needs the correct kernel patches.  All"
-	einfo "recent versions of udev (>=udev-115 or so) should have correct"
-	einfo "usb device detection and startup of gpsd (ie, without hotplug)."
-	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 ""
-}
diff --git a/sci-geosciences/gpsd/gpsd-2.37.ebuild b/sci-geosciences/gpsd/gpsd-2.39.ebuild
index 089c8ec6e77b..7efc6bcfb757 100644
--- a/sci-geosciences/gpsd/gpsd-2.37.ebuild
+++ b/sci-geosciences/gpsd/gpsd-2.39.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-2.37.ebuild,v 1.4 2008/12/21 17:56:11 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-2.39.ebuild,v 1.1 2009/07/18 17:47:15 nerdboy Exp $
 
-inherit eutils distutils
+inherit autotools eutils distutils flag-o-matic
 
 DESCRIPTION="GPS daemon and library to support USB/serial GPS devices and various GPS/mapping clients."
 HOMEPAGE="http://gpsd.berlios.de/"
@@ -10,10 +10,9 @@ SRC_URI="mirror://berlios/gpsd/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~arm ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
 
-IUSE="dbus italk itrax minimal ntp python usb X"
-# tnt support is broken in this version - add tntc back when fixed
+IUSE="dbus garmin minimal ntp ocean python tntc usb X"
 
 RDEPEND="X? (
 		x11-libs/libXmu
@@ -25,7 +24,6 @@ RDEPEND="X? (
 		x11-libs/libICE
 		x11-libs/libXpm
 		x11-libs/libXaw
-		x11-libs/openmotif
 	)
 	python? ( dev-lang/python )
 
@@ -48,16 +46,26 @@ DEPEND="${RDEPEND}
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	sed -i -e \
-	    "s:gpspacket\", extension_source)]:gpspacket\", extension_source, libraries=['m'])]:g" \
-	    setup.py || die "sed failed"
+	# add -lm to setup.py again (see bug #250757)
+	sed -i \
+	    -e "s:, gpspacket_sources:, gpspacket_sources, libraries=['m']:g" \
+	    -e "s:geoid.c\"]:geoid.c\"], libraries=['m']:g" \
+	    setup.py || die "sed 1 failed"
+	# fix Garmin text struct
+	sed -i -e "s:RTCM2_PACKET;:RTCM2_PACKET,:g" \
+	    drivers.c || die "sed 2 failed"
+	# add missing include file (see bug #162361)
+	sed -i -e "s:gps.h libgpsmm.h:gps.h libgpsmm.h gpsd_config.h:g" \
+	    Makefile.am || die "sed 3 failed"
+
+	eautoreconf
 }
 
 src_compile() {
 
 	local my_conf="--enable-shared --with-pic --enable-static \
-		--disable-garmin --disable-garmintxt"
-	# Garmin support is broken in this version
+		--disable-fast-install"
+		# --enable-superstar2 is missing a header file
 
 	use python && distutils_python_version
 
@@ -71,34 +79,37 @@ src_compile() {
 		local max_clients="5"
 		local max_devices="2"
 		if ! use ntp; then
-		my_conf="${my_conf} --disable-pps"
+			my_conf="${my_conf} --disable-pps --disable-ntpshm"
 		fi
 		my_conf="${my_conf} --enable-squelch --without-x \
 		--enable-max-devices=${max_devices} \
 		--enable-max-clients=${max_clients}"
 
 		WITH_XSLTPROC=no WITH_XMLTO=no econf ${my_conf} \
-		$(use_enable dbus) $(use_enable italk) \
-		$(use_enable itrax) $(use_enable python) \
-		|| die "econf failed"
+		$(use_enable dbus) $(use_enable ocean oceanserver) \
+		$(use_enable tntc tnt) $(use_enable python) \
+		$(use_enable garmin garmintxt) || die "econf failed"
 	else
-		econf ${my_conf} $(use_enable dbus) $(use_enable italk) \
-		$(use_enable itrax) $(use_enable python) $(use_with X x) \
+		econf ${my_conf} $(use_enable dbus) $(use_enable tntc tnt) \
+		$(use_enable ocean oceanserver) $(use_enable python) \
+		$(use_enable garmin garmintxt) $(use_with X x) \
 		|| die "econf failed"
 	fi
-	# Support for the TNT digital compass is currently broken
-	# $(use_enable tntc tnt)
 
-	# still needs an explicit linkage with the math lib (bug #250757)
-	append-ldflags -lm
+	# still needs an explicit link flag (bug #250757)
+	append-ldflags -Wl,-z,-defs -Wl,--no-undefined
 
-	emake || die "emake failed"
+	emake -j1 || die "emake failed"
 }
 
 src_install() {
 
 	make DESTDIR="${D}" install || die "make install failed"
 
+	if ! test -x "${D}"usr/sbin/gpsd; then
+	    ewarn "gpsd link error detected; please re-emerge gpsd."
+	fi
+
 	if use usb ; then
 		insinto /etc/hotplug/usb
 		doins gpsd.usermap
@@ -121,39 +132,36 @@ src_install() {
 		"${D}usr/share/man/man1/xgps.1.bz2"
 	fi
 
-	diropts "-m0644"
-	dobin logextract
+	use python && distutils_src_install
 
-	if use python ; then
-		exeinto /usr/$(get_libdir)/python${PYVER}/site-packages
-		doexe gps.py gpsfake.py gpspacket.so
-	fi
+	dodoc INSTALL README TODO
+
+	# add missing dgpsip-servers and capabilities files
+	insinto /usr/share/${PN}
+	doins dgpsip-servers gpscap.ini
 
 	if use minimal; then
-		doman gpsctl.1 gpsflash.1 gpspipe.1 gpsd.8 gps.1
-		use python && doman gpsprof.1 gpsfake.1 gpscat.1
+		doman gpsctl.1 gpsd.8 gps.1 cgps.1 gpxlogger.1 gpspipe.1
+		use python && doman gpsprof.1
+	else
+		diropts "-m0644"
+		dobin logextract
+		use python && dobin striplog
 	fi
-
-	dodoc INSTALL README TODO
-
-	# add missing include file (see bug #162361)
-	insinto /usr/include
-	doins gpsd_config.h
 }
 
 pkg_postinst() {
 	elog ""
-	elog "This version of gpsd has broken the support for the TNT compass"
-	elog "and Garmin so they are disabled.  If you need it, stay with the"
-	elog "previous version for now.  The minimal flag now removes X and"
-	elog "enables the embedded device (ie, small footprint) support, but"
-	elog "you'll need to modify the ebuild if you need to change either"
-	elog "the number of clients or the number of devices.  Although pps"
-	elog "is enabled, it still needs the correct kernel patches.  All"
-	elog "recent versions of udev (>=udev-115 or so) should have correct"
+	elog "This version of gpsd has broken support for the SuperStarII"
+	elog "chipset which is currently disabled."
+	elog ""
+	elog "Other than the above, all default devices are enabled, and all"
+	elog "optional devices and formats are controlled via USE flags."
+	elog ""
+	elog "Recent versions of udev (>=udev-115 or so) should have correct"
 	elog "usb device detection and startup of gpsd (ie, without hotplug)."
 	elog ""
-	elog "Different GPS devices require the corresponding kernel options"
+	elog "Certain GPS devices also require the corresponding kernel options"
 	elog "to be enabled, such as USB_SERIAL_GARMIN, or a USB serial driver"
 	elog "for an adapter such as those that come with Deluo GPS units (eg,"
 	elog "USB_SERIAL_PL2303). Straight serial devices should always work,"
@@ -163,10 +171,14 @@ pkg_postinst() {
 	elog "if your device isn't detected correctly, please use lsusb or"
 	elog "another suitable tool to determine the proper device IDs and"
 	elog "use the commented rules to fill in the blanks for your device."
-	elog "Please file a bug to get your device added to the list."
 	elog ""
-	elog "Read the INSTALL doc for more information on supported hardware,"
-	elog "and make sure udev has the right group permissions set on the tty"
+	elog "Please see this post about the new capabilities database:"
+	elog ""
+	elog "http://lists.berlios.de/pipermail/gpsd-dev/2009-January/006333.html"
+	elog ""
+	elog "on current hardware, adding new hardware, etc.  Read the above"
+	elog "and the INSTALL doc for more information on supported hardware,"
+	elog "and make sure udev has the right group permissions set on the"
 	elog "devices if using USB (it should Do The Right Thing (TM))..."
 	elog ""
 }
diff --git a/sci-geosciences/gpsd/metadata.xml b/sci-geosciences/gpsd/metadata.xml
index bf421a84d1b1..07bcaf2ce779 100644
--- a/sci-geosciences/gpsd/metadata.xml
+++ b/sci-geosciences/gpsd/metadata.xml
@@ -12,8 +12,8 @@
 </longdescription>
 <use>
   <flag name='garmin'>Enable support for Garmin simple text protocol</flag>
-  <flag name='italk'>Enable iTalk protocol support</flag>
-  <flag name='itrax'>Enable iTrax hardware support</flag>
+  <flag name='minimal'>Reduced install set, limited number of devices and 
+   client, no X deps</flag>
   <flag name='ntp'>Enable <pkg>net-misc/ntp</pkg> shared memory interface
     and PPS kernel support for GPS time</flag>
   <flag name='ocean'>Enable OceanServer support</flag>