main/gpsd: switch fully to python3

2 files changed, 10 insertions, 303 deletions

diff --git a/main/gpsd/0001-workaround-for-scons-using-python2.patch b/main/gpsd/0001-workaround-for-scons-using-python2.patch
deleted file mode 100644
index 5e8e1f0976..0000000000
--- a/main/gpsd/0001-workaround-for-scons-using-python2.patch
+++ /dev/null
@@ -1,290 +0,0 @@
-diff --git a/contrib/ntpshmviz b/contrib/ntpshmviz
-index a7ae44f..5627d3a 100755
---- a/contrib/ntpshmviz
-+++ b/contrib/ntpshmviz
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- #
- # This file is Copyright (c) 2010-2018 by the GPSD project
- # SPDX-License-Identifier: BSD-2-clause
-diff --git a/contrib/skyview2svg b/contrib/skyview2svg
-index 9c79b25..6b80d4b 100644
---- a/contrib/skyview2svg
-+++ b/contrib/skyview2svg
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- # -*- coding: utf-8 -*-
- """
- skyview2svg -- Create an SVG image of GPS satellites sky view.
-diff --git a/contrib/webgps.py b/contrib/webgps.py
-index 902c162..942dcbb 100755
---- a/contrib/webgps.py
-+++ b/contrib/webgps.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- # encoding: utf-8
- 
- """webgps.py
-diff --git a/devtools/ais.py b/devtools/ais.py
-index f269433..531a4c7 100755
---- a/devtools/ais.py
-+++ b/devtools/ais.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- #
- # A Python AIVDM/AIVDO decoder
- #
-diff --git a/devtools/aivdmtable b/devtools/aivdmtable
-index 13c1e5f..51c4146 100755
---- a/devtools/aivdmtable
-+++ b/devtools/aivdmtable
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- #
- # Generate an asciidoc table of the six-bit encoding used in AIVDM packets.
- #
-diff --git a/devtools/cycle_analyzer b/devtools/cycle_analyzer
-index aac4c6c..0aa20c2 100755
---- a/devtools/cycle_analyzer
-+++ b/devtools/cycle_analyzer
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- #
- # This file is Copyright (c) 2010 by the GPSD project
- # BSD terms apply: see the file COPYING in the distribution root for details.
-diff --git a/devtools/flocktest b/devtools/flocktest
-index d301ee7..8cf2d9e 100755
---- a/devtools/flocktest
-+++ b/devtools/flocktest
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- #
- # This file is Copyright (c) 2010 by the GPSD project
- # BSD terms apply: see the file COPYING in the distribution root for details.
-diff --git a/devtools/identify_failing_build_options.py b/devtools/identify_failing_build_options.py
-index ec10a84..480a3fb 100755
---- a/devtools/identify_failing_build_options.py
-+++ b/devtools/identify_failing_build_options.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- 
- # This code runs compatibly under Python 2 and 3.x for x >= 2.
- # Preserve this property!
-diff --git a/devtools/regress-builder b/devtools/regress-builder
-index 3266768..ef44506 100755
---- a/devtools/regress-builder
-+++ b/devtools/regress-builder
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- #
- # This file is Copyright (c) 2010-2019 by the GPSD project
- # BSD terms apply: see the file COPYING in the distribution root for details.
-diff --git a/devtools/regressdiff b/devtools/regressdiff
-index 6188687..24d5f42 100755
---- a/devtools/regressdiff
-+++ b/devtools/regressdiff
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- #
- # Walk through a pair of textfiles looking for where they begin to differ.
- # May be useful for comparing logs when regression tests break.
-diff --git a/devtools/sizes b/devtools/sizes
-index f6459cf..05a5fb7 100755
---- a/devtools/sizes
-+++ b/devtools/sizes
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- #
- # sizes -- explore the sizes of static gpsd binaries
- #
-diff --git a/devtools/striplog b/devtools/striplog
-index e81a2c8..4ba3cbd 100755
---- a/devtools/striplog
-+++ b/devtools/striplog
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- #
- # striplog -- strip leading lines from logs
- #
-diff --git a/devtools/tablegen.py b/devtools/tablegen.py
-index b8a3ed3..f42a59e 100755
---- a/devtools/tablegen.py
-+++ b/devtools/tablegen.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- #
- # This tool is intended to automate away the drudgery in bring up support
- # for a new AIS message type.  It parses the tabular description of a message
-diff --git a/devtools/test_json_validity.py b/devtools/test_json_validity.py
-index 959bfe8..cac10da 100755
---- a/devtools/test_json_validity.py
-+++ b/devtools/test_json_validity.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- #
- # Christian Gagneraud - 2012
- # Simple python script that will parse json dictionaries on its input,
-diff --git a/devtools/uninstall_cleanup.py b/devtools/uninstall_cleanup.py
-index e78d412..916fbab 100755
---- a/devtools/uninstall_cleanup.py
-+++ b/devtools/uninstall_cleanup.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- 
- # This code runs compatibly under Python 2 and 3.x for x >= 2.
- # Preserve this property!
-diff --git a/gegps b/gegps
-index 8672e7e..0c1b53e 100755
---- a/gegps
-+++ b/gegps
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- # -*- coding: utf-8 -*-
- '''
- usage: gegps [-i] [-d kmldir]
-diff --git a/gps/gps.py b/gps/gps.py
-index c3f4a03..5956eec 100644
---- a/gps/gps.py
-+++ b/gps/gps.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- # -*- coding: utf-8 -*-
- '''gps.py -- Python interface to GPSD.
- 
-diff --git a/gpscat b/gpscat
-index c04dc72..0035316 100755
---- a/gpscat
-+++ b/gpscat
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- #
- "Display GPS output.  Hexify it if necessary."
- 
-diff --git a/gpsfake b/gpsfake
-index 6bae262..485fea6 100755
---- a/gpsfake
-+++ b/gpsfake
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- #
- '''
- gpsfake -- test harness for gpsd
-diff --git a/gpsprof b/gpsprof
-index 9bd665c..3989627 100755
---- a/gpsprof
-+++ b/gpsprof
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- #
- '''
- Collect and plot latency-profiling data from a running gpsd.
-diff --git a/jsongen.py b/jsongen.py
-index e27eeb6..4788458 100755
---- a/jsongen.py
-+++ b/jsongen.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- #
- # This file is Copyright (c) 2010 by the GPSD project
- # SPDX-License-Identifier: BSD-2-clause
-diff --git a/maskaudit.py b/maskaudit.py
-index 00d1275..2029494 100755
---- a/maskaudit.py
-+++ b/maskaudit.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- #
- # This file is Copyright (c) 2010 by the GPSD project
- # SPDX-License-Identifier: BSD-2-clause
-diff --git a/test_misc.py b/test_misc.py
-index eb79c10..7a81957 100755
---- a/test_misc.py
-+++ b/test_misc.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- #
- # Test gps/misc.py
- #
-diff --git a/test_xgps_deps.py b/test_xgps_deps.py
-index cb9448e..e1f5301 100755
---- a/test_xgps_deps.py
-+++ b/test_xgps_deps.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- """Test imports needed by X11-based tools."""
- 
- from __future__ import print_function
-diff --git a/ubxtool b/ubxtool
-index 7e4a042..bab887e 100755
---- a/ubxtool
-+++ b/ubxtool
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- # -*- coding: UTF-8
- '''
- ubxtool -- u-blox configurator and packet decoder
-diff --git a/valgrind-audit.py b/valgrind-audit.py
-index 749b2fa..30a1817 100755
---- a/valgrind-audit.py
-+++ b/valgrind-audit.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- #
- # This is a valgrind torture test for the gpsd daemon.
- # It's not really expected to spot anything as long as we aren't using
-diff --git a/xgps b/xgps
-index 89d96d1..3edfa6a 100755
---- a/xgps
-+++ b/xgps
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- # -*- coding: UTF-8
- '''
- xgps -- test client for gpsd
-diff --git a/xgpsspeed b/xgpsspeed
-index b532fe5..4ce3beb 100755
---- a/xgpsspeed
-+++ b/xgpsspeed
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- #
- # by
- # Robin Wittler <real@the-real.org> (speedometer mode)
-diff --git a/zerk b/zerk
-index 4186042..f0257e6 100755
---- a/zerk
-+++ b/zerk
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- # -*- coding: UTF-8
- '''
- zerk -- GREIS configurator and packet decoder
diff --git a/main/gpsd/APKBUILD b/main/gpsd/APKBUILD
index d67ee0b728..94dd16d17c 100644
--- a/main/gpsd/APKBUILD
+++ b/main/gpsd/APKBUILD
@@ -2,21 +2,19 @@
 # Maintainer: Nathan Angelacos <nangel@alpinelinux.org>
 pkgname=gpsd
 pkgver=3.20
-pkgrel=0
+pkgrel=1
 pkgdesc="A GPS daemon"
 arch=all
 url="http://catb.org/gpsd/"
-license="BSD"
-makedepends="scons python3-dev libcap-dev ncurses-dev python"
+license="BSD-2-Clause"
+makedepends="scons python3-dev libcap-dev ncurses-dev"
 subpackages="$pkgname-dev $pkgname-doc py3-$pkgname:_py $pkgname-clients:_clients"
-source="https://download-mirror.savannah.gnu.org/releases/gpsd/$pkgname-$pkgver.tar.gz
+source="https://download-mirror.savannah.gnu.org/releases/gpsd/gpsd-$pkgver.tar.gz
 	timepps.h
 	gpsd-use-local-timepps-header.patch
-	0001-workaround-for-scons-using-python2.patch
 	gpsd.initd
 	gpsd.confd"
 
-builddir="$srcdir/$pkgname-$pkgver"
 options="!check" # FIXME: tests fails
 
 prepare() {
@@ -26,12 +24,15 @@ prepare() {
 	mkdir -p "$builddir"/sys
 	cp "$srcdir"/timepps.h "$builddir"/sys/
 
+	# Hack to get scons to respect python
+	ln -s /usr/bin/python3 python
+	export PATH="$PATH:."
+
 	default_prepare
 }
 
 build() {
-	cd "$builddir"
-	CPPFLAGS="-I. -DHAVE_SYS_TIMEPPS_H"
+	CPPFLAGS="$CPPFLAGS -I. -DHAVE_SYS_TIMEPPS_H"
 	scons -j${JOBS:-1} \
 		prefix=/usr \
 		target_python=python3 \
@@ -40,13 +41,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	scons check
 }
 
 package() {
-	cd "$builddir"
-
 	DESTDIR="$pkgdir" scons install
 	# fix python interpreter path
 	 sed -e "s,#!/usr/bin/\(python[23]\?\|env \+python[23]\?\),#!/usr/bin/python3},g" -i \
@@ -66,7 +64,7 @@ _py() {
 
 	mkdir -p "$subpkgdir"/usr/bin
 	for n in gpscat gpsfake gpsprof; do
-		mv "$pkgdir"/usr/bin/${n} "$subpkgdir"/usr/bin/
+		mv "$pkgdir"/usr/bin/$n "$subpkgdir"/usr/bin/
 	done
 
 }
@@ -80,6 +78,5 @@ _clients() {
 sha512sums="557ef5e5f3b511da4fc441f4bb2e0cd2e23c2981e8b3ce2999973767a04fde070d3ec6f14af60d0e471320078e9f4d1144e5796e7927975ecfbd55fc97f470a9  gpsd-3.20.tar.gz
 eb11fc19243d1789016d88eb7645bfe67c46304547781489bf36eb1dd4c252d523681ff835a6488fa0ef62b6b9e2f781c672279f4439f5d5640a3f214a113048  timepps.h
 b692c9fc77a9db3fc621693d3b9e3ef9bc2efbbc7b01651168d7b928d29d48a489b8859930bad01b6021e211372e069a726b78dd5938385ed4ae0153b38f4170  gpsd-use-local-timepps-header.patch
-6599951b4df6154de0bc1088f1bc740af68e2b5a1e3ea2b422a406ed54a79d4273a5015e5e4efdf832c8926cb50626fc7fe8be361448128cc63c41b0f8359a70  0001-workaround-for-scons-using-python2.patch
 51319247eb78c3021d3eb897cb5d6026cc09d46a532a245a835459ed525947ffb6239f08126dd7e344de52e3b0387226bce060191ec3f14f99fc9f255d96f8ea  gpsd.initd
 75dbfe39eb900cc9587dd70794ee77ae2230765bbede47760ca227145aa3f2290b6995335ffcfeae6cd86f56b01ca87367548f4fbcf810aff1bc012b7416deef  gpsd.confd"