Update to PEP 517

3 files changed, 59 insertions, 34 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0f948969f15d..1ba22b064c24 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,28 +1,31 @@
 pkgbase = qomui
-	pkgdesc = OpenVPN Gui with advanced features and support for multiple providers
+	pkgdesc = Qt OpenVPN Management UI
 	pkgver = 0.8.2
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/corrad1nho/qomui
-	install = qomui.install
 	arch = x86_64
-	license = GPL3
+	license = GPL-3.0-or-later
+	makedepends = git
+	makedepends = python-build
+	makedepends = python-installer
 	makedepends = python-setuptools
-	depends = python
-	depends = python-pyqt5
-	depends = python-dbus
-	depends = openvpn
-	depends = stunnel
+	makedepends = python-wheel
 	depends = bind-tools
-	depends = dnsmasq
-	depends = geoip
-	depends = python-psutil
-	depends = python-requests
-	depends = python-lxml
+	depends = openvpn
 	depends = python-beautifulsoup4
-	depends = python-pexpect
-	depends = libcgroup
-	depends = wireguard-tools
 	depends = python-cryptography
+	depends = python-dbus
+	depends = python-lxml
+	depends = python-pexpect
+	depends = python-psutil
+	depends = python-pyqt5
+	depends = python-requests
+	depends = stunnel
+	optdepends = dnsmasq: bypass OpenVPN
+	optdepends = geoip: identify server locations
+	optdepends = libcgroup: bypass OpenVPN
+	optdepends = openresolv: wireguard
+	optdepends = wireguard-tools: wireguard
 	source = https://github.com/corrad1nho/qomui/archive/v0.8.2.tar.gz
 	sha256sums = 78187864a4368fed06f6e58c4d411053a1d1193d625ee79be0a57bf0938b1d0b
 
diff --git a/PKGBUILD b/PKGBUILD
index 1aed7e59ed81..2b399fbd2c64 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,27 +1,52 @@
+# Maintainer:
 # Contributor: corrad1nho <corrado@posteo.net>
 
 pkgname=qomui
 pkgver=0.8.2
-pkgrel=2
-pkgdesc="OpenVPN Gui with advanced features and support for multiple providers"
-arch=("x86_64")
+pkgrel=3
+pkgdesc="Qt OpenVPN Management UI"
 url="https://github.com/corrad1nho/qomui"
-license=("GPL3")
-depends=(python python-pyqt5 python-dbus openvpn stunnel bind-tools dnsmasq geoip python-psutil python-requests python-lxml python-beautifulsoup4 python-pexpect libcgroup wireguard-tools python-cryptography)
-makedepends=(python-setuptools)
-install=qomui.install
+license=("GPL-3.0-or-later")
+arch=("x86_64")
+
+depends=(
+  'bind-tools'
+  'openvpn'
+  'python-beautifulsoup4'
+  'python-cryptography'
+  'python-dbus'
+  'python-lxml'
+  'python-pexpect'
+  'python-psutil'
+  'python-pyqt5'
+  'python-requests'
+  'stunnel'
+)
+makedepends=(
+  'git'
+  'python-build'
+  'python-installer'
+  'python-setuptools'
+  'python-wheel'
+)
+optdepends=(
+  'dnsmasq: bypass OpenVPN'
+  'geoip: identify server locations'
+  'libcgroup: bypass OpenVPN'
+  'openresolv: wireguard'
+  'wireguard-tools: wireguard'
+)
+
+_pkgsrc="$pkgname-$pkgver"
 source=("https://github.com/corrad1nho/qomui/archive/v$pkgver.tar.gz")
 sha256sums=("78187864a4368fed06f6e58c4d411053a1d1193d625ee79be0a57bf0938b1d0b")
 
 build() {
-	cd "$pkgname-$pkgver"
-	python setup.py build
+  cd "$_pkgsrc"
+  python -m build --wheel --no-isolation
 }
 
 package() {
-	cd "$pkgname-$pkgver"
-	python setup.py install --root="$pkgdir" --optimize=1
-	echo -e "$pkgver\nAUR" > $pkgdir/usr/share/qomui/VERSION
+  cd "$_pkgsrc"
+  python -m installer --destdir="$pkgdir" dist/*.whl
 }
-
-
diff --git a/qomui.install b/qomui.install
deleted file mode 100644
index 208973620b2b..000000000000
--- a/qomui.install
+++ /dev/null
@@ -1,3 +0,0 @@
-post_remove() {
-  /usr/bin/rm -rf /usr/share/qomui
-}