Sync gpsd protocol list with current source #461622 by Thomas Witt.

(Portage version: 2.2.0_alpha169/cvs/Linux x86_64, signed Manifest commit with key FB7C4156)

4 files changed, 54 insertions, 17 deletions

diff --git a/sci-geosciences/gpsd/ChangeLog b/sci-geosciences/gpsd/ChangeLog
index f18e2533edc3..494dd08e3274 100644
--- a/sci-geosciences/gpsd/ChangeLog
+++ b/sci-geosciences/gpsd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-geosciences/gpsd
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/ChangeLog,v 1.95 2013/03/11 17:24:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/ChangeLog,v 1.96 2013/03/27 20:04:10 vapier Exp $
+
+  27 Mar 2013; Mike Frysinger <vapier@gentoo.org> gpsd-3.8.ebuild,
+  gpsd-9999.ebuild, metadata.xml:
+  Sync gpsd protocol list with current source #461622 by Thomas Witt.
 
 *gpsd-3.8 (11 Mar 2013)
 
diff --git a/sci-geosciences/gpsd/gpsd-3.8.ebuild b/sci-geosciences/gpsd/gpsd-3.8.ebuild
index e8889933bb59..1f7eff5271e6 100644
--- a/sci-geosciences/gpsd/gpsd-3.8.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-3.8.ebuild,v 1.1 2013/03/11 17:24:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-3.8.ebuild,v 1.2 2013/03/27 20:04:10 vapier Exp $
 
 EAPI="4"
 
@@ -26,14 +26,15 @@ LICENSE="BSD"
 SLOT="0"
 
 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
+	aivdm ashtech earthmate evermore fury fv18 garmin garmintxt
+	geostar gpsclock itrax mtk3301 navcom nmea nmea2000 ntrip
+	oceanserver oncore rtcm104v2 rtcm104v3 sirf superstar2 tnt
+	tripmate tsip ubx
 )
 IUSE_GPSD_PROTOCOLS=${GPSD_PROTOCOLS[@]/#/gpsd_protocols_}
-IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth cxx debug dbus ipv6 ncurses ntp python qt4 +shm +sockets test udev usb X"
-REQUIRED_USE="X? ( python )"
+IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth cxx debug dbus ipv6 latency_timing ncurses ntp python qt4 +shm +sockets test udev usb X"
+REQUIRED_USE="X? ( python )
+	gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm )"
 
 RDEPEND="X? ( dev-python/pygtk:2 )
 	ncurses? ( sys-libs/ncurses )
@@ -60,6 +61,20 @@ pkg_setup() {
 	use python && python_pkg_setup
 }
 
+src_unpack() {
+	default
+
+	# Make sure our list matches the source.
+	local src_protocols=$(echo $(
+		sed -n '/GPS protocols/,/Time service/{s:#.*::;s:[(",]::g;p}' "${S}"/SConstruct | awk '{print $1}' | LC_ALL=C sort
+	) )
+	if [[ ${src_protocols} != ${GPSD_PROTOCOLS[*]} ]] ; then
+		eerror "Detected protocols: ${src_protocols}"
+		eerror "Ebuild protocols:   ${GPSD_PROTOCOLS[*]}"
+		die "please sync ebuild & source"
+	fi
+}
+
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-3.8-ldflags.patch
 	epatch "${FILESDIR}"/${PN}-3.8-libgps.patch
@@ -105,9 +120,10 @@ src_configure() {
 		python=False
 		$(use_scons bluetooth bluez)
 		$(use_scons cxx libgpsmm)
-		$(use_scons debug)
+		$(use_scons debug clientdebug)
 		$(use_scons dbus dbus_export)
 		$(use_scons ipv6)
+		$(use_scons latency_timing timing)
 		$(use_scons ncurses)
 		$(use_scons ntp ntpshm)
 		$(use_scons ntp pps)
diff --git a/sci-geosciences/gpsd/gpsd-9999.ebuild b/sci-geosciences/gpsd/gpsd-9999.ebuild
index b9874f5ff884..de0e3cc5dc7a 100644
--- a/sci-geosciences/gpsd/gpsd-9999.ebuild
+++ b/sci-geosciences/gpsd/gpsd-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-9999.ebuild,v 1.9 2013/03/11 17:24:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-9999.ebuild,v 1.10 2013/03/27 20:04:10 vapier Exp $
 
 EAPI="4"
 
@@ -26,14 +26,15 @@ LICENSE="BSD"
 SLOT="0"
 
 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
+	aivdm ashtech earthmate evermore fury fv18 garmin garmintxt
+	geostar gpsclock itrax mtk3301 navcom nmea nmea2000 ntrip
+	oceanserver oncore rtcm104v2 rtcm104v3 sirf superstar2 tnt
+	tripmate tsip ubx
 )
 IUSE_GPSD_PROTOCOLS=${GPSD_PROTOCOLS[@]/#/gpsd_protocols_}
-IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth cxx debug dbus ipv6 ncurses ntp python qt4 +shm +sockets test udev usb X"
-REQUIRED_USE="X? ( python )"
+IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth cxx debug dbus ipv6 latency_timing ncurses ntp python qt4 +shm +sockets test udev usb X"
+REQUIRED_USE="X? ( python )
+	gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm )"
 
 RDEPEND="X? ( dev-python/pygtk:2 )
 	ncurses? ( sys-libs/ncurses )
@@ -60,6 +61,20 @@ pkg_setup() {
 	use python && python_pkg_setup
 }
 
+src_unpack() {
+	default
+
+	# Make sure our list matches the source.
+	local src_protocols=$(echo $(
+		sed -n '/GPS protocols/,/Time service/{s:#.*::;s:[(",]::g;p}' "${S}"/SConstruct | awk '{print $1}' | LC_ALL=C sort
+	) )
+	if [[ ${src_protocols} != ${GPSD_PROTOCOLS[*]} ]] ; then
+		eerror "Detected protocols: ${src_protocols}"
+		eerror "Ebuild protocols:   ${GPSD_PROTOCOLS[*]}"
+		die "please sync ebuild & source"
+	fi
+}
+
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-3.8-ldflags.patch
 	epatch "${FILESDIR}"/${PN}-3.8-libgps.patch
@@ -105,9 +120,10 @@ src_configure() {
 		python=False
 		$(use_scons bluetooth bluez)
 		$(use_scons cxx libgpsmm)
-		$(use_scons debug)
+		$(use_scons debug clientdebug)
 		$(use_scons dbus dbus_export)
 		$(use_scons ipv6)
+		$(use_scons latency_timing timing)
 		$(use_scons ncurses)
 		$(use_scons ntp ntpshm)
 		$(use_scons ntp pps)
diff --git a/sci-geosciences/gpsd/metadata.xml b/sci-geosciences/gpsd/metadata.xml
index 5c0ecb75d8d0..2fb5da4a64a9 100644
--- a/sci-geosciences/gpsd/metadata.xml
+++ b/sci-geosciences/gpsd/metadata.xml
@@ -8,6 +8,7 @@
 </longdescription>
 <use>
   <flag name='dbus'>export gpsd data over dbus connections</flag>
+  <flag name='latency_timing'>support latency timing information</flag>
   <flag name='ntp'>Enable <pkg>net-misc/ntp</pkg> shared memory interface
     and PPS kernel support for GPS time</flag>
   <flag name='sockets'>export gpsd over unix sockets</flag>