main/gpsd: upgrade to 3.23

1 files changed, 30 insertions, 26 deletions

diff --git a/main/gpsd/APKBUILD b/main/gpsd/APKBUILD
index 666c8899f27..dfe17c3739a 100644
--- a/main/gpsd/APKBUILD
+++ b/main/gpsd/APKBUILD
@@ -1,23 +1,28 @@
 # Contributor: Nathan Angelacos <nangel@alpinelinux.org>
 # Maintainer: Nathan Angelacos <nangel@alpinelinux.org>
+
+# gpsd is commonly used with NTP servers to provide a stable clock,
+# please do not move to community.
+
 pkgname=gpsd
-pkgver=3.19
+pkgver=3.23
 pkgrel=0
-pkgdesc="A GPS daemon"
-arch=all
+pkgdesc="GPS daemon"
+arch="all"
 url="http://catb.org/gpsd/"
-license="BSD"
-makedepends="scons python3-dev libcap-dev ncurses-dev python"
-subpackages="$pkgname-dev $pkgname-doc py3-$pkgname:_py $pkgname-clients:_clients"
-source="https://download-mirror.savannah.gnu.org/releases/gpsd/$pkgname-$pkgver.tar.gz
+license="BSD-2-Clause"
+makedepends="scons asciidoctor python3-dev libcap-dev ncurses-dev"
+subpackages="
+	$pkgname-dev
+	$pkgname-doc
+	py3-$pkgname:_py:noarch
+	$pkgname-clients:_clients
+	$pkgname-openrc"
+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
-	ttydefaults.patch
 	gpsd.initd
 	gpsd.confd"
 
-builddir="$srcdir/$pkgname-$pkgver"
 options="!check" # FIXME: tests fails
 
 prepare() {
@@ -27,29 +32,29 @@ 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$builddir -DHAVE_SYS_TIMEPPS_H"
 	scons -j${JOBS:-1} \
 		prefix=/usr \
-		target_python=python3
+		target_python=python3 \
+		python_shebang=/usr/bin/python3 \
+		dbus_export=no \
+		systemd=no
 }
 
 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 \
-	         gegps gpscat gpsfake xgps xgpsspeed gpsprof gps/*.py
 	install -m755 -D "$srcdir"/gpsd.initd "$pkgdir"/etc/init.d/gpsd
 	install -m644 -D "$srcdir"/gpsd.confd "$pkgdir"/etc/conf.d/gpsd
 }
@@ -65,7 +70,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
 
 }
@@ -76,10 +81,9 @@ _clients() {
 	mv "$pkgdir"/usr/bin/* "$subpkgdir"/usr/bin
 }
 
-sha512sums="c9f9a9ff65759f852771ec4cf97ab15343c9176a149dd5ea6c2e2dc18b47aa7c7bf9ff1f2e8523121564d33a34ae6aa08169c5454847b4fe7848e616fd20a814  gpsd-3.19.tar.gz
+sha512sums="
+967cc9801271418023630df02b457b76108968992151f6e80b569e99b856bd79cc3d0369d2088f3bc609b2ab22b29dba87639bf466bf262ab80b2b3f04055f8b  gpsd-3.23.tar.gz
 eb11fc19243d1789016d88eb7645bfe67c46304547781489bf36eb1dd4c252d523681ff835a6488fa0ef62b6b9e2f781c672279f4439f5d5640a3f214a113048  timepps.h
-b918e4b32a6e8bcd25d126e4f1a78dfdda30837a64e7d829f04b27e138843a1dbec83e64677edd6f88eca8cead511949ee664066de4429641ba248fe5a7768ef  gpsd-use-local-timepps-header.patch
-a0ec09823247def7b7cc5cdcc123d1ee8d5ab923b1cf7e400b6b8c35b8315e82c70f4d197dab0f3d3cba979c71c20a989617b3ca0725d4f8fa7c99c02f36ca0c  0001-workaround-for-scons-using-python2.patch
-e2af8f52fc2d7e663882b6d12c5f4d709aa267b16eb9aeca2a70d8ecc681ae72359f3efcd1636cde576bc8579e008f242574bc0adfab7252d3e763f039e86135  ttydefaults.patch
 a0e7bf206ad51c31195f86f79ef92adca425d7f988534c0f70a2dd3053613f6fc46820d62d0330aaef7ca100b5f2ab781ce9643f25b4c99c844ae66e7eec5cbc  gpsd.initd
-55d4a51f82d445d3ac93b2855132ef4380908ed045feba6298ed1d0b607cd9054b5325c024dc52b370983ebd5d9b377537aee7d7128c97aa22e3075f4134d404  gpsd.confd"
+55d4a51f82d445d3ac93b2855132ef4380908ed045feba6298ed1d0b607cd9054b5325c024dc52b370983ebd5d9b377537aee7d7128c97aa22e3075f4134d404  gpsd.confd
+"