Update PKGBUILD and SRCINFO

- As recommended by yochananmarqos

2 files changed, 39 insertions, 46 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 60cff10d521f..f58bfe1f8a85 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,18 @@
 pkgbase = hushboard-git
 	pkgdesc = Mute your microphone while typing.
-	pkgver = r02.223b6f9
-	pkgrel = 0
-	url = https://github.com/stuartlangridge/hushboard
+	pkgver = r34.223b6f9
+	pkgrel = 1
+	url = https://kryogenix.org/code/hushboard
 	arch = any
 	license = MIT
-	makedepends = python-pip
-	makedepends = python-wheel
+	makedepends = setconf
+	makedepends = python-setuptools
 	makedepends = git
-	depends = python
 	depends = libappindicator-gtk3
 	depends = python-gobject
 	depends = python-xlib
-	depends = gtk3
-	provides = hushboard
-	conflicts = hushboard
+	provides = hushboard-git
+	conflicts = hushboard-git
 	source = git+https://github.com/stuartlangridge/hushboard
 	source = LICENSE
 	md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 750e37675db4..6c7fe85e3a96 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,46 +1,41 @@
 # Maintainer: Jeffrey Bouter <aur@kn0x.org>
-
-export PIP_CONFIG_FILE=/dev/null
-export PIP_DISABLE_PIP_VERSION_CHECK=true
-
 pkgname=hushboard-git
-_pkgname=hushboard
-epoch=
-pkgver=r02.223b6f9
-pkgrel=0
-pkgdesc='Mute your microphone while typing.'
-arch=(any)
-url="https://github.com/stuartlangridge/$_pkgname"
-license=(MIT)
-depends=(python libappindicator-gtk3 python-gobject python-xlib gtk3)
-## EXTRA_DEPENDS ##
-makedepends=(python-pip python-wheel git)
-checkdepends=()
-provides=("$_pkgname")
-conflicts=(${provides%=*})  # No quotes, to avoid an empty entry.
-noextract=()
-source+=("git+https://github.com/stuartlangridge/$_pkgname.git")
-md5sums+=(SKIP)
-source+=(LICENSE)
-md5sums+=(3ce314c6b503c298b2ebba2d176915a4)
+pkgver=r34.223b6f9
+pkgrel=1
+pkgdesc="Mute your microphone while typing."
+arch=('any')
+url="https://kryogenix.org/code/hushboard"
+license=('MIT')
+depends=('python-gobject' 'python-xlib' 'libappindicator-gtk3')
+makedepends=('git' 'python-setuptools' 'setconf')
+provides=("${pkgname%-git}")
+conflicts=("${pkgname%-git}")
+source=('git+https://github.com/stuartlangridge/hushboard.git')
+sha256sums=('SKIP')
 
-pkgver()
-{
-  cd "$_pkgname"
-  echo $(git rev-list --count HEAD).$(git rev-parse --short HEAD)
+pkgver() {
+  cd "$srcdir/${pkgname%-git}"
+  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
-package()
-{
-  cd "$_pkgname"
-  python setup.py install --root="$pkgdir"
+prepare() {
+  cd "$srcdir/${pkgname%-git}"
+  setconf "snap/gui/${pkgname%-git}.desktop" Icon hushboard
+}
 
-  # Install the icon
-  install -Dm644 "$srcdir/$_pkgname/hushboard-512.png" "$pkgdir/usr/share/icons/hushboard-512.png"
+build() {
+  cd "$srcdir/${pkgname%-git}"
+  python setup.py build
+}
 
-  # Replace the icon path from SNAP to system location
-  sed -i 's/Icon=.*/Icon=\/usr\/share\/icons\/hushboard-512.png/g' "$srcdir/$_pkgname/snap/gui/hushboard.desktop"
+package() {
+  cd "$srcdir/${pkgname%-git}"
+  export PYTHONHASHSEED=0
+  python setup.py install --root="$pkgdir" --optimize=1 --skip-build
 
-  # Install the desktop file
-  install -Dm644 "$srcdir/$_pkgname/snap/gui/hushboard.desktop" "$pkgdir/usr/share/applications/hushboard.desktop"
+  install -Dm644 LICENSE -t "$pkgdir/usr/share/licenses/${pkgname%-git}"
+  install -Dm644 "${pkgname%-git}-512.png" \
+    "$pkgdir/usr/share/pixmaps/${pkgname%-git}.png"
+  install -Dm644 "snap/gui/${pkgname%-git}.desktop" -t \
+    "$pkgdir/usr/share/applications"
 }