onioncircuits: update to 0.6

2 files changed, 28 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e7bd2147b346..bd51a766e190 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,22 @@
 pkgbase = onioncircuits
 	pkgdesc = GTK application to display Tor circuits and streams
-	pkgver = 0.5
+	pkgver = 0.6
 	pkgrel = 1
 	url = https://git-tails.immerda.ch/onioncircuits
 	arch = any
 	license = GPL3
+	makedepends = git
+	makedepends = python-setuptools
+	makedepends = python-distutils-extra
+	depends = tor
+	depends = hicolor-icon-theme
 	depends = python>=3.4.2
 	depends = python-gobject>=3.14.0
-	depends = stem>=1.2.2
+	depends = python-stem>=1.2.2
 	depends = gobject-introspection
-	depends = python-distutils-extra
-	source = http://cdn-fastly.deb.debian.org/debian/pool/main/o/onioncircuits/onioncircuits_0.5.orig.tar.xz
-	sha256sums = 3ee331140fa6661bfd9191a0733a587e61a041bd196aec8d2a30c46fc2b08ea0
+	depends = python-pycountry
+	source = git+https://git-tails.immerda.ch/onioncircuits#commit=1355de00e8c1e944458a270cec1b1692ae69178a
+	sha256sums = SKIP
 
 pkgname = onioncircuits
 
diff --git a/PKGBUILD b/PKGBUILD
index b0aa920883ad..11f2841ba165 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,23 +1,30 @@
-# Maintainer: Michael J. Pento <mjpento@verizon.net>
+# Maintainer: Andrew Sun <adsun701@gmail.com>
+# Contributor: Michael J. Pento <mjpento@verizon.net>
 
 pkgname=onioncircuits
-pkgver=0.5
+pkgver=0.6
 pkgrel=1
 pkgdesc="GTK application to display Tor circuits and streams"
 arch=('any')
 url="https://git-tails.immerda.ch/onioncircuits"
 license=('GPL3')
-depends=('python>=3.4.2' 'python-gobject>=3.14.0' 'stem>=1.2.2' 'gobject-introspection' 'python-distutils-extra')
-source=("http://cdn-fastly.deb.debian.org/debian/pool/main/o/onioncircuits/${pkgname}_${pkgver}.orig.tar.xz")
-sha256sums=('3ee331140fa6661bfd9191a0733a587e61a041bd196aec8d2a30c46fc2b08ea0')
+depends=('tor' 'hicolor-icon-theme' 'python>=3.4.2' 'python-gobject>=3.14.0' 'python-stem>=1.2.2' 'gobject-introspection' 'python-pycountry')
+makedepends=('git' 'python-setuptools' 'python-distutils-extra')
+_commit=1355de00e8c1e944458a270cec1b1692ae69178a  # tags/0.6^0
+source=("git+https://git-tails.immerda.ch/onioncircuits#commit=${_commit}")
+sha256sums=('SKIP')
 
-build() {
-    cd ${pkgname}-${pkgver}
+pkgver() {
+  cd "${srcdir}/${pkgname}"
+  git describe --tags | sed 's/-/+/g'
+}
 
-    ./setup.py build
+build() {
+  cd "${srcdir}/${pkgname}"
+  python setup.py build
 }
-package() {
-    cd ${pkgname}-${pkgver}
 
-    ./setup.py install --root="${pkgdir}/"
+package() {
+  cd "${srcdir}/${pkgname}"
+  python setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 --skip-build
 }