Version bump to latest. Drop older. Fixes bug #362979.

Package-Manager: portage-2.2.0_alpha33/cvs/Linux x86_64

9 files changed, 170 insertions, 482 deletions

diff --git a/sci-geosciences/gpsd/ChangeLog b/sci-geosciences/gpsd/ChangeLog
index 50fdcbd9c2ac..9ba82e069511 100644
--- a/sci-geosciences/gpsd/ChangeLog
+++ b/sci-geosciences/gpsd/ChangeLog
@@ -1,6 +1,15 @@
 # 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.65 2011/05/10 13:08:25 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/ChangeLog,v 1.66 2011/05/16 10:43:42 scarabeus Exp $
+
+*gpsd-2.96 (16 May 2011)
+
+  16 May 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  +files/2.96-fix-ldflags.patch,
+  -files/gpsd-2.33-duplicate-device-add-hang.patch,
+  -files/gpsd-2.33-hotplug-background-fix.patch, -gpsd-2.38.ebuild,
+  -gpsd-2.39-r1.ebuild, +files/2.96-fix-tests.patch, +gpsd-2.96.ebuild:
+  Version bump to latest. Drop older. Fixes bug #362979.
 
   10 May 2011; Michael Weber <xmw@gentoo.org> gpsd-2.95-r1.ebuild:
   arm/ppc stable (bug 362981)
diff --git a/sci-geosciences/gpsd/Manifest b/sci-geosciences/gpsd/Manifest
index 4e884592fc27..685467c65c6d 100644
--- a/sci-geosciences/gpsd/Manifest
+++ b/sci-geosciences/gpsd/Manifest
@@ -1,30 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX 2.95-disable-strip.patch 382 RMD160 e9e94c7593b60c12dde86dc4d769ff0ff7a60413 SHA1 4ae5f084998b1538bf5428fd37016f48d57da0ee SHA256 435a6fa9c1ea46befc24af760da9ef96f4a66b9bf98c2b9d5d3f9ba2c72b4080
 AUX 2.95-fix-ldflags.patch 721 RMD160 4be1b2ea581d8aef35896acd9098bc298b3199ad SHA1 c8b03243da8d747429632eab871fa40e412be509 SHA256 3a93468ca101c876549bdda0a1d129ca5803706e4291f9fc8e7c74d2015ecf5a
+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 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-2.33-duplicate-device-add-hang.patch 1094 RMD160 651375eacec543581266b3bfbf996ee31f4bbc03 SHA1 b00cd23f00bdd24280664c8a38efa752838909fe SHA256 504784c891073fa8825704c9e94598fceb1c95c0750566e230ace19e7c777b83
-AUX gpsd-2.33-hotplug-background-fix.patch 2231 RMD160 1b5d0326501627ec99dd08fb10a2b0eaed2f69e1 SHA1 9ba7b5a3f802d12527ad6937121027a41ecccbce SHA256 acf258d1b15fda4aa303105a62807d28cde1173817a7e46ad719be479cf28a33
 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.38.tar.gz 776598 RMD160 e5c8a05170286fd7aac87c9d182cfdf5a8f6c6b0 SHA1 310cad336e06faed34a7bd3503b169b502520925 SHA256 ae828da850ac0590fd47768856c4ec29021332204182abe4ad94098d72168474
-DIST gpsd-2.39.tar.gz 834649 RMD160 9e643156a71433a02d64284130dff200eb276527 SHA1 d3f33da9f8e789119366ec4781957eed118aa08f SHA256 ee3b2fb403112c3871e7e4fdb915cdc25b020f3208318ba61e9ac37692832a21
 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.38.ebuild 5500 RMD160 a1832670de44e24c5aea18d2a80579a7299e4b65 SHA1 390ccdad9fdc2af36f93d17d459ffa06e5a3c186 SHA256 3cf54d456966e6f572a4094b9710c555a242152f78714c8edfb412ae397c5f35
-EBUILD gpsd-2.39-r1.ebuild 5510 RMD160 36e20de3ca41542d372abe916ff11ace5d9bad50 SHA1 9ac29fd5433c2b5be2944b78aac8a228301aee1e SHA256 4b3c367c754c814900045a3801f8a925e9532d3d3a6704e80a9d70718e2d71a6
 EBUILD gpsd-2.95-r1.ebuild 2668 RMD160 5add673c501cae721a8b5de25180f2a99ff368df SHA1 442af11f54e86e315b90f23c3a045347536caaf2 SHA256 36c1006385362b31684197de71892d096c3b02e579b8141b81e8d06722967d1c
-MISC ChangeLog 12249 RMD160 fefd2affe67059ac81183eb0ab16a7cc61e95a27 SHA1 b6ca2c46e68b5696102f0d3b58af7fa5a05482f0 SHA256 a120b7d1da190f2a53b96bf552b2e42cfcfdda34f6a109353861631db3771523
+EBUILD gpsd-2.96.ebuild 2658 RMD160 db268551ee663e0b8eb6be479a1485689abe3c7b SHA1 d75c297652695c0e6bab68f1345c814398e334c5 SHA256 d00629522910d347db2d45b7e5cd4134e6244a1eb7a50adb46dd07a5d17cad9c
+MISC ChangeLog 12619 RMD160 0c04e333b358dbd91ddc71a40d2932ccb0e84ea8 SHA1 4260d1e06d5df9de64b91b159dd7143b6e40a60d SHA256 3c0f662864a61daf1bd2eb6c93862a67d6950381657f164be0d080d9433e5803
 MISC metadata.xml 1036 RMD160 a8eb31ca3ab1bce798c241acd2978facb680d4d6 SHA1 e59e389ad669d2ec8d7bb6b51eccdc4d39adf778 SHA256 0a99a5aee08d78d720fa0b07712660cba2ea9c229ed99ca6e488f3dea5e1116e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk3JOM4ACgkQknrdDGLu8JAIrAD/Y8LF5mwEFuwLbrDRefLzcL8V
-/QKTUwCZr/8jdGvdG0oA+gN2KXMD8AJ8lLdxAUm8YcH/qoGr+WALr3nui7y8OqyF
-=pAbo
+iEYEARECAAYFAk3Q/+MACgkQHB6c3gNBRYfKfgCeLqEwi8/2saNz3R+y2vHOACfx
+gz8AoKXB8skx9ayx4AXr+Wp8aKJM0C9a
+=c3JL
 -----END PGP SIGNATURE-----
