3dsconv: update to 4.2

2 files changed, 25 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4cd29626edeb..cac0f6920df4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,14 @@
 pkgbase = 3dsconv
-	pkgdesc = Tool to convert Nintendo 3DS CTR Cart Image files (CCI, ".3ds") to the CTR Importable Archive format (CIA).
-	pkgver = 4.1
-	pkgrel = 0
+	pkgdesc = Convert Nintendo 3DS files to the CIA format
+	pkgver = 4.2
+	pkgrel = 1
 	url = https://github.com/ihaveamac/3dsconv
 	arch = any
 	license = MIT
-	makedepends = tar
-	depends = python2
-	optdepends = python2-crypto: support for zerokey-encryption
-	provides = 3dsconv
-	options = !strip
-	source = https://github.com/ihaveamac/3dsconv/archive/v4.1.tar.gz
-	sha256sums = bacb1d19fbdd875cafce5302f594568c7766d8670ea932b363d6af7b1f5b5b07
+	makedepends = python-setuptools
+	depends = python-pyaes
+	source = 3dsconv-4.2.tar.gz::https://github.com/ihaveamac/3dsconv/archive/v4.2.tar.gz
+	sha256sums = 3e8d15f22a81189cb24459e3bd659b38e9f92ae957a4fae6f00af194ba0645f7
 
 pkgname = 3dsconv
 
diff --git a/PKGBUILD b/PKGBUILD
index 048089b31e8e..21a597f815b8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,27 +1,25 @@
-# Maintainer: yubimusubi
-pkgname=('3dsconv')
-provides=('3dsconv')
-pkgver=4.1
-pkgrel=0
-pkgdesc='Tool to convert Nintendo 3DS CTR Cart Image files (CCI, ".3ds") to the CTR Importable Archive format (CIA).'
+# Maintainer: Andrew Sun <adsun701 at gmail dot com>
+# Contributor: yubimusubi <possum plus aur at possum dot cc>
+
+pkgname=3dsconv
+pkgver=4.2
+pkgrel=1
+pkgdesc='Convert Nintendo 3DS files to the CIA format'
 arch=('any')
 url="https://github.com/ihaveamac/3dsconv"
 license=('MIT')
-depends=('python2')
-optdepends=('python2-crypto: support for zerokey-encryption')
-makedepends=('tar')
-options=('!strip')
-
-source=(
-    "https://github.com/ihaveamac/3dsconv/archive/v$pkgver.tar.gz"
-)
+depends=('python-pyaes')
+makedepends=('python-setuptools')
+source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/ihaveamac/3dsconv/archive/v${pkgver}.tar.gz")
+sha256sums=('3e8d15f22a81189cb24459e3bd659b38e9f92ae957a4fae6f00af194ba0645f7')
 
-sha256sums=(
-     'bacb1d19fbdd875cafce5302f594568c7766d8670ea932b363d6af7b1f5b5b07'
-)
+build(){
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  python setup.py build
+}
 
 package() {
-    cd "$pkgname-$pkgver"
-    install -d "$pkgdir/usr/bin/"
-    install "3dsconv.py" "$pkgdir/usr/bin/3dsconv"
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  python setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 --skip-build
+  install -Dm644 "${srcdir}/${pkgname}-${pkgver}/LICENSE.md" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.md"
 }