fix build

5 files changed, 60 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b4555ada3ac3..83462422b803 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,18 @@
 pkgbase = python-usbtmc
 	pkgdesc = A Python USBTMC driver for controlling instruments over USB.
 	pkgver = 0.8
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/python-ivi/python-usbtmc
-	arch = any
+	install = python-usbtmc.install
+	arch = x86_64
 	license = MIT
+	makedepends = python-build
+	makedepends = python-installer
+	makedepends = python-wheel
+	depends = python-pyusb
 	source = python-usbtmc-0.8.tar.gz::https://github.com/python-ivi/python-usbtmc/archive/v0.8.tar.gz
+	source = python-usbtmc.sysusers
 	sha256sums = dc13aa4ae0c0e4545e2ef83ae181d08528de176ee1522e6d66856449cf91c491
+	sha256sums = 3813bed7349a402231d291fe747cbe4b535081b8d39c33427701983a6bf08074
 
 pkgname = python-usbtmc
-	depends = python
-	depends = python-pyusb
-
-pkgname = python2-usbtmc
-	depends = python2
-	depends = python2-pyusb
-
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..27fd112126d4
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+src/
+pkg/
+*.tar.gz
diff --git a/PKGBUILD b/PKGBUILD
index 68860b2380be..b54fd1f6f9fb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,27 +1,53 @@
-# Maintainer: Alex Forencich <alex@alexforencich.com>
-pkgname=(python-usbtmc python2-usbtmc)
+pkgname=python-usbtmc
 pkgver=0.8
-pkgrel=1
+pkgrel=2
 pkgdesc="A Python USBTMC driver for controlling instruments over USB."
-arch=('any')
+arch=('x86_64')
 url="https://github.com/python-ivi/python-usbtmc"
-license=('MIT')
+license=(MIT)
+depends=(
+python-pyusb
+)
+makedepends=(
+python-build
+python-installer
+python-wheel
+)
+install=python-usbtmc.install
 
-source=("python-usbtmc-$pkgver.tar.gz::https://github.com/python-ivi/python-usbtmc/archive/v$pkgver.tar.gz")
-sha256sums=('dc13aa4ae0c0e4545e2ef83ae181d08528de176ee1522e6d66856449cf91c491')
+source=(
+"python-usbtmc-${pkgver}.tar.gz::https://github.com/python-ivi/python-usbtmc/archive/v${pkgver}.tar.gz"
+python-usbtmc.sysusers
+)
+sha256sums=('dc13aa4ae0c0e4545e2ef83ae181d08528de176ee1522e6d66856449cf91c491'
+            '3813bed7349a402231d291fe747cbe4b535081b8d39c33427701983a6bf08074')
 
-package_python-usbtmc() {
-  depends=('python' 'python-pyusb')
+build(){
+    cd python-usbtmc-${pkgver}
 
-  cd "$srcdir/python-usbtmc-$pkgver"
-  python setup.py install --prefix=/usr --root="$pkgdir/" --optimize=1
-
-  install -m 0644 -D usbtmc.rules $pkgdir/etc/udev/rules.d/40-usbtmc.rules
+    python -m build --wheel --no-isolation
 }
 
-package_python2-usbtmc() {
-  depends=('python2' 'python2-pyusb')
+package(){
+    cd python-usbtmc-${pkgver}
+
+    python -m installer --destdir="${pkgdir}" dist/*.whl
 
-  cd "$srcdir/python-usbtmc-$pkgver"
-  python2 setup.py install --prefix=/usr --root="$pkgdir/" --optimize=1
+    install -Dm 644 "${srcdir}"/python-usbtmc.sysusers "${pkgdir}"/usr/lib/sysusers.d/python-usbtmc.conf
+    install -m 0644 -D usbtmc.rules "${pkgdir}"/etc/udev/rules.d/40-usbtmc.rules
+    msg2 "Users might need to be added to the the usbtmc group to avoid permissions issues"
 }
+
+#package() {
+#  cd "$srcdir/python-usbtmc-$pkgver"
+#  python setup.py install --prefix=/usr --root="$pkgdir/" --optimize=1
+#
+#  install -m 0644 -D usbtmc.rules $pkgdir/etc/udev/rules.d/40-usbtmc.rules
+#}
+
+#package_python2-usbtmc() {
+#  depends=('python2' 'python2-pyusb')
+#
+#  cd "$srcdir/python-usbtmc-$pkgver"
+#  python2 setup.py install --prefix=/usr --root="$pkgdir/" --optimize=1
+#}
diff --git a/python-usbtmc.install b/python-usbtmc.install
new file mode 100644
index 000000000000..58eac9e74f71
--- /dev/null
+++ b/python-usbtmc.install
@@ -0,0 +1,4 @@
+post_install() {
+  echo "NOTE: To use python-usbtmc as normal user you have to add yourself to the usbtmc group"
+}
+
diff --git a/python-usbtmc.sysusers b/python-usbtmc.sysusers
new file mode 100644
index 000000000000..f7e9b95b6267
--- /dev/null
+++ b/python-usbtmc.sysusers
@@ -0,0 +1 @@
+g usbtmc - - -