main/gpsd: rebuild against scons 3.0.0_r1 and modernize

scons was rebuild to use python2 and it solves the build error
of this package. So rebuilding it.

1 files changed, 19 insertions, 45 deletions

diff --git a/main/gpsd/APKBUILD b/main/gpsd/APKBUILD
index a4d2355759..5bc1be8fe5 100644
--- a/main/gpsd/APKBUILD
+++ b/main/gpsd/APKBUILD
@@ -2,14 +2,12 @@
 # Maintainer: Nathan Angelacos <nangel@alpinelinux.org>
 pkgname=gpsd
 pkgver=3.16
-pkgrel=1
+pkgrel=2
 pkgdesc="A GPS daemon"
 arch=all
 url="http://catb.org/gpsd/"
 license="BSD"
-depends=""
 makedepends="scons python2-dev libcap-dev ncurses-dev"
-install=
 subpackages="$pkgname-dev"
 source="http://download-mirror.savannah.gnu.org/releases/gpsd/$pkgname-$pkgver.tar.gz
 	timepps.h
@@ -18,63 +16,39 @@ source="http://download-mirror.savannah.gnu.org/releases/gpsd/$pkgname-$pkgver.t
 	gpsd.initd
 	gpsd.confd"
 
-_builddir="$srcdir"/$pkgname-$pkgver
-
+builddir="$srcdir/$pkgname-$pkgver"
 
 prepare() {
-	local i
-
-    # We copy timepps.h to the local build directory instead of
-    # creating a pps-tools-dev package for ppstime.h
-    # (See https://github.com/ago/pps-tools)
-    mkdir -p "$_builddir"/sys
-    cp timepps.h "$_builddir"/sys/
-
-
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
+	# We copy timepps.h to the local build directory instead of
+	# creating a pps-tools-dev package for ppstime.h
+	# (See https://github.com/ago/pps-tools)
+	mkdir -p "$builddir"/sys
+	cp timepps.h "$builddir"/sys/
 
+	default_prepare
 }
 
 build() {
-	cd "$_builddir"
+	cd "$builddir"
         CPPFLAGS="-I. -DHAVE_SYS_TIMEPPS_H"
-	scons -j1 \
-		prefix=/usr \
-		|| return 1
+	scons -j1 prefix=/usr 
 }
 
 package() {
-    cd "$_builddir"
+	cd "$builddir"
 
-    mkdir -p "$pkgdir"/usr/lib
-    cp -a "$_builddir"/libgps*.so* "$pkgdir"/usr/lib/
+	mkdir -p "$pkgdir"/usr/lib
+	cp -a "$builddir"/libgps*.so* "$pkgdir"/usr/lib/
 
-    mkdir -p "$pkgdir"/usr/sbin
-    for a in gpsdecode gpsd gpsctl gpsdctl gpspipe; do
-     install -m755 -D "$_builddir/"$a "$pkgdir"/usr/sbin/
-    done
+	mkdir -p "$pkgdir"/usr/sbin
+	for a in gpsdecode gpsd gpsctl gpsdctl gpspipe; do
+		install -m755 -D "$builddir/"$a "$pkgdir"/usr/sbin/
+	done
 
-    install -m755 -D "$srcdir"/gpsd.initd "$pkgdir"/etc/init.d/gpsd
-    install -m644 -D "$srcdir"/gpsd.confd "$pkgdir"/etc/conf.d/gpsd
+	install -m755 -D "$srcdir"/gpsd.initd "$pkgdir"/etc/init.d/gpsd
+	install -m644 -D "$srcdir"/gpsd.confd "$pkgdir"/etc/conf.d/gpsd
 }
 
-md5sums="68691b5de4c94f82ec4062b042b5eb63  gpsd-3.16.tar.gz
-28f6835098a216f4a620f9218d15b5b8  timepps.h
-940780c04830eb08ae29276da1de8925  gpsd-use-local-timepps-header.patch
-5189a0776250acda819286e1336ac8c6  ttydefaults.patch
-8bb3f9c4c7913bd12006e3af42782246  gpsd.initd
-453f3d1d75d2b048f0987cfb9cf250fd  gpsd.confd"
-sha256sums="03579af13a4d3fe0c5b79fa44b5f75c9f3cac6749357f1d99ce5d38c09bc2029  gpsd-3.16.tar.gz
-ab4f459ee9d1037d7fa962a66ea652b08935539a4f443dc216e82b5717d8bb22  timepps.h
-4857faaf2d0f69b5b91c32f1813ffd01c435677e73aab2ff8125c373cdc9c048  gpsd-use-local-timepps-header.patch
-d42d323425eae828d5685b058a81ff1bb6e82ab695ea3e80c2fff18f0c8cc302  ttydefaults.patch
-723d2d644421a9974579fd409f19370f7db6a9df42be72df40f60246a6365963  gpsd.initd
-218a7f044f902070922c45f3b543c9ff6af25be5305648899565c1fbdc0d5da9  gpsd.confd"
 sha512sums="a8ad85a1f17d3ea550a4b99c262e47a834ed8fd16b00e10574f7cf5f34b6c506142aa77a870a61f8827c0d0c88fe7f65f6e916089d64e84c5667d4a2ca89c543  gpsd-3.16.tar.gz
 eb11fc19243d1789016d88eb7645bfe67c46304547781489bf36eb1dd4c252d523681ff835a6488fa0ef62b6b9e2f781c672279f4439f5d5640a3f214a113048  timepps.h
 1802e72c9ac71a162fcd37d99dc9c8596b6085180dba9b37f24f2b17344d16cd5f618228f43bfdc2f7509f9a2f1072c2b11c238486febcdb94d9d0d095eaebdd  gpsd-use-local-timepps-header.patch