0.0.8

2 files changed, 19 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 940ba43ce626..2e89d71bab4b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,22 @@
 pkgbase = grub-reboot-picker
 	pkgdesc = Tray application to reboot into different OSes or UEFI/BIOS
-	pkgver = 0.0.7
-	pkgrel = 2
+	pkgver = 0.0.8
+	pkgrel = 1
 	url = https://github.com/mendhak/grub-reboot-picker
 	arch = any
 	license = MIT
+	makedepends = python-build
+	makedepends = python-installer
 	makedepends = python-setuptools
+	makedepends = python-wheel
 	depends = python-gobject
 	depends = python-cairo
 	depends = libappindicator-gtk3
 	depends = grub
 	depends = polkit
-	source = grub-reboot-picker-0.0.7.tar.gz::https://github.com/mendhak/grub-reboot-picker/archive/v0.0.7.tar.gz
+	source = grub-reboot-picker-0.0.8.tar.gz::https://github.com/mendhak/grub-reboot-picker/archive/v0.0.8.tar.gz
 	source = setup.patch
-	sha256sums = 661c97686cd45556ef6b925a1aed3c405db399714329d78fdd94dd3a826d7ac9
+	sha256sums = 9a18eb1696f98f36d3e1887dc08f19634afc1409844edaaba6b0a80f86d8a2e9
 	sha256sums = 53697a6925981cf83c3c67fed1646fff9a3800ce43994f7da94526151b285bb2
 
 pkgname = grub-reboot-picker
diff --git a/PKGBUILD b/PKGBUILD
index f9d925d7752d..888b48ef01b0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,16 +1,16 @@
-# Maintainer: Mark Wagie <mark dot wagie at tutanota dot com>
+# Maintainer: Mark Wagie <mark dot wagie at proton dot me>
 pkgname=grub-reboot-picker
-pkgver=0.0.7
-pkgrel=2
+pkgver=0.0.8
+pkgrel=1
 pkgdesc="Tray application to reboot into different OSes or UEFI/BIOS"
 arch=('any')
 url="https://github.com/mendhak/grub-reboot-picker"
 license=('MIT')
 depends=('python-gobject' 'python-cairo' 'libappindicator-gtk3' 'grub' 'polkit')
-makedepends=('python-setuptools')
+makedepends=('python-build' 'python-installer' 'python-setuptools' 'python-wheel')
 source=("$pkgname-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz"
         'setup.patch')
-sha256sums=('661c97686cd45556ef6b925a1aed3c405db399714329d78fdd94dd3a826d7ac9'
+sha256sums=('9a18eb1696f98f36d3e1887dc08f19634afc1409844edaaba6b0a80f86d8a2e9'
             '53697a6925981cf83c3c67fed1646fff9a3800ce43994f7da94526151b285bb2')
 
 prepare() {
@@ -34,12 +34,17 @@ prepare() {
 
 build() {
   cd "$pkgname-$pkgver"
-  python setup.py build
+  python -m build --wheel --no-isolation
 }
 
 package() {
   cd "$pkgname-$pkgver"
-  python setup.py install --root="$pkgdir" --optimize=1 --skip-build
+  python -m installer --destdir="$pkgdir" dist/*.whl
+
+  local site_packages=$(python -c "import site; print(site.getsitepackages()[0])")
+  mv -v "${pkgdir}${site_packages}"/etc "$pkgdir/"
+  cp -rv "${pkgdir}${site_packages}"/usr/* "$pkgdir/usr/"
+  rm -rfv "${pkgdir}${site_packages}/usr"
 
   install -Dm644 LICENSE.md -t "$pkgdir/usr/share/licenses/$pkgname"
 }