diff --git a/sci-geosciences/gpsd/files/2.96-fix-ldflags.patch b/sci-geosciences/gpsd/files/2.96-fix-ldflags.patch
new file mode 100644
index 000000000000..f643a359df8f
--- /dev/null
+++ b/sci-geosciences/gpsd/files/2.96-fix-ldflags.patch
@@ -0,0 +1,21 @@
+diff -urN gpsd-2.96.old/Makefile.am gpsd-2.96/Makefile.am
+--- gpsd-2.96.old/Makefile.am	2011-05-16 11:41:11.763256750 +0200
++++ gpsd-2.96/Makefile.am	2011-05-16 11:44:02.742119221 +0200
+@@ -130,7 +130,7 @@
+ libgps_VERSION_REVISION = 0
+ libgps_VERSION_AGE = 0
+ libgps_VERSION_NUMBER = $(libgps_VERSION_CURRENT):$(libgps_VERSION_REVISION):$(libgps_VERSION_AGE)
+-libgps_la_LDFLAGS = -version-number $(libgps_VERSION_NUMBER)
++libgps_la_LDFLAGS = $(LDFLAGS) -version-number $(libgps_VERSION_NUMBER)
+ lib_LTLIBRARIES = libgps.la libgpsd.la
+ 
+ libgps_SONAME = $(shell expr $(libgps_VERSION_CURRENT) - $(libgps_VERSION_AGE))
+@@ -425,7 +425,7 @@
+ # Build test_qgpsmm
+ #
+ test_qgpsmm_SOURCES = test_gpsmm.cpp
+-test_qgpsmm_LDFLAGS = -Wl,-rpath,$(srcdir)/libQgpsmm/binaries
++test_qgpsmm_LDFLAGS = $(LDFLAGS) -Wl,-rpath,$(srcdir)/libQgpsmm/binaries
+ test_qgpsmm_LDADD = $(LIBC) $(LIBUSB) $(QtNetwork_LIBS) libgps.la -LlibQgpsmm/binaries -lQgpsmm
+ test_qgpsmm_DEPENDENCIES = libQgpsmm/binaries/libQgpsmm.so
+ endif
diff --git a/sci-geosciences/gpsd/files/2.96-fix-tests.patch b/sci-geosciences/gpsd/files/2.96-fix-tests.patch
new file mode 100644
index 000000000000..38aec0024b0c
--- /dev/null
+++ b/sci-geosciences/gpsd/files/2.96-fix-tests.patch
@@ -0,0 +1,23 @@
+diff -urN gpsd-2.96.old//Makefile.am gpsd-2.96//Makefile.am
+--- gpsd-2.96.old//Makefile.am	2011-05-16 11:41:11.763256750 +0200
++++ gpsd-2.96//Makefile.am	2011-05-16 12:37:34.095971771 +0200
+@@ -615,8 +615,8 @@
+ pkgconfigdir = $(libdir)/pkgconfig
+ 
+ # These are not distributed
+-libgps: libgps_core.c gps.h .libs/libgps.a
+-	$(CC) $(CFLAGS) -o libgps $(LIBM) -DTESTMAIN $(LIBPTHREAD) -g libgps_core.c .libs/libgps.a
++libgps: libgps_core.c gps.h .libs/libgps.so
++	$(CC) $(CFLAGS) $(LDFLAGS) -o libgps $(LIBM) -DTESTMAIN $(LIBPTHREAD) -g libgps_core.c .libs/libgps.so
+ 
+ 
+ # Report splint warnings
+@@ -720,7 +720,7 @@
+ 
+ # Use make REGRESSOPTS=-u to force running with UDP rather than pty devices
+ 
+-run_regress_driver = PYTHON=$(PYTHON) $(srcdir)/regress-driver $(REGRESSOPTS)
++run_regress_driver = PYTHON=$(PYTHON) LD_LIBRARY_PATH="./.libs/" $(srcdir)/regress-driver $(REGRESSOPTS)
+ 
+ # Regression-test the daemon
+ gps-regress: gpsd stamp-python
diff --git a/sci-geosciences/gpsd/files/gpsd-2.33-duplicate-device-add-hang.patch b/sci-geosciences/gpsd/files/gpsd-2.33-duplicate-device-add-hang.patch
deleted file mode 100644
index 5e3d957a478a..000000000000
--- a/sci-geosciences/gpsd/files/gpsd-2.33-duplicate-device-add-hang.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-If you try to add the same device twice with the hotplug script, gpsd does not
-send any error back to the script, leading to it waiting forever on recv(), and
-blocking gpsd from progressing in it's select loop.
-
-This patch makes the daemon write back an error to the control socket (in
-addition the the normal debug output), so that the hotplug script does not
-block for the socket, and everything proceeds much better.
-
-Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-
-diff -Nuar --exclude '*~' gpsd-2.33.orig/gpsd.c gpsd-2.33/gpsd.c
---- gpsd-2.33.orig/gpsd.c	2006-06-09 05:34:09.000000000 -0700
-+++ gpsd-2.33/gpsd.c	2006-08-13 15:42:25.152204904 -0700
-@@ -1048,9 +1048,10 @@
- 	    (void)write(sfd, "ERROR\n", 6);
-     } else if (buf[0] == '+') {
- 	p = snarfline(buf+1, &stash);
--	if (find_device(stash))
-+	if (find_device(stash)) {
- 	    gpsd_report(1,"<= control(%d): %s already active \n", sfd, stash);
--	else {
-+		(void)write(sfd, "ERROR\n", 6);
-+	} else {
- 	    gpsd_report(1,"<= control(%d): adding %s \n", sfd, stash);
- 	    if (open_device(stash))
- 		(void)write(sfd, "OK\n", 3);
diff --git a/sci-geosciences/gpsd/files/gpsd-2.33-hotplug-background-fix.patch b/sci-geosciences/gpsd/files/gpsd-2.33-hotplug-background-fix.patch
deleted file mode 100644
index 03963ed6e5b8..000000000000
--- a/sci-geosciences/gpsd/files/gpsd-2.33-hotplug-background-fix.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-In recent versions of udev, the gpsd script runs in series with the task that
-creates the real /dev/ttyUSB0 device node. Unfortuntely, the gpsd script runs
-BEFORE the creation of the node, and the node is not created until after you
-kill the gpsd script, because the gpsd script waits forever for the node to
-appear. 
-
-This is a race condition, and is best fixed by running the actual wait/hotplug
-portion in the background.
-
-Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-
-diff -Nuar --exclude '*~' gpsd-2.33.orig/gpsd.hotplug gpsd-2.33/gpsd.hotplug
---- gpsd-2.33.orig/gpsd.hotplug	2005-06-27 11:53:00.000000000 -0700
-+++ gpsd-2.33/gpsd.hotplug	2006-08-13 18:35:03.382383884 -0700
-@@ -56,7 +56,7 @@
-     return action
- 
- def hotplug(action, devpath):
--    #syslog.syslog("ACTION=%s" % action)
-+    #syslog.syslog("ACTION=%s DEVPATH=%s" % (action,devpath))
-     if not devpath:
-         syslog.syslog("No device")
-     else:
-@@ -88,16 +88,18 @@
-             return
- 
- if __name__ == '__main__':
--    syslog.openlog('gpsd.hotplug', 0, syslog.LOG_DAEMON)
--    try: 
--        if len(sys.argv) == 1:	# Called as hotplug script
--            hotplug(os.getenv("ACTION"), os.getenv("DEVPATH"))
--        else:			# Called by hand for testing
--            gpsd_control(sys.argv[1], sys.argv[2])
--    except:
--        (exc_type, exc_value, exc_traceback) = sys.exc_info()
--        syslog.syslog("gpsd.hotplug: exception %s yields %s" % (exc_type, exc_value))
--        raise exc_type, exc_value, exc_traceback
--    #syslog.syslog("gpsd.hotplug ends")
--    syslog.closelog()
-+    pid = os.fork()
-+    if not pid:
-+        syslog.openlog('gpsd.hotplug', 0, syslog.LOG_DAEMON)
-+        try: 
-+            if len(sys.argv) == 1:	# Called as hotplug script
-+                hotplug(os.getenv("ACTION"), os.getenv("DEVPATH"))
-+            else:			# Called by hand for testing
-+                gpsd_control(sys.argv[1], sys.argv[2])
-+        except:
-+            (exc_type, exc_value, exc_traceback) = sys.exc_info()
-+            syslog.syslog("gpsd.hotplug: exception %s yields %s" % (exc_type, exc_value))
-+            raise exc_type, exc_value, exc_traceback
-+        #syslog.syslog("gpsd.hotplug ends")
-+        syslog.closelog()
-         
diff --git a/sci-geosciences/gpsd/gpsd-2.38.ebuild b/sci-geosciences/gpsd/gpsd-2.38.ebuild
deleted file mode 100644
index ca8e34edcc67..000000000000
--- a/sci-geosciences/gpsd/gpsd-2.38.ebuild
+++ /dev/null
@@ -1,195 +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.38.ebuild,v 1.11 2011/04/12 18:16:46 arfrever Exp $
-
-EAPI="3"
-
-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/"
-SRC_URI="mirror://berlios/gpsd/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-
-IUSE="dbus garmin minimal ntp ocean python 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
-	)
-	python? ( dev-lang/python )
-
-	dbus? (
-		>=sys-apps/dbus-0.94
-		dev-libs/glib:2
-		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
-	)"
-
-pkg_setup() {
-	use python && python_pkg_setup
-}
-
-src_prepare() {
-	# 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_configure() {
-
-	local my_conf="--enable-shared --with-pic --enable-static \
-		--disable-fast-install"
-		# --enable-superstar2 is missing a header file
-
-	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 --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 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 tntc tnt) \
-		$(use_enable ocean oceanserver) $(use_enable python) \
-		$(use_enable garmin garmintxt) $(use_with X x) \
-		|| die "econf failed"
-	fi
-
-	# still needs an explicit linkage with the math lib (bug #250757)
-	append-ldflags -Wl,-z,-defs -Wl,--no-undefined
-}
-
-src_compile() {
-	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
-		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
-
-	use python && distutils_src_install
-
-	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 sirfmon.1 gpsd.8 gps.1 cgps.1 cgpxlogger.1 gpspipe.1
-		use python && doman gpsprof.1
-	else
-		diropts "-m0644"
-		dobin logextract
-		use python && dobin striplog
-	fi
-}
-
-pkg_postinst() {
-	use python && distutils_pkg_postinst
-
-	elog ""
-	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 "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,"
-	elog "even without udev/hotplug support."
-	elog ""
-	elog "Note: the supplied gpsd udev rules are now device-specific, so"
-	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 ""
-	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 ""
-}
-
-pkg_postrm() {
-	use python && distutils_pkg_postrm
-}
diff --git a/sci-geosciences/gpsd/gpsd-2.39-r1.ebuild b/sci-geosciences/gpsd/gpsd-2.39-r1.ebuild
deleted file mode 100644
index c1ab79120933..000000000000
--- a/sci-geosciences/gpsd/gpsd-2.39-r1.ebuild
+++ /dev/null
@@ -1,195 +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.39-r1.ebuild,v 1.9 2011/03/02 19:51:41 jlec Exp $
-
-EAPI="2"
-
-inherit autotools eutils flag-o-matic 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="dbus garmin +gpsd_user -minimal ntp ocean pl2303 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
-	)
-	dbus? (
-		>=sys-apps/dbus-0.94
-		dev-libs/glib:2
-		dev-libs/dbus-glib )
-	ntp? ( net-misc/ntp )
-	usb? ( virtual/dev-manager )
-	sys-libs/ncurses
-	dev-lang/python"
-
-DEPEND="${RDEPEND}
-	X? (
-		x11-proto/xproto
-		x11-proto/xextproto
-	)
-	!minimal? (
-		dev-libs/libxslt
-	)"
-
-pkg_setup() {
-	# Run the gpsd daemon as user gpsd and group uucp, see bug #282130
-	if use gpsd_user; then
-		enewuser gpsd -1 -1 -1 "uucp"
-	else
-		einfo "USE=gpsd_user is disabled; no gpsd user added."
-	fi
-}
-
-src_prepare() {
-	# 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_configure() {
-
-	local my_conf="--enable-shared --with-pic --enable-static"
-		# --enable-superstar2 is missing a header file
-
-	# Drop privs to user gpsd, see bug #282130
-	use gpsd_user && my_conf="${my_conf} --enable-gpsd-user=gpsd"
-
-	if ! use ntp; then
-		my_conf="${my_conf} --disable-pps --disable-ntpshm"
-	fi
-
-	if use minimal; then
-		local max_clients="5"
-		local max_devices="2"
-		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 ocean oceanserver) \
-		$(use_enable tntc tnt) $(use_enable garmin garmintxt) \
-		|| die "econf failed"
-	else
-		econf ${my_conf} $(use_enable dbus) $(use_enable tntc tnt) \
-		$(use_enable ocean oceanserver) $(use_with X x) \
-		$(use_enable garmin garmintxt) \
-		|| die "econf failed"
-	fi
-}
-
-src_compile() {
-	# still needs an explicit link flag (bug #250757)
-	append-ldflags -Wl,-z,-defs -Wl,--no-undefined
-
-	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
-		exeinto /etc/hotplug/usb
-		doexe gpsd.hotplug
-		insinto /etc/udev/rules.d
-		doins "${FILESDIR}"/99-gpsd-usb.rules
-		if use pl2303; then
-			sed -i -e "1,7s:#ATTRS:ATTRS:" \
-				-e "1,7s:#ENV:ENV:" \
-				"${D}"/etc/udev/rules.d/99-gpsd-usb.rules
-		fi
-		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
-
-	python_src_install
-
-	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 gpsd.8 gps.1 cgps.1 gpxlogger.1 gpspipe.1 gpsprof.1
-	else
-		diropts "-m0644"
-		dobin logextract striplog
-	fi
-}
-
-pkg_postinst() {
-	elog ""
-	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 "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,"
-	elog "even without udev/hotplug support."
-	elog ""
-	elog "Note: the supplied gpsd udev rules are now device-specific, so"
-	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 ""
-	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/gpsd-2.96.ebuild b/sci-geosciences/gpsd/gpsd-2.96.ebuild
new file mode 100644
index 000000000000..b924ee6a0d98
--- /dev/null
+++ b/sci-geosciences/gpsd/gpsd-2.96.ebuild
@@ -0,0 +1,107 @@
+# 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.96.ebuild,v 1.1 2011/05/16 10:43:42 scarabeus Exp $
+
+EAPI=3
+
+PYTHON_DEPEND="2:2.6"
+
+inherit python base autotools
+
+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}bis.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+
+GPSD_PROTOCOLS="ashtech aivdm clientdebug earthmate evermore fv18 garmin
+	garmintxt gpsclock itrax mtk3301 nmea ntrip navcom oceanserver
+	oldstyle oncore rtcm104v2 rtcm104v3 sirf superstar2 timing tsip
+	tripmate tnt ubx"
+for protocol in ${GPSD_PROTOCOLS}; do
+	IUSE_GPSD_PROTOCOLS+=" gpsd_protocols_${protocol}"
+done
+
+IUSE="${IUSE_GPSD_PROTOCOLS} dbus ipv6 ntp qt4"
+
+# those harddeps are de-facto automagicall
+RDEPEND="
+	dev-python/pygtk:2
+	sys-libs/ncurses
+	virtual/libusb:1
+	dbus? (
+		sys-apps/dbus
+		dev-libs/dbus-glib
+	)
+	ntp? ( net-misc/ntp )
+	qt4? ( x11-libs/qt-gui )"
+
+DEPEND="${RDEPEND}
+	app-text/xmlto
+	=app-text/docbook-xml-dtd-4.1*"
+
+PATCHES=(
+	"${FILESDIR}/2.95-disable-strip.patch"
+	"${FILESDIR}/${PV}-fix-ldflags.patch"
+	"${FILESDIR}/${PV}-fix-tests.patch"
+)
+
+pkg_setup() {
+	python_set_active_version 2
+
+	# Run the gpsd daemon as gpsd and group uucp
+	enewuser gpsd -1 -1 -1 "uucp"
+}
+
+src_prepare() {
+	base_src_prepare
+	eautoreconf
+}
+
+src_configure() {
+	local myopts
+
+	# enable specified protocols
+	for protocol in ${GPSD_PROTOCOLS}; do
+		myopts+=" $(use_enable gpsd_protocols_${protocol} ${protocol})"
+	done
+
+	if ! use qt4 ;  then
+		myopts+=" --disable-libQgpsmm --disable-libgpsmm ${myopts}"
+	fi
+
+	# --disable-bluetooth: considered experimental -> disable
+	# Hack to make it not generate docs on the fly; xmlto is
+	# needed for man pages (xsltproc is only needed for web pages)
+	WITH_XMLTO=yes WITH_XSLTPROC=no econf \
+		--build=${CBUILD} \
+		--disable-dependency-tracking \
+		--disable-bluetooth \
+		--disable-static \
+		--enable-gpsd-user=gpsd \
+		--enable-gpsd-group=uucp \
+		$(use_enable dbus) \
+		$(use_enable ipv6) \
+		$(use_enable ntp ntpshm) \
+		$(use_enable ntp pps) \
+		${myopts}
+}
+
+src_install() {
+	# no it can't be done using emake cause it is non-compliant
+	make DESTDIR="${D}" install || die
+
+	# needs this header for libQgpsmm
+	if use qt4 ; then
+		insinto /usr/include
+		doins libQgpsmm/libQgpsmm_global.h
+	fi
+
+	# no need for .la files here
+	find "${D}" -type f -name '*.la' -exec rm -f '{}' +
+
+	newconfd "${FILESDIR}"/gpsd.conf-2 gpsd || die
+	newinitd "${FILESDIR}"/gpsd.init-2 gpsd || die
+}