Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/files/, sci-geosciences/gpsd/
Date: Fri, 25 Sep 2020 17:56:10
Message-Id: 1601056555.65805a58b1c7920eeaf78b5ea6ec07d958ddc312.sam@gentoo
1 commit: 65805a58b1c7920eeaf78b5ea6ec07d958ddc312
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Fri Sep 25 17:55:55 2020 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Fri Sep 25 17:55:55 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65805a58
7
8 sci-geosciences/gpsd: cleanup old
9
10 Bug: https://bugs.gentoo.org/743766
11 Bug: https://bugs.gentoo.org/743556
12 Package-Manager: Portage-3.0.4, Repoman-3.0.1
13 Signed-off-by: Sam James <sam <AT> gentoo.org>
14
15 sci-geosciences/gpsd/Manifest | 2 -
16 .../gpsd/files/gpsd-3.17-do_not_rm_library.patch | 12 --
17 .../gpsd/files/gpsd-3.17-scons-print.patch | 73 --------
18 .../gpsd/files/gpsd-3.17-scons-py3.patch | 143 ----------------
19 .../gpsd/files/gpsd-3.18.1-do_not_rm_library.patch | 11 --
20 .../gpsd/files/gpsd-3.19-do_not_rm_library.patch | 11 --
21 sci-geosciences/gpsd/gpsd-3.17-r3.ebuild | 171 -------------------
22 sci-geosciences/gpsd/gpsd-3.17-r4.ebuild | 175 -------------------
23 sci-geosciences/gpsd/gpsd-3.20.ebuild | 189 ---------------------
24 9 files changed, 787 deletions(-)
25
26 diff --git a/sci-geosciences/gpsd/Manifest b/sci-geosciences/gpsd/Manifest
27 index 432a2de36b3..cb4314ceceb 100644
28 --- a/sci-geosciences/gpsd/Manifest
29 +++ b/sci-geosciences/gpsd/Manifest
30 @@ -1,3 +1 @@
31 -DIST gpsd-3.17.tar.gz 8755304 BLAKE2B d1f82b5734fd90fe903a6f2fe8835fe8292fe3e729306e7abe4054821971fece4c23f382c08a233503f07ad66b7b3a02a52a000e55c08491bf254ab6e99378b5 SHA512 71085053f600730e0f2de269c59ce0a17ae106ef01403f02d78418b267c6adb9818d541fba59eb23bf71cdb67c5442c82b4948d262ef7e74bb993dcae677a1b1
32 -DIST gpsd-3.20.tar.gz 3600835 BLAKE2B 6c9a3540de1be9191a601d6666c18c79e8e8913a3b4455448bafd0fa81e3a1859bd4851d42c3d06aed48fd0910060919f87a661d02fec44c001e9a393d8658e6 SHA512 557ef5e5f3b511da4fc441f4bb2e0cd2e23c2981e8b3ce2999973767a04fde070d3ec6f14af60d0e471320078e9f4d1144e5796e7927975ecfbd55fc97f470a9
33 DIST gpsd-3.21.tar.xz 2620396 BLAKE2B 366d1857f7ff63e087ac1bec8c95d997cd8d48a60d5548c1644748e1ed20334f45a4fb279bc26c61481cc3dea0244eb0aaca0ba562838a3b5de15da5d1d82502 SHA512 a45416c31ee891a84203aea786b6385ea5f557a406d898a8facdde78d120199b7e7db8f86ab8c395f6ca90965940355fa19413b2b918642fd8c7df219745233e
34
35 diff --git a/sci-geosciences/gpsd/files/gpsd-3.17-do_not_rm_library.patch b/sci-geosciences/gpsd/files/gpsd-3.17-do_not_rm_library.patch
36 deleted file mode 100644
37 index 83e2907fca5..00000000000
38 --- a/sci-geosciences/gpsd/files/gpsd-3.17-do_not_rm_library.patch
39 +++ /dev/null
40 @@ -1,12 +0,0 @@
41 -diff --git a/SConstruct b/SConstruct
42 -index c0f083a..4a98580 100644
43 ---- a/SConstruct
44 -+++ b/SConstruct
45 -@@ -1646,7 +1646,6 @@ binaryinstall.append(env.Install(installdir('sbindir'), sbin_binaries))
46 - binaryinstall.append(env.Install(installdir('bindir'), bin_binaries))
47 - binaryinstall.append(LibraryInstall(env, installdir('libdir'), compiled_gpslib, libgps_version))
48 - # Work around a minor bug in InstallSharedLib() link handling
49 --env.AddPreAction(binaryinstall, 'rm -f %s/libgps.*' % (installdir('libdir'), ))
50 -
51 - if qt_env:
52 - binaryinstall.append(LibraryInstall(qt_env, installdir('libdir'), compiled_qgpsmmlib, libgps_version))
53
54 diff --git a/sci-geosciences/gpsd/files/gpsd-3.17-scons-print.patch b/sci-geosciences/gpsd/files/gpsd-3.17-scons-print.patch
55 deleted file mode 100644
56 index 4d94d05f428..00000000000
57 --- a/sci-geosciences/gpsd/files/gpsd-3.17-scons-print.patch
58 +++ /dev/null
59 @@ -1,73 +0,0 @@
60 -From ed205512dd05a7dd4b0dab8af760d13e9efbbb25 Mon Sep 17 00:00:00 2001
61 -From: Fred Wright <fw@×××××××.net>
62 -Date: Sat, 7 Oct 2017 19:54:55 -0700
63 -Subject: [PATCH] Fixes SConstruct for SCons 3.0.0.
64 -
65 -SCons 3.0.0 introduced a bug where the print_funtion future import is
66 -inflicted on the SConstruct script, making 'print' as a statement
67 -illegal. This is expected to be fixed in SCons 3.0.1, but in the
68 -meantime it's necessary to switch to the print_function mode for
69 -compatibility. Fortunately, there were only three print statements in
70 -the whole file.
71 -
72 -This is not a complete Python 3 fix; it simply restores correct
73 -operation when running SCons under Python 2.
74 -
75 -TESTED:
76 -Arraged to test all three print() instances under OSX.
77 -Tested "scons build-all check" under OSX, Ubuntu, CentOS, Fedora,
78 -FreeBSD, OpenBSD, and NetBSD.
79 ----
80 - SConstruct | 15 +++++++++++----
81 - 1 file changed, 11 insertions(+), 4 deletions(-)
82 -
83 -diff --git a/SConstruct b/SConstruct
84 -index 4923ad8cdae3..040103cff387 100644
85 ---- a/SConstruct
86 -+++ b/SConstruct
87 -@@ -23,6 +23,13 @@
88 - # * Out-of-directory builds: see http://www.scons.org/wiki/UsingBuildDir
89 - # * Coveraging mode: gcc "-coverage" flag requires a hack
90 - # for building the python bindings
91 -+# * Python 3 compatibility in this recipe
92 -+
93 -+# Since SCons 3.0.0 forces print_function on us, it needs to be unconditional.
94 -+# This is recognized to be a bug in SCons, but we need to live with it for now,
95 -+# and we'll need this for eventual Python 3 compatibility, anyway.
96 -+# Python requires this to precede any non-comment code.
97 -+from __future__ import print_function
98 -
99 - # Release identification begins here
100 - gpsd_version = "3.18~dev"
101 -@@ -375,7 +382,7 @@ if env.GetOption("silent"):
102 -
103 - def announce(msg):
104 - if not env.GetOption("silent"):
105 -- print msg
106 -+ print(msg)
107 -
108 - # DESTDIR environment variable means user prefix the installation root.
109 - DESTDIR = os.environ.get('DESTDIR', '')
110 -@@ -1546,8 +1553,8 @@ def substituter(target, source, env):
111 - content = content.replace(s, t)
112 - m = re.search("@[A-Z]+@", content)
113 - if m and m.group(0) not in map(lambda x: x[0], substmap):
114 -- print >>sys.stderr, "Unknown subst token %s in %s." \
115 -- % (m.group(0), sfp.name)
116 -+ print("Unknown subst token %s in %s." % (m.group(0), sfp.name),
117 -+ file=sys.stderr)
118 - tfp = open(str(target[0]), "w")
119 - tfp.write(content)
120 - tfp.close()
121 -@@ -2191,7 +2198,7 @@ def validation_list(target, source, env):
122 - if '-head' not in page:
123 - fp = open(page)
124 - if "Valid HTML" in fp.read():
125 -- print os.path.join(website, os.path.basename(page))
126 -+ print(os.path.join(website, os.path.basename(page)))
127 - fp.close()
128 - Utility("validation-list", [www], validation_list)
129 -
130 ---
131 -2.19.1
132 -
133
134 diff --git a/sci-geosciences/gpsd/files/gpsd-3.17-scons-py3.patch b/sci-geosciences/gpsd/files/gpsd-3.17-scons-py3.patch
135 deleted file mode 100644
136 index d6154c47687..00000000000
137 --- a/sci-geosciences/gpsd/files/gpsd-3.17-scons-py3.patch
138 +++ /dev/null
139 @@ -1,143 +0,0 @@
140 -From b2ba8d5ade0f9d55c2b51ca41d9c9604662452ad Mon Sep 17 00:00:00 2001
141 -From: Robert Norris <rw_norris@×××××××.com>
142 -Date: Mon, 12 Feb 2018 14:16:17 -0800
143 -Subject: [PATCH] SConstruct: Allow building for Python 3
144 -
145 -Still usable with Python 2
146 -
147 -Tested:
148 -scons build-all check
149 -
150 -Debian Unstable with python 2.7.14
151 -OpenSUSE Tumbleweed with python 3.6.4
152 ----
153 - SConstruct | 30 ++++++++++++++++--------------
154 - 1 file changed, 16 insertions(+), 14 deletions(-)
155 -
156 -diff --git a/SConstruct b/SConstruct
157 -index c6a309ec3c30..17b47e21342f 100644
158 ---- a/SConstruct
159 -+++ b/SConstruct
160 -@@ -370,7 +370,7 @@ for flag in ["LDFLAGS", "SHLINKFLAGS", "CPPFLAGS"]:
161 -
162 -
163 - # Keep scan-build options in the environment
164 --for key, value in os.environ.iteritems():
165 -+for key, value in os.environ.items():
166 - if key.startswith('CCC_'):
167 - env.Append(ENV={key: value})
168 -
169 -@@ -476,6 +476,8 @@ if env['sysroot']:
170 - env.MergeFlags({"LINKFLAGS": ["--sysroot=%s" % env['sysroot']]})
171 -
172 - # Build help
173 -+def cmp(a, b):
174 -+ return (a > b) - (a < b)
175 -
176 - Help("""Arguments may be a mixture of switches and targets in any order.
177 - Switches apply to the entire build regardless of where they are in the order.
178 -@@ -859,9 +861,9 @@ else:
179 - "dbus_export": ["libdbus-1"],
180 - }
181 -
182 -- keys = map(lambda x: (x[0], x[2]), boolopts) \
183 -- + map(lambda x: (x[0], x[2]), nonboolopts) \
184 -- + map(lambda x: (x[0], x[2]), pathopts)
185 -+ keys = list(map(lambda x: (x[0], x[2]), boolopts)) \
186 -+ + list(map(lambda x: (x[0], x[2]), nonboolopts)) \
187 -+ + list(map(lambda x: (x[0], x[2]), pathopts))
188 - keys.sort()
189 - for (key, help) in keys:
190 - value = env[key]
191 -@@ -998,7 +1000,7 @@ else:
192 - if env['python']: # May have been turned off by error
193 - env['PYTHON'] = target_python_path
194 - env['ENV']['PYTHON'] = target_python_path # For regress-driver
195 -- py_config_vars = ast.literal_eval(py_config_text)
196 -+ py_config_vars = ast.literal_eval(py_config_text.decode())
197 - py_config_vars = [[] if x is None else x for x in py_config_vars]
198 - python_config = dict(zip(PYTHON_CONFIG_NAMES, py_config_vars))
199 -
200 -@@ -1387,7 +1389,7 @@ else:
201 -
202 - python_objects = {}
203 - python_compiled_libs = {}
204 -- for ext, sources in python_extensions.iteritems():
205 -+ for ext, sources in python_extensions.items():
206 - python_objects[ext] = []
207 - for src in sources:
208 - python_objects[ext].append(
209 -@@ -1417,7 +1419,7 @@ Platform: UNKNOWN
210 - python_egg_info = python_env.Textfile(target="gps-%s.egg-info"
211 - % (gpsd_version, ),
212 - source=python_egg_info_source)
213 -- python_built_extensions = python_compiled_libs.values()
214 -+ python_built_extensions = list(python_compiled_libs.values())
215 - python_targets = python_built_extensions + [python_egg_info]
216 -
217 - env.Command(target="packet_names.h", source="packet_states.h", action="""
218 -@@ -1624,14 +1626,14 @@ if env['xgps']:
219 - "xgpsspeed.1": "gps.xml",
220 - "xgps.1": "gps.xml",
221 - })
222 --all_manpages = base_manpages.keys() + python_manpages.keys()
223 -+all_manpages = list(base_manpages.keys()) + list(python_manpages.keys())
224 -
225 - man_env = env.Clone()
226 - if man_env.GetOption('silent'):
227 - man_env['SPAWN'] = filtered_spawn # Suppress stderr chatter
228 - manpage_targets = []
229 - if manbuilder:
230 -- for (man, xml) in base_manpages.items() + python_manpages.items():
231 -+ for (man, xml) in list(base_manpages.items()) + list(python_manpages.items()):
232 - manpage_targets.append(man_env.Man(source=xml, target=man))
233 -
234 - # Where it all comes together
235 -@@ -1682,7 +1684,7 @@ if ((not env['debug'] and not env['profiling'] and not env['nostrip']
236 - if not env['python']:
237 - python_install = []
238 - else:
239 -- python_module_dir = python_libdir + os.sep + 'gps'
240 -+ python_module_dir = str(python_libdir) + os.sep + 'gps'
241 - python_extensions_install = python_env.Install(DESTDIR + python_module_dir,
242 - python_built_extensions)
243 - if ((not env['debug'] and not env['profiling']
244 -@@ -1695,7 +1697,7 @@ else:
245 - python_progs_install = python_env.Install(installdir('bindir'),
246 - python_progs)
247 -
248 -- python_egg_info_install = python_env.Install(DESTDIR + python_libdir,
249 -+ python_egg_info_install = python_env.Install(DESTDIR + str(python_libdir),
250 - python_egg_info)
251 - python_install = [python_extensions_install,
252 - python_modules_install,
253 -@@ -1712,7 +1714,7 @@ if qt_env:
254 -
255 -
256 - maninstall = []
257 --for manpage in base_manpages.keys() + python_manpages.keys():
258 -+for manpage in list(base_manpages.keys()) + list(python_manpages.keys()):
259 - if not manbuilder and not os.path.exists(manpage):
260 - continue
261 - section = manpage.split(".")[1]
262 -@@ -2198,7 +2200,7 @@ htmlpages = Split('''
263 - www/writing-a-driver.html
264 - ''')
265 -
266 --webpages = htmlpages + asciidocs + map(lambda f: f[:-3], glob.glob("www/*.in"))
267 -+webpages = htmlpages + asciidocs + list(map(lambda f: f[:-3], glob.glob("www/*.in")))
268 -
269 - www = env.Alias('www', webpages)
270 -
271 -@@ -2376,7 +2378,7 @@ if os.path.exists("gpsd.c") and os.path.exists(".gitignore"):
272 - if ".gitignore" in distfiles:
273 - distfiles.remove(".gitignore")
274 - distfiles += generated_sources
275 -- distfiles += base_manpages.keys() + python_manpages.keys()
276 -+ distfiles += list(base_manpages.keys()) + list(python_manpages.keys())
277 - if "packaging/rpm/gpsd.spec" not in distfiles:
278 - distfiles.append("packaging/rpm/gpsd.spec")
279 -
280 ---
281 -2.19.1
282 -
283
284 diff --git a/sci-geosciences/gpsd/files/gpsd-3.18.1-do_not_rm_library.patch b/sci-geosciences/gpsd/files/gpsd-3.18.1-do_not_rm_library.patch
285 deleted file mode 100644
286 index 0500f385d79..00000000000
287 --- a/sci-geosciences/gpsd/files/gpsd-3.18.1-do_not_rm_library.patch
288 +++ /dev/null
289 @@ -1,11 +0,0 @@
290 ---- gpsd-3.18.1/SConstruct.orig 2018-10-19 12:45:40.000000000 -0700
291 -+++ gpsd-3.18.1/SConstruct 2019-10-02 11:49:00.848685223 -0700
292 -@@ -1796,8 +1796,6 @@ # third-party client programs should not
293 - binaryinstall.append(env.Install(installdir('bindir'), bin_binaries))
294 - binaryinstall.append(LibraryInstall(env, installdir('libdir'), compiled_gpslib,
295 - libgps_version))
296 --# Work around a minor bug in InstallSharedLib() link handling
297 --env.AddPreAction(binaryinstall, 'rm -f %s/libgps.*' % (installdir('libdir'), ))
298 -
299 - if qt_env:
300 - binaryinstall.append(LibraryInstall(qt_env, installdir('libdir'),
301
302 diff --git a/sci-geosciences/gpsd/files/gpsd-3.19-do_not_rm_library.patch b/sci-geosciences/gpsd/files/gpsd-3.19-do_not_rm_library.patch
303 deleted file mode 100644
304 index 8008dd54fe9..00000000000
305 --- a/sci-geosciences/gpsd/files/gpsd-3.19-do_not_rm_library.patch
306 +++ /dev/null
307 @@ -1,11 +0,0 @@
308 ---- gpsd-3.19/SConstruct.orig 2019-07-01 19:00:17.000000000 -0700
309 -+++ gpsd-3.19/SConstruct 2019-10-02 11:49:06.080655901 -0700
310 -@@ -1980,8 +1980,6 @@ # third-party client programs should not
311 - binaryinstall.append(env.Install(installdir('bindir'), bin_binaries))
312 - binaryinstall.append(LibraryInstall(env, installdir('libdir'), libgps_shared,
313 - libgps_version))
314 --# Work around a minor bug in InstallSharedLib() link handling
315 --env.AddPreAction(binaryinstall, 'rm -f %s/libgps.*' % (installdir('libdir'), ))
316 -
317 - if qt_env:
318 - binaryinstall.append(LibraryInstall(qt_env, installdir('libdir'),
319
320 diff --git a/sci-geosciences/gpsd/gpsd-3.17-r3.ebuild b/sci-geosciences/gpsd/gpsd-3.17-r3.ebuild
321 deleted file mode 100644
322 index 98c43cc1ab7..00000000000
323 --- a/sci-geosciences/gpsd/gpsd-3.17-r3.ebuild
324 +++ /dev/null
325 @@ -1,171 +0,0 @@
326 -# Copyright 1999-2019 Gentoo Authors
327 -# Distributed under the terms of the GNU General Public License v2
328 -
329 -EAPI=5
330 -
331 -DISTUTILS_OPTIONAL=1
332 -PYTHON_COMPAT=( python2_7 )
333 -SCONS_MIN_VERSION="1.2.1"
334 -
335 -inherit eutils udev user multilib distutils-r1 scons-utils toolchain-funcs
336 -
337 -if [[ ${PV} == "9999" ]] ; then
338 - EGIT_REPO_URI="git://git.savannah.nongnu.org/gpsd.git"
339 - inherit git-2
340 -else
341 - SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
342 - KEYWORDS="amd64 arm ~ppc ~ppc64 ~sparc x86"
343 -fi
344 -
345 -DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients"
346 -HOMEPAGE="http://catb.org/gpsd/"
347 -
348 -LICENSE="BSD"
349 -SLOT="0/23"
350 -
351 -GPSD_PROTOCOLS=(
352 - aivdm ashtech earthmate evermore fury fv18 garmin garmintxt geostar
353 - gpsclock isync itrax mtk3301 navcom nmea0183 nmea2000 ntrip oceanserver
354 - oncore passthrough rtcm104v2 rtcm104v3 sirf skytraq superstar2 tnt
355 - tripmate tsip ublox
356 -)
357 -IUSE_GPSD_PROTOCOLS=${GPSD_PROTOCOLS[@]/#/gpsd_protocols_}
358 -IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth +cxx dbus debug ipv6 latency-timing ncurses ntp python qt5 +shm +sockets static test udev usb X"
359 -RESTRICT="!test? ( test )"
360 -REQUIRED_USE="X? ( python )
361 - gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm )
362 - python? ( ${PYTHON_REQUIRED_USE} )
363 - qt5? ( cxx )"
364 -
365 -RDEPEND="
366 - >=net-misc/pps-tools-0.0.20120407
367 - bluetooth? ( net-wireless/bluez )
368 - dbus? (
369 - sys-apps/dbus
370 - dev-libs/dbus-glib
371 - )
372 - ncurses? ( sys-libs/ncurses:= )
373 - ntp? ( || (
374 - net-misc/ntp
375 - net-misc/ntpsec
376 - net-misc/chrony
377 - ) )
378 - qt5? (
379 - dev-qt/qtcore:5
380 - dev-qt/qtnetwork:5
381 - )
382 - python? ( ${PYTHON_DEPS} )
383 - usb? ( virtual/libusb:1 )
384 - X? ( dev-python/pygobject:3[cairo,${PYTHON_USEDEP}] )"
385 -DEPEND="${RDEPEND}
386 - virtual/pkgconfig
387 - test? ( sys-devel/bc )"
388 -
389 -# xml packages are for man page generation
390 -if [[ ${PV} == *9999* ]] ; then
391 - DEPEND+="
392 - app-text/xmlto
393 - =app-text/docbook-xml-dtd-4.1*"
394 -fi
395 -
396 -src_prepare() {
397 - # Make sure our list matches the source.
398 - local src_protocols=$(echo $(
399 - sed -n '/# GPS protocols/,/# Time service/{s:#.*::;s:[(",]::g;p}' "${S}"/SConstruct | awk '{print $1}' | LC_ALL=C sort
400 - ) )
401 - if [[ ${src_protocols} != ${GPSD_PROTOCOLS[*]} ]] ; then
402 - eerror "Detected protocols: ${src_protocols}"
403 - eerror "Ebuild protocols: ${GPSD_PROTOCOLS[*]}"
404 - die "please sync ebuild & source"
405 - fi
406 -
407 - epatch "${FILESDIR}"/${P}-do_not_rm_library.patch
408 -
409 - # Avoid useless -L paths to the install dir
410 - sed -i \
411 - -e 's:\<STAGING_PREFIX\>:SYSROOT:g' \
412 - SConstruct || die
413 -
414 - use python && distutils-r1_src_prepare
415 -}
416 -
417 -python_prepare_all() {
418 - python_setup
419 - # Extract python info out of SConstruct so we can use saner distribute
420 - pyvar() { sed -n "/^ *$1 *=/s:.*= *::p" SConstruct ; }
421 - local pybins=$(pyvar python_progs | tail -1)
422 - local pysrcs=$(sed -n '/^ *python_extensions = {/,/}/{s:^ *::;s:os[.]sep:"/":g;p}' SConstruct)
423 - local packet=$("${PYTHON}" -c "${pysrcs}; print(python_extensions['gps/packet'])")
424 - local client=$("${PYTHON}" -c "${pysrcs}; print(python_extensions['gps/clienthelpers'])")
425 - sed \
426 - -e "s|@VERSION@|$(pyvar gpsd_version)|" \
427 - -e "s|@URL@|$(pyvar website)|" \
428 - -e "s|@EMAIL@|$(pyvar devmail)|" \
429 - -e "s|@SCRIPTS@|${pybins}|" \
430 - -e "s|@GPS_PACKET_SOURCES@|${packet}|" \
431 - -e "s|@GPS_CLIENT_SOURCES@|${client}|" \
432 - -e "s|@SCRIPTS@|${pybins}|" \
433 - "${FILESDIR}"/${PN}-3.3-setup.py > setup.py || die
434 - distutils-r1_python_prepare_all
435 -}
436 -
437 -src_configure() {
438 - myesconsargs=(
439 - prefix="${EPREFIX}/usr"
440 - libdir="\$prefix/$(get_libdir)"
441 - udevdir="$(get_udevdir)"
442 - chrpath=False
443 - gpsd_user=gpsd
444 - gpsd_group=uucp
445 - nostrip=True
446 - manbuild=False
447 - shared=$(usex !static True False)
448 - $(use_scons bluetooth bluez)
449 - $(use_scons cxx libgpsmm)
450 - $(use_scons debug clientdebug)
451 - $(use_scons dbus dbus_export)
452 - $(use_scons ipv6)
453 - $(use_scons latency-timing timing)
454 - $(use_scons ncurses)
455 - $(use_scons ntp ntpshm)
456 - $(use_scons ntp pps)
457 - $(use_scons X python)
458 - $(use_scons qt5 qt)
459 - $(use_scons shm shm_export)
460 - $(use_scons sockets socket_export)
461 - $(use_scons usb)
462 - )
463 -
464 - use X && myesconsargs+=( xgps=1 )
465 - use qt5 && myesconsargs+=( qt_versioned=5 )
466 -
467 - # enable specified protocols
468 - local protocol
469 - for protocol in ${GPSD_PROTOCOLS[@]} ; do
470 - myesconsargs+=( $(use_scons gpsd_protocols_${protocol} ${protocol}) )
471 - done
472 -}
473 -
474 -src_compile() {
475 - export CHRPATH=
476 - tc-export CC CXX PKG_CONFIG
477 - export SHLINKFLAGS=${LDFLAGS} LINKFLAGS=${LDFLAGS}
478 - escons
479 -
480 - use python && distutils-r1_src_compile
481 -}
482 -
483 -src_install() {
484 - DESTDIR="${D}" escons install $(usex udev udev-install "")
485 -
486 - newconfd "${FILESDIR}"/gpsd.conf-2 gpsd
487 - newinitd "${FILESDIR}"/gpsd.init-2 gpsd
488 -
489 - use python && distutils-r1_src_install
490 -}
491 -
492 -pkg_preinst() {
493 - # Run the gpsd daemon as gpsd and group uucp; create it here
494 - # as it doesn't seem to be needed during compile/install ...
495 - enewuser gpsd -1 -1 -1 "uucp"
496 -}
497
498 diff --git a/sci-geosciences/gpsd/gpsd-3.17-r4.ebuild b/sci-geosciences/gpsd/gpsd-3.17-r4.ebuild
499 deleted file mode 100644
500 index 814c85acb35..00000000000
501 --- a/sci-geosciences/gpsd/gpsd-3.17-r4.ebuild
502 +++ /dev/null
503 @@ -1,175 +0,0 @@
504 -# Copyright 1999-2019 Gentoo Authors
505 -# Distributed under the terms of the GNU General Public License v2
506 -
507 -EAPI=5
508 -
509 -DISTUTILS_OPTIONAL=1
510 -PYTHON_COMPAT=( python2_7 )
511 -SCONS_MIN_VERSION="1.2.1"
512 -
513 -inherit eutils udev user multilib distutils-r1 scons-utils toolchain-funcs
514 -
515 -if [[ ${PV} == "9999" ]] ; then
516 - EGIT_REPO_URI="git://git.savannah.nongnu.org/gpsd.git"
517 - inherit git-2
518 -else
519 - SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
520 - KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
521 -fi
522 -
523 -DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients"
524 -HOMEPAGE="http://catb.org/gpsd/"
525 -
526 -LICENSE="BSD"
527 -SLOT="0/23"
528 -
529 -GPSD_PROTOCOLS=(
530 - aivdm ashtech earthmate evermore fury fv18 garmin garmintxt geostar
531 - gpsclock isync itrax mtk3301 navcom nmea0183 nmea2000 ntrip oceanserver
532 - oncore passthrough rtcm104v2 rtcm104v3 sirf skytraq superstar2 tnt
533 - tripmate tsip ublox
534 -)
535 -IUSE_GPSD_PROTOCOLS=${GPSD_PROTOCOLS[@]/#/gpsd_protocols_}
536 -IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth +cxx dbus debug ipv6 latency-timing ncurses ntp python qt5 +shm +sockets static test udev usb X"
537 -RESTRICT="!test? ( test )"
538 -REQUIRED_USE="X? ( python )
539 - gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm )
540 - python? ( ${PYTHON_REQUIRED_USE} )
541 - qt5? ( cxx )"
542 -
543 -RDEPEND="
544 - >=net-misc/pps-tools-0.0.20120407
545 - bluetooth? ( net-wireless/bluez )
546 - dbus? (
547 - sys-apps/dbus
548 - dev-libs/dbus-glib
549 - )
550 - ncurses? ( sys-libs/ncurses:= )
551 - ntp? ( || (
552 - net-misc/ntp
553 - net-misc/ntpsec
554 - net-misc/chrony
555 - ) )
556 - qt5? (
557 - dev-qt/qtcore:5
558 - dev-qt/qtnetwork:5
559 - )
560 - python? ( ${PYTHON_DEPS} )
561 - usb? ( virtual/libusb:1 )
562 - X? ( dev-python/pygobject:3[cairo,${PYTHON_USEDEP}] )"
563 -DEPEND="${RDEPEND}
564 - virtual/pkgconfig
565 - test? ( sys-devel/bc )"
566 -
567 -# xml packages are for man page generation
568 -if [[ ${PV} == *9999* ]] ; then
569 - DEPEND+="
570 - app-text/xmlto
571 - =app-text/docbook-xml-dtd-4.1*"
572 -fi
573 -
574 -src_prepare() {
575 - # Make sure our list matches the source.
576 - local src_protocols=$(echo $(
577 - sed -n '/# GPS protocols/,/# Time service/{s:#.*::;s:[(",]::g;p}' "${S}"/SConstruct | awk '{print $1}' | LC_ALL=C sort
578 - ) )
579 - if [[ ${src_protocols} != ${GPSD_PROTOCOLS[*]} ]] ; then
580 - eerror "Detected protocols: ${src_protocols}"
581 - eerror "Ebuild protocols: ${GPSD_PROTOCOLS[*]}"
582 - die "please sync ebuild & source"
583 - fi
584 -
585 - epatch "${FILESDIR}"/${P}-do_not_rm_library.patch
586 - epatch "${FILESDIR}"/${P}-scons-print.patch
587 - epatch "${FILESDIR}"/${P}-scons-py3.patch
588 -
589 - # Avoid useless -L paths to the install dir
590 - sed -i \
591 - -e 's:\<STAGING_PREFIX\>:SYSROOT:g' \
592 - SConstruct || die
593 -
594 - use python && distutils-r1_src_prepare
595 -}
596 -
597 -python_prepare_all() {
598 - python_setup
599 - # Extract python info out of SConstruct so we can use saner distribute
600 - pyvar() { sed -n "/^ *$1 *=/s:.*= *::p" SConstruct ; }
601 - local pybins=$(pyvar python_progs | tail -1)
602 - # Handle conditional tools manually. #666734
603 - use X && pybins+="+ ['xgps', 'xgpsspeed']"
604 - local pysrcs=$(sed -n '/^ *python_extensions = {/,/}/{s:^ *::;s:os[.]sep:"/":g;p}' SConstruct)
605 - local packet=$("${PYTHON}" -c "${pysrcs}; print(python_extensions['gps/packet'])")
606 - local client=$("${PYTHON}" -c "${pysrcs}; print(python_extensions['gps/clienthelpers'])")
607 - sed \
608 - -e "s|@VERSION@|$(pyvar gpsd_version)|" \
609 - -e "s|@URL@|$(pyvar website)|" \
610 - -e "s|@EMAIL@|$(pyvar devmail)|" \
611 - -e "s|@SCRIPTS@|${pybins}|" \
612 - -e "s|@GPS_PACKET_SOURCES@|${packet}|" \
613 - -e "s|@GPS_CLIENT_SOURCES@|${client}|" \
614 - -e "s|@SCRIPTS@|${pybins}|" \
615 - "${FILESDIR}"/${PN}-3.3-setup.py > setup.py || die
616 - distutils-r1_python_prepare_all
617 -}
618 -
619 -src_configure() {
620 - myesconsargs=(
621 - prefix="${EPREFIX}/usr"
622 - libdir="\$prefix/$(get_libdir)"
623 - udevdir="$(get_udevdir)"
624 - chrpath=False
625 - gpsd_user=gpsd
626 - gpsd_group=uucp
627 - nostrip=True
628 - manbuild=False
629 - shared=$(usex !static True False)
630 - $(use_scons bluetooth bluez)
631 - $(use_scons cxx libgpsmm)
632 - $(use_scons debug clientdebug)
633 - $(use_scons dbus dbus_export)
634 - $(use_scons ipv6)
635 - $(use_scons latency-timing timing)
636 - $(use_scons ncurses)
637 - $(use_scons ntp ntpshm)
638 - $(use_scons ntp pps)
639 - $(use_scons X python)
640 - $(use_scons qt5 qt)
641 - $(use_scons shm shm_export)
642 - $(use_scons sockets socket_export)
643 - $(use_scons usb)
644 - )
645 -
646 - use X && myesconsargs+=( xgps=1 )
647 - use qt5 && myesconsargs+=( qt_versioned=5 )
648 -
649 - # enable specified protocols
650 - local protocol
651 - for protocol in ${GPSD_PROTOCOLS[@]} ; do
652 - myesconsargs+=( $(use_scons gpsd_protocols_${protocol} ${protocol}) )
653 - done
654 -}
655 -
656 -src_compile() {
657 - export CHRPATH=
658 - tc-export CC CXX PKG_CONFIG
659 - export SHLINKFLAGS=${LDFLAGS} LINKFLAGS=${LDFLAGS}
660 - escons
661 -
662 - use python && distutils-r1_src_compile
663 -}
664 -
665 -src_install() {
666 - DESTDIR="${D}" escons install $(usex udev udev-install "")
667 -
668 - newconfd "${FILESDIR}"/gpsd.conf-2 gpsd
669 - newinitd "${FILESDIR}"/gpsd.init-2 gpsd
670 -
671 - use python && distutils-r1_src_install
672 -}
673 -
674 -pkg_preinst() {
675 - # Run the gpsd daemon as gpsd and group uucp; create it here
676 - # as it doesn't seem to be needed during compile/install ...
677 - enewuser gpsd -1 -1 -1 "uucp"
678 -}
679
680 diff --git a/sci-geosciences/gpsd/gpsd-3.20.ebuild b/sci-geosciences/gpsd/gpsd-3.20.ebuild
681 deleted file mode 100644
682 index 8953467697c..00000000000
683 --- a/sci-geosciences/gpsd/gpsd-3.20.ebuild
684 +++ /dev/null
685 @@ -1,189 +0,0 @@
686 -# Copyright 1999-2020 Gentoo Authors
687 -# Distributed under the terms of the GNU General Public License v2
688 -
689 -EAPI=7
690 -
691 -DISTUTILS_OPTIONAL=1
692 -PYTHON_COMPAT=( python3_{6,7,8} )
693 -SCONS_MIN_VERSION="2.3.0"
694 -
695 -inherit eutils udev multilib distutils-r1 scons-utils toolchain-funcs
696 -
697 -if [[ ${PV} == "9999" ]] ; then
698 - EGIT_REPO_URI="https://gitlab.com/gpsd/gpsd.git"
699 - inherit git-r3
700 -else
701 - SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
702 - KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
703 -fi
704 -
705 -DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients"
706 -HOMEPAGE="https://gpsd.gitlab.io/gpsd/"
707 -
708 -LICENSE="BSD"
709 -SLOT="0/25"
710 -
711 -GPSD_PROTOCOLS=(
712 - aivdm ashtech earthmate evermore fury fv18 garmin garmintxt geostar
713 - gpsclock greis isync itrax mtk3301 navcom nmea0183 nmea2000 ntrip
714 - oceanserver oncore passthrough rtcm104v2 rtcm104v3 sirf skytraq
715 - superstar2 tnt tripmate tsip ublox
716 -)
717 -IUSE_GPSD_PROTOCOLS=${GPSD_PROTOCOLS[@]/#/+gpsd_protocols_}
718 -IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth +cxx dbus debug ipv6 latency-timing ncurses ntp python qt5 +shm +sockets static test udev usb X"
719 -REQUIRED_USE="X? ( python )
720 - gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm )
721 - gpsd_protocols_isync? ( gpsd_protocols_ublox )
722 - gpsd_protocols_ublox? ( python )
723 - gpsd_protocols_greis? ( python )
724 - python? ( ${PYTHON_REQUIRED_USE} )
725 - qt5? ( cxx )"
726 -RESTRICT="!test? ( test )"
727 -
728 -RDEPEND="
729 - acct-user/gpsd
730 - >=net-misc/pps-tools-0.0.20120407
731 - bluetooth? ( net-wireless/bluez )
732 - dbus? (
733 - sys-apps/dbus
734 - dev-libs/dbus-glib
735 - )
736 - ncurses? ( sys-libs/ncurses:= )
737 - ntp? ( || (
738 - net-misc/ntp
739 - net-misc/ntpsec
740 - net-misc/chrony
741 - ) )
742 - qt5? (
743 - dev-qt/qtcore:5
744 - dev-qt/qtnetwork:5
745 - )
746 - python? ( ${PYTHON_DEPS} )
747 - gpsd_protocols_ublox? ( dev-python/pyserial )
748 - gpsd_protocols_greis? ( dev-python/pyserial )
749 - usb? ( virtual/libusb:1 )
750 - X? ( dev-python/pygobject:3[cairo,${PYTHON_USEDEP}] )"
751 -DEPEND="${RDEPEND}
752 - virtual/pkgconfig
753 - test? ( sys-devel/bc )"
754 -
755 -# xml packages are for man page generation
756 -if [[ ${PV} == *9999* ]] ; then
757 - DEPEND+="
758 - app-text/xmlto
759 - =app-text/docbook-xml-dtd-4.1*"
760 -fi
761 -
762 -src_prepare() {
763 - # Make sure our list matches the source.
764 - local src_protocols=$(echo $(
765 - sed -n '/# GPS protocols/,/# Time service/{s:#.*::;s:[(",]::g;p}' "${S}"/SConstruct | awk '{print $1}' | LC_ALL=C sort
766 - ) )
767 - if [[ ${src_protocols} != ${GPSD_PROTOCOLS[*]} ]] ; then
768 - eerror "Detected protocols: ${src_protocols}"
769 - eerror "Ebuild protocols: ${GPSD_PROTOCOLS[*]}"
770 - die "please sync ebuild & source"
771 - fi
772 -
773 - # Avoid useless -L paths to the install dir
774 - sed -i \
775 - -e 's:\<STAGING_PREFIX\>:SYSROOT:g' \
776 - SConstruct || die
777 -
778 - #Fix systemd binary paths
779 - sed -i -e 's/local\///' 'systemd/gpsd.service'
780 - sed -i -e 's/local\///' 'systemd/gpsdctl@××××××××.in'
781 -
782 - default
783 -
784 - use python && distutils-r1_src_prepare
785 -}
786 -
787 -python_prepare_all() {
788 - python_setup
789 -
790 - # Extract python info out of SConstruct so we can use saner distribute
791 - pyvar() { sed -n "/^ *$1 *=/s:.*= *::p" SConstruct ; }
792 - local pybins=$(pyvar python_progs | tail -1)
793 - # Handle conditional tools manually. #666734
794 - use X && pybins+="+ ['xgps', 'xgpsspeed']"
795 - use gpsd_protocols_ublox && pybins+="+ ['ubxtool']"
796 - use gpsd_protocols_greis && pybins+="+ ['zerk']"
797 - local pysrcs=$(sed -n '/^ *python_extensions = {/,/}/{s:^ *::;s:os[.]sep:"/":g;p}' SConstruct)
798 - local packet=$("${PYTHON}" -c "${pysrcs}; print(python_extensions['gps/packet'])" || die "Unable to extract packet types")
799 - # Post 3.19 the clienthelpers were merged into gps.packet
800 - sed \
801 - -e "s|@VERSION@|$(pyvar gpsd_version)|" \
802 - -e "s|@URL@|$(pyvar website)|" \
803 - -e "s|@EMAIL@|$(pyvar devmail)|" \
804 - -e "s|@SCRIPTS@|${pybins}|" \
805 - -e "s|@GPS_PACKET_SOURCES@|${packet}|" \
806 - -e "/@GPS_CLIENT_SOURCES@/d" \
807 - -e "s|@SCRIPTS@|${pybins}|" \
808 - "${FILESDIR}"/${PN}-3.3-setup.py > setup.py || die
809 - distutils-r1_python_prepare_all
810 -}
811 -
812 -src_configure() {
813 - scons_opts=(
814 - prefix="${EPREFIX}/usr"
815 - libdir="\$prefix/$(get_libdir)"
816 - udevdir="$(get_udevdir)"
817 - rundir="/run"
818 - chrpath=False
819 - gpsd_user=gpsd
820 - gpsd_group=dialout
821 - nostrip=True
822 - manbuild=False
823 - shared=$(usex !static True False)
824 - bluez=$(usex bluetooth)
825 - libgpsmm=$(usex cxx)
826 - clientdebug=$(usex debug)
827 - dbus_export=$(usex dbus)
828 - ipv6=$(usex ipv6)
829 - timing=$(usex latency-timing)
830 - ncurses=$(usex ncurses)
831 - ntpshm=$(usex ntp)
832 - pps=$(usex ntp)
833 - python=$(usex python)
834 - # force a predictable python libdir because lib vs. lib64 usage differs
835 - # from 3.5 to 3.6+
836 - $(usex python python_libdir="${EPREFIX}"/python-discard "")
837 - qt=$(usex qt5)
838 - shm_export=$(usex shm)
839 - socket_export=$(usex sockets)
840 - usb=$(usex usb)
841 - )
842 -
843 - use X && scons_opts+=( xgps=1 xgpsspeed=1 )
844 - use qt5 && scons_opts+=( qt_versioned=5 )
845 -
846 - # enable specified protocols
847 - local protocol
848 - for protocol in ${GPSD_PROTOCOLS[@]} ; do
849 - scons_opts+=( ${protocol}=$(usex gpsd_protocols_${protocol}) )
850 - done
851 -}
852 -
853 -src_compile() {
854 - export CHRPATH=
855 - tc-export CC CXX PKG_CONFIG
856 - export SHLINKFLAGS=${LDFLAGS} LINKFLAGS=${LDFLAGS}
857 - escons "${scons_opts[@]}"
858 -
859 - use python && distutils-r1_src_compile
860 -}
861 -
862 -src_install() {
863 - DESTDIR="${D}" escons install "${scons_opts[@]}" $(usex udev udev-install "")
864 -
865 - newconfd "${FILESDIR}"/gpsd.conf-2 gpsd
866 - newinitd "${FILESDIR}"/gpsd.init-2 gpsd
867 -
868 - # Cleanup bad alt copy due to Scons
869 - rm -rf "${D}"/python-discard/gps*
870 - find "${D}"/python-discard/ -type d -delete
871 - # Install correct multi-python copy
872 - use python && distutils-r1_src_install
873 -
874 -}