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

(Portage version: 2.2_rc33/cvs/Linux x86_64)

7 files changed, 75 insertions, 512 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/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>