Fixed download, build and packaging issues.

2 files changed, 61 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 037d4b37777b..6b03d26f9c85 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,24 @@
-# Generated by mksrcinfo v8
-# Sun Aug  6 19:52:38 UTC 2017
 pkgbase = zget-git
-	pkgdesc = Zeroconf based peer to peer file transfer
-	pkgver = 0.11.1.r18.g0e4309e
+	pkgdesc = Zeroconf based peer to peer file transfer.
+	pkgver = 0.11.1+18.r135.20170727.0e4309e
 	pkgrel = 1
 	url = https://github.com/nils-werner/zget
 	arch = any
 	license = MIT
 	makedepends = git
-	makedepends = python-setuptools
-	depends = python
+	makedepends = python-babel
+	makedepends = python-build
+	makedepends = python-installer
+	makedepends = python-wheel
+	depends = python>=3
 	depends = python-netifaces
 	depends = python-progressbar
 	depends = python-requests
+	depends = python-six
 	depends = python-zeroconf
-	provides = zget
+	provides = zget=0.11.1+18.r135.20170727.0e4309e
 	conflicts = zget
-	source = git://github.com/nils-werner/zget.git
+	source = zget::git+https://github.com/nils-werner/zget.git
 	sha256sums = SKIP
 
 pkgname = zget-git
-
diff --git a/PKGBUILD b/PKGBUILD
index 44b057a88723..b7be8c19ab54 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,37 +1,74 @@
-# Maintainer: Maxim Andersson <thesilentboatman@gmail.com>
+# Maintainer:  dreieck
+# Contributor: Maxim Andersson
 
 pkgname=zget-git
 _gitname=zget
-pkgver=0.11.1.r18.g0e4309e
+pkgver=0.11.1+18.r135.20170727.0e4309e
 pkgrel=1
-pkgdesc="Zeroconf based peer to peer file transfer"
+pkgdesc="Zeroconf based peer to peer file transfer."
 arch=('any')
 url="https://github.com/nils-werner/zget"
 license=('MIT')
-depends=('python' 'python-netifaces' 'python-progressbar' 'python-requests' 'python-zeroconf')
-makedepends=('git' 'python-setuptools')
-provides=('zget')
+depends=(
+  'python>=3'
+  'python-netifaces'
+  'python-progressbar'
+  'python-requests'
+  'python-six'
+  'python-zeroconf'
+)
+makedepends=(
+  'git'
+  'python-babel'
+  'python-build'
+  'python-installer'
+  'python-wheel'
+)
+provides=("zget=${pkgver}")
 conflicts=('zget')
-source=('git://github.com/nils-werner/zget.git')
+source=('zget::git+https://github.com/nils-werner/zget.git')
 sha256sums=('SKIP')
 
-pkgver() {
-  cd "${srcdir}/${_gitname}"
-  git describe --long --tags | sed -r 's/([^-]*-g)/r\1/;s/-/./g'
-}
-
 prepare() {
   cd "${srcdir}/${_gitname}"
 
   # Remove unneeded limitations (on Arch)
   sed -i 's/<......//' setup.py
+
+  git log > git.log
+}
+
+pkgver() {
+  cd "${srcdir}/${_gitname}"
+
+  _ver="$(git describe --tags | sed 's|^[vV]||' | sed 's|-[^-]*$||' | tr '-' '+')"
+  _rev="$(git rev-list --count HEAD)"
+  _date="$(git log -1 --date=format:"%Y%m%d" --format="%ad")"
+  _hash="$(git rev-parse --short HEAD)"
+
+  if [ -z "${_ver}" ]; then
+    error "Version could not be determined."
+    return 1
+  else
+    printf '%s' "${_ver}.r${_rev}.${_date}.${_hash}"
+  fi
+}
+
+build() {
+  cd "${srcdir}/${_gitname}"
+  python -m build --wheel --no-isolation
 }
 
 package() {
   cd "${srcdir}/${_gitname}"
 
-  install -Dm644 LICENSE -t "${pkgdir}/usr/share/licenses/${_gitname}"
-  python setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1
+  python -m installer --destdir="$pkgdir" dist/*.whl
+
+  for _docfile in CHANGELOG README.md git.log; do
+    install -Dvm644 "${_docfile}" "${pkgdir}/usr/share/doc/zget/${_docfile}"
+  done
+  install -Dvm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  ln -svr "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" "${pkgdir}/usr/share/doc/zget/LICENSE"
 }
 
 # vim:set ts=2 sw=2 et: