1 |
commit: 9f52f6421ecbe3ec235979016783f9af9371714f |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Feb 4 00:14:53 2018 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Feb 6 19:35:10 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f52f642 |
7 |
|
8 |
sci-geosciences/gpsd: Drop old |
9 |
|
10 |
Closes: https://bugs.gentoo.org/632372 |
11 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
12 |
|
13 |
sci-geosciences/gpsd/Manifest | 2 - |
14 |
sci-geosciences/gpsd/files/gpsd-3.10-dbus.patch | 32 ---- |
15 |
.../gpsd/files/gpsd-3.10-nmea-disabled.patch | 54 ------- |
16 |
sci-geosciences/gpsd/files/gpsd-3.10-rpath.patch | 13 -- |
17 |
.../gpsd/files/gpsd-3.10-udev-install.patch | 40 ----- |
18 |
.../gpsd/files/gpsd-3.15-broken-install.patch | 28 ---- |
19 |
.../gpsd/files/gpsd-3.15-dynamic-libs.patch | 100 ------------ |
20 |
sci-geosciences/gpsd/files/gpsd-3.15-libgpsd.patch | 81 ---------- |
21 |
.../gpsd/files/gpsd-3.15-timebase.patch | 12 -- |
22 |
.../gpsd/files/gpsd-3.16-sysmacros.patch | 31 ---- |
23 |
sci-geosciences/gpsd/files/gpsd-3.8-ldflags.patch | 15 -- |
24 |
sci-geosciences/gpsd/gpsd-3.10.ebuild | 167 -------------------- |
25 |
sci-geosciences/gpsd/gpsd-3.16.ebuild | 170 --------------------- |
26 |
sci-geosciences/gpsd/gpsd-3.17.ebuild | 163 -------------------- |
27 |
14 files changed, 908 deletions(-) |
28 |
|
29 |
diff --git a/sci-geosciences/gpsd/Manifest b/sci-geosciences/gpsd/Manifest |
30 |
index 2fa9615e1b8..3352663f8ca 100644 |
31 |
--- a/sci-geosciences/gpsd/Manifest |
32 |
+++ b/sci-geosciences/gpsd/Manifest |
33 |
@@ -1,3 +1 @@ |
34 |
-DIST gpsd-3.10.tar.gz 1566622 BLAKE2B c80fcabf7d2e33d2704cd320b8bbaf0954abf4ba27d2de11e0b9db40f23ea14f5faa4ca81fa3462707018ff6d1956486bff7e0581afec35befaa005455947cfd SHA512 fd452185a8a9f9b8dfb2a5c2d5b6410f795d56dc46a7c216d8fcd686e43c5555a5f0421434060e9bb7afa465bb8a45a1e358108c4de42300eeb972caa334d8b6 |
35 |
-DIST gpsd-3.16.tar.gz 8587490 BLAKE2B db6619308ddb2f473727bc91d2f696a401a0b4f97afa66e52a5515f633a5a154fa6b158185e0f42f893bda4867c928314c0e56bd80ac3c12ded16d6d25ce64d6 SHA512 a8ad85a1f17d3ea550a4b99c262e47a834ed8fd16b00e10574f7cf5f34b6c506142aa77a870a61f8827c0d0c88fe7f65f6e916089d64e84c5667d4a2ca89c543 |
36 |
DIST gpsd-3.17.tar.gz 8755304 BLAKE2B d1f82b5734fd90fe903a6f2fe8835fe8292fe3e729306e7abe4054821971fece4c23f382c08a233503f07ad66b7b3a02a52a000e55c08491bf254ab6e99378b5 SHA512 71085053f600730e0f2de269c59ce0a17ae106ef01403f02d78418b267c6adb9818d541fba59eb23bf71cdb67c5442c82b4948d262ef7e74bb993dcae677a1b1 |
37 |
|
38 |
diff --git a/sci-geosciences/gpsd/files/gpsd-3.10-dbus.patch b/sci-geosciences/gpsd/files/gpsd-3.10-dbus.patch |
39 |
deleted file mode 100644 |
40 |
index 3ea68386e2f..00000000000 |
41 |
--- a/sci-geosciences/gpsd/files/gpsd-3.10-dbus.patch |
42 |
+++ /dev/null |
43 |
@@ -1,32 +0,0 @@ |
44 |
-From efaf7972ca95ff52464dedfe30bafa45095d299e Mon Sep 17 00:00:00 2001 |
45 |
-From: Bernd Zeimetz <bernd@××××.de> |
46 |
-Date: Sat, 23 Nov 2013 02:56:22 +0100 |
47 |
-Subject: [PATCH] Make it build abain with dbus enabled. |
48 |
- |
49 |
-This reverts a bad change to SConstruct in 57e9bdea. |
50 |
- |
51 |
-It still leaves the issue that scons links all file sstaically now. |
52 |
---- |
53 |
- SConstruct | 6 +++++- |
54 |
- 1 file changed, 5 insertions(+), 1 deletion(-) |
55 |
- |
56 |
-diff --git a/SConstruct b/SConstruct |
57 |
-index 290910b..51b07e1 100644 |
58 |
---- a/SConstruct |
59 |
-+++ b/SConstruct |
60 |
-@@ -968,7 +968,11 @@ gpsdlibs = ["-lgpsd"] + usblibs + bluezlibs + gpslibs |
61 |
- # linking |
62 |
- # The final executable will build but not be portable. |
63 |
- |
64 |
--env.StaticLibrary(target = 'libgps.a', source = libgps_sources) |
65 |
-+env.StaticLibrary(target='libgps.a', |
66 |
-+ source=libgps_sources, |
67 |
-+ parse_flags=dbus_libs + rtlibs) |
68 |
-+ |
69 |
-+ |
70 |
- |
71 |
- # Source groups |
72 |
- |
73 |
--- |
74 |
-1.8.4.3 |
75 |
- |
76 |
|
77 |
diff --git a/sci-geosciences/gpsd/files/gpsd-3.10-nmea-disabled.patch b/sci-geosciences/gpsd/files/gpsd-3.10-nmea-disabled.patch |
78 |
deleted file mode 100644 |
79 |
index e87eff8a564..00000000000 |
80 |
--- a/sci-geosciences/gpsd/files/gpsd-3.10-nmea-disabled.patch |
81 |
+++ /dev/null |
82 |
@@ -1,54 +0,0 @@ |
83 |
-https://bugs.gentoo.org/493022 |
84 |
- |
85 |
-From c31095e1562494a74d56b46fcc01541d1444cd5c Mon Sep 17 00:00:00 2001 |
86 |
-From: Simon Dawson <spdawson@×××××.com> |
87 |
-Date: Sun, 8 Dec 2013 10:31:25 +0000 |
88 |
-Subject: [PATCH] gpsmon: fix build when nmea is false |
89 |
- |
90 |
-When nmea is False and ncurses support is enabled, the build fails as |
91 |
-follows. |
92 |
- |
93 |
-gpsmon.o: In function `gpsmon_hook': |
94 |
-gpsmon.c:(.text+0x974): undefined reference to `driver_nmea0183' |
95 |
-collect2: error: ld returned 1 exit status |
96 |
-scons: *** [gpsmon] Error 1 |
97 |
-scons: building terminated because of errors. |
98 |
- |
99 |
-The problem appears to be a failure to protect use of the driver_nmea0183 |
100 |
-variable with appropriate #ifdef guards. |
101 |
- |
102 |
-Signed-off-by: Simon Dawson <spdawson@×××××.com> |
103 |
-Signed-off-by: Eric S. Raymond <esr@×××××××.com> |
104 |
---- |
105 |
- gpsmon.c | 4 ++++ |
106 |
- 1 file changed, 4 insertions(+) |
107 |
- |
108 |
-diff --git a/gpsmon.c b/gpsmon.c |
109 |
-index de1f14b..b030979 100644 |
110 |
---- a/gpsmon.c |
111 |
-+++ b/gpsmon.c |
112 |
-@@ -36,7 +36,9 @@ extern struct monitor_object_t garmin_mmt, garmin_bin_ser_mmt; |
113 |
- extern struct monitor_object_t italk_mmt, ubx_mmt, superstar2_mmt; |
114 |
- extern struct monitor_object_t fv18_mmt, gpsclock_mmt, mtk3301_mmt; |
115 |
- extern struct monitor_object_t oncore_mmt, tnt_mmt, aivdm_mmt; |
116 |
-+#ifdef NMEA_ENABLE |
117 |
- extern const struct gps_type_t driver_nmea0183; |
118 |
-+#endif /* NMEA_ENABLE */ |
119 |
- |
120 |
- /* These are public */ |
121 |
- struct gps_device_t session; |
122 |
-@@ -477,9 +479,11 @@ static void select_packet_monitor(struct gps_device_t *device) |
123 |
- */ |
124 |
- if (device->packet.type != last_type) { |
125 |
- const struct gps_type_t *active_type = device->device_type; |
126 |
-+#ifdef NMEA_ENABLE |
127 |
- if (device->packet.type == NMEA_PACKET |
128 |
- && ((device->device_type->flags & DRIVER_STICKY) != 0)) |
129 |
- active_type = &driver_nmea0183; |
130 |
-+#endif /* NMEA_ENABLE */ |
131 |
- if (!switch_type(active_type)) |
132 |
- longjmp(terminate, TERM_DRIVER_SWITCH); |
133 |
- else { |
134 |
--- |
135 |
-2.1.2 |
136 |
- |
137 |
|
138 |
diff --git a/sci-geosciences/gpsd/files/gpsd-3.10-rpath.patch b/sci-geosciences/gpsd/files/gpsd-3.10-rpath.patch |
139 |
deleted file mode 100644 |
140 |
index 8d4a309f095..00000000000 |
141 |
--- a/sci-geosciences/gpsd/files/gpsd-3.10-rpath.patch |
142 |
+++ /dev/null |
143 |
@@ -1,13 +0,0 @@ |
144 |
-don't set the -rpath flag to the install dir as this breaks DESTDIR |
145 |
- |
146 |
---- a/SConstruct |
147 |
-+++ b/SConstruct |
148 |
-@@ -287,7 +287,7 @@ def installdir(dir, add_destdir=True): |
149 |
- # Honor the specified installation prefix in link paths. |
150 |
- if env["sysroot"]: |
151 |
- env.Prepend(LIBPATH=[env["sysroot"] + installdir('libdir', add_destdir=False)]) |
152 |
--if env["shared"]: |
153 |
-+if env["shared"] and env["chrpath"]: |
154 |
- env.Prepend(RPATH=[installdir('libdir')]) |
155 |
- |
156 |
- # Give deheader a way to set compiler flags |
157 |
|
158 |
diff --git a/sci-geosciences/gpsd/files/gpsd-3.10-udev-install.patch b/sci-geosciences/gpsd/files/gpsd-3.10-udev-install.patch |
159 |
deleted file mode 100644 |
160 |
index 5d81466b970..00000000000 |
161 |
--- a/sci-geosciences/gpsd/files/gpsd-3.10-udev-install.patch |
162 |
+++ /dev/null |
163 |
@@ -1,40 +0,0 @@ |
164 |
-From 6821edb2d40956e5f93a80420ae1dbf825b95281 Mon Sep 17 00:00:00 2001 |
165 |
-From: Mike Frysinger <vapier@g.o> |
166 |
-Date: Mon, 11 Mar 2013 13:26:57 -0400 |
167 |
-Subject: [PATCH] fix DESTDIR handling with udev rules install again |
168 |
- |
169 |
-Commit 102e29d16c3fd9b414eeac53c794302f902ae8da reverted the DESTDIR |
170 |
-logic when upgrading the udev path handling. |
171 |
- |
172 |
-I fixed that with commit a41cd69c87e312198834a2e6232134176c9352e5. |
173 |
- |
174 |
-It's been reverted yet again in an unrelated commit |
175 |
-57e9bdeae2f00664616ee1d9a936a5cfe27bfd30. Why do people keep doing this? |
176 |
- |
177 |
-Signed-off-by: Mike Frysinger <vapier@g.o> |
178 |
---- |
179 |
- SConstruct | 8 ++++---- |
180 |
- 1 file changed, 4 insertions(+), 4 deletions(-) |
181 |
- |
182 |
-diff --git a/SConstruct b/SConstruct |
183 |
-index 51b07e1..caed21e 100644 |
184 |
---- a/SConstruct |
185 |
-+++ b/SConstruct |
186 |
-@@ -1790,10 +1790,10 @@ if env['python']: |
187 |
- # is plugged in. |
188 |
- |
189 |
- Utility('udev-install', 'install', [ |
190 |
-- 'mkdir -p ' + env['udevdir'], |
191 |
-- 'cp $SRCDIR/gpsd.rules ' + env['udevdir'] + '/rules.d/25-gpsd.rules', |
192 |
-- 'cp $SRCDIR/gpsd.hotplug ' + env['udevdir'], |
193 |
-- 'chmod a+x ' + env['udevdir'] + '/gpsd.hotplug', |
194 |
-+ 'mkdir -p ' + DESTDIR + env['udevdir'] + '/rules.d', |
195 |
-+ 'cp $SRCDIR/gpsd.rules ' + DESTDIR + env['udevdir'] + '/rules.d/25-gpsd.rules', |
196 |
-+ 'cp $SRCDIR/gpsd.hotplug ' + DESTDIR + env['udevdir'], |
197 |
-+ 'chmod a+x ' + DESTDIR + env['udevdir'] + '/gpsd.hotplug', |
198 |
- ]) |
199 |
- |
200 |
- Utility('udev-uninstall', '', [ |
201 |
--- |
202 |
-1.8.4.3 |
203 |
- |
204 |
|
205 |
diff --git a/sci-geosciences/gpsd/files/gpsd-3.15-broken-install.patch b/sci-geosciences/gpsd/files/gpsd-3.15-broken-install.patch |
206 |
deleted file mode 100644 |
207 |
index ec68a3c21a9..00000000000 |
208 |
--- a/sci-geosciences/gpsd/files/gpsd-3.15-broken-install.patch |
209 |
+++ /dev/null |
210 |
@@ -1,28 +0,0 @@ |
211 |
-From 798629da485b9504dbb5bd5c96c9ea1d3454ebe3 Mon Sep 17 00:00:00 2001 |
212 |
-From: Mike Frysinger <vapier@g.o> |
213 |
-Date: Sun, 7 Jun 2015 13:39:55 -0400 |
214 |
-Subject: [PATCH] Revert "# Work arount a minor bug in InstallSharedLib() link |
215 |
- handling" |
216 |
- |
217 |
-This reverts commit 0532106c1ea0807922ea6f868fcde384f22d4e92 as it breaks |
218 |
-parallel installs. The original commit itself contains no real details. |
219 |
---- |
220 |
- SConstruct | 2 -- |
221 |
- 1 file changed, 2 deletions(-) |
222 |
- |
223 |
-diff --git a/SConstruct b/SConstruct |
224 |
-index 39a6b6a..c8a977e 100644 |
225 |
---- a/SConstruct |
226 |
-+++ b/SConstruct |
227 |
-@@ -1336,8 +1336,6 @@ if env["ncurses"]: |
228 |
- binaryinstall.append(env.Install(installdir('bindir'), [cgps, gpsmon])) |
229 |
- binaryinstall.append(LibraryInstall(env, installdir('libdir'), compiled_gpslib, libgps_version)) |
230 |
- binaryinstall.append(LibraryInstall(env, installdir('libdir'), compiled_gpsdlib, libgps_version)) |
231 |
--# Work arount a minor bug in InstallSharedLib() link handling |
232 |
--env.AddPreAction(binaryinstall, 'rm -f %s/libgps.*' % (installdir('libdir'), )) |
233 |
- |
234 |
- if qt_env: |
235 |
- binaryinstall.append(LibraryInstall(qt_env, installdir('libdir'), compiled_qgpsmmlib, libgps_version)) |
236 |
--- |
237 |
-2.4.1 |
238 |
- |
239 |
|
240 |
diff --git a/sci-geosciences/gpsd/files/gpsd-3.15-dynamic-libs.patch b/sci-geosciences/gpsd/files/gpsd-3.15-dynamic-libs.patch |
241 |
deleted file mode 100644 |
242 |
index 9461a666b03..00000000000 |
243 |
--- a/sci-geosciences/gpsd/files/gpsd-3.15-dynamic-libs.patch |
244 |
+++ /dev/null |
245 |
@@ -1,100 +0,0 @@ |
246 |
-From ac48583654e97ef04e8cbb52c2ae77a617c7add3 Mon Sep 17 00:00:00 2001 |
247 |
-From: Mike Frysinger <vapier@g.o> |
248 |
-Date: Sun, 7 Jun 2015 01:08:39 -0400 |
249 |
-Subject: [PATCH] reenable dynamic libs |
250 |
- |
251 |
-Upstream decided to staticly link their own programs against their libs |
252 |
-instead of using the shared ones. Restore dynamic linking to save space |
253 |
-and such. |
254 |
---- |
255 |
- SConstruct | 64 ++++++++++++++++++++++++++++++++++---------------------------- |
256 |
- 1 file changed, 35 insertions(+), 29 deletions(-) |
257 |
- |
258 |
-diff --git a/SConstruct b/SConstruct |
259 |
-index 28cebf0..a050f38 100644 |
260 |
---- a/SConstruct |
261 |
-+++ b/SConstruct |
262 |
-@@ -961,6 +961,9 @@ if qt_env: |
263 |
- gpsflags = ["-lm"] + rtlibs + dbusflags |
264 |
- gpsdflags = usbflags + bluezflags + gpsflags |
265 |
- |
266 |
-+gpslibs = ["-lgps"] + gpsflags |
267 |
-+gpsdlibs = ["-lgpsd"] + gpsdflags + gpslibs |
268 |
-+ |
269 |
- # Source groups |
270 |
- |
271 |
- gpsd_sources = ['gpsd.c','timehint.c', 'shmexport.c','dbusexport.c'] |
272 |
-@@ -983,38 +986,41 @@ gpsmon_sources = [ |
273 |
- ## Production programs |
274 |
- |
275 |
- gpsd = env.Program('gpsd', gpsd_sources, |
276 |
-- LIBS=['gpsd', 'gps_static'], LIBPATH='.', |
277 |
-- parse_flags=gpsdflags+gpsflags) |
278 |
-+ LIBS=['gpsd'], parse_flags=gpsdflags+gpslibs) |
279 |
-+env.Depends(gpsd, [compiled_gpslib]) |
280 |
-+ |
281 |
- gpsdecode = env.Program('gpsdecode', ['gpsdecode.c'], |
282 |
-- LIBS=['gpsd', 'gps_static'], LIBPATH='.', |
283 |
-- parse_flags=gpsdflags+gpsflags) |
284 |
-+ LIBS=['gpsd'], parse_flags=gpsdflags+gpslibs) |
285 |
-+env.Depends(gpsdecode, [compiled_gpslib]) |
286 |
-+ |
287 |
- gpsctl = env.Program('gpsctl', ['gpsctl.c'], |
288 |
-- LIBS=['gpsd', 'gps_static'], LIBPATH='.', |
289 |
-- parse_flags=gpsdflags+gpsflags) |
290 |
-+ LIBS=['gpsd'], parse_flags=gpsdflags+gpslibs) |
291 |
-+env.Depends(gpsctl, [compiled_gpslib]) |
292 |
-+ |
293 |
- gpsmon = env.Program('gpsmon', gpsmon_sources, |
294 |
-- LIBS=['gpsd', 'gps_static'], LIBPATH='.', |
295 |
-- parse_flags=gpsdflags + gpsflags + ncurseslibs) |
296 |
--gpsdctl = env.Program('gpsdctl', ['gpsdctl.c'], |
297 |
-- LIBS=['gps_static'], LIBPATH='.', |
298 |
-- parse_flags=gpsflags) |
299 |
--gpspipe = env.Program('gpspipe', ['gpspipe.c'], |
300 |
-- LIBS=['gps_static'], LIBPATH='.', |
301 |
-- parse_flags=gpsflags) |
302 |
--gps2udp = env.Program('gps2udp', ['gps2udp.c'], |
303 |
-- LIBS=['gps_static'], LIBPATH='.', |
304 |
-- parse_flags=gpsflags) |
305 |
--gpxlogger = env.Program('gpxlogger', ['gpxlogger.c'], |
306 |
-- LIBS=['gps_static'], LIBPATH='.', |
307 |
-- parse_flags=gpsflags) |
308 |
--lcdgps = env.Program('lcdgps', ['lcdgps.c'], |
309 |
-- LIBS=['gps_static'], LIBPATH='.', |
310 |
-- parse_flags=gpsflags) |
311 |
--cgps = env.Program('cgps', ['cgps.c'], |
312 |
-- LIBS=['gps_static'], LIBPATH='.', |
313 |
-- parse_flags=gpsflags + ncurseslibs) |
314 |
--ntpshmmon = env.Program('ntpshmmon', ['ntpshmmon.c'], |
315 |
-- LIBS=['gps_static'], LIBPATH='.', |
316 |
-- parse_flags=gpsflags) |
317 |
-+ LIBS=['gpsd'], parse_flags=gpsdflags+gpslibs + ncurseslibs) |
318 |
-+env.Depends(gpsmon, [compiled_gpslib]) |
319 |
-+ |
320 |
-+gpsdctl = env.Program('gpsdctl', ['gpsdctl.c'], parse_flags=gpslibs) |
321 |
-+env.Depends(gpsdctl, compiled_gpslib) |
322 |
-+ |
323 |
-+gpspipe = env.Program('gpspipe', ['gpspipe.c'], parse_flags=gpslibs) |
324 |
-+env.Depends(gpspipe, compiled_gpslib) |
325 |
-+ |
326 |
-+gps2udp = env.Program('gps2udp', ['gps2udp.c'], parse_flags=gpslibs) |
327 |
-+env.Depends(gps2udp, compiled_gpslib) |
328 |
-+ |
329 |
-+gpxlogger = env.Program('gpxlogger', ['gpxlogger.c'], parse_flags=gpslibs) |
330 |
-+env.Depends(gpxlogger, compiled_gpslib) |
331 |
-+ |
332 |
-+lcdgps = env.Program('lcdgps', ['lcdgps.c'], parse_flags=gpslibs) |
333 |
-+env.Depends(lcdgps, compiled_gpslib) |
334 |
-+ |
335 |
-+cgps = env.Program('cgps', ['cgps.c'], parse_flags=gpslibs + ncurseslibs) |
336 |
-+env.Depends(cgps, compiled_gpslib) |
337 |
-+ |
338 |
-+ntpshmmon = env.Program('ntpshmmon', ['ntpshmmon.c'], parse_flags=gpslibs) |
339 |
-+env.Depends(ntpshmmon, compiled_gpslib) |
340 |
- |
341 |
- binaries = [gpsd, gpsdecode, gpsctl, gpsdctl, gpspipe, gps2udp, gpxlogger, lcdgps, ntpshmmon] |
342 |
- if env["ncurses"]: |
343 |
--- |
344 |
-2.4.1 |
345 |
- |
346 |
|
347 |
diff --git a/sci-geosciences/gpsd/files/gpsd-3.15-libgpsd.patch b/sci-geosciences/gpsd/files/gpsd-3.15-libgpsd.patch |
348 |
deleted file mode 100644 |
349 |
index 77ba8a7966f..00000000000 |
350 |
--- a/sci-geosciences/gpsd/files/gpsd-3.15-libgpsd.patch |
351 |
+++ /dev/null |
352 |
@@ -1,81 +0,0 @@ |
353 |
-From 7b29fcb88a476daab12957ac22512edf66aee813 Mon Sep 17 00:00:00 2001 |
354 |
-From: Mike Frysinger <vapier@g.o> |
355 |
-Date: Sun, 7 Jun 2015 01:08:48 -0400 |
356 |
-Subject: [PATCH] reenable libgpsd |
357 |
- |
358 |
-Upstream has decided to drop the shared libgpsd (since it wasn't used |
359 |
-externally anymore), but this also meant they statically link the code |
360 |
-into every app. Re-enable the shared lib so that the various runtime |
361 |
-programs can continue to share and save on resources. |
362 |
---- |
363 |
- SConstruct | 25 +++++++++++++------------ |
364 |
- 1 file changed, 13 insertions(+), 12 deletions(-) |
365 |
- |
366 |
-diff --git a/SConstruct b/SConstruct |
367 |
-index a050f38..53f697d 100644 |
368 |
---- a/SConstruct |
369 |
-+++ b/SConstruct |
370 |
-@@ -903,7 +903,7 @@ else: |
371 |
- obj_list = [] |
372 |
- for s in Flatten(sources): |
373 |
- if type(s) is str: |
374 |
-- obj_list.append(env.SharedObject(s)) |
375 |
-+ obj_list.append(env.SharedObject(s, parse_flags=parse_flags)) |
376 |
- else: |
377 |
- obj_list.append(s) |
378 |
- return env.SharedLibrary(target=target, |
379 |
-@@ -925,9 +925,12 @@ static_gpslib = env.StaticLibrary("gps_static", |
380 |
- [env.StaticObject(s) for s in libgps_sources], |
381 |
- rtlibs) |
382 |
- |
383 |
--compiled_gpsdlib = env.StaticLibrary(target="gpsd", |
384 |
-- source=[env.StaticObject(s, parse_flags=usbflags + bluezflags) for s in libgpsd_sources], |
385 |
-- parse_flags=usbflags + bluezflags) |
386 |
-+compiled_gpsdlib = Library(env=env, |
387 |
-+ target="gpsd", |
388 |
-+ sources=libgpsd_sources, |
389 |
-+ version=libgps_version, |
390 |
-+ parse_flags=usbflags + rtlibs + bluezflags + ["-lgps"]) |
391 |
-+env.Depends(compiled_gpsdlib, [compiled_gpslib]) |
392 |
- |
393 |
- libraries = [compiled_gpslib, compiled_gpsdlib] |
394 |
- |
395 |
-@@ -985,21 +987,19 @@ gpsmon_sources = [ |
396 |
- |
397 |
- ## Production programs |
398 |
- |
399 |
--gpsd = env.Program('gpsd', gpsd_sources, |
400 |
-- LIBS=['gpsd'], parse_flags=gpsdflags+gpslibs) |
401 |
--env.Depends(gpsd, [compiled_gpslib]) |
402 |
-+gpsd = env.Program('gpsd', gpsd_sources, parse_flags=gpsdlibs) |
403 |
-+env.Depends(gpsd, [compiled_gpsdlib, compiled_gpslib]) |
404 |
- |
405 |
--gpsdecode = env.Program('gpsdecode', ['gpsdecode.c'], |
406 |
-- LIBS=['gpsd'], parse_flags=gpsdflags+gpslibs) |
407 |
--env.Depends(gpsdecode, [compiled_gpslib]) |
408 |
-+gpsdecode = env.Program('gpsdecode', ['gpsdecode.c'], parse_flags=gpsdlibs) |
409 |
-+env.Depends(gpsdecode, [compiled_gpsdlib, compiled_gpslib]) |
410 |
- |
411 |
- gpsctl = env.Program('gpsctl', ['gpsctl.c'], |
412 |
- LIBS=['gpsd'], parse_flags=gpsdflags+gpslibs) |
413 |
--env.Depends(gpsctl, [compiled_gpslib]) |
414 |
-+env.Depends(gpsctl, [compiled_gpsdlib, compiled_gpslib]) |
415 |
- |
416 |
- gpsmon = env.Program('gpsmon', gpsmon_sources, |
417 |
- LIBS=['gpsd'], parse_flags=gpsdflags+gpslibs + ncurseslibs) |
418 |
--env.Depends(gpsmon, [compiled_gpslib]) |
419 |
-+env.Depends(gpsmon, [compiled_gpsdlib, compiled_gpslib]) |
420 |
- |
421 |
- gpsdctl = env.Program('gpsdctl', ['gpsdctl.c'], parse_flags=gpslibs) |
422 |
- env.Depends(gpsdctl, compiled_gpslib) |
423 |
-@@ -1339,6 +1339,7 @@ binaryinstall.append(env.Install(installdir('bindir'), [gpsdecode, gpsctl, gpsp |
424 |
- if env["ncurses"]: |
425 |
- binaryinstall.append(env.Install(installdir('bindir'), [cgps, gpsmon])) |
426 |
- binaryinstall.append(LibraryInstall(env, installdir('libdir'), compiled_gpslib, libgps_version)) |
427 |
-+binaryinstall.append(LibraryInstall(env, installdir('libdir'), compiled_gpsdlib, libgps_version)) |
428 |
- # Work arount a minor bug in InstallSharedLib() link handling |
429 |
- env.AddPreAction(binaryinstall, 'rm -f %s/libgps.*' % (installdir('libdir'), )) |
430 |
- |
431 |
--- |
432 |
-2.4.1 |
433 |
- |
434 |
|
435 |
diff --git a/sci-geosciences/gpsd/files/gpsd-3.15-timebase.patch b/sci-geosciences/gpsd/files/gpsd-3.15-timebase.patch |
436 |
deleted file mode 100644 |
437 |
index 2477d30ce6c..00000000000 |
438 |
--- a/sci-geosciences/gpsd/files/gpsd-3.15-timebase.patch |
439 |
+++ /dev/null |
440 |
@@ -1,12 +0,0 @@ |
441 |
-don't always rebuild this header as it won't change between compile & install |
442 |
- |
443 |
---- a/SConstruct |
444 |
-+++ b/SConstruct |
445 |
-@@ -1174,7 +1174,6 @@ |
446 |
- f.close() |
447 |
- timebase = env.Command(target="timebase.h", |
448 |
- source=["leapseconds.cache"], action=timebase_h) |
449 |
--env.AlwaysBuild(timebase) |
450 |
- |
451 |
- env.Textfile(target="gpsd_config.h", source=confdefs) |
452 |
- env.Textfile(target="gpsd.h", source=[File("gpsd.h-head"), File("gpsd_config.h"), File("gpsd.h-tail")]) |
453 |
|
454 |
diff --git a/sci-geosciences/gpsd/files/gpsd-3.16-sysmacros.patch b/sci-geosciences/gpsd/files/gpsd-3.16-sysmacros.patch |
455 |
deleted file mode 100644 |
456 |
index d9863c9280f..00000000000 |
457 |
--- a/sci-geosciences/gpsd/files/gpsd-3.16-sysmacros.patch |
458 |
+++ /dev/null |
459 |
@@ -1,31 +0,0 @@ |
460 |
-https://bugs.gentoo.org/581740 |
461 |
- |
462 |
-From 87027243d101cfa7e01d9b697f890ea7b247449b Mon Sep 17 00:00:00 2001 |
463 |
-From: Mike Frysinger <vapier@g.o> |
464 |
-Date: Mon, 9 May 2016 14:33:06 -0400 |
465 |
-Subject: [PATCH] include sys/sysmacros.h for major |
466 |
- |
467 |
-These functions are not part of any official spec, and Linux C libs have |
468 |
-always kept them in sys/sysmacros.h. Include the header directly to fix |
469 |
-builds w/alternative C libs, and to work with future glibc versions. |
470 |
---- |
471 |
- serial.c | 3 +++ |
472 |
- 1 file changed, 3 insertions(+) |
473 |
- |
474 |
-diff --git a/serial.c b/serial.c |
475 |
-index d8bdd8c..b748cab 100644 |
476 |
---- a/serial.c |
477 |
-+++ b/serial.c |
478 |
-@@ -14,6 +14,9 @@ |
479 |
- #include <unistd.h> |
480 |
- #include <sys/socket.h> |
481 |
- #include <sys/param.h> /* defines BSD */ |
482 |
-+#ifdef __linux__ |
483 |
-+#include <sys/sysmacros.h> |
484 |
-+#endif |
485 |
- |
486 |
- #include "gpsd_config.h" |
487 |
- #ifdef ENABLE_BLUEZ |
488 |
--- |
489 |
-2.7.4 |
490 |
- |
491 |
|
492 |
diff --git a/sci-geosciences/gpsd/files/gpsd-3.8-ldflags.patch b/sci-geosciences/gpsd/files/gpsd-3.8-ldflags.patch |
493 |
deleted file mode 100644 |
494 |
index b41be8b66e5..00000000000 |
495 |
--- a/sci-geosciences/gpsd/files/gpsd-3.8-ldflags.patch |
496 |
+++ /dev/null |
497 |
@@ -1,15 +0,0 @@ |
498 |
-https://bugs.gentoo.org/391299 |
499 |
- |
500 |
-split up linking flags into multiple arguments |
501 |
- |
502 |
---- gpsd-3.8/SConstruct |
503 |
-+++ gpsd-3.8/SConstruct |
504 |
-@@ -214,7 +214,7 @@ |
505 |
- env.Replace(**{j: os.getenv(i)}) |
506 |
- for flag in ["LDFLAGS", "LINKFLAGS", "SHLINKFLAGS", "CPPFLAGS"]: |
507 |
- if os.environ.has_key(flag): |
508 |
-- env.MergeFlags({flag : [os.getenv(flag)]}) |
509 |
-+ env.MergeFlags({flag : Split(os.getenv(flag))}) |
510 |
- |
511 |
- |
512 |
- # Placeholder so we can kluge together something like VPATH builds. |
513 |
|
514 |
diff --git a/sci-geosciences/gpsd/gpsd-3.10.ebuild b/sci-geosciences/gpsd/gpsd-3.10.ebuild |
515 |
deleted file mode 100644 |
516 |
index e7b5410cc43..00000000000 |
517 |
--- a/sci-geosciences/gpsd/gpsd-3.10.ebuild |
518 |
+++ /dev/null |
519 |
@@ -1,167 +0,0 @@ |
520 |
-# Copyright 1999-2017 Gentoo Foundation |
521 |
-# Distributed under the terms of the GNU General Public License v2 |
522 |
- |
523 |
-EAPI="5" |
524 |
- |
525 |
-DISTUTILS_OPTIONAL=1 |
526 |
-PYTHON_COMPAT=( python2_7 ) |
527 |
-SCONS_MIN_VERSION="1.2.1" |
528 |
- |
529 |
-inherit eutils udev user multilib distutils-r1 scons-utils toolchain-funcs |
530 |
- |
531 |
-if [[ ${PV} == "9999" ]] ; then |
532 |
- EGIT_REPO_URI="git://git.savannah.nongnu.org/gpsd.git" |
533 |
- inherit git-2 |
534 |
-else |
535 |
- SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz" |
536 |
- KEYWORDS="amd64 arm ppc ppc64 x86" |
537 |
-fi |
538 |
- |
539 |
-DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients" |
540 |
-HOMEPAGE="http://catb.org/gpsd/" |
541 |
- |
542 |
-LICENSE="BSD" |
543 |
-SLOT="0" |
544 |
- |
545 |
-GPSD_PROTOCOLS=( |
546 |
- aivdm ashtech earthmate evermore fury fv18 garmin garmintxt |
547 |
- geostar gpsclock itrax mtk3301 navcom nmea nmea2000 ntrip |
548 |
- oceanserver oncore rtcm104v2 rtcm104v3 sirf superstar2 tnt |
549 |
- tripmate tsip ublox |
550 |
-) |
551 |
-IUSE_GPSD_PROTOCOLS=${GPSD_PROTOCOLS[@]/#/gpsd_protocols_} |
552 |
-IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth cxx debug dbus ipv6 latency_timing ncurses ntp python qt4 +shm +sockets static test udev usb X" |
553 |
-REQUIRED_USE="X? ( python ) |
554 |
- gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm ) |
555 |
- python? ( ${PYTHON_REQUIRED_USE} )" |
556 |
- |
557 |
-RDEPEND="X? ( dev-python/pygtk:2[${PYTHON_USEDEP}] ) |
558 |
- ncurses? ( sys-libs/ncurses:= ) |
559 |
- bluetooth? ( net-wireless/bluez ) |
560 |
- usb? ( virtual/libusb:1 ) |
561 |
- dbus? ( |
562 |
- sys-apps/dbus |
563 |
- dev-libs/dbus-glib |
564 |
- ) |
565 |
- ntp? ( || ( net-misc/ntp net-misc/chrony ) ) |
566 |
- qt4? ( dev-qt/qtgui:4 ) |
567 |
- python? ( ${PYTHON_DEPS} )" |
568 |
-DEPEND="${RDEPEND} |
569 |
- virtual/pkgconfig |
570 |
- test? ( sys-devel/bc )" |
571 |
- |
572 |
-# xml packages are for man page generation |
573 |
-if [[ ${PV} == "9999" ]] ; then |
574 |
- DEPEND+=" |
575 |
- app-text/xmlto |
576 |
- =app-text/docbook-xml-dtd-4.1*" |
577 |
-fi |
578 |
- |
579 |
-src_prepare() { |
580 |
- # Make sure our list matches the source. |
581 |
- local src_protocols=$(echo $( |
582 |
- sed -n '/GPS protocols/,/Time service/{s:#.*::;s:[(",]::g;p}' "${S}"/SConstruct | awk '{print $1}' | LC_ALL=C sort |
583 |
- ) ) |
584 |
- if [[ ${src_protocols} != ${GPSD_PROTOCOLS[*]} ]] ; then |
585 |
- eerror "Detected protocols: ${src_protocols}" |
586 |
- eerror "Ebuild protocols: ${GPSD_PROTOCOLS[*]}" |
587 |
- die "please sync ebuild & source" |
588 |
- fi |
589 |
- |
590 |
- epatch "${FILESDIR}"/${PN}-3.8-ldflags.patch |
591 |
- epatch "${FILESDIR}"/${PN}-3.10-rpath.patch |
592 |
- epatch "${FILESDIR}"/${PN}-3.10-dbus.patch |
593 |
- epatch "${FILESDIR}"/${PN}-3.10-udev-install.patch |
594 |
- epatch "${FILESDIR}"/${PN}-3.10-nmea-disabled.patch #493022 |
595 |
- |
596 |
- # Avoid useless -L paths to the install dir |
597 |
- sed -i \ |
598 |
- -e 's:\<STAGING_PREFIX\>:SYSROOT:g' \ |
599 |
- SConstruct || die |
600 |
- |
601 |
- use python && distutils-r1_src_prepare |
602 |
-} |
603 |
- |
604 |
-python_prepare_all() { |
605 |
- python_export_best |
606 |
- # Extract python info out of SConstruct so we can use saner distribute |
607 |
- pyvar() { sed -n "/^ *$1 *=/s:.*= *::p" SConstruct ; } |
608 |
- local pybins=$(pyvar python_progs) |
609 |
- local pysrcs=$(sed -n '/^ *python_extensions = {/,/}/{s:^ *::;s:os[.]sep:"/":g;p}' SConstruct) |
610 |
- local packet=$("${PYTHON}" -c "${pysrcs}; print(python_extensions['gps/packet'])") |
611 |
- local client=$("${PYTHON}" -c "${pysrcs}; print(python_extensions['gps/clienthelpers'])") |
612 |
- sed \ |
613 |
- -e "s|@VERSION@|$(pyvar gpsd_version)|" \ |
614 |
- -e "s|@URL@|$(pyvar website)|" \ |
615 |
- -e "s|@EMAIL@|$(pyvar devmail)|" \ |
616 |
- -e "s|@SCRIPTS@|${pybins}|" \ |
617 |
- -e "s|@GPS_PACKET_SOURCES@|${packet}|" \ |
618 |
- -e "s|@GPS_CLIENT_SOURCES@|${client}|" \ |
619 |
- -e "s|@SCRIPTS@|$(pyvar python_progs)|" \ |
620 |
- "${FILESDIR}"/${PN}-3.3-setup.py > setup.py || die |
621 |
- distutils-r1_python_prepare_all |
622 |
-} |
623 |
- |
624 |
-src_configure() { |
625 |
- myesconsargs=( |
626 |
- prefix="${EPREFIX}/usr" |
627 |
- libdir="\$prefix/$(get_libdir)" |
628 |
- udevdir="$(get_udevdir)" |
629 |
- chrpath=False |
630 |
- gpsd_user=gpsd |
631 |
- gpsd_group=uucp |
632 |
- strip=False |
633 |
- python=False |
634 |
- manbuild=False |
635 |
- shared=$(usex !static True False) |
636 |
- $(use_scons bluetooth bluez) |
637 |
- $(use_scons cxx libgpsmm) |
638 |
- $(use_scons debug clientdebug) |
639 |
- $(use_scons dbus dbus_export) |
640 |
- $(use_scons ipv6) |
641 |
- $(use_scons latency_timing timing) |
642 |
- $(use_scons ncurses) |
643 |
- $(use_scons ntp ntpshm) |
644 |
- $(use_scons ntp pps) |
645 |
- $(use_scons shm shm_export) |
646 |
- $(use_scons sockets socket_export) |
647 |
- $(use_scons qt4 libQgpsmm) |
648 |
- $(use_scons usb) |
649 |
- ) |
650 |
- |
651 |
- # enable specified protocols |
652 |
- local protocol |
653 |
- for protocol in ${GPSD_PROTOCOLS[@]} ; do |
654 |
- myesconsargs+=( $(use_scons gpsd_protocols_${protocol} ${protocol}) ) |
655 |
- done |
656 |
-} |
657 |
- |
658 |
-src_compile() { |
659 |
- export CHRPATH= |
660 |
- tc-export CC CXX PKG_CONFIG |
661 |
- export SHLINKFLAGS=${LDFLAGS} LINKFLAGS=${LDFLAGS} |
662 |
- escons |
663 |
- |
664 |
- use python && distutils-r1_src_compile |
665 |
-} |
666 |
- |
667 |
-src_install() { |
668 |
- DESTDIR="${D}" escons install $(usex udev udev-install "") |
669 |
- |
670 |
- newconfd "${FILESDIR}"/gpsd.conf-2 gpsd |
671 |
- newinitd "${FILESDIR}"/gpsd.init-2 gpsd |
672 |
- |
673 |
- if use python ; then |
674 |
- distutils-r1_src_install |
675 |
- # Delete all X related packages if user doesn't want them |
676 |
- if ! use X ; then |
677 |
- rm "${ED%/}"/usr/bin/xgps* || die |
678 |
- fi |
679 |
- fi |
680 |
-} |
681 |
- |
682 |
-pkg_preinst() { |
683 |
- # Run the gpsd daemon as gpsd and group uucp; create it here |
684 |
- # as it doesn't seem to be needed during compile/install ... |
685 |
- enewuser gpsd -1 -1 -1 "uucp" |
686 |
-} |
687 |
|
688 |
diff --git a/sci-geosciences/gpsd/gpsd-3.16.ebuild b/sci-geosciences/gpsd/gpsd-3.16.ebuild |
689 |
deleted file mode 100644 |
690 |
index bf36c89f403..00000000000 |
691 |
--- a/sci-geosciences/gpsd/gpsd-3.16.ebuild |
692 |
+++ /dev/null |
693 |
@@ -1,170 +0,0 @@ |
694 |
-# Copyright 1999-2017 Gentoo Foundation |
695 |
-# Distributed under the terms of the GNU General Public License v2 |
696 |
- |
697 |
-EAPI=5 |
698 |
- |
699 |
-DISTUTILS_OPTIONAL=1 |
700 |
-PYTHON_COMPAT=( python2_7 ) |
701 |
-SCONS_MIN_VERSION="1.2.1" |
702 |
- |
703 |
-inherit eutils udev user multilib distutils-r1 scons-utils toolchain-funcs |
704 |
- |
705 |
-if [[ ${PV} == "9999" ]] ; then |
706 |
- EGIT_REPO_URI="git://git.savannah.nongnu.org/gpsd.git" |
707 |
- inherit git-2 |
708 |
-else |
709 |
- SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz" |
710 |
- KEYWORDS="amd64 arm ppc ppc64 x86" |
711 |
-fi |
712 |
- |
713 |
-DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients" |
714 |
-HOMEPAGE="http://catb.org/gpsd/" |
715 |
- |
716 |
-LICENSE="BSD" |
717 |
-SLOT="0/22" |
718 |
- |
719 |
-GPSD_PROTOCOLS=( |
720 |
- aivdm ashtech earthmate evermore fury fv18 garmin garmintxt |
721 |
- geostar gpsclock itrax mtk3301 navcom nmea0183 nmea2000 ntrip |
722 |
- oceanserver oncore passthrough rtcm104v2 rtcm104v3 sirf superstar2 |
723 |
- tnt tripmate tsip ublox |
724 |
-) |
725 |
-IUSE_GPSD_PROTOCOLS=${GPSD_PROTOCOLS[@]/#/gpsd_protocols_} |
726 |
-IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth cxx debug dbus ipv6 latency_timing ncurses ntp python qt4 +shm +sockets static test udev usb X" |
727 |
-REQUIRED_USE="X? ( python ) |
728 |
- gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm ) |
729 |
- python? ( ${PYTHON_REQUIRED_USE} )" |
730 |
- |
731 |
-RDEPEND="X? ( dev-python/pygtk:2[${PYTHON_USEDEP}] ) |
732 |
- ncurses? ( sys-libs/ncurses:= ) |
733 |
- bluetooth? ( net-wireless/bluez ) |
734 |
- usb? ( virtual/libusb:1 ) |
735 |
- dbus? ( |
736 |
- sys-apps/dbus |
737 |
- dev-libs/dbus-glib |
738 |
- ) |
739 |
- ntp? ( || ( net-misc/ntp net-misc/chrony ) ) |
740 |
- qt4? ( dev-qt/qtgui:4 ) |
741 |
- python? ( ${PYTHON_DEPS} )" |
742 |
-DEPEND="${RDEPEND} |
743 |
- virtual/pkgconfig |
744 |
- test? ( sys-devel/bc )" |
745 |
- |
746 |
-# xml packages are for man page generation |
747 |
-if [[ ${PV} == "9999" ]] ; then |
748 |
- DEPEND+=" |
749 |
- app-text/xmlto |
750 |
- =app-text/docbook-xml-dtd-4.1*" |
751 |
-fi |
752 |
- |
753 |
-src_prepare() { |
754 |
- # Make sure our list matches the source. |
755 |
- local src_protocols=$(echo $( |
756 |
- sed -n '/# GPS protocols/,/# Time service/{s:#.*::;s:[(",]::g;p}' "${S}"/SConstruct | awk '{print $1}' | LC_ALL=C sort |
757 |
- ) ) |
758 |
- if [[ ${src_protocols} != ${GPSD_PROTOCOLS[*]} ]] ; then |
759 |
- eerror "Detected protocols: ${src_protocols}" |
760 |
- eerror "Ebuild protocols: ${GPSD_PROTOCOLS[*]}" |
761 |
- die "please sync ebuild & source" |
762 |
- fi |
763 |
- |
764 |
- epatch "${FILESDIR}"/${PN}-3.8-ldflags.patch |
765 |
- epatch "${FILESDIR}"/${PN}-3.15-dynamic-libs.patch |
766 |
- epatch "${FILESDIR}"/${PN}-3.15-libgpsd.patch |
767 |
- epatch "${FILESDIR}"/${PN}-3.15-broken-install.patch |
768 |
- epatch "${FILESDIR}"/${PN}-3.15-timebase.patch |
769 |
- epatch "${FILESDIR}"/${PN}-3.16-sysmacros.patch #581740 |
770 |
- |
771 |
- # Avoid useless -L paths to the install dir |
772 |
- sed -i \ |
773 |
- -e 's:\<STAGING_PREFIX\>:SYSROOT:g' \ |
774 |
- SConstruct || die |
775 |
- |
776 |
- sed -e 's:libusb.h:libusb-1.0/libusb.h:' -i driver_garmin.c || die |
777 |
- |
778 |
- use python && distutils-r1_src_prepare |
779 |
-} |
780 |
- |
781 |
-python_prepare_all() { |
782 |
- python_export_best |
783 |
- # Extract python info out of SConstruct so we can use saner distribute |
784 |
- pyvar() { sed -n "/^ *$1 *=/s:.*= *::p" SConstruct ; } |
785 |
- local pybins=$(pyvar python_progs | tail -1) |
786 |
- local pysrcs=$(sed -n '/^ *python_extensions = {/,/}/{s:^ *::;s:os[.]sep:"/":g;p}' SConstruct) |
787 |
- local packet=$("${PYTHON}" -c "${pysrcs}; print(python_extensions['gps/packet'])") |
788 |
- local client=$("${PYTHON}" -c "${pysrcs}; print(python_extensions['gps/clienthelpers'])") |
789 |
- sed \ |
790 |
- -e "s|@VERSION@|$(pyvar gpsd_version)|" \ |
791 |
- -e "s|@URL@|$(pyvar website)|" \ |
792 |
- -e "s|@EMAIL@|$(pyvar devmail)|" \ |
793 |
- -e "s|@SCRIPTS@|${pybins}|" \ |
794 |
- -e "s|@GPS_PACKET_SOURCES@|${packet}|" \ |
795 |
- -e "s|@GPS_CLIENT_SOURCES@|${client}|" \ |
796 |
- -e "s|@SCRIPTS@|${pybins}|" \ |
797 |
- "${FILESDIR}"/${PN}-3.3-setup.py > setup.py || die |
798 |
- distutils-r1_python_prepare_all |
799 |
-} |
800 |
- |
801 |
-src_configure() { |
802 |
- myesconsargs=( |
803 |
- prefix="${EPREFIX}/usr" |
804 |
- libdir="\$prefix/$(get_libdir)" |
805 |
- udevdir="$(get_udevdir)" |
806 |
- chrpath=False |
807 |
- gpsd_user=gpsd |
808 |
- gpsd_group=uucp |
809 |
- nostrip=True |
810 |
- python=False |
811 |
- manbuild=False |
812 |
- shared=$(usex !static True False) |
813 |
- $(use_scons bluetooth bluez) |
814 |
- $(use_scons cxx libgpsmm) |
815 |
- $(use_scons debug clientdebug) |
816 |
- $(use_scons dbus dbus_export) |
817 |
- $(use_scons ipv6) |
818 |
- $(use_scons latency_timing timing) |
819 |
- $(use_scons ncurses) |
820 |
- $(use_scons ntp ntpshm) |
821 |
- $(use_scons ntp pps) |
822 |
- $(use_scons shm shm_export) |
823 |
- $(use_scons sockets socket_export) |
824 |
- $(use_scons qt4 libQgpsmm) |
825 |
- $(use_scons usb) |
826 |
- ) |
827 |
- |
828 |
- # enable specified protocols |
829 |
- local protocol |
830 |
- for protocol in ${GPSD_PROTOCOLS[@]} ; do |
831 |
- myesconsargs+=( $(use_scons gpsd_protocols_${protocol} ${protocol}) ) |
832 |
- done |
833 |
-} |
834 |
- |
835 |
-src_compile() { |
836 |
- export CHRPATH= |
837 |
- tc-export CC CXX PKG_CONFIG |
838 |
- export SHLINKFLAGS=${LDFLAGS} LINKFLAGS=${LDFLAGS} |
839 |
- escons |
840 |
- |
841 |
- use python && distutils-r1_src_compile |
842 |
-} |
843 |
- |
844 |
-src_install() { |
845 |
- DESTDIR="${D}" escons install $(usex udev udev-install "") |
846 |
- |
847 |
- newconfd "${FILESDIR}"/gpsd.conf-2 gpsd |
848 |
- newinitd "${FILESDIR}"/gpsd.init-2 gpsd |
849 |
- |
850 |
- if use python ; then |
851 |
- distutils-r1_src_install |
852 |
- # Delete all X related packages if user doesn't want them |
853 |
- if ! use X ; then |
854 |
- rm "${ED%/}"/usr/bin/xgps* || die |
855 |
- fi |
856 |
- fi |
857 |
-} |
858 |
- |
859 |
-pkg_preinst() { |
860 |
- # Run the gpsd daemon as gpsd and group uucp; create it here |
861 |
- # as it doesn't seem to be needed during compile/install ... |
862 |
- enewuser gpsd -1 -1 -1 "uucp" |
863 |
-} |
864 |
|
865 |
diff --git a/sci-geosciences/gpsd/gpsd-3.17.ebuild b/sci-geosciences/gpsd/gpsd-3.17.ebuild |
866 |
deleted file mode 100644 |
867 |
index 3bc87135257..00000000000 |
868 |
--- a/sci-geosciences/gpsd/gpsd-3.17.ebuild |
869 |
+++ /dev/null |
870 |
@@ -1,163 +0,0 @@ |
871 |
-# Copyright 1999-2017 Gentoo Foundation |
872 |
-# Distributed under the terms of the GNU General Public License v2 |
873 |
- |
874 |
-EAPI="5" |
875 |
- |
876 |
-DISTUTILS_OPTIONAL=1 |
877 |
-PYTHON_COMPAT=( python2_7 ) |
878 |
-SCONS_MIN_VERSION="1.2.1" |
879 |
- |
880 |
-inherit eutils udev user multilib distutils-r1 scons-utils toolchain-funcs |
881 |
- |
882 |
-if [[ ${PV} == "9999" ]] ; then |
883 |
- EGIT_REPO_URI="git://git.savannah.nongnu.org/gpsd.git" |
884 |
- inherit git-2 |
885 |
-else |
886 |
- SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz" |
887 |
- KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86" |
888 |
-fi |
889 |
- |
890 |
-DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients" |
891 |
-HOMEPAGE="http://catb.org/gpsd/" |
892 |
- |
893 |
-LICENSE="BSD" |
894 |
-SLOT="0/23" |
895 |
- |
896 |
-GPSD_PROTOCOLS=( |
897 |
- aivdm ashtech earthmate evermore fury fv18 garmin garmintxt geostar |
898 |
- gpsclock isync itrax mtk3301 navcom nmea0183 nmea2000 ntrip oceanserver |
899 |
- oncore passthrough rtcm104v2 rtcm104v3 sirf skytraq superstar2 tnt |
900 |
- tripmate tsip ublox |
901 |
-) |
902 |
-IUSE_GPSD_PROTOCOLS=${GPSD_PROTOCOLS[@]/#/gpsd_protocols_} |
903 |
-IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth cxx debug dbus ipv6 latency_timing ncurses ntp python qt4 +shm +sockets static test udev usb X" |
904 |
-REQUIRED_USE="X? ( python ) |
905 |
- gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm ) |
906 |
- python? ( ${PYTHON_REQUIRED_USE} )" |
907 |
- |
908 |
-RDEPEND="X? ( dev-python/pygtk:2[${PYTHON_USEDEP}] ) |
909 |
- ncurses? ( sys-libs/ncurses:= ) |
910 |
- bluetooth? ( net-wireless/bluez ) |
911 |
- usb? ( virtual/libusb:1 ) |
912 |
- dbus? ( |
913 |
- sys-apps/dbus |
914 |
- dev-libs/dbus-glib |
915 |
- ) |
916 |
- ntp? ( || ( net-misc/ntp net-misc/chrony ) ) |
917 |
- qt4? ( dev-qt/qtgui:4 ) |
918 |
- python? ( ${PYTHON_DEPS} )" |
919 |
-DEPEND="${RDEPEND} |
920 |
- virtual/pkgconfig |
921 |
- test? ( sys-devel/bc )" |
922 |
- |
923 |
-# xml packages are for man page generation |
924 |
-if [[ ${PV} == "9999" ]] ; then |
925 |
- DEPEND+=" |
926 |
- app-text/xmlto |
927 |
- =app-text/docbook-xml-dtd-4.1*" |
928 |
-fi |
929 |
- |
930 |
-src_prepare() { |
931 |
- # Make sure our list matches the source. |
932 |
- local src_protocols=$(echo $( |
933 |
- sed -n '/# GPS protocols/,/# Time service/{s:#.*::;s:[(",]::g;p}' "${S}"/SConstruct | awk '{print $1}' | LC_ALL=C sort |
934 |
- ) ) |
935 |
- if [[ ${src_protocols} != ${GPSD_PROTOCOLS[*]} ]] ; then |
936 |
- eerror "Detected protocols: ${src_protocols}" |
937 |
- eerror "Ebuild protocols: ${GPSD_PROTOCOLS[*]}" |
938 |
- die "please sync ebuild & source" |
939 |
- fi |
940 |
- |
941 |
- epatch "${FILESDIR}"/${P}-do_not_rm_library.patch |
942 |
- |
943 |
- # Avoid useless -L paths to the install dir |
944 |
- sed -i \ |
945 |
- -e 's:\<STAGING_PREFIX\>:SYSROOT:g' \ |
946 |
- SConstruct || die |
947 |
- |
948 |
- use python && distutils-r1_src_prepare |
949 |
-} |
950 |
- |
951 |
-python_prepare_all() { |
952 |
- python_export_best |
953 |
- # Extract python info out of SConstruct so we can use saner distribute |
954 |
- pyvar() { sed -n "/^ *$1 *=/s:.*= *::p" SConstruct ; } |
955 |
- local pybins=$(pyvar python_progs | tail -1) |
956 |
- local pysrcs=$(sed -n '/^ *python_extensions = {/,/}/{s:^ *::;s:os[.]sep:"/":g;p}' SConstruct) |
957 |
- local packet=$("${PYTHON}" -c "${pysrcs}; print(python_extensions['gps/packet'])") |
958 |
- local client=$("${PYTHON}" -c "${pysrcs}; print(python_extensions['gps/clienthelpers'])") |
959 |
- sed \ |
960 |
- -e "s|@VERSION@|$(pyvar gpsd_version)|" \ |
961 |
- -e "s|@URL@|$(pyvar website)|" \ |
962 |
- -e "s|@EMAIL@|$(pyvar devmail)|" \ |
963 |
- -e "s|@SCRIPTS@|${pybins}|" \ |
964 |
- -e "s|@GPS_PACKET_SOURCES@|${packet}|" \ |
965 |
- -e "s|@GPS_CLIENT_SOURCES@|${client}|" \ |
966 |
- -e "s|@SCRIPTS@|${pybins}|" \ |
967 |
- "${FILESDIR}"/${PN}-3.3-setup.py > setup.py || die |
968 |
- distutils-r1_python_prepare_all |
969 |
-} |
970 |
- |
971 |
-src_configure() { |
972 |
- myesconsargs=( |
973 |
- prefix="${EPREFIX}/usr" |
974 |
- libdir="\$prefix/$(get_libdir)" |
975 |
- udevdir="$(get_udevdir)" |
976 |
- chrpath=False |
977 |
- gpsd_user=gpsd |
978 |
- gpsd_group=uucp |
979 |
- nostrip=True |
980 |
- python=False |
981 |
- manbuild=False |
982 |
- shared=$(usex !static True False) |
983 |
- $(use_scons bluetooth bluez) |
984 |
- $(use_scons cxx libgpsmm) |
985 |
- $(use_scons debug clientdebug) |
986 |
- $(use_scons dbus dbus_export) |
987 |
- $(use_scons ipv6) |
988 |
- $(use_scons latency_timing timing) |
989 |
- $(use_scons ncurses) |
990 |
- $(use_scons ntp ntpshm) |
991 |
- $(use_scons ntp pps) |
992 |
- $(use_scons shm shm_export) |
993 |
- $(use_scons sockets socket_export) |
994 |
- $(use_scons qt4 libQgpsmm) |
995 |
- $(use_scons usb) |
996 |
- ) |
997 |
- |
998 |
- # enable specified protocols |
999 |
- local protocol |
1000 |
- for protocol in ${GPSD_PROTOCOLS[@]} ; do |
1001 |
- myesconsargs+=( $(use_scons gpsd_protocols_${protocol} ${protocol}) ) |
1002 |
- done |
1003 |
-} |
1004 |
- |
1005 |
-src_compile() { |
1006 |
- export CHRPATH= |
1007 |
- tc-export CC CXX PKG_CONFIG |
1008 |
- export SHLINKFLAGS=${LDFLAGS} LINKFLAGS=${LDFLAGS} |
1009 |
- escons |
1010 |
- |
1011 |
- use python && distutils-r1_src_compile |
1012 |
-} |
1013 |
- |
1014 |
-src_install() { |
1015 |
- DESTDIR="${D}" escons install $(usex udev udev-install "") |
1016 |
- |
1017 |
- newconfd "${FILESDIR}"/gpsd.conf-2 gpsd |
1018 |
- newinitd "${FILESDIR}"/gpsd.init-2 gpsd |
1019 |
- |
1020 |
- if use python ; then |
1021 |
- distutils-r1_src_install |
1022 |
- # Delete all X related packages if user doesn't want them |
1023 |
- if ! use X ; then |
1024 |
- rm "${ED%/}"/usr/bin/xgps* || die |
1025 |
- fi |
1026 |
- fi |
1027 |
-} |
1028 |
- |
1029 |
-pkg_preinst() { |
1030 |
- # Run the gpsd daemon as gpsd and group uucp; create it here |
1031 |
- # as it doesn't seem to be needed during compile/install ... |
1032 |
- enewuser gpsd -1 -1 -1 "uucp" |
1033 |
-} |