1 |
vapier 13/03/27 20:04:10 |
2 |
|
3 |
Modified: gpsd-9999.ebuild metadata.xml gpsd-3.8.ebuild |
4 |
ChangeLog |
5 |
Log: |
6 |
Sync gpsd protocol list with current source #461622 by Thomas Witt. |
7 |
|
8 |
(Portage version: 2.2.0_alpha169/cvs/Linux x86_64, signed Manifest commit with key FB7C4156) |
9 |
|
10 |
Revision Changes Path |
11 |
1.10 sci-geosciences/gpsd/gpsd-9999.ebuild |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/gpsd-9999.ebuild?rev=1.10&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/gpsd-9999.ebuild?rev=1.10&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/gpsd-9999.ebuild?r1=1.9&r2=1.10 |
16 |
|
17 |
Index: gpsd-9999.ebuild |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-9999.ebuild,v |
20 |
retrieving revision 1.9 |
21 |
retrieving revision 1.10 |
22 |
diff -u -r1.9 -r1.10 |
23 |
--- gpsd-9999.ebuild 11 Mar 2013 17:24:59 -0000 1.9 |
24 |
+++ gpsd-9999.ebuild 27 Mar 2013 20:04:10 -0000 1.10 |
25 |
@@ -1,6 +1,6 @@ |
26 |
# Copyright 1999-2013 Gentoo Foundation |
27 |
# Distributed under the terms of the GNU General Public License v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-9999.ebuild,v 1.9 2013/03/11 17:24:59 vapier Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-9999.ebuild,v 1.10 2013/03/27 20:04:10 vapier Exp $ |
30 |
|
31 |
EAPI="4" |
32 |
|
33 |
@@ -26,14 +26,15 @@ |
34 |
SLOT="0" |
35 |
|
36 |
GPSD_PROTOCOLS=( |
37 |
- ashtech aivdm clientdebug earthmate evermore fv18 garmin |
38 |
- garmintxt gpsclock itrax mtk3301 nmea ntrip navcom oceanserver |
39 |
- oldstyle oncore rtcm104v2 rtcm104v3 sirf superstar2 timing tsip |
40 |
- tripmate tnt ubx |
41 |
+ aivdm ashtech earthmate evermore fury fv18 garmin garmintxt |
42 |
+ geostar gpsclock itrax mtk3301 navcom nmea nmea2000 ntrip |
43 |
+ oceanserver oncore rtcm104v2 rtcm104v3 sirf superstar2 tnt |
44 |
+ tripmate tsip ubx |
45 |
) |
46 |
IUSE_GPSD_PROTOCOLS=${GPSD_PROTOCOLS[@]/#/gpsd_protocols_} |
47 |
-IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth cxx debug dbus ipv6 ncurses ntp python qt4 +shm +sockets test udev usb X" |
48 |
-REQUIRED_USE="X? ( python )" |
49 |
+IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth cxx debug dbus ipv6 latency_timing ncurses ntp python qt4 +shm +sockets test udev usb X" |
50 |
+REQUIRED_USE="X? ( python ) |
51 |
+ gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm )" |
52 |
|
53 |
RDEPEND="X? ( dev-python/pygtk:2 ) |
54 |
ncurses? ( sys-libs/ncurses ) |
55 |
@@ -60,6 +61,20 @@ |
56 |
use python && python_pkg_setup |
57 |
} |
58 |
|
59 |
+src_unpack() { |
60 |
+ default |
61 |
+ |
62 |
+ # Make sure our list matches the source. |
63 |
+ local src_protocols=$(echo $( |
64 |
+ sed -n '/GPS protocols/,/Time service/{s:#.*::;s:[(",]::g;p}' "${S}"/SConstruct | awk '{print $1}' | LC_ALL=C sort |
65 |
+ ) ) |
66 |
+ if [[ ${src_protocols} != ${GPSD_PROTOCOLS[*]} ]] ; then |
67 |
+ eerror "Detected protocols: ${src_protocols}" |
68 |
+ eerror "Ebuild protocols: ${GPSD_PROTOCOLS[*]}" |
69 |
+ die "please sync ebuild & source" |
70 |
+ fi |
71 |
+} |
72 |
+ |
73 |
src_prepare() { |
74 |
epatch "${FILESDIR}"/${PN}-3.8-ldflags.patch |
75 |
epatch "${FILESDIR}"/${PN}-3.8-libgps.patch |
76 |
@@ -105,9 +120,10 @@ |
77 |
python=False |
78 |
$(use_scons bluetooth bluez) |
79 |
$(use_scons cxx libgpsmm) |
80 |
- $(use_scons debug) |
81 |
+ $(use_scons debug clientdebug) |
82 |
$(use_scons dbus dbus_export) |
83 |
$(use_scons ipv6) |
84 |
+ $(use_scons latency_timing timing) |
85 |
$(use_scons ncurses) |
86 |
$(use_scons ntp ntpshm) |
87 |
$(use_scons ntp pps) |
88 |
|
89 |
|
90 |
|
91 |
1.10 sci-geosciences/gpsd/metadata.xml |
92 |
|
93 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/metadata.xml?rev=1.10&view=markup |
94 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/metadata.xml?rev=1.10&content-type=text/plain |
95 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/metadata.xml?r1=1.9&r2=1.10 |
96 |
|
97 |
Index: metadata.xml |
98 |
=================================================================== |
99 |
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/metadata.xml,v |
100 |
retrieving revision 1.9 |
101 |
retrieving revision 1.10 |
102 |
diff -u -r1.9 -r1.10 |
103 |
--- metadata.xml 7 Oct 2012 09:04:49 -0000 1.9 |
104 |
+++ metadata.xml 27 Mar 2013 20:04:10 -0000 1.10 |
105 |
@@ -8,6 +8,7 @@ |
106 |
</longdescription> |
107 |
<use> |
108 |
<flag name='dbus'>export gpsd data over dbus connections</flag> |
109 |
+ <flag name='latency_timing'>support latency timing information</flag> |
110 |
<flag name='ntp'>Enable <pkg>net-misc/ntp</pkg> shared memory interface |
111 |
and PPS kernel support for GPS time</flag> |
112 |
<flag name='sockets'>export gpsd over unix sockets</flag> |
113 |
|
114 |
|
115 |
|
116 |
1.2 sci-geosciences/gpsd/gpsd-3.8.ebuild |
117 |
|
118 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/gpsd-3.8.ebuild?rev=1.2&view=markup |
119 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/gpsd-3.8.ebuild?rev=1.2&content-type=text/plain |
120 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/gpsd-3.8.ebuild?r1=1.1&r2=1.2 |
121 |
|
122 |
Index: gpsd-3.8.ebuild |
123 |
=================================================================== |
124 |
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-3.8.ebuild,v |
125 |
retrieving revision 1.1 |
126 |
retrieving revision 1.2 |
127 |
diff -u -r1.1 -r1.2 |
128 |
--- gpsd-3.8.ebuild 11 Mar 2013 17:24:59 -0000 1.1 |
129 |
+++ gpsd-3.8.ebuild 27 Mar 2013 20:04:10 -0000 1.2 |
130 |
@@ -1,6 +1,6 @@ |
131 |
# Copyright 1999-2013 Gentoo Foundation |
132 |
# Distributed under the terms of the GNU General Public License v2 |
133 |
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-3.8.ebuild,v 1.1 2013/03/11 17:24:59 vapier Exp $ |
134 |
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-3.8.ebuild,v 1.2 2013/03/27 20:04:10 vapier Exp $ |
135 |
|
136 |
EAPI="4" |
137 |
|
138 |
@@ -26,14 +26,15 @@ |
139 |
SLOT="0" |
140 |
|
141 |
GPSD_PROTOCOLS=( |
142 |
- ashtech aivdm clientdebug earthmate evermore fv18 garmin |
143 |
- garmintxt gpsclock itrax mtk3301 nmea ntrip navcom oceanserver |
144 |
- oldstyle oncore rtcm104v2 rtcm104v3 sirf superstar2 timing tsip |
145 |
- tripmate tnt ubx |
146 |
+ aivdm ashtech earthmate evermore fury fv18 garmin garmintxt |
147 |
+ geostar gpsclock itrax mtk3301 navcom nmea nmea2000 ntrip |
148 |
+ oceanserver oncore rtcm104v2 rtcm104v3 sirf superstar2 tnt |
149 |
+ tripmate tsip ubx |
150 |
) |
151 |
IUSE_GPSD_PROTOCOLS=${GPSD_PROTOCOLS[@]/#/gpsd_protocols_} |
152 |
-IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth cxx debug dbus ipv6 ncurses ntp python qt4 +shm +sockets test udev usb X" |
153 |
-REQUIRED_USE="X? ( python )" |
154 |
+IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth cxx debug dbus ipv6 latency_timing ncurses ntp python qt4 +shm +sockets test udev usb X" |
155 |
+REQUIRED_USE="X? ( python ) |
156 |
+ gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm )" |
157 |
|
158 |
RDEPEND="X? ( dev-python/pygtk:2 ) |
159 |
ncurses? ( sys-libs/ncurses ) |
160 |
@@ -60,6 +61,20 @@ |
161 |
use python && python_pkg_setup |
162 |
} |
163 |
|
164 |
+src_unpack() { |
165 |
+ default |
166 |
+ |
167 |
+ # Make sure our list matches the source. |
168 |
+ local src_protocols=$(echo $( |
169 |
+ sed -n '/GPS protocols/,/Time service/{s:#.*::;s:[(",]::g;p}' "${S}"/SConstruct | awk '{print $1}' | LC_ALL=C sort |
170 |
+ ) ) |
171 |
+ if [[ ${src_protocols} != ${GPSD_PROTOCOLS[*]} ]] ; then |
172 |
+ eerror "Detected protocols: ${src_protocols}" |
173 |
+ eerror "Ebuild protocols: ${GPSD_PROTOCOLS[*]}" |
174 |
+ die "please sync ebuild & source" |
175 |
+ fi |
176 |
+} |
177 |
+ |
178 |
src_prepare() { |
179 |
epatch "${FILESDIR}"/${PN}-3.8-ldflags.patch |
180 |
epatch "${FILESDIR}"/${PN}-3.8-libgps.patch |
181 |
@@ -105,9 +120,10 @@ |
182 |
python=False |
183 |
$(use_scons bluetooth bluez) |
184 |
$(use_scons cxx libgpsmm) |
185 |
- $(use_scons debug) |
186 |
+ $(use_scons debug clientdebug) |
187 |
$(use_scons dbus dbus_export) |
188 |
$(use_scons ipv6) |
189 |
+ $(use_scons latency_timing timing) |
190 |
$(use_scons ncurses) |
191 |
$(use_scons ntp ntpshm) |
192 |
$(use_scons ntp pps) |
193 |
|
194 |
|
195 |
|
196 |
1.96 sci-geosciences/gpsd/ChangeLog |
197 |
|
198 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/ChangeLog?rev=1.96&view=markup |
199 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/ChangeLog?rev=1.96&content-type=text/plain |
200 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/ChangeLog?r1=1.95&r2=1.96 |
201 |
|
202 |
Index: ChangeLog |
203 |
=================================================================== |
204 |
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/ChangeLog,v |
205 |
retrieving revision 1.95 |
206 |
retrieving revision 1.96 |
207 |
diff -u -r1.95 -r1.96 |
208 |
--- ChangeLog 11 Mar 2013 17:24:59 -0000 1.95 |
209 |
+++ ChangeLog 27 Mar 2013 20:04:10 -0000 1.96 |
210 |
@@ -1,6 +1,10 @@ |
211 |
# ChangeLog for sci-geosciences/gpsd |
212 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
213 |
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/ChangeLog,v 1.95 2013/03/11 17:24:59 vapier Exp $ |
214 |
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/ChangeLog,v 1.96 2013/03/27 20:04:10 vapier Exp $ |
215 |
+ |
216 |
+ 27 Mar 2013; Mike Frysinger <vapier@g.o> gpsd-3.8.ebuild, |
217 |
+ gpsd-9999.ebuild, metadata.xml: |
218 |
+ Sync gpsd protocol list with current source #461622 by Thomas Witt. |
219 |
|
220 |
*gpsd-3.8 (11 Mar 2013) |