Update viking-git according to VCS package guidelines

2 files changed, 23 insertions, 47 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0cb6d883a123..bc5748903870 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,28 +1,29 @@
-# Generated by makepkg 5.1.3
-# Wed Jul  3 10:43:03 UTC 2019
 pkgbase = viking-git
 	pkgdesc = GTK+2 application to manage GPS data
-	pkgver = 1.7.r46.gbdb31987
+	pkgver = 1.8.r352.gc66ef1c6
 	pkgrel = 1
 	url = https://viking-gps.github.io/
 	arch = x86_64
 	license = GPL2
+	makedepends = git
 	makedepends = boost
-	makedepends = gnome-doc-utils
-	makedepends = intltool
 	makedepends = gtk-doc
-	makedepends = jq
+	makedepends = intltool
+	makedepends = yelp-tools
 	depends = curl
 	depends = file
 	depends = gpsd
 	depends = gtk2
 	depends = libgexiv2
 	depends = mapnik
+	depends = geoclue
 	depends = liboauth
+	depends = libzip
 	optdepends = gpsbabel: import and export GPS tracks from various formats
-	provides = viking=1.7.r46.gbdb31987
+	provides = viking=1.8.r352.gc66ef1c6
 	conflicts = viking
-	source = https://github.com/viking-gps/viking/archive/master.tar.gz
+	options = !emptydirs
+	source = git+https://github.com/viking-gps/viking.git
 	sha256sums = SKIP
 
 pkgname = viking-git
diff --git a/PKGBUILD b/PKGBUILD
index 4789069acb49..e8c5156f30ef 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,72 +1,47 @@
-# Maintainer: Nikolay Korotkiy <sikmir@gmail.com>
+# Maintainer: Manuel Reimer <manuel.reimer@gmx.de>
+# Contributor: Nikolay Korotkiy <sikmir@gmail.com>
 # Contributor: Jaroslav Lichtblau <svetlemodry@archlinux.org>
 # Contributor: Nick Østergaard <oe.nick@gmail.com>
 # Contributor: Jonny Gerold <jonny@fsk141.com>
-_orgname=viking-gps
 _pkgname=viking
-_branch=master
-_use_gh_api=true
-_gh_api_url="https://api.github.com/repos/${_orgname}/${_pkgname}"
 pkgname=${_pkgname}-git
-pkgver=1.7.r46.gbdb31987
+pkgver=1.8.r352.gc66ef1c6
 pkgrel=1
 pkgdesc='GTK+2 application to manage GPS data'
 arch=(x86_64)
 url='https://viking-gps.github.io/'
 license=('GPL2')
-depends=('curl' 'file' 'gpsd' 'gtk2' 'libgexiv2' 'mapnik' 'liboauth')
-makedepends=('boost' 'gnome-doc-utils' 'intltool' 'gtk-doc')
-if [ "${_use_gh_api}" = true ]; then
-  makedepends+=('jq')
-else
-  makedepends+=('git')
-fi
+depends=('curl' 'file' 'gpsd' 'gtk2' 'libgexiv2' 'mapnik' 'geoclue' 'liboauth' 'libzip')
+makedepends=('git' 'boost' 'gtk-doc' 'intltool' 'yelp-tools')
 optdepends=('gpsbabel: import and export GPS tracks from various formats')
+options=('!emptydirs')
 provides=("${pkgname//-git}=${pkgver}")
-conflicts=(${pkgname//-git})
-if [ "${_use_gh_api}" = true ]; then
-  source=("https://github.com/${_orgname}/${_pkgname}/archive/${_branch}.tar.gz")
-else
-  source=("${_pkgname}-${_branch}::git://github.com/${_orgname}/${_pkgname}.git#branch=${_branch}")
-fi
+conflicts=($_pkgname)
+source=("git+https://github.com/viking-gps/viking.git")
 sha256sums=('SKIP')
 
 pkgver() {
-  if [ "${_use_gh_api}" = true ]; then
-    read -r tag_name tag_sha <<<$(curl -s "${_gh_api_url}/tags" | \
-      jq -r '.[0]|[.name,.commit.sha]|@sh' | sed "s/'//g")
-    head=$(curl -s "${_gh_api_url}/git/refs/heads/${_branch}" | \
-      jq -r '.object.sha')
-    count=$(curl -s "${_gh_api_url}/compare/${tag_sha}...${head}" | \
-      jq -r '.total_commits')
-
-    printf "%s.r%s.g%.8s" "${tag_name#viking-}" "${count}" "${head}"
-  else
-    cd ${_pkgname}-${_branch}
-    git describe --long | sed 's/viking-//;s/\([^-]*-g\)/r\1/;s/-/./g'
-  fi
+  cd "$_pkgname"
+  git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/^viking\.//'
 }
 
 prepare() {
-  cd ${_pkgname}-${_branch}
+  cd "$_pkgname"
 
   export NOCONFIGURE=yes
   ./autogen.sh
 }
 
 build() {
-  cd ${_pkgname}-${_branch}
+  cd "$_pkgname"
 
   export CXXFLAGS="$CXXFLAGS -I/usr/include/mapnik"
-  ./configure \
-    --prefix=/usr \
-    --enable-expedia \
-    --enable-geocaches
+  ./configure --prefix=/usr --enable-geocaches
   make
 }
 
 package(){
-  cd ${_pkgname}-${_branch}
+  cd "$_pkgname"
 
   make DESTDIR="${pkgdir}" install
 }