update to 0.60.1

3 files changed, 40 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 49a8dd5d6130..7f4fcccdbc22 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,19 @@
 pkgbase = python-oletools
 	pkgdesc = Python tools to analyze security characteristics of MS Office and OLE files
-	pkgver = 0.56
+	pkgver = 0.60.1
 	pkgrel = 1
 	url = https://github.com/decalage2/oletools
 	arch = any
 	license = BSD
-	depends = python
+	makedepends = python-build
+	makedepends = python-installer
+	makedepends = python-setuptools
+	makedepends = python-wheel
 	depends = python-colorclass
 	depends = python-easygui
 	depends = python-pyparsing
 	depends = python-msoffcrypto-tool
-	source = https://github.com/decalage2/oletools/releases/download/v0.56/oletools-0.56.tar.gz
-	sha512sums = dc6dd56f39dd07c7672f6df9372a9114935db1a0d4c080eeacf9e94058548dee03fd55b6aa0ac892264c75e4b0893e804f2b6b8e8ded8d18b18ad6671b6d5c10
+	source = python-oletools-0.60.1.zip::https://files.pythonhosted.org/packages/source/o/oletools/oletools-0.60.1.zip
+	sha256sums = 67a796da4c4b8e2feb9a6b2495bef8798a3323a75512de4e5669d9dc9d1fae31
 
 pkgname = python-oletools
-
diff --git a/Makefile b/Makefile
deleted file mode 100644
index b2defd1b633b..000000000000
--- a/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-all: .SRCINFO package
-
-clean:
-	rm -rf pkg src *.gem *.pkg.* *.gz
-
-.SRCINFO: PKGBUILD
-	makepkg --printsrcinfo > .SRCINFO
-
-package:
-	makepkg -s
diff --git a/PKGBUILD b/PKGBUILD
index 61e5b9f45ed6..32a0e78145e6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,20 +1,19 @@
-# Maintainer: Brad Ackerman <brad[at]facefault.org>
+# Maintainer: Luis Martinez <luis dot martinez at disroot dot org>
+# Contributor: Brad Ackerman <brad[at]facefault.org>
 # Contributor: Christian Rebischke <chris.rebischke[at]archlinux[dot]org>
-_pyname=oletools
+
 pkgname=python-oletools
-pkgver=0.56
+_pkg="${pkgname#python-}"
+pkgver=0.60.1
 pkgrel=1
 pkgdesc="Python tools to analyze security characteristics of MS Office and OLE files"
-depends=('python'
-         'python-colorclass'
-         'python-easygui'
-         'python-pyparsing'
-         'python-msoffcrypto-tool')
 arch=('any')
 url="https://github.com/decalage2/oletools"
 license=('BSD')
-source=("https://github.com/decalage2/oletools/releases/download/v${pkgver}/${_pyname}-${pkgver}.tar.gz")
-sha512sums=('dc6dd56f39dd07c7672f6df9372a9114935db1a0d4c080eeacf9e94058548dee03fd55b6aa0ac892264c75e4b0893e804f2b6b8e8ded8d18b18ad6671b6d5c10')
+depends=('python-colorclass' 'python-easygui' 'python-pyparsing' 'python-msoffcrypto-tool')
+makedepends=('python-build' 'python-installer' 'python-setuptools' 'python-wheel')
+source=("$pkgname-$pkgver.zip::https://files.pythonhosted.org/packages/source/o/$_pkg/$_pkg-$pkgver.zip")
+sha256sums=('67a796da4c4b8e2feb9a6b2495bef8798a3323a75512de4e5669d9dc9d1fae31')
 
 # Some checks failing; will investigate. -BA 20190616
 # check() {
@@ -22,12 +21,31 @@ sha512sums=('dc6dd56f39dd07c7672f6df9372a9114935db1a0d4c080eeacf9e94058548dee03f
 #   python3 setup.py test
 # }
 
+prepare() {
+  cd "$_pkg-$pkgver"
+  sed -i '167,193c\package_data = {}' setup.py
+}
+
+build() {
+  cd "$_pkg-$pkgver"
+  python -m build --wheel --no-isolation
+}
+
 package() {
-  cd "${srcdir}/${_pyname}-${pkgver}"
-  python3 setup.py install -O1 --root="${pkgdir}"
-  install -Dm 644 ${_pyname}/LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-  install -Dm 644 README.md "${pkgdir}/usr/share/doc/${pkgname}/README"
-  cp ${_pyname}/doc/* "${pkgdir}/usr/share/doc/${pkgname}"
+  cd "$_pkg-$pkgver"
+  PYTHONHASHSEED=0 python -m installer --destdir="$pkgdir" dist/*.whl
+  install -Dm644 \
+    "$_pkg/LICENSE.txt" \
+    "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  install -Dm644 \
+    "$_pkg/thirdparty/xglob/LICENSE.txt" \
+    "$pkgdir/usr/share/licenses/$pkgname/thirdparty/xglob/LICENSE"
+  install -Dm644 \
+    "$_pkg/thirdparty/xxxswf/LICENSE.txt" \
+    "$pkgdir/usr/share/licenses/$pkgname/thirdparty/xxxswf/LICENSE"
+  install -Dm644 \
+    "$_pkg/thirdparty/prettytable/COPYING" \
+    "$pkgdir/usr/share/licenses/$pkgname/thirdparty/prettytable/LICENSE"
 }
 
 # vim:set et sw=2 ts=2 tw=79: