v1.1.3

1 files changed, 40 insertions, 22 deletions

diff --git a/PKGBUILD b/PKGBUILD
index c7175461fcf3..7b103f277a19 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,46 +1,64 @@
 _name=pyjnius
 pkgbase=python-$_name
 pkgname=(python2-$_name python-$_name)
-pkgver=1.1.1
+pkgver=1.1.3
 pkgrel=1
 pkgdesc='Python module to access Java class as Python class, using JNI.'
 arch=(any)
 url="https://github.com/kivy/$_name"
-license=(LGPL3)
+license=(MIT)
 source=("$_name-$pkgver.tar.gz::https://github.com/kivy/$_name/tarball/$pkgver")
-md5sums=(2d457e4761b27e6760cf54efb6201f17)
+sha256sums=('f497c1f48bbf57ab1cad5c63cfabbd30585d471d87a7307f35b3a3e4fc0b99df')
+makedepends=(
+    cython  python-setuptools
+    cython2 python2-setuptools
+)
 
 prepare() {
-	[[ ! -d "python-$_name-$pkgver"  ]] && mv "kivy-$_name-"* "python-$_name-$pkgver" || true
-	[[ ! -d "python2-$_name-$pkgver" ]] && cp -r python{,2}-"$_name-$pkgver" || true
+	rm -rf "$srcdir"/python{,2}-"$_name-$pkgver"
+	# root directory of tar is (e.g.) kivy-pyjnius-a7e791a
+	mv kivy-pyjnius-* "$srcdir/python-$_name-$pkgver"
+	# They want to install their setup script, wtf?
+	sed -i "s/, 'setup'//" "$srcdir/python-$_name-$pkgver/setup_sdist.py"
+	cp -a "$srcdir"/python{,2}-"$_name-$pkgver"
 }
 
-build() {
-	local python=${pkgname%%-*}
-	cd "$pkgname-$pkgver"
+build_() {
+	local python=$1
+	cd "$srcdir/$python-$_name-$pkgver"
 	
 	$python setup.py build_ext --inplace -f
 	$python setup.py build
 }
-
-package_python2-pyjnius() {
-	depends=(java-environment python2)
-	makedepends=(cython2)
-	package_ python2
+build() {
+	build_ python
+	build_ python2
 }
 
-package_python-pyjnius() {
-	depends=(java-environment python)
-	makedepends=(cython)
-	package_ python
+
+check_() {
+	local python=$1
+	cd "$srcdir/$python-$_name-$pkgver"
+	$python setup.py test
+}
+check_python-pyjnius() {
+	check_ python
+}
+check_python2-pyjnius() {
+	check_ python2
 }
 
 package_() {
 	local python=$1
-	local pyver=$($python -c 'import sys; print(".".join(map(str, sys.version_info[:2])))')
-	export PYTHONPATH="$pkgdir/usr/lib/python$pyver/site-packages"
-	mkdir -p "$PYTHONPATH"
+	cd "$srcdir/$python-$_name-$pkgver"
 	
-	cd "$srcdir/$pkgname-$pkgver"
-	$python setup.py install --prefix="$pkgdir/usr" --optimize=1
+	depends=($python 'java-environment')
+	$python setup.py install --root="$pkgdir" --skip-build
+	install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE.rst"
+}
+package_python-pyjnius() {
+	package_ python
+}
+package_python2-pyjnius() {
+	package_ python2
 